fix: suppress raw API error payloads (#924) (thanks @grp06)

Co-authored-by: George Pickett <gpickett00@gmail.com>

src/agents/pi-embedded-runner/run/payloads.test.ts

@@ -3,15 +3,27 @@ import { describe, expect, it } from "vitest";
 import { buildEmbeddedRunPayloads } from "./payloads.js";
 
 describe("buildEmbeddedRunPayloads", () => {
-  it("suppresses raw API error JSON when the assistant errored", () => {
-    const errorJson =
+  const errorJson =
       '{"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"},"request_id":"req_011CX7DwS7tSvggaNHmefwWg"}';
-    const lastAssistant = {
+  const errorJsonPretty = `{
+  "type": "error",
+  "error": {
+    "details": null,
+    "type": "overloaded_error",
+    "message": "Overloaded"
+  },
+  "request_id": "req_011CX7DwS7tSvggaNHmefwWg"
+}`;
+  const makeAssistant = (overrides: Partial<AssistantMessage>): AssistantMessage =>
+    ({
       stopReason: "error",
       errorMessage: errorJson,
       content: [{ type: "text", text: errorJson }],
-    } as AssistantMessage;
+      ...overrides,
+    }) as AssistantMessage;
 
+  it("suppresses raw API error JSON when the assistant errored", () => {
+    const lastAssistant = makeAssistant({});
     const payloads = buildEmbeddedRunPayloads({
       assistantTexts: [errorJson],
       toolMetas: [],
@@ -29,4 +41,74 @@ describe("buildEmbeddedRunPayloads", () => {
     expect(payloads[0]?.isError).toBe(true);
     expect(payloads.some((payload) => payload.text === errorJson)).toBe(false);
   });
+
+  it("suppresses pretty-printed error JSON that differs from the errorMessage", () => {
+    const lastAssistant = makeAssistant({ errorMessage: errorJson });
+    const payloads = buildEmbeddedRunPayloads({
+      assistantTexts: [errorJsonPretty],
+      toolMetas: [],
+      lastAssistant,
+      sessionKey: "session:telegram",
+      inlineToolResultsAllowed: true,
+      verboseLevel: "on",
+      reasoningLevel: "off",
+    });
+
+    expect(payloads).toHaveLength(1);
+    expect(payloads[0]?.text).toBe(
+      "The AI service is temporarily overloaded. Please try again in a moment.",
+    );
+    expect(payloads.some((payload) => payload.text === errorJsonPretty)).toBe(false);
+  });
+
+  it("suppresses raw error JSON from fallback assistant text", () => {
+    const lastAssistant = makeAssistant({ content: [{ type: "text", text: errorJsonPretty }] });
+    const payloads = buildEmbeddedRunPayloads({
+      assistantTexts: [],
+      toolMetas: [],
+      lastAssistant,
+      sessionKey: "session:telegram",
+      inlineToolResultsAllowed: false,
+      verboseLevel: "off",
+      reasoningLevel: "off",
+    });
+
+    expect(payloads).toHaveLength(1);
+    expect(payloads[0]?.text).toBe(
+      "The AI service is temporarily overloaded. Please try again in a moment.",
+    );
+    expect(payloads.some((payload) => payload.text?.includes("request_id"))).toBe(false);
+  });
+
+  it("suppresses raw error JSON even when errorMessage is missing", () => {
+    const lastAssistant = makeAssistant({ errorMessage: undefined });
+    const payloads = buildEmbeddedRunPayloads({
+      assistantTexts: [errorJsonPretty],
+      toolMetas: [],
+      lastAssistant,
+      sessionKey: "session:telegram",
+      inlineToolResultsAllowed: false,
+      verboseLevel: "off",
+      reasoningLevel: "off",
+    });
+
+    expect(payloads).toHaveLength(1);
+    expect(payloads[0]?.isError).toBe(true);
+    expect(payloads.some((payload) => payload.text?.includes("request_id"))).toBe(false);
+  });
+
+  it("does not suppress error-shaped JSON when the assistant did not error", () => {
+    const payloads = buildEmbeddedRunPayloads({
+      assistantTexts: [errorJsonPretty],
+      toolMetas: [],
+      lastAssistant: { stopReason: "end_turn" } as AssistantMessage,
+      sessionKey: "session:telegram",
+      inlineToolResultsAllowed: false,
+      verboseLevel: "off",
+      reasoningLevel: "off",
+    });
+
+    expect(payloads).toHaveLength(1);
+    expect(payloads[0]?.text).toBe(errorJsonPretty.trim());
+  });
 });

src/agents/pi-embedded-runner/run/payloads.ts

@@ -4,7 +4,12 @@ import type { ReasoningLevel, VerboseLevel } from "../../../auto-reply/thinking.
 import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../../../auto-reply/tokens.js";
 import { formatToolAggregate } from "../../../auto-reply/tool-meta.js";
 import type { ClawdbotConfig } from "../../../config/config.js";
-import { formatAssistantErrorText } from "../../pi-embedded-helpers.js";
+import {
+  formatAssistantErrorText,
+  getApiErrorPayloadFingerprint,
+  isRawApiErrorPayload,
+  normalizeTextForComparison,
+} from "../../pi-embedded-helpers.js";
 import {
   extractAssistantText,
   extractAssistantThinking,
@@ -42,16 +47,20 @@ export function buildEmbeddedRunPayloads(params: {
     replyToCurrent?: boolean;
   }> = [];
 
+  const lastAssistantErrored = params.lastAssistant?.stopReason === "error";
   const errorText = params.lastAssistant
     ? formatAssistantErrorText(params.lastAssistant, {
         cfg: params.config,
         sessionKey: params.sessionKey,
       })
     : undefined;
-  const rawErrorMessage =
-    params.lastAssistant?.stopReason === "error"
-      ? params.lastAssistant.errorMessage?.trim() || undefined
-      : undefined;
+  const rawErrorMessage = lastAssistantErrored
+    ? params.lastAssistant?.errorMessage?.trim() || undefined
+    : undefined;
+  const rawErrorFingerprint = rawErrorMessage
+    ? getApiErrorPayloadFingerprint(rawErrorMessage)
+    : null;
+  const normalizedRawErrorText = rawErrorMessage ? normalizeTextForComparison(rawErrorMessage) : null;
   if (errorText) replyItems.push({ text: errorText, isError: true });
 
   const inlineToolResults =
@@ -87,13 +96,28 @@ export function buildEmbeddedRunPayloads(params: {
   if (reasoningText) replyItems.push({ text: reasoningText });
 
   const fallbackAnswerText = params.lastAssistant ? extractAssistantText(params.lastAssistant) : "";
+  const shouldSuppressRawErrorText = (text: string) => {
+    if (!lastAssistantErrored) return false;
+    const trimmed = text.trim();
+    if (!trimmed) return false;
+    if (rawErrorMessage && trimmed === rawErrorMessage) return true;
+    if (normalizedRawErrorText) {
+      const normalized = normalizeTextForComparison(trimmed);
+      if (normalized && normalized === normalizedRawErrorText) return true;
+    }
+    if (rawErrorFingerprint) {
+      const fingerprint = getApiErrorPayloadFingerprint(trimmed);
+      if (fingerprint && fingerprint === rawErrorFingerprint) return true;
+    }
+    return isRawApiErrorPayload(trimmed);
+  };
   const answerTexts = (
     params.assistantTexts.length
       ? params.assistantTexts
       : fallbackAnswerText
         ? [fallbackAnswerText]
         : []
-  ).filter((text) => (rawErrorMessage ? text.trim() !== rawErrorMessage : true));
+  ).filter((text) => !shouldSuppressRawErrorText(text));
 
   for (const text of answerTexts) {
     const {