fix(cron): respect recovered tool errors

Elarwei001 · Elarwei001 · commit 3cb013e77a12 · 2026-05-19T22:00:17.000+08:00
diff --git a/src/cron/isolated-agent.helpers.test.ts b/src/cron/isolated-agent.helpers.test.ts
@@ -62,6 +62,11 @@ describe("resolveCronPayloadOutcome", () => {
     });
 
     expect(result.hasFatalErrorPayload).toBe(false);
+    expect(result.errorPayloadRecovery).toEqual({
+      hadErrorPayload: true,
+      recovered: true,
+      recoveredBy: "laterPayload",
+    });
     expect(result.summary).toBe("Write completed successfully.");
   });
 
@@ -73,6 +78,11 @@ describe("resolveCronPayloadOutcome", () => {
     });
 
     expect(result.hasFatalErrorPayload).toBe(false);
+    expect(result.errorPayloadRecovery).toEqual({
+      hadErrorPayload: true,
+      recovered: true,
+      recoveredBy: "presentationWarning",
+    });
     expect(result.embeddedRunError).toBeUndefined();
     expect(result.pendingPresentationWarningError).toBe("⚠️ ✉️ Message failed");
     expect(result.summary).toBe("Final cron report");
@@ -281,7 +291,7 @@ describe("resolveCronPayloadOutcome", () => {
     expect(result.deliveryPayloadHasStructuredContent).toBe(true);
   });
 
