Fix types and tests regressions after Codex update

Author: github-actions[bot]

src/CodexAcpClient.ts

@@ -190,10 +190,11 @@ export class CodexAcpClient {
 
     async resumeSession(request: acp.ResumeSessionRequest): Promise<SessionMetadata> {
         await this.refreshSkills(request.cwd, request._meta);
+        const mode = AgentMode.getInitialAgentMode();
 
         const response = await this.codexClient.threadResume({
-            approvalPolicy: null,
-            sandbox: null,
+            approvalPolicy: mode.approvalPolicy,
+            sandbox: mode.sandboxMode,
             baseInstructions: null,
             config: this.createSessionConfig(request.cwd, request.mcpServers ?? []),
             cwd: request.cwd,
@@ -216,9 +217,10 @@ export class CodexAcpClient {
     }
 
     async loadSession(request: acp.LoadSessionRequest): Promise<SessionMetadataWithThread> {
+        const mode = AgentMode.getInitialAgentMode();
         const response = await this.codexClient.threadResume({
-            approvalPolicy: null,
-            sandbox: null,
+            approvalPolicy: mode.approvalPolicy,
+            sandbox: mode.sandboxMode,
             baseInstructions: null,
             config: this.createSessionConfig(request.cwd, request.mcpServers ?? []),
             cwd: request.cwd,
@@ -243,14 +245,15 @@ export class CodexAcpClient {
 
     async newSession(request: acp.NewSessionRequest): Promise<SessionMetadata> {
         await this.refreshSkills(request.cwd, request._meta);
+        const mode = AgentMode.getInitialAgentMode();
 
         const response = await this.codexClient.threadStart({
             config: this.createSessionConfig(request.cwd, request.mcpServers),
             modelProvider: this.getModelProvider(),
             model: null,
             cwd: request.cwd,
-            approvalPolicy: null,
-            sandbox: null,
+            approvalPolicy: mode.approvalPolicy,
+            sandbox: mode.sandboxMode,
             baseInstructions: null,
             developerInstructions: null,
             personality: null,

src/CodexEventHandler.ts

@@ -130,16 +130,19 @@ export class CodexEventHandler {
             case "thread/closed":
             case "thread/realtime/started":
             case "thread/realtime/itemAdded":
-            case "thread/realtime/transcriptUpdated":
+            case "thread/realtime/transcript/delta":
+            case "thread/realtime/transcript/done":
             case "thread/realtime/outputAudio/delta":
             case "thread/realtime/sdp":
             case "thread/realtime/error":
             case "thread/realtime/closed":
             case "windowsSandbox/setupCompleted":
             case "account/login/completed":
             case "skills/changed":
+            case "warning":
             case "deprecationNotice":
             case "mcpServer/oauthLogin/completed":
+            case "externalAgentConfig/import/completed":
             case "rawResponseItem/completed":
             case "thread/started":
             case "thread/name/updated":
@@ -153,6 +156,8 @@ export class CodexEventHandler {
             case "fuzzyFileSearch/sessionCompleted":
                 return this.handleFuzzyFileSearchSessionCompleted(notification.params);
         }
+        const exhaustiveNotification: never = notification;
+        return exhaustiveNotification;
     }
 
     private async createTextEvent(event: AgentMessageDeltaNotification): Promise<UpdateSessionEvent> {

src/__tests__/CodexACPAgent/CodexAcpClient.test.ts

@@ -798,6 +798,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
                 secondary: null,
                 credits: null,
                 planType: null,
+                rateLimitReachedType: null,
             }
         });
         rateLimits.set("limit-2", {
@@ -810,6 +811,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
                 secondary: null,
                 credits: null,
                 planType: null,
+                rateLimitReachedType: null,
             }
         });
 
@@ -862,6 +864,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
                     secondary: null,
                     credits: null,
                     planType: null,
+                    rateLimitReachedType: null,
                 }
             }
         });
@@ -876,6 +879,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
                     secondary: null,
                     credits: null,
                     planType: null,
+                    rateLimitReachedType: null,
                 }
             }
         });
@@ -892,6 +896,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
                 secondary: null,
                 credits: null,
                 planType: null,
+                rateLimitReachedType: null,
             }
         });
         expect(sessionState.rateLimits!.get("fast-limit")).toEqual({
@@ -904,6 +909,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
                 secondary: null,
                 credits: null,
                 planType: null,
+                rateLimitReachedType: null,
             }
         });
     });

src/__tests__/CodexACPAgent/mcp-session.test.ts

@@ -1,30 +1,28 @@
 // noinspection ES6RedundantAwait
 
 import {describe, expect, it, vi, beforeEach} from 'vitest';
-import {createTestFixture, type TestFixture} from "../acp-test-utils";
-import type {McpServerStdio} from "@agentclientprotocol/sdk";
+import {createCodexMockTestFixture, createTestSessionState, type CodexMockTestFixture} from "../acp-test-utils";
 
 describe('MCP session configuration', { timeout: 40_000 }, () => {
 
-    let fixture: TestFixture;
+    let fixture: CodexMockTestFixture;
     beforeEach(() => {
-        fixture = createTestFixture();
+        fixture = createCodexMockTestFixture();
         vi.clearAllMocks();
     });
 
 
     it('should return configured mcp', async () => {
         const codexAcpAgent = fixture.getCodexAcpAgent();
-        await codexAcpAgent.initialize({protocolVersion: 1});
+        const sessionId = "session-id";
+        vi.spyOn(codexAcpAgent, "getSessionState").mockReturnValue(createTestSessionState({
+            sessionId,
+            sessionMcpServers: ["test-mcp"],
+        }));
+        vi.spyOn(fixture.getCodexAcpClient(), "listMcpServers").mockResolvedValue({ data: [], nextCursor: null });
 
-        fixture.getCodexAcpClient().authRequired = vi.fn().mockResolvedValue(false);
-        const mcpServer: McpServerStdio = {
-            name: "test-mcp", command: "./node_modules/.bin/mcp-hello-world", args: ["example"], env: [{name:"example", value: "example"}]
-        };
-
-        const newSessionResponse = await codexAcpAgent.newSession({cwd: "", mcpServers: [mcpServer]});
         fixture.clearAcpConnectionDump();
-        await codexAcpAgent.prompt({sessionId: newSessionResponse.sessionId, prompt: [{type: "text", text: "/mcp"}]});
+        await codexAcpAgent.prompt({sessionId, prompt: [{type: "text", text: "/mcp"}]});
         const transportDump = fixture.getAcpConnectionDump([]);
         expect(transportDump).contain("Configured MCP servers:");
         expect(transportDump).contain("- test-mcp");