fix(codex): retry only completion watchdog stalls

steipete · steipete · commit 115f649391fa · 2026-05-30T00:18:26.000+02:00
diff --git a/extensions/codex/src/app-server/run-attempt.ts b/extensions/codex/src/app-server/run-attempt.ts
@@ -100,7 +100,10 @@ import {
   resolveCodexTurnTerminalIdleTimeoutMs,
   withCodexStartupTimeout,
 } from "./attempt-timeouts.js";
-import { createCodexAttemptTurnWatchController } from "./attempt-turn-watches.js";
+import {
+  createCodexAttemptTurnWatchController,
+  type CodexAttemptTurnWatchTimeoutKind,
+} from "./attempt-turn-watches.js";
 import {
   refreshCodexAppServerAuthTokens,
   resolveCodexAppServerAuthAccountCacheKey,
@@ -943,6 +946,7 @@ export async function runCodexAppServerAttempt(
   let terminalTurnNotificationQueued = false;
   let timedOut = false;
   let turnCompletionIdleTimedOut = false;
+  let turnWatchTimeoutKind: CodexAttemptTurnWatchTimeoutKind | undefined;
   let turnCompletionIdleTimeoutMessage: string | undefined;
   let clientClosedPromptError: string | undefined;
   let clientClosedAbort = false;
@@ -1021,9 +1025,10 @@ export async function runCodexAppServerAttempt(
     turnTerminalIdleTimeoutMs,
     interruptTimeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS,
     onInterruptTurn: (input) => interruptCodexTurnBestEffort(client, input),
-    onTimeout: () => {
+    onTimeout: (timeout) => {
       timedOut = true;
       turnCompletionIdleTimedOut = true;
+      turnWatchTimeoutKind = timeout.kind;
       turnCompletionIdleTimeoutMessage =
         "codex app-server turn idle timed out waiting for turn/completed";
     },
@@ -2122,6 +2127,10 @@ export async function runCodexAppServerAttempt(
         ? {
             codexAppServerFailure: {
               kind: codexAppServerFailureKind,
+              ...(codexAppServerFailureKind === "turn_completion_idle_timeout" &&
+              turnWatchTimeoutKind
+                ? { turnWatchTimeoutKind }
+                : {}),
               transport: appServer.start.transport,
               threadId: thread.threadId,
               turnId: activeTurnId,
diff --git a/extensions/codex/src/app-server/run-attempt.turn-watches.test.ts b/extensions/codex/src/app-server/run-attempt.turn-watches.test.ts
@@ -2147,6 +2147,7 @@ describe("runCodexAppServerAttempt turn watches", () => {
       promptError: "codex app-server turn idle timed out waiting for turn/completed",
       codexAppServerFailure: {
         kind: "turn_completion_idle_timeout",
+        turnWatchTimeoutKind: "completion",
         transport: "stdio",
         threadId: "thread-1",
         turnId: "turn-1",
diff --git a/src/agents/embedded-agent-runner/run.codex-app-server-recovery.test.ts b/src/agents/embedded-agent-runner/run.codex-app-server-recovery.test.ts
@@ -42,6 +42,7 @@ function codexTurnCompletionIdleTimeoutAttempt(
     promptErrorSource: "prompt",
     codexAppServerFailure: {
       kind: "turn_completion_idle_timeout",
+      turnWatchTimeoutKind: "completion",
       transport: "stdio",
       threadId: "thread-1",
       turnId: "turn-1",
@@ -172,6 +173,35 @@ describe("runEmbeddedAgent Codex app-server recovery", () => {
     expect(mockedRunEmbeddedAttempt).toHaveBeenCalledTimes(2);
   });
 
+  it("does not retry non-completion Codex turn watch timeouts", async () => {
+    mockedRunEmbeddedAttempt.mockResolvedValueOnce(
+      codexTurnCompletionIdleTimeoutAttempt({
+        codexAppServerFailure: {
+          kind: "turn_completion_idle_timeout",
+          turnWatchTimeoutKind: "progress",
+          transport: "stdio",
+          threadId: "thread-1",
+          turnId: "turn-1",
+          replaySafe: true,
+        },
+      }),
+    );
+
+    const result = await runEmbeddedAgent({
+      ...overflowBaseRunParams,
+      provider: "codex",
+      model: "gpt-5.5",
+      runId: "run-codex-progress-idle-timeout",
+    });
+
+    expect(result.payloads?.[0]).toMatchObject({
+      isError: true,
+      text: "Request timed out before a response was generated. Please try again, or increase `agents.defaults.timeoutSeconds` in your config.",
+    });
+    expect(mockedRunEmbeddedAttempt).toHaveBeenCalledTimes(1);
+    expect(mockedMarkAuthProfileFailure).not.toHaveBeenCalled();
+  });
+
   it("returns a timeout payload after a replay-safe turn/completed idle timeout retry is exhausted", async () => {
     mockedRunEmbeddedAttempt
       .mockResolvedValueOnce(codexTurnCompletionIdleTimeoutAttempt())
@@ -199,6 +229,7 @@ describe("runEmbeddedAgent Codex app-server recovery", () => {
       codexTurnCompletionIdleTimeoutAttempt({
         codexAppServerFailure: {
           kind: "turn_completion_idle_timeout",
+          turnWatchTimeoutKind: "completion",
           transport: "websocket",
           threadId: "thread-1",
           turnId: "turn-1",
@@ -237,6 +268,7 @@ describe("runEmbeddedAgent Codex app-server recovery", () => {
         },
         codexAppServerFailure: {
           kind: "turn_completion_idle_timeout",
+          turnWatchTimeoutKind: "completion",
           transport: "stdio",
           threadId: "thread-1",
           turnId: "turn-1",
diff --git a/src/agents/embedded-agent-runner/run/codex-app-server-recovery.ts b/src/agents/embedded-agent-runner/run/codex-app-server-recovery.ts
@@ -14,6 +14,12 @@ export function resolveCodexAppServerRecoveryRetry(params: {
   ) {
     return { retry: false, reason: failure.kind };
   }
+  if (
+    failure.kind === "turn_completion_idle_timeout" &&
+    failure.turnWatchTimeoutKind !== "completion"
+  ) {
+    return { retry: false, reason: failure.turnWatchTimeoutKind ?? "unknown_turn_watch_timeout" };
+  }
   if (failure.transport !== "stdio") {
     return { retry: false, reason: "non_stdio_transport" };
   }
diff --git a/src/agents/embedded-agent-runner/run/types.ts b/src/agents/embedded-agent-runner/run/types.ts
@@ -125,6 +125,7 @@ export type EmbeddedRunAttemptResult = {
   };
   codexAppServerFailure?: {
     kind: "client_closed_before_turn_completed" | "turn_completion_idle_timeout";
+    turnWatchTimeoutKind?: "progress" | "completion" | "terminal";
     transport: "stdio" | "websocket";
     threadId?: string;
     turnId?: string;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,12 @@ export function resolveCodexAppServerRecoveryRetry(params: {`
`14`	`14`	`) {`
`15`	`15`	`return { retry: false, reason: failure.kind };`
`16`	`16`	`}`
	`17`	`+ if (`
	`18`	`+ failure.kind === "turn_completion_idle_timeout" &&`
	`19`	`+ failure.turnWatchTimeoutKind !== "completion"`
	`20`	`+ ) {`
	`21`	`+ return { retry: false, reason: failure.turnWatchTimeoutKind ?? "unknown_turn_watch_timeout" };`
	`22`	`+ }`
`17`	`23`	`if (failure.transport !== "stdio") {`
`18`	`24`	`return { retry: false, reason: "non_stdio_transport" };`
`19`	`25`	`}`