fix(codex): normalize native command exit status

shbernal · shbernal · commit 37c31a27778f · 2026-05-30T15:16:38.000+02:00
diff --git a/extensions/codex/src/app-server/event-projector.test.ts b/extensions/codex/src/app-server/event-projector.test.ts
@@ -1695,13 +1695,49 @@ describe("CodexAppServerEventProjector", () => {
     expect(toolResult.result).toEqual({ status: "completed", exitCode: 0, durationMs: 42 });
   });
 
+  it("treats nonzero native command exits as completed tool results", async () => {
+    const onAgentEvent = vi.fn();
+    const projector = await createProjector({ ...(await createParams()), onAgentEvent });
+
+    await projector.handleNotification(
+      turnCompleted([
+        {
+          type: "commandExecution",
+          id: "cmd-no-matches",
+          command: "grep -R missing docs",
+          cwd: "/workspace",
+          processId: null,
+          source: "agent",
+          status: "failed",
+          commandActions: [],
+          aggregatedOutput: "",
+          exitCode: 1,
+          durationMs: 42,
+        },
+      ]),
+    );
+
+    expect(projector.buildResult(buildEmptyToolTelemetry()).lastToolError).toBeUndefined();
+    const toolResult = findAgentEvent(onAgentEvent, {
+      stream: "tool",
+      phase: "result",
+      itemId: "cmd-no-matches",
+      name: "bash",
+    }).data;
+    expect(toolResult).toMatchObject({
+      status: "completed",
+      isError: false,
+      result: { status: "completed", exitCode: 1, durationMs: 42 },
+    });
+  });
+
   it("uses streamed command output for failed native tool errors", async () => {
     const projector = await createProjector();
 
     await projector.handleNotification(
       forCurrentTurn("item/commandExecution/outputDelta", {
         itemId: "cmd-streamed-failure",
-        delta: "fatal: missing fixture\n",
+        delta: "pnpm: command not found\n",
       }),
     );
     await projector.handleNotification(
@@ -1716,7 +1752,7 @@ describe("CodexAppServerEventProjector", () => {
           status: "failed",
           commandActions: [],
           aggregatedOutput: null,
-          exitCode: 1,
+          exitCode: 127,
           durationMs: 42,
         },
       ]),
@@ -1725,7 +1761,7 @@ describe("CodexAppServerEventProjector", () => {
     expect(projector.buildResult(buildEmptyToolTelemetry()).lastToolError).toEqual({
       toolName: "bash",
       meta: "run tests (workspace)",
-      error: "fatal: missing fixture",
+      error: "pnpm: command not found",
       mutatingAction: true,
       actionFingerprint: JSON.stringify({
         type: "commandExecution",
diff --git a/extensions/codex/src/app-server/event-projector.ts b/extensions/codex/src/app-server/event-projector.ts
@@ -110,6 +110,7 @@ const MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM = 20;
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 12_000;
 const GENERATED_IMAGE_MEDIA_SUBDIR = "tool-image-generation";
 const BYTES_PER_MB = 1024 * 1024;
+const SHELL_INVOCATION_FAILURE_EXIT_CODES = new Set([126, 127]);
 // Match OpenClaw's default image media cap for generated image tool outputs.
 const DEFAULT_GENERATED_IMAGE_MAX_BYTES = 6 * BYTES_PER_MB;
 const TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES = new Set([
@@ -1924,6 +1925,9 @@ function itemTitle(item: CodexThreadItem): string {
 function itemStatus(item: CodexThreadItem): "completed" | "failed" | "running" | "blocked" {
   const status = readItemString(item, "status");
   if (status === "failed") {
+    if (isCompletedCommandExit(item)) {
+      return "completed";
+    }
     return "failed";
   }
   if (status === "declined") {
@@ -1939,6 +1943,17 @@ function isNonSuccessItemStatus(status: ReturnType<typeof itemStatus>): boolean
   return status === "failed" || status === "blocked";
 }
 
+function isCompletedCommandExit(item: CodexThreadItem): boolean {
+  // Codex marks nonzero native shell exits as failed. OpenClaw's exec contract
+  // treats process exits as completed tool runs; callers read exitCode/output
+  // for command semantics, while 126/127 still mean the shell could not run it.
+  return (
+    item.type === "commandExecution" &&
+    typeof item.exitCode === "number" &&
+    !SHELL_INVOCATION_FAILURE_EXIT_CODES.has(item.exitCode)
+  );
+}
+
 function itemName(item: CodexThreadItem): string | undefined {
   if (item.type === "dynamicToolCall" && typeof item.tool === "string") {
     return item.tool;
@@ -2082,7 +2097,7 @@ function itemToolResult(item: CodexThreadItem): { result?: Record<string, unknow
   if (item.type === "commandExecution") {
     return {
       result: sanitizeCodexAgentEventRecord({
-        status: item.status,
+        status: itemStatus(item),
         exitCode: item.exitCode,
         durationMs: item.durationMs,
       }),
@@ -2091,15 +2106,15 @@ function itemToolResult(item: CodexThreadItem): { result?: Record<string, unknow
   if (item.type === "fileChange") {
     return {
       result: sanitizeCodexAgentEventRecord({
-        status: item.status,
+        status: itemStatus(item),
         changes: itemFileChanges(item),
       }),
     };
   }
   if (item.type === "mcpToolCall") {
     return {
       result: sanitizeCodexAgentEventRecord({
-        status: item.status,
+        status: itemStatus(item),
         durationMs: item.durationMs,
         ...(item.error ? { error: item.error } : {}),
         ...(item.result ? { result: item.result } : {}),
