Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
test(codex): cover profile lifecycle late responses via real app-server client
MagicLizi2e7f00f9a3bb
diff --git a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.tsindex 3c71b7113e..310ca44cda 100644--- a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts+++ b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts@@ -12,7 +12,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest';import type { AgentDeps, DeviceHostedSession } from '../../base-agent.js';import type { Logger } from '../../../interfaces/logger.js';+import { AppServerClient, type RequestProgressDeadline } from '../app-server/client.js';import { Method } from '../app-server/protocol.js';+import type { CloseHandler, LineHandler, Transport } from '../app-server/transport.js';import { withoutCodexSpawnModelOverrides } from '../device-hosted-guest.js';import { CodexAgent } from '../index.js';@@ -34,6 +36,75 @@ function noopLogger(): Logger {return logger;}+/** 假传输:让 profile 生命周期请求走真实 AppServerClient 的 pending/超时逻辑。 */+class FakeAppServerTransport implements Transport {+ readonly lines: string[] = [];+ private readonly lineHandlers = new Set<LineHandler>();+ private readonly closeHandlers = new Set<CloseHandler>();++ async writeLine(line: string): Promise<void> {+ this.lines.push(line);+ }++ onLine(handler: LineHandler): () => void {+ this.lineHandlers.add(handler);+ return () => this.lineHandlers.delete(handler);+ }++ onStderr(): () => void {+ return () => undefined;+ }++ onClose(handler: CloseHandler): () => void {+ this.closeHandlers.add(handler);+ return () => this.closeHandlers.delete(handler);+ }++ async close(): Promise<void> {}++ emitLine(value: unknown): void {+ const line = JSON.stringify(value);+ for (const handler of this.lineHandlers) handler(line);+ }+}++/**+ * 让 profile 替换请求走真实 AppServerClient + 假传输(#5774 review):请求的+ * timeoutMs/extendWhileProgress 由 AppServerClient 的 pending 超时逻辑真实执行,+ * 才能验证接受期限收口后晚到响应仍被 pending 收下、晚到窗口结束后请求被清除。+ * 受控 Promise 会绕过内层超时,即使两层同上限丢响应也测不出来。+ */+function installRealAppServerReplacement(fixture: Awaited<ReturnType<typeof startHosted>>) {+ const transport = new FakeAppServerTransport();+ const client = new AppServerClient({ createTransport: () => transport, logger: noopLogger() });+ client.start();+ const baseRequest = fixture.request.getMockImplementation()!;+ let replacementGated = false;+ let inner: Promise<unknown> = Promise.resolve(undefined);+ fixture.request.mockImplementation(async (+ method: string,+ params: unknown,+ options?: { timeoutMs?: number; extendWhileProgress?: RequestProgressDeadline },+ ) => {+ // startSession 的首次 thread/start 已经发完;此后唯一的 ThreadStart 就是 profile 替换。+ if (method === Method.ThreadStart && !replacementGated) {+ replacementGated = true;+ inner = client.request(method, params, options);+ return inner;+ }+ return baseRequest(method, params);+ });+ return {+ client,+ transport,+ lastRequestId: () => (JSON.parse(transport.lines.at(-1)!) as { id: number }).id,+ innerSettled: () => inner.then(+ () => ({ ok: true }),+ (error: Error) => ({ ok: false, message: error.message }),+ ),+ };+}+async function makeTempDir(prefix: string): Promise<string> {const dir = await fs.realpath(await fs.mkdtemp(path.join(os.tmpdir(), prefix)));tempDirs.push(dir);@@ -489,20 +560,9 @@ describe('Codex device-hosted guest sessions', () => {const fixture = await startHosted({ guest: true, linkActivity });const handle = await fixture.started;const host = await fixture.getHost.mock.results[0]!.value;- const baseRequest = fixture.request.getMockImplementation()!;- let replacementGated = false;- let resolveReplacement: (response: unknown) => void = () => undefined;- const replacement = new Promise((resolve) => {- resolveReplacement = resolve;- });- fixture.request.mockImplementation(async (method: string, params: unknown) => {- // startSession 的首次 thread/start 已经发完;此后唯一的 ThreadStart 就是 profile 替换。- if (method === Method.ThreadStart && !replacementGated) {- replacementGated = true;- return replacement;- }- return baseRequest(method, params);- });+ // 受测的替换请求走真实 AppServerClient + 假传输(#5774 review):pending 的删除由+ // 真实超时逻辑负责,受控 Promise 会绕过内层超时、测不出两层同上限丢响应。+ const appServer = installRealAppServerReplacement(fixture);await handle.setExtraDirs?.(['/shared-profile']);activityAt = Date.now() + 45_000;vi.useFakeTimers();@@ -533,15 +593,64 @@ describe('Codex device-hosted guest sessions', () => {} finally {vi.useRealTimers();}- // 接受期限收口后,晚到响应仍到达 onLateResolve:脱线线程被退订,- // 而不是被同上限的内层超时丢弃。- resolveReplacement({- thread: { id: 'late-thread-id' },- model: 'gpt-5.5',- modelProvider: 'openai',- cwd: '/repo',+ // 接受期限收口后,晚到响应仍被真实 pending 收下并到达 onLateResolve:脱线线程+ // 被退订,而不是被同上限的内层超时删掉 pending 丢弃。+ appServer.transport.emitLine({+ id: appServer.lastRequestId(),+ result: {+ thread: { id: 'late-thread-id' },+ model: 'gpt-5.5',+ modelProvider: 'openai',+ cwd: '/repo',+ },});await vi.waitFor(() => expect(host.unsubscribeThread).toHaveBeenCalledWith('late-thread-id'));+ await appServer.client.close();+ await handle.close();+ });++ it('clears an unanswered profile replacement after the late response window', async () => {+ // 链路没有往来:外层 60s 基准直接收口,内层靠晚到响应窗口继续存活。+ const linkActivity = vi.fn(() => ({+ lastActivityAt: null,+ execRequests: 0,+ execResponses: 0,+ execMaxInFlight: 0,+ httpInFlight: 0,+ }));+ const fixture = await startHosted({ guest: true, linkActivity });+ const handle = await fixture.started;+ const host = await fixture.getHost.mock.results[0]!.value;+ const appServer = installRealAppServerReplacement(fixture);+ await handle.setExtraDirs?.(['/shared-profile']);+ vi.useFakeTimers();+ try {+ const sendPromise = handle.send(+ { type: 'user', content: 'use the hosted profile' },+ { throwOnStartFailure: true },+ );+ // 失败在 fake timers 推进中发生:先挂处理器,避免 unhandled rejection。+ void sendPromise.catch(() => undefined);+ await vi.advanceTimersByTimeAsync(60_000);+ await expect(sendPromise).rejects.toThrow(/did not acknowledge within 60000ms/);+ // 晚到窗口(5min)到点后 AppServerClient 按超时显式删除 pending:+ // 请求被清除,而不是无限挂在 pending 里泄漏。+ await vi.advanceTimersByTimeAsync(310_000);+ await expect(appServer.innerSettled()).resolves.toMatchObject({+ ok: false,+ message: expect.stringMatching(/timed out after 360000ms/),+ });+ } finally {+ vi.useRealTimers();+ }+ // 窗口结束后才到的响应被丢弃,不会再触发 onLateResolve 的退订清理。+ appServer.transport.emitLine({+ id: appServer.lastRequestId(),+ result: { thread: { id: 'too-late-thread-id' } },+ });+ await new Promise((resolve) => setTimeout(resolve, 20));+ expect(host.unsubscribeThread).not.toHaveBeenCalled();+ await appServer.client.close();await handle.close();});