fix(cli): accept empty Claude end turns

charles-openclaw · charles-openclaw · commit 1c5aa95fa02f · 2026-06-01T09:27:16.000Z
diff --git a/src/agents/cli-output.ts b/src/agents/cli-output.ts
@@ -18,6 +18,7 @@ export type CliOutput = {
   sessionId?: string;
   usage?: CliUsage;
   finalPromptText?: string;
+  allowEmptySuccess?: boolean;
 };
 
 export type CliStreamingDelta = {
@@ -369,7 +370,12 @@ function parseClaudeCliJsonlResult(params: {
     }
     // Claude may finish with an empty result after tool-only work. Keep the
     // resolved session handle and usage instead of dropping them.
-    return { text: "", sessionId: params.sessionId, usage: params.usage };
+    return {
+      text: "",
+      sessionId: params.sessionId,
+      usage: params.usage,
+      allowEmptySuccess: true,
+    };
   }
   return null;
 }
diff --git a/src/agents/cli-runner.reliability.test.ts b/src/agents/cli-runner.reliability.test.ts
@@ -131,13 +131,14 @@ function buildPreparedContext(params?: {
   openClawHistoryPrompt?: string;
   provider?: string;
   model?: string;
+  output?: "json" | "jsonl" | "text";
 }): PreparedCliRunContext {
   const provider = params?.provider ?? "codex-cli";
   const model = params?.model ?? "gpt-5.4";
   const backend = {
     command: "codex",
     args: ["exec", "--json"],
-    output: "text" as const,
+    output: params?.output ?? ("text" as const),
     input: "arg" as const,
     modelArg: "--model",
     sessionMode: "existing" as const,
@@ -1712,6 +1713,47 @@ describe("runCliAgent reliability", () => {
     expect(hookRunner.runLlmOutput).not.toHaveBeenCalled();
   });
 
+  it("accepts an empty Claude CLI result as a successful no-reply turn", async () => {
+    const hookRunner = {
+      hasHooks: vi.fn((hookName: string) => hookName === "llm_output"),
+      runLlmInput: vi.fn(async () => undefined),
+      runLlmOutput: vi.fn(async () => undefined),
+      runAgentEnd: vi.fn(async () => undefined),
+    };
+    setHookRunnerForTest(hookRunner);
+
+    supervisorSpawnMock.mockResolvedValueOnce(
+      createManagedRun({
+        reason: "exit",
+        exitCode: 0,
+        exitSignal: null,
+        durationMs: 50,
+        stdout: `${JSON.stringify({
+          type: "result",
+          subtype: "success",
+          is_error: false,
+          result: "",
+          session_id: "claude-session-1",
+        })}\n`,
+        stderr: "",
+        timedOut: false,
+        noOutputTimedOut: false,
+      }),
+    );
+
+    const result = await runPreparedCliAgent(
+      buildPreparedContext({
+        provider: "claude-cli",
+        model: "claude-sonnet-4-6",
+        output: "jsonl",
+      }),
+    );
+
+    expect(result.payloads).toBeUndefined();
+    expect(result.meta.executionTrace.fallbackUsed).toBe(false);
+    expect(hookRunner.runLlmOutput).not.toHaveBeenCalled();
+  });
+
   it("emits agent_end with failure details when the CLI run fails", async () => {
     let releaseAgentEnd: () => void = () => undefined;
     const agentEndSettled = new Promise<void>((resolve) => {
diff --git a/src/agents/cli-runner.ts b/src/agents/cli-runner.ts
@@ -534,7 +534,7 @@ export async function runPreparedCliAgent(
           };
     const output = await executePreparedCliRun(attemptContext, cliSessionIdToUse);
     const assistantText = output.text.trim();
-    if (!assistantText) {
+    if (!assistantText && !output.allowEmptySuccess) {
       throw new FailoverError("CLI backend returned an empty response.", {
         reason: "empty_response",
         provider: params.provider,
