Skip to content

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.

【架构优化】mcpCallMayWrite 词表提为包级变量并去掉重复的工具名切分循环 (#400)

fx-kurumi5c0d1ccb237e
diff --git a/internal/httpapi/agent_tool_mcp.go b/internal/httpapi/agent_tool_mcp.go
index 9ed86989..38a86967 100644
--- a/internal/httpapi/agent_tool_mcp.go
+++ b/internal/httpapi/agent_tool_mcp.go
@@ -7,6 +7,7 @@ import (
"fmt"
"io"
"net/http"
+ "slices"
"strings"
"time"
@@ -474,6 +475,13 @@ func mcpCallName(kind string, call assistantMCPCall) string {
return strings.TrimSpace(call.Tool)
}
+// mcpWriteVerbs mark a write when one is a whole _/-/. separated segment of
+// the tool name.
+var mcpWriteVerbs = []string{"add", "merge", "upload", "transition", "close", "reopen", "approve", "assign", "set", "remove", "publish", "send", "post", "submit", "comment"}
+
+// mcpReadWords mark a read when one appears anywhere in the tool name.
+var mcpReadWords = []string{"get", "list", "search", "query", "count", "lookup", "read", "fetch", "describe", "show", "info", "detail", "tree", "blame", "compare", "schema", "reference", "find", "view"}
+
// mcpCallMayWrite treats a call as a write unless its name reads as a read.
// The approval review is the safety net, so an unknown name such as
// merge_merge_request is reviewed instead of passing as a read.
@@ -482,17 +490,9 @@ func mcpCallMayWrite(kind string, call assistantMCPCall) bool {
if name == "" || clarifyMCPWriteName(name) {
return name != ""
}
- for _, word := range []string{"add", "merge", "upload", "transition", "close", "reopen", "approve", "assign", "set", "remove", "publish", "send", "post", "submit", "comment"} {
- for _, part := range strings.FieldsFunc(name, func(r rune) bool { return r == '_' || r == '-' || r == '.' }) {
- if part == word {
- return true
- }
- }
- }
- for _, word := range []string{"get", "list", "search", "query", "count", "lookup", "read", "fetch", "describe", "show", "info", "detail", "tree", "blame", "compare", "schema", "reference", "find", "view"} {
- if strings.Contains(name, word) {
- return false
- }
+ parts := strings.FieldsFunc(name, func(r rune) bool { return r == '_' || r == '-' || r == '.' })
+ if slices.ContainsFunc(parts, func(part string) bool { return slices.Contains(mcpWriteVerbs, part) }) {
+ return true
}
- return true
+ return !slices.ContainsFunc(mcpReadWords, func(word string) bool { return strings.Contains(name, word) })
}
diff --git a/internal/httpapi/mcp_call_may_write_test.go b/internal/httpapi/mcp_call_may_write_test.go
new file mode 100644
index 00000000..c4b9cbaf
--- /dev/null
+++ b/internal/httpapi/mcp_call_may_write_test.go
@@ -0,0 +1,90 @@
+package httpapi
+
+import "testing"
+
+func TestMCPCallMayWriteClassifiesToolNames(t *testing.T) {
+ cases := []struct {
+ name string
+ kind string
+ call assistantMCPCall
+ want bool
+ }{
+ {"empty name is not a write", "gongfeng", assistantMCPCall{Tool: " "}, false},
+ {"clarify write name", "gongfeng", assistantMCPCall{Tool: "create_issue"}, true},
+ {"write verb segment by underscore", "gongfeng", assistantMCPCall{Tool: "comments_add"}, true},
+ {"write verb segment by dash", "gongfeng", assistantMCPCall{Tool: "mr-approve"}, true},
+ {"write verb segment by dot", "gongfeng", assistantMCPCall{Tool: "label.remove"}, true},
+ {"write verb wins over read word", "gongfeng", assistantMCPCall{Tool: "merge_merge_request"}, true},
+ {"write verb dot segment beats read word", "gongfeng", assistantMCPCall{Tool: "detail.set"}, true},
+ {"write verb segment beats read word in same name", "gongfeng", assistantMCPCall{Tool: "list_add"}, true},
+ {"write verb is case-insensitive", "gongfeng", assistantMCPCall{Tool: "Issue_Close"}, true},
+ {"write verb only as substring is not a segment", "gongfeng", assistantMCPCall{Tool: "get_settings"}, false},
+ {"read word", "gongfeng", assistantMCPCall{Tool: "get_branch_list"}, false},
+ {"read word as substring", "gongfeng", assistantMCPCall{Tool: "user_todo_stories_get"}, false},
+ {"unknown name defaults to write", "gongfeng", assistantMCPCall{Tool: "frobnicate"}, true},
+ {"tapd inner read tool", "tapd", assistantMCPCall{Tool: "proxy_execute_tool", Arguments: map[string]any{"tool_name": "stories_get"}}, false},
+ {"tapd inner write tool", "tapd", assistantMCPCall{Tool: "proxy_execute_tool", Arguments: map[string]any{"tool_name": "comments_add"}}, true},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ if got := mcpCallMayWrite(tc.kind, tc.call); got != tc.want {
+ t.Fatalf("mcpCallMayWrite(%q, %+v)=%v, want %v", tc.kind, tc.call, got, tc.want)
+ }
+ })
+ }
+}
+
+// Every name below also contains a read word, so it only classifies as a
+// write when the whole-segment write-verb check runs before the read-word
+// fallback and honours each separator.
+func TestMCPCallMayWriteWriteVerbSegmentBeatsReadWord(t *testing.T) {
+ cases := []struct {
+ name string
+ kind string
+ call assistantMCPCall
+ want bool
+ }{
+ {"underscore segment beats read word", "gongfeng", assistantMCPCall{Tool: "merge_request_info"}, true},
+ {"dash segment beats read word", "gongfeng", assistantMCPCall{Tool: "review-approve-detail"}, true},
+ {"dot segment beats read word", "gongfeng", assistantMCPCall{Tool: "issue.close.view"}, true},
+ {"tapd inner write segment beats read word", "tapd", assistantMCPCall{Tool: "proxy_execute_tool", Arguments: map[string]any{"tool_name": "comment_search"}}, true},
+ {"write verb inside a segment is still a read", "gongfeng", assistantMCPCall{Tool: "list_merged_requests"}, false},
+ {"write verb joined by another separator is still a read", "gongfeng", assistantMCPCall{Tool: "issue:close:view"}, false},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ if got := mcpCallMayWrite(tc.kind, tc.call); got != tc.want {
+ t.Fatalf("mcpCallMayWrite(%q, %+v)=%v, want %v", tc.kind, tc.call, got, tc.want)
+ }
+ })
+ }
+}
+
+// Covers each verb in the write list (set, assign, publish, ...) against a
+// read word, verbs only embedded in a longer segment, and lower-casing.
+func TestMCPCallMayWriteVerbListAndCase(t *testing.T) {
+ cases := []struct {
+ kind string
+ call assistantMCPCall
+ want bool
+ }{
+ {"gongfeng", assistantMCPCall{Tool: "comment_list"}, true},
+ {"gongfeng", assistantMCPCall{Tool: "set_view"}, true},
+ {"gongfeng", assistantMCPCall{Tool: "mr-approve-detail"}, true},
+ {"gongfeng", assistantMCPCall{Tool: "label.assign.info"}, true},
+ {"gongfeng", assistantMCPCall{Tool: "issue_close_get"}, true},
+ {"gongfeng", assistantMCPCall{Tool: "publish_search_result"}, true},
+ {"tapd", assistantMCPCall{Tool: "proxy_execute_tool", Arguments: map[string]any{"tool_name": "stories_assign_query"}}, true},
+ // A write verb that is only part of a segment does not count.
+ {"gongfeng", assistantMCPCall{Tool: "assignee_list"}, false},
+ {"gongfeng", assistantMCPCall{Tool: "postmortem-detail"}, false},
+ {"gongfeng", assistantMCPCall{Tool: "closed.issues.query"}, false},
+ // The name is lower-cased first, so an upper-case verb segment still wins.
+ {"gongfeng", assistantMCPCall{Tool: "Issue_Close_list"}, true},
+ }
+ for _, tc := range cases {
+ if got := mcpCallMayWrite(tc.kind, tc.call); got != tc.want {
+ t.Errorf("mcpCallMayWrite(%q, %+v)=%v, want %v", tc.kind, tc.call, got, tc.want)
+ }
+ }
+}