Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.
JavaScript agent-orchestrationagentic-workflowai-agentsai-codingclaude-codecode-reviewcodebuddycodexcoding-agentscursordeveloper-toolshuman-on-the-loopllmmcpmulti-agentsdlcself-hostedsopworkflow-automationworkflow-engine
【架构优化】从 WriteWorkspaceFile 中拆出覆盖写入的原子替换 replaceWorkspaceFile (#807)
fx-kurumia14dd44dcc20
diff --git a/internal/runtime/workspace_edit.go b/internal/runtime/workspace_edit.goindex 7f952696..8114aa40 100644--- a/internal/runtime/workspace_edit.go+++ b/internal/runtime/workspace_edit.go@@ -53,13 +53,23 @@ func WriteWorkspaceFile(root, path, content, expected string) (string, error) {if !utf8.Valid(previous) || strings.ContainsRune(string(previous), 0) {return "", fmt.Errorf("二进制文件不可编辑")}+ if err := replaceWorkspaceFile(base, root, rel, content, info.Mode().Perm()); err != nil {+ return "", err+ }+ return WorkspaceContentSHA(content), nil+}++// replaceWorkspaceFile atomically overwrites an existing file: content is+// written and synced to a temporary file beside rel with the given permissions,+// then renamed over rel inside base. The temporary file is always cleaned up.+func replaceWorkspaceFile(base *os.Root, root, rel, content string, perm os.FileMode) error {f, err := os.CreateTemp(filepath.Join(root, filepath.Dir(rel)), ".agentflow-edit-*")if err != nil {- return "", err+ return err}temp := f.Name()defer os.Remove(temp)- if err = f.Chmod(info.Mode().Perm()); err == nil {+ if err = f.Chmod(perm); err == nil {_, err = f.WriteString(content)}if err == nil {@@ -70,16 +80,13 @@ func WriteWorkspaceFile(root, path, content, expected string) (string, error) {err = closeErr}if err != nil {- return "", err+ return err}tempRel, err := filepath.Rel(root, temp)if err != nil {- return "", err- }- if err = base.Rename(tempRel, rel); err != nil {- return "", err+ return err}- return WorkspaceContentSHA(content), nil+ return base.Rename(tempRel, rel)}// resolveWorkspaceEditPath cleans path into a workspace-relative path and rejectsdiff --git a/internal/runtime/workspace_edit_perm_guard_test.go b/internal/runtime/workspace_edit_perm_guard_test.gonew file mode 100644index 00000000..fc4f88dd--- /dev/null+++ b/internal/runtime/workspace_edit_perm_guard_test.go@@ -0,0 +1,45 @@+package runtime++import (+ "os"+ "path/filepath"+ "testing"+)++// WriteWorkspaceFile must keep the mode bits of the file it overwrites: the+// replace path takes the existing permissions from the caller, so a file that+// was deliberately group-writable must stay group-writable after an edit.+func TestWorkspaceEditPreservesOriginalFileMode(t *testing.T) {+ root := t.TempDir()+ target := filepath.Join(root, "run.sh")+ if err := os.WriteFile(target, []byte("echo old\n"), 0751); err != nil {+ t.Fatal(err)+ }+ if err := os.Chmod(target, 0751); err != nil {+ t.Fatal(err)+ }+ if _, err := WriteWorkspaceFile(root, "run.sh", "echo new\n", WorkspaceContentSHA("echo old\n")); err != nil {+ t.Fatal(err)+ }+ raw, err := os.ReadFile(target)+ if err != nil || string(raw) != "echo new\n" {+ t.Fatalf("content %q, %v", raw, err)+ }+ info, err := os.Stat(target)+ if err != nil {+ t.Fatal(err)+ }+ if got := info.Mode().Perm(); got != 0751 {+ t.Fatalf("mode after overwrite = %04o, want 0751", got)+ }+ // A read-only source file must not be widened by the replace either.+ if err := os.Chmod(target, 0444); err != nil {+ t.Fatal(err)+ }+ if _, err := WriteWorkspaceFile(root, "run.sh", "echo third\n", WorkspaceContentSHA("echo new\n")); err != nil {+ t.Fatal(err)+ }+ if info, err = os.Stat(target); err != nil || info.Mode().Perm() != 0444 {+ t.Fatalf("mode after read-only overwrite = %v, %v", info.Mode().Perm(), err)+ }+}diff --git a/internal/runtime/workspace_edit_split_test.go b/internal/runtime/workspace_edit_split_test.goindex a695b98d..c7ecca93 100644--- a/internal/runtime/workspace_edit_split_test.go+++ b/internal/runtime/workspace_edit_split_test.go@@ -67,3 +67,37 @@ func TestCreateWorkspaceFile(t *testing.T) {t.Fatalf("existing file changed: %q", raw)}}++func TestReplaceWorkspaceFile(t *testing.T) {+ root := t.TempDir()+ if err := os.MkdirAll(filepath.Join(root, "src"), 0755); err != nil {+ t.Fatal(err)+ }+ target := filepath.Join(root, "src", "main.go")+ if err := os.WriteFile(target, []byte("old"), 0600); err != nil {+ t.Fatal(err)+ }+ base, err := os.OpenRoot(root)+ if err != nil {+ t.Fatal(err)+ }+ defer base.Close()+ rel := filepath.Join("src", "main.go")+ if err = replaceWorkspaceFile(base, root, rel, "new", 0640); err != nil {+ t.Fatal(err)+ }+ raw, err := os.ReadFile(target)+ if err != nil || string(raw) != "new" {+ t.Fatalf("content %q, %v", raw, err)+ }+ info, err := os.Stat(target)+ if err != nil || info.Mode().Perm() != 0640 {+ t.Fatalf("mode %v, %v", info.Mode().Perm(), err)+ }+ if leftovers, _ := filepath.Glob(filepath.Join(root, "src", ".agentflow-edit-*")); len(leftovers) != 0 {+ t.Fatalf("temporary files left behind: %v", leftovers)+ }+ if err = replaceWorkspaceFile(base, root, filepath.Join("missing", "x.go"), "x", 0644); err == nil {+ t.Fatal("replace into a missing directory succeeded")+ }+}