Reuse leisure truncation notices for fleet-dry spills

Author: TheGreatAxios

src/plugins/result-truncation-plugin.ts

@@ -55,7 +55,7 @@ export function spillBlobKey(callId: string): string {
   return `${callId}:full`;
 }
 
-function truncationNotice(args: {
+export function truncationNotice(args: {
   maxChars: number;
   remaining: number;
   fullLength: number;
@@ -92,7 +92,7 @@ function truncationNotice(args: {
  * remaining/fullLength (and optional absolutePath), so shrink kept until the
  * assembled result fits.
  */
-function truncateWithReservedNotice(
+export function truncateWithReservedNotice(
   text: string,
   maxChars: number,
   buildNotice: (keptLen: number) => string,

src/subagent/fleet-dry-drive.test.ts

@@ -557,86 +557,6 @@ describe("driveOpenTasksAfterFleetDry", () => {
     ).toBe(original);
   });
 
-  test("send waits for async writeBlob before naming the URI", async () => {
-    const original = `head-${"x".repeat(FLEET_DRY_REPORT_CHARS)}TAIL-MARKER`;
-    const records = new Map<string, FleetDryMailboxRecord>([
-      ["big", { status: "done", report: original }],
-    ]);
-    const store = fakeBlobStore();
-    let resolveWrite: (() => void) | undefined;
-    const writeBlob = (key: string, bytes: Uint8Array, contentType: string) =>
-      new Promise<void>((resolve) => {
-        resolveWrite = () => {
-          store.writeBlob(key, bytes, contentType);
-          resolve();
-        };
-      });
-    const sent: string[] = [];
-    const drivenP = driveOpenTasksAfterFleetDry({
-      previousRunning: 1,
-      running: 0,
-      openTasks: [openTask],
-      parentProcessing: false,
-      mailbox: peekMailbox(records),
-      lanes: [],
-      writeBlob,
-      beginSystemContinuation: (prompt) => {
-        sent.push(prompt);
-      },
-      send: () => undefined,
-    });
-    await Promise.resolve();
-    expect(sent).toEqual([]);
-    resolveWrite?.();
-    expect(await drivenP).toBe(true);
-    const uri = `tool-output:///${fleetDrySpillKey("big", "report")}`;
-    expect(sent[0]).toContain(uri);
-    expect(sent[0]).not.toContain("TAIL-MARKER");
-    const recovered = new TextDecoder().decode(
-      await createBlobReader(store).read(uri),
-    );
-    expect(recovered).toBe(original);
-  });
-
-  test("rejected writeBlob send is NOT retrievable and names no URI", async () => {
-    const original = "x".repeat(FLEET_DRY_REPORT_CHARS + 40);
-    const records = new Map<string, FleetDryMailboxRecord>([
-      ["big", { status: "done", report: original }],
-    ]);
-    const rejections: unknown[] = [];
-    const onUnhandled = (reason: unknown) => {
-      rejections.push(reason);
-    };
-    process.on("unhandledRejection", onUnhandled);
-    try {
-      const sent: string[] = [];
-      const driven = await driveOpenTasksAfterFleetDry({
-        previousRunning: 1,
-        running: 0,
-        openTasks: [openTask],
-        parentProcessing: false,
-        mailbox: peekMailbox(records),
-        lanes: [],
-        writeBlob: async () => {
-          throw new Error("disk full");
-        },
-        beginSystemContinuation: (prompt) => {
-          sent.push(prompt);
-        },
-        send: () => undefined,
-      });
-      await Promise.resolve();
-      expect(driven).toBe(true);
-      const parsed = reportsJSONFromPrompt(sent[0] ?? "");
-      const report = (parsed as { report?: string }[])[0]?.report ?? "";
-      expect(report).toContain("NOT retrievable");
-      expect(report).not.toContain("tool-output:///");
-      expect(rejections).toEqual([]);
-    } finally {
-      process.off("unhandledRejection", onUnhandled);
-    }
-  });
-
   test("dry+terminal, live+open, and parentProcessing only skip", () => {
     const noop = {
       mailbox: undefined,

src/subagent/fleet-dry-drive.ts

@@ -5,6 +5,10 @@
  */
 
 import { hasActiveTasks, type Task } from "../agent/tasks.js";
+import {
+  truncationNotice,
+  truncateWithReservedNotice,
+} from "../plugins/result-truncation-plugin.js";
 import { isLiveWaitStatus, type WaitJSONStatus } from "./lifecycle.js";
 
 /** Enough of a lane report for a parent continuation; traces stay on disk. */
@@ -83,46 +87,6 @@ export function fleetDrySpillKey(
   return `fleet-dry:${agentId}:${field}`;
 }
 
-function truncationNotice(args: {
-  maxChars: number;
-  remaining: number;
-  fullLength: number;
-  uri?: string;
-}): string {
-  const { maxChars, remaining, fullLength, uri } = args;
-  if (uri === undefined) {
-    return (
-      `\n[output truncated at ${maxChars.toLocaleString()} chars — ` +
-      `${remaining.toLocaleString()} chars discarded, NOT retrievable ` +
-      `(no blob store is configured; re-running gives the same cut). ` +
-      `Use offset/limit or a narrower query.]`
-    );
-  }
-  return (
-    `\n[output truncated at ${maxChars.toLocaleString()} chars — ` +
-    `${remaining.toLocaleString()} more chars omitted here. The full result ` +
-    `(${fullLength.toLocaleString()} chars, text/plain) is saved at ${uri}` +
-    ` — use read_file with that URI (offset/limit supported) to see the rest.]`
-  );
-}
-
-function truncateWithReservedNotice(
-  text: string,
-  maxChars: number,
-  buildNotice: (keptLen: number) => string,
-): string {
-  let keptLen = maxChars;
-  for (let i = 0; i < 8; i++) {
-    const notice = buildNotice(keptLen);
-    const total = keptLen + notice.length;
-    if (total <= maxChars) return text.slice(0, keptLen) + notice;
-    keptLen -= total - maxChars;
-    if (keptLen < 0) keptLen = 0;
-  }
-  const notice = buildNotice(keptLen);
-  return (text.slice(0, keptLen) + notice).slice(0, maxChars);
-}
-
 async function clipField(
   text: string | undefined,
   agentId: string,
@@ -146,6 +110,7 @@ async function clipField(
       maxChars: FLEET_DRY_REPORT_CHARS,
       remaining: text.length - keptLen,
       fullLength: text.length,
+      contentType: "text/plain",
       ...(uri !== undefined ? { uri } : {}),
     }),
   );