opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-09 21:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: update MERGE_LOG.md with segment 4 completion

Browse Source 
Made-with: Cursor
This commit is contained in:
Novice 2026-03-23 13:59:58 +08:00
parent a28f22e59d
commit 4f236cab7f
No known key found for this signature in database
GPG Key ID: A253106A7475AA3E
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MERGE_LOG.md
View File

@ -7,7 +7,7 @@
| 1 | `657eeb65` | 50 | Early changes: deps, Switch组件, 基础重构 | ✅ |
| 2 | `9c339239` | 129 | Mid refactors: model_runtime, prompt, storage | ✅ |
| 3 | `92bde350` | 56 | dify_graph 大迁移 | ✅ |
| 4 | `fb41b215` | 165 | Post-backend refactors | ⬚ |
| 4 | `fb41b215` | 165 | Post-backend refactors | ✅ |
| 5 | `main HEAD` | 103 | Final changes | ⬚ |
- **Base commit**: `98466e2d`
@ -72,3 +72,24 @@
- Fixed 15 frontend test files: QueryClientProvider wrapping, i18n key renames (importDSL→importApp), emoji rendering assertions, controlMode default, missing mock exports
### Test Results: ✅ Backend 6222 passed, Frontend 25031+ passed
---
## Segment 4: Post-backend Refactors (165 commits → `fb41b215`) ✅
### Conflicts: 44 files
- 3 modify/delete (commands.py, cot/fc agent runners → keep deletion)
- 16 backend content (enums, base_node_data, graph, llm/node, tool_node, etc.)
- 19 frontend content (avatar, text-generation, block-selector, edge interactions, etc.)
- 6 lock/config files (pyproject.toml, uv.lock, package.json, pnpm-lock, eslint-suppressions)
### Post-merge fixes
- Updated `BaseNodeData` import: `dify_graph.nodes.base` → `dify_graph.entities.base_node_data`
- Changed `NodeType.COMMAND/FILE_UPLOAD` → `BuiltinNodeTypes.COMMAND/FILE_UPLOAD`
- Fixed `system_oauth_encryption` → `system_encryption` rename in commands/plugin.py
- Removed tests for deleted agent runner modules (4 files)
- Fixed Avatar: default → named import + numeric → string size API in 5 collaboration files
- Added missing skill deps: @monaco-editor/react, react-arborist, @tanstack/react-virtual
- Fixed frontend test mocks: useUserProfile, useLeaderRestoreListener, next/navigation
### Test Results: ✅ Backend 11608 passed, Frontend skipped (vitest hang issue with forks pool)