Merge pull request #678 from phantom5099/main

pref(tool):删除无用工具

Author: pionxe

docs/architecture/architecture-v1.md

@@ -691,11 +691,7 @@ NeoCode 在多处预留了扩展点。本节集中描述：**哪里可以扩展
 | `filesystem_edit` | 文件系统 | 基于字符串精确替换的原地编辑 |
 | `filesystem_glob` | 文件系统 | 文件名模式匹配 |
 | `filesystem_grep` | 文件系统 | 文件内容正则搜索 |
-| `filesystem_copy_file` | 文件系统 | 复制文件 |
-| `filesystem_move_file` | 文件系统 | 移动/重命名文件 |
-| `filesystem_create_dir` | 文件系统 | 创建目录 |
 | `filesystem_delete_file` | 文件系统 | 删除文件 |
-| `filesystem_remove_dir` | 文件系统 | 删除目录 |
 | `codebase_read` | 代码库 | 读取代码文件（含语义增强） |
 | `codebase_search_text` | 代码库 | 基于文本搜索代码库 |
 | `codebase_search_symbol` | 代码库 | 基于 Tree-sitter 的跨语言符号搜索 |

internal/app/bootstrap.go

@@ -457,11 +457,7 @@ func buildToolRegistry(cfg config.Config) (*tools.Registry, func() error, error)
 	toolRegistry.Register(filesystem.NewGrep(cfg.Workdir))
 	toolRegistry.Register(filesystem.NewGlob(cfg.Workdir))
 	toolRegistry.Register(filesystem.NewEdit(cfg.Workdir))
-	toolRegistry.Register(filesystem.NewMove(cfg.Workdir))
-	toolRegistry.Register(filesystem.NewCopy(cfg.Workdir))
 	toolRegistry.Register(filesystem.NewDelete(cfg.Workdir))