-  it("returns only the last error payload when all payloads are errors", () => {
+  it("uses terminal assistant text when all error payloads were recovered", () => {
     const result = resolveCronPayloadOutcome({
       payloads: [
         { text: "first error", isError: true },
@@ -291,11 +301,33 @@ describe("resolveCronPayloadOutcome", () => {
       preferFinalAssistantVisibleText: true,
     });
 
-    expect(result.outputText).toBe("last error");
-    expect(result.deliveryPayloads).toEqual([{ text: "last error", isError: true }]);
+    expect(result.hasFatalErrorPayload).toBe(false);
+    expect(result.errorPayloadRecovery).toEqual({
+      hadErrorPayload: true,
+      recovered: true,
+      recoveredBy: "terminalAssistantText",
+    });
+    expect(result.outputText).toBe("Recovered final answer");
+    expect(result.deliveryPayloads).toEqual([{ text: "Recovered final answer" }]);
     expect(result.deliveryPayload).toEqual({ text: "last error", isError: true });
   });
 
+  it("keeps recovered error payloads fatal when final assistant text reports denial", () => {
+    const result = resolveCronPayloadOutcome({
+      payloads: [{ text: "tool error", isError: true }],
+      finalAssistantVisibleText: "I could not run the requested script.",
+      preferFinalAssistantVisibleText: true,
+    });
+
+    expect(result.hasFatalErrorPayload).toBe(true);
+    expect(result.errorPayloadRecovery).toEqual({
+      hadErrorPayload: true,
+      recovered: false,
+    });
+    expect(result.embeddedRunError).toBe("tool error");
+    expect(result.deliveryPayloads).toEqual([{ text: "tool error", isError: true }]);
+  });
+
   it("keeps multi-payload direct delivery when finalAssistantVisibleText is not preferred", () => {
     const result = resolveCronPayloadOutcome({
       payloads: [{ text: "Working on it..." }, { text: "Final weather summary" }],
diff --git a/src/cron/isolated-agent/helpers.ts b/src/cron/isolated-agent/helpers.ts
@@ -18,6 +18,11 @@ export type CronPayloadOutcome = {
   deliveryPayloads: DeliveryPayload[];
   deliveryPayloadHasStructuredContent: boolean;
   hasFatalErrorPayload: boolean;
+  errorPayloadRecovery: {
+    hadErrorPayload: boolean;
+    recovered: boolean;
+    recoveredBy?: "laterPayload" | "terminalAssistantText" | "presentationWarning";
+  };
   embeddedRunError?: string;
   pendingPresentationWarningError?: string;
 };
@@ -274,29 +279,61 @@ export function resolveCronPayloadOutcome(params: {
   const normalizedFinalAssistantVisibleText = normalizeOptionalString(
     params.finalAssistantVisibleText,
   );
+  const failureSignal = normalizeCronFailureSignal(params.failureSignal);
+  const runLevelError = formatCronRunLevelError(params.runLevelError);
+  const hasStructuredDeliveryPayloads = selectedDeliveryPayloads.some((payload) =>
+    payloadHasStructuredDeliveryContent(payload),
+  );
   const hasSuccessfulPayloadAfterLastError =
-    !params.runLevelError &&
+    !runLevelError &&
     lastErrorPayloadIndex >= 0 &&
     params.payloads
       .slice(lastErrorPayloadIndex + 1)
       .some((payload) => payload?.isError !== true && Boolean(payload?.text?.trim()));
   const hasSuccessfulPayloadBeforeLastError =
-    !params.runLevelError &&
+    !runLevelError &&
     lastErrorPayloadIndex > 0 &&
     params.payloads
       .slice(0, lastErrorPayloadIndex)
       .some((payload) => payload?.isError !== true && Boolean(payload?.text?.trim()));
   const hasPendingPresentationWarning =
-    !params.runLevelError &&
-    params.failureSignal?.fatalForCron !== true &&
+    !runLevelError &&
+    failureSignal === undefined &&
     lastErrorPayloadIndex >= 0 &&
     isCronMessagePresentationWarning(lastErrorPayloadText) &&
     (normalizedFinalAssistantVisibleText !== undefined || hasSuccessfulPayloadBeforeLastError);
+  const hasTerminalAssistantRecovery =
+    !runLevelError &&
+    failureSignal === undefined &&
+    params.preferFinalAssistantVisibleText === true &&
+    normalizedFinalAssistantVisibleText !== undefined &&
+    detectCronDenialToken(normalizedFinalAssistantVisibleText) === undefined &&
+    !hasStructuredDeliveryPayloads &&
+    lastErrorPayloadIndex >= 0 &&
+    !hasSuccessfulPayloadAfterLastError &&
+    (!hasSuccessfulPayloadBeforeLastError ||
+      normalizedFinalAssistantVisibleText !== fallbackOutputText);
   const hasFatalStructuredErrorPayload =
-    hasErrorPayload && !hasSuccessfulPayloadAfterLastError && !hasPendingPresentationWarning;
-  const hasStructuredDeliveryPayloads = selectedDeliveryPayloads.some((payload) =>
-    payloadHasStructuredDeliveryContent(payload),
-  );
+    hasErrorPayload &&
+    !hasSuccessfulPayloadAfterLastError &&
+    !hasPendingPresentationWarning &&
+    !hasTerminalAssistantRecovery;
+  const errorPayloadRecoveredBy = hasSuccessfulPayloadAfterLastError
+    ? ("laterPayload" as const)
+    : hasPendingPresentationWarning
+      ? ("presentationWarning" as const)
+      : hasTerminalAssistantRecovery
+        ? ("terminalAssistantText" as const)
+        : undefined;
+  const errorPayloadRecovery = {
+    hadErrorPayload: hasErrorPayload,
+    recovered:
+      hasErrorPayload &&
+      (hasSuccessfulPayloadAfterLastError ||
+        hasPendingPresentationWarning ||
+        hasTerminalAssistantRecovery),
+    ...(errorPayloadRecoveredBy ? { recoveredBy: errorPayloadRecoveredBy } : {}),
+  };
   // Keep structured/media announce payloads intact. Only collapse purely textual
   // cron announce output to the final assistant-visible answer.
   const shouldUseFinalAssistantVisibleText =
@@ -329,8 +366,6 @@ export function resolveCronPayloadOutcome(params: {
       text: payload?.text,
     })),
   ]);
-  const failureSignal = normalizeCronFailureSignal(params.failureSignal);
-  const runLevelError = formatCronRunLevelError(params.runLevelError);
   const hasFatalErrorPayload =
     hasFatalStructuredErrorPayload ||
     failureSignal !== undefined ||
@@ -361,6 +396,7 @@ export function resolveCronPayloadOutcome(params: {
       ? false
       : deliveryPayloadHasStructuredContent,
     hasFatalErrorPayload,
+    errorPayloadRecovery,
     embeddedRunError: structuredErrorText
       ? structuredErrorText
       : failureSignal
