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 3 completion

Browse Source 
Made-with: Cursor
This commit is contained in:
Novice 2026-03-23 10:31:40 +08:00
parent 6b75188ddc
commit 55095e70d2
No known key found for this signature in database
GPG Key ID: A253106A7475AA3E
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MERGE_LOG.md
View File

@ -6,7 +6,7 @@
|---------|--------------|---------|-------------|--------|
| 1 | `657eeb65` | 50 | Early changes: deps, Switch组件, 基础重构 | ✅ |
| 2 | `9c339239` | 129 | Mid refactors: model_runtime, prompt, storage | ✅ |
| 3 | `92bde350` | 56 | dify_graph 大迁移 | ⬚ |
| 3 | `92bde350` | 56 | dify_graph 大迁移 | ✅ |
| 4 | `fb41b215` | 165 | Post-backend refactors | ⬚ |
| 5 | `main HEAD` | 103 | Final changes | ⬚ |
@ -49,4 +49,26 @@
- Added `enable_collaboration_mode`/`enable_creators_platform` to SystemFeatures mocks
- Fixed `UPDATE_WORKFLOW_NODES_MAP` import path
### Test Results: ⏳ Pending
### Test Results: ✅ All passed
---
## Segment 3: dify_graph 大迁移 (56 commits → `92bde350`) ✅
### Conflicts: 47 files
- 5 modify/delete (4 agent runners → keep deletion, app-info.tsx → keep ours)
- 26 backend content (dify_graph modules, workflow_entry, queue_entities, etc.)
- 13 frontend content (app-card, list, account-dropdown, contract/router, etc.)
- 3 lock/config files (uv.lock, pnpm-lock, eslint-suppressions)
### Post-merge fixes (major migration)
- **core.model_runtime → dify_graph.model_runtime**: 20+ files (imports + mock paths)
- **core.workflow.file → dify_graph.file**: 15+ files (imports + mock/patch paths)
- **core.workflow.enums → dify_graph.enums**: skill_service, nested_node_graph_service
- **core.workflow.graph_engine/graph_events/node_events/nodes.base → dify_graph.\***: 10+ files
- Fixed SandboxContext phantom import in dify_graph/context/__init__.py
- Fixed core.app.workflow.node_factory → core.workflow.node_factory
- Fixed toast import paths (useToastContext from toast/context)
- 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