@fitchmultz/pi-subagents 0.46.1 → 0.47.0

package/src/runs/background/completion-dedupe.ts

@@ -2,29 +2,8 @@ import { createHash } from "node:crypto";
 import { isRecord, hasText } from "./async-value.ts";
 
 interface CompletionDataLike {
-  completionId?: unknown;
-  id?: unknown;
-  agent?: unknown;
-  timestamp?: unknown;
-  sessionId?: unknown;
-  taskIndex?: unknown;
-  totalTasks?: unknown;
-  success?: unknown;
-}
-
-function asNonEmptyString(value: unknown): string | undefined {
-  if (typeof value !== "string") {
-    return undefined;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : undefined;
-}
-
-function asFiniteNumber(value: unknown): number | undefined {
-  if (typeof value !== "number") {
-    return undefined;
-  }
-  return Number.isFinite(value) ? value : undefined;
+  completionId?: string;
+  id: string;
 }
 
 function stableStringify(value: unknown): string {
@@ -48,32 +27,11 @@ function payloadDigest(value: unknown): string {
   return createHash("sha256").update(stableStringify(value)).digest("hex").slice(0, 16);
 }
 
-export function buildCompletionKey(data: Readonly<CompletionDataLike>, fallback: string): string {
-  const completionId = asNonEmptyString(data.completionId);
-  if (hasText(completionId)) {
-    return `completion:${completionId}`;
-  }
-  const id = asNonEmptyString(data.id);
-  if (hasText(id)) {
-    return `id:${id}:${payloadDigest(data)}`;
+export function buildCompletionKey(data: Readonly<CompletionDataLike>): string {
+  if (hasText(data.completionId)) {
+    return `completion:${data.completionId.trim()}`;
   }
-  const sessionId = asNonEmptyString(data.sessionId) ?? "no-session";
-  const agent = asNonEmptyString(data.agent) ?? "unknown";
-  const timestamp = asFiniteNumber(data.timestamp);
-  const taskIndex = asFiniteNumber(data.taskIndex);
-  const totalTasks = asFiniteNumber(data.totalTasks);
-  const success = data.success === true ? "1" : "?";
-  const successIdentity = data.success === false ? "0" : success;
-  return [
-    "meta",
-    sessionId,
-    agent,
-    timestamp !== undefined ? String(timestamp) : "no-ts",
-    taskIndex !== undefined ? String(taskIndex) : "-",
-    totalTasks !== undefined ? String(totalTasks) : "-",
-    successIdentity,
-    fallback,
-  ].join(":");
+  return `id:${data.id.trim()}:${payloadDigest(data)}`;
 }
 
 /** Mutable identity store owned by the completion-admission lifecycle. */
@@ -105,24 +63,3 @@ export function markSeenWithTtl(
   seen.set(key, now);
   return false;
 }
-
-function isSeenMap(value: unknown): value is Map<string, number> {
-  if (!(value instanceof Map)) {
-    return false;
-  }
-  const entries: Map<unknown, unknown> = value;
-  return [...entries].every(
-    ([key, timestamp]) => typeof key === "string" && typeof timestamp === "number",
-  );
-}
-
-export function getGlobalSeenMap(storeKey: string): Map<string, number> {
-  const globalStore = globalThis as Record<string, unknown>;
-  const existing = globalStore[storeKey];
-  if (isSeenMap(existing)) {
-    return existing;
-  }
-  const map = new Map<string, number>();
-  globalStore[storeKey] = map;
-  return map;
-}

package/src/runs/background/notify.ts

@@ -1,6 +1,5 @@
 /** Subagent completion notifications. */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { buildCompletionKey, getGlobalSeenMap, markSeenWithTtl } from "./completion-dedupe.ts";
 import { SUBAGENT_ASYNC_COMPLETE_EVENT } from "../../shared/types.ts";
 import { hasText, isRecord } from "./async-value.ts";
 import type { ReadonlyInput } from "../../shared/types/inputs.ts";
@@ -144,7 +143,7 @@ function isUnsubscribe(value: unknown): value is () => void {
 
 export default function registerSubagentNotify(
   pi: ReadonlyInput<ExtensionAPI>,
-  onQueued?: (completionKey: string, runId?: string) => void,
+  onQueued: (completionKey: string, runId?: string) => void,
 ): () => void {
   const unsubscribeStoreKey = "__pi_subagents_notify_unsubscribe__";
   const globalStore = globalThis as Record<string, unknown>;
@@ -156,7 +155,6 @@ export default function registerSubagentNotify(
       // Best effort cleanup for stale handlers from an older reload.
     }
   }
-  const seen = getGlobalSeenMap("__pi_subagents_notify_seen__");
   const handleComplete = (data: unknown): void => {
     if (
       !isResult(data) ||
@@ -165,17 +163,9 @@ export default function registerSubagentNotify(
     ) {
       return;
     }
-    const key = buildCompletionKey(data, "notify");
-    // Owned completion keys are governed by the shared queue/journal lifecycle, not a TTL.
-    if (
-      (onQueued === undefined || !hasText(data.completionKey)) &&
-      markSeenWithTtl(seen, key, Date.now(), 10 * 60 * 1000)
-    ) {
-      return;
-    }
     pi.sendMessage(buildNotification(data), { triggerTurn: true });
     if (hasText(data.completionKey)) {
-      onQueued?.(data.completionKey, data.runId);
+      onQueued(data.completionKey, data.runId);
     }
   };
   const unsubscribe = pi.events.on(SUBAGENT_ASYNC_COMPLETE_EVENT, handleComplete);

package/src/runs/background/result-watcher.ts

@@ -292,7 +292,7 @@ class ResultWatcher {
       if (this.foreign(envelope)) {
         return;
       }
-      const key = buildCompletionKey({ ...envelope.data, id: envelope.runId }, "result");
+      const key = buildCompletionKey({ ...envelope.data, id: envelope.runId });
       if (this.alreadyHandled(envelope, key)) {
         return;
       }

package/src/runs/background/runner-child-observer.ts

@@ -59,6 +59,7 @@ export class RunnerChildObserver {
     this.id = config.id;
     this.hooks = hooks;
     this.mutatingFailureStates = statusPayload.steps.map(() => createMutatingFailureState());
+    this.syncTopLevelCurrentTool();
   }
 
   expandChildren(flatIndex: number, count: number): void {
@@ -69,16 +70,21 @@ export class RunnerChildObserver {
     );
   }
 
-  private syncTopLevelCurrentTool(): void {
-    const active = this.statusPayload.steps
-      .filter(
-        (step) =>
-          step.status === "running" &&
-          typeof step.currentTool === "string" &&
-          step.currentTool.length > 0,
-      )
-      .sort((left, right) => (right.currentToolStartedAt ?? 0) - (left.currentToolStartedAt ?? 0))
-      .at(0);
+  syncTopLevelCurrentTool(): void {
+    const active =
+      this.statusPayload.state === "running" || this.statusPayload.state === "queued"
+        ? this.statusPayload.steps
+            .filter(
+              (step) =>
+                step.status === "running" &&
+                typeof step.currentTool === "string" &&
+                step.currentTool.length > 0,
+            )
+            .sort(
+              (left, right) => (right.currentToolStartedAt ?? 0) - (left.currentToolStartedAt ?? 0),
+            )
+            .at(0)
+        : undefined;
     this.statusPayload.currentTool = active?.currentTool;
     this.statusPayload.currentToolStartedAt = active?.currentToolStartedAt;
     this.statusPayload.currentPath = active?.currentPath;
@@ -106,7 +112,9 @@ export class RunnerChildObserver {
     }
     step.streamingText = updateStreamingText(step.streamingText, event);
     this.recordChildActivity(flatIndex, event, toolSnapshot, now);
-    this.syncTopLevelCurrentTool();
+    if (event.type === "tool_execution_start" || event.type === "tool_execution_end") {
+      this.syncTopLevelCurrentTool();
+    }
     step.lastActivityAt = now;
     this.statusPayload.lastActivityAt = now;
     this.statusPayload.lastUpdate = now;

package/src/runs/background/runner-monitor.ts

@@ -166,6 +166,8 @@ export class RunnerMonitor {
       clearTimeout(this.statusWriteTimer);
       this.statusWriteTimer = undefined;
     }
+    // Step completion, interruption and expansion can change activity without a tool-end event.
+    this.childObserver.syncTopLevelCurrentTool();
     this.refreshWorkflowGraph();
     writeAtomicJson(this.statusPath, this.statusPayload);
     if (this.config.runtimeVersion !== 2) {

package/src/runs/background/runner-parallel.ts

@@ -2,7 +2,6 @@ import * as path from "node:path";
 import { inspect } from "node:util";
 import type { ReadonlyDeep } from "type-fest";
 import { appendJsonl } from "../../shared/artifacts.ts";
-import { writeAtomicJson } from "../../shared/atomic-json.ts";
 import { writeInitialProgressFile } from "../../shared/settings.ts";
 import { completeWorkflowStep, runParallelTasks } from "../shared/workflow-policy.ts";
 import {
@@ -194,7 +193,7 @@ export class RunnerParallelGroup {
     status.currentStep = position.flatIndex;
     status.lastUpdate = failedAt;
     status.outputFile = path.join(this.config.asyncDir, `output-${position.flatIndex}.log`);
-    writeAtomicJson(path.join(this.config.asyncDir, "status.json"), status);
+    this.monitor.writeStatusPayload();
     this.append({
       type: "subagent.parallel.completed",
       ts: failedAt,
@@ -224,7 +223,7 @@ export class RunnerParallelGroup {
     status.lastActivityAt = startedAt;
     status.lastUpdate = startedAt;
     status.outputFile = path.join(this.config.asyncDir, `output-${position.flatIndex}.log`);
-    writeAtomicJson(path.join(this.config.asyncDir, "status.json"), status);
+    this.monitor.writeStatusPayload();
     this.append({
       type: "subagent.parallel.started",
       ts: startedAt,

package/src/runs/shared/child-observation-spool.ts

@@ -51,8 +51,11 @@ export class ChildObservationSpool {
     fs.writeFileSync(this.stderr, text);
   }
   resetText(): void {
-    this.textOffset = 0;
+    if (this.textOffset === 0) {
+      return;
+    }
     fs.ftruncateSync(this.text, 0);
+    this.textOffset = 0;
   }
   appendText(text: string): void {
     const bytes = Buffer.from(text);
@@ -72,14 +75,16 @@ export class ChildObservationSpool {
     this.textOffset += bytes.length;
   }
   replayText(consume: (text: string) => void): void {
-    this.decode(this.text, 0, this.textOffset, consume);
+    if (this.textOffset > 0) {
+      this.decode(this.text, 0, this.textOffset, consume);
+    }
   }
   replayWire(start: number, end: number, consume: (text: string) => void): void {
     this.decode(this.wire, start, end, consume);
   }
 
   private copy(fd: number, start: number, end: number, consume: (bytes: Buffer) => void): void {
-    const buffer = Buffer.allocUnsafe(64 * 1024);
+    const buffer = Buffer.allocUnsafe(Math.min(64 * 1024, end - start));
     for (let position = start; position < end;) {
       const count = fs.readSync(fd, buffer, 0, Math.min(buffer.length, end - position), position);
       if (count === 0) {

package/src/runs/shared/run-restoration.ts

@@ -22,6 +22,7 @@ import {
 import {
   getRunMetadataDir,
   migrateSupervisorQuestionSteps,
+  readQuestionOwner,
   readRunJson,
   saveQuestionOwner,
   saveRunStatus,
@@ -254,14 +255,13 @@ function nativeLaunchCwd(run: OwnedRun, details: ReadonlyDetails): OwnedRun {
 }
 
 function repairQuestionOwner(run: OwnedRun): void {
-  let owner: unknown;
+  let sessionId: string | undefined;
   try {
-    owner = readRunJson(path.join(getRunMetadataDir(run.runId), "question-owner.json"));
+    sessionId = readQuestionOwner(run.runId)?.sessionId;
   } catch {
     // A genuine receipt can repair unusable supplemental metadata.
   }
-  const sessionId = isRecord(owner) ? owner.sessionId : undefined;
-  if (typeof sessionId !== "string" || sessionId.trim() === "") {
+  if (sessionId === undefined || sessionId.trim() === "") {
     saveQuestionOwner(run.runId, run.ownerSessionId);
   }
 }

package/src/runs/shared/supervisor-questions.ts

@@ -216,7 +216,10 @@ export function createSupervisorQuestion(
   return question;
 }
 
-export function listRunQuestions(runDir: string): SupervisorQuestionView[] {
+export function listRunQuestions(
+  runDir: string,
+  ownerSessionId?: string,
+): SupervisorQuestionView[] {
   let entries: fs.Dirent[];
   try {
     entries = fs.readdirSync(path.join(runDir, "questions"), { withFileTypes: true });
@@ -233,7 +236,10 @@ export function listRunQuestions(runDir: string): SupervisorQuestionView[] {
         path.join(runDir, "questions", entry.name, "question.json"),
         parseSupervisorQuestion,
       );
-      return question ? [readQuestionState(question, path.dirname(runDir))] : [];
+      return question &&
+        (ownerSessionId === undefined || question.ownerSessionId === ownerSessionId)
+        ? [readQuestionState(question, path.dirname(runDir))]
+        : [];
     });
 }
 
@@ -243,9 +249,7 @@ export function listOwnedRunQuestions(
   runId: string,
 ): SupervisorQuestionView[] {
   migrateSupervisorQuestions(ownerSessionId, runId);
-  return listRunQuestions(getRunMetadataDir(runId)).filter(
-    (question) => question.ownerSessionId === ownerSessionId,
-  );
+  return listRunQuestions(getRunMetadataDir(runId), ownerSessionId);
 }
 
 export function pendingSupervisorQuestion(input: {
@@ -321,11 +325,7 @@ function* supervisorQuestionSteps(
   for (const entry of runs) {
     yield;
     try {
-      questions.push(
-        ...listRunQuestions(path.join(root, entry.name)).filter(
-          (question) => question.ownerSessionId === ownerSessionId,
-        ),
-      );
+      questions.push(...listRunQuestions(path.join(root, entry.name), ownerSessionId));
     } catch (error) {
       if (runId !== undefined) {
         throw error;

package/src/shared/journal-frames.ts

@@ -172,7 +172,7 @@ export function readJsonProjection(file: string, select: Projection): UnknownRec
   const projection = new JsonProjection(select, undefined, () => Infinity);
   try {
     const end = fs.fstatSync(fd).size;
-    const bytes = Buffer.allocUnsafe(64 * 1024);
+    const bytes = Buffer.allocUnsafe(Math.min(64 * 1024, end));
     for (let offset = 0; offset < end;) {
       const count = fs.readSync(fd, bytes, 0, Math.min(bytes.length, end - offset), offset);
       if (count === 0) {

package/src/slash/command-discovery.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { discoverAgents, discoverAgentsAll } from "../agents/agents.ts";
+import { discoverAgents, discoverChains } from "../agents/agents.ts";
 import type { ChainConfig } from "../shared/types/config.ts";
 import { resolveExecutionCwd } from "../shared/execution-cwd.ts";
 
@@ -51,21 +51,19 @@ export function makeAgentCompletions(
   multiAgent: boolean,
 ): (prefix: string) => Completion[] | null {
   return (prefix) => {
+    const position = multiAgent ? completionPosition(prefix) : { word: prefix, before: "" };
+    if (!position || (!multiAgent && prefix.includes(" "))) {
+      return null;
+    }
     const cwd = completionCwd(pi, state);
     if (cwd === null || cwd.length === 0) {
       return null;
     }
     const agents = discoverAgents(cwd, "both", { projectTrusted: projectTrusted(state) }).agents;
     if (!multiAgent) {
-      return prefix.includes(" ")
-        ? null
-        : agents
-            .filter((agent) => agent.name.startsWith(prefix))
-            .map((agent) => ({ value: agent.name, label: agent.name }));
-    }
-    const position = completionPosition(prefix);
-    if (!position) {
-      return null;
+      return agents
+        .filter((agent) => agent.name.startsWith(prefix))
+        .map((agent) => ({ value: agent.name, label: agent.name }));
     }
     const { word: lastWord, before: beforeLastWord } = position;
     if (lastWord === "->") {
@@ -79,7 +77,7 @@ export function makeAgentCompletions(
 
 export function discoverSavedChains(cwd: string, trusted: boolean): ChainConfig[] {
   const chains = new Map<string, ChainConfig>();
-  for (const chain of discoverAgentsAll(cwd, { projectTrusted: trusted }).chains) {
+  for (const chain of discoverChains(cwd, { projectTrusted: trusted }).chains) {
     const existing = chains.get(chain.name);
     const projectOverride = existing?.source === "user" && chain.source === "project";
     const jsonOverride =
@@ -98,8 +96,11 @@ export function makeChainCompletions(
   state: SlashDiscoveryState,
 ): (prefix: string) => Completion[] | null {
   return (prefix) => {
+    if (prefix.includes(" ")) {
+      return null;
+    }
     const cwd = completionCwd(pi, state);
-    if (prefix.includes(" ") || cwd === null || cwd.length === 0) {
+    if (cwd === null || cwd.length === 0) {
       return null;
     }
     return discoverSavedChains(cwd, projectTrusted(state))

package/src/tui/agent-history.ts

@@ -1,27 +1,10 @@
-import type { SessionEntry } from "@earendil-works/pi-coding-agent";
 import { stripAcceptanceReport } from "../runs/shared/acceptance-reports.ts";
-import { displayHistory, type AgentHistory, type AgentHistoryItem } from "./history-display.ts";
-import type { DisplayEntry } from "./history-record.ts";
+import type { AgentHistory, AgentHistoryItem } from "./history-display.ts";
 import { readableText } from "./history-text.ts";
 export { readableText } from "./history-text.ts";
 export { indexedHistory } from "./indexed-history.ts";
 export type { AgentHistory, AgentHistoryItem } from "./history-display.ts";
 
-/** Read native entries, not a compacted model context: earlier messages remain inspectable. */
-export function historyItems(entries: readonly SessionEntry[]): AgentHistory {
-  const visible: DisplayEntry[] = [];
-  for (const entry of entries) {
-    if (
-      entry.type === "message" ||
-      entry.type === "custom_message" ||
-      entry.type === "compaction" ||
-      entry.type === "branch_summary"
-    ) {
-      visible.push(entry.type === "message" ? { ...entry, native: entry.message } : entry);
-    }
-  }
-  return displayHistory(visible);
-}
 function finalMatch(history: AgentHistory, text: string): string | undefined {
   if (history.finalId !== undefined) {
     return history.finalId;

package/src/tui/agent-view.ts

@@ -400,5 +400,4 @@ export class AgentViewController {
     this.lastSaved = "";
   }
 }
-export { AgentConversation } from "./agent-conversation.ts";
 export { agentTaskLabel, type AgentTask, type AgentVisit } from "./view-model.ts";

package/src/tui/conversation-history.ts

@@ -1,4 +1,5 @@
 import { errorText } from "./text-values.ts";
+import { isDeepStrictEqual } from "node:util";
 import {
   historyStatus,
   pageNotices,
@@ -183,9 +184,22 @@ export class ConversationHistory {
         ? { ...item, load: () => this.controller.savedResult(this.key, item.id) }
         : item,
     );
+    const previous = task.page,
+      sameSource =
+        previous !== undefined &&
+        previous.sourceId === result.page.sourceId &&
+        previous.generation === result.page.generation &&
+        previous.sessionId === result.page.sessionId &&
+        previous.sourceState === result.page.sourceState &&
+        isDeepStrictEqual(
+          previous.entries.map((entry) => entry.ref),
+          result.page.entries.map((entry) => entry.ref),
+        );
     this.seenSource ||= result.page.count > 0;
     this.controller.applyHistoryPage(this.key, { ...history, items }, result.page, this.seenSource);
-    this.source.clearCards();
+    if (!sameSource) {
+      this.source.clearCards();
+    }
   }
 
   assignment(): AgentHistoryItem {

package/src/tui/history-cards.ts

@@ -1,4 +1,5 @@
 import type { AssistantMessage } from "@earendil-works/pi-ai";
+import { isDeepStrictEqual } from "node:util";
 import {
   AssistantMessageComponent,
   UserMessageComponent,
@@ -47,29 +48,9 @@ interface CardLine {
   readonly contentStart: number;
   readonly end: number;
 }
-function plainItem(item: AgentHistoryItem): boolean {
-  return (
-    item.load === undefined &&
-    item.assistant === undefined &&
-    item.previewAssistant === undefined &&
-    item.call === undefined &&
-    item.result === undefined
-  );
-}
-function plainSignature(item: AgentHistoryItem): string {
-  return JSON.stringify([
-    item.kind,
-    item.title,
-    item.text,
-    item.details,
-    item.diff,
-    item.model,
-    item.timestamp,
-    item.messageId,
-  ]);
-}
 function sameDisplay(left: AgentHistoryItem, right: AgentHistoryItem): boolean {
-  return plainItem(left) && plainItem(right) && plainSignature(left) === plainSignature(right);
+  // Detail loaders stay fresh in contentItems; only the native display component is reused.
+  return isDeepStrictEqual({ ...left, load: undefined }, { ...right, load: undefined });
 }
 function previewStop(reason: string | undefined): AssistantMessage["stopReason"] {
   if (reason === "error" || reason === "aborted" || reason === "length") {
@@ -191,10 +172,11 @@ export class HistoryCards {
   private card(item: AgentHistoryItem, expanded: boolean, detail: boolean): Component {
     const signature = `${expanded}:${detail}`,
       cached = this.components.get(item.id);
-    if (
-      cached?.signature === signature &&
-      (cached.item === item || sameDisplay(cached.item, item))
-    ) {
+    if (cached?.signature === signature && cached.item === item) {
+      return cached.component;
+    }
+    if (cached?.signature === signature && sameDisplay(cached.item, item)) {
+      this.components.set(item.id, { ...cached, item });
       return cached.component;
     }
     const component = this.create(item, { expanded, detail });