@esso0428/pi-subagents 0.17.1 → 0.17.3

package/src/index.ts

@@ -12,10 +12,10 @@
 
 import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
-import { defineTool, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext, getAgentDir, getSettingsListTheme } from "@earendil-works/pi-coding-agent";
-import { Container, Key, matchesKey, type SettingItem, SettingsList, Spacer, Text } from "@earendil-works/pi-tui";
+import { defineTool, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext, getAgentDir, getSelectListTheme, getSettingsListTheme } from "@earendil-works/pi-coding-agent";
+import { Container, Key, matchesKey, SelectList, type SettingItem, SettingsList, Spacer, Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
-import { agentHistoryLocator, createAgentHistoryPath, readAgentHistory } from "./agent-history.js";
+import { agentHistoryLocator, createAgentHistoryPath, readAgentHistory, readAgentHistoryResult } from "./agent-history.js";
 import { buildAgentStatusMenuEntries, canOpenActiveAgent, canOpenAgentHistory, formatAgentHistoryOption, splitAgentRecords } from "./agent-history-list.js";
 import { AgentManager } from "./agent-manager.js";
 import { getAgentConversation, getDefaultMaxTurns, getGraceTurns, normalizeMaxTurns, SUBAGENT_TOOL_NAMES, setDefaultMaxTurns, setGraceTurns, steerAgent } from "./agent-runner.js";
@@ -171,8 +171,8 @@ const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "ma
  * surfaces (or "" if the run produced nothing). `record.result` is bounded to
  * the run's own turns, so this is never a stale earlier answer (#144).
  */
-function partialOutputSuffix(record: AgentRecord): string {
-  const partial = record.result?.trim();
+function partialOutputSuffix(record: AgentRecord, fallback?: string): string {
+  const partial = record.result?.trim() || fallback?.trim();
   return partial ? `\n\nPartial output before the failure:\n${partial}` : "";
 }
 
@@ -450,7 +450,12 @@ export default function (pi: ExtensionAPI) {
     // Persist final record for cross-extension history reconstruction
     pi.appendEntry("subagents:record", {
       id: record.id, type: record.type, description: record.description,
-      status: record.status, result: record.result, error: record.error,
+      status: record.status,
+      // Durable transcripts are the source of truth for full output. Avoid
+      // copying a potentially large result into the parent session branch;
+      // get_subagent_result reloads it on demand after cleanup/restart.
+      result: record.transcriptPath ? undefined : record.result,
+      error: record.error,
       startedAt: record.startedAt, completedAt: record.completedAt,
       toolUses: record.toolUses,
       lifetimeUsage: record.lifetimeUsage,
@@ -555,16 +560,29 @@ export default function (pi: ExtensionAPI) {
     }
   }
 
+  type AgentMenuSelection = { id?: string; index: number };
+  let runningAgentSelection: AgentMenuSelection = { index: 0 };
+  let historyAgentSelection: AgentMenuSelection = { index: 0 };
+
+  function resetAgentMenuSelections() {
+    runningAgentSelection = { index: 0 };
+    historyAgentSelection = { index: 0 };
+  }
+
   // Capture ctx from session_start for RPC spawn handler + start the scheduler.
   // This also wires the RPC handlers and broadcasts readiness — on the first
   // bound session_start, so a filtered-out activation never advertises (#142).
   pi.on("session_start", async (_event, ctx) => {
+    resetAgentMenuSelections();
     currentCtx = ctx;
     manager.clearCompleted(true);
     const branch = ctx.sessionManager?.getBranch?.() ?? [];
     manager.restoreCompleted(branch
       .filter((entry: any) => entry?.type === "custom" && entry?.customType === "subagents:record")
       .map((entry: any) => entry.data));
+    // Checkpoint files cover agents whose parent session never got a terminal
+    // branch entry (shutdown, session switch, or a process restart).
+    manager.restoreRecovered(ctx.cwd);
     // Attach the panel during TUI startup, after restored records are present,
     // so terminal agents from the session branch are immediately visible.
     if (ctx.mode === "tui") {
@@ -589,6 +607,10 @@ export default function (pi: ExtensionAPI) {
   });
 
   pi.on("session_before_switch", () => {
+    resetAgentMenuSelections();
+    // A switch is catchable. Stop and checkpoint live/queued agents before the
+    // old session context is discarded, then retain their unread history.
+    manager.abortAll();
     manager.clearCompleted(true);
     scheduler.stop();
   });
@@ -596,6 +618,7 @@ export default function (pi: ExtensionAPI) {
   // On shutdown, abort all agents immediately and clean up.
   // If the session is going down, there's nothing left to consume agent results.
   pi.on("session_shutdown", async () => {
+    resetAgentMenuSelections();
     rpcHandle?.unsubSpawn();
     rpcHandle?.unsubStop();
     rpcHandle?.unsubPing();
@@ -1163,6 +1186,7 @@ Terse command-style prompts produce shallow, generic work.
           rec.historyFile = createAgentHistoryPath(ctx.cwd, agentId);
           rec.transcriptPath = agentHistoryLocator(ctx.cwd, rec.historyFile);
           writeInitialEntry(rec.historyFile, agentId, params.prompt, ctx.cwd);
+          manager.setTranscript(agentId, rec.historyFile, rec.transcriptPath, ctx.cwd);
         } catch (err) {
           rec.historyFile = undefined;
           rec.transcriptPath = undefined;
@@ -1274,9 +1298,10 @@ Terse command-style prompts produce shallow, generic work.
         const { state: bgState, callbacks: bgCallbacks } = createActivityTracker(effectiveMaxTurns);
 
         // Wrap onSessionCreated to wire output file streaming.
-        // The callback lazily reads record.outputFile (set right after spawn)
-        // rather than closing over a value that doesn't exist yet.
+        // The callback reads the transcript paths installed synchronously by
+        // onSpawned before the agent can queue or start.
         let id: string;
+        const joinMode = resolveJoinMode(defaultJoinMode, true);
         const origBgOnSession = bgCallbacks.onSessionCreated;
         bgCallbacks.onSessionCreated = (session: any) => {
           origBgOnSession(session);
@@ -1297,20 +1322,21 @@ Terse command-style prompts produce shallow, generic work.
             isBackground: true,
             isolation,
             invocation: agentInvocation,
+            onSpawned: (spawnedId) => {
+              attachTranscript(manager.getRecord(spawnedId), spawnedId);
+            },
             ...bgCallbacks,
           });
         } catch (err) {
           return textResult(err instanceof Error ? err.message : String(err));
         }
 
-        // Set output file + join mode synchronously after spawn, before the
-        // event loop yields — onSessionCreated is async so this is safe.
-        const joinMode = resolveJoinMode(defaultJoinMode, true);
+        // Set join metadata after spawn. Transcript metadata was installed by
+        // the manager's synchronous onSpawned callback before this point.
         const record = manager.getRecord(id);
         if (record && joinMode) {
           record.joinMode = joinMode;
           record.toolCallId = toolCallId;
-          attachTranscript(record, id);
         }
 
         if (joinMode == null || joinMode === 'async') {
@@ -1512,6 +1538,9 @@ Terse command-style prompts produce shallow, generic work.
         if (record.promise) await abortable(record.promise, signal);
       }
 
+      const durableResult = !record.result?.trim() && record.transcriptPath && currentCtx?.cwd
+        ? readAgentHistoryResult(currentCtx.cwd, record.transcriptPath)
+        : undefined;
       const displayName = getDisplayName(record.type);
       const duration = formatDuration(record.startedAt, record.completedAt);
       const tokens = formatLifetimeTokens(record);
@@ -1530,9 +1559,9 @@ Terse command-style prompts produce shallow, generic work.
       if (record.status === "running") {
         output += "Agent is still running. Use wait: true or check back later.";
       } else if (record.status === "error") {
-        output += `Error: ${record.error}${partialOutputSuffix(record)}`;
+        output += `Error: ${record.error}${partialOutputSuffix(record, durableResult)}`;
       } else {
-        output += record.result?.trim() || "No output.";
+        output += durableResult || record.result?.trim() || "No output.";
       }
 
       // Mark result as consumed — suppresses the completion notification
@@ -1789,6 +1818,59 @@ Terse command-style prompts produce shallow, generic work.
     });
   }
 
+  async function selectAgentFromReadOnlyList(
+    ctx: ExtensionCommandContext,
+    title: string,
+    pairs: Array<{ record: AgentRecord; label: string }>,
+    selection: AgentMenuSelection,
+  ): Promise<AgentRecord | undefined> {
+    const options = pairs.map(({ record, label }) => ({ value: record.id, label }));
+    const rememberedIndex = selection.id
+      ? pairs.findIndex(({ record }) => record.id === selection.id)
+      : -1;
+    const initialIndex = rememberedIndex >= 0
+      ? rememberedIndex
+      : Math.max(0, Math.min(selection.index, pairs.length - 1));
+
+    const remember = (id: string) => {
+      const index = pairs.findIndex(({ record }) => record.id === id);
+      if (index >= 0) {
+        selection.id = id;
+        selection.index = index;
+      }
+    };
+
+    const choice = await ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
+      const list = new SelectList(
+        options,
+        Math.min(options.length, 10),
+        getSelectListTheme(),
+      );
+      list.setSelectedIndex(initialIndex);
+      const initialItem = options[initialIndex];
+      if (initialItem) remember(initialItem.value);
+      list.onSelectionChange = item => remember(item.value);
+      list.onSelect = item => {
+        remember(item.value);
+        done(item.value);
+      };
+      list.onCancel = () => done(undefined);
+
+      const container = new Container();
+      container.addChild(new Text(title, 0, 0));
+      container.addChild(new Spacer(1));
+      container.addChild(list);
+      return {
+        render: (w: number) => container.render(w),
+        invalidate: () => container.invalidate(),
+        handleInput: (data: string) => list.handleInput(data),
+      };
+    });
+
+    if (!choice) return undefined;
+    return pairs.find(({ record }) => record.id === choice)?.record;
+  }
+
   async function showRunningAgents(ctx: ExtensionCommandContext) {
     const { active: agents } = splitAgentRecords(manager.listAgents(), ctx.cwd);
     if (agents.length === 0) {
@@ -1801,15 +1883,13 @@ Terse command-style prompts produce shallow, generic work.
       const dur = formatDuration(record.startedAt, record.completedAt);
       return { record, label: `${dn} (${record.description}) · ${record.toolUses} tools · ${record.status} · ${dur}` };
     });
-    const options = makeUniqueAgentOptionLabels(pairs);
+    makeUniqueAgentOptionLabels(pairs);
 
-    const choice = await ctx.ui.select("Running agents", options);
-    if (!choice) return;
-    const record = pairs.find((pair) => pair.label === choice)?.record;
+    const record = await selectAgentFromReadOnlyList(ctx, "Running agents", pairs, runningAgentSelection);
     if (!record) return;
 
     await viewAgentConversation(ctx, record, "live");
-    // Back-navigation: re-show the list
+    // Back-navigation: re-show the list at the previously selected agent.
     await showRunningAgents(ctx);
   }
 
@@ -1821,13 +1901,13 @@ Terse command-style prompts produce shallow, generic work.
     }
 
     const pairs = history.map((record) => ({ record, label: formatAgentHistoryOption(record, Date.now()) }));
