openclaw
diff --git a/‎CHANGELOG.md‎
Lines changed: 1 addition & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎extensions/codex/src/app-server/dynamic-tools.test.ts‎
Lines changed: 22 additions & 0 deletions b/‎extensions/codex/src/app-server/dynamic-tools.test.ts‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎extensions/codex/src/app-server/dynamic-tools.ts‎
Lines changed: 41 additions & 10 deletions b/‎extensions/codex/src/app-server/dynamic-tools.ts‎
Lines changed: 41 additions & 10 deletions
diff --git a/‎extensions/codex/src/app-server/protocol.ts‎
Lines changed: 1 addition & 0 deletions b/‎extensions/codex/src/app-server/protocol.ts‎
Lines changed: 1 addition & 0 deletions
@@ -52,6 +52,7 @@ Docs: https://docs.openclaw.ai
 - Debug proxy: record CONNECT client-socket errors and destroy the paired upstream socket so abrupt client disconnects no longer leak tunnel resources. (#82444) Thanks @SebTardif.
 - Diffs: continue hydrating later diff cards when one card fails so a single broken card no longer blanks the whole diff viewer. (#84775) Thanks @cosmopolitan033.
 - Mac app: use the native settings sidebar window chrome so the sidebar toggle stays on the left and content no longer clips under oversized titlebar padding.
+- QA-Lab/Codex: bundle auth/plugin fixture imports for flow scenarios and let terminal async media tools end Codex app-server turns without timing out. (#80397, refs #80323) Thanks @100yenadmin.
 - Gateway/agents: preserve fresh session overrides and metadata when stale cached agent-session entries race with store updates, so subagent model/provider overrides and routing policy survive concurrent writes. (#19328) Thanks @CodeReclaimers.
 - Control UI/chat: keep chat session search inline with the session selector so the header no longer shows a duplicate standalone search row.
 - Codex app-server: restart the native app-server and retry once when server-side compaction times out, so preflight compaction stalls recover instead of failing every dispatch. (#85500)
 
@@ -802,6 +802,28 @@ describe("createCodexDynamicToolBridge", () => {
     expectContextFields(callArg(handler, 0, 1, "middleware context"), { runtime: "codex" });
   });
 
+  it("preserves terminal async tool results without marking them as errors", async () => {
+    const bridge = createBridgeWithToolResult("image_generate", {
+      content: [{ type: "text", text: "Background task started." }],
+      details: { async: true, status: "started", taskId: "task-1" },
+      terminate: true,
+    });
+
+    const result = await bridge.handleToolCall({
+      threadId: "thread-1",
+      turnId: "turn-1",
+      callId: "call-1",
+      namespace: null,
+      tool: "image_generate",
+      arguments: { prompt: "lighthouse" },
+    });
+
+    expect(result).toEqual(expectInputText("Background task started."));
+    expect(result.sideEffectEvidence).toBe(true);
+    expect(result.terminate).toBe(true);
+    expect(Object.keys(result)).not.toContain("terminate");
+  });
+
   it("marks executed dynamic tool results as side-effect evidence", async () => {
     const bridge = createBridgeWithToolResult("exec", textToolResult("done"));
 
 
@@ -192,16 +192,21 @@ export function createCodexDynamicToolBridge(params: {
           startedAt,
         });
         const terminalType = inferToolResultDiagnosticTerminalType(result, resultIsError);
-        return withSideEffectEvidence(
-          withDiagnosticTerminalType(
-            {
-              contentItems: convertToolContents(result.content, toolResultMaxChars),
-              success: !resultIsError,
-            },
-            terminalType,
-          ),
-          terminalType !== "blocked",
+        const response = withDiagnosticTerminalType(
+          {
+            contentItems: convertToolContents(result.content, toolResultMaxChars),
+            success: !resultIsError,
+          },
+          terminalType,
+        );
+        withDynamicToolTermination(
+          response,
+          rawResult.terminate === true ||
+            result.terminate === true ||
+            isToolResultYield(rawResult) ||
+            isToolResultYield(result),
         );
+        return withSideEffectEvidence(response, terminalType !== "blocked");
       } catch (error) {
         collectToolTelemetry({
           toolName: tool.name,
@@ -463,10 +468,21 @@ function isToolResultError(result: AgentToolResult<unknown>): boolean {
     status !== "success" &&
     status !== "completed" &&
     status !== "recorded" &&
-    status !== "running"
+    status !== "pending" &&
+    status !== "started" &&
+    status !== "running" &&
+    status !== "yielded"
   );
 }
 
+function isToolResultYield(result: AgentToolResult<unknown>): boolean {
+  const details = result.details;
+  if (!isRecord(details) || typeof details.status !== "string") {
+    return false;
+  }
+  return details.status.trim().toLowerCase() === "yielded";
+}
+
 function inferToolResultDiagnosticTerminalType(
   result: AgentToolResult<unknown>,
   isError: boolean,
@@ -508,6 +524,21 @@ function withSideEffectEvidence<T extends CodexDynamicToolCallResponse>(
   return response;
 }
 
+function withDynamicToolTermination<T extends CodexDynamicToolCallResponse>(
+  response: T,
+  terminate: boolean,
+): T {
+  if (!terminate) {
+    return response;
+  }
+  Object.defineProperty(response, "terminate", {
+    configurable: true,
+    enumerable: false,
+    value: true,
+  });
+  return response;
+}
+
 function normalizeToolResultMaxChars(maxChars: number): number {
   return typeof maxChars === "number" && Number.isFinite(maxChars) && maxChars > 0
     ? Math.floor(maxChars)
 
@@ -272,6 +272,7 @@ export type CodexDynamicToolCallResponse = {
   diagnosticTerminalType?: CodexDynamicToolDiagnosticTerminalType;
   sideEffectEvidence?: boolean;
   success: boolean;
+  terminate?: boolean;
 };
 
 export type CodexDynamicToolDiagnosticTerminalType = "blocked" | "completed" | "error";