fix: suppress exceptions caused by broken unified diffs from codex

Author: AlexandrSuhinin

src/CodexToolCallMapper.ts

@@ -20,6 +20,7 @@ import type {
     ThreadItem,
 } from "./app-server/v2";
 import type { JsonValue } from "./app-server/serde_json/JsonValue";
+import {logger} from "./Logger";
 
 type CodexItemStatus = CommandExecutionStatus | PatchApplyStatus | McpToolCallStatus | DynamicToolCallStatus;
 type AcpToolCallStatus = "pending" | "in_progress" | "completed" | "failed";
@@ -257,13 +258,18 @@ function createSearchTitle(query: string | null, path: string | null): string {
 }
 
 async function createPatchContent(change: FileUpdateChange): Promise<ToolCallContent | null> {
-    switch (change.kind.type) {
-        case "add":
-            return await createAddFileContent(change);
-        case "delete":
-            return await createDeleteFileContent(change);
-        case "update":
-            return await createUpdateFileContent(change);
+    try {
+        switch (change.kind.type) {
+            case "add":
+                return await createAddFileContent(change);
+            case "delete":
+                return await createDeleteFileContent(change);
+            case "update":
+                return await createUpdateFileContent(change);
+        }
+    } catch (error) {
+        logger.log(`Error processing file update change: ${error}`);
+        return null;
     }
 }
 

src/__tests__/CodexACPAgent/file-change-events.test.ts

@@ -1,6 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import type { SessionState } from '../../CodexAcpServer';
 import type { ServerNotification } from '../../app-server';
+import { createFileChangeUpdate } from '../../CodexToolCallMapper';
+import type { ThreadItem } from '../../app-server/v2';
 import { createCodexMockTestFixture, createTestSessionState, setupPromptAndSendNotifications, type CodexMockTestFixture } from '../acp-test-utils';
 import {AgentMode} from "../../AgentMode";
 
@@ -271,4 +273,29 @@ describe('CodexEventHandler - file change events', () => {
             'data/file-change-delete-raw-content.json'
         );
     });
+
+    it('should ignore broken unified diffs in file changes', async () => {
+        const fileChange: ThreadItem = {
+            type: 'fileChange',
+            id: 'file-change-broken-diff',
+            changes: [
+                {
+                    path: '/test/project/BrokenFile.kt',
+                    kind: { type: 'add' },
+                    diff:
+`--- /dev/null
++++ /test/project/BrokenFile.kt
+@@ broken @@
++class BrokenFile
+`,
+                },
+            ],
+            status: 'completed',
+        };
+
+        const updateEvent = await createFileChangeUpdate(fileChange);
+        expect(updateEvent).toMatchObject({
+            content: [],
+        });
+    });
 });