fix(codex): project guardianWarning circuit-breaker notification (#101220)

Darren2030 · claude · vincentkoc · web-flow · commit ceb7a4adba05 · 2026-07-06T19:33:24.000-07:00
* fix(codex): project guardianWarning circuit-breaker notification Codex emits a `guardianWarning` notification from its rejection circuit-breaker (e.g. 3 consecutive or 10 total denials in a turn) right before ending the turn as interrupted. The app-server event projector had no case for it, so the rejection-limit reason was silently dropped and the turn degraded to a generic interruption. Project it on the `codex_app_server.guardian` stream with phase "warning", alongside the existing autoApprovalReview handling. The exact v2 param shape is not bundled in OpenClaw's protocol schemas, so the human-readable reason is read defensively. Closes #101207 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(codex): route guardianWarning through thread-scoped filter `guardianWarning` is thread-scoped — codex emits it with only {message, threadId} (no turnId). The turn-strict pre-switch filter therefore dropped it before it reached the projection switch, making the handler added in the previous commit dead code for real traffic. Correlate it on the thread alone (mirroring hook notifications) so it reaches the switch, and read the `message` field per the codex schema. The regression test now sends the real {threadId, message} shape instead of a synthetic turnId, so it actually exercises the routing. Refs #101207 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * repro(codex): add real behavior proof for guardianWarning projection * fix(codex): narrow guardian warning projection Co-authored-by: 曾文锋0668000834 <zeng.wenfeng@xydigit.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Vincent Koc <vincentkoc@ieee.org>
diff --git a/extensions/codex/src/app-server/event-projector.test.ts b/extensions/codex/src/app-server/event-projector.test.ts
@@ -1652,6 +1652,30 @@ describe("CodexAppServerEventProjector", () => {
     ).toBe(false);
   });
 
+  it("projects thread-scoped guardian warnings", async () => {
+    const onAgentEvent = vi.fn();
+    const projector = await createProjector({ ...(await createParams()), onAgentEvent });
+
+    await projector.handleNotification({
+      method: "guardianWarning",
+      params: { threadId: "thread-other", message: "Wrong thread." },
+    } as ProjectorNotification);
+    await projector.handleNotification({
+      method: "guardianWarning",
+      params: {
+        threadId: THREAD_ID,
+        message: "Guardian rejection limit reached; ending turn as interrupted.",
+      },
+    } as ProjectorNotification);
+
+    const warning = findAgentEvent(onAgentEvent, {
+      stream: "codex_app_server.guardian",
+      phase: "warning",
+    }).data;
+    expect(warning.message).toBe("Guardian rejection limit reached; ending turn as interrupted.");
+    expect(onAgentEvent).toHaveBeenCalledTimes(1);
+  });
+
   it("projects reasoning end, plan updates, compaction state, and tool metadata", async () => {
     const onReasoningStream = vi.fn();
     const onReasoningEnd = vi.fn();
diff --git a/extensions/codex/src/app-server/event-projector.ts b/extensions/codex/src/app-server/event-projector.ts
@@ -684,6 +684,11 @@ export class CodexAppServerEventProjector {
       if (!this.isHookNotificationForCurrentThread(params)) {
         return;
       }
+    } else if (notification.method === "guardianWarning") {
+      // Codex guardian warnings are thread-scoped and carry no turn id.
+      if (readCodexNotificationThreadId(params) !== this.threadId) {
+        return;
+      }
     } else if (!this.isNotificationForTurn(params)) {
       return;
     }
@@ -719,6 +724,9 @@ export class CodexAppServerEventProjector {
       case "item/autoApprovalReview/completed":
         this.handleGuardianReviewNotification(notification.method, params);
         break;
+      case "guardianWarning":
+        this.handleGuardianWarning(params);
+        break;
       case "hook/started":
       case "hook/completed":
         this.handleHookNotification(notification.method, params);
@@ -1257,6 +1265,16 @@ export class CodexAppServerEventProjector {
     });
   }
 
+  private handleGuardianWarning(params: JsonObject): void {
+    this.emitAgentEvent({
+      stream: "codex_app_server.guardian",
+      data: {
+        phase: "warning",
+        message: readString(params, "message"),
+      },
+    });
+  }
+
   private handleHookNotification(method: string, params: JsonObject): void {
     const run = isJsonObject(params.run) ? params.run : undefined;
     if (!run) {
