npm - factory-factory - Versions diffs - 0.3.20 → 0.4.0 - Mend

factory-factory 0.3.20 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (874) hide show

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

@@ -7,7 +7,7 @@ const { mockSpawn } = vi.hoisted(() => ({
 vi.mock('node:child_process', () => ({
     spawn: (...args) => mockSpawn(...args),
 }));
-import { CodexRequestError, CodexRpcClient } from './codex-rpc-client.js';
+import { CodexRequestError, CodexRequestTimeoutError, CodexRpcClient } from './codex-rpc-client.js';
 function createMockChild() {
     const child = new EventEmitter();
     child.stdin = new PassThrough();
@@ -153,6 +153,81 @@ describe('CodexRpcClient', () => {
         await expect(client.request('turn/start', { threadId: 'thread_1' })).rejects.toThrow(/stdin unavailable/);
         expect(client.pending.size).toBe(0);
     });
+    it('rejects unresponsive requests with a timeout and stops codex', async () => {
+        vi.useFakeTimers();
+        try {
+            const child = createMockChild();
+            mockSpawn.mockReturnValue(child);
+            const client = new CodexRpcClient({
+                cwd: '/tmp/workspace',
+                env: {},
+            });
+            client.start();
+            const responsePromise = client.request('turn/start', { threadId: 'thread_1' }, { timeoutMs: 50 });
+            const rejection = responsePromise.catch((error) => error);
+            await vi.advanceTimersByTimeAsync(50);
+            const error = await rejection;
+            expect(error).toBeInstanceOf(CodexRequestTimeoutError);
+            expect(error).toMatchObject({
+                id: 1,
+                method: 'turn/start',
+                timeoutMs: 50,
+            });
+            expect(client.pending.size).toBe(0);
+            expect(child.kill).toHaveBeenCalledWith('SIGTERM');
+        }
+        finally {
+            vi.useRealTimers();
+        }
+    });
+    it('falls back to the configured client timeout for invalid per-request overrides', async () => {
+        vi.useFakeTimers();
+        try {
+            const child = createMockChild();
+            mockSpawn.mockReturnValue(child);
+            const client = new CodexRpcClient({
+                cwd: '/tmp/workspace',
+                env: {},
+                requestTimeoutMs: 25,
+            });
+            client.start();
+            const responsePromise = client.request('turn/start', { threadId: 'thread_1' }, { timeoutMs: 0 });
+            const rejection = responsePromise.catch((error) => error);
+            await vi.advanceTimersByTimeAsync(25);
+            const error = await rejection;
+            expect(error).toBeInstanceOf(CodexRequestTimeoutError);
+            expect(error).toMatchObject({
+                id: 1,
+                method: 'turn/start',
+                timeoutMs: 25,
+            });
+            expect(child.kill).toHaveBeenCalledWith('SIGTERM');
+        }
+        finally {
+            vi.useRealTimers();
+        }
+    });
+    it('clears request timeout state when a response arrives before the deadline', async () => {
+        vi.useFakeTimers();
+        try {
+            const child = createMockChild();
+            mockSpawn.mockReturnValue(child);
+            const client = new CodexRpcClient({
+                cwd: '/tmp/workspace',
+                env: {},
+            });
+            client.start();
+            const responsePromise = client.request('turn/start', { threadId: 'thread_1' }, { timeoutMs: 50 });
+            child.stdout.write('{"id":1,"result":{"ok":true}}\n');
+            await expect(responsePromise).resolves.toEqual({ ok: true });
+            await vi.advanceTimersByTimeAsync(50);
+            expect(client.pending.size).toBe(0);
+            expect(child.kill).not.toHaveBeenCalled();
+        }
+        finally {
+            vi.useRealTimers();
+        }
+    });
     it('stops the subprocess gracefully', async () => {
         const child = createMockChild();
         mockSpawn.mockReturnValue(child);

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/codex-rpc-client.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"codex-rpc-client.test.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-rpc-client.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;CACnB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,KAAK,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;~~AAUvE~~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"}
1	+ {"version":3,"file":"codex-rpc-client.test.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/codex-rpc-client.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"session-config-resolver.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAA6B,MAAM,0BAA0B,CAAC;AAE/F,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,eAAO,MAAM,yBAAyB,EAAE,cAAc,EAA0C,CAAC;AACjG,eAAO,MAAM,qBAAqB,EAAE,WAAW,EAI9C,CAAC;AA2FF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,MAAM,GACV,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAWzB;AA8HD,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,eAAe,EAAE,GAAG,MAAM,CAU3E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAEjF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE3F;AAED,wBAAgB,+BAA+B,CAC7C,kBAAkB,EAAE,sBAAsB,EAAE,GAC3C,MAAM,CAUR;AAED,wBAAgB,4BAA4B,CAC1C,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,OAAO,EAAE,cAAc,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,~~CAahC~~;AAED,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,eAAe,EAAE,EAC/B,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,OAAO,GAChC,eAAe,GAAG,IAAI,CA2BxB;AAED,wBAAgB,0BAA0B,CACxC,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,WAAW,EAAE,MAAM,GAClB,MAAM,EAAE,CAQV;AAED,wBAAgB,yBAAyB,CACvC,mBAAmB,EAAE,WAAW,EAAE,EAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,WAAW,CAUb;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,cAAc,EACvB,uBAAuB,EAAE,cAAc,EAAE,EACzC,mBAAmB,EAAE,WAAW,EAAE,GACjC,eAAe,EAAE,CA4CnB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,eAAe,EAAE,EAC1B,mBAAmB,EAAE,WAAW,EAAE,GACjC,eAAe,CAAC,IAAI,CAAC,CAavB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,eAAe,EAAE,EAC/B,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,uBAAuB,EAAE,cAAc,EAAE,EACzC,mBAAmB,EAAE,WAAW,EAAE,GACjC,mBAAmB,EAAE,CA2BvB;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtF;AAED,wBAAgB,kCAAkC,CAChD,YAAY,EAAE,eAAe,EAAE,EAC/B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,OAAO,CAUT;AAED,wBAAgB,6BAA6B,CAC3C,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,MAAM,EAAE,MAAM,GACb,MAAM,CAMR"}
1	+ {"version":3,"file":"session-config-resolver.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAA6B,MAAM,0BAA0B,CAAC;AAE/F,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,eAAO,MAAM,yBAAyB,EAAE,cAAc,EAA0C,CAAC;AACjG,eAAO,MAAM,qBAAqB,EAAE,WAAW,EAI9C,CAAC;AA2FF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,MAAM,GACV,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAWzB;AA8HD,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,eAAe,EAAE,GAAG,MAAM,CAU3E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAEjF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE3F;AAED,wBAAgB,+BAA+B,CAC7C,kBAAkB,EAAE,sBAAsB,EAAE,GAC3C,MAAM,CAUR;AAED,wBAAgB,4BAA4B,CAC1C,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,OAAO,EAAE,cAAc,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAkBhC;AAED,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,eAAe,EAAE,EAC/B,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,OAAO,GAChC,eAAe,GAAG,IAAI,CA2BxB;AAED,wBAAgB,0BAA0B,CACxC,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,WAAW,EAAE,MAAM,GAClB,MAAM,EAAE,CAQV;AAED,wBAAgB,yBAAyB,CACvC,mBAAmB,EAAE,WAAW,EAAE,EAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,WAAW,CAUb;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,cAAc,EACvB,uBAAuB,EAAE,cAAc,EAAE,EACzC,mBAAmB,EAAE,WAAW,EAAE,GACjC,eAAe,EAAE,CA4CnB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,eAAe,EAAE,EAC1B,mBAAmB,EAAE,WAAW,EAAE,GACjC,eAAe,CAAC,IAAI,CAAC,CAavB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,eAAe,EAAE,EAC/B,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,uBAAuB,EAAE,cAAc,EAAE,EACzC,mBAAmB,EAAE,WAAW,EAAE,GACjC,mBAAmB,EAAE,CA2BvB;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtF;AAED,wBAAgB,kCAAkC,CAChD,YAAY,EAAE,eAAe,EAAE,EAC/B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,OAAO,CAUT;AAED,wBAAgB,6BAA6B,CAC3C,kBAAkB,EAAE,sBAAsB,EAAE,EAC5C,MAAM,EAAE,MAAM,GACb,MAAM,CAMR"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.js CHANGED Viewed

@@ -218,11 +218,16 @@ export function resolveDefaultCollaborationMode(collaborationModes) {
 }
 export function resolveTurnCollaborationMode(collaborationModes, session) {
     const modeEntry = collaborationModes.find((entry) => entry.mode === session.defaults.collaborationMode);
+    const shouldUseSessionDefaults = session.defaults.collaborationMode.toLowerCase() === 'default';
     return {
         mode: modeEntry?.mode ?? session.defaults.collaborationMode,
         settings: {
-            model: modeEntry?.model ?? session.defaults.model,
-            reasoning_effort: modeEntry?.reasoningEffort ?? session.defaults.reasoningEffort,
+            model: shouldUseSessionDefaults
+                ? session.defaults.model
+                : (modeEntry?.model ?? session.defaults.model),
+            reasoning_effort: shouldUseSessionDefaults
+                ? session.defaults.reasoningEffort
+                : (modeEntry?.reasoningEffort ?? session.defaults.reasoningEffort),
             developer_instructions: modeEntry?.developerInstructions ?? null,
         },
     };

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"session-config-resolver.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAWhF,MAAM,CAAC,MAAM,yBAAyB,GAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;AACjG,MAAM,CAAC,MAAM,qBAAqB,GAAkB;IAClD,WAAW;IACX,iBAAiB;IACjB,oBAAoB;CACrB,CAAC;AAEF,SAAS,aAAa,CAAC,KAAa;IAClC,OAAO,KAAK;SACT,KAAK,CAAC,MAAM,CAAC;SACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC7D,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC7D,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAsB;IACvD,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;QAC5B,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;QAC5B,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QAC3B,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAiB;IAC/C,IAAI,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC/B,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAClC,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,yBAAyB,CAChC,cAA8B,EAC9B,WAAwB;IAExB,IAAI,cAAc,KAAK,OAAO,IAAI,WAAW,KAAK,oBAAoB,EAAE,CAAC;QACvE,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,GAAG,yBAAyB,CAAC,cAAc,CAAC,KAAK,sBAAsB,CAAC,WAAW,CAAC,GAAG,CAAC;AACjG,CAAC;AAED,SAAS,iCAAiC,CAAC,GAAW;IACpD,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,aAAa,EAAE,CAAC,GAAG,CAAC;QACpB,cAAc,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,aAAa,EAAE,IAAI;QACnB,mBAAmB,EAAE,KAAK;QAC1B,eAAe,EAAE,KAAK;KACvB,CAAC;AACJ,CAAC;AAED,SAAS,mCAAmC;IAC1C,OAAO;QACL,IAAI,EAAE,kBAAkB;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,MAAe;IACjD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxE,IAAI,UAAU,KAAK,gBAAgB,EAAE,CAAC;QACpC,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,IAAI,UAAU,KAAK,kBAAkB,EAAE,CAAC;QACtC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,IAAiB,EACjB,GAAW;IAEX,IAAI,IAAI,KAAK,oBAAoB,EAAE,CAAC;QAClC,OAAO,mCAAmC,EAAE,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;SAC/B,CAAC;IACJ,CAAC;IACD,OAAO,iCAAiC,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,mCAAmC,CAC1C,WAAmB,EACnB,kBAA4C;IAE5C,MAAM,OAAO,GAAG,kBAAkB;SAC/B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC/C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACf,KAAK,EAAE,KAAK,CAAC,IAAI;QACjB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC,CAAC,CAAC;IAEN,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,WAAW,CAAC,EAAE,CAAC;QAC5D,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,OAAO;QACL,EAAE,EAAE,MAAM;QACV,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,WAAW;QACzB,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,YAAoB,EACpB,YAA+B;IAE/B,MAAM,OAAO,GAAgC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxE,KAAK,EAAE,KAAK,CAAC,EAAE;QACf,IAAI,EAAE,KAAK,CAAC,WAAW;QACvB,WAAW,EAAE,KAAK,CAAC,WAAW;KAC/B,CAAC,CAAC,CAAC;IAEJ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,YAAY,CAAC,EAAE,CAAC;QAC7D,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO;QACL,EAAE,EAAE,OAAO;QACX,QAAQ,EAAE,OAAO;QACjB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,YAAY;QAC1B,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,iCAAiC,CACxC,sBAA8C,EAC9C,YAA+B,EAC/B,YAAoB;IAEpB,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;IAC3E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAC7E,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC,CACxC,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAA8B,CAAC;IAC/D,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE,CAAC;QACrC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;YACjD,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,CAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,UAAU,CAAC,sBAAsB,CAAC;QAChF,CAAC,CAAC,UAAU,CAAC,sBAAsB;QACnC,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,eAAe,GACnB,sBAAsB,IAAI,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC;QACpE,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,sBAAsB,IAAI,gBAAgB,CAAC,GAAG,CAAC,sBAAsB,CAAC;YACtE,CAAC,CAAC,sBAAsB;YACxB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,EAAE,EAAE,kBAAkB;QACtB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,eAAe;QAC7B,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACvC,KAAK;YACL,IAAI,EAAE,KAAK;YACX,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrF,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CACtC,eAAsC,EACtC,OAA0B;IAE1B,OAAO;QACL,EAAE,EAAE,gBAAgB;QACpB,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,eAAe;QAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChC,KAAK,EAAE,MAAM,CAAC,EAAE;YAChB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,cAA8B,EAAE,WAAwB;IACnF,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,YAA+B;IACjE,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACrC,IAAI,SAAS,EAAE,EAAE,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAc,EAAE,aAAqB;IACvE,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAgB,EAAE,GAAW;IAChE,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,kBAA4C;IAE5C,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IACtF,MAAM,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;IAC9C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,gBAAgB,EAAE,IAAI,IAAI,SAAS,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,kBAA4C,EAC5C,OAAuB;IAEvB,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CACvC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAC7D,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,iBAAiB;QAC3D,QAAQ,EAAE;YACR,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK;YACjD,gBAAgB,EAAE,SAAS,EAAE,eAAe,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe;YAChF,sBAAsB,EAAE,SAAS,EAAE,qBAAqB,IAAI,IAAI;SACjE;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,YAA+B,EAC/B,OAAe,EACf,wBAAiC;IAEjC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IACtE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAC7E,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC,CACxC,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,aAAa,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9F,IACE,gBAAgB,CAAC,wBAAwB,CAAC;QAC1C,eAAe,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAClD,CAAC;QACD,OAAO,wBAAwB,CAAC;IAClC,CAAC;IACD,IACE,gBAAgB,CAAC,UAAU,CAAC,sBAAsB,CAAC;QACnD,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAC3D,CAAC;QACD,OAAO,UAAU,CAAC,sBAAsB,CAAC;IAC3C,CAAC;IACD,OAAO,eAAe,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,kBAA4C,EAC5C,WAAmB;IAEnB,MAAM,MAAM,GAAG,kBAAkB;SAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,mBAAkC,EAClC,aAAsC;IAEtC,MAAM,kBAAkB,GAAG,0BAA0B,CAAC,aAAa,CAAC,CAAC;IACrE,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClD,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,OAAuB,EACvB,uBAAyC,EACzC,mBAAkC;IAElC,MAAM,kBAAkB,GAAG,yBAAyB,CAClD,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAC/B,CAAC;IACF,MAAM,QAAQ,GACZ,uBAAuB,CAAC,MAAM,GAAG,CAAC;QAChC,CAAC,CAAC,uBAAuB;QACzB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAEjG,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,SAAS,GAAG,CAChB,cAA8B,EAC9B,WAAwB,EACxB,WAAoB,EACd,EAAE;QACR,MAAM,EAAE,GAAG,mBAAmB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACb,OAAO,CAAC,IAAI,CAAC;YACX,EAAE;YACF,IAAI,EAAE,yBAAyB,CAAC,cAAc,EAAE,WAAW,CAAC;YAC5D,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,cAAc;YACd,WAAW;SACZ,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,SAAS,CACP,OAAO,CAAC,QAAQ,CAAC,cAAc,EAC/B,kBAAkB,EAClB,oBAAoB,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC,EAAE,CACrG,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,OAAuB,EACvB,OAA0B,EAC1B,mBAAkC;IAElC,MAAM,kBAAkB,GAAG,yBAAyB,CAClD,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAC/B,CAAC;IACF,MAAM,eAAe,GAAG,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IACjG,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,eAAe,CAAC;QAC5D,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,gBAAgB,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAAuB,EACvB,YAA+B,EAC/B,kBAA4C,EAC5C,uBAAyC,EACzC,mBAAkC;IAElC,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C,OAAO,EACP,uBAAuB,EACvB,mBAAmB,CACpB,CAAC;IACF,MAAM,sBAAsB,GAAG,wBAAwB,CACrD,OAAO,EACP,gBAAgB,EAChB,mBAAmB,CACpB,CAAC;IACF,MAAM,aAAa,GAA0B;QAC3C,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;QAC7D,mCAAmC,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;QAC3F,+BAA+B,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;KAC1E,CAAC;IAEF,MAAM,eAAe,GAAG,iCAAiC,CACvD,OAAO,CAAC,QAAQ,CAAC,eAAe,EAChC,YAAY,EACZ,OAAO,CAAC,QAAQ,CAAC,KAAK,CACvB,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,YAA+B,EAAE,OAAe;IAC3E,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,kCAAkC,CAChD,YAA+B,EAC/B,OAAe,EACf,eAAuB;IAEvB,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IACtE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,UAAU,CAAC,yBAAyB;SACxC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC;SACrC,MAAM,CAAC,CAAC,MAAM,EAAoB,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;SAC9D,QAAQ,CAAC,eAAe,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,kBAA4C,EAC5C,MAAc;IAEd,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAChF,IAAI,KAAK,EAAE,IAAI,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC;IACpB,CAAC;IACD,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC"}
1	+ {"version":3,"file":"session-config-resolver.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.ts"],"names":[],"mappings":"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"}

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

@@ -188,5 +188,24 @@ describe('session-config-resolver helpers', () => {
             },
         });
     });
+    it('resolves default collaboration mode with session defaults', () => {
+        const session = createSession({
+            defaults: {
+                ...createSession().defaults,
+                collaborationMode: 'default',
+                model: 'gpt-5-mini',
+                reasoningEffort: 'high',
+            },
+        });
+        const mode = resolveTurnCollaborationMode(collaborationModes, session);
+        expect(mode).toEqual({
+            mode: 'default',
+            settings: {
+                model: 'gpt-5-mini',
+                reasoning_effort: 'high',
+                developer_instructions: null,
+            },
+        });
+    });
 });
 //# sourceMappingURL=session-config-resolver.test.js.map

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"session-config-resolver.test.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.test.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"session-config-resolver.test.js","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/session-config-resolver.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EACL,kBAAkB,EAClB,2BAA2B,EAC3B,0BAA0B,EAC1B,mBAAmB,EACnB,YAAY,EACZ,kCAAkC,EAClC,6BAA6B,EAC7B,yBAAyB,EACzB,+BAA+B,EAC/B,mBAAmB,EACnB,wBAAwB,EACxB,8BAA8B,EAC9B,oBAAoB,EACpB,mBAAmB,EACnB,4BAA4B,GAC7B,MAAM,2BAA2B,CAAC;AAEnC,MAAM,YAAY,GAAsB;IACtC;QACE,EAAE,EAAE,OAAO;QACX,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,eAAe;QAC5B,sBAAsB,EAAE,QAAQ;QAChC,yBAAyB,EAAE;YACzB,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE;YAC/C,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE;YACtD,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;SACjD;QACD,eAAe,EAAE,CAAC,MAAM,CAAC;QACzB,SAAS,EAAE,IAAI;KAChB;IACD;QACE,EAAE,EAAE,YAAY;QAChB,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,gBAAgB;QAC7B,sBAAsB,EAAE,KAAK;QAC7B,yBAAyB,EAAE,EAAE;QAC7B,eAAe,EAAE,CAAC,MAAM,CAAC;QACzB,SAAS,EAAE,KAAK;KACjB;CACF,CAAC;AAEF,MAAM,kBAAkB,GAA6B;IACnD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,OAAO;QACd,eAAe,EAAE,QAAQ;QACzB,qBAAqB,EAAE,IAAI;KAC5B;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,OAAO;QACd,eAAe,EAAE,MAAM;QACvB,qBAAqB,EAAE,aAAa;KACrC;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,SAAmC;IACxD,OAAO;QACL,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,gBAAgB;QACrB,QAAQ,EAAE;YACR,KAAK,EAAE,OAAO;YACd,cAAc,EAAE,YAAY;YAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;YACzC,eAAe,EAAE,QAAQ;YACzB,iBAAiB,EAAE,SAAS;SAC7B;QACD,UAAU,EAAE,IAAI;QAChB,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,iCAAiC,EAAE,IAAI,GAAG,EAAE;QAC5C,qBAAqB,EAAE,IAAI,GAAG,EAAE;QAChC,gBAAgB,EAAE,IAAI,GAAG,EAAE;QAC3B,6BAA6B,EAAE,IAAI,GAAG,EAAE;QACxC,4BAA4B,EAAE,IAAI,GAAG,EAAE;QACvC,8BAA8B,EAAE,IAAI,GAAG,EAAE;QACzC,qBAAqB,EAAE,IAAI,GAAG,EAAE;QAChC,oBAAoB,EAAE,IAAI,GAAG,EAAE;QAC/B,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACnF,MAAM,iBAAiB,GAAoB,EAAE,GAAG,YAAY,CAAC,CAAC,CAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QACrF,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,CAAC,mBAAmB,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpE,MAAM,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,CAAC,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9E,IAAI,EAAE,kBAAkB;SACzB,CAAC,CAAC;QACH,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;YACtD,IAAI,EAAE,gBAAgB;YACtB,aAAa,EAAE,CAAC,WAAW,CAAC;YAC5B,cAAc,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;YACtC,aAAa,EAAE,IAAI;YACnB,mBAAmB,EAAE,KAAK;YAC1B,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,CAAC,+BAA+B,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,CACJ,+BAA+B,CAAC;YAC9B;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI;gBACX,eAAe,EAAE,IAAI;gBACrB,qBAAqB,EAAE,IAAI;aAC5B;SACF,CAAC,CACH,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACf,MAAM,CAAC,GAAG,EAAE,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC/E,MAAM,CAAC,GAAG,EAAE,CACV,+BAA+B,CAAC;YAC9B;gBACE,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,IAAI;gBACX,eAAe,EAAE,IAAI;gBACrB,qBAAqB,EAAE,IAAI;aAC5B;SACF,CAAC,CACH,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,CAAC,8BAA8B,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnF,MAAM,CAAC,8BAA8B,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5F,MAAM,CAAC,8BAA8B,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtF,MAAM,CAAC,8BAA8B,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CAAC,0BAA0B,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5F,MAAM,CAAC,0BAA0B,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACrE,MAAM;YACN,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QACH,MAAM,CAAC,6BAA6B,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrF,MAAM,CAAC,6BAA6B,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACjG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,yBAAyB,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzF,MAAM,CAAC,yBAAyB,CAAC,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAC9E,iBAAiB,CAClB,CAAC;QACF,MAAM,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CACtE,wCAAwC,CACzC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,MAAM,OAAO,GAAG,aAAa,CAAC;YAC5B,QAAQ,EAAE;gBACR,GAAG,aAAa,EAAE,CAAC,QAAQ;gBAC3B,cAAc,EAAE,YAAY;gBAC5B,aAAa,EAAE,2BAA2B,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;aAChF;SACF,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,mBAAmB,CACjC,OAAO,EACP,CAAC,YAAY,EAAE,OAAO,CAAC,EACvB,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAC1C,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC7D,MAAM,CACJ,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,CACxF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,OAAO,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAChF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG,wBAAwB,CACvC,aAAa,CAAC;YACZ,QAAQ,EAAE;gBACR,GAAG,aAAa,EAAE,CAAC,QAAQ;gBAC3B,cAAc,EAAE,WAAW;gBAC3B,aAAa,EAAE,2BAA2B,CAAC,oBAAoB,EAAE,gBAAgB,CAAC;aACnF;SACF,CAAC,EACF,OAAO,EACP,CAAC,iBAAiB,CAAC,CACpB,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,kBAAkB,CAChC,OAAO,EACP,YAAY,EACZ,kBAAkB,EAClB,CAAC,YAAY,EAAE,OAAO,CAAC,EACvB,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAC1C,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACjD,OAAO;YACP,MAAM;YACN,gBAAgB;YAChB,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,CAAC,kCAAkC,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,MAAM,CAAC,kCAAkC,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzF,MAAM,CAAC,kCAAkC,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,OAAO,GAAG,aAAa,CAAC;YAC5B,QAAQ,EAAE;gBACR,GAAG,aAAa,EAAE,CAAC,QAAQ;gBAC3B,iBAAiB,EAAE,MAAM;gBACzB,KAAK,EAAE,YAAY;gBACnB,eAAe,EAAE,KAAK;aACvB;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,4BAA4B,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE;gBACR,KAAK,EAAE,OAAO;gBACd,gBAAgB,EAAE,MAAM;gBACxB,sBAAsB,EAAE,aAAa;aACtC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,OAAO,GAAG,aAAa,CAAC;YAC5B,QAAQ,EAAE;gBACR,GAAG,aAAa,EAAE,CAAC,QAAQ;gBAC3B,iBAAiB,EAAE,SAAS;gBAC5B,KAAK,EAAE,YAAY;gBACnB,eAAe,EAAE,MAAM;aACxB;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,4BAA4B,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAEvE,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE;gBACR,KAAK,EAAE,YAAY;gBACnB,gBAAgB,EAAE,MAAM;gBACxB,sBAAsB,EAAE,IAAI;aAC7B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"stream-event-handler.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAW1E,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EAEX,aAAa,EACd,MAAM,iBAAiB,CAAC;AAOzB,KAAK,wBAAwB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACpC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,cAAc,CAAC;IACtD,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7D,kBAAkB,EAAE,CAClB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,MAAM,EAAE,MAAM,KACX,aAAa,GAAG,IAAI,CAAC;IAC1B,iCAAiC,EAAE,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,6BAA6B,EAAE,CAC7B,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,MAAM,EAAE,MAAM,KACX,OAAO,CAAC;IACb,iCAAiC,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrF,wBAAwB,EAAE,CACxB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,aAAa,KACjC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,uBAAuB,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9E,UAAU,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACtE,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpF,CAAC;AAEF,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,sBAAsB;IAEnD,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevE,uBAAuB,CAAC,YAAY,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;YAyHtE,uBAAuB;YAmBvB,4BAA4B;YAgB5B,6BAA6B;YAe7B,yBAAyB;YA2CzB,eAAe;IAsB7B,OAAO,CAAC,kBAAkB;YAIZ,yBAAyB;YAkDzB,oBAAoB;YA4CpB,+BAA+B;IAsB7C,OAAO,CAAC,yBAAyB;IAWjC,OAAO,CAAC,0BAA0B;YAWpB,sBAAsB;YAsBtB,iBAAiB;YA6EjB,mBAAmB;YA+EnB,sCAAsC;~~CA0BrD~~"}
1	+ {"version":3,"file":"stream-event-handler.d.ts","sourceRoot":"","sources":["../../../../../../../../src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAW1E,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EAEX,aAAa,EACd,MAAM,iBAAiB,CAAC;AAOzB,KAAK,wBAAwB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACpC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,cAAc,CAAC;IACtD,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7D,kBAAkB,EAAE,CAClB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,MAAM,EAAE,MAAM,KACX,aAAa,GAAG,IAAI,CAAC;IAC1B,iCAAiC,EAAE,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,6BAA6B,EAAE,CAC7B,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,MAAM,EAAE,MAAM,KACX,OAAO,CAAC;IACb,iCAAiC,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrF,wBAAwB,EAAE,CACxB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,aAAa,KACjC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,uBAAuB,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9E,UAAU,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACtE,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpF,CAAC;AAEF,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,sBAAsB;IAEnD,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevE,uBAAuB,CAAC,YAAY,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;YAyHtE,uBAAuB;YAmBvB,4BAA4B;YAgB5B,6BAA6B;YAe7B,yBAAyB;YA2CzB,eAAe;IAsB7B,OAAO,CAAC,kBAAkB;YAIZ,yBAAyB;YAkDzB,oBAAoB;YA4CpB,+BAA+B;IAsB7C,OAAO,CAAC,yBAAyB;IAWjC,OAAO,CAAC,0BAA0B;YAWpB,sBAAsB;YAsBtB,iBAAiB;YA6EjB,mBAAmB;YA+EnB,sCAAsC;CAgCrD"}

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.js CHANGED Viewed

@@ -414,6 +414,9 @@ export class CodexStreamEventHandler {
     async handleCompletedItemWithoutStartedState(session, item, turnId) {
         const recovered = this.deps.buildToolCallState(session, item, turnId);
         if (recovered) {
+            if (this.deps.shouldHoldTurnForPlanApproval(session, item, turnId)) {
+                this.deps.holdTurnUntilPlanApprovalResolves(session, turnId);
+            }
             await this.deps.emitSessionUpdate(session.sessionId, {
                 sessionUpdate: 'tool_call',
                 toolCallId: recovered.toolCallId,
@@ -424,6 +427,7 @@ export class CodexStreamEventHandler {
                 rawInput: item,
                 rawOutput: item,
             });
+            await this.deps.maybeRequestPlanApproval(session, item, turnId, recovered);
             return;
         }
         this.deps.reportShapeDrift('item_completed_without_started_state', {

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.js.map CHANGED Viewed

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

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.test.js CHANGED Viewed

@@ -139,5 +139,59 @@ describe('stream-event-handler', () => {
         }));
         expect(reportShapeDrift).not.toHaveBeenCalledWith('item_completed_without_started_state', expect.anything());
     });
+    it('requests plan approval for recovered completed plan items', async () => {
+        const session = createSession();
+        session.defaults.collaborationMode = 'plan';
+        session.planTextByItemId.set('item_plan', '## Proposed Plan\n1. Fix recovery approval');
+        const emitSessionUpdate = vi.fn(async () => undefined);
+        const shouldHoldTurnForPlanApproval = vi.fn(() => true);
+        const holdTurnUntilPlanApprovalResolves = vi.fn();
+        const maybeRequestPlanApproval = vi.fn(async () => undefined);
+        const toolState = {
+            toolCallId: 'call_plan',
+            kind: 'think',
+            title: 'plan',
+            locations: [],
+        };
+        const handler = new CodexStreamEventHandler({
+            codex: { request: vi.fn() },
+            sessionIdByThreadId: new Map([['thread_1', 'sess_thread_1']]),
+            sessions: new Map([['sess_thread_1', session]]),
+            requireSession: vi.fn(),
+            emitSessionUpdate,
+            reportShapeDrift: vi.fn(),
+            buildToolCallState: vi.fn(() => toolState),
+            emitReasoningThoughtChunkFromItem: vi.fn(async () => undefined),
+            shouldHoldTurnForPlanApproval,
+            holdTurnUntilPlanApprovalResolves,
+            maybeRequestPlanApproval,
+            hasPendingPlanApprovals: vi.fn(() => false),
+            settleTurn: vi.fn(),
+            emitTurnFailureMessage: vi.fn(async () => undefined),
+        });
+        const item = {
+            type: 'plan',
+            id: 'item_plan',
+            status: 'completed',
+        };
+        await handler.handleCodexNotification({
+            method: 'item/completed',
+            params: {
+                threadId: 'thread_1',
+                turnId: 'turn_1',
+                item,
+            },
+        });
+        expect(shouldHoldTurnForPlanApproval).toHaveBeenCalledWith(session, item, 'turn_1');
+        expect(holdTurnUntilPlanApprovalResolves).toHaveBeenCalledWith(session, 'turn_1');
+        expect(emitSessionUpdate).toHaveBeenCalledWith('sess_thread_1', expect.objectContaining({
+            sessionUpdate: 'tool_call',
+            toolCallId: 'call_plan',
+            title: 'plan',
+            kind: 'think',
+            status: 'completed',
+        }));
+        expect(maybeRequestPlanApproval).toHaveBeenCalledWith(session, item, 'turn_1', toolState);
+    });
 });
 //# sourceMappingURL=stream-event-handler.test.js.map

package/dist/src/backend/services/session/service/acp/codex-app-server-adapter/stream-event-handler.test.js.map CHANGED Viewed

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

package/dist/src/backend/services/session/service/acp/types.d.ts CHANGED Viewed

@@ -1,5 +1,11 @@
 export type AcpProvider = 'CLAUDE' | 'CODEX';
 export type PermissionPreset = 'STRICT' | 'RELAXED' | 'YOLO';
+export interface AcpMcpServerConfig {
+    name: string;
+    command: string;
+    args: string[];
+    env: Record<string, string>;
+}
 export interface AcpClientOptions {
     provider: AcpProvider;
     workingDir: string;
@@ -9,6 +15,7 @@ export interface AcpClientOptions {
     permissionPreset?: PermissionPreset;
     sessionId: string;
     resumeProviderSessionId?: string;
+    mcpServers?: AcpMcpServerConfig[];
 }
 export interface AcpSessionState {
     providerSessionId: string;

package/dist/src/backend/services/session/service/acp/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE7C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAElB,uBAAuB,CAAC,EAAE,MAAM,CAAC;~~CAClC~~;AAED,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;CAC3B"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE7C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7D,MAAM,WAAW,kBAAkB;IAEjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAElB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;CAC3B"}

package/dist/src/backend/services/session/service/bridges.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 export interface SessionWorkspaceBridge {
-    markSessionRunning(workspaceId: string, sessionId: string): void;
-    markSessionIdle(workspaceId: string, sessionId: string): void;
+    markSessionRunning(workspaceId: string, sessionId: string): number;
+    markSessionIdle(workspaceId: string, sessionId: string, generation?: number): void;
     on(event: 'request_notification', handler: (data: {
         workspaceId: string;
         workspaceName: string;
@@ -8,10 +8,14 @@ export interface SessionWorkspaceBridge {
         finishedAt: Date;
     }) => void): void;
 }
+export type RatchetSessionEndOutcome = 'COMPLETED' | 'DIED';
 export interface SessionLifecycleWorkspaceBridge {
-    markSessionRunning(workspaceId: string, sessionId: string): void;
-    markSessionIdle(workspaceId: string, sessionId: string): void;
-    clearRatchetActiveSessionIfMatching(workspaceId: string, sessionId: string): Promise<void>;
+    markSessionRunning(workspaceId: string, sessionId: string): number;
+    markSessionIdle(workspaceId: string, sessionId: string, generation?: number): void;
+    recordRatchetSessionEnd(workspaceId: string, sessionId: string, outcome: RatchetSessionEndOutcome): Promise<void>;
+}
+export interface SessionLifecycleMessageQueueBridge {
+    tryDispatchNextMessage(sessionId: string): Promise<void>;
 }
 export interface SessionAutoIterationExitBridge {
     onAutoIterationSessionExit(workspaceId: string, sessionId: string): void;

package/dist/src/backend/services/session/service/bridges.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bridges.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/session/service/bridges.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,~~IAAI~~,CAAC;~~IACjE~~,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;~~IAC9D~~,EAAE,CACA,KAAK,EAAE,sBAAsB,EAC7B,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,IAAI,CAAC;KAClB,KAAK,IAAI,GACT,IAAI,CAAC;CACT;~~AAGD~~,MAAM,WAAW,+BAA+B;IAC9C,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,~~IAAI~~,CAAC;~~IACjE~~,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;~~IAC9D~~,~~mCAAmC~~,~~CAAC~~,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;~~CAC5F~~;AAGD,MAAM,WAAW,8BAA8B;IAC7C,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1E;AAGD,MAAM,WAAW,uBAAuB;IACtC,sBAAsB,CAAC,KAAK,EAAE,sBAAsB,GAAG,uBAAuB,CAAC;CAChF;AAGD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAGD,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,SAAS,GAAG,SAAS,GAAG,eAAe,CAAC;CACzD"}
1	+ {"version":3,"file":"bridges.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/session/service/bridges.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,sBAAsB;IACrC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACnE,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnF,EAAE,CACA,KAAK,EAAE,sBAAsB,EAC7B,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,IAAI,CAAC;KAClB,KAAK,IAAI,GACT,IAAI,CAAC;CACT;AAOD,MAAM,MAAM,wBAAwB,GAAG,WAAW,GAAG,MAAM,CAAC;AAG5D,MAAM,WAAW,+BAA+B;IAC9C,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACnE,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnF,uBAAuB,CACrB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAGD,MAAM,WAAW,kCAAkC;IACjD,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D;AAGD,MAAM,WAAW,8BAA8B;IAC7C,0BAA0B,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1E;AAGD,MAAM,WAAW,uBAAuB;IACtC,sBAAsB,CAAC,KAAK,EAAE,sBAAsB,GAAG,uBAAuB,CAAC;CAChF;AAGD,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAGD,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,SAAS,GAAG,SAAS,GAAG,eAAe,CAAC;CACzD"}

package/dist/src/backend/services/session/service/chat/chat-event-forwarder.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chat-event-forwarder.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/chat/chat-event-forwarder.service.ts"],"names":[],"mappings":"~~AAeA~~,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;~~AAEzF~~,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;~~AAShF~~,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD,cAAM,yBAAyB;IAE7B,OAAO,CAAC,2BAA2B,CAAS;IAG5C,OAAO,CAAC,eAAe,CAAuC;IAK9D,SAAS,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,sBAAsB,CAAA;KAAE,GAAG,IAAI;IAI/D,OAAO,KAAK,SAAS,GAOpB;IAMD,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAOtC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAQ7E,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAQ9C,4BAA4B,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAQ1E,2BAA2B,IAAI,IAAI;~~IAoCnC~~,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;CAGhE;AAED,eAAO,MAAM,yBAAyB,2BAAkC,CAAC"}
1	+ {"version":3,"file":"chat-event-forwarder.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/chat/chat-event-forwarder.service.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAGzF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAQhF,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD,cAAM,yBAAyB;IAE7B,OAAO,CAAC,2BAA2B,CAAS;IAG5C,OAAO,CAAC,eAAe,CAAuC;IAK9D,SAAS,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,sBAAsB,CAAA;KAAE,GAAG,IAAI;IAI/D,OAAO,KAAK,SAAS,GAOpB;IAMD,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAOtC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAQ7E,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAQ9C,4BAA4B,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAQ1E,2BAA2B,IAAI,IAAI;IA2BnC,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;CAGhE;AAED,eAAO,MAAM,yBAAyB,2BAAkC,CAAC"}

package/dist/src/backend/services/session/service/chat/chat-event-forwarder.service.js CHANGED Viewed

@@ -1,8 +1,6 @@
-import { WS_READY_STATE } from '../../../../../backend/constants/websocket.js';
-import { toError } from '../../../../../backend/lib/error-utils.js';
 import { createLogger } from '../../../../../backend/services/logger.service.js';
 import { sessionDomainService } from '../../../../../backend/services/session/service/session-domain.service.js';
-import { chatConnectionService } from './chat-connection.service.js';
+import { sessionEventBus } from '../../../../../backend/services/session/service/session-event-bus.js';
 const logger = createLogger('chat-event-forwarder');
 class ChatEventForwarderService {
     workspaceNotificationsSetup = false;
@@ -36,23 +34,13 @@ class ChatEventForwarderService {
         this.workspace.on('request_notification', (data) => {
             const { workspaceId, workspaceName, sessionCount, finishedAt } = data;
             logger.debug('Broadcasting workspace notification request', { workspaceId });
-            const message = JSON.stringify({
+            sessionEventBus.publishToAllClients({
                 type: 'workspace_notification_request',
                 workspaceId,
                 workspaceName,
                 sessionCount,
                 finishedAt: finishedAt.toISOString(),
             });
-            for (const info of chatConnectionService.values()) {
-                if (info.ws.readyState === WS_READY_STATE.OPEN) {
-                    try {
-                        info.ws.send(message);
-                    }
-                    catch (error) {
-                        logger.error('Failed to send workspace notification', toError(error));
-                    }
-                }
-            }
         });
     }
     getAllPendingRequests() {