fix(codex): recover app-server completion stalls · opencl...

Recent Commits to openclaw:main

keshavbotage · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -808,12 +808,15 @@ describe("connectCodexAppServerEndpoint", () => {`
`808`	`808`	`const sawProbeRequest = new Promise<void>((resolve) => {`
`809`	`809`	`server.once("connection", (socket) => {`
`810`	`810`	`socket.on("message", (data) => {`
`811`		`-const text = Array.isArray(data)`
`812`		`- ? Buffer.concat(data).toString("utf8")`
`813`		`- : data instanceof ArrayBuffer`
`814`		`- ? Buffer.from(new Uint8Array(data)).toString("utf8")`
`815`		`- : Buffer.from(data).toString("utf8");`
`816`		`-const request = JSON.parse(text) as Record<string, unknown>;`
	`811`	`+const messageText =`
	`812`	`+typeof data === "string"`
	`813`	`+ ? data`
	`814`	`+ : Array.isArray(data)`
	`815`	`+ ? Buffer.concat(data).toString()`
	`816`	`+ : data instanceof ArrayBuffer`
	`817`	`+ ? Buffer.from(new Uint8Array(data)).toString()`
	`818`	`+ : Buffer.from(data).toString();`
	`819`	`+const request = JSON.parse(messageText) as Record<string, unknown>;`
`817`	`820`	`if (request.method === "initialize") {`
`818`	`821`	`socket.send(JSON.stringify({ id: request.id, result: {} }));`
`819`	`822`	`}`

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,8 @@`
`176`	`176`	`},`
`177`	`177`	`"postToolRawAssistantCompletionIdleTimeoutMs": {`
`178`	`178`	`"type": "number",`
`179`		`-"minimum": 1`
	`179`	`+"minimum": 1,`
	`180`	`+"default": 300000`
`180`	`181`	`},`
`181`	`182`	`"approvalPolicy": {`
`182`	`183`	`"type": "string",`
`@@ -360,7 +361,7 @@`
`360`	`361`	`},`
`361`	`362`	`"appServer.postToolRawAssistantCompletionIdleTimeoutMs": {`
`362`	`363`	`"label": "Post-Tool Raw Assistant Completion Idle Timeout",`
`363`		`-"help": "Completion-idle guard after a tool handoff when Codex emits raw assistant completion or progress without turn/completed. Defaults to the assistant completion idle timeout when unset.",`
	`364`	`+"help": "Completion-idle guard after a tool handoff when Codex emits raw assistant completion or progress without turn/completed. Defaults to 300000 ms when unset.",`
`364`	`365`	`"advanced": true`
`365`	`366`	`},`
`366`	`367`	`"appServer.approvalPolicy": {`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import {`
`4`	`4`	`isAssistantCompletionReleaseNotification,`
`5`	`5`	`isCodexTurnAbortMarkerNotification,`
`6`	`6`	`isNativeToolProgressNotification,`
	`7`	`+isNativeResponseStreamDeltaNotification,`
`7`	`8`	`isPendingOpenClawDynamicToolCompletionNotification,`
`8`	`9`	`isRawAssistantCompletionNotification,`
`9`	`10`	`isRawReasoningCompletionNotification,`
`@@ -99,9 +100,10 @@ export function applyCodexTurnNotificationState(params: {`
`99`	`100`	`params.turnId,`
`100`	`101`	`);`
`101`	`102`	`const isTurnCompletion = notification.method === "turn/completed" && isCurrentTurnNotification;`
	`103`	`+const isNativeResponseStreamDelta = isNativeResponseStreamDeltaNotification(notification);`
`102`	`104`	`let turnCrossedToolHandoff = params.turnCrossedToolHandoff;`
`103`	`105`
`104`		`-if (isCurrentTurnNotification) {`
	`106`	`+if (isCurrentTurnNotification && !isNativeResponseStreamDelta) {`
`105`	`107`	turnWatches.touchActivity(`notification:${notification.method}`, {
`106`	`108`	`details: describeNotificationActivity(notification),`
`107`	`109`	`attemptProgress: true,`
`@@ -174,6 +176,9 @@ export function applyCodexTurnNotificationState(params: {`
`174`	`176`	`} else if (isCurrentTurnNotification && assistantCompletionCanRelease) {`
`175`	`177`	`turnWatches.armAssistantCompletionIdleWatch(describeNotificationActivity(notification));`
`176`	`178`	`} else if (postToolRawAssistantCompletionNeedsTerminalGuard) {`
	`179`	`+// A post-tool assistant status can be followed by native Codex streaming a`
	`180`	`+// large custom tool input. Forwarded raw deltas refresh activity at enqueue`
	`181`	`+// time; keep this guard conservative for versions that do not forward them.`
`177`	`182`	`turnWatches.armCompletionIdleWatch({`
`178`	`183`	`timeoutMs: params.postToolRawAssistantCompletionIdleTimeoutMs,`
`179`	`184`	`});`
`@@ -203,6 +208,7 @@ export function applyCodexTurnNotificationState(params: {`
`203`	`208`	`!turnWatches.isCompletionIdleWatchPinnedByTerminalError() &&`
`204`	`209`	`notification.method !== "turn/completed" &&`
`205`	`210`	`isCurrentTurnNotification &&`
	`211`	`+!isNativeResponseStreamDelta &&`
`206`	`212`	`!trackedDynamicToolCompletion &&`
`207`	`213`	`!rawToolOutputCompletion &&`
`208`	`214`	`!postToolRawAssistantCompletionNeedsTerminalGuard &&`

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,12 @@ export function isNativeToolProgressNotification(notification: CodexServerNotifi`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
	`182`	`+export function isNativeResponseStreamDeltaNotification(`
	`183`	`+notification: CodexServerNotification,`
	`184`	`+): boolean {`
	`185`	`+return notification.method.startsWith("response.") && notification.method.endsWith(".delta");`
	`186`	`+}`
	`187`	`+`
`182`	`188`	`export function isRawAssistantCompletionNotification(`
`183`	`189`	`notification: CodexServerNotification,`
`184`	`190`	`): boolean {`

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,28 @@ describe("Codex app-server attempt results", () => {`
`89`	`89`	`replayInvalid: true,`
`90`	`90`	`livenessState: "abandoned",`
`91`	`91`	`});`
	`92`	`+expect(`
	`93`	`+buildCodexAppServerPromptTimeoutOutcome({`
	`94`	`+result: createResult({`
	`95`	`+assistantTexts: ["I am changing the data model now..."],`
	`96`	`+}),`
	`97`	`+turnCompletionIdleTimedOut: true,`
	`98`	`+}),`
	`99`	`+).toEqual({`
	`100`	`+message:`
	`101`	`+"Codex stopped before confirming the turn was complete. The response may be incomplete; retry if needed.",`
	`102`	`+});`
	`103`	`+expect(`
	`104`	`+buildCodexAppServerPromptTimeoutOutcome({`
	`105`	`+result: createResult({`
	`106`	`+toolMetas: [{ toolName: "exec" }],`
	`107`	`+}),`
	`108`	`+turnCompletionIdleTimedOut: true,`
	`109`	`+}),`
	`110`	`+).toEqual({`
	`111`	`+message:`
	`112`	`+"Codex stopped before confirming the turn was complete. The response may be incomplete; retry if needed.",`
	`113`	`+});`
`92`	`114`	`});`
`93`	`115`
`94`	`116`	`it("classifies replay blocked reasons", () => {`

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,12 @@ export function buildCodexAppServerPromptTimeoutOutcome(params: {`
`27`	`27`	`const completionIdleTimeoutHadPotentialSideEffects = hasCodexAppServerPotentialSideEffectEvidence(`
`28`	`28`	`params.result,`
`29`	`29`	`);`
	`30`	`+const replayBlockedReason = resolveCodexAppServerReplayBlockedReason(params.result);`
`30`	`31`	`if (`
`31`	`32`	`!params.turnCompletionIdleTimedOut \|\|`
`32`	`33`	`(params.result.itemLifecycle.completedCount === 0 &&`
`33`		`-!completionIdleTimeoutHadPotentialSideEffects)`
	`34`	`+!completionIdleTimeoutHadPotentialSideEffects &&`
	`35`	`+replayBlockedReason === undefined)`
`34`	`36`	`) {`
`35`	`37`	`return undefined;`
`36`	`38`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import { afterEach, describe, expect, it, vi } from "vitest";`
`2`	`2`	`import {`
`3`	`3`	`CODEX_APP_SERVER_STARTUP_TIMEOUT_FLOOR_MS,`
	`4`	`+CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
`4`	`5`	`CODEX_TURN_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
`5`	`6`	`CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS,`
`6`	`7`	`CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS,`
`@@ -36,6 +37,11 @@ describe("Codex app-server attempt timeouts", () => {`
`36`	`37`	`});`
`37`	`38`
`38`	`39`	`it("normalizes turn idle timeout overrides", () => {`
	`40`	`+expect(CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS).toBe(5 * 60_000);`
	`41`	`+expect(CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS).toBeGreaterThan(`
	`42`	`+CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS,`
	`43`	`+);`
	`44`	`+`
`39`	`45`	`expect(resolveCodexTurnCompletionIdleTimeoutMs(undefined)).toBe(`
`40`	`46`	`CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS,`
`41`	`47`	`);`
`@@ -54,9 +60,21 @@ describe("Codex app-server attempt timeouts", () => {`
`54`	`60`	`expect(resolveCodexTurnAssistantCompletionIdleTimeoutMs(9.8)).toBe(9);`
`55`	`61`	`expect(resolveCodexTurnAssistantCompletionIdleTimeoutMs(-10)).toBe(1);`
`56`	`62`
`57`		`-expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(undefined, 123)).toBe(123);`
`58`		`-expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(Number.NaN, 123)).toBe(123);`
`59`		`-expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(undefined, Number.NaN)).toBe(1);`
	`63`	`+expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(undefined, 123)).toBe(`
	`64`	`+CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
	`65`	`+);`
	`66`	`+expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(Number.NaN, 123)).toBe(`
	`67`	`+CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
	`68`	`+);`
	`69`	`+expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(undefined, 120_000)).toBe(`
	`70`	`+CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
	`71`	`+);`
	`72`	`+expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(undefined, 6 * 60_000)).toBe(`
	`73`	`+6 * 60_000,`
	`74`	`+);`
	`75`	`+expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(undefined, Number.NaN)).toBe(`
	`76`	`+CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
	`77`	`+);`
`60`	`78`	`expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(7.9, 123)).toBe(7);`
`61`	`79`	`expect(resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(0, 123)).toBe(1);`
`62`	`80`

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,10 @@ import { parseFiniteNumber } from "openclaw/plugin-sdk/number-runtime";`
`3`	`3`	`export const CODEX_APP_SERVER_STARTUP_TIMEOUT_FLOOR_MS = 100;`
`4`	`4`	`export const CODEX_TURN_COMPLETION_IDLE_TIMEOUT_MS = 60_000;`
`5`	`5`	`export const CODEX_TURN_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS = 10_000;`
	`6`	`+// Native Codex can stream a large custom tool input after a raw assistant`
	`7`	`+// progress item. Forwarded deltas count as activity, but older native paths may`
	`8`	`+// not surface them, so keep this terminal guard conservative.`
	`9`	`+export const CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS = 5 * 60_000;`
`6`	`10`	`export const CODEX_POST_REASONING_SOURCE_REPLY_IDLE_TIMEOUT_MS = 5 * 60_000;`
`7`	`11`	`export const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 60_000;`
`8`	`12`
`@@ -91,7 +95,11 @@ export function resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(`
`91`	`95`	`value: number \| undefined,`
`92`	`96`	`fallbackMs: number,`
`93`	`97`	`): number {`
`94`		`-return resolvePositiveIntegerTimeoutMs(value, fallbackMs);`
	`98`	`+const defaultMs = Math.max(`
	`99`	`+resolvePositiveIntegerTimeoutMs(undefined, fallbackMs),`
	`100`	`+CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS,`
	`101`	`+);`
	`102`	`+return resolvePositiveIntegerTimeoutMs(value, defaultMs);`
`95`	`103`	`}`
`96`	`104`
`97`	`105`	`export function resolveCodexTurnTerminalIdleTimeoutMs(value: number \| undefined): number {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main