@fitchmultz/pi-subagents 0.46.1 → 0.46.2

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 });