factory-factory 0.4.5 → 0.4.7

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

@@ -1,4 +1,5 @@
 import { describe, expect, it } from 'vitest';
+import { SUBAGENT_TOOL_META_KEY, SUBAGENTS_CHANGED_METHOD, SUBAGENTS_LIST_METHOD, SUBAGENTS_READ_METHOD, subagentListResultSchema, subagentReadResultSchema, subagentsChangedParamsSchema, subagentToolMetadataSchema, } from '../../../../../../shared/acp-protocol/subagents.js';
 import { CodexAppServerAcpAdapter } from './codex-app-server-acp-adapter.js';
 const RUN_REAL_CODEX_APP_SERVER_TESTS = process.env.RUN_REAL_CODEX_APP_SERVER_TESTS === '1';
 const RUN_REAL_CODEX_PROMPT_TESTS = process.env.RUN_REAL_CODEX_APP_SERVER_PROMPT_TESTS === '1';
@@ -7,11 +8,16 @@ function createManualConnection() {
     const closed = new Promise((resolve) => {
         resolveClosed = resolve;
     });
+    const extNotifications = [];
     const updates = [];
     return {
         close: () => resolveClosed?.(),
         connection: {
             closed,
+            extNotification: async (method, params) => {
+                await Promise.resolve();
+                extNotifications.push({ method, params });
+            },
             sessionUpdate: async (payload) => {
                 await Promise.resolve();
                 updates.push(payload);
@@ -27,11 +33,77 @@ function createManualConnection() {
                 };
             },
         },
+        extNotifications,
         updates,
     };
 }