-    const options = makeUniqueAgentOptionLabels(pairs);
-    const choice = await ctx.ui.select("Agent history", options);
-    if (!choice) return;
-    const record = pairs.find((pair) => pair.label === choice)?.record;
+    makeUniqueAgentOptionLabels(pairs);
+    const record = await selectAgentFromReadOnlyList(ctx, "Agent history", pairs, historyAgentSelection);
     if (!record) return;
 
     await viewAgentConversation(ctx, record, "history");
+    // Back-navigation: re-show the list at the previously selected agent.
+    await showAgentHistory(ctx);
   }
 
   async function viewAgentConversation(

package/src/ui/agent-widget.ts

@@ -5,7 +5,7 @@
  * Uses the callback form of setWidget for themed rendering.
  */
 
-import { Editor, isKeyRelease, Key, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import { Editor, isKeyRelease, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { AgentManager } from "../agent-manager.js";
 import { getConfig } from "../agent-types.js";
 import type { AgentInvocation, AgentRecord, SubagentType, WidgetMode } from "../types.js";
@@ -249,6 +249,8 @@ export class AgentWidget {
   private navigationActive = false;
   /** Stable identity of the selected row, so roster changes do not jump selection. */
   private selectedAgentId: string | undefined;
+  /** Last logical roster index of the selected row, used when it disappears. */
+  private selectedRosterIndex = 0;
   /** First logical row currently represented by the bounded viewport. */
   private viewportStart = 0;
 
@@ -307,6 +309,7 @@ export class AgentWidget {
     this.lastRenderKey = undefined;
     this.navigationActive = false;
     this.selectedAgentId = undefined;
+    this.selectedRosterIndex = 0;
     this.viewportStart = 0;
     // Print/RPC tests and lightweight embedders may provide only the widget
     // surface; real interactive contexts always implement this hook.
@@ -382,9 +385,29 @@ export class AgentWidget {
   }
 
   private deactivate(): void {
+    // Keep the selected row and viewport so re-entering navigation can resume
+    // where the user left off. Lifecycle resets (context, dispose, empty
+    // roster) clear this state explicitly instead of treating every exit as a
+    // reset.
     this.navigationActive = false;
-    this.selectedAgentId = undefined;
-    this.viewportStart = 0;
+    this.update();
+  }
+
+  /** Resume navigation from the retained row, or select the first row. */
+  private activate(records: readonly AgentRecord[]): void {
+    this.navigationActive = true;
+    const selectedIndex = this.selectedIndexOf(records);
+    if (selectedIndex >= 0) {
+      this.selectedRosterIndex = selectedIndex;
+    } else {
+      // The previously selected row may have been cleaned up while navigation
+      // was inactive. Resume at its old logical position, clamped to the new
+      // roster, rather than jumping back to the first row.
+      const fallbackIndex = Math.max(0, Math.min(this.selectedRosterIndex, records.length - 1));
+      this.selectedAgentId = records[fallbackIndex].id;
+      this.selectedRosterIndex = fallbackIndex;
+      this.viewportStart = Math.min(this.viewportStart, Math.max(0, records.length - 1));
+    }
     this.update();
   }
 
@@ -396,10 +419,7 @@ export class AgentWidget {
 
     if (!this.navigationActive) {
       if (direction !== 1 || !this.editorHasFocus() || (ui.getEditorText?.() ?? "") !== "") return false;
-      this.navigationActive = true;
-      this.selectedAgentId = records[0].id;
-      this.viewportStart = 0;
-      this.update();
+      this.activate(records);
       return true;
     }
 
@@ -410,6 +430,7 @@ export class AgentWidget {
     }
     const nextIndex = Math.max(0, Math.min(records.length - 1, currentIndex + direction));
     this.selectedAgentId = records[nextIndex].id;
+    this.selectedRosterIndex = nextIndex;
     this.update();
     return true;
   }
@@ -431,13 +452,11 @@ export class AgentWidget {
     }
 
     if (!this.navigationActive) {
-      if (!matchesKey(data, "down") || (this.uiCtx.getEditorText?.() ?? "") !== "" || this.roster().length === 0) {
+      const records = this.roster();
+      if (!matchesKey(data, "down") || (this.uiCtx.getEditorText?.() ?? "") !== "" || records.length === 0) {
         return undefined;
       }
-      this.navigationActive = true;
-      this.selectedAgentId = this.roster()[0]?.id;
-      this.viewportStart = 0;
-      this.update();
+      this.activate(records);
       return { consume: true };
     }
 
@@ -518,7 +537,7 @@ export class AgentWidget {
     const w = tui.terminal.columns;
     const maxLines = getWidgetLineBudget(tui.terminal.rows);
     if (maxLines === 0) return [];
-    const truncate = (line: string) => truncateToWidth(line, w);
+    const truncate = (line: string, width = w) => truncateToWidth(line, Math.max(0, width));
     const headingColor = hasActive ? "accent" : "dim";
     const headingIcon = hasActive ? "●" : "○";
     const frame = SPINNER[this.widgetFrame % SPINNER.length];
@@ -604,12 +623,12 @@ export class AgentWidget {
       // Reserve one line for a directional overflow summary. The viewport is
       // a contiguous slice in roster order, so the same slice is navigable and
       // renderable even when the selected row is currently hidden.
-      const contentBudget = Math.max(0, maxBody - 1);
+      const baseContentBudget = Math.max(0, maxBody - 1);
       const heightAt = (index: number) => rows[index]?.lines.length ?? 0;
-      const endFor = (start: number): number => {
+      const endFor = (start: number, budget: number): number => {
         let used = 0;
         let end = start;
-        while (end < rows.length && used + heightAt(end) <= contentBudget) {
+        while (end < rows.length && used + heightAt(end) <= budget) {
           used += heightAt(end++);
         }
         return end;
@@ -621,21 +640,33 @@ export class AgentWidget {
         : -1;
       if (selectedIndex >= 0) {
         if (selectedIndex < start) start = selectedIndex;
-        if (selectedIndex >= endFor(start)) start = selectedIndex;
+        if (selectedIndex >= endFor(start, baseContentBudget)) start = selectedIndex;
+      }
+
+      // Keep both directional affordances in the viewport chrome: the top
+      // count sits below the heading and the bottom count sits below the
+      // bounded roster. Each consumes one row when that direction is hidden.
+      let showTopMore = start > 0;
+      let contentBudget = Math.max(0, maxBody - (showTopMore ? 2 : 1));
+      if (selectedIndex >= 0 && selectedIndex >= endFor(start, contentBudget)) {
+        start = selectedIndex;
+        showTopMore = start > 0;
+        contentBudget = Math.max(0, maxBody - (showTopMore ? 2 : 1));
       }
       this.viewportStart = start;
 
       let used = 0;
       let end = start;
+      const visibleBody: string[] = [];
       while (end < rows.length && used + heightAt(end) <= contentBudget) {
-        lines.push(...rows[end].lines);
+        visibleBody.push(...rows[end].lines);
         used += heightAt(end);
         end++;
       }
       // A selected two-line row must remain addressable even if only one body
       // line is available. Showing its header is preferable to hiding it.
       if (end === start && rows[start] && contentBudget > 0) {
-        lines.push(rows[start].lines[0]);
+        visibleBody.push(rows[start].lines[0]);
         end = start + 1;
       }
 
@@ -653,7 +684,44 @@ export class AgentWidget {
         ...(hiddenAfter > 0 ? [`↓ ${hiddenAfter} more`] : []),
       ].join(" · ");
       const summary = `+${hidden} more (${direction}${categoryCounts.length > 0 ? `; ${categoryCounts.join(", ")}` : ""})`;
-      lines.push(truncate(theme.fg("dim", "└─") + ` ${theme.fg("dim", summary)}`));
+
+      if (showTopMore) lines.push(truncate(theme.fg("dim", `↑ ${hiddenBefore} more`)));
+
+      // Fill the bounded viewport so the scrollbar track has a stable height.
+      while (visibleBody.length < contentBudget) visibleBody.push("");
+      const totalBody = rows.reduce((total, row) => total + row.lines.length, 0);
+      const startOffset = rows.slice(0, start).reduce((total, row) => total + row.lines.length, 0);
+      const trackHeight = Math.max(0, contentBudget);
+      const minThumbHeight = Math.min(2, trackHeight);
+      const thumbHeight = Math.max(
+        minThumbHeight,
+        Math.min(trackHeight, Math.round((trackHeight * trackHeight) / totalBody)),
+      );
+      const maxScrollTop = Math.max(0, totalBody - trackHeight);
+      const maxThumbTop = Math.max(0, trackHeight - thumbHeight);
+      const thumbOffset = maxScrollTop === 0
+        ? 0
+        : Math.round((startOffset / maxScrollTop) * maxThumbTop);
+      const contentWidth = Math.max(0, w - 1);
+      for (let index = 0; index < visibleBody.length; index++) {
+        const isThumb = index >= thumbOffset && index < thumbOffset + thumbHeight;
+        const scrollbar = isThumb
+          ? theme.fg("scrollbarThumb", this.navigationActive ? "█" : "┃")
+          : theme.fg("scrollbarTrack", "│");
+        const bodyLine = truncate(visibleBody[index] ?? "", contentWidth);
+        lines.push(bodyLine + " ".repeat(Math.max(0, contentWidth - visibleWidth(bodyLine))) + scrollbar);
+      }
+
+      // The directional count is outside the viewport, like ScrollView's
+      // surrounding chrome, and therefore does not consume scrollbar track.
+      if (hiddenAfter > 0) {
+        lines.push(truncate(theme.fg("dim", `↓ ${hiddenAfter} more · +${hidden} more (${categoryCounts.length > 0 ? categoryCounts.join(", ") : ""})`)));
+      } else if (!showTopMore) {
+        lines.push(truncate(theme.fg("dim", "└─") + ` ${theme.fg("dim", summary)}`));
+      } else {
+        // Keep a stable footer row when the selected viewport reaches the end.
+        lines.push(truncate(theme.fg("dim", "└─")));
+      }
     }
 
     return lines;
@@ -729,6 +797,7 @@ export class AgentWidget {
       this.lastRenderKey = undefined;
       this.navigationActive = false;
       this.selectedAgentId = undefined;
+      this.selectedRosterIndex = 0;
       this.viewportStart = 0;
       this.syncTimer(false);
       return;
@@ -753,13 +822,22 @@ export class AgentWidget {
     // an otherwise idle widget advance.
     if (advanceSpinner && runningCount > 0) this.widgetFrame++;
     this.syncTimer(runningCount > 0);
-    if (this.navigationActive) {
+    const selectedIndex = this.selectedIndexOf(roster);
+    if (selectedIndex >= 0) {
+      this.selectedRosterIndex = selectedIndex;
+    } else if (this.navigationActive) {
       if (roster.length === 0) {
         this.navigationActive = false;
         this.selectedAgentId = undefined;
+        this.selectedRosterIndex = 0;
         this.viewportStart = 0;
-      } else if (this.selectedIndexOf(roster) < 0) {
-        this.selectedAgentId = roster[Math.min(this.viewportStart, roster.length - 1)].id;
+      } else {
+        // Keep the selection near the row that disappeared. Both the saved
+        // logical index and viewport are clamped as the roster shrinks.
+        const fallbackIndex = Math.max(0, Math.min(this.selectedRosterIndex, roster.length - 1));
+        this.selectedAgentId = roster[fallbackIndex].id;
+        this.selectedRosterIndex = fallbackIndex;
+        this.viewportStart = Math.min(this.viewportStart, roster.length - 1);
       }
     }
     const renderKey = this.renderKey(allAgents);
@@ -805,6 +883,7 @@ export class AgentWidget {
     this.lastRenderKey = undefined;
     this.navigationActive = false;
     this.selectedAgentId = undefined;
+    this.selectedRosterIndex = 0;
     this.viewportStart = 0;
     this.uiCtx = undefined;
   }

package/src/ui/conversation-timeline.ts

@@ -325,7 +325,10 @@ export class ConversationTimeline implements Component {
 
       try {
         const markdown = new Markdown(block.markdown || "∅", 2, 0, getMarkdownTheme(), {
-          color: (text) => this.theme.fg(block.role === "meta" ? "muted" : "text", text),
+          color: (text) => this.theme.fg(
+            block.role === "user" ? "userMessageText" : block.role === "meta" ? "muted" : "text",
+            text,
+          ),
         });
         for (const line of markdown.render(requestedWidth)) {
           lines.push({ text: truncateToWidth(line, requestedWidth), plain: stripAnsi(line), blockIndex, railable: true });