-	toolRegistry.Register(filesystem.NewCreateDir(cfg.Workdir))
-	toolRegistry.Register(filesystem.NewRemoveDir(cfg.Workdir))
 	toolRegistry.Register(bash.New(cfg.Workdir, cfg.Shell, time.Duration(cfg.ToolTimeoutSec)*time.Second))
 	toolRegistry.Register(diagnosetool.New())
 	toolRegistry.Register(webfetch.New(webfetch.Config{

internal/checkpoint/per_edit_snapshot_test.go

@@ -883,72 +883,6 @@ func TestCapturePostDelete_DirectoryTreeRecovery(t *testing.T) {
 	}
 }
 
-func TestRestore_RemoveDirWithNestedFiles(t *testing.T) {
-	store, workdir := newTestStore(t)
-	dir := filepath.Join(workdir, "foo")
-	child := filepath.Join(dir, "bar.txt")
-
-	// Turn 1: create tree.
-	writeWorkdirFile(t, workdir, "foo/bar.txt", "hello")
-	if _, err := store.CapturePreWrite(dir); err != nil {
-		t.Fatalf("capture dir t1: %v", err)
-	}
-	if _, err := store.CapturePreWrite(child); err != nil {
-		t.Fatalf("capture child t1: %v", err)
-	}
-	if _, err := store.Finalize("cp1"); err != nil {
-		t.Fatalf("finalize cp1: %v", err)
-	}
-	store.Reset()
-
-	// Turn 2: remove tree with recursive pre-capture + post-delete.
-	if _, err := store.CapturePreWrite(dir); err != nil {
-		t.Fatalf("capture dir t2: %v", err)
-	}
-	if _, err := store.CapturePreWrite(child); err != nil {
-		t.Fatalf("capture child t2: %v", err)
-	}
-	if err := os.RemoveAll(dir); err != nil {
-		t.Fatalf("removeAll: %v", err)
-	}
-	if err := store.CapturePostDelete([]string{dir, child}); err != nil {
-		t.Fatalf("CapturePostDelete: %v", err)
-	}
-	if _, err := store.Finalize("cp2"); err != nil {
-		t.Fatalf("finalize cp2: %v", err)
-	}
-	store.Reset()
-
-	// Turn 3: recreate tree with different content.
-	writeWorkdirFile(t, workdir, "foo/bar.txt", "world")
-	if _, err := store.CapturePreWrite(dir); err != nil {
-		t.Fatalf("capture dir t3: %v", err)
-	}
-	if _, err := store.CapturePreWrite(child); err != nil {
-		t.Fatalf("capture child t3: %v", err)
-	}
-	if _, err := store.Finalize("cp3"); err != nil {
-		t.Fatalf("finalize cp3: %v", err)
-	}
-	store.Reset()
-
-	// Restore cp2: should delete the tree.
-	if err := store.Restore(context.Background(), "cp2", ""); err != nil {
-		t.Fatalf("restore cp2: %v", err)
-	}
-	if _, err := os.Stat(dir); !os.IsNotExist(err) {
-		t.Fatalf("expected dir absent after restore cp2, stat err=%v", err)
-	}
-
-	// Restore cp1: should recreate the tree with original content.
-	if err := store.Restore(context.Background(), "cp1", ""); err != nil {
-		t.Fatalf("restore cp1: %v", err)
-	}
-	if got := mustReadFile(t, child); got != "hello" {
-		t.Fatalf("child want hello got %q", got)
-	}
-}
-
 func TestPerEditStoreHelperMethods(t *testing.T) {
 	t.Run("availability and pending lifecycle", func(t *testing.T) {
 		var nilStore *PerEditSnapshotStore

internal/context/microcompact_test.go

@@ -502,101 +502,6 @@ func TestMicroCompactMixedPinnedAndNonPinned(t *testing.T) {
 	}
 }
 
-func TestMicroCompactPinsCopyAndMoveUsingPersistedMetadataPaths(t *testing.T) {
-	t.Parallel()
-
-	pinChecker := NewDefaultPinChecker()
-
-	copyMessages := []providertypes.Message{
-		{Role: providertypes.RoleUser, Parts: []providertypes.ContentPart{providertypes.NewTextPart("older user")}},
-		{
-			Role: providertypes.RoleAssistant,
-			ToolCalls: []providertypes.ToolCall{
-				{ID: "copy-call", Name: tools.ToolNameFilesystemCopyFile, Arguments: `{"source_path":"main.go","destination_path":"go.mod"}`},
-			},
-		},
-		{Role: providertypes.RoleTool, ToolCallID: "copy-call", Parts: []providertypes.ContentPart{providertypes.NewTextPart("ok")}, ToolMetadata: map[string]string{
-			"tool_name":        tools.ToolNameFilesystemCopyFile,
-			"source_path":      "/project/main.go",
-			"destination_path": "/project/go.mod",
-		}},
-		{
-			Role: providertypes.RoleAssistant,
-			ToolCalls: []providertypes.ToolCall{
-				{ID: "recent-call", Name: tools.ToolNameBash, Arguments: "{}"},
-			},
-		},
-		{Role: providertypes.RoleTool, ToolCallID: "recent-call", Parts: []providertypes.ContentPart{providertypes.NewTextPart("recent bash result")}},
-		{Role: providertypes.RoleUser, Parts: []providertypes.ContentPart{providertypes.NewTextPart("latest explicit instruction")}},
-	}
-
-	copyGot := microCompactMessagesWithPolicies(copyMessages, stubMicroCompactPolicySource{}, 1, nil, pinChecker)
-	if renderDisplayParts(copyGot[2].Parts) != "ok" {
-		t.Fatalf("expected copy_file result touching go.mod to stay pinned, got %q", renderDisplayParts(copyGot[2].Parts))
-	}
-
-	moveMessages := []providertypes.Message{
-		{Role: providertypes.RoleUser, Parts: []providertypes.ContentPart{providertypes.NewTextPart("older user")}},
-		{
-			Role: providertypes.RoleAssistant,
-			ToolCalls: []providertypes.ToolCall{
-				{ID: "move-call", Name: tools.ToolNameFilesystemMoveFile, Arguments: `{"source_path":"package.json","destination_path":"package.backup.json"}`},
-			},
-		},
-		{Role: providertypes.RoleTool, ToolCallID: "move-call", Parts: []providertypes.ContentPart{providertypes.NewTextPart("ok")}, ToolMetadata: map[string]string{
-			"tool_name":        tools.ToolNameFilesystemMoveFile,
-			"source_path":      "/project/package.json",
-			"destination_path": "/project/package.backup.json",
-		}},
-		{
-			Role: providertypes.RoleAssistant,
-			ToolCalls: []providertypes.ToolCall{
-				{ID: "recent-call", Name: tools.ToolNameBash, Arguments: "{}"},
-			},
-		},
-		{Role: providertypes.RoleTool, ToolCallID: "recent-call", Parts: []providertypes.ContentPart{providertypes.NewTextPart("recent bash result")}},
-		{Role: providertypes.RoleUser, Parts: []providertypes.ContentPart{providertypes.NewTextPart("latest explicit instruction")}},
-	}
-
-	moveGot := microCompactMessagesWithPolicies(moveMessages, stubMicroCompactPolicySource{}, 1, nil, pinChecker)
-	if renderDisplayParts(moveGot[2].Parts) != "ok" {
-		t.Fatalf("expected move_file result touching package.json to stay pinned, got %q", renderDisplayParts(moveGot[2].Parts))
-	}
-}
-
-func TestMicroCompactStillCompactsCopyAndMoveWhenNoKeyFileIsTouched(t *testing.T) {
-	t.Parallel()
-
-	pinChecker := NewDefaultPinChecker()
-	messages := []providertypes.Message{
-		{Role: providertypes.RoleUser, Parts: []providertypes.ContentPart{providertypes.NewTextPart("older user")}},
-		{
-			Role: providertypes.RoleAssistant,
-			ToolCalls: []providertypes.ToolCall{
-				{ID: "move-call", Name: tools.ToolNameFilesystemMoveFile, Arguments: `{"source_path":"main.go","destination_path":"main2.go"}`},
-			},
-		},
-		{Role: providertypes.RoleTool, ToolCallID: "move-call", Parts: []providertypes.ContentPart{providertypes.NewTextPart("ok")}, ToolMetadata: map[string]string{
-			"tool_name":        tools.ToolNameFilesystemMoveFile,
-			"source_path":      "/project/main.go",
-			"destination_path": "/project/main2.go",
-		}},
-		{
-			Role: providertypes.RoleAssistant,
-			ToolCalls: []providertypes.ToolCall{
-				{ID: "recent-call", Name: tools.ToolNameBash, Arguments: "{}"},
-			},
-		},
-		{Role: providertypes.RoleTool, ToolCallID: "recent-call", Parts: []providertypes.ContentPart{providertypes.NewTextPart("recent bash result")}},
-		{Role: providertypes.RoleUser, Parts: []providertypes.ContentPart{providertypes.NewTextPart("latest explicit instruction")}},
-	}
-
-	got := microCompactMessagesWithPolicies(messages, stubMicroCompactPolicySource{}, 1, nil, pinChecker)
-	if !strings.Contains(renderDisplayParts(got[2].Parts), "[summary] filesystem_move_file") {
-		t.Fatalf("expected non-key move_file result to still compact into summary, got %q", renderDisplayParts(got[2].Parts))
-	}
-}
-
 // stubMicroCompactPinChecker 实现 MicroCompactPinChecker，用于测试。
 type stubMicroCompactPinChecker map[string]map[string]bool
 

internal/context/pin_checker.go

@@ -23,8 +23,6 @@ var defaultPinPatterns = []string{
 var defaultPinToolNames = map[string]struct{}{
 	tools.ToolNameFilesystemWriteFile: {},
 	tools.ToolNameFilesystemEdit:      {},
-	tools.ToolNameFilesystemCopyFile:  {},
-	tools.ToolNameFilesystemMoveFile:  {},
 }
 
 // pinChecker 基于文件路径 glob 模式判断工具结果是否应钉住。

internal/context/pin_checker_test.go

@@ -39,8 +39,6 @@ func TestDefaultPinCheckerMatchesKeyArtifacts(t *testing.T) {
 		{toolName: "filesystem_write_file", path: "utils.py", expected: false},
 		{toolName: "filesystem_write_file", path: "style.css", expected: false},
 		{toolName: "filesystem_edit", path: "README.md", expected: true},
-		{toolName: "filesystem_copy_file", path: "go.mod", expected: true},
-		{toolName: "filesystem_move_file", path: "package.json", expected: true},
 		{toolName: "filesystem_read_file", path: "README.md", expected: false},
 		{toolName: "bash", path: "README.md", expected: false},
 	}
@@ -80,34 +78,6 @@ func TestDefaultPinCheckerFallsBackToPath(t *testing.T) {
 	}
 }
 
-func TestDefaultPinCheckerSupportsCopyAndMoveMetadataFields(t *testing.T) {
-	t.Parallel()
-
-	checker := NewDefaultPinChecker()
-
-	copyPinned := checker.ShouldPin("filesystem_copy_file", map[string]string{
-		"destination_path": "/project/go.mod",
-	})
-	if !copyPinned {
-		t.Error("expected destination_path match for copy_file go.mod")
-	}
-
-	movePinned := checker.ShouldPin("filesystem_move_file", map[string]string{
-		"source_path": "/project/package.json",
-	})
-	if !movePinned {
-		t.Error("expected source_path match for move_file package.json")
-	}
-
-	notPinned := checker.ShouldPin("filesystem_move_file", map[string]string{
-		"source_path":      "/project/main.go",
-		"destination_path": "/project/main2.go",
-	})
-	if notPinned {
-		t.Error("expected non-key source/destination paths to remain unpinned")
-	}
-}
-
 func TestDefaultPinCheckerNoPathReturnsFalse(t *testing.T) {
 	t.Parallel()
 

internal/promptasset/templates/core/tool_usage.md

@@ -32,11 +32,7 @@ For general file operations outside of codebase exploration, use `filesystem_*`
 - For simple create/overwrite tasks, prefer `filesystem_write_file` with `verify_after_write=true` so one call can emit write + verification facts.
 - Do not use `bash` to edit files when the filesystem tools can make the change safely.
 - For file system structure changes inside the workspace, prefer the dedicated tools over `bash`:
-  - rename/move: `filesystem_move_file` (not `bash mv`)
-  - copy: `filesystem_copy_file` (not `bash cp`)
   - delete file: `filesystem_delete_file` (not `bash rm`)
-  - create directory: `filesystem_create_dir` (not `bash mkdir`)
-  - remove directory: `filesystem_remove_dir` (not `bash rmdir` / `rm -rf`)
   These tools record their changes for checkpoint/rollback; equivalent `bash` commands produce reduced rollback coverage.
 - For multi-step implementation, debugging, refactoring, or long-running work, keep task state explicit via `todo_write` (plan/add/update/set_status/claim/complete/fail) when that tool is available and the current mode permits execution todo updates.
 - Create todos that map to real acceptance work, not vague activity.

internal/runner/runner.go

@@ -104,11 +104,7 @@ func New(cfg Config) (*Runner, error) {
 	toolMgr.Register(filesystem.NewGrep(workdir))
 	toolMgr.Register(filesystem.NewGlob(workdir))
 	toolMgr.Register(filesystem.NewEdit(workdir))
-	toolMgr.Register(filesystem.NewMove(workdir))
-	toolMgr.Register(filesystem.NewCopy(workdir))
 	toolMgr.Register(filesystem.NewDelete(workdir))
-	toolMgr.Register(filesystem.NewCreateDir(workdir))
-	toolMgr.Register(filesystem.NewRemoveDir(workdir))
 	toolMgr.Register(bash.New(workdir, shell, cfg.RequestTimeout))
 	toolMgr.Register(webfetch.New(webfetch.Config{Timeout: cfg.RequestTimeout}))
 	toolMgr.Register(diagnosetool.New())

internal/runtime/run.go

@@ -839,7 +839,7 @@ func (s *Service) emitToolDiffs(ctx context.Context, state *runState, summary to
 }
 
 // buildToolDiffPayload 将工具结果 metadata 中的 diff 信息组装成 ToolDiffPayload。
-// 多文件工具(filesystem_move_file 等)使用 Files+Diffs 多路径字段；
+// 使用 Files+Diffs 或 FilePath/Diff/WasNew 字段；
 // 其他写工具继续填充兼容字段 FilePath/Diff/WasNew，保持现有消费者不破。
 // FileChange.Kind 优先取 entry.Kind（toolexec 收集层填充），缺失时回退到 WasNew 二分以兼容旧 metadata。
 func buildToolDiffPayload(result tools.ToolResult) (ToolDiffPayload, bool) {

internal/runtime/tool_diff_helpers_test.go

@@ -33,7 +33,7 @@ func TestBuildToolDiffPayload(t *testing.T) {
 
 	t.Run("multi file payload", func(t *testing.T) {
 		result := tools.ToolResult{
-			Name:       tools.ToolNameFilesystemMoveFile,
+			Name:       tools.ToolNameFilesystemWriteFile,
 			ToolCallID: "call-2",
 			Metadata: map[string]any{
 				"tool_diffs": []map[string]any{
@@ -61,7 +61,7 @@ func TestBuildToolDiffPayload(t *testing.T) {
 
 	t.Run("multi file kind from metadata wins over WasNew fallback", func(t *testing.T) {
 		result := tools.ToolResult{
-			Name:       tools.ToolNameFilesystemMoveFile,
+			Name:       tools.ToolNameFilesystemWriteFile,
 			ToolCallID: "call-move",
 			Metadata: map[string]any{
 				"tool_diffs": []map[string]any{
@@ -88,7 +88,7 @@ func TestBuildToolDiffPayload(t *testing.T) {
 
 	t.Run("multi file filters unchanged copy source", func(t *testing.T) {
 		result := tools.ToolResult{
-			Name:       tools.ToolNameFilesystemCopyFile,
+			Name:       tools.ToolNameFilesystemWriteFile,
 			ToolCallID: "call-copy",
 			Metadata: map[string]any{
 				"tool_diffs": []map[string]any{
@@ -112,7 +112,7 @@ func TestBuildToolDiffPayload(t *testing.T) {
 
 	t.Run("multi file delete metadata preserves deleted kind", func(t *testing.T) {
 		result := tools.ToolResult{
-			Name:       tools.ToolNameFilesystemRemoveDir,
+			Name:       tools.ToolNameFilesystemWriteFile,
 			ToolCallID: "call-rm",
 			Metadata: map[string]any{
 				"tool_diffs": []map[string]any{
@@ -144,7 +144,7 @@ func TestBuildToolDiffPayload(t *testing.T) {
 }
 
 func TestToolExecutionHelperFunctions(t *testing.T) {
-	t.Run("toolCallTouchedPaths covers write and move payloads", func(t *testing.T) {
+	t.Run("toolCallTouchedPaths extracts path", func(t *testing.T) {
 		writePaths := toolCallTouchedPaths(providertypes.ToolCall{
 			Name:      tools.ToolNameFilesystemWriteFile,
 			Arguments: `{"path":" docs/readme.md "}`,
@@ -153,16 +153,8 @@ func TestToolExecutionHelperFunctions(t *testing.T) {
 			t.Fatalf("write toolCallTouchedPaths() = %#v", writePaths)
 		}
 
-		movePaths := toolCallTouchedPaths(providertypes.ToolCall{
-			Name:      tools.ToolNameFilesystemMoveFile,
-			Arguments: `{"source_path":"src/a.txt","destination_path":" /tmp/b.txt "}`,
-		}, "/repo")
-		if len(movePaths) != 2 || movePaths[0] != "/repo/src/a.txt" || movePaths[1] != "/tmp/b.txt" {
-			t.Fatalf("move toolCallTouchedPaths() = %#v", movePaths)
-		}
-
 		if got := toolCallTouchedPaths(providertypes.ToolCall{
-			Name:      tools.ToolNameFilesystemCopyFile,
+			Name:      tools.ToolNameFilesystemWriteFile,
 			Arguments: `{invalid`,
 		}, "/repo"); got != nil {
 			t.Fatalf("malformed toolCallTouchedPaths() = %#v, want nil", got)