@jwilger/pi-development-system 0.48.0 → 0.51.1

package/src/subagents/orch/manager.ts

@@ -1,5 +1,7 @@
-// @ts-nocheck: vendored upstream pi-subagent-manager 0.14.0 compiled under looser options; see src/subagents/VENDORED.md
 import type { AgentMessage } from "@earendil-works/pi-agent-core";
+import { parseSpawnOverrides } from "../../core/spawn-overrides.ts";
+import { isParseError } from "../../core/types.ts";
+import { DEFAULT_MANAGER_SETTINGS, type ManagerSettings } from "../prefs/settings.ts";
 import type {
   AgentDriver,
   AgentType,
@@ -13,21 +15,18 @@ import type {
   TranscriptObservation,
   TranscriptSnapshot,
 } from "../types.ts";
-import { immutableTranscriptValue } from "./transcript.ts";
-import { parseSpawnOverrides } from "../../core/spawn-overrides.ts";
-import { isParseError } from "../../core/types.ts";
 import { canonicalPath, inheritContext, isDescendant, parentPath } from "./paths.ts";
-import { DEFAULT_MANAGER_SETTINGS, type ManagerSettings } from "../prefs/settings.ts";
+import { immutableTranscriptValue } from "./transcript.ts";
 
 interface Record {
   view: ThreadView;
   definition: AgentType;
   inherited: AgentMessage[];
-  contextReady?: Promise<void>;
+  contextReady?: Promise<void> | undefined;
   contextPending?: boolean;
   startup: AbortController;
   driver?: AgentDriver;
-  initializing?: Promise<AgentDriver>;
+  initializing?: Promise<AgentDriver> | undefined;
   run?: Promise<void>;
   started?: Promise<void>;
   sessionLeafId?: string | null;
@@ -40,18 +39,26 @@ interface Record {
   stopRequested: boolean;
   observationRevision?: number;
   driverGeneration?: number;
-  transcriptSource?: TranscriptSnapshot;
+  transcriptSource?: TranscriptSnapshot | undefined;
   transcriptListeners?: Set<TranscriptListener>;
-  detachTranscript?: () => void;
-  observationError?: string;
+  detachTranscript?: (() => void) | undefined;
+  observationError?: string | undefined;
 }
 const active = (view: Pick<ThreadView, "state">) =>
   view.state === "starting" || view.state === "running";
+const settledState = (record: {
+  stopRequested: boolean;
+  pauseRequested: boolean;
+}): ThreadView["state"] => {
+  if (record.stopRequested) return "stopped";
+  return record.pauseRequested ? "paused" : "completed";
+};
+const swallow = (): undefined => undefined;
 const errorText = (error: unknown) => (error instanceof Error ? error.message : String(error));
 
 function abortable<T>(work: Promise<T>, signal: AbortSignal): Promise<T> {
   if (signal.aborted) {
-    void work.catch(() => {});
+    work.catch(swallow);
     return Promise.reject(signal.reason);
   }
   return new Promise((resolve, reject) => {
@@ -75,7 +82,10 @@ export class ThreadManager {
   private records = new Map<string, Record>();
   private disposed = false;
   private epoch = 0;
-  constructor(private options: ManagerOptions) {}
+  private options: ManagerOptions;
+  constructor(options: ManagerOptions) {
+    this.options = options;
+  }
 
   /** New limits affect future launches/resumes, never cancel existing work. */
   setLimits(limits: ManagerSettings): void {
@@ -158,14 +168,14 @@ export class ThreadManager {
       return {
         view,
         definition: structuredClone(record.definition),
-        ...(!view.sessionFile && !record.contextPending
+        ...(!(view.sessionFile || record.contextPending)
           ? { inherited: structuredClone(record.inherited) }
           : {}),
       };
     });
   }
   restore(saved: SavedThread[]): void {
-    if (this.records.size) throw new Error("Restore requires an empty thread registry");
+    if (this.records.size > 0) throw new Error("Restore requires an empty thread registry");
     const restored = new Map<string, Record>();
     for (const item of saved) {
       const savedView = structuredClone(item.view);
@@ -187,12 +197,12 @@ export class ThreadManager {
         inputTokens: storedView.inputTokens ?? 0,
         outputTokens: storedView.outputTokens ?? 0,
       };
-      delete view.startedAt;
+      view.startedAt = undefined;
       if (view.parent !== parentPath(path)) throw new Error(`Invalid saved parent for ${path}`);
       if (active(view)) {
         view.state = "paused";
         view.status = "Interrupted by reload; send input to resume";
-        delete view.output;
+        view.output = undefined;
       }
       restored.set(path, {
         view,
@@ -201,9 +211,7 @@ export class ThreadManager {
         // A reservation saved before its lexical parent opened has no snapshot yet.
         contextPending: !view.sessionFile && item.inherited === undefined && view.parent !== null,
         startup: new AbortController(),
-        ...(Object.prototype.hasOwnProperty.call(savedView, "sessionLeafId")
-          ? { sessionLeafId }
-          : {}),
+        ...(Object.hasOwn(savedView, "sessionLeafId") ? { sessionLeafId } : {}),
         pauseRequested: false,
         stopRequested: false,
       });
@@ -257,19 +265,15 @@ export class ThreadManager {
         : level > maxLevels
     )
       throw new Error("Agent depth limit reached");
-    this.archiveFinished(this.options.maxThreads ?? DEFAULT_MANAGER_SETTINGS.maxThreads);
     this.assertCapacity();
     const type = structuredClone(this.options.getType(args.type));
     if (overrides !== undefined) type.spawnOverrides = { ...overrides };
     const parentRecord = parent && parent !== "/root" ? this.record(parent) : undefined;
     this.assertStartableAncestors(path);
+    // Last, so a spawn refused by any check above drops nothing.
+    this.archiveFinished(this.options.maxThreads ?? DEFAULT_MANAGER_SETTINGS.maxThreads, path);
     // Reservation is synchronous: subtree cancellation sees children even during lazy parent reopen.
-    const inherited =
-      parent === "/root"
-        ? inheritContext(this.options.rootSnapshot())
-        : parentRecord?.driver
-          ? inheritContext(parentRecord.driver.snapshot())
-          : [];
+    const inherited = this.inheritedFor(parent, parentRecord);
     const now = Date.now();
     const record: Record = {
       view: {
@@ -298,7 +302,9 @@ export class ThreadManager {
     this.records.set(path, record);
     if (record.contextPending) this.prepareInheritedContext(record);
     this.start(record, args.task);
-    return args.wait === false ? this.view(record) : this.wait(caller, path, undefined, signal);
+    return args.wait === false
+      ? this.view(record)
+      : await this.wait(caller, path, undefined, signal);
   }
 
   async steer(caller: string, path: string, message: string): Promise<ThreadView> {
@@ -321,7 +327,9 @@ export class ThreadManager {
       if (record.stopRequested && active(record.view))
         throw new Error("Thread is stopping; wait for stopped state before resuming");
       if (record.view.state === "running") {
-        await record.driver!.steer(message);
+        const live = record.driver;
+        if (live === undefined) throw new Error("Running thread has no driver");
+        await live.steer(message);
         this.touch(record);
         return this.view(record);
       }
@@ -351,12 +359,13 @@ export class ThreadManager {
       const finish = (error?: Error) => {
         if (timer) clearTimeout(timer);
         signal?.removeEventListener("abort", cancel);
-        error ? reject(error) : resolve();
+        if (error) reject(error);
+        else resolve();
       };
       const cancel = () => finish(new Error("Waiting cancelled; thread remains running"));
       signal?.addEventListener("abort", cancel, { once: true });
       if (timeoutMs !== undefined) timer = setTimeout(() => finish(), timeoutMs);
-      record.run!.then(
+      (record.run ?? Promise.resolve()).then(
         () => finish(),
         (error) => finish(new Error(errorText(error))),
       );
@@ -404,7 +413,7 @@ export class ThreadManager {
         await item.run;
         item.view.state = "stopped";
         item.view.status = "Stopped; session retained";
-        delete item.view.output;
+        item.view.output = undefined;
         this.touch(item);
       }),
     );
@@ -429,14 +438,15 @@ export class ThreadManager {
     // Idle/restored history may be lazily loaded, but attachment never prompts/resumes a turn.
     if (!active(record.view)) await this.ensureDriver(record, true);
     this.assertLive();
-    const listeners = (record.transcriptListeners ??= new Set());
+    const listeners = record.transcriptListeners ?? new Set<TranscriptListener>();
+    record.transcriptListeners = listeners;
     const registered: TranscriptListener = (snapshot) => listener(snapshot);
     listeners.add(registered);
     if (record.driver) this.attachTranscript(record, record.driver);
     else {
       // A starting child gets a placeholder immediately; existing startup supplies the live source.
-      void this.ensureDriver(record, true).catch((error) => {
-        if (this.disposed || !listeners.has(registered)) return;
+      this.ensureDriver(record, true).catch((error) => {
+        if (this.isShutDown() || !listeners.has(registered)) return;
         record.observationError = errorText(error);
         this.publishTranscript(record);
       });
@@ -445,7 +455,7 @@ export class ThreadManager {
       snapshot: this.transcriptSnapshot(record),
       unsubscribe: () => {
         listeners.delete(registered);
-        if (!listeners.size) {
+        if (listeners.size === 0) {
           record.detachTranscript?.();
           record.detachTranscript = undefined;
           record.transcriptSource = undefined;
@@ -473,7 +483,7 @@ export class ThreadManager {
     await Promise.all(
       records.map(async (record) => {
         await record.driver?.abort();
-        await record.initializing?.catch(() => {});
+        await record.initializing?.catch(swallow);
         await record.run;
         record.driver?.dispose();
       }),
@@ -488,8 +498,8 @@ export class ThreadManager {
     record.view.state = "starting";
     record.view.status = "Starting";
     record.view.startedAt = Date.now();
-    delete record.view.output;
-    delete record.view.error;
+    record.view.output = undefined;
+    record.view.error = undefined;
     const epoch = this.epoch;
     let markStarted!: () => void;
     record.started = new Promise((resolve) => {
@@ -501,7 +511,7 @@ export class ThreadManager {
         if (contextReady) await abortable(contextReady, record.startup.signal);
         record.startup.signal.throwIfAborted();
         const driver = await this.ensureDriver(record);
-        if (record.stopRequested || this.disposed) {
+        if (record.stopRequested || this.isShutDown()) {
           record.view.state = "stopped";
           return;
         }
@@ -511,11 +521,7 @@ export class ThreadManager {
         this.touch(record);
         markStarted();
         await task;
-        record.view.state = record.stopRequested
-          ? "stopped"
-          : record.pauseRequested
-            ? "paused"
-            : "completed";
+        record.view.state = settledState(record);
         if (record.view.state === "completed") {
           record.view.output = driver.output();
           record.view.status = "Completed; session retained";
@@ -531,7 +537,7 @@ export class ThreadManager {
         record.liveOutputTokens = 0;
         markStarted(); // Failed/cancelled initialization must also release callers waiting to steer.
         this.touch(record);
-        if (!this.disposed && epoch === this.epoch)
+        if (!this.isShutDown() && epoch === this.epoch)
           this.options.onEvent?.({
             kind: "settled",
             thread: this.view(record),
@@ -586,7 +592,7 @@ export class ThreadManager {
           return this.options.createDriver(options);
         })
         .then(async (driver) => {
-          if (this.disposed || signal.aborted) {
+          if (this.isShutDown() || signal.aborted) {
             await driver.abort();
             driver.dispose();
             throw new Error("Driver startup cancelled");
@@ -615,7 +621,8 @@ export class ThreadManager {
   private attachTranscript(record: Record, driver: AgentDriver): void {
     if (record.detachTranscript || !record.transcriptListeners?.size) return;
     const observation = driver.observeTranscript?.((snapshot) => {
-      if (this.disposed || record.driver !== driver || !record.transcriptListeners?.size) return;
+      if (this.isShutDown() || record.driver !== driver || !record.transcriptListeners?.size)
+        return;
       record.transcriptSource = snapshot;
       this.publishTranscript(record);
     });
@@ -641,7 +648,7 @@ export class ThreadManager {
     });
   }
   private publishTranscript(record: Record): void {
-    if (this.disposed || !record.transcriptListeners?.size) return;
+    if (this.isShutDown() || !record.transcriptListeners?.size) return;
     record.observationRevision = (record.observationRevision ?? 0) + 1;
     const snapshot = this.transcriptSnapshot(record);
     for (const listener of record.transcriptListeners) {
@@ -655,7 +662,7 @@ export class ThreadManager {
   private touch(record: Record): void {
     record.view.updatedAt = Date.now();
     this.publishTranscript(record);
-    if (!this.disposed) this.options.onEvent?.({ kind: "change", thread: this.view(record) });
+    if (!this.isShutDown()) this.options.onEvent?.({ kind: "change", thread: this.view(record) });
   }
   /** Fold driver-cumulative usage into persisted totals. Partials only refresh the live view. */
   private applyUsage(
@@ -669,7 +676,8 @@ export class ThreadManager {
       if (input === record.liveInputTokens && output === record.liveOutputTokens) return;
       record.liveInputTokens = input;
       record.liveOutputTokens = output;
-      if (!this.disposed) this.options.onEvent?.({ kind: "metrics", thread: this.view(record) });
+      if (!this.isShutDown())
+        this.options.onEvent?.({ kind: "metrics", thread: this.view(record) });
       return;
     }
     record.view.inputTokens =
@@ -685,7 +693,7 @@ export class ThreadManager {
     const startedAt = record.view.startedAt;
     if (startedAt === undefined) return;
     record.view.elapsedMs = (record.view.elapsedMs ?? 0) + Math.max(0, Date.now() - startedAt);
-    delete record.view.startedAt;
+    record.view.startedAt = undefined;
   }
   private prepareInheritedContext(record: Record, readOnly = false): Promise<void> | undefined {
     if (!record.contextPending) return record.contextReady;
@@ -709,7 +717,7 @@ export class ThreadManager {
         throw error;
       });
     record.contextReady = ready;
-    void ready.catch(() => {});
+    ready.catch(swallow);
     return ready;
   }
   private sessionLeafId(record: Record): string | null | undefined {
@@ -730,7 +738,7 @@ export class ThreadManager {
       sessionFile: record.driver ? record.driver.sessionFile : record.view.sessionFile,
     });
     // devsys: show per-spawn pins so agent_status reports what the thread was told to run on.
-    if (record.definition?.spawnOverrides) view.pinned = { ...record.definition.spawnOverrides };
+    if (record.definition.spawnOverrides) view.pinned = { ...record.definition.spawnOverrides };
     if (record.liveInputTokens) view.inputTokens = (view.inputTokens ?? 0) + record.liveInputTokens;
     if (record.liveOutputTokens)
       view.outputTokens = (view.outputTokens ?? 0) + record.liveOutputTokens;
@@ -741,8 +749,16 @@ export class ThreadManager {
     if (!record) throw new Error(`Unknown thread ${path}`);
     return record;
   }
+  private inheritedFor(parent: string | null, parentRecord: Record | undefined): AgentMessage[] {
+    if (parent === "/root") return inheritContext(this.options.rootSnapshot());
+    return parentRecord?.driver ? inheritContext(parentRecord.driver.snapshot()) : [];
+  }
+  /** A method, not a field read: the flag flips across awaits, which static narrowing cannot see. */
+  private isShutDown(): boolean {
+    return this.disposed;
+  }
   private assertLive(): void {
-    if (this.disposed) throw new Error("Thread manager has shut down");
+    if (this.isShutDown()) throw new Error("Thread manager has shut down");
   }
   private assertCallerMaySteer(caller: string): void {
     if (caller !== "/root" && this.record(caller).stopRequested)
@@ -765,16 +781,33 @@ export class ThreadManager {
    * on their own history. Make room for one more thread by dropping the oldest finished
    * thread that has no retained descendant; live and paused threads are never dropped.
    * Throws only when every retained thread is still live, paused or a parent of one.
+   * `spawning` is the path about to be created: its ancestors are kept (a finished parent
+   * with no other child is still the new thread's parent).
    */
-  private archiveFinished(limit: number): void {
+  private archiveFinished(limit: number, spawning: string): void {
     while (this.records.size >= limit) {
       const paths = [...this.records.keys()];
       const victim = paths.find((path) => {
-        const state = this.records.get(path)?.view.state;
+        const held = this.records.get(path);
+        const state = held?.view.state;
         const finished = state === "completed" || state === "failed" || state === "stopped";
-        return finished && !paths.some((other) => isDescendant(other, path));
+        // A driver still being created would land on a dropped record and never be disposed.
+        const opening =
+          held?.driver === undefined &&
+          (held?.initializing !== undefined || held?.contextReady !== undefined);
+        return (
+          finished &&
+          !opening &&
+          !isDescendant(spawning, path) &&
+          !paths.some((other) => isDescendant(other, path))
+        );
       });
       if (victim === undefined) throw new Error("Total thread limit reached");
+      const record = this.records.get(victim);
+      // Release what the record holds: shutdown() only walks retained records.
+      record?.detachTranscript?.();
+      record?.transcriptListeners?.clear();
+      record?.driver?.dispose();
       this.records.delete(victim);
     }
   }

package/src/subagents/orch/runtime.ts

@@ -1,46 +1,46 @@
-// @ts-nocheck: vendored upstream pi-subagent-manager 0.14.0 compiled under looser options; see src/subagents/VENDORED.md
+// biome-ignore-all lint/complexity/noExcessiveCognitiveComplexity: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+import { existsSync } from "node:fs";
+import { mkdir, readFile, realpath } from "node:fs/promises";
 import path from "node:path";
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { clampThinkingLevel } from "@earendil-works/pi-ai/compat";
-import { existsSync } from "node:fs";
-import { mkdir, readFile, realpath } from "node:fs/promises";
 import {
   createAgentSession,
   createCodemodeExtension,
   createToolSearchExtension,
   DefaultResourceLoader,
+  type ExtensionContext,
   getAgentDir,
   ModelRuntime,
   SessionManager,
   SettingsManager,
-  type ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
-import {
-  BOOTSTRAP_MESSAGE,
-  buildBootstrapMessage,
-  buildQueuedUserMessage,
-  buildUpdateDetails,
-  DurableMailbox,
-} from "./mailbox.ts";
-import { selectTools } from "../prefs/config.ts";
-import { TranscriptChannel } from "./transcript.ts";
-import type { InheritedToolSource } from "./inherited-tools.ts";
-import type { ModelSelectionMode, ToolFilteringMode } from "../prefs/settings.ts";
 import { applySpawnOverrides, modelSource } from "../../core/spawn-overrides.ts";
+import { selectTools } from "../prefs/config.ts";
 import {
-  modelIdentity,
   getModelPreferences,
-  selectPreferredModel,
   ModelPreferenceError,
+  modelIdentity,
+  selectPreferredModel,
 } from "../prefs/models.ts";
+import type { ModelSelectionMode, ToolFilteringMode } from "../prefs/settings.ts";
 import {
-  THINKING_LEVELS,
   type AgentType,
-  type ResolvedAgentSettings,
   type DriverFactory,
   type DriverOptions,
+  type ResolvedAgentSettings,
+  THINKING_LEVELS,
   type ThinkingLevel,
 } from "../types.ts";
+import type { InheritedToolSource } from "./inherited-tools.ts";
+import {
+  BOOTSTRAP_MESSAGE,
+  buildBootstrapMessage,
+  buildQueuedUserMessage,
+  buildUpdateDetails,
+  DurableMailbox,
+} from "./mailbox.ts";
+import { TranscriptChannel } from "./transcript.ts";
 
 const BUILTINS = ["read", "bash", "powershell", "edit", "write", "grep", "find", "ls"];
 /** Persisted before transcript messages so older-leaf restores still carry ownership. */
@@ -157,7 +157,7 @@ export function createDriverFactory(
     type: AgentType,
     parentPath?: string | null,
     restored?: ReturnType<SessionManager["buildSessionContext"]>,
-  ): { provider?: string; id?: string; thinkingLevel: ThinkingLevel };
+  ): { provider?: string | undefined; id?: string | undefined; thinkingLevel: ThinkingLevel };
 } {
   // Keep resolved settings even after disposal: descendants inherit settings, not the caller's history.
   const resolved = new Map<string, { provider: string; id: string; thinking: ThinkingLevel }>();
@@ -226,9 +226,9 @@ export function createDriverFactory(
       const candidates = filtering
         ? availableScopedModels(normalizeScopedModels(ctx.scopedModels))
         : availableModelCandidates();
-      ({ provider, id } = parseModelIdentity(
-        selectTypeModelPreference(type, candidates, filtering)!,
-      ));
+      const preferred = selectTypeModelPreference(type, candidates, filtering);
+      if (preferred === undefined) throw new Error("No preferred model is available");
+      ({ provider, id } = parseModelIdentity(preferred));
     } else if (source === "restored" && restored?.model) {
       provider = restored.model.provider;
       id = restored.model.modelId;
@@ -252,7 +252,7 @@ export function createDriverFactory(
     const { provider, id, thinkingLevel } = resolveInitialSettings(type, parentPath);
     const model =
       normalizeScopedModels(ctx.scopedModels).find(
-        ({ model }) => model.provider === provider && model.id === id,
+        (scoped) => scoped.model.provider === provider && scoped.model.id === id,
       )?.model ?? (provider && id ? ctx.modelRegistry.find(provider, id) : undefined);
     if (!model)
       throw new Error(
@@ -381,14 +381,15 @@ export function createDriverFactory(
       modelId: string | undefined,
       scopedModels: readonly ScopedModel[],
     ) => {
-      if (!providerId || !modelId)
+      if (!(providerId && modelId))
         throw new Error(
           `Subagent model ${providerId ?? "(unset)"}/${modelId ?? "(unset)"} is unavailable; select a physical model in the root or agent type`,
         );
       await mirrorRuntimeAuth(providerId);
       const sourceModel =
-        scopedModels.find(({ model }) => model.provider === providerId && model.id === modelId)
-          ?.model ?? ctx.modelRegistry.find(providerId, modelId);
+        scopedModels.find(
+          (scoped) => scoped.model.provider === providerId && scoped.model.id === modelId,
+        )?.model ?? ctx.modelRegistry.find(providerId, modelId);
       if (sourceModel?.api === "pi-virtual") {
         throw new Error(
           `Virtual model ${providerId}/${modelId} cannot be reproduced through the public registry API. Set this agent type's model to a physical provider/model-id.`,
@@ -414,13 +415,16 @@ export function createDriverFactory(
     const rootActive = new Set(inherited.activeNames);
     // Preserve deferred/codemode exposure rather than flooding model declarations with MCP tools.
     const activeToolNames = toolNames.filter(
-      (name) => localNames.has(name) || rootActive.has(name) || options.type.tools?.allow?.includes(name) && toolFiltering === "allowed",
+      (name) =>
+        localNames.has(name) ||
+        rootActive.has(name) ||
+        (options.type.tools?.allow?.includes(name) && toolFiltering === "allowed"),
     );
     const customTools = [...options.tools, ...externalTools].filter(
       (tool) => allowed.has(tool.name) && tool.name !== "codemode" && tool.name !== "tool_search",
     );
     const settingsManager = SettingsManager.inMemory({ cacheWarming: "off" });
-    let parkQueue = () => {};
+    let parkQueue: () => void = () => undefined;
     const pauseBoundary = () => {
       if (!options.shouldPause()) return undefined;
       parkQueue();
@@ -558,7 +562,7 @@ export function createDriverFactory(
       throw error;
     }
     const streamFunction = session.agent.streamFunction;
-    session.agent.streamFunction = async (requestModel, context, streamOptions) => {
+    session.agent.streamFunction = (requestModel, context, streamOptions) => {
       assertScopedRequestAuthorized(
         modelIdentity(requestModel),
         normalizeScopedModels(getRootContext().scopedModels),
@@ -579,7 +583,7 @@ export function createDriverFactory(
       sessionManager.appendMessage(buildBootstrapMessage());
       emit("activity", BOOTSTRAP_MESSAGE);
     };
-    const queueAccepted = async (kind: "steer" | "followUp", content: string) => {
+    const queueAccepted = (kind: "steer" | "followUp", content: string): Promise<void> => {
       assertCurrentModelAuthorized();
       ensurePersistedSession();
       const accepted = mailbox.accept(kind, content);
@@ -587,6 +591,7 @@ export function createDriverFactory(
       if (kind === "followUp") session.agent.followUp(buildQueuedUserMessage(accepted));
       else session.agent.steer(buildQueuedUserMessage(accepted));
       mailbox.markEnqueued(accepted.id);
+      return Promise.resolve();
     };
     const resumePending = async () => {
       for (const accepted of mailbox.replayablePending()) {
@@ -641,7 +646,7 @@ export function createDriverFactory(
       const usage = message.usage;
       const input = usage.input + usage.cacheRead + usage.cacheWrite;
       const output = usage.output;
-      if (!Number.isFinite(input) || !Number.isFinite(output)) return;
+      if (!(Number.isFinite(input) && Number.isFinite(output))) return;
       return { input, output, reported: input + output + usage.totalTokens > 0 };
     };
 
@@ -650,7 +655,7 @@ export function createDriverFactory(
       .find((entry) => entry.type === "custom" && entry.customType === THREAD_OWNERSHIP_TYPE);
     const inheritedMetadata =
       ownership?.type === "custom"
-        ? (ownership.data as { inheritedCount?: unknown })?.inheritedCount
+        ? (ownership.data as { inheritedCount?: unknown }).inheritedCount
         : undefined;
     const inheritedCount =
       typeof inheritedMetadata === "number" &&

package/src/subagents/orch/tools.ts

@@ -1,9 +1,8 @@
-// @ts-nocheck: vendored upstream pi-subagent-manager 0.14.0 compiled under looser options; see src/subagents/VENDORED.md
-import { Type } from "typebox";
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
-import type { ThreadManager } from "./manager.ts";
+import { Type } from "typebox";
 import { ModelPreferenceError } from "../prefs/models.ts";
 import type { AgentType, ResolvedAgentSettings, ThreadView } from "../types.ts";
+import type { ThreadManager } from "./manager.ts";
 
 const path = Type.String({ description: "Absolute agent path, or name relative to the caller" });
 const text = Type.String({ minLength: 1 });
@@ -30,8 +29,10 @@ export function agentTools(
   const make = (
     name: string,
     description: string,
+    // biome-ignore-start lint/suspicious/noExplicitAny: the host validates params against the TypeBox schema before execute runs, and each handler reads only fields that schema declares
     parameters: any,
     execute: (params: any, signal?: AbortSignal) => Promise<any> | any,
+    // biome-ignore-end lint/suspicious/noExplicitAny: end of the schema-validated boundary
   ): ToolDefinition => ({
     name,
     label: name,
@@ -53,12 +54,7 @@ export function agentTools(
             return {
               name,
               description,
-              error:
-                error instanceof ModelPreferenceError
-                  ? error.summary
-                  : error instanceof Error
-                    ? error.message
-                    : String(error),
+              error: describeError(error),
             };
           }
         });
@@ -99,7 +95,8 @@ export function agentTools(
         ),
         thinkingLevel: Type.Optional(
           Type.String({
-            description: "Pin this child's thinking level: off, minimal, low, medium, high, xhigh or max.",
+            description:
+              "Pin this child's thinking level: off, minimal, low, medium, high, xhigh or max.",
           }),
         ),
       }),
@@ -175,3 +172,8 @@ export function agentTools(
     ),
   ];
 }
+
+function describeError(error: unknown): string {
+  if (error instanceof ModelPreferenceError) return error.summary;
+  return error instanceof Error ? error.message : String(error);
+}