@esso0428/pi-subagents 0.15.16 → 0.16.0

package/src/index.ts

@@ -15,6 +15,8 @@ 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 { Type } from "@sinclair/typebox";
+import { agentHistoryLocator, createAgentHistoryPath, readAgentHistory } 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";
 import { applyNicoOverrides, BUILTIN_TOOL_NAMES, getAgentConfig, getAllTypes, getAvailableTypes, isDefaultsDisabled, registerAgents, resolveType, setDefaultsDisabled } from "./agent-types.js";
@@ -24,8 +26,6 @@ import { isModelInScope, readEnabledModels, resolveEnabledModels } from "./enabl
 import { GroupJoinManager } from "./group-join.js";
 import { resolveAgentInvocationConfig, resolveJoinMode } from "./invocation-config.js";
 import { type ModelRegistry, resolveModel } from "./model-resolver.js";
-import { agentHistoryLocator, createAgentHistoryPath, readAgentHistory } from "./agent-history.js";
-import { buildAgentStatusMenuEntries, canOpenActiveAgent, canOpenAgentHistory, formatAgentHistoryOption, splitAgentRecords } from "./agent-history-list.js";
 import { createOutputFilePath, streamToOutputFile, writeInitialEntry } from "./output-file.js";
 import { SubagentScheduler } from "./schedule.js";
 import { resolveStorePath, ScheduleStore } from "./schedule-store.js";
@@ -49,6 +49,7 @@ import {
   type Theme,
   type UICtx,
 } from "./ui/agent-widget.js";
+import { createDeferredUiRefresh } from "./ui/deferred-ui-refresh.js";
 import { FleetList, type FleetUICtx } from "./ui/fleet-list.js";
 import { showSchedulesMenu } from "./ui/schedule-menu.js";
 import { addUsage, getLifetimeTotal, getSessionContextPercent, type LifetimeUsage } from "./usage.js";
@@ -374,6 +375,7 @@ export default function (pi: ExtensionAPI) {
     fleet.onAgentFinished(record.id);
     scheduleNudge(record.id, () => emitIndividualNudge(record));
     widget.update();
+    scheduleUiRefresh();
   }
 
   // ---- Group join manager ----
@@ -385,7 +387,11 @@ export default function (pi: ExtensionAPI) {
       scheduleNudge(groupKey, () => {
         // Re-check at send time
         const unconsumed = records.filter(r => !r.resultConsumed);
-        if (unconsumed.length === 0) { widget.update(); return; }
+        if (unconsumed.length === 0) {
+          widget.update();
+          scheduleUiRefresh();
+          return;
+        }
 
         const notifications = unconsumed.map(r => formatTaskNotification(r, 300)).join('\n\n');
         const label = partial
@@ -406,6 +412,7 @@ export default function (pi: ExtensionAPI) {
         }, { deliverAs: "followUp", triggerTurn: true });
       });
       widget.update();
+      scheduleUiRefresh();
     },
     30_000,
   );
@@ -463,6 +470,7 @@ export default function (pi: ExtensionAPI) {
       widget.markFinished(record.id);
       fleet.onAgentFinished(record.id);
       widget.update();
+      scheduleUiRefresh();
       return;
     }
 
