openclaw
diff --git a/‎src/agents/cli-output.ts‎
Lines changed: 1 addition & 0 deletions b/‎src/agents/cli-output.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/agents/cli-runner.reliability.test.ts‎
Lines changed: 32 additions & 26 deletions b/‎src/agents/cli-runner.reliability.test.ts‎
Lines changed: 32 additions & 26 deletions
@@ -34,6 +34,7 @@ export type CliOutput = {
   messagingToolSentMediaUrls?: string[];
   messagingToolSentTargets?: MessagingToolSend[];
   messagingToolSourceReplyPayloads?: MessagingToolSourceReplyPayload[];
+  yielded?: true;
 };
 
 /** Incremental assistant text emitted while parsing a streaming CLI response. */
 
@@ -14,10 +14,12 @@ import { CURRENT_SESSION_VERSION } from "../config/sessions/version.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import {
   markMcpLoopbackRequestClassified,
+  markMcpLoopbackRequestFinished,
   markMcpLoopbackRequestStarted,
   markMcpLoopbackToolCallFinished,
   markMcpLoopbackToolCallStarted,
   recordMcpLoopbackToolCallResult,
+  resolveMcpLoopbackYieldContext,
   updateMcpLoopbackToolCallCapture,
 } from "../gateway/mcp-http.loopback-runtime.js";
 import { getGlobalHookRunner } from "../plugins/hook-runner-global.js";
@@ -1687,35 +1689,39 @@ describe("runCliAgent reliability", () => {
     expect(completion.refusal).toBe(false);
   });
 
-  it("marks CLI runs as yielded when bundle MCP records sessions_yield", async () => {
-    const exit = {
-      reason: "exit" as const,
-      exitCode: 0,
-      exitSignal: null,
-      durationMs: 50,
-      stdout: "yield acknowledged",
-      stderr: "",
-      timedOut: false,
-      noOutputTimedOut: false,
-    };
-    supervisorSpawnMock.mockResolvedValueOnce({
-      ...createManagedRun(exit),
-      wait: vi.fn(async () => {
-        const runtime = await import("../gateway/mcp-http.loopback-runtime.js");
-        runtime.resolveMcpLoopbackYieldHandler("s1")?.("waiting on subagents");
-        return exit;
-      }),
+  it("marks CLI runs as paused after sessions_yield", async () => {
+    supervisorSpawnMock.mockImplementationOnce(async (...args: unknown[]) => {
+      const input = args[0] as Parameters<ReturnType<typeof getProcessSupervisor>["spawn"]>[0];
+      const captureHandle = markMcpLoopbackRequestStarted(input.env?.OPENCLAW_MCP_CLI_CAPTURE_KEY);
+      await resolveMcpLoopbackYieldContext(captureHandle)?.onYield("waiting on subagents");
+      markMcpLoopbackRequestFinished(captureHandle);
+      input.onStdout?.("yield acknowledged");
+      return createManagedRun({
+        reason: "exit",
+        exitCode: 0,
+        exitSignal: null,
+        durationMs: 50,
+        stdout: "",
+        stderr: "",
+        timedOut: false,
+        noOutputTimedOut: false,
+      });
     });
+    const context = buildPreparedContext();
+    context.mcpDeliveryCapture = true;
 
-    const result = await runPreparedCliAgent(buildPreparedContext());
+    const result = await runPreparedCliAgent(context);
 
-    expect(result.meta.yielded).toBe(true);
-    expect(result.meta.livenessState).toBe("paused");
-    expect(result.meta.stopReason).toBe("end_turn");
-    const completion = requireRecord(result.meta.completion, "completion");
-    expect(completion.finishReason).toBe("end_turn");
-    expect(completion.stopReason).toBe("end_turn");
-    expect(completion.refusal).toBe(false);
+    expect(result.meta).toMatchObject({
+      yielded: true,
+      livenessState: "paused",
+      stopReason: "end_turn",
+      completion: {
+        finishReason: "end_turn",
+        stopReason: "end_turn",
+        refusal: false,
+      },
+    });
   });
 
   it("seeds fresh CLI sessions from the OpenClaw transcript", async () => {