git.iko.soy/crush
on main help sign in
Handle unknown tool calls in the TUI (#2001)
c5f0e4dKujtim Hoxha
internal/ui/chat/generic.gonew file+98
compare with main
unifiedsplit
@@ -0,0 +1,98 @@
1+package chat
2+
3+import (
4+ "encoding/json"
5+ "strings"
6+
7+ "github.com/charmbracelet/crush/internal/message"
8+ "github.com/charmbracelet/crush/internal/stringext"
9+ "github.com/charmbracelet/crush/internal/ui/styles"
10+)
11+
12+// GenericToolMessageItem is a message item that represents an unknown tool call.
13+type GenericToolMessageItem struct {
14+ *baseToolMessageItem
15+}
16+
17+var _ ToolMessageItem = (*GenericToolMessageItem)(nil)
18+
19+// NewGenericToolMessageItem creates a new [GenericToolMessageItem].
20+func NewGenericToolMessageItem(
21+ sty *styles.Styles,
22+ toolCall message.ToolCall,
23+ result *message.ToolResult,
24+ canceled bool,
25+) ToolMessageItem {
26+ return newBaseToolMessageItem(sty, toolCall, result, &GenericToolRenderContext{}, canceled)
27+}
28+
29+// GenericToolRenderContext renders unknown/generic tool messages.
30+type GenericToolRenderContext struct{}
31+
32+// RenderTool implements the [ToolRenderer] interface.
33+func (g *GenericToolRenderContext) RenderTool(sty *styles.Styles, width int, opts *ToolRenderOpts) string {
34+ cappedWidth := cappedMessageWidth(width)
35+ name := genericPrettyName(opts.ToolCall.Name)
36+
37+ if opts.IsPending() {
38+ return pendingTool(sty, name, opts.Anim)
39+ }
40+
41+ var params map[string]any
42+ if err := json.Unmarshal([]byte(opts.ToolCall.Input), &params); err != nil {
43+ return toolErrorContent(sty, &message.ToolResult{Content: "Invalid parameters"}, cappedWidth)
44+ }
45+
46+ var toolParams []string
47+ if len(params) > 0 {
48+ parsed, _ := json.Marshal(params)
49+ toolParams = append(toolParams, string(parsed))
50+ }
51+
52+ header := toolHeader(sty, opts.Status, name, cappedWidth, opts.Compact, toolParams...)
53+ if opts.Compact {
54+ return header
55+ }
56+
57+ if earlyState, ok := toolEarlyStateContent(sty, opts, cappedWidth); ok {
58+ return joinToolParts(header, earlyState)
59+ }
60+
61+ if !opts.HasResult() || opts.Result.Content == "" {
62+ return header
63+ }
64+
65+ bodyWidth := cappedWidth - toolBodyLeftPaddingTotal
66+
67+ // Handle image data.
68+ if opts.Result.Data != "" && strings.HasPrefix(opts.Result.MIMEType, "image/") {
69+ body := sty.Tool.Body.Render(toolOutputImageContent(sty, opts.Result.Data, opts.Result.MIMEType))
70+ return joinToolParts(header, body)
71+ }
72+
73+ // Try to parse result as JSON for pretty display.
74+ var result json.RawMessage
75+ var body string
76+ if err := json.Unmarshal([]byte(opts.Result.Content), &result); err == nil {
77+ prettyResult, err := json.MarshalIndent(result, "", " ")
78+ if err == nil {
79+ body = sty.Tool.Body.Render(toolOutputCodeContent(sty, "result.json", string(prettyResult), 0, bodyWidth, opts.ExpandedContent))
80+ } else {
81+ body = sty.Tool.Body.Render(toolOutputPlainContent(sty, opts.Result.Content, bodyWidth, opts.ExpandedContent))
82+ }
83+ } else if looksLikeMarkdown(opts.Result.Content) {
84+ body = sty.Tool.Body.Render(toolOutputCodeContent(sty, "result.md", opts.Result.Content, 0, bodyWidth, opts.ExpandedContent))
85+ } else {
86+ body = sty.Tool.Body.Render(toolOutputPlainContent(sty, opts.Result.Content, bodyWidth, opts.ExpandedContent))
87+ }
88+
89+ return joinToolParts(header, body)
90+}
91+
92+// genericPrettyName converts a snake_case or kebab-case tool name to a
93+// human-readable title case name.
94+func genericPrettyName(name string) string {
95+ name = strings.ReplaceAll(name, "_", " ")
96+ name = strings.ReplaceAll(name, "-", " ")
97+ return stringext.Capitalize(name)
98+}
internal/ui/chat/tools.go+2−9
@@ -255,14 +255,7 @@ func NewToolMessageItem(
255 if strings.HasPrefix(toolCall.Name, "mcp_") {
255 if strings.HasPrefix(toolCall.Name, "mcp_") {
256 item = NewMCPToolMessageItem(sty, toolCall, result, canceled)
256 item = NewMCPToolMessageItem(sty, toolCall, result, canceled)
257 } else {
257 } else {
258− // TODO: Implement other tool items
258+ item = NewGenericToolMessageItem(sty, toolCall, result, canceled)
259− item = newBaseToolMessageItem(
260− sty,
261− toolCall,
262− result,
263− &DefaultToolRenderContext{},
264− canceled,
265− )
266 }
259 }
267 }
260 }
268 item.SetMessageID(messageID)
261 item.SetMessageID(messageID)
@@ -1399,6 +1392,6 @@ func prettifyToolName(name string) string {
1399 case tools.WriteToolName:
1392 case tools.WriteToolName:
1400 return "Write"
1393 return "Write"
1401 default:
1394 default:
1402− return name
1395+ return genericPrettyName(name)
1403 }
1396 }
1404}
1397}
internal/ui/model/ui.go−5
@@ -1124,11 +1124,6 @@ func (m *UI) handleDialogMsg(msg tea.Msg) tea.Cmd {
1124 cmds = append(cmds, m.toggleCompactMode())
1124 cmds = append(cmds, m.toggleCompactMode())
1125 m.dialog.CloseDialog(dialog.CommandsID)
1125 m.dialog.CloseDialog(dialog.CommandsID)
1126 case dialog.ActionToggleThinking:
1126 case dialog.ActionToggleThinking:
1127− if m.isAgentBusy() {
1128− cmds = append(cmds, uiutil.ReportWarn("Agent is busy, please wait..."))
1129− break
1130− }
1131−
1132 cmds = append(cmds, func() tea.Msg {
1127 cmds = append(cmds, func() tea.Msg {
1133 cfg := m.com.Config()
1128 cfg := m.com.Config()
1134 if cfg == nil {
1129 if cfg == nil {