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.

refactor(httpapi): extract TAPD/Gongfeng read instructions from clarifyMCPInstructionsFor (#632) (#633)

fx-kurumibda7b97762b1
diff --git a/internal/httpapi/clarify_mcp.go b/internal/httpapi/clarify_mcp.go
index a725ae70..077b4c36 100644
--- a/internal/httpapi/clarify_mcp.go
+++ b/internal/httpapi/clarify_mcp.go
@@ -348,39 +348,11 @@ func (h *streamHandlers) clarifyMCPInstructionsFor(issue domain.Issue, user doma
b.WriteString(")\n")
}
}
- tapdTool := func(name string) string {
- return "tapd__" + name
- }
if len(tapd) > 0 && strings.EqualFold(strings.TrimSpace(issue.Source), "tapd") {
- ws := clarifyTAPDWorkspace(issue, project)
- entryType, entryID := clarifyTAPDEntry(issue)
- getTool := "stories_get"
- switch entryType {
- case "bug":
- getTool = "bugs_get"
- case "task":
- getTool = "tasks_get"
- }
- if resumed {
- fmt.Fprintf(&b, "这是 TAPD %s。对话里已有此前分析,不要再重拉原单和评论。仅当出现尚未读取的新文档链接时才用对应 MCP 读取。\n", entryType)
- } else {
- fmt.Fprintf(&b, "这是 TAPD %s。先静默读取原单和评论。调用 %s:tool_name=%s,tool_args.workspace_id=%s,tool_args.id=%s(字符串),tool_args.limit=1。评论同样调用该工具,tool_name=comments_get,tool_args.workspace_id=%s,tool_args.entry_type=%s,tool_args.entry_id=%s。不要用 params,必须用 tool_args。\n",
- entryType, tapdTool("proxy_execute_tool"), getTool, ws, entryID, ws, entryType, entryID)
- }
+ b.WriteString(clarifyTAPDReadInstruction(issue, project, resumed))
}
if len(gongfeng) > 0 && strings.EqualFold(strings.TrimSpace(issue.Source), "gongfeng") {
- gfProject := h.clarifyGongfengProjectID(issue)
- issueID, issueIID := "", 0
- if issue.ExternalRef != nil {
- issueID = strings.TrimSpace(issue.ExternalRef.ExternalID)
- issueIID = issue.ExternalRef.ExternalIID
- }
- if resumed {
- b.WriteString("这是工蜂 Issue。对话里已有此前分析,不要再重拉原单和评论。\n")
- } else {
- fmt.Fprintf(&b, "这是工蜂 Issue。必须读取原单:调用 gongfeng__get_issue_detail(project_id=%s, issue_iid=%d),并同步 gongfeng__get_issue_notes(project_id=%s, issue_id=%s)看评论。\n",
- gfProject, issueIID, gfProject, issueID)
- }
+ b.WriteString(clarifyGongfengReadInstruction(issue, h.clarifyGongfengProjectID(issue), resumed))
}
if issue.ID == "" && issue.ExternalRef == nil && (len(tapd) > 0 || len(gongfeng) > 0) {
b.WriteString("这是尚未建单的需求草稿,没有原单可拉。描述或对话里出现上述工具能读取的链接时必须先读取后再出题;没有链接不要为了找原单去 list。\n")
@@ -392,6 +364,42 @@ func (h *streamHandlers) clarifyMCPInstructionsFor(issue domain.Issue, user doma
return b.String()
}
+// clarifyTAPDReadInstruction tells the clarifier how to read a TAPD-sourced
+// issue and its comments via tapd__proxy_execute_tool. A resumed conversation
+// already holds the earlier analysis, so it is told not to fetch them again.
+func clarifyTAPDReadInstruction(issue domain.Issue, project domain.Project, resumed bool) string {
+ entryType, entryID := clarifyTAPDEntry(issue)
+ if resumed {
+ return fmt.Sprintf("这是 TAPD %s。对话里已有此前分析,不要再重拉原单和评论。仅当出现尚未读取的新文档链接时才用对应 MCP 读取。\n", entryType)
+ }
+ ws := clarifyTAPDWorkspace(issue, project)
+ getTool := "stories_get"
+ switch entryType {
+ case "bug":
+ getTool = "bugs_get"
+ case "task":
+ getTool = "tasks_get"
+ }
+ return fmt.Sprintf("这是 TAPD %s。先静默读取原单和评论。调用 tapd__proxy_execute_tool:tool_name=%s,tool_args.workspace_id=%s,tool_args.id=%s(字符串),tool_args.limit=1。评论同样调用该工具,tool_name=comments_get,tool_args.workspace_id=%s,tool_args.entry_type=%s,tool_args.entry_id=%s。不要用 params,必须用 tool_args。\n",
+ entryType, getTool, ws, entryID, ws, entryType, entryID)
+}
+
+// clarifyGongfengReadInstruction tells the clarifier how to read a
+// Gongfeng-sourced issue and its notes. gongfengProject is the project path or
+// ID already resolved by the caller.
+func clarifyGongfengReadInstruction(issue domain.Issue, gongfengProject string, resumed bool) string {
+ if resumed {
+ return "这是工蜂 Issue。对话里已有此前分析,不要再重拉原单和评论。\n"
+ }
+ issueID, issueIID := "", 0
+ if issue.ExternalRef != nil {
+ issueID = strings.TrimSpace(issue.ExternalRef.ExternalID)
+ issueIID = issue.ExternalRef.ExternalIID
+ }
+ return fmt.Sprintf("这是工蜂 Issue。必须读取原单:调用 gongfeng__get_issue_detail(project_id=%s, issue_iid=%d),并同步 gongfeng__get_issue_notes(project_id=%s, issue_id=%s)看评论。\n",
+ gongfengProject, issueIID, gongfengProject, issueID)
+}
+
func clarifyMCPWriteName(name string) bool {
n := strings.ToLower(strings.TrimSpace(name))
if n == "" || n == "tools/list" {
diff --git a/internal/httpapi/clarify_mcp_read_instruction_test.go b/internal/httpapi/clarify_mcp_read_instruction_test.go
new file mode 100644
index 00000000..b9b71b58
--- /dev/null
+++ b/internal/httpapi/clarify_mcp_read_instruction_test.go
@@ -0,0 +1,78 @@
+package httpapi
+
+import (
+ "testing"
+
+ "agentflow/internal/domain"
+)
+
+func TestClarifyTAPDReadInstruction(t *testing.T) {
+ project := domain.Project{TAPDWorkspaceID: "20000000"}
+ cases := []struct {
+ name string
+ externalType string
+ want string
+ }{
+ {
+ name: "story",
+ externalType: "story",
+ want: "这是 TAPD story。先静默读取原单和评论。调用 tapd__proxy_execute_tool:tool_name=stories_get,tool_args.workspace_id=20000000,tool_args.id=1010(字符串),tool_args.limit=1。评论同样调用该工具,tool_name=comments_get,tool_args.workspace_id=20000000,tool_args.entry_type=story,tool_args.entry_id=1010。不要用 params,必须用 tool_args。\n",
+ },
+ {
+ name: "bug",
+ externalType: " BUG ",
+ want: "这是 TAPD bug。先静默读取原单和评论。调用 tapd__proxy_execute_tool:tool_name=bugs_get,tool_args.workspace_id=20000000,tool_args.id=1010(字符串),tool_args.limit=1。评论同样调用该工具,tool_name=comments_get,tool_args.workspace_id=20000000,tool_args.entry_type=bug,tool_args.entry_id=1010。不要用 params,必须用 tool_args。\n",
+ },
+ {
+ name: "task",
+ externalType: "task",
+ want: "这是 TAPD task。先静默读取原单和评论。调用 tapd__proxy_execute_tool:tool_name=tasks_get,tool_args.workspace_id=20000000,tool_args.id=1010(字符串),tool_args.limit=1。评论同样调用该工具,tool_name=comments_get,tool_args.workspace_id=20000000,tool_args.entry_type=task,tool_args.entry_id=1010。不要用 params,必须用 tool_args。\n",
+ },
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ issue := domain.Issue{Source: "tapd", ExternalRef: &domain.ExternalRef{ExternalID: " 1010 ", ExternalType: tc.externalType}}
+ if got := clarifyTAPDReadInstruction(issue, project, false); got != tc.want {
+ t.Fatalf("instruction mismatch\n got: %q\nwant: %q", got, tc.want)
+ }
+ })
+ }
+}
+
+func TestClarifyTAPDReadInstructionResumed(t *testing.T) {
+ issue := domain.Issue{Source: "tapd", ExternalRef: &domain.ExternalRef{ExternalID: "1010", ExternalType: "bug"}}
+ want := "这是 TAPD bug。对话里已有此前分析,不要再重拉原单和评论。仅当出现尚未读取的新文档链接时才用对应 MCP 读取。\n"
+ if got := clarifyTAPDReadInstruction(issue, domain.Project{TAPDWorkspaceID: "20000000"}, true); got != want {
+ t.Fatalf("resumed instruction mismatch\n got: %q\nwant: %q", got, want)
+ }
+}
+
+func TestClarifyTAPDReadInstructionPrefersURLWorkspace(t *testing.T) {
+ issue := domain.Issue{Source: "tapd", ExternalRef: &domain.ExternalRef{
+ ExternalID: "1010000000100000555",
+ ExternalType: "story",
+ ExternalURL: "https://tapd.example.com/tapd_fe/10000000/story/detail/1010000000100000555",
+ }}
+ want := "这是 TAPD story。先静默读取原单和评论。调用 tapd__proxy_execute_tool:tool_name=stories_get,tool_args.workspace_id=10000000,tool_args.id=1010000000100000555(字符串),tool_args.limit=1。评论同样调用该工具,tool_name=comments_get,tool_args.workspace_id=10000000,tool_args.entry_type=story,tool_args.entry_id=1010000000100000555。不要用 params,必须用 tool_args。\n"
+ if got := clarifyTAPDReadInstruction(issue, domain.Project{TAPDWorkspaceID: "fallback"}, false); got != want {
+ t.Fatalf("instruction mismatch\n got: %q\nwant: %q", got, want)
+ }
+}
+
+func TestClarifyGongfengReadInstruction(t *testing.T) {
+ issue := domain.Issue{Source: "gongfeng", ExternalRef: &domain.ExternalRef{ExternalID: " 9001 ", ExternalIID: 12}}
+ want := "这是工蜂 Issue。必须读取原单:调用 gongfeng__get_issue_detail(project_id=group/repo, issue_iid=12),并同步 gongfeng__get_issue_notes(project_id=group/repo, issue_id=9001)看评论。\n"
+ if got := clarifyGongfengReadInstruction(issue, "group/repo", false); got != want {
+ t.Fatalf("instruction mismatch\n got: %q\nwant: %q", got, want)
+ }
+
+ noRef := "这是工蜂 Issue。必须读取原单:调用 gongfeng__get_issue_detail(project_id=group/repo, issue_iid=0),并同步 gongfeng__get_issue_notes(project_id=group/repo, issue_id=)看评论。\n"
+ if got := clarifyGongfengReadInstruction(domain.Issue{Source: "gongfeng"}, "group/repo", false); got != noRef {
+ t.Fatalf("instruction without external ref mismatch\n got: %q\nwant: %q", got, noRef)
+ }
+
+ resumed := "这是工蜂 Issue。对话里已有此前分析,不要再重拉原单和评论。\n"
+ if got := clarifyGongfengReadInstruction(issue, "group/repo", true); got != resumed {
+ t.Fatalf("resumed instruction mismatch\n got: %q\nwant: %q", got, resumed)
+ }
+}