factory-factory 0.4.6 → 0.4.7

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.notification-ordering.test.js

@@ -0,0 +1,265 @@
+import { describe, expect, it, vi } from 'vitest';
+import { CodexAppServerAcpAdapter } from './codex-app-server-acp-adapter.js';
+function createMockConnection() {
+    return {
+        closed: new Promise(() => undefined),
+        sessionUpdate: vi.fn(async () => undefined),
+        extNotification: vi.fn(async () => undefined),
+        requestPermission: vi.fn(() => Promise.resolve({
+            outcome: { outcome: 'selected', optionId: 'allow_once' },
+        })),
+    };
+}
+function createMockCodexClient() {
+    const request = vi.fn();
+    const client = {
+        start: vi.fn(),
+        stop: vi.fn(async () => undefined),
+        request,
+        notify: vi.fn(),
+        respondSuccess: vi.fn(),
+        respondError: vi.fn(),
+    };
+    return { client, request };
+}
+async function initializeAdapter(adapter, request) {
+    request.mockResolvedValueOnce({});
+    request.mockResolvedValueOnce({
+        requirements: {
+            allowedApprovalPolicies: ['on-failure'],
+            allowedSandboxModes: ['workspace-write'],
+        },
+    });
+    request.mockResolvedValueOnce({
+        data: [
+            { name: 'Default', mode: 'default' },
+            { name: 'Plan', mode: 'plan' },
+        ],
+        nextCursor: null,
+    });
+    request.mockResolvedValueOnce({
+        data: [
+            {
+                id: 'gpt-5',
+                displayName: 'GPT-5',
+                description: 'Default model',
+                defaultReasoningEffort: 'medium',
+                supportedReasoningEfforts: [],
+                inputModalities: ['text'],
+                isDefault: true,
+            },
+        ],
+        nextCursor: null,
+    });
+    await adapter.initialize({
+        protocolVersion: 1,
+        clientCapabilities: {},
+        clientInfo: { name: 'test-client', version: '0.0.1' },
+    });
+}
+describe('CodexAppServerAcpAdapter notification ordering', () => {
+    it('keeps a replayed session when the optional task-status refresh fails', async () => {
+        const connection = createMockConnection();
+        const { client, request } = createMockCodexClient();
+        const shapeDriftWarn = vi.fn();
+        const adapter = new CodexAppServerAcpAdapter(connection, client, {
+            shapeDriftWarn,
+        });
+        await initializeAdapter(adapter, request);
+        request.mockResolvedValueOnce({
+            thread: { id: 'thread_optional_goal', cwd: '/tmp/workspace' },
+            approvalPolicy: 'on-failure',
+            reasoningEffort: 'medium',
+        });
+        request.mockResolvedValueOnce({ thread: { id: 'thread_optional_goal', turns: [] } });
+        const internalAdapter = adapter;
+        vi.spyOn(internalAdapter.streamEventHandler, 'refreshTaskStatus').mockRejectedValueOnce(new Error('goal refresh failed'));
+        await expect(adapter.loadSession({
+            sessionId: 'sess_thread_optional_goal',
+            cwd: '/tmp/workspace',
+            mcpServers: [],
+        })).resolves.toMatchObject({ configOptions: expect.any(Array) });
+        expect(shapeDriftWarn).toHaveBeenCalledWith('Codex app-server shape drift detected', expect.objectContaining({ event: 'thread_goal_refresh_failed' }));
+    });
+    it('preserves Codex notification order across asynchronous ACP updates', async () => {
+        const connection = createMockConnection();
+        const { client, request } = createMockCodexClient();
+        const adapter = new CodexAppServerAcpAdapter(connection, client);
+        await initializeAdapter(adapter, request);
+        request.mockResolvedValueOnce({
+            thread: { id: 'thread_notification_order', cwd: '/tmp/workspace' },
+            approvalPolicy: 'on-failure',
+            reasoningEffort: 'medium',
+        });
+        await adapter.newSession({ cwd: '/tmp/workspace', mcpServers: [] });
+        const sessionUpdate = connection.sessionUpdate;
+        sessionUpdate.mockClear();
+        let releaseFirstUpdate = () => undefined;
+        const firstUpdateBlocked = new Promise((resolve) => {
+            releaseFirstUpdate = resolve;
+        });
+        sessionUpdate
+            .mockImplementationOnce(async () => await firstUpdateBlocked)
+            .mockResolvedValue(undefined);
+        const handleCodexNotification = adapter.handleCodexNotification.bind(adapter);
+        const item = {
+            type: 'commandExecution',
+            id: 'item_notification_order',
+            callId: 'call_notification_order',
+            command: 'cat README.md',
+        };
+        const started = handleCodexNotification('item/started', {
+            threadId: 'thread_notification_order',
+            turnId: 'turn_notification_order',
+            item: { ...item, status: 'inProgress' },
+        });
+        await vi.waitFor(() => expect(sessionUpdate).toHaveBeenCalledTimes(1));
+        const completed = handleCodexNotification('item/completed', {
+            threadId: 'thread_notification_order',
+            turnId: 'turn_notification_order',
+            item: { ...item, status: 'completed' },
+        });
+        releaseFirstUpdate();
+        await Promise.all([started, completed]);
+        expect(sessionUpdate.mock.calls.map((call) => call[0].update.status).filter(Boolean)).toEqual([
+            'pending',
+            'in_progress',
+            'completed',
+        ]);
+    });
+    it('finishes an item before turn completion clears its tool call state', async () => {
+        const connection = createMockConnection();
+        const { client, request } = createMockCodexClient();
+        const adapter = new CodexAppServerAcpAdapter(connection, client);
+        await initializeAdapter(adapter, request);
+        request.mockResolvedValueOnce({
+            thread: { id: 'thread_turn_completion_order', cwd: '/tmp/workspace' },
+            approvalPolicy: 'on-failure',
+            reasoningEffort: 'medium',
+        });
+        const session = await adapter.newSession({ cwd: '/tmp/workspace', mcpServers: [] });
+        request.mockResolvedValueOnce({
+            turn: { id: 'turn_completion_order', status: 'inProgress' },
+        });
+        const prompt = adapter.prompt({
+            sessionId: session.sessionId,
+            prompt: [{ type: 'text', text: 'run a command' }],
+        });
+        await vi.waitFor(() => expect(request).toHaveBeenCalledWith('turn/start', expect.objectContaining({ threadId: 'thread_turn_completion_order' })));
+        const sessionUpdate = connection.sessionUpdate;
+        sessionUpdate.mockClear();
+        let releaseFirstUpdate = () => undefined;
+        const firstUpdateBlocked = new Promise((resolve) => {
+            releaseFirstUpdate = resolve;
+        });
+        sessionUpdate
+            .mockImplementationOnce(async () => await firstUpdateBlocked)
+            .mockResolvedValue(undefined);
+        const handleCodexNotification = adapter.handleCodexNotification.bind(adapter);
+        const item = {
+            type: 'commandExecution',
+            id: 'item_turn_completion_order',
+            status: 'inProgress',
+            command: 'echo ordered',
+        };
+        const started = handleCodexNotification('item/started', {
+            threadId: 'thread_turn_completion_order',
+            turnId: 'turn_completion_order',
+            item,
+        });
+        await vi.waitFor(() => expect(sessionUpdate).toHaveBeenCalledTimes(1));
+        const completed = handleCodexNotification('item/completed', {
+            threadId: 'thread_turn_completion_order',
+            turnId: 'turn_completion_order',
+            item: { ...item, status: 'completed' },
+        });
+        const turnCompleted = handleCodexNotification('turn/completed', {
+            threadId: 'thread_turn_completion_order',
+            turn: { id: 'turn_completion_order', status: 'completed', error: null, items: [] },
+        });
+        releaseFirstUpdate();
+        await Promise.all([started, completed, turnCompleted]);
+        await expect(prompt).resolves.toEqual({ stopReason: 'end_turn' });
+        expect(sessionUpdate.mock.calls.map((call) => call[0].update.sessionUpdate)).toEqual([
+            'tool_call',
+            'tool_call_update',
+            'tool_call_update',
+        ]);
+    });
+    it('waits for a plan hold before processing turn completion', async () => {
+        let resolvePlanApproval = () => {
+            throw new Error('expected plan approval request callback');
+        };
+        const connection = createMockConnection();
+        connection.requestPermission.mockImplementation(() => new Promise((resolve) => {
+            resolvePlanApproval = resolve;
+        }));
+        const { client, request } = createMockCodexClient();
+        const adapter = new CodexAppServerAcpAdapter(connection, client);
+        await initializeAdapter(adapter, request);
+        request.mockResolvedValueOnce({
+            thread: { id: 'thread_plan_hold_order', cwd: '/tmp/workspace' },
+            approvalPolicy: 'on-failure',
+            reasoningEffort: 'medium',
+        });
+        const session = await adapter.newSession({ cwd: '/tmp/workspace', mcpServers: [] });
+        await adapter.setSessionMode({ sessionId: session.sessionId, modeId: 'plan' });
+        request.mockResolvedValueOnce({
+            turn: { id: 'turn_plan_hold_order', status: 'inProgress' },
+        });
+        const prompt = adapter.prompt({
+            sessionId: session.sessionId,
+            prompt: [{ type: 'text', text: 'make a plan' }],
+        });
+        await vi.waitFor(() => expect(request).toHaveBeenCalledWith('turn/start', expect.objectContaining({ threadId: 'thread_plan_hold_order' })));
+        const handleCodexNotification = adapter.handleCodexNotification.bind(adapter);
+        await handleCodexNotification('item/started', {
+            threadId: 'thread_plan_hold_order',
+            turnId: 'turn_plan_hold_order',
+            item: { type: 'plan', id: 'item_plan_hold_order', status: 'inProgress' },
+        });
+        await handleCodexNotification('item/plan/delta', {
+            threadId: 'thread_plan_hold_order',
+            turnId: 'turn_plan_hold_order',
+            itemId: 'item_plan_hold_order',
+            delta: '# Plan\n- implement it',
+        });
+        let releaseTranscriptActivity = () => undefined;
+        const transcriptActivityBlocked = new Promise((resolve) => {
+            releaseTranscriptActivity = resolve;
+        });
+        const subagentController = adapter.subagentController;
+        const handleTranscriptActivity = vi
+            .spyOn(subagentController, 'handleTranscriptActivity')
+            .mockImplementationOnce(async () => await transcriptActivityBlocked)
+            .mockResolvedValue(undefined);
+        const itemCompleted = handleCodexNotification('item/completed', {
+            threadId: 'thread_plan_hold_order',
+            turnId: 'turn_plan_hold_order',
+            item: { type: 'plan', id: 'item_plan_hold_order', status: 'completed' },
+        });
+        await vi.waitFor(() => expect(handleTranscriptActivity).toHaveBeenCalledTimes(1));
+        let turnCompletionProcessed = false;
+        const turnCompleted = handleCodexNotification('turn/completed', {
+            threadId: 'thread_plan_hold_order',
+            turn: { id: 'turn_plan_hold_order', status: 'completed', error: null, items: [] },
+        });
+        void turnCompleted.then(() => {
+            turnCompletionProcessed = true;
+        });
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(turnCompletionProcessed).toBe(false);
+        releaseTranscriptActivity();
+        await turnCompleted;
+        let promptSettled = false;
+        void prompt.then(() => {
+            promptSettled = true;
+        });
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        expect(promptSettled).toBe(false);
+        resolvePlanApproval({ outcome: { outcome: 'selected', optionId: 'default' } });
+        await itemCompleted;
+        await expect(prompt).resolves.toEqual({ stopReason: 'end_turn' });
+    });
+});
+//# sourceMappingURL=codex-app-server-acp-adapter.notification-ordering.test.js.map

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.notification-ordering.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-app-server-acp-adapter.notification-ordering.test.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.notification-ordering.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.test.js

