LLM-26222 [Codex] Show input params, result of running mcp tools

NikolaiSviridov · NikolaiSviridov · commit d2b90ed44822 · 2026-04-08T15:24:27.000+02:00
diff --git a/src/CodexAcpServer.ts b/src/CodexAcpServer.ts
@@ -41,6 +41,7 @@ export interface SessionState {
     account: Account | null;
     cwd: string;
     sessionMcpServers?: Array<string>;
+    mcpToolLogs: Map<string, Array<string>>;
 }
 
 export class CodexAcpServer implements acp.Agent {
@@ -156,6 +157,7 @@ export class CodexAcpServer implements acp.Agent {
             account: accountResponse.account,
             cwd: request.cwd,
             sessionMcpServers: sessionMcpServers,
+            mcpToolLogs: new Map(),
         }
         this.sessions.set(sessionId, sessionState);
 
@@ -356,6 +358,7 @@ export class CodexAcpServer implements acp.Agent {
             account: accountResponse.account,
             cwd: request.cwd,
             sessionMcpServers: sessionMcpServers,
+            mcpToolLogs: new Map(),
         };
         this.sessions.set(sessionId, sessionState);
 
diff --git a/src/CodexEventHandler.ts b/src/CodexEventHandler.ts
@@ -25,6 +25,8 @@ import {
     createCommandExecutionUpdate,
     createDynamicToolCallUpdate,
     createFileChangeUpdate,
+    createMcpRawInput,
+    createMcpRawOutput,
     createFuzzyFileSearchComplete,
     createFuzzyFileSearchStartOrUpdate,
     createMcpToolCallUpdate,
@@ -101,12 +103,13 @@ export class CodexEventHandler {
             case "turn/diff/updated":
             case "item/commandExecution/terminalInteraction":
             case "item/fileChange/outputDelta":
-            case "item/mcpToolCall/progress":
             case "serverRequest/resolved":
             case "account/updated":
             case "fs/changed":
             case "mcpServer/startupStatus/updated":
                 return null;
+            case "item/mcpToolCall/progress":
+                return this.createMcpToolProgressEvent(notification.params);
             case "account/rateLimits/updated":
                 this.handleRateLimitsUpdated(notification.params);
                 return null;
@@ -213,10 +216,19 @@ export class CodexEventHandler {
             case "mcpToolCall":
             case "fileChange":
             case "dynamicToolCall":
+                const mcpLogs = event.item.type === "mcpToolCall"
+                    ? this.consumeMcpToolLogs(event.item.id)
+                    : [];
                 return {
                     sessionUpdate: "tool_call_update",
                     toolCallId: event.item.id,
-                    status: event.item.status === "completed" ? "completed" : "failed"
+                    status: event.item.status === "completed" ? "completed" : "failed",
+                    rawInput: event.item.type === "mcpToolCall"
+                        ? createMcpRawInput(event.item.server, event.item.tool, event.item.arguments)
+                        : undefined,
+                    rawOutput: event.item.type === "mcpToolCall"
+                        ? createMcpRawOutput(mcpLogs, event.item.result, event.item.error)
+                        : undefined,
                 }
             case "commandExecution":
                 return this.completeCommandExecutionEvent(event.item);
@@ -258,6 +270,37 @@ export class CodexEventHandler {
         }
     }
 
+    private createMcpToolProgressEvent(event: { itemId: string, message: string }): UpdateSessionEvent {
+        const logs = this.appendMcpToolLog(event.itemId, event.message);
+        return {
+            sessionUpdate: "tool_call_update",
+            toolCallId: event.itemId,
+            rawOutput: {
+                formatted_output: logs.join("\n\n"),
+            }
+        };
+    }
+
+    private appendMcpToolLog(toolCallId: string, message: string): Array<string> {
+        const cleaned = message.trim();
+        if (cleaned.length === 0) {
+            return this.sessionState.mcpToolLogs.get(toolCallId) ?? [];
+        }
+
+        const logs = this.sessionState.mcpToolLogs.get(toolCallId) ?? [];
+        if (logs.at(-1) !== cleaned && !logs.includes(cleaned)) {
+            logs.push(cleaned);
+        }
+        this.sessionState.mcpToolLogs.set(toolCallId, logs);
+        return logs;
+    }
+
+    private consumeMcpToolLogs(toolCallId: string): Array<string> {
+        const logs = this.sessionState.mcpToolLogs.get(toolCallId) ?? [];
+        this.sessionState.mcpToolLogs.delete(toolCallId);
+        return logs;
+    }
+
     private completeCommandExecutionEvent(item: ThreadItem & { "type": "commandExecution" }): UpdateSessionEvent {
         return {
             sessionUpdate: "tool_call_update",
diff --git a/src/CodexToolCallMapper.ts b/src/CodexToolCallMapper.ts
@@ -13,6 +13,8 @@ import type {
     CommandExecutionStatus,
     DynamicToolCallStatus,
     FileUpdateChange,
+    McpToolCallError,
+    McpToolCallResult,
     McpToolCallStatus,
     PatchApplyStatus,
     ThreadItem,
@@ -84,7 +86,12 @@ export async function createCommandExecutionUpdate(
 export async function createMcpToolCallUpdate(
     item: ThreadItem & { type: "mcpToolCall" }
 ): Promise<UpdateSessionEvent> {
-    return createExecuteToolCallUpdate(item, `mcp.${item.server}.${item.tool}`);
+    return createExecuteToolCallUpdate(
+        item,
+        `mcp.${item.server}.${item.tool}`,
+        createMcpRawInput(item.server, item.tool, item.arguments),
+        createMcpRawOutput([], item.result, item.error),
+    );
 }
 
 export async function createDynamicToolCallUpdate(
@@ -96,7 +103,8 @@ export async function createDynamicToolCallUpdate(
 export async function createExecuteToolCallUpdate(
     item: ThreadItem & ({ type: "mcpToolCall" } | { type: "dynamicToolCall" }),
     title: string,
-    rawInput?: { arguments: JsonValue }
+    rawInput?: Record<string, JsonValue | string>,
+    rawOutput?: Record<string, JsonValue | string | null>,
 ): Promise<UpdateSessionEvent> {
     return {
         sessionUpdate: "tool_call",
@@ -105,9 +113,88 @@ export async function createExecuteToolCallUpdate(
         title: title,
         status: toAcpStatus(item.status),
         rawInput: rawInput,
+        rawOutput: rawOutput,
     };
 }
 
+export function createMcpRawInput(server: string, tool: string, argumentsValue: JsonValue): Record<string, JsonValue | string> {
+    const invocation = `Called ${server}.${tool} (${formatJsonInline(argumentsValue)})`;
+    return {
+        server,
+        tool,
+        arguments: argumentsValue,
+        invocation,
+        prettyArguments: formatJsonPretty(argumentsValue),
+    };
+}
+
+export function createMcpRawOutput(
+    logs: Array<string>,
+    result: McpToolCallResult | null,
+    error: McpToolCallError | null,
+): Record<string, JsonValue | string | null> | undefined {
+    const logLines = normalizeMcpLogLines(logs, error, result);
+    if (logLines.length === 0) {
+        return undefined;
+    }
+
+    return {
+        formatted_output: logLines.join("\n\n"),
+        result,
+        error,
+    };
+}
+
+function formatMcpResult(result: McpToolCallResult | null): string | null {
+    if (!result) {
+        return null;
+    }
+
+    const parts: string[] = [];
+    if (result.content.length > 0) {
+        parts.push(result.content.map((contentItem) => formatJsonPretty(contentItem)).join("\n"));
+    }
+    if (result.structuredContent !== null) {
+        parts.push(formatJsonPretty(result.structuredContent));
+    }
+
+    return parts.length > 0 ? parts.join("\n\n") : null;
+}
+
+function normalizeMcpLogLines(
+    logs: Array<string>,
+    error: McpToolCallError | null,
+    result: McpToolCallResult | null,
+): Array<string> {
+    const lines: string[] = [];
+    const seen = new Set<string>();
+
+    const append = (value: string | null | undefined) => {
+        const cleaned = value?.trim();
+        if (!cleaned || seen.has(cleaned)) {
+            return;
+        }
+        seen.add(cleaned);
+        lines.push(cleaned);
+    };
+
+    for (const log of logs) {
+        append(log);
+    }
+    append(error?.message);
+    append(formatMcpResult(result));
+
+    return lines;
+}
+
+function formatJsonInline(value: JsonValue): string {
+    return JSON.stringify(value);
+}
+
+function formatJsonPretty(value: JsonValue): string {
+    return JSON.stringify(value, null, 2);
+}
+
 export function fuzzyFileSearchToolCallId(sessionId: string): string {
     return `fuzzyFileSearch.${sessionId}`;
 }
diff --git a/src/__tests__/CodexACPAgent/command-action-events.test.ts b/src/__tests__/CodexACPAgent/command-action-events.test.ts
@@ -260,6 +260,64 @@ describe('CodexEventHandler - command action events', () => {
         );
     });
 
+    it('should include mcp progress and final logs', async () => {
+        const notifications: ServerNotification[] = [
+            {
+                method: 'item/started',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    item: {
+                        type: "mcpToolCall",
+                        id: "call-id",
+                        server: "ijproxy",
+                        tool: "read_file",
+                        status: "inProgress",
+                        arguments: { file_path: ".ai/local.md", mode: "slice", start_line: 1, max_lines: 200 },
+                        result: null,
+                        error: null,
+                        durationMs: null,
+                    },
+                },
+            },
+            {
+                method: 'item/mcpToolCall/progress',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    itemId: 'call-id',
+                    message: "File /Users/aleksandr.slapoguzov/Projects/ultimate/.ai/local.md doesn't exist or can't be opened",
+                },
+            },
+            {
+                method: 'item/completed',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    item: {
+                        type: "mcpToolCall",
+                        id: "call-id",
+                        server: "ijproxy",
+                        tool: "read_file",
+                        status: "failed",
+                        arguments: { file_path: ".ai/local.md", mode: "slice", start_line: 1, max_lines: 200 },
+                        result: null,
+                        error: {
+                            message: "File /Users/aleksandr.slapoguzov/Projects/ultimate/.ai/local.md doesn't exist or can't be opened",
+                        },
+                        durationMs: 15,
+                    },
+                },
+            },
+        ];
+
+        await setupPromptAndSendNotifications(mockFixture, sessionId, sessionState, notifications);
+
+        await expect(mockFixture.getAcpConnectionDump([])).toMatchFileSnapshot(
+            'data/mcp-tool-completed-with-logs.json'
+        );
+    });
+
     it('should handle dynamic tools', async () => {
         const dynamicToolNotification: ServerNotification = {
             method: 'item/started',
diff --git a/src/__tests__/CodexACPAgent/data/load-session-history.json b/src/__tests__/CodexACPAgent/data/load-session-history.json
@@ -158,7 +158,14 @@
         "toolCallId": "item-mcp-1",
         "kind": "execute",
         "title": "mcp.github.search",
-        "status": "completed"
+        "status": "completed",
+        "rawInput": {
+          "server": "github",
+          "tool": "search",
+          "arguments": {},
+          "invocation": "Called github.search ({})",
+          "prettyArguments": "{}"
+        }
       }
     }
   ]
diff --git a/src/__tests__/CodexACPAgent/data/mcp-tool-completed-with-logs.json b/src/__tests__/CodexACPAgent/data/mcp-tool-completed-with-logs.json
@@ -0,0 +1,76 @@
+{
+  "method": "sessionUpdate",
+  "args": [
+    {
+      "sessionId": "test-session-id",
+      "update": {
+        "sessionUpdate": "tool_call_update",
+        "toolCallId": "call-id",
+        "_meta": {
+          "mcp_output_delta": {
+            "data": "File /Users/aleksandr.slapoguzov/Projects/ultimate/.ai/local.md doesn't exist or can't be opened"
+          }
+        }
+      }
+    }
+  ]
+}
+{
+  "method": "sessionUpdate",
+  "args": [
+    {
+      "sessionId": "test-session-id",
+      "update": {
+        "sessionUpdate": "tool_call_update",
+        "toolCallId": "call-id",
+        "status": "failed",
+        "rawInput": {
+          "server": "ijproxy",
+          "tool": "read_file",
+          "arguments": {
+            "file_path": ".ai/local.md",
+            "mode": "slice",
+            "start_line": 1,
+            "max_lines": 200
+          },
+          "invocation": "Called ijproxy.read_file ({\"file_path\":\".ai/local.md\",\"mode\":\"slice\",\"start_line\":1,\"max_lines\":200})",
+          "prettyArguments": "{\n  \"file_path\": \".ai/local.md\",\n  \"mode\": \"slice\",\n  \"start_line\": 1,\n  \"max_lines\": 200\n}"
+        },
+        "rawOutput": {
+          "formatted_output": "File /Users/aleksandr.slapoguzov/Projects/ultimate/.ai/local.md doesn't exist or can't be opened",
+          "result": null,
+          "error": {
+            "message": "File /Users/aleksandr.slapoguzov/Projects/ultimate/.ai/local.md doesn't exist or can't be opened"
+          }
+        }
+      }
+    }
+  ]
+}
+{
+  "method": "sessionUpdate",
+  "args": [
+    {
+      "sessionId": "test-session-id",
+      "update": {
+        "sessionUpdate": "tool_call",
+        "toolCallId": "call-id",
+        "kind": "execute",
+        "title": "mcp.ijproxy.read_file",
+        "status": "in_progress",
+        "rawInput": {
+          "server": "ijproxy",
+          "tool": "read_file",
+          "arguments": {
+            "file_path": ".ai/local.md",
+            "mode": "slice",
+            "start_line": 1,
+            "max_lines": 200
+          },
+          "invocation": "Called ijproxy.read_file ({\"file_path\":\".ai/local.md\",\"mode\":\"slice\",\"start_line\":1,\"max_lines\":200})",
+          "prettyArguments": "{\n  \"file_path\": \".ai/local.md\",\n  \"mode\": \"slice\",\n  \"start_line\": 1,\n  \"max_lines\": 200\n}"
+        }
+      }
+    }
+  ]
+}
diff --git a/src/__tests__/CodexACPAgent/data/mcp-tool-in-progress.json b/src/__tests__/CodexACPAgent/data/mcp-tool-in-progress.json
diff --git a/src/__tests__/acp-test-utils.ts b/src/__tests__/acp-test-utils.ts

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,14 @@`
`158`	`158`	`"toolCallId": "item-mcp-1",`
`159`	`159`	`"kind": "execute",`
`160`	`160`	`"title": "mcp.github.search",`
`161`		`- "status": "completed"`
	`161`	`+ "status": "completed",`
	`162`	`+ "rawInput": {`
	`163`	`+ "server": "github",`
	`164`	`+ "tool": "search",`
	`165`	`+ "arguments": {},`
	`166`	`+ "invocation": "Called github.search ({})",`
	`167`	`+ "prettyArguments": "{}"`
	`168`	`+ }`
`162`	`169`	`}`
`163`	`170`	`}`
`164`	`171`	`]`