@@ -470,6 +478,7 @@ export default function (pi: ExtensionAPI) {
     // don't send an individual nudge — finalizeBatch will pick it up retroactively.
     if (currentBatchAgents.some(a => a.id === record.id)) {
       widget.update();
+      scheduleUiRefresh();
       return;
     }
 
@@ -480,6 +489,7 @@ export default function (pi: ExtensionAPI) {
     // 'held' → do nothing, group will fire later
     // 'delivered' → group callback already fired
     widget.update();
+    scheduleUiRefresh();
   }, undefined, (record) => {
     // Emit started event when agent transitions to running (including from queue)
     pi.events.emit("subagents:started", {
@@ -487,6 +497,11 @@ export default function (pi: ExtensionAPI) {
       type: record.type,
       description: record.description,
     });
+    widget.ensureTimer();
+    widget.update();
+    fleet.ensureTimer();
+    fleet.update();
+    scheduleUiRefresh();
   }, (record, info) => {
     // Emit compacted event when agent's session compacts (preserves count on record).
     pi.events.emit("subagents:compacted", {
@@ -581,6 +596,7 @@ export default function (pi: ExtensionAPI) {
   });
 
   pi.on("session_before_switch", () => {
+    deferredUiRefresh.cancel();
     manager.clearCompleted(true);
     scheduler.stop();
   });
@@ -602,6 +618,7 @@ export default function (pi: ExtensionAPI) {
     manager.abortAll();
     for (const timer of pendingNudges.values()) clearTimeout(timer);
     pendingNudges.clear();
+    deferredUiRefresh.dispose();
     fleet.dispose();
     manager.dispose();
   });
@@ -614,13 +631,34 @@ export default function (pi: ExtensionAPI) {
   let widgetMode: WidgetMode = "background";
   function getWidgetMode(): WidgetMode { return widgetMode; }
   const widget = new AgentWidget(manager, agentActivity, getWidgetMode);
-  function setWidgetMode(m: WidgetMode): void { widgetMode = m; widget.update(); }
+  function setWidgetMode(m: WidgetMode): void {
+    const changed = widgetMode !== m;
+    widgetMode = m;
+    widget.update();
+    if (changed) scheduleUiRefresh();
+  }
 
   // Claude Code-style FleetView: navigable list of main + subagents below the editor.
   const fleet = new FleetList(manager, agentActivity, () => currentCtx?.cwd, pi, () => currentCtx);
+
+  // One render-only scheduler is shared by both widgets. The callback resolves
+  // the live TUI target at fire time because session switches invalidate the
+  // previous widget context; both widgets use the same TUI, so one successful
+  // request is sufficient.
+  const deferredUiRefresh = createDeferredUiRefresh(() => {
+    if (widget.requestUiRefresh(true)) return;
+    fleet.requestUiRefresh(true);
+  });
+  const scheduleUiRefresh = (): void => deferredUiRefresh.schedule();
+
   let fleetViewEnabled = true;
   function isFleetViewEnabled(): boolean { return fleetViewEnabled; }
-  function setFleetViewEnabled(b: boolean): void { fleetViewEnabled = b; fleet.setEnabled(b); }
+  function setFleetViewEnabled(b: boolean): void {
+    const changed = fleetViewEnabled !== b;
+    fleetViewEnabled = b;
+    fleet.setEnabled(b);
+    if (changed) scheduleUiRefresh();
+  }
 
   // Project/global default for writing the subagent .output transcript. A custom
   // agent's `output_transcript` frontmatter overrides this per spawn; when the
@@ -720,8 +758,9 @@ export default function (pi: ExtensionAPI) {
 
   // Grab UI context from first tool execution + clear lingering widget on new turn
   pi.on("tool_execution_start", async (_event, ctx) => {
-    widget.setUICtx(ctx.ui as UICtx);
-    fleet.setUICtx(ctx.ui as unknown as FleetUICtx);
+    const widgetContextChanged = widget.setUICtx(ctx.ui as UICtx);
+    const fleetContextChanged = fleet.setUICtx(ctx.ui as unknown as FleetUICtx);
+    if (widgetContextChanged || fleetContextChanged) scheduleUiRefresh();
     widget.onTurnStart();
   });
 
@@ -1319,6 +1358,7 @@ Terse command-style prompts produce shallow, generic work.
         widget.update();
         fleet.ensureTimer();
         fleet.update();
+        scheduleUiRefresh();
 
         // Emit created event
         pi.events.emit("subagents:created", {
@@ -1379,8 +1419,10 @@ Terse command-style prompts produce shallow, generic work.
             fgId = a.id;
             agentActivity.set(a.id, fgState);
             widget.ensureTimer();
+            widget.update();
             fleet.ensureTimer();
             fleet.update();
+            scheduleUiRefresh();
             break;
           }
         }

package/src/output-file.ts

@@ -66,7 +66,6 @@ export function streamToOutputFile(
   historyPath?: string,
 ): () => void {
   let writtenCount = 1; // initial user prompt already written
-  const outputPaths = historyPath && historyPath !== path ? [path, historyPath] : [path];
 
   const flush = () => {
     const messages = session.messages;
@@ -80,9 +79,10 @@ export function streamToOutputFile(
         timestamp: new Date().toISOString(),
         cwd,
       };
-      for (const outputPath of outputPaths) {
+      const entryJson = JSON.stringify(entry) + "\n";
+      for (const target of historyPath && historyPath !== path ? [path, historyPath] : [path]) {
         try {
-          appendFileSync(outputPath, JSON.stringify(entry) + "\n", "utf-8");
+          appendFileSync(target, entryJson, "utf-8");
         } catch { /* ignore write errors */ }
       }
       writtenCount++;

package/src/ui/agent-widget.ts

@@ -275,16 +275,24 @@ export class AgentWidget {
   }
 
   /** Set the UI context (grabbed from first tool execution). */
-  setUICtx(ctx: UICtx) {
-    if (ctx !== this.uiCtx) {
-      // UICtx changed — the widget registered on the old context is gone.
-      // Force re-registration on next update().
-      this.uiCtx = ctx;
-      this.widgetRegistered = false;
-      this.tui = undefined;
-      this.lastStatusText = undefined;
-      this.lastRenderKey = undefined;
-    }
+  setUICtx(ctx: UICtx): boolean {
+    if (ctx === this.uiCtx) return false;
+
+    // UICtx changed — the widget registered on the old context is gone.
+    // Force re-registration on next update().
+    this.uiCtx = ctx;
+    this.widgetRegistered = false;
+    this.tui = undefined;
+    this.lastStatusText = undefined;
+    this.lastRenderKey = undefined;
+    return true;
+  }
+
+  /** Request a render on the currently registered TUI without touching input. */
+  requestUiRefresh(force = true): boolean {
+    if (!this.tui) return false;
+    this.tui.requestRender(force);
+    return true;
   }
 
   /**

package/src/ui/ccstyle/diff/ansi-utils.ts

@@ -90,7 +90,7 @@ export function stripBackgroundSgrParams(params: readonly number[]): number[] {
 }
 
 export function filterSgrSequences(text: string, filter: (params: number[]) => number[]): string {
-	if (!text || !text.includes("\x1b[")) {
+	if (!text?.includes("\x1b[")) {
 		return text;
 	}
 
@@ -159,7 +159,7 @@ function sanitizeColonSgr(rawParams: string): string {
 }
 
 export function sanitizeAnsiForThemedOutput(text: string): string {
-	if (!text || !text.includes("\x1b[")) return text;
+	if (!text?.includes("\x1b[")) return text;
 	return text.replace(ANSI_SGR_WITH_COLON_PATTERN, (sequence, rawParams: string) =>
 		rawParams.includes(":")
 			? sanitizeColonSgr(rawParams)

package/src/ui/ccstyle/diff/diff-presentation.ts

@@ -39,7 +39,6 @@ export function resolveDiffPresentationMode(
 			return canRenderSplitLayout ? "split" : "unified";
 		case "unified":
 			return "unified";
-		case "auto":
 		default:
 			return safeWidth >= (config.diffSplitMinWidth ?? 120) && canRenderSplitLayout ? "split" : "unified";
 	}

package/src/ui/ccstyle/diff/diff-renderer.ts

@@ -1,39 +1,37 @@
+import { getLanguageFromPath, highlightCode } from "@earendil-works/pi-coding-agent";
 import {
+	type Component,
 	Text,
 	truncateToWidth,
 	visibleWidth,
 	wrapTextWithAnsi,
-	type Component,
 } from "@earendil-works/pi-tui";
-import { getLanguageFromPath, highlightCode } from "@earendil-works/pi-coding-agent";
 import {
 	ANSI_SGR_PATTERN,
-	STYLE_RESET_PARAMS,
+	expandSgrReset,
 	filterSgrSequences,
-	toSgrParams,
 	readSgrColorSequence,
-	isFiniteSgrParam,
-	expandSgrReset,
+	toSgrParams,
 } from "./ansi-utils.js";
-import {
-	buildCollapsedDiffHintText,
-	clampRenderedLineToWidth,
-	clampRenderedLinesToWidth,
-} from "./line-width-safety.js";
 import {
 	buildDiffSummaryText,
+	type DiffPresentationMode,
 	normalizeDiffRenderWidth,
 	resolveDiffPresentationMode,
-	type DiffPresentationMode,
 } from "./diff-presentation.js";
-import { pluralize, sanitizeAnsiForThemedOutput, sanitizeToolResultText, showMoreHintText } from "./render-utils.js";
-import { splitWriteContentLines } from "./write-display-utils.js";
+import {
+	buildCollapsedDiffHintText,
+	clampRenderedLinesToWidth,
+	clampRenderedLineToWidth,
+} from "./line-width-safety.js";
+import { sanitizeAnsiForThemedOutput, sanitizeToolResultText, showMoreHintText } from "./render-utils.js";
 import {
 	DEFAULT_TOOL_DISPLAY_CONFIG,
 	type DiffIndicatorMode,
-	type ToolDisplayConfig,
 	type PersistedDiff,
+	type ToolDisplayConfig,
 } from "./types.js";
+import { splitWriteContentLines } from "./write-display-utils.js";
 
 const MAX_HL_CHARS = 200_000;
 
@@ -267,7 +265,7 @@ function wrapToWidth(text: string, width: number, wordWrap: boolean): string[] {
 }
 
 function resolveLanguageFromPath(rawPath: string | undefined): string | undefined {
-	if (!rawPath || !rawPath.trim()) {
+	if (!rawPath?.trim()) {
 		return undefined;
 	}
 	const normalizedPath = rawPath.replace(/^@/, "").trim();
@@ -281,7 +279,7 @@ function resolveLanguageFromPath(rawPath: string | undefined): string | undefine
 	}
 }
 
-function resolveShikiTheme(theme: DiffTheme): string {
+function _resolveShikiTheme(theme: DiffTheme): string {
 	if (process.env.DIFF_THEME) return process.env.DIFF_THEME;
 	const background =
 		parseAnsiColorCode(readThemeAnsi(theme, "bg", "toolSuccessBg")) ??
@@ -828,7 +826,9 @@ function tokenizeInlineDiff(input: string): Array<{ value: string; start: number
 	const pattern = /(\s+|[A-Za-z0-9_]+|[^A-Za-z0-9_\s])/g;
 	let match: RegExpExecArray | null;
 
-	while ((match = pattern.exec(input)) !== null) {
+	while (true) {
+		match = pattern.exec(input);
+		if (match === null) break;
 		const value = match[0] ?? "";
 		if (!value) {
 			continue;
@@ -1139,13 +1139,15 @@ function mixRgb(base: RgbColor, tint: RgbColor, ratio: number): RgbColor {
 }
 
 function extractThemeBackgroundAnsi(text: string): string | undefined {
-	if (!text || !text.includes("\x1b[")) {
+	if (!text?.includes("\x1b[")) {
 		return undefined;
 	}
 
 	ANSI_SGR_PATTERN.lastIndex = 0;
 	let match: RegExpExecArray | null;
-	while ((match = ANSI_SGR_PATTERN.exec(text)) !== null) {
+	while (true) {
+		match = ANSI_SGR_PATTERN.exec(text);
+		if (match === null) break;
 		const parsed = toSgrParams(match[1] ?? "");
 		for (let index = 0; index < parsed.length; index += 1) {
 			const param = parsed[index] ?? 0;
@@ -1372,7 +1374,6 @@ function resolveIndicatorGlyph(
 				return " ";
 			}
 			return kind === "add" ? "+" : "-";
-		case "none":
 		default:
 			return " ";
 	}

package/src/ui/ccstyle/diff/line-width-safety.ts

@@ -1,6 +1,5 @@
 import { normalizeDiffRenderWidth } from "./diff-presentation.js";
-import { pluralize } from "./render-utils.js";
-import { showMoreHintText } from "./render-utils.js";
+import { pluralize, showMoreHintText } from "./render-utils.js";
 
 export interface WidthMeasurementOps {
 	measure(text: string): number;

package/src/ui/ccstyle/diff/shiki-highlight.ts

@@ -0,0 +1,97 @@
+/** Maximum source size eligible for optional asynchronous Shiki enhancement. */
+export const MAX_HL_CHARS = 32_000;
+const MAX_CACHE_ENTRIES = 48;
+
+type CodeToAnsi = (code: string, lang: string, theme: string) => Promise<string>;
+export type ShikiLoader = () => Promise<CodeToAnsi>;
+type Subscriber = { fallback: readonly string[]; invalidate: () => void };
+type Pending = { work: Promise<void>; subscribers: Set<Subscriber> };
+
+let defaultLoad: Promise<CodeToAnsi> | undefined;
+const loadDefault: ShikiLoader = () => {
+  if (!defaultLoad) {
+    defaultLoad = import("@shikijs/cli")
+      .then((module) => module.codeToANSI as CodeToAnsi)
+      .catch((error) => {
+        defaultLoad = undefined;
+        throw error;
+      });
+  }
+  return defaultLoad;
+};
+
+function differs(lines: readonly string[], fallback: readonly string[]): boolean {
+  return lines.length !== fallback.length || lines.some((line, index) => line !== fallback[index]);
+}
+
+/**
+ * Small, viewer-local async cache. The synchronous Pi highlighter remains the
+ * first paint; Shiki is only requested by an expanded card that has metadata.
+ */
+export class ShikiHighlightCache {
+  private readonly cache = new Map<string, string[]>();
+  private readonly pending = new Map<string, Pending>();
+
+  constructor(private readonly loader: ShikiLoader = loadDefault) {}
+
+  get(
+    code: string,
+    lang: string | undefined,
+    theme: string,
+    fallback: readonly string[],
+    invalidate?: () => void,
+  ): string[] | undefined {
+    if (!lang || code.length > MAX_HL_CHARS) return undefined;
+
+    const key = `${theme}\0${lang}\0${code}`;
+    const cached = this.cache.get(key);
+    if (cached) {
+      // LRU: a frequently viewed card should not evict itself immediately.
+      this.cache.delete(key);
+      this.cache.set(key, cached);
+      return cached;
+    }
+
+    const existing = this.pending.get(key);
+    if (existing) {
+      if (invalidate && ![...existing.subscribers].some((item) => item.invalidate === invalidate)) {
+        existing.subscribers.add({ fallback, invalidate });
+      }
+      return undefined;
+    }
+
+    const pending: Pending = { work: undefined as never, subscribers: new Set() };
+    if (invalidate) pending.subscribers.add({ fallback, invalidate });
+    pending.work = Promise.resolve()
+      .then(() => this.loader())
+      .then((highlight) => highlight(code, lang, theme))
+      .then((ansi) => {
+        const lines = ansi.replace(/\r/g, "").replace(/\n$/, "").split("\n");
+        this.cache.set(key, lines);
+        while (this.cache.size > MAX_CACHE_ENTRIES) {
+          const oldest = this.cache.keys().next().value;
+          if (oldest !== undefined) this.cache.delete(oldest);
+        }
+        for (const subscriber of pending.subscribers) {
+          if (!differs(lines, subscriber.fallback)) continue;
+          try {
+            subscriber.invalidate();
+          } catch {
+            // A stale card must not prevent another card from being repainted.
+          }
+        }
+      })
+      .catch(() => {
+        // The synchronous Pi highlighter remains the durable fallback.
+      })
+      .finally(() => this.pending.delete(key));
+    this.pending.set(key, pending);
+    return undefined;
+  }
+
+  clear(): void {
+    this.cache.clear();
+  }
+}
+
+export const shikiHighlightCache = new ShikiHighlightCache();

package/src/ui/ccstyle/tool-renderer.ts

@@ -1,6 +1,6 @@
-import { truncateToWidth, type Component } from "@earendil-works/pi-tui";
-import { createViewerCcstyleResult, oneLine } from "./tool-result.js";
+import { type Component, truncateToWidth } from "@earendil-works/pi-tui";
 import { DEFAULT_TOOL_DISPLAY_CONFIG } from "./diff/types.js";
+import { createViewerCcstyleResult, oneLine } from "./tool-result.js";
 
 export interface ViewerToolRenderers {
   name: string;
@@ -82,5 +82,5 @@ export function createViewerCcstyleTool(toolName: string, isHovered: () => boole
   };
 }
 
-export { renderRichToolResult } from "./tool-result.js";
 export type { PersistedDiff, ViewerDiffConfig } from "./diff/types.js";
+export { renderRichToolResult } from "./tool-result.js";