review fix

Author: NikolaiSviridov

src/CodexEventHandler.ts

@@ -271,28 +271,28 @@ export class CodexEventHandler {
     }
 
     private createMcpToolProgressEvent(event: { itemId: string, message: string }): UpdateSessionEvent {
-        const logs = this.appendMcpToolLog(event.itemId, event.message);
+        const logDelta = this.appendMcpToolLog(event.itemId, event.message);
         return {
             sessionUpdate: "tool_call_update",
             toolCallId: event.itemId,
-            rawOutput: {
-                formatted_output: logs.join("\n\n"),
+            _meta: {
+                mcp_output_delta: {
+                    data: logDelta,
+                }
             }
         };
     }
 
-    private appendMcpToolLog(toolCallId: string, message: string): Array<string> {
+    private appendMcpToolLog(toolCallId: string, message: string): string {
         const cleaned = message.trim();
         if (cleaned.length === 0) {
-            return this.sessionState.mcpToolLogs.get(toolCallId) ?? [];
+            return "";
         }
 
         const logs = this.sessionState.mcpToolLogs.get(toolCallId) ?? [];
-        if (logs.at(-1) !== cleaned && !logs.includes(cleaned)) {
-            logs.push(cleaned);
-        }
+        logs.push(cleaned);
         this.sessionState.mcpToolLogs.set(toolCallId, logs);
-        return logs;
+        return cleaned;
     }
 
     private consumeMcpToolLogs(toolCallId: string): Array<string> {

src/CodexToolCallMapper.ts

@@ -166,23 +166,20 @@ function normalizeMcpLogLines(
     error: McpToolCallError | null,
     result: McpToolCallResult | null,
 ): Array<string> {
-    const lines: string[] = [];
-    const seen = new Set<string>();
+    const lines = logs
+        .map((log) => log.trim())
+        .filter((log) => log.length > 0);
 
-    const append = (value: string | null | undefined) => {
+    const appendTrailingUnique = (value: string | null | undefined) => {
         const cleaned = value?.trim();
-        if (!cleaned || seen.has(cleaned)) {
+        if (!cleaned || lines.at(-1) === cleaned) {
             return;
         }
-        seen.add(cleaned);
         lines.push(cleaned);
     };
 
-    for (const log of logs) {
-        append(log);
-    }
-    append(error?.message);
-    append(formatMcpResult(result));
+    appendTrailingUnique(error?.message);
+    appendTrailingUnique(formatMcpResult(result));
 
     return lines;
 }

src/__tests__/CodexACPAgent/command-action-events.test.ts

@@ -318,6 +318,74 @@ describe('CodexEventHandler - command action events', () => {
         );
     });
 
+    it('should preserve repeated mcp progress messages in final output', async () => {
+        const repeatedMessage = 'Polling for status';
+        const notifications: ServerNotification[] = [
+            {
+                method: 'item/started',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    item: {
+                        type: "mcpToolCall",
+                        id: "call-id",
+                        server: "server-name",
+                        tool: "tool-name",
+                        status: "inProgress",
+                        arguments: { argument: "example" },
+                        result: null,
+                        error: null,
+                        durationMs: null,
+                    },
+                },
+            },
+            {
+                method: 'item/mcpToolCall/progress',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    itemId: 'call-id',
+                    message: repeatedMessage,
+                },
+            },
+            {
+                method: 'item/mcpToolCall/progress',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    itemId: 'call-id',
+                    message: repeatedMessage,
+                },
+            },
+            {
+                method: 'item/completed',
+                params: {
+                    threadId: 'thread-1',
+                    turnId: 'turn-1',
+                    item: {
+                        type: "mcpToolCall",
+                        id: "call-id",
+                        server: "server-name",
+                        tool: "tool-name",
+                        status: "failed",
+                        arguments: { argument: "example" },
+                        result: null,
+                        error: {
+                            message: repeatedMessage,
+                        },
+                        durationMs: 15,
+                    },
+                },
+            },
+        ];
+
+        await setupPromptAndSendNotifications(mockFixture, sessionId, sessionState, notifications);
+
+        await expect(mockFixture.getAcpConnectionDump([])).toMatchFileSnapshot(
+            'data/mcp-tool-repeated-progress.json'
+        );
+    });
+
     it('should handle dynamic tools', async () => {
         const dynamicToolNotification: ServerNotification = {
             method: 'item/started',