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
refactor(httpapi): extract assistantWrappedToolParams and assistantToolSearchNames from assistantToolDisplay (#523) (#524)
fx-kurumieb00faa721a7
diff --git a/internal/httpapi/assistant_stream.go b/internal/httpapi/assistant_stream.goindex a3ce7178..10def382 100644--- a/internal/httpapi/assistant_stream.go+++ b/internal/httpapi/assistant_stream.go@@ -340,6 +340,44 @@ func assistantAgentReport(text string) string {return strings.TrimSpace(assistantAgentTrailerRe.ReplaceAllString(text, ""))}+// assistantWrappedToolParams returns the inner tool input carried by a+// DeferExecuteTool/MCP wrapper: a string "params" is used verbatim, any other+// value is re-encoded, and a missing "params" falls back to the wrapper input.+func assistantWrappedToolParams(input json.RawMessage, m map[string]any) json.RawMessage {+ nested, ok := m["params"]+ if !ok {+ return input+ }+ if text, ok := nested.(string); ok {+ return json.RawMessage(text)+ }+ if raw, err := json.Marshal(nested); err == nil {+ return raw+ }+ return input+}++// assistantToolSearchNames joins the non-blank entries of the first+// non-empty "tool_names"/"queries" list of a ToolSearch input.+func assistantToolSearchNames(m map[string]any) string {+ for _, key := range []string{"tool_names", "queries"} {+ values, ok := m[key].([]any)+ if !ok {+ continue+ }+ var names []string+ for _, value := range values {+ if text, ok := value.(string); ok && strings.TrimSpace(text) != "" {+ names = append(names, strings.TrimSpace(text))+ }+ }+ if len(names) > 0 {+ return strings.Join(names, ", ")+ }+ }+ return ""+}+func assistantToolDisplay(name string, input json.RawMessage) (string, string) {name = assistantSessionToolName(name)var m map[string]any@@ -372,31 +410,13 @@ func assistantToolDisplay(name string, input json.RawMessage) (string, string) {// opaque DeferExecuteTool label that the filter would keep forever.return "", ""}- params := input- if nested, ok := m["params"]; ok {- if text, ok := nested.(string); ok {- params = json.RawMessage(text)- } else if raw, err := json.Marshal(nested); err == nil {- params = raw- }- }- return assistantToolDisplay(inner, params)+ return assistantToolDisplay(inner, assistantWrappedToolParams(input, m))case "ToolSearch":if detail := str("query", "q", "search", "pattern"); detail != "" {return name, detail}- for _, key := range []string{"tool_names", "queries"} {- if values, ok := m[key].([]any); ok {- var names []string- for _, value := range values {- if text, ok := value.(string); ok && strings.TrimSpace(text) != "" {- names = append(names, strings.TrimSpace(text))- }- }- if len(names) > 0 {- return name, truncateRunes(strings.Join(names, ", "), 160)- }- }+ if names := assistantToolSearchNames(m); names != "" {+ return name, truncateRunes(names, 160)}}if strings.Contains(strings.ToLower(name), "command") || strings.EqualFold(name, "bash") || strings.EqualFold(name, "shell") || strings.EqualFold(name, "exec") {diff --git a/internal/httpapi/assistant_tool_display_split_test.go b/internal/httpapi/assistant_tool_display_split_test.gonew file mode 100644index 00000000..185d1604--- /dev/null+++ b/internal/httpapi/assistant_tool_display_split_test.go@@ -0,0 +1,62 @@+package httpapi++import (+ "encoding/json"+ "testing"+)++func TestAssistantWrappedToolParams(t *testing.T) {+ input := json.RawMessage(`{"toolName":"x"}`)+ cases := []struct {+ name string+ m map[string]any+ want string+ }{+ {"missing params falls back", map[string]any{"toolName": "x"}, `{"toolName":"x"}`},+ {"string params verbatim", map[string]any{"params": `{"a":1}`}, `{"a":1}`},+ {"object params re-encoded", map[string]any{"params": map[string]any{"b": "c"}}, `{"b":"c"}`},+ {"nil map falls back", nil, `{"toolName":"x"}`},+ }+ for _, tc := range cases {+ if got := string(assistantWrappedToolParams(input, tc.m)); got != tc.want {+ t.Errorf("%s: got %s, want %s", tc.name, got, tc.want)+ }+ }+}++func TestAssistantToolSearchNames(t *testing.T) {+ cases := []struct {+ name string+ m map[string]any+ want string+ }{+ {"tool_names trimmed and filtered", map[string]any{"tool_names": []any{" Read ", "", 3, "Edit"}}, "Read, Edit"},+ {"queries used when tool_names blank", map[string]any{"tool_names": []any{" "}, "queries": []any{"slack"}}, "slack"},+ {"tool_names preferred", map[string]any{"tool_names": []any{"A"}, "queries": []any{"B"}}, "A"},+ {"no lists", map[string]any{"other": "x"}, ""},+ {"nil map", nil, ""},+ }+ for _, tc := range cases {+ if got := assistantToolSearchNames(tc.m); got != tc.want {+ t.Errorf("%s: got %q, want %q", tc.name, got, tc.want)+ }+ }+}++func TestAssistantToolDisplayToolSearchAndWrapper(t *testing.T) {+ if title, detail := assistantToolDisplay("ToolSearch", json.RawMessage(`{"tool_names":["Read","Edit"]}`)); title != "ToolSearch" || detail != "Read, Edit" {+ t.Fatalf("ToolSearch names = %q %q", title, detail)+ }+ if title, detail := assistantToolDisplay("ToolSearch", json.RawMessage(`{"query":"q1","tool_names":["Read"]}`)); title != "ToolSearch" || detail != "q1" {+ t.Fatalf("ToolSearch query = %q %q", title, detail)+ }+ if title, detail := assistantToolDisplay("ToolSearch", json.RawMessage(`{}`)); title != "ToolSearch" || detail != "" {+ t.Fatalf("ToolSearch empty = %q %q", title, detail)+ }+ if title, detail := assistantToolDisplay("MCP", json.RawMessage(`{"toolName":"Bash","params":"{\"command\":\"ls -la\"}"}`)); title != "Bash" || detail != "ls -la" {+ t.Fatalf("MCP string params = %q %q", title, detail)+ }+ if title, detail := assistantToolDisplay("DeferExecuteTool", json.RawMessage(`{"toolName":"Bash","params":{"command":"pwd"}}`)); title != "Bash" || detail != "pwd" {+ t.Fatalf("DeferExecuteTool object params = %q %q", title, detail)+ }+}