@bermudi/pi-delegate 0.1.13 → 0.1.15

package/format.ts

@@ -3,6 +3,8 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { renderOutputForLLM } from "./spill.ts";
 import { getOutputSpillThreshold, getOutputSpillTail } from "./config.ts";
+import { toolExpandHint } from "./key-hints.ts";
+import { sanitizeTerminalLine } from "./utils.ts";
 import type {
   ResolvedTask,
   TaskProgress,
@@ -136,9 +138,13 @@ export function applyLineBudget(lines: string[], expanded: boolean): string[] {
   const budget = Math.max(10, Math.min(18, Math.floor(rows * 0.4)));
   if (lines.length <= budget) return [...lines];
   const hidden = lines.length - budget + 1;
+  const expandHint = toolExpandHint("expands");
   return [
     ...lines.slice(0, budget - 1),
-    truncLine(`… ${hidden} lines hidden · Ctrl+O expands`, getTermWidth()),
+    truncLine(
+      `… ${hidden} lines hidden${expandHint ? ` · ${expandHint}` : ""}`,
+      getTermWidth(),
+    ),
   ];
 }
 
@@ -189,7 +195,36 @@ export function trunc(s: string, n: number): string {
 
 /** Render an optional task `id` in a compact, visually distinct form. */
 export function formatTaskId(id: string | undefined): string {
-  return id ? ` #${id}` : "";
+  if (!id) return "";
+  const safeId = sanitizeTerminalLine(id);
+  return safeId ? ` #${safeId}` : "";
+}
+
+/**
+ * Short identity tag for a resumed transcript, derived from its session file
+ * path (pi names sessions `<timestamp>_<uuid>.jsonl`, so the UUID prefix is
+ * the stable part). Best-effort display identity only — never parsed back.
+ */
+export function formatResumeTag(resumeFrom: string): string {
+  const stem = sanitizeTerminalLine(resumeFrom).replace(/\.jsonl$/i, "");
+  const base = stem.split("/").pop() ?? stem;
+  const unique = base.includes("_") ? (base.split("_").pop() ?? base) : base;
+  return (unique.slice(0, 8) || "resumed").trim();
+}
+
+/**
+ * Plain-text revival marker for a progress row that continued an earlier
+ * transcript. Empty when the row is not a resume, or when the agent name
+ * already carries the resume identity (`resume:<tag>`, set at task resolution
+ * for omitted-agent resumes) — the marker must not duplicate it.
+ */
+export function resumeMarker(p: {
+  agent: string;
+  resumedFrom?: string;
+}): string {
+  return p.resumedFrom && p.agent !== `resume:${p.resumedFrom}`
+    ? ` ↻${p.resumedFrom}`
+    : "";
 }
 
 /**
@@ -206,7 +241,7 @@ export function previewOutputLine(output: string, maxWidth: number): string {
   const clean = output.trim();
   if (!clean || clean === "(no output)") return "";
   for (const raw of clean.split("\n")) {
-    const line = raw.trim();
+    const line = sanitizeTerminalLine(raw);
     if (!line) continue;
     // Strip leading markdown noise so the preview reads as content, not markup.
     const stripped = line
@@ -241,20 +276,23 @@ function firstArg(
   return undefined;
 }
 
-/** Render a compact, human-readable summary of a tool call. */
+/** Render a compact, terminal-safe, single-line summary of a tool call. */
 export function formatToolCallShort(
   name: string,
   args: Record<string, unknown>,
 ): string {
-  if (!args || typeof args !== "object") return name;
+  const safeName = sanitizeTerminalLine(name);
+  if (!args || typeof args !== "object") return safeName;
   switch (name) {
     case "bash": {
-      const cmd = firstArg(args, "command") ?? "...";
+      const cmd = sanitizeTerminalLine(firstArg(args, "command") ?? "...");
       const maxLen = 80;
       return `$ ${cmd.length > maxLen ? cmd.slice(0, maxLen) + "…" : cmd}`;
     }
     case "read": {
-      const p = shortenPath(firstArg(args, "path", ["file_path"]) ?? "...");
+      const p = shortenPath(
+        sanitizeTerminalLine(firstArg(args, "path", ["file_path"]) ?? "..."),
+      );
       const offset = typeof args.offset === "number" ? args.offset : undefined;
       const limit = typeof args.limit === "number" ? args.limit : undefined;
       let line = `read ${p}`;
@@ -266,16 +304,20 @@ export function formatToolCallShort(
       return line;
     }
     case "write": {
-      const p = shortenPath(firstArg(args, "path", ["file_path"]) ?? "...");
+      const p = shortenPath(
+        sanitizeTerminalLine(firstArg(args, "path", ["file_path"]) ?? "..."),
+      );
       const lines = String(args.content ?? "").split("\n").length;
       return `write ${p}${lines > 1 ? ` (${lines} lines)` : ""}`;
     }
     case "edit": {
-      const p = shortenPath(firstArg(args, "path", ["file_path"]) ?? "...");
+      const p = shortenPath(
+        sanitizeTerminalLine(firstArg(args, "path", ["file_path"]) ?? "..."),
+      );
       return `edit ${p}`;
     }
     default: {
-      // Try to pick a meaningful first arg before falling back to JSON
+      // Try to pick a meaningful first arg before falling back to JSON.
       for (const key of [
         "command",
         "path",
@@ -288,15 +330,20 @@ export function formatToolCallShort(
       ]) {
         const val = args[key];
         if (typeof val === "string" && val.trim()) {
-          const preview = val.length > 50 ? val.slice(0, 50) + "…" : val;
-          return `${name} ${preview}`;
+          const safeValue = sanitizeTerminalLine(val);
+          const preview =
+            safeValue.length > 50 ? safeValue.slice(0, 50) + "…" : safeValue;
+          return `${safeName} ${preview}`;
         }
       }
       try {
-        const preview = JSON.stringify(args).slice(0, 50);
-        return `${name} ${preview}${preview.length >= 50 ? "…" : ""}`;
+        const json = JSON.stringify(args);
+        if (json === undefined) return safeName;
+        const serialized = sanitizeTerminalLine(json);
+        const preview = serialized.slice(0, 50);
+        return `${safeName} ${preview}${serialized.length > 50 ? "…" : ""}`;
       } catch {
-        return name;
+        return safeName;
       }
     }
   }
@@ -338,6 +385,10 @@ function isResumableSessionFile(sessionFile: string): boolean {
   return false;
 }
 
+/** Shared LLM-facing warning for results returned before proven quiescence. */
+export const INCOMPLETE_QUIESCENCE_WARNING =
+  "[INCOMPLETE: quiescence was abandoned; output, file evidence, token usage, and cost are lower bounds while the quarantined session settles.]";
+
 /**
  * Render a failed or aborted task's result lines for LLM consumption.
  *
@@ -364,7 +415,10 @@ export function formatFailedTask(
   config?: import("./config.ts").DelegateConfig,
 ): string[] {
   const parts: string[] = [];
-  const isAbort = r.error === "Aborted";
+  if (r.incomplete === "quiescence_abandoned") {
+    parts.push(INCOMPLETE_QUIESCENCE_WARNING);
+  }
+  const isAbort = r.failureKind === "cancelled";
   // Empty string is falsy but not nullish — `||` covers both undefined and "".
   const failParts = [r.error || "unknown error"];
   if (r.sessionFile) failParts.push(`session: ${shortenPath(r.sessionFile)}`);
@@ -436,7 +490,7 @@ export function formatCompletedTask(
   // `|| task.sessionAction` covers action-only tasks (close/list/...) where prompt is
   // empty. Async prompt tasks always set prompt, so this is a no-op there.
   parts.push(
-    `=== ${result.agent}${formatTaskId(result.id ?? task.id)}: ${trunc(task.prompt || task.sessionAction || "", 80)} ===`,
+    `=== ${result.agent}${resumeMarker(result)}${formatTaskId(result.id ?? task.id)}: ${trunc(task.prompt || task.sessionAction || "", 80)} ===`,
   );
   if (task.warnings?.length) {
     for (const w of task.warnings) parts.push(`[WARNING: ${w}]`);
@@ -444,8 +498,11 @@ export function formatCompletedTask(
   if (result.error) {
     parts.push(...formatFailedTask(result, task.cwd, config));
   } else {
+    if (result.incomplete === "quiescence_abandoned") {
+      parts.push(INCOMPLETE_QUIESCENCE_WARNING);
+    }
     const meta = [
-      `OK | ${fmtDuration(result.durationMs)} | ${fmtTokens(result.tokens)} tokens`,
+      `OK | ${fmtDuration(result.durationMs)} | ${taskTokenLabel(result)}`,
     ];
     if (result.sessionFile) meta.push(shortenPath(result.sessionFile));
     const touched = relativeTouchedSummary(result.touchedFiles, task.cwd);
@@ -477,6 +534,23 @@ export function formatCompletedTask(
     for (const conflict of integration.conflicts ?? []) {
       parts.push(`conflict: ${conflict.path}: ${conflict.reason}`);
     }
+    for (const issue of "classificationIssues" in integration
+      ? (integration.classificationIssues ?? [])
+      : []) {
+      parts.push(
+        `attribution classification issue: ${issue.path}: ${issue.reason}`,
+      );
+    }
+    if (integration.cleanupIssue) {
+      parts.push(
+        `cleanup ${integration.cleanupIssue.status}: ${integration.cleanupIssue.reason}`,
+      );
+      if (integration.cleanupIssue.recoveryPath) {
+        parts.push(
+          `cleanup recovery path: ${integration.cleanupIssue.recoveryPath}`,
+        );
+      }
+    }
     if (integration.status === "applied_unverified") {
       parts.push(
         'Changes were applied but not verified. Suggested next call: delegate({ tasks: [{ agent: "reviewer", workspace: "scratch", prompt: "Review the applied isolated changes and run the relevant tests." }] })',
@@ -511,7 +585,9 @@ export function latestActivity(p: TaskProgress): ToolActivity | null {
 export function formatActivityLabel(p: TaskProgress): string {
   const activity = inFlightActivity(p) ?? latestActivity(p);
   if (!activity) return "thinking";
-  const call = formatToolCallShort(activity.name, activity.args);
+  const call = sanitizeTerminalLine(
+    formatToolCallShort(activity.name, activity.args),
+  );
   if (!activity.result) return call;
   return `last: ${call}`;
 }
@@ -522,7 +598,9 @@ export function formatActivityLabel(p: TaskProgress): string {
 export function compactActivity(p: TaskProgress): string {
   const activity = inFlightActivity(p) ?? latestActivity(p);
   if (!activity) return "thinking…";
-  const call = formatToolCallShort(activity.name, activity.args);
+  const call = sanitizeTerminalLine(
+    formatToolCallShort(activity.name, activity.args),
+  );
   if (!activity.result) {
     const toolAge = fmtDuration(Date.now() - activity.startTime);
     return `${call} | ${toolAge}`;
@@ -533,8 +611,16 @@ export function compactActivity(p: TaskProgress): string {
 
 /** Per-task stats core: [duration, tokens]. Callers append medium-specific
  *  extras (touched files; themed join). */
+export function taskTokenLabel(
+  result: Pick<TaskResult, "tokens" | "incomplete">,
+): string {
+  return result.incomplete === "quiescence_abandoned"
+    ? `≥${fmtTokens(result.tokens)} tokens (incomplete)`
+    : `${fmtTokens(result.tokens)} tokens`;
+}
+
 export function taskMetaBase(r: TaskResult): string[] {
-  return [fmtDuration(r.durationMs), `${fmtTokens(r.tokens)} tokens`];
+  return [fmtDuration(r.durationMs), taskTokenLabel(r)];
 }
 
 /** Pending-task waiting label: "queued (N running)" at the concurrency cap,