fix(cron): deliver recovered answer for no-preference channels (#94846)

ruomuxydt · claude · ruomuxydt · commit c3fd0af91064 · 2026-06-19T21:46:41.000+08:00
When a recovered tool-warning run has finalAssistantVisibleText, the output fields (summary, outputText, deliveryPayloads) now use the recovered answer, not the stale warning payload, even for channels that do not prefer final assistant visible text. This addresses ClawSweeper rank-up move: 'Fix the no-preference finalAssistantVisibleText-only recovery case so the delivered payload is the recovered answer.'

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;
diff --git a/src/cron/isolated-agent/helpers.test.ts b/src/cron/isolated-agent/helpers.test.ts
@@ -243,10 +243,10 @@ describe("resolveCronPayloadOutcome", () => {
     });
     // The recovered run should not be fatal
     expect(result.hasFatalErrorPayload).toBe(false);
-    // Output fields should reflect the successful recovery, not the formatted run-level error
-    expect(result.summary).toBe("Patch applied successfully.");
-    expect(result.outputText).toBe("Patch applied successfully.");
-    expect(result.deliveryPayloads).toEqual([{ text: "Patch applied successfully." }]);
+    // Output fields should reflect the recovered answer (final assistant text), not the formatted run-level error
+    expect(result.summary).toContain("REPRO_FINAL_OUTPUT_PRESENT");
+    expect(result.outputText).toContain("REPRO_FINAL_OUTPUT_PRESENT");
+    expect(result.deliveryPayloads).toEqual([{ text: "REPRO_FINAL_OUTPUT_PRESENT" }]);
   });
 
   it("still treats a genuine fatal error as fatal when no recovery occurs", () => {
@@ -295,6 +295,21 @@ describe("resolveCronPayloadOutcome", () => {
     expect(result.summary).toContain("Task completed despite missing file.");
   });
 
+  it("delivers the recovered answer for no-preference channels when finalAssistantVisibleText exists", () => {
+    // No preferFinalAssistantVisibleText (default false) — recovered tool-warning should still use the final answer
+    const result = resolveCronPayloadOutcome({
+      payloads: [
+        { text: "⚠️ 🛠️ sed: file missing", isError: true },
+      ],
+      runLevelError: new Error("sed: file missing"),
+      finalAssistantVisibleText: "Task completed despite missing file.",
+    });
+    expect(result.hasFatalErrorPayload).toBe(false);
+    expect(result.summary).toContain("Task completed despite missing file.");
+    expect(result.outputText).toContain("Task completed despite missing file.");
+    expect(result.deliveryPayloads).toEqual([{ text: "Task completed despite missing file." }]);
+  });
+
   it("preserves original error payload text for generic fatal run-level errors with later success", () => {
     // Generic fatal (not tool warning) with later success-looking payload
     const result = resolveCronPayloadOutcome({
diff --git a/src/cron/isolated-agent/helpers.ts b/src/cron/isolated-agent/helpers.ts
@@ -309,10 +309,11 @@ export function resolveCronPayloadOutcome(params: {
   // A final assistant answer can replace textual warning payloads, but never
   // structured/media payloads that carry the actual delivery content.
   const shouldUseFinalAssistantVisibleText =
-    params.preferFinalAssistantVisibleText === true &&
     normalizedFinalAssistantVisibleText !== undefined &&
     !hasFatalStructuredErrorPayload &&
-    !hasStructuredDeliveryPayloads;
+    !hasStructuredDeliveryPayloads &&
+    (params.preferFinalAssistantVisibleText === true ||
+      (hasRecoveringTerminalOutput && isLastErrorAToolWarning));
   const summary = shouldUseFinalAssistantVisibleText
     ? (pickSummaryFromOutput(normalizedFinalAssistantVisibleText) ?? fallbackSummary)
     : fallbackSummary;