+function extractFactoryFactorySubagentMeta(recorded) {
+    if (!isRecord(recorded.update) ||
+        (recorded.update.sessionUpdate !== 'tool_call' &&
+            recorded.update.sessionUpdate !== 'tool_call_update') ||
+        !isRecord(recorded.update._meta)) {
+        return null;
+    }
+    const parsed = subagentToolMetadataSchema.safeParse(recorded.update._meta[SUBAGENT_TOOL_META_KEY]);
+    return parsed.success ? parsed.data : null;
+}
+function isSubagentsChangedNotification(notification, parentSessionId, subagentId) {
+    if (notification.method !== SUBAGENTS_CHANGED_METHOD) {
+        return false;
+    }
+    const parsed = subagentsChangedParamsSchema.safeParse(notification.params);
+    return (parsed.success &&
+        parsed.data.sessionId === parentSessionId &&
+        parsed.data.subagentId === subagentId);
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+async function settleAdapterClose() {
+    await new Promise((resolve) => setTimeout(resolve, 150));
+}
 const describeIfRealCodex = RUN_REAL_CODEX_APP_SERVER_TESTS ? describe : describe.skip;
 const promptItIfEnabled = RUN_REAL_CODEX_PROMPT_TESTS ? it : it.skip;
+describe('manual Codex sub-agent correlation assertions', () => {
+    it('extracts validated metadata only from ACP tool updates', () => {
+        const meta = {
+            [SUBAGENT_TOOL_META_KEY]: {
+                id: 'child-1',
+                parentSessionId: 'session-1',
+            },
+        };
+        expect(extractFactoryFactorySubagentMeta({
+            sessionId: 'session-1',
+            update: { sessionUpdate: 'agent_message_chunk', _meta: meta },
+        })).toBeNull();
+        expect(extractFactoryFactorySubagentMeta({
+            sessionId: 'session-1',
+            update: { sessionUpdate: 'tool_call', _meta: meta },
+        })).toEqual({ id: 'child-1', parentSessionId: 'session-1' });
+        expect(extractFactoryFactorySubagentMeta({
+            sessionId: 'session-1',
+            update: {
+                sessionUpdate: 'tool_call_update',
+                _meta: { [SUBAGENT_TOOL_META_KEY]: { id: '', parentSessionId: 'session-1' } },
+            },
+        })).toBeNull();
+    });
+    it('matches only validated change notifications for the correlated parent and child', () => {
+        const notification = {
+            method: SUBAGENTS_CHANGED_METHOD,
+            params: {
+                sessionId: 'session-1',
+                subagentId: 'child-1',
+                change: 'completed',
+            },
+        };
+        expect(isSubagentsChangedNotification(notification, 'session-1', 'child-1')).toBe(true);
+        expect(isSubagentsChangedNotification(notification, 'session-2', 'child-1')).toBe(false);
+        expect(isSubagentsChangedNotification(notification, 'session-1', 'child-2')).toBe(false);
+        expect(isSubagentsChangedNotification({ ...notification, method: 'factoryfactory.ai/subagents/unrelated' }, 'session-1', 'child-1')).toBe(false);
+        expect(isSubagentsChangedNotification({ ...notification, params: { ...notification.params, change: 'removed' } }, 'session-1', 'child-1')).toBe(false);
+    });
+});
 describeIfRealCodex('CodexAppServerAcpAdapter (manual real app-server)', () => {
     it('initializes and creates a session with real codex app-server', async () => {
         const fixture = createManualConnection();
@@ -88,5 +160,102 @@ describeIfRealCodex('CodexAppServerAcpAdapter (manual real app-server)', () => {
             await new Promise((resolve) => setTimeout(resolve, 150));
         }
     }, 180_000);
+    promptItIfEnabled('surfaces one real sub-agent and recovers its transcript after adapter reload', async () => {
+        const fixture = createManualConnection();
+        const adapter = new CodexAppServerAcpAdapter(fixture.connection);
+        let reloadedFixture = null;
+        try {
+            await adapter.initialize({
+                protocolVersion: 1,
+                clientCapabilities: {},
+                clientInfo: {
+                    name: 'factory-factory-manual-test',
+                    version: '0.1.0',
+                },
+            });
+            const session = await adapter.newSession({
+                cwd: process.cwd(),
+                mcpServers: [],
+            });
+            const result = await adapter.prompt({
+                sessionId: session.sessionId,
+                prompt: [
+                    {
+                        type: 'text',
+                        text: [
+                            'Spawn exactly one bounded research sub-agent.',
+                            'Ask it to read package.json and report only the package name.',
+                            'Wait for that sub-agent to finish before replying.',
+                            'Do not spawn any other sub-agents.',
+                            'Then reply with the package name.',
+                        ].join(' '),
+                    },
+                ],
+            });
+            expect(result.stopReason).toBe('end_turn');
+            const subagentMeta = fixture.updates
+                .map(extractFactoryFactorySubagentMeta)
+                .find((metadata) => metadata !== null) ?? null;
+            expect(subagentMeta).not.toBeNull();
+            if (!subagentMeta) {
+                throw new Error('Expected a namespaced sub-agent tool update');
+            }
+            expect(subagentMeta.parentSessionId).toBe(session.sessionId);
+            const list = subagentListResultSchema.parse(await adapter.extMethod(SUBAGENTS_LIST_METHOD, {
+                sessionId: session.sessionId,
+                cursor: null,
+                limit: 50,
+            }));
+            const listedSubagent = list.subagents.find((item) => item.id === subagentMeta.id);
+            expect(listedSubagent).toBeDefined();
+            if (!listedSubagent) {
+                throw new Error('Expected the metadata child in the parent-filtered list');
+            }
+            const childId = listedSubagent.id;
+            expect(fixture.extNotifications.some((notification) => isSubagentsChangedNotification(notification, session.sessionId, childId))).toBe(true);
+            const read = subagentReadResultSchema.parse(await adapter.extMethod(SUBAGENTS_READ_METHOD, {
+                sessionId: session.sessionId,
+                subagentId: childId,
+                cursor: null,
+                limit: 10,
+            }));
+            expect(read.updates.length).toBeGreaterThan(0);
+            fixture.close();
+            await settleAdapterClose();
+            reloadedFixture = createManualConnection();
+            const reloadedAdapter = new CodexAppServerAcpAdapter(reloadedFixture.connection);
+            await reloadedAdapter.initialize({
+                protocolVersion: 1,
+                clientCapabilities: {},
+                clientInfo: {
+                    name: 'factory-factory-manual-test',
+                    version: '0.1.0',
+                },
+            });
+            await reloadedAdapter.loadSession({
+                sessionId: session.sessionId,
+                cwd: process.cwd(),
+                mcpServers: [],
+            });
+            const reloadedList = subagentListResultSchema.parse(await reloadedAdapter.extMethod(SUBAGENTS_LIST_METHOD, {
+                sessionId: session.sessionId,
+                cursor: null,
+                limit: 50,
+            }));
+            expect(reloadedList.subagents.map((item) => item.id)).toContain(childId);
+            const reloadedRead = subagentReadResultSchema.parse(await reloadedAdapter.extMethod(SUBAGENTS_READ_METHOD, {
+                sessionId: session.sessionId,
+                subagentId: childId,
+                cursor: null,
+                limit: 10,
+            }));
+            expect(reloadedRead.updates.length).toBeGreaterThan(0);
+        }
+        finally {
+            fixture.close();
+            reloadedFixture?.close();
+            await settleAdapterClose();
+        }
+    }, 600_000);
 });
 //# sourceMappingURL=codex-app-server-acp-adapter.manual.integration.test.js.map

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

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=codex-app-server-acp-adapter.notification-ordering.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"codex-app-server-acp-adapter.notification-ordering.test.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-app-server-acp-adapter.notification-ordering.test.ts"],"names":[],"mappings":""}

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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"}