fix(codex): narrow quiescent turn completion stall handling

funmerlin · funmerlin · commit 6be7297e3480 · 2026-05-15T16:17:12.000+02:00
diff --git a/extensions/codex/src/app-server/run-attempt.test.ts b/extensions/codex/src/app-server/run-attempt.test.ts
@@ -2458,7 +2458,7 @@ describe("runCodexAppServerAttempt", () => {
     });
   });
 
-  it("times out promptly when the last completed current-turn item is not followed by turn completion", async () => {
+  it("times out promptly when the last completed non-assistant current-turn item is not followed by turn completion", async () => {
     let notify: (notification: CodexServerNotification) => Promise<void> = async () => undefined;
     const request = vi.fn(async (method: string) => {
       if (method === "thread/start") {
@@ -2469,7 +2469,7 @@ describe("runCodexAppServerAttempt", () => {
       }
       return {};
     });
-    __testing.setCodexAppServerClientFactoryForTests(
+    setCodexAppServerClientFactoryForTest(
       async () =>
         ({
           request,
diff --git a/extensions/codex/src/app-server/run-attempt.ts b/extensions/codex/src/app-server/run-attempt.ts
@@ -1254,10 +1254,16 @@ export async function runCodexAppServerAttempt(
       turnAssistantCompletionIdleWatchArmed &&
       notification.method === "item/completed" &&
       activeTurnItemIds.size === 0;
-    const shouldKeepCompletionIdleWatchArmed =
+    const trackedDynamicToolCompletion = isTrackedOpenClawDynamicToolCompletionNotification(
+      notification,
+      activeOpenClawDynamicToolCallIds,
+    );
+    const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem =
       isCurrentTurnNotification &&
       notification.method === "item/completed" &&
-      activeTurnItemIds.size === 0;
+      activeTurnItemIds.size === 0 &&
+      !trackedDynamicToolCompletion &&
+      !isCompletedAssistantNotification(notification);
     if (isCurrentTurnNotification && notification.method === "error") {
       if (isRetryableErrorNotification(notification.params)) {
         disarmTurnCompletionIdleWatch();
@@ -1271,14 +1277,10 @@ export async function runCodexAppServerAttempt(
       armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
     } else if (unblockedAssistantCompletionRelease) {
       armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
-    } else if (
-      isCurrentTurnNotification &&
-      notification.method === "item/completed" &&
-      activeTurnItemIds.size === 0
-    ) {
-      // If the bridge goes silent immediately after the last current-turn item
-      // completes, do not wait for the long terminal watchdog. Re-arm the short
-      // completion-idle guard so we fail promptly instead of wedging the session.
+    } else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) {
+      // If a non-assistant current-turn item is the last active item and the
+      // bridge then goes quiet, reset the short completion-idle guard from that
+      // final completion so the remaining silent-turn gap fails fast.
       armTurnCompletionIdleWatch();
     } else if (
       isCurrentTurnNotification &&
@@ -1291,11 +1293,8 @@ export async function runCodexAppServerAttempt(
       !turnCompletionIdleWatchPinnedByTerminalError &&
       notification.method !== "turn/completed" &&
       isCurrentTurnNotification &&
-      !isTrackedOpenClawDynamicToolCompletionNotification(
-        notification,
-        activeOpenClawDynamicToolCallIds,
-      ) &&
-      !shouldKeepCompletionIdleWatchArmed
+      !trackedDynamicToolCompletion &&
+      !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem
     ) {
       // The short completion-idle watchdog guards blind gaps after Codex
       // accepts a turn or after OpenClaw hands a turn-scoped request result
