wip

Author: 35C4n0r

lib/msgfmt/format_tool_call.go

@@ -7,7 +7,7 @@ import (
 func removeClaudeReportTaskToolCall(msg string) (string, []string) {
 	msg = "\n" + msg // This handles the case where the message starts with a tool call
 
-	// Remove all tool calls that start with `● coder - coder_report_task (MCP)` till we encounter the next line starting with ●
+	// Remove all tool calls that start with `● coder - coder_report_task (MCP)`
 	lines := strings.Split(msg, "\n")
 
 	toolCallStartIdx := -1

lib/msgfmt/msgfmt.go

@@ -254,14 +254,6 @@ func formatGenericMessage(message string, userInput string, agentType AgentType)
 	return message
 }
 
-//func formatClaudeMessage(message string, userInput string) string {
-//	message = RemoveUserInput(message, userInput, AgentTypeClaude)
-//	message = removeMessageBox(message)
-//	message = removeClaudeReportTaskToolCall(message)
-//	message = trimEmptyLines(message)
-//	return message
-//}
-
 func formatCodexMessage(message string, userInput string) string {
 	message = RemoveUserInput(message, userInput, AgentTypeCodex)
 	message = removeCodexInputBox(message)

lib/screentracker/conversation.go

@@ -44,9 +44,9 @@ type ConversationConfig struct {
 	SkipSendMessageStatusCheck bool
 	// ReadyForInitialPrompt detects whether the agent has initialized and is ready to accept the initial prompt
 	ReadyForInitialPrompt func(message string) bool
-	FormatToolCall        func(message string) (string, []string)
-	// Logger for logging tool calls and other events
-	Logger *slog.Logger
+	// FormatToolCall removes the coder report_task tool call from the agent message and also returns the array of removed tool calls
+	FormatToolCall func(message string) (string, []string)
+	Logger         *slog.Logger
 }
 
 type ConversationRole string
@@ -86,7 +86,7 @@ type Conversation struct {
 	InitialPromptSent bool
 	// ReadyForInitialPrompt keeps track if the agent is ready to accept the initial prompt
 	ReadyForInitialPrompt bool
-	//
+	// toolCallMessageSet keeps track of the tool calls that have been detected & logged in the current agent message
 	toolCallMessageSet map[string]bool
 }