Files
dify/MERGE_LOG.md
Novice a883b74272 fix: update core.file imports to core.workflow.file after merge
The File class and related modules were moved from core.file to
core.workflow.file in the sandboxed-agent branch. This commit
updates all remaining references including test mock/patch paths,
Switch component defaultValue→value changes, and account setting
tab constant updates.

Made-with: Cursor
2026-03-19 18:05:55 +08:00

866 B

Merge Log: sandboxed-agent-rebase ← main

Overview

Segment Target Commit Commits Description Status
1 657eeb65 50 Early changes: deps, Switch组件, 基础重构
2 9c339239 129 Mid refactors: model_runtime 等
3 92bde350 56 dify_graph 大迁移
4 fb41b215 165 Post-backend refactors
5 main HEAD 103 Final changes
  • Base commit: 98466e2d
  • Branch: sandboxed-agent-rebase
  • Total main commits: 503

Segment 1: Early Changes (50 commits → 657eeb65)

Started:

Merge Command

git merge 657eeb65

Conflicts

Resolution

Test Results