Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(codex): WS 加密推理报错落回 HTTP 后直接剥离,不再等上游 400
Dashff0f232055d1
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyEncryptedHttpRecovery.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyEncryptedHttpRecovery.test.tsnew file mode 100644index 0000000000..5d29f3283b--- /dev/null+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyEncryptedHttpRecovery.test.ts@@ -0,0 +1,170 @@+/**+ * WS 命中 invalid_encrypted_content 后经 426 落回 HTTP 的端到端恢复。+ *+ * 实测(2026-10-18):任务从网关模型切到 ChatGPT 订阅后,订阅后端在 WS 上回 400+ * invalid_encrypted_content,但同一历史走 HTTP 时回 200 + 一条 SSE error 事件,从不回 400。+ * 只认 400/422 的 recoveryRules 因此永远不触发,每轮都以+ * "stream closed before response.completed" 失败。+ *+ * codexProxyHost.test.ts 把剥离链路整体 mock 成 no-op,看不到请求体是否真被清洗;本文件+ * 保留真实的 strip controller / active strip transform / recovery rule,只把上游换成本地+ * 模拟订阅后端的 server。+ */+import { once } from 'node:events';+import { createServer, request as httpRequest, type IncomingMessage } from 'node:http';+import type { AddressInfo } from 'node:net';++import { afterEach, describe, expect, it, vi } from 'vitest';+import { WebSocket, WebSocketServer } from 'ws';++const proxyUpstream = vi.hoisted(() => ({ url: '' }));++vi.mock('electron', () => ({+ app: { isPackaged: false, getPath: vi.fn(() => '/tmp/cindy-codex-encrypted-recovery-test'), getAppPath: vi.fn(() => process.cwd()) },+}));+vi.mock('../../appCapabilities.js', () => ({+ getAppCapabilities: () => ({ canUseCindyGateway: true }),+}));+vi.mock('../../logger.js', () => {+ const logger = { trace: vi.fn(), debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() };+ return { createLogger: () => logger, getLogLevel: () => 'info', getLogDir: () => '/tmp/cindy-codex-encrypted-recovery-test/logs' };+});+vi.mock('../../clientEndpointsService.js', async () => {+ const { TEST_CLIENT_ENDPOINTS } = await import('../../../test/vitest/clientEndpointsFixture');+ return {+ getClientEndpoint: (key: keyof typeof TEST_CLIENT_ENDPOINTS) => TEST_CLIENT_ENDPOINTS[key],+ };+});+vi.mock('../../model-access/effectiveEndpoint.js', async () => {+ const { TEST_XD_GATEWAY_BASE_URL } = await import('../../../test/vitest/clientEndpointsFixture');+ return { effectiveXdGatewayBaseUrl: () => TEST_XD_GATEWAY_BASE_URL };+});+// 只把上游指向本地模拟 server;剥离相关的 transform / rule / controller 全部保持真实。+vi.mock('@cindy/anthropic-compat-proxy', async (importOriginal) => {+ const actual = await importOriginal<typeof import('@cindy/anthropic-compat-proxy')>();+ return {+ ...actual,+ createAnthropicCompatProxy: (opts: Parameters<typeof actual.createAnthropicCompatProxy>[0]) =>+ actual.createAnthropicCompatProxy({+ ...opts,+ upstream: proxyUpstream.url,+ resolveOutboundProxy: () => null,+ resolveWebSocketUpstream: (ctx) => (opts.resolveWebSocketUpstream?.(ctx) ? proxyUpstream.url : null),+ routingTransform: async (body, ctx) => ({+ ...(await opts.routingTransform?.(body, ctx)),+ upstreamOverride: proxyUpstream.url,+ }),+ }),+ };+});++import {+ armCodexHttpRecovery,+ disposeCodexProxy,+ ensureCodexProxyReady,+ getCodexProxyEndpoint,+ registerComposed,+ setCodexProxyAuthInjection,+ unregister,+} from '../codex-proxy-host';++const ENCRYPTED_ERROR = {+ type: 'error',+ status: 400,+ error: {+ type: 'invalid_request_error',+ code: 'invalid_encrypted_content',+ param: 'input',+ message: 'The encrypted content for item rs_gateway could not be verified. Reason: Encrypted content could not be decrypted or parsed.',+ },+};++// 历史来自另一个供应商:reasoning 的密文当前账号解不开。+const HISTORY = {+ model: 'gpt-6.1-sol',+ stream: true,+ input: [+ { type: 'message', role: 'user', content: [{ type: 'input_text', text: '上一轮的问题' }] },+ { type: 'reasoning', id: 'rs_gateway', summary: [], encrypted_content: 'gAAAA-issued-by-gateway' },+ { type: 'message', role: 'assistant', content: [{ type: 'output_text', text: '上一轮的回答' }] },+ { type: 'message', role: 'user', content: [{ type: 'input_text', text: '继续' }] },+ ],+};++async function readBody(req: IncomingMessage): Promise<string> {+ const chunks: Buffer[] = [];+ for await (const chunk of req) chunks.push(Buffer.from(chunk));+ return Buffer.concat(chunks).toString('utf8');+}++describe('codex encrypted-content recovery after WebSocket → HTTP fallback', () => {+ afterEach(async () => {+ unregister('session-switched');+ await disposeCodexProxy();+ });++ it('strips undecryptable reasoning on the first HTTP replay instead of waiting for an upstream 400', async () => {+ const httpBodies: string[] = [];+ // 模拟 ChatGPT 订阅后端:WS 回 400 错误帧;HTTP 对同样的历史回 200 + SSE error,不给 400。+ const upstream = createServer(async (req, res) => {+ const body = await readBody(req);+ httpBodies.push(body);+ res.writeHead(200, { 'content-type': 'text/event-stream', connection: 'close' });+ if (body.includes('encrypted_content')) {+ res.end(`event: error\ndata: ${JSON.stringify(ENCRYPTED_ERROR)}\n\n`);+ return;+ }+ res.end(`event: response.completed\ndata: ${JSON.stringify({ type: 'response.completed', response: { id: 'resp_ok', output: [] } })}\n\n`);+ });+ const wss = new WebSocketServer({ noServer: true });+ upstream.on('upgrade', (req, socket, head) => wss.handleUpgrade(req, socket, head, (ws) => {+ ws.on('message', () => ws.send(JSON.stringify(ENCRYPTED_ERROR)));+ }));+ await new Promise<void>((resolve) => upstream.listen(0, '127.0.0.1', resolve));+ proxyUpstream.url = `http://127.0.0.1:${(upstream.address() as AddressInfo).port}`;++ let client: WebSocket | null = null;+ try {+ setCodexProxyAuthInjection('oauth-bearer');+ await ensureCodexProxyReady();+ const proxyUrl = getCodexProxyEndpoint();+ registerComposed('session-switched', 'thread-switched', 'PRODUCT_PROMPT');++ client = new WebSocket(`${proxyUrl.replace(/^http/, 'ws')}/v1/responses`, { headers: { 'thread-id': 'thread-switched' } });+ await once(client, 'open');+ const rejection = once(client, 'message');+ client.send(JSON.stringify({ type: 'response.create', ...HISTORY }));+ const [frame] = await rejection;+ expect(armCodexHttpRecovery({+ sessionId: 'session-switched',+ threadId: 'thread-switched',+ message: JSON.stringify(JSON.parse(frame.toString())),+ })).toBe('encrypted_content');++ // Codex 收到 426 后改发 HTTP,带着同一份历史。+ const replay = await new Promise<string>((resolve, reject) => {+ const req = httpRequest(`${proxyUrl}/v1/responses`, {+ method: 'POST',+ headers: { 'content-type': 'application/json', 'thread-id': 'thread-switched' },+ }, (res) => { void readBody(res).then(resolve, reject); });+ req.once('error', reject);+ req.end(JSON.stringify(HISTORY));+ });++ expect(replay).toContain('response.completed');+ expect(httpBodies).toHaveLength(1);+ const sent = JSON.parse(httpBodies[0]!) as { input: Array<Record<string, unknown>> };+ expect(JSON.stringify(sent.input)).not.toContain('encrypted_content');+ // 可读的对话内容保持原样,只丢掉解不开的密文。+ expect(sent.input.filter((item) => item.type === 'message')).toEqual(+ HISTORY.input.filter((item) => item.type === 'message'),+ );+ } finally {+ client?.terminate();+ for (const ws of wss.clients) ws.terminate();+ await new Promise<void>((resolve) => wss.close(() => resolve()));+ upstream.closeAllConnections();+ await new Promise<void>((resolve) => upstream.close(() => resolve()));+ }+ });+});diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.tsindex 1339b21f11..169e085b5a 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts@@ -1618,7 +1618,7 @@ describe('chatBridgeCapabilitiesForRoute', () => {},};const transforms = mockState.createAnthropicCompatProxy.mock.calls[0]?.[0]?.transformRequest ?? [];- const forcedRouteTransform = transforms[3];+ const forcedRouteTransform = transforms[4];if (!forcedRouteTransform) throw new Error('expected locked Subagent route transform');mockState.injectionTransform.mockImplementationOnce((body) => {// 首个 collab_spawn 请求必须先懒登记血缘,同一轮 instructions transform 才能@@ -1708,7 +1708,7 @@ describe('chatBridgeCapabilitiesForRoute', () => {},)).toBeNull();- const execGuardTransform = transforms[5];+ const execGuardTransform = transforms[6];if (!execGuardTransform) throw new Error('expected locked Subagent exec guard transform');const guarded = execGuardTransform({model: 'deepseek/deepseek-v4-flash',@@ -1805,7 +1805,7 @@ describe('chatBridgeCapabilitiesForRoute', () => {},};const transforms = mockState.createAnthropicCompatProxy.mock.calls[0]?.[0]?.transformRequest ?? [];- const forcedRouteTransform = transforms[3];+ const forcedRouteTransform = transforms[4];if (!forcedRouteTransform) throw new Error('expected smart Subagent route transform');expect(forcedRouteTransform({model: 'smart/model-cheap',@@ -2729,7 +2729,7 @@ describe('codex proxy host', () => {// upstream 是函数形态(每请求现取,model-access 下发可运行期换 endpoint);// 断言其当前求值 = 网关 base + /v1upstream: expect.any(Function),- // [encrypted activeStrip, image generation activeStrip, provider-aware Guardian reviewer, locked Subagent route, instructions 注入, locked Subagent exec guard, Gateway 原生 web_search, 跨来源压缩块兼容, xAI ModelInput activeStrip, responses item id activeStrip(#4738), responses item id length activeStrip(#4227), exec function adapter, strict gateway history 兼容, xAI ModelInput sanitize, DeepSeek V4 custom tool 兼容, xAI Responses 兼容, XD Gateway Grok 兼容, ByteDance Seed tool 兼容, MiniMax effort 兼容, provider model rewrite, provider 参数归一, 视觉桥(controller 未注入 → 短路透传), 工具 ID 校正, stripNonAnthropicFields]+ // [armed HTTP recovery strip(WS 错误后落回 HTTP 即激活对应 strip), encrypted activeStrip, image generation activeStrip, provider-aware Guardian reviewer, locked Subagent route, instructions 注入, locked Subagent exec guard, Gateway 原生 web_search, 跨来源压缩块兼容, xAI ModelInput activeStrip, responses item id activeStrip(#4738), responses item id length activeStrip(#4227), exec function adapter, strict gateway history 兼容, xAI ModelInput sanitize, DeepSeek V4 custom tool 兼容, xAI Responses 兼容, XD Gateway Grok 兼容, ByteDance Seed tool 兼容, MiniMax effort 兼容, provider model rewrite, provider 参数归一, 视觉桥(controller 未注入 → 短路透传), 工具 ID 校正, stripNonAnthropicFields]transformRequest: [expect.any(Function), expect.any(Function), expect.any(Function), expect.any(Function), expect.any(Function),expect.any(Function), expect.any(Function), expect.any(Function), expect.any(Function), expect.any(Function),@@ -2737,6 +2737,7 @@ describe('codex proxy host', () => {expect.any(Function), expect.any(Function), expect.any(Function), expect.any(Function),expect.any(Function), expect.any(Function), expect.any(Function), expect.any(Function),expect.any(Function), expect.any(Function), // frozen custom-provider effort+ expect.any(Function),],transformResponse: expect.any(Function),routingTransform: expect.any(Function),@@ -3548,8 +3549,8 @@ describe('codex proxy host', () => {setSessionProvider('session-openai-review', 'openai');const transforms = mockState.createAnthropicCompatProxy.mock.calls[0]?.[0]?.transformRequest ?? [];- // active strips ×2, then provider-aware Guardian rewrite。- const reviewerTransform = transforms[2];+ // armed HTTP recovery strip, active strips ×2, then provider-aware Guardian rewrite。+ const reviewerTransform = transforms[3];if (!reviewerTransform) throw new Error('expected Guardian reviewer transform');const body = { model: 'codex-auto-review', input: [{ role: 'user', content: 'review' }] };const guardianHeaders = (parentThreadId: string) => ({@@ -3616,7 +3617,7 @@ describe('codex proxy host', () => {await host.ensureCodexControlPlaneProxyReady('oauth-bearer');const transforms = mockState.createAnthropicCompatProxy.mock.calls[0]?.[0]?.transformRequest ?? [];- const reviewerTransform = transforms[2];+ const reviewerTransform = transforms[3];if (!reviewerTransform) throw new Error('expected Guardian reviewer transform');expect(reviewerTransform({ model: 'codex-auto-review', input: [] },@@ -6852,7 +6853,7 @@ describe('codex proxy host', () => {await host.ensureCodexProxyReady();const transforms = mockState.createAnthropicCompatProxy.mock.calls[0]?.[0]?.transformRequest ?? [];- expect(transforms).toHaveLength(26); // ordinary transforms + dump + frozen custom-provider effort+ expect(transforms).toHaveLength(27); // ordinary transforms + dump + frozen custom-provider effortconst ctx = {method: 'POST',url: '/v1/responses',diff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.tsindex 26810e4f29..e68dac77b6 100644--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts@@ -185,6 +185,8 @@ export interface CodexObservedSubagentIdentity {const observedSubagentIdentityByThread = new Map<string, CodexObservedSubagentIdentity>();const reviewerModelBySession = new Map<string, string>();const httpRecoveryReasonByThread = new Map<string, string>();+/** WS 已确认、尚未在落回的 HTTP 请求上激活对应 strip 的 recovery 原因(一次性消费)。 */+const pendingHttpRecoveryStripByThread = new Map<string, string>();const CODEX_AUTO_REVIEW_MODEL = 'codex-auto-review';const CODEX_GUARDIAN_SUBAGENT = 'guardian';@@ -324,6 +326,7 @@ export function armCodexHttpRecovery(args: {sessionToThreads.set(sessionId, threads);threadToSession.set(threadId, sessionId);}+ pendingHttpRecoveryStripByThread.set(threadId, reason);log.info('codex websocket recovery fallback armed', {sessionId,threadId,@@ -334,6 +337,29 @@ export function armCodexHttpRecovery(args: {return reason;}+/**+ * WS 已确认的 body recovery 原因,在 426 落回 HTTP 后的首个请求上直接激活对应 strip,+ * 不再等上游 400。ChatGPT 订阅后端对解不开的 encrypted_content 在 WS 上回 400 错误帧,+ * 同一历史走 HTTP 时却回 200 + SSE error 事件;只认 400/422 的 recoveryRules 永远不触发,+ * 任务每轮都以 "stream closed before response.completed" 失败(2026-10-18 实测)。+ * 激活与上游 400 触发的 rule.onRetry 等价:按本次请求的 model 标记,换模型后照常 reconcile。+ * 必须排在各 active strip transform 之前,同一请求即生效。+ */+function createArmedHttpRecoveryStripTransform(): RequestTransform {+ return (body, ctx) => {+ if (!isPlainObject(body) || typeof body.model !== 'string' || !body.model) return null;+ const threadId = selectedThreadIdFromHeaders(ctx.headers);+ const reason = pendingHttpRecoveryStripByThread.get(threadId);+ if (!reason) return null;+ pendingHttpRecoveryStripByThread.delete(threadId);+ const rule = CODEX_BODY_RECOVERY_RULES.find((candidate) => candidate.id === reason);+ if (!rule?.enabled() || !rule.onRetry) return null;+ rule.onRetry(threadId, body.model);+ log.info('codex HTTP recovery strip activated from websocket error', { threadId, reason, model: body.model });+ return null;+ };+}+// codex 走 Responses API,每轮**全量重发**整个 thread 历史;导入的存量长会话// (贴图 base64 + 加密 reasoning blob,字节数膨胀远快于 token 数)单次请求体可以// 轻松越过 proxy 默认的 32MB —— 原生 codex 直连上游没有这道闸,曾导致导入会话@@ -3144,6 +3170,7 @@ function createTransformRequestChain(execAdapter.releaseResponse(requestId);};const transforms: RequestTransform[] = [+ createArmedHttpRecoveryStripTransform(),createActiveStripTransform({controller: encryptedStripController,enabled: () => readSilentEncryptedRetrySettings().enabled,@@ -3884,6 +3911,7 @@ function clearSessionThreads(sessionId: string): string[] {smartSubagentRoutesByThread.delete(threadId);observedSubagentIdentityByThread.delete(threadId);httpRecoveryReasonByThread.delete(threadId);+ pendingHttpRecoveryStripByThread.delete(threadId);}}return threadIds;@@ -3932,6 +3960,7 @@ export async function disposeCodexProxy(): Promise<void> {observedSubagentIdentityByThread.clear();reviewerModelBySession.clear();httpRecoveryReasonByThread.clear();+ pendingHttpRecoveryStripByThread.clear();if (_startPromise) {await _startPromise.catch(() => undefined);