@@ -27,7 +27,7 @@ function createMockCodexClient() {
     const mocks = {
         start: vi.fn(),
         stop: vi.fn(async () => undefined),
-        request: vi.fn(),
+        request: vi.fn((method) => Promise.resolve(method === 'thread/goal/get' ? { goal: null } : undefined)),
         notify: vi.fn(),
         respondSuccess: vi.fn(),
         respondError: vi.fn(),
@@ -40,6 +40,9 @@ function createMockCodexClient() {
 function getCodexRequestCalls(codex, method) {
     return codex.request.mock.calls.filter((call) => call[0] === method);
 }
+function sendCodexNotification(adapter, method, params) {
+    return adapter.handleCodexNotification(method, params);
+}
 const DEFAULT_APPROVAL_POLICY = 'on-failure';
 const DEFAULT_ALLOWED_APPROVAL_POLICIES = [DEFAULT_APPROVAL_POLICY, 'on-request', 'never'];
 const DEFAULT_ALLOWED_SANDBOX_MODES = ['read-only', 'workspace-write', 'danger-full-access'];
@@ -624,7 +627,7 @@ describe('CodexAppServerAcpAdapter', () => {
             mcpServers: [],
         });
         connection.sessionUpdate.mockClear();
-        await adapter.handleCodexNotification('item/started', {
+        await sendCodexNotification(adapter, 'item/started', {
             threadId: 'thread_replay_dedupe',
             turnId: 'turn_replay_dedupe',
             item: {
@@ -644,13 +647,13 @@ describe('CodexAppServerAcpAdapter', () => {
                 command: 'cat README.md',
             },
         });
-        await adapter.handleCodexNotification('item/reasoning/summaryTextDelta', {
+        await sendCodexNotification(adapter, 'item/reasoning/summaryTextDelta', {
             threadId: 'thread_replay_dedupe',
             turnId: 'turn_replay_dedupe',
             itemId: 'item_replayed_reasoning',
             delta: '**From live**',
         });
-        await adapter.handleCodexNotification('item/completed', {
+        await sendCodexNotification(adapter, 'item/completed', {
             threadId: 'thread_replay_dedupe',
             turnId: 'turn_replay_dedupe',
             item: {
@@ -736,7 +739,7 @@ describe('CodexAppServerAcpAdapter', () => {
             cwd: '/tmp/workspace',
             mcpServers: [],
         });
-        await adapter.handleCodexNotification('item/started', {
+        await sendCodexNotification(adapter, 'item/started', {
             threadId: 'thread_command_handoff',
             turnId: 'turn_command_handoff',
             item: {
@@ -747,31 +750,46 @@ describe('CodexAppServerAcpAdapter', () => {
                 command: 'git commit -m "test"',
             },
         });
-        await adapter.handleCodexNotification('item/commandExecution/outputDelta', {
+        await sendCodexNotification(adapter, 'item/commandExecution/outputDelta', {
             threadId: 'thread_command_handoff',
             turnId: 'turn_command_handoff',
             itemId: 'item_command_handoff',
             delta: 'Process running with session ID 96081',
         });
-        await adapter.handleCodexNotification('item/commandExecution/outputDelta', {
+        await sendCodexNotification(adapter, 'item/commandExecution/outputDelta', {
             threadId: 'thread_command_handoff',
             turnId: 'turn_command_handoff',
             itemId: 'item_command_handoff',
             delta: 'still running',
         });
+        const completedItem = {
+            type: 'commandExecution',
+            id: 'item_command_handoff',
+            status: 'completed',
+            aggregatedOutput: 'Process exited with code 0',
+            exitCode: 0,
+        };
+        for (let count = 0; count < 2; count += 1) {
+            await sendCodexNotification(adapter, 'item/completed', {
+                threadId: 'thread_command_handoff',
+                turnId: 'turn_command_handoff',
+                item: completedItem,
+            });
+        }
         const updates = connection.sessionUpdate.mock.calls.map((call) => call[0].update);
         const inProgressUpdates = updates.filter((update) => update.sessionUpdate === 'tool_call_update' &&
             update.toolCallId === 'call_command_handoff' &&
             update.status === 'in_progress');
         expect(inProgressUpdates).toHaveLength(1);
-        expect(updates).toEqual(expect.arrayContaining([
+        const completedUpdates = updates.filter((update) => (update.sessionUpdate === 'tool_call' || update.sessionUpdate === 'tool_call_update') &&
+            update.toolCallId === 'call_command_handoff' &&
+            update.status === 'completed');
+        expect(completedUpdates).toEqual([
             expect.objectContaining({
                 sessionUpdate: 'tool_call_update',
-                toolCallId: 'call_command_handoff',
-                status: 'completed',
                 rawOutput: 'Process running with session ID 96081',
             }),
-        ]));
+        ]);
     });
     it('does not synthesize completion for normal output that mentions session handoff text', async () => {
         const { connection } = createMockConnection();
@@ -787,7 +805,7 @@ describe('CodexAppServerAcpAdapter', () => {
             cwd: '/tmp/workspace',
             mcpServers: [],
         });
-        await adapter.handleCodexNotification('item/started', {
+        await sendCodexNotification(adapter, 'item/started', {
             threadId: 'thread_command_log_output',
             turnId: 'turn_command_log_output',
             item: {
@@ -798,13 +816,13 @@ describe('CodexAppServerAcpAdapter', () => {
                 command: 'bash script.sh',
             },
         });
-        await adapter.handleCodexNotification('item/commandExecution/outputDelta', {
+        await sendCodexNotification(adapter, 'item/commandExecution/outputDelta', {
             threadId: 'thread_command_log_output',
             turnId: 'turn_command_log_output',
             itemId: 'item_command_log_output',
             delta: 'worker log: process running with session ID 96081 and waiting',
         });
-        await adapter.handleCodexNotification('item/commandExecution/outputDelta', {
+        await sendCodexNotification(adapter, 'item/commandExecution/outputDelta', {
             threadId: 'thread_command_log_output',
             turnId: 'turn_command_log_output',
             itemId: 'item_command_log_output',