@bermudi/pi-delegate 0.1.14 → 0.1.15

package/dispatch.ts

@@ -112,6 +112,7 @@ export function initProgress(resolved: ResolvedTask[]): TaskProgress[] {
     id: t.id,
     index: i,
     agent: t.agentName,
+    resumedFrom: t.resumeFromDisplay,
     task: trunc(sanitizeTerminalLine(t.prompt || t.sessionAction || ""), 50),
     status: "pending" as const,
     durationMs: 0,

package/format.ts

@@ -200,6 +200,33 @@ export function formatTaskId(id: string | undefined): string {
   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}`
+    : "";
+}
+
 /**
  * Extract a single-line preview of agent output for collapsed final display.
  *
@@ -463,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}]`);

package/lifecycle.ts

@@ -118,6 +118,7 @@ function failTask(
   return {
     id: task.id,
     agent: task.agentName,
+    resumedFrom: task.resumeFromDisplay,
     output: "",
     error,
     failureKind,
@@ -200,6 +201,7 @@ function completeSessionAction(
   return {
     id: task.id,
     agent: task.agentName,
+    resumedFrom: task.resumeFromDisplay,
     output,
     durationMs: elapsedMs ?? 0,
     tokens: 0,
@@ -1237,6 +1239,7 @@ function deadlineExceededResult(
   return {
     id: task.id,
     agent: task.agentName,
+    resumedFrom: task.resumeFromDisplay,
     output: prior?.output ?? "",
     error: formatDeadlineExceededError(budgetMs),
     failureKind: "deadline_exceeded",
@@ -1566,6 +1569,7 @@ async function runTaskAttempt(
     return propagateSessionQuarantine(r, {
       id: task.id,
       agent: task.agentName,
+      resumedFrom: task.resumeFromDisplay,
       output: r.output,
       error: r.error,
       // Classify the failure: the runner sets `stalled` for the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bermudi/pi-delegate",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Delegate tool for the Pi coding agent.",
   "keywords": [
     "pi-package"

package/render-branches.ts

@@ -14,6 +14,7 @@ import {
   previewOutputLine,
   taskTokenLabel,
   waitingLabel,
+  resumeMarker,
 } from "./format.ts";
 import {
   resolveCarriageReturn,
@@ -128,6 +129,11 @@ export function renderPartialBranch(ctx: BranchCtx, h: RenderHelpers): void {
     const task = sanitizeTerminalLine(p.task);
     const taskId = formatTaskId(p.id);
     const taskIdTag = taskId ? theme.fg("accent", taskId) : "";
+    // Revival marker: a resumed row must never read as a fresh spawn. Empty
+    // when the identity already carries the resume label (omitted-agent
+    // resumes resolve to `resume:<tag>` at task resolution).
+    const resumeMarkRaw = resumeMarker(p);
+    const resumeMark = resumeMarkRaw ? theme.fg("warning", resumeMarkRaw) : "";
     const runParts: string[] = [];
     if (p.toolUses > 0)
       runParts.push(`${p.toolUses} tool${p.toolUses > 1 ? "s" : ""}`);
@@ -137,7 +143,7 @@ export function renderPartialBranch(ctx: BranchCtx, h: RenderHelpers): void {
       case "done":
         lines.push(
           truncLine(
-            `${tree(i, total)} ${theme.fg("success", "✓")} ${theme.bold(agent)}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? `${modelLabel(p)}${statJoin([fmtDuration(p.durationMs), taskTokenLabel(p)])}` : ""}`,
+            `${tree(i, total)} ${theme.fg("success", "✓")} ${theme.bold(agent)}${resumeMark}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? `${modelLabel(p)}${statJoin([fmtDuration(p.durationMs), taskTokenLabel(p)])}` : ""}`,
             w,
           ),
         );
@@ -158,7 +164,7 @@ export function renderPartialBranch(ctx: BranchCtx, h: RenderHelpers): void {
       case "failed":
         lines.push(
           truncLine(
-            `${tree(i, total)} ${theme.fg("error", "✗")} ${theme.bold(agent)}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? modelLabel(p) : ""}${p.error ? theme.fg("error", ` · ${sanitizeTerminalLine(p.error)}`) : ""}`,
+            `${tree(i, total)} ${theme.fg("error", "✗")} ${theme.bold(agent)}${resumeMark}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? modelLabel(p) : ""}${p.error ? theme.fg("error", ` · ${sanitizeTerminalLine(p.error)}`) : ""}`,
             w,
           ),
         );
@@ -192,7 +198,7 @@ export function renderPartialBranch(ctx: BranchCtx, h: RenderHelpers): void {
           const glyph = theme.fg("warning", spinnerFrame());
           lines.push(
             truncLine(
-              `${tree(i, total)} ${glyph} ${theme.bold(agent)}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? `${modelLabel(p)}${statJoin(runParts)}` : ""}${issueTag}${theme.fg("dim", ageTag)}`,
+              `${tree(i, total)} ${glyph} ${theme.bold(agent)}${resumeMark}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? `${modelLabel(p)}${statJoin(runParts)}` : ""}${issueTag}${theme.fg("dim", ageTag)}`,
               w,
             ),
           );
@@ -271,7 +277,7 @@ export function renderPartialBranch(ctx: BranchCtx, h: RenderHelpers): void {
         );
         lines.push(
           truncLine(
-            `${tree(i, total)} ${theme.fg("muted", "○")} ${theme.bold(agent)}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? modelLabel(p) : ""}${queuedTag}`,
+            `${tree(i, total)} ${theme.fg("muted", "○")} ${theme.bold(agent)}${resumeMark}${taskIdTag}${theme.fg("muted", ` — ${task}`)}${expanded ? modelLabel(p) : ""}${queuedTag}`,
             w,
           ),
         );
@@ -431,6 +437,11 @@ export function renderFinalBranch(ctx: BranchCtx, h: RenderHelpers): void {
     const taskId = formatTaskId(p.id);
     const taskIdTag = taskId ? theme.fg("accent", taskId) : "";
     const taskIdWidth = taskId.length;
+    // Revival marker: a resumed row must never read as a fresh spawn. Empty
+    // when the identity already carries the resume label (omitted-agent
+    // resumes resolve to `resume:<tag>` at task resolution).
+    const resumeMarkRaw = resumeMarker(p);
+    const resumeMark = resumeMarkRaw ? theme.fg("warning", resumeMarkRaw) : "";
     const previewBudget = Math.max(1, w - 30 - taskIdWidth);
     const taskPreview = theme.fg("muted", ` — ${trunc(task, previewBudget)}`);
     const isLive =
@@ -445,7 +456,7 @@ export function renderFinalBranch(ctx: BranchCtx, h: RenderHelpers): void {
       : "";
     lines.push(
       truncLine(
-        `${tree(i, total)} ${icon} ${theme.bold(agent)}${taskIdTag}${taskPreview}${expanded ? modelLabel(p) : ""}${isLive ? liveTail : cancelledTail || (expanded ? statJoin([fmtDuration(p.durationMs), taskTokenLabel(p)]) : "")}`,
+        `${tree(i, total)} ${icon} ${theme.bold(agent)}${resumeMark}${taskIdTag}${taskPreview}${expanded ? modelLabel(p) : ""}${isLive ? liveTail : cancelledTail || (expanded ? statJoin([fmtDuration(p.durationMs), taskTokenLabel(p)]) : "")}`,
         w,
       ),
     );

package/task-resolution.ts

@@ -18,6 +18,7 @@ import {
   isSessionIdQuarantined,
 } from "./session-quarantine.ts";
 import { BUILTIN_AGENT_CONFIGS, buildSubagentSystemPrompt } from "./agents.ts";
+import { formatResumeTag } from "./format.ts";
 import { buildParentTranscript } from "./parent-context.ts";
 import { findAvailableAlternative, resolveModelRequest } from "./model.ts";
 import {
@@ -591,6 +592,14 @@ export function resolveTasks(
       requestedSystemPrompt = systemPrompt;
     }
 
+    // Freeze the display tag from the caller's path *before* lifecycle
+    // canonicalizes `resumeFrom` for locking/acquisition. A symlink whose
+    // basename differs from its target would otherwise make the settled row's
+    // `resumedFrom` disagree with the live progress row and `agentName`,
+    // defeating `resumeMarker`'s no-duplication rule.
+    const resumeFromDisplay = t.resumeFrom
+      ? formatResumeTag(t.resumeFrom)
+      : undefined;
     return {
       ...t,
       id: t.id,
@@ -604,8 +613,13 @@ export function resolveTasks(
       // display code treats "" and absent alike (`t.prompt || …`).
       prompt: prompt ?? "",
       // Keep the built-in selector visible in progress/results. Omitted-agent
-      // inline tasks retain the established `ad-hoc` label and config namespace.
-      agentName: agent?.name ?? "ad-hoc",
+      // inline tasks retain the established `ad-hoc` label and config namespace
+      // — except resumes: a continued transcript is not a fresh ad-hoc spawn,
+      // so it carries the resumed-transcript identity instead.
+      agentName:
+        agent?.name ??
+        (resumeFromDisplay ? `resume:${resumeFromDisplay}` : "ad-hoc"),
+      resumeFromDisplay,
       warnings,
       reuseIntent: {
         model: requestedModel,

package/ticket-format.ts

@@ -10,6 +10,7 @@ import {
   relativeTouchedSummary,
   findTouchedOverlaps,
   formatTouchedOverlapWarning,
+  resumeMarker,
 } from "./format.ts";
 import { renderOutputForPoll } from "./spill.ts";
 import { getOutputSpillTail, getOutputSpillThreshold } from "./config.ts";
@@ -93,12 +94,12 @@ export function formatInFlightTaskLine(p: TaskProgress): string {
   if (p.tokens > 0) parts.push(`${fmtTokens(p.tokens)} tokens`);
   const age = getActivityAge(p.lastActivityAt);
   if (age) parts.push(age);
-  return `⏳ ${p.agent}${formatTaskId(p.id)} · ${parts.join(" · ")}`;
+  return `⏳ ${p.agent}${resumeMarker(p)}${formatTaskId(p.id)} · ${parts.join(" · ")}`;
 }
 
 /** Queued-task line shared by poll snapshots and cancel previews. */
 export function formatQueuedTaskLine(p: TaskProgress): string {
-  return `○ ${p.agent}${formatTaskId(p.id)} · waiting…`;
+  return `○ ${p.agent}${resumeMarker(p)}${formatTaskId(p.id)} · waiting…`;
 }
 
 function appendTouchedMeta(
@@ -123,7 +124,7 @@ function formatSettledPollLines(
   const thresholdChars = getOutputSpillThreshold(ticket.config);
   if (!failed) {
     const lines = [
-      `✓ ${result.agent}${formatTaskId(result.id)} · ${meta.join(" · ")}`,
+      `✓ ${result.agent}${resumeMarker(result)}${formatTaskId(result.id)} · ${meta.join(" · ")}`,
     ];
     if (result.output && result.output !== "(no output)") {
       lines.push(
@@ -134,7 +135,7 @@ function formatSettledPollLines(
   }
   const errorText = result.error ?? "unknown error";
   const lines = [
-    `✗ ${result.agent}${formatTaskId(result.id)} · ${errorText} · ${meta.join(" · ")}`,
+    `✗ ${result.agent}${resumeMarker(result)}${formatTaskId(result.id)} · ${errorText} · ${meta.join(" · ")}`,
   ];
   if (result.sessionFile)
     lines.push(`  session: ${shortenPath(result.sessionFile)}`);
@@ -273,9 +274,9 @@ export function formatCancelPreview(ticket: AsyncTicket): string {
 
   for (const p of ticket.progress) {
     if (p.status === "done") {
-      lines.push(`✓ ${p.agent}${formatTaskId(p.id)} · completed`);
+      lines.push(`✓ ${p.agent}${resumeMarker(p)}${formatTaskId(p.id)} · completed`);
     } else if (p.status === "failed") {
-      lines.push(`✗ ${p.agent}${formatTaskId(p.id)} · ${p.error ?? "failed"}`);
+      lines.push(`✗ ${p.agent}${resumeMarker(p)}${formatTaskId(p.id)} · ${p.error ?? "failed"}`);
     } else if (p.status === "running") {
       lines.push(formatInFlightTaskLine(p));
     } else {

package/tickets.ts

@@ -11,6 +11,7 @@ import {
   fmtDuration,
   formatCompletedTask,
   formatTaskId,
+  resumeMarker,
   trunc,
   findTouchedOverlaps,
   formatTouchedOverlapWarning,
@@ -268,7 +269,7 @@ export function formatCompletedTicket(
     const t = ticket.resolved[i]!;
     if (!r) {
       parts.push(
-        `=== ${t.agentName}${formatTaskId(t.id)}: ${trunc(t.prompt || "", 80)} ===`,
+        `=== ${t.agentName}${resumeMarker(ticket.progress[i]!)}${formatTaskId(t.id)}: ${trunc(t.prompt || "", 80)} ===`,
       );
       parts.push(`[${pendingLabelFor(i)}]`);
       continue;
@@ -323,6 +324,7 @@ function pendingResultPlaceholder(task: ResolvedTask | undefined): TaskResult {
   return {
     id: task?.id,
     agent: task?.agentName ?? "unknown",
+    resumedFrom: task?.resumeFromDisplay,
     output: "",
     durationMs: 0,
     tokens: 0,

package/types.ts

@@ -148,6 +148,14 @@ export interface ResolvedTask {
   sessionId?: string;
   sessionAction?: SessionAction;
   resumeFrom?: string;
+  /** Display tag (`formatResumeTag`) of the *caller's* `resumeFrom` path, frozen
+   *  once at task resolution. `resumeFrom` itself is later replaced by the
+   *  canonical transcript path for locking/acquisition/quarantine, which can
+   *  have a different basename (symlink alias vs target). Settled-result and
+   *  progress `resumedFrom` tags must read this field — never re-derive from the
+   *  now-canonical `resumeFrom` — so the live and settled rows agree and
+   *  `resumeMarker`'s no-duplication rule holds. */
+  resumeFromDisplay?: string;
   /** Hard wall-clock budget in milliseconds, measured from task start. */
   deadlineMs?: number;
   agentName: string;
@@ -228,6 +236,9 @@ export interface TaskProgress {
   id?: string;
   index: number;
   agent: string;
+  /** Short tag (via `formatResumeTag`) of the transcript this task continued
+   *  via `resumeFrom`, if any. Lets renderers mark the row as a revival. */
+  resumedFrom?: string;
   task: string;
   status: "pending" | "running" | "done" | "failed";
   durationMs: number;
@@ -267,6 +278,10 @@ export interface DelegateDetails {
 export interface TaskResult {
   id?: string;
   agent: string;
+  /** Short tag (via `formatResumeTag`) of the transcript this task continued
+   *  via `resumeFrom`, if any. Lets settled-result renderers mark the row as
+   *  a revival — mirrors `TaskProgress.resumedFrom`. */
+  resumedFrom?: string;
   output: string;
   error?: string;
   /** Stable machine-readable failure reason; error remains human-facing. */