Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/httpapi/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func NewServer(ctx context.Context, config ServerConfig) (*Server, error) {
humaConfig.Info.Description = "HTTP API for Claude Code, Goose, and Aider.\n\nhttps://github.com/coder/agentapi"
api := humachi.New(router, humaConfig)
formatMessage := func(message string, userInput string) string {
return mf.FormatAgentMessage(config.AgentType, message, userInput, logger)
return mf.FormatAgentMessage(config.AgentType, message, userInput)
}

isAgentReadyForInitialPrompt := func(message string) bool {
Expand Down
7 changes: 1 addition & 6 deletions lib/msgfmt/message_box.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package msgfmt

import (
"log/slog"
"strings"
)

Expand Down Expand Up @@ -102,7 +101,7 @@ func removeAmpMessageBox(msg string) string {
return formattedMsg
}

func removeClaudeReportTaskToolCall(msg string, logger *slog.Logger) string {
func removeClaudeReportTaskToolCall(msg string) string {
// Remove all tool calls that start with `● coder - coder_report_task (MCP)` till we encounter the next line starting with ●
lines := strings.Split(msg, "\n")

Expand Down Expand Up @@ -146,10 +145,6 @@ func removeClaudeReportTaskToolCall(msg string, logger *slog.Logger) string {
idxPair := toolCallIdxs[i]
start, end := idxPair[0], idxPair[1]

// Capture the tool call content before removing it
toolCallContent := strings.Join(lines[start:end], "\n")
logger.Info("Removing tool call", "content", toolCallContent)

lines = append(lines[:start], lines[end:]...)
}

Expand Down
9 changes: 4 additions & 5 deletions lib/msgfmt/msgfmt.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package msgfmt

import (
"log/slog"
"strings"
)

Expand Down Expand Up @@ -255,10 +254,10 @@ func formatGenericMessage(message string, userInput string, agentType AgentType)
return message
}

func formatClaudeMessage(message string, userInput string, logger *slog.Logger) string {
func formatClaudeMessage(message string, userInput string) string {
message = RemoveUserInput(message, userInput, AgentTypeClaude)
message = removeMessageBox(message)
message = removeClaudeReportTaskToolCall(message, logger)
message = removeClaudeReportTaskToolCall(message)
message = trimEmptyLines(message)
return message
}
Expand All @@ -284,10 +283,10 @@ func formatAmpMessage(message string, userInput string) string {
return message
}

func FormatAgentMessage(agentType AgentType, message string, userInput string, logger *slog.Logger) string {
func FormatAgentMessage(agentType AgentType, message string, userInput string) string {
switch agentType {
case AgentTypeClaude:
return formatClaudeMessage(message, userInput, logger)
return formatClaudeMessage(message, userInput)
case AgentTypeGoose:
return formatGenericMessage(message, userInput, agentType)
case AgentTypeAider:
Expand Down
3 changes: 1 addition & 2 deletions lib/msgfmt/msgfmt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package msgfmt

import (
"embed"
"log/slog"
"path"
"strings"
"testing"
Expand Down Expand Up @@ -234,7 +233,7 @@ func TestFormatAgentMessage(t *testing.T) {
assert.NoError(t, err)
expected, err := testdataDir.ReadFile(path.Join(dir, string(agentType), c.Name(), "expected.txt"))
assert.NoError(t, err)
assert.Equal(t, string(expected), FormatAgentMessage(agentType, string(msg), string(userInput), slog.Default()))
assert.Equal(t, string(expected), FormatAgentMessage(agentType, string(msg), string(userInput)))
})
}
})
Expand Down