fix: keep cron final output over tool warnings

steipete · steipete · commit c8a953af9371 · 2026-05-20T14:50:50.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Docs: https://docs.openclaw.ai
 
 - Mac app: keep local packaging signed with a stable app identity for permission testing and fix Control UI production builds under current Vite/Highlight.js exports.
 - macOS app: update the embedded Peekaboo bridge to 3.2.1 so OpenClaw-hosted UI automation works with current Peekaboo CLI capture flows.
+- Cron: deliver preferred final assistant output for successful scheduled runs when trailing plain tool warnings remain in diagnostics instead of marking the run failed.
 - fix(mattermost): fail closed on missing channel type [AI]. (#84091) Thanks @pgondhi987.
 - Recheck rebuilt system.run argv [AI]. (#84090) Thanks @pgondhi987.
 - CLI/cron: bound `openclaw cron show` job lookup pagination so non-advancing or unbounded `cron.list` responses fail instead of hanging the command. Fixes #83856. (#83989)
diff --git a/src/cron/isolated-agent.helpers.test.ts b/src/cron/isolated-agent.helpers.test.ts
@@ -28,6 +28,27 @@ describe("resolveCronPayloadOutcome", () => {
     expect(result.summary).toContain("Exec failed");
   });
 
+  it("lets preferred final assistant text recover a plain tool warning", () => {
+    const result = resolveCronPayloadOutcome({
+      payloads: [
+        {
+          text: "⚠️ 🛠️ jq -s '{total:length}' (agent) failed",
+          isError: true,
+        },
+      ],
+      finalAssistantVisibleText: "**Clawsweeper 6h report**\nClosed: 34 total",
+      preferFinalAssistantVisibleText: true,
+    });
+
+    expect(result.hasFatalErrorPayload).toBe(false);
+    expect(result.embeddedRunError).toBeUndefined();
+    expect(result.summary).toBe("**Clawsweeper 6h report**\nClosed: 34 total");
+    expect(result.outputText).toBe("**Clawsweeper 6h report**\nClosed: 34 total");
+    expect(result.deliveryPayloads).toEqual([
+      { text: "**Clawsweeper 6h report**\nClosed: 34 total" },
+    ]);
+  });
+
   it("treats transient error payloads as non-fatal when a later success exists", () => {
     const result = resolveCronPayloadOutcome({
       payloads: [
diff --git a/src/cron/isolated-agent/helpers.ts b/src/cron/isolated-agent/helpers.ts
@@ -202,6 +202,10 @@ function isCronMessagePresentationWarning(text: string | undefined): boolean {
   );
 }
 
+function isCronToolWarning(text: string | undefined): boolean {
+  return normalizeOptionalString(text)?.startsWith("⚠️ 🛠️ ") === true;
+}
+
 function isNonTerminalToolErrorWarning(payload: object | undefined): boolean {
   return Boolean(payload && getReplyPayloadMetadata(payload)?.nonTerminalToolErrorWarning);
 }
@@ -236,6 +240,7 @@ export function resolveCronPayloadOutcome(params: {
     .toReversed()
     .find((payload) => payload?.isError === true && Boolean(payload?.text?.trim()))
     ?.text?.trim();
+  const errorPayloads = params.payloads.filter((payload) => payload?.isError === true);
   const normalizedFinalAssistantVisibleText = normalizeOptionalString(
     params.finalAssistantVisibleText,
   );
@@ -264,14 +269,23 @@ export function resolveCronPayloadOutcome(params: {
     lastErrorPayloadIndex >= 0 &&
     isCronMessagePresentationWarning(lastErrorPayloadText) &&
     (normalizedFinalAssistantVisibleText !== undefined || hasSuccessfulPayloadBeforeLastError);
+  const hasStructuredDeliveryPayloads = selectedDeliveryPayloads.some((payload) =>
+    payloadHasStructuredDeliveryContent(payload),
+  );
+  const hasRecoveredToolWarning =
+    !params.runLevelError &&
+    params.failureSignal?.fatalForCron !== true &&
+    params.preferFinalAssistantVisibleText === true &&
+    normalizedFinalAssistantVisibleText !== undefined &&
+    !hasStructuredDeliveryPayloads &&
+    errorPayloads.length > 0 &&
+    errorPayloads.every((payload) => isCronToolWarning(payload?.text));
   const hasFatalStructuredErrorPayload =
     hasErrorPayload &&
     !hasSuccessfulPayloadAfterLastError &&
     !hasPendingPresentationWarning &&
-    !hasNonTerminalToolErrorWarning;
-  const hasStructuredDeliveryPayloads = selectedDeliveryPayloads.some((payload) =>
-    payloadHasStructuredDeliveryContent(payload),
-  );
+    !hasNonTerminalToolErrorWarning &&
+    !hasRecoveredToolWarning;
   // Keep structured/media announce payloads intact. Only collapse purely textual
   // cron announce output to the final assistant-visible answer.
   const shouldUseFinalAssistantVisibleText =
diff --git a/src/cron/run-diagnostics.test.ts b/src/cron/run-diagnostics.test.ts
@@ -179,6 +179,45 @@ describe("cron run diagnostics", () => {
     expect(diagnostics?.summary).toBe("⚠️ Exec failed");
   });
 
+  it("downgrades recovered tool errors for successful runs", () => {
+    const diagnostics = createCronRunDiagnosticsFromAgentResult(
+      {
+        payloads: [
+          {
+            toolName: "exec",
+            text: "⚠️ 🛠️ jq -s '{total:length}' (agent) failed",
+            isError: true,
+            details: {
+              status: "failed",
+              exitCode: 1,
+              aggregated: "jq syntax error",
+            },
+          },
+        ],
+      },
+      { finalStatus: "ok", nowMs: () => 800 },
+    );
+
+    expect(diagnostics?.entries).toEqual([
+      {
+        ts: 800,
+        source: "exec",
+        severity: "warn",
+        message: "jq syntax error",
+        toolName: "exec",
+        exitCode: 1,
+      },
+      {
+        ts: 800,
+        source: "tool",
+        severity: "warn",
+        message: "⚠️ 🛠️ jq -s '{total:length}' (agent) failed",
+        toolName: "exec",
+      },
+    ]);
+    expect(diagnostics?.summary).toBe("⚠️ 🛠️ jq -s '{total:length}' (agent) failed");
+  });
+
   it("captures silent failed exec details with a fallback message", () => {
     const diagnostics = createCronRunDiagnosticsFromAgentResult(
       {
diff --git a/src/cron/run-diagnostics.ts b/src/cron/run-diagnostics.ts
@@ -224,6 +224,7 @@ export function createCronRunDiagnosticsFromExecDetails(
   opts?: {
     nowMs?: () => number;
     toolName?: string;
+    finalStatus?: "ok" | "error" | "skipped";
   },
 ): CronRunDiagnostics | undefined {
   if (!isRecord(details)) {
@@ -248,7 +249,7 @@ export function createCronRunDiagnosticsFromExecDetails(
         {
           ts: opts?.nowMs?.() ?? Date.now(),
           source: "exec",
-          severity: status === "failed" ? "error" : "warn",
+          severity: opts?.finalStatus === "ok" ? "warn" : status === "failed" ? "error" : "warn",
           message,
           toolName: opts?.toolName,
           exitCode,
@@ -270,6 +271,7 @@ export function createCronRunDiagnosticsFromToolPayload(
   const detailsDiagnostics = createCronRunDiagnosticsFromExecDetails(payload.details, {
     nowMs: opts?.nowMs,
     toolName,
+    finalStatus: opts?.finalStatus,
   });
   const isError = payload.isError === true;
   const text = typeof payload.text === "string" ? payload.text : undefined;
@@ -279,7 +281,7 @@ export function createCronRunDiagnosticsFromToolPayload(
   const textDiagnostics =
     isError && text
       ? createCronRunDiagnosticsFromError("tool", text, {
-          severity: isNonTerminalToolWarning ? "warn" : "error",
+          severity: isNonTerminalToolWarning || opts?.finalStatus === "ok" ? "warn" : "error",
           nowMs: opts?.nowMs,
           toolName,
         })
