@jwilger/pi-development-system 0.50.0 → 0.52.0

package/src/subagents/prefs/settings.ts

@@ -1,4 +1,5 @@
-// @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 settings-file loader with no tests of its own; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+// biome-ignore-all lint/suspicious/noShadow: vendored upstream settings-file loader with no tests of its own; rewriting it risks behaviour (see src/subagents/VENDORED.md)
 import { randomUUID } from "node:crypto";
 import {
   closeSync,
@@ -23,11 +24,7 @@ export type WidgetMode = (typeof WIDGET_MODES)[number];
 const TOOL_FILTERING_MODES = ["allowed", "all-except-blocked", "all"] as const;
 export type ToolFilteringMode = (typeof TOOL_FILTERING_MODES)[number];
 
-const MODEL_SELECTION_MODES = [
-  "pick-first-available",
-  "pick-first-scoped",
-  "use-current",
-] as const;
+const MODEL_SELECTION_MODES = ["pick-first-available", "pick-first-scoped", "use-current"] as const;
 export type ModelSelectionMode = (typeof MODEL_SELECTION_MODES)[number];
 
 export interface ManagerSettings {
@@ -55,7 +52,15 @@ export const DEFAULT_MANAGER_SETTINGS: ManagerSettings = {
 };
 
 const KEYS = [
-  "maxLevels", "maxConcurrent", "maxThreads", "modelSelection", "subagentMode", "toolFiltering", "widgetMode", "nerdFontIcons", "finalRecap",
+  "maxLevels",
+  "maxConcurrent",
+  "maxThreads",
+  "modelSelection",
+  "subagentMode",
+  "toolFiltering",
+  "widgetMode",
+  "nerdFontIcons",
+  "finalRecap",
 ] as const;
 const MAX_LEVELS = 32;
 
@@ -65,9 +70,7 @@ function errorCode(error: unknown): string | undefined {
     : undefined;
 }
 
-function lstatIfPresent(
-  path: string,
-): ReturnType<typeof lstatSync> | undefined {
+function lstatIfPresent(path: string): ReturnType<typeof lstatSync> | undefined {
   try {
     return lstatSync(path);
   } catch (error) {
@@ -76,9 +79,7 @@ function lstatIfPresent(
   }
 }
 
-function assertNotSymlinkPath(
-  path: string,
-): ReturnType<typeof lstatSync> | undefined {
+function assertNotSymlinkPath(path: string): ReturnType<typeof lstatSync> | undefined {
   const stat = lstatIfPresent(path);
   if (stat?.isSymbolicLink()) throw new Error(`Unsafe symlink path: ${path}`);
   return stat;
@@ -107,8 +108,8 @@ function parseSettings(content: string): Partial<ManagerSettings> {
   try {
     parsed = JSON.parse(content);
   } catch (error) {
-    const detail = error instanceof Error ? error.message : String(error);
-    throw new Error(`Invalid JSON: ${detail}`);
+    const reason = error instanceof Error ? error.message : String(error);
+    throw new Error(`Invalid JSON: ${reason}`, { cause: error });
   }
   if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw new Error("Settings must be a JSON object");
@@ -123,7 +124,9 @@ function parseSettings(content: string): Partial<ManagerSettings> {
     if (typeof record.scopedModelFiltering !== "boolean")
       throw new Error("scopedModelFiltering must be a boolean");
     if (!Object.hasOwn(record, "modelSelection"))
-      layer.modelSelection = record.scopedModelFiltering ? "pick-first-scoped" : "pick-first-available";
+      layer.modelSelection = record.scopedModelFiltering
+        ? "pick-first-scoped"
+        : "pick-first-available";
   }
   for (const key of KEYS) {
     if (!Object.hasOwn(record, key)) continue;
@@ -186,8 +189,7 @@ function readLayerContent(entry: SettingsLayer): string | undefined {
   }
   const stat = assertNotSymlinkPath(entry.filePath);
   if (!stat) return undefined;
-  if (!stat.isFile())
-    throw new Error(`Settings must be a regular file: ${entry.filePath}`);
+  if (!stat.isFile()) throw new Error(`Settings must be a regular file: ${entry.filePath}`);
   return readFileSync(entry.filePath, "utf8");
 }
 
@@ -214,9 +216,13 @@ export function loadManagerSaveScope(options: {
     if (content !== undefined) {
       const state: unknown = JSON.parse(content);
       if (
-        state && typeof state === "object" && !Array.isArray(state) &&
-        "saveScope" in state && state.saveScope === "user"
-      ) return "user";
+        state &&
+        typeof state === "object" &&
+        !Array.isArray(state) &&
+        "saveScope" in state &&
+        state.saveScope === "user"
+      )
+        return "user";
     }
   } catch {
     // Missing, invalid or unsafe UI state must not prevent opening settings.
@@ -243,8 +249,7 @@ export function loadManagerSettings(options: {
   const diagnostics: string[] = [];
   const settings: ManagerSettings = { ...DEFAULT_MANAGER_SETTINGS };
   const layers = [layer(options.agentDir, ["subagent-manager"])];
-  if (options.includeProject)
-    layers.push(layer(options.cwd, [".pi", "agent", "subagent-manager"]));
+  if (options.includeProject) layers.push(layer(options.cwd, [".pi", "agent", "subagent-manager"]));
   for (const entry of layers) {
     try {
       const parsed = readLayer(entry);
@@ -257,13 +262,6 @@ export function loadManagerSettings(options: {
 }
 
 function serializedSettings(settings: ManagerSettings): string {
-  if (
-    settings === null ||
-    typeof settings !== "object" ||
-    Array.isArray(settings)
-  ) {
-    throw new Error("Settings must be a JSON object");
-  }
   for (const key of Object.keys(settings)) {
     if (!isSupportedKey(key)) throw new Error(`Unknown settings key: ${key}`);
   }
@@ -298,17 +296,20 @@ function ensureOwnedDirectory(directory: string): void {
 }
 
 function ensureScopeDirectories(directories: string[]): void {
-  assertExistingDirectory(directories[0]);
-  for (let index = 1; index < directories.length; index++) {
-    assertExistingDirectory(directories[index - 1]);
-    ensureOwnedDirectory(directories[index]);
+  const [root, ...rest] = directories;
+  if (root === undefined) return;
+  assertExistingDirectory(root);
+  let parent = root;
+  for (const directory of rest) {
+    assertExistingDirectory(parent);
+    ensureOwnedDirectory(directory);
+    parent = directory;
   }
 }
 
 function assertRegularFileOrAbsent(filePath: string): void {
   const stat = assertNotSymlinkPath(filePath);
-  if (stat && !stat.isFile())
-    throw new Error(`Settings must be a regular file: ${filePath}`);
+  if (stat && !stat.isFile()) throw new Error(`Settings must be a regular file: ${filePath}`);
 }
 
 function exclusiveCreateFlags(): number {
@@ -333,8 +334,7 @@ function writeAtomically(entry: SettingsLayer, content: string): void {
     for (const directory of entry.directories) assertExistingDirectory(directory);
     assertRegularFileOrAbsent(filePath);
     const tempStat = assertNotSymlinkPath(temporary);
-    if (!tempStat?.isFile())
-      throw new Error(`Settings must be a regular file: ${temporary}`);
+    if (!tempStat?.isFile()) throw new Error(`Settings must be a regular file: ${temporary}`);
     renameSync(temporary, filePath);
   } finally {
     if (created) {

package/src/subagents/types.ts

@@ -1,4 +1,3 @@
-// @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 type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 
@@ -11,22 +10,24 @@ export interface ResolvedAgentSettings {
 export interface AgentType {
   name: string;
   description: string;
-  models?: string[];
+  models?: string[] | undefined;
   /** @deprecated Use ordered models instead. */
-  model?: string;
+  model?: string | undefined;
   /** Advisory display names. Not provider/model pins and never used for selection. */
-  modelSuggestions?: string[];
-  thinkingLevel?: ThinkingLevel;
+  modelSuggestions?: string[] | undefined;
+  thinkingLevel?: ThinkingLevel | undefined;
   /** devsys: per-spawn pin set by the coordinator via agent_spawn; beats preferences and inheritance. */
-  spawnOverrides?: { model?: string; thinkingLevel?: ThinkingLevel };
+  spawnOverrides?:
+    | { model?: string | undefined; thinkingLevel?: ThinkingLevel | undefined }
+    | undefined;
   /** Pi semantic token for the type pill background and task path foreground. */
-  color?: string | undefined;
+  color?: string | undefined | undefined;
   /** Optional literal Nerd Font glyph; displayed only when the labs setting is enabled. */
-  icon?: string | undefined;
-  tools?: { allow?: string[]; block?: string[] };
+  icon?: string | undefined | undefined;
+  tools?: { allow?: string[] | undefined; block?: string[] | undefined } | undefined;
   systemPrompt: string;
-  filePath?: string;
-  source?: "bundled" | "user" | "project";
+  filePath?: string | undefined;
+  source?: "bundled" | "user" | "project" | undefined;
   /**
    * How this definition is customized relative to its base.
    * - fork: a full `<name>.md` copy (owns the system prompt).
@@ -34,15 +35,17 @@ export interface AgentType {
    *   (no Markdown body; unset fields follow the base).
    * Absent for pure bundled definitions and brand-new drafts.
    */
-  customization?: {
-    kind: "fork" | "override";
-    scope: "user" | "project";
-    filePath: string;
-  };
+  customization?:
+    | {
+        kind: "fork" | "override";
+        scope: "user" | "project";
+        filePath: string;
+      }
+    | undefined;
   /** Source of the base definition under the customization, if any. */
-  baseSource?: "bundled" | "user" | "project";
+  baseSource?: "bundled" | "user" | "project" | undefined;
   /** File path of the base definition under the customization, if any. */
-  baseFilePath?: string;
+  baseFilePath?: string | undefined;
 }
 type ThreadState = "starting" | "running" | "paused" | "completed" | "failed" | "stopped";
 export interface ThreadView {
@@ -69,7 +72,7 @@ export interface ThreadView {
   /** Cumulative output tokens. Live views include the in-progress message. */
   outputTokens?: number;
   /** devsys: per-spawn model/thinkingLevel pin requested through agent_spawn, when any. */
-  pinned?: { model?: string; thinkingLevel?: ThinkingLevel };
+  pinned?: { model?: string | undefined; thinkingLevel?: ThinkingLevel | undefined };
 }
 type DriverEvent =
   | { kind: "activity" | "error"; text: string }

package/src/subagents/ui/dialog.ts

@@ -1,4 +1,9 @@
-// @ts-nocheck: vendored upstream pi-subagent-manager 0.14.0 compiled under looser options; see src/subagents/VENDORED.md
+// biome-ignore-all lint/complexity/noVoid: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+// biome-ignore-all lint/correctness/noVoidTypeReturn: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+// biome-ignore-all lint/suspicious/noControlCharactersInRegex: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+// biome-ignore-all lint/suspicious/noEmptyBlockStatements: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+// biome-ignore-all lint/suspicious/noUnnecessaryConditions: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
+// biome-ignore-all lint/suspicious/useAwait: vendored upstream TUI/config code with no tests; rewriting it risks behaviour (see src/subagents/VENDORED.md)
 import type {
   ExtensionContext,
   ExtensionUIContext,
@@ -6,6 +11,7 @@ import type {
   Theme,
 } from "@earendil-works/pi-coding-agent";
 import {
+  type Component,
   CURSOR_MARKER,
   Editor,
   getKeybindings,
@@ -13,11 +19,10 @@ import {
   Key,
   matchesKey,
   stripTerminalSequences,
+  type TUI,
   truncateToWidth,
   visibleWidth,
   wrapTextWithAnsi,
-  type Component,
-  type TUI,
 } from "@earendil-works/pi-tui";
 
 export interface DialogHost {
@@ -31,10 +36,10 @@ export interface DialogRow {
   id: string;
   label: string;
   /** Trusted formatter receives sanitized text; generated ANSI styling is kept when clipping. */
-  renderLabel?: (label: string, theme: Theme) => string;
-  value?: string;
-  valueColor?: Parameters<Theme["fg"]>[0];
-  help?: string;
+  renderLabel?: ((label: string, theme: Theme) => string) | undefined;
+  value?: string | undefined;
+  valueColor?: Parameters<Theme["fg"]>[0] | undefined;
+  help?: string | undefined;
 }
 export const DIALOG_OPTIONS = {
   overlay: true,
@@ -69,18 +74,14 @@ export function frameDialog(
     const clipped = truncateToWidth(text, Math.max(0, columns), "", true);
     return clipped + " ".repeat(Math.max(0, columns - visibleWidth(clipped)));
   };
-  if (width < 4 || height < 4)
-    return [fit(theme.fg("muted", dialogText(title)), width)];
+  if (width < 4 || height < 4) return [fit(theme.fg("muted", dialogText(title)), width)];
   const inner = width - 2;
   const line = (text: string) =>
     theme.fg("border", "│") + fit(text, inner) + theme.fg("border", "│");
   const heading = truncateToWidth(` ${dialogText(title)} `, inner, "");
   const top = theme.fg(
     "border",
-    "╭" +
-      heading +
-      "─".repeat(Math.max(0, inner - visibleWidth(heading))) +
-      "╮",
+    `╭${heading}${"─".repeat(Math.max(0, inner - visibleWidth(heading)))}╮`,
   );
   // Pad to the full frame so centered overlays keep the same bounds between views.
   const budget = height - 4;
@@ -90,9 +91,9 @@ export function frameDialog(
   return [
     top,
     ...content,
-    theme.fg("border", "├" + "─".repeat(inner) + "┤"),
+    theme.fg("border", `├${"─".repeat(inner)}┤`),
     line(theme.fg("dim", dialogText(footer))),
-    theme.fg("border", "╰" + "─".repeat(inner) + "╯"),
+    theme.fg("border", `╰${"─".repeat(inner)}╯`),
   ];
 }
 
@@ -100,13 +101,24 @@ export function frameDialog(
 class DialogEditor {
   private editor: Editor;
   private initialText: string;
+  private host: DialogEditorHost;
+  private theme: Theme;
+  readonly title: string;
+  readonly prefill: string;
+  private done: (value: string | undefined) => void;
+
   constructor(
-    private host: DialogEditorHost,
-    private theme: Theme,
-    readonly title: string,
-    readonly prefill: string,
-    private done: (value: string | undefined) => void,
+    host: DialogEditorHost,
+    theme: Theme,
+    title: string,
+    prefill: string,
+    done: (value: string | undefined) => void,
   ) {
+    this.host = host;
+    this.theme = theme;
+    this.title = title;
+    this.prefill = prefill;
+    this.done = done;
     this.editor = new Editor(
       host as ConstructorParameters<typeof Editor>[0],
       {
@@ -173,8 +185,7 @@ export function dialogEditor(
   prefill: string,
 ): Promise<string | undefined> {
   return ctx.ui.custom(
-    (host, theme, _keys, done) =>
-      new DialogEditor(host, theme, title, prefill, done),
+    (host, theme, _keys, done) => new DialogEditor(host, theme, title, prefill, done),
     DIALOG_OPTIONS,
   );
 }
@@ -183,16 +194,31 @@ export function dialogEditor(
 class DialogMenu {
   private selected = 0;
   private viewport = 1;
+  private host: DialogHost;
+  private theme: Theme;
+  readonly title: string;
+  readonly rows: DialogRow[];
+  private done: (id: string | undefined) => void;
+  readonly footer: string;
+  private saveId: string | undefined;
+
   constructor(
-    private host: DialogHost,
-    private theme: Theme,
-    readonly title: string,
-    readonly rows: DialogRow[],
-    private done: (id: string | undefined) => void,
+    host: DialogHost,
+    theme: Theme,
+    title: string,
+    rows: DialogRow[],
+    done: (id: string | undefined) => void,
     selectedId?: string,
-    readonly footer = "↑↓ navigate · Enter select · Esc close",
-    private saveId?: string,
+    footer: string = "↑↓ navigate · Enter select · Esc close",
+    saveId?: string,
   ) {
+    this.host = host;
+    this.theme = theme;
+    this.title = title;
+    this.rows = rows;
+    this.done = done;
+    this.footer = footer;
+    this.saveId = saveId;
     const index = rows.findIndex((row) => row.id === selectedId);
     if (index >= 0) this.selected = index;
   }
@@ -202,23 +228,16 @@ class DialogMenu {
   handleInput(data: string): void {
     const keys = getKeybindings();
     if (keys.matches(data, "tui.select.cancel")) return this.done(undefined);
-    if (keys.matches(data, "tui.select.confirm"))
-      return this.done(this.getSelectedId());
-    if (this.saveId && matchesKey(data, Key.ctrl("s")))
-      return this.done(this.saveId);
+    if (keys.matches(data, "tui.select.confirm")) return this.done(this.getSelectedId());
+    if (this.saveId && matchesKey(data, Key.ctrl("s"))) return this.done(this.saveId);
     let offset = 0;
     if (keys.matches(data, "tui.select.up")) offset = -1;
-    else if (keys.matches(data, "tui.select.down") || matchesKey(data, Key.tab))
-      offset = 1;
+    else if (keys.matches(data, "tui.select.down") || matchesKey(data, Key.tab)) offset = 1;
     else if (matchesKey(data, Key.pageUp)) offset = -this.viewport;
     else if (matchesKey(data, Key.pageDown)) offset = this.viewport;
     else if (matchesKey(data, Key.home)) this.selected = 0;
-    else if (matchesKey(data, Key.end))
-      this.selected = Math.max(0, this.rows.length - 1);
-    this.selected = Math.max(
-      0,
-      Math.min(this.rows.length - 1, this.selected + offset),
-    );
+    else if (matchesKey(data, Key.end)) this.selected = Math.max(0, this.rows.length - 1);
+    this.selected = Math.max(0, Math.min(this.rows.length - 1, this.selected + offset));
     this.host.requestRender();
   }
   invalidate(): void {}
@@ -232,20 +251,17 @@ class DialogMenu {
     this.viewport = Math.max(1, height - 6 - help.length);
     const start = Math.max(
       0,
-      Math.min(
-        this.selected - this.viewport + 1,
-        this.rows.length - this.viewport,
-      ),
+      Math.min(this.selected - this.viewport + 1, this.rows.length - this.viewport),
     );
     const labelWidth = Math.min(28, Math.max(8, Math.floor(inner * 0.35)));
     const body = [
       this.theme.fg(
         "dim",
-        ` ${this.rows.length ? this.selected + 1 : 0}/${this.rows.length} · Field / Value`,
+        ` ${this.rows.length > 0 ? this.selected + 1 : 0}/${this.rows.length} · Field / Value`,
       ),
       ...this.rows.slice(start, start + this.viewport).map((row, i) => {
         const selected = start + i === this.selected;
-        const color = (text: string) => selected ? this.theme.fg("accent", text) : text;
+        const color = (text: string) => (selected ? this.theme.fg("accent", text) : text);
         const plainLabel = dialogText(row.label);
         const label = truncateToWidth(
           row.renderLabel ? row.renderLabel(plainLabel, this.theme) : plainLabel,
@@ -255,22 +271,17 @@ class DialogMenu {
         );
         const padding = " ".repeat(Math.max(0, labelWidth - visibleWidth(label)));
         const value = dialogText(row.value ?? "");
-        return color(`${selected ? "›" : " "} `)
-          + (row.renderLabel ? label : color(label))
-          + color(`${padding} │ `)
-          + (row.valueColor ? this.theme.fg(row.valueColor, value) : color(value));
+        return (
+          color(`${selected ? "›" : " "} `) +
+          (row.renderLabel ? label : color(label)) +
+          color(`${padding} │ `) +
+          (row.valueColor ? this.theme.fg(row.valueColor, value) : color(value))
+        );
       }),
       "",
       ...help.map((line) => this.theme.fg("muted", ` ${line}`)),
     ];
-    return frameDialog(
-      this.theme,
-      width,
-      height,
-      this.title,
-      body,
-      this.footer,
-    );
+    return frameDialog(this.theme, width, height, this.title, body, this.footer);
   }
 }
 
@@ -287,7 +298,11 @@ export async function dialogMenu(
   ctx: ExtensionContext,
   title: string,
   rows: DialogRow[],
-  options: { selectedId?: string; footer?: string; saveId?: string } = {},
+  options: {
+    selectedId?: string | undefined;
+    footer?: string | undefined;
+    saveId?: string | undefined;
+  } = {},
 ): Promise<string | undefined> {
   return ctx.ui.custom(
     (host, theme, _keys, done) =>
@@ -371,9 +386,7 @@ const dialogScopes = new WeakSet<ExtensionContext>();
 
 function isPromise<T>(value: T | Promise<T>): value is Promise<T> {
   return (
-    typeof value === "object" &&
-    value !== null &&
-    typeof (value as Promise<T>).then === "function"
+    typeof value === "object" && value !== null && typeof (value as Promise<T>).then === "function"
   );
 }
 
@@ -395,14 +408,25 @@ export class DialogSession {
   private disposed = false;
   private generation = 0;
   private pending: PendingView | undefined;
-  private outerDone: ((result?: void) => void) | undefined;
+  private outerDone: ((result?: undefined) => void) | undefined;
+
+  private host: TUI;
+
+  private theme: Theme;
+
+  private keys: KeybindingsManager;
 
   constructor(
-    private host: TUI,
-    private theme: Theme,
-    private keys: KeybindingsManager,
-    done: (result?: void) => void,
+    host: TUI,
+    theme: Theme,
+    keys: KeybindingsManager,
+    done: (result?: undefined) => void,
   ) {
+    this.host = host;
+
+    this.theme = theme;
+
+    this.keys = keys;
     this.outerDone = done;
   }
 
@@ -442,16 +466,14 @@ export class DialogSession {
       const resolveOnce = (value: T) => {
         if (settled) return;
         settled = true;
-        if (this.pending?.generation === generation)
-          this.pending.settled = true;
+        if (this.pending?.generation === generation) this.pending.settled = true;
         resolve(value);
       };
       const rejectOnce = (error: unknown) => {
         if (settled) return;
         settled = true;
         this.inputLocked = true;
-        if (this.pending?.generation === generation)
-          this.pending.settled = true;
+        if (this.pending?.generation === generation) this.pending.settled = true;
         reject(error);
       };
       this.pending = {
@@ -480,8 +502,7 @@ export class DialogSession {
           void produced.then(
             (component) => adopt(component),
             (error: unknown) => {
-              if (settled || this.closed || generation !== this.generation)
-                return;
+              if (settled || this.closed || generation !== this.generation) return;
               rejectOnce(error);
             },
           );
@@ -540,8 +561,7 @@ export class DialogSession {
       return;
     }
     this.replaceChild(component);
-    this.inputLocked =
-      this.pending?.generation === generation ? this.pending.settled : true;
+    this.inputLocked = this.pending?.generation === generation ? this.pending.settled : true;
     this.host.requestRender();
   }
 
@@ -556,7 +576,7 @@ export class DialogSession {
 
   private forwardFocus(): void {
     const child = this.child;
-    if (!child || !("focused" in child)) return;
+    if (!(child && "focused" in child)) return;
     // Read the setter's latest value; the first view can mount before showOverlay focuses us.
     child.focused = this.focused;
   }
@@ -569,18 +589,13 @@ export class DialogSession {
   }
 }
 
-export function scopeDialogContext<T extends ExtensionContext>(
-  ctx: T,
-  session: DialogSession,
-): T {
+export function scopeDialogContext<T extends ExtensionContext>(ctx: T, session: DialogSession): T {
   const source = ctx.ui;
   const originalCustom = source.custom.bind(source);
   const ui = Object.create(source) as ExtensionUIContext;
   ui.custom = ((factory, options) => {
     if (options?.overlay) return session.mount(factory);
-    return originalCustom(factory, options).finally(() =>
-      session.restoreFocus(),
-    );
+    return originalCustom(factory, options).finally(() => session.restoreFocus());
   }) as ExtensionUIContext["custom"];
   // Pi exposes ctx.ui as a getter; assignment cannot shadow an inherited accessor.
   // Define an own property while keeping the remaining context getters live.

package/src/subagents/ui/import-picker.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck: vendored upstream pi-subagent-manager 0.14.0 compiled under looser options; see src/subagents/VENDORED.md
 import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import {
   CURSOR_MARKER,
@@ -10,10 +9,10 @@ import {
 } from "@earendil-works/pi-tui";
 import {
   DIALOG_OPTIONS,
+  type DialogHost,
   dialogHeight,
   dialogText,
   frameDialog,
-  type DialogHost,
 } from "./dialog.ts";
 
 export interface ImportPickerItem {
@@ -76,12 +75,28 @@ class ImportPicker {
   private viewport = 1;
   private readonly checked = new Set<string>();
 
+  private host: DialogHost;
+
+  private theme: Theme;
+
+  private readonly items: readonly ImportPickerItem[];
+
+  private done: (ids: string[] | undefined) => void;
+
   constructor(
-    private host: DialogHost,
-    private theme: Theme,
-    private readonly items: readonly ImportPickerItem[],
-    private done: (ids: string[] | undefined) => void,
-  ) {}
+    host: DialogHost,
+    theme: Theme,
+    items: readonly ImportPickerItem[],
+    done: (ids: string[] | undefined) => void,
+  ) {
+    this.host = host;
+
+    this.theme = theme;
+
+    this.items = items;
+
+    this.done = done;
+  }
 
   /** Selected ids in source order. Empty until the user toggles a row. */
   getSelectedIds(): string[] {
@@ -99,7 +114,9 @@ class ImportPicker {
     return this.cursor;
   }
 
-  invalidate(): void {}
+  invalidate(): void {
+    // Nothing is cached, so there is nothing to invalidate.
+  }
 
   handleInput(data: string): void {
     const keys = getKeybindings();
@@ -155,8 +172,8 @@ class ImportPicker {
       if (listCount > 0) body.push(this.theme.fg("muted", " No external agents to import"));
     } else {
       const rows = this.items.slice(start, start + listCount);
-      for (let offset = 0; offset < rows.length; offset++)
-        body.push(this.row(rows[offset]!, start + offset === this.cursor));
+      for (const [offset, row] of rows.entries())
+        body.push(this.row(row, start + offset === this.cursor));
     }
     if (gap) body.push("");
     for (const line of detail.slice(0, detailCount)) body.push(this.theme.fg("muted", ` ${line}`));
@@ -164,7 +181,7 @@ class ImportPicker {
   }
 
   private countLine(start: number, shown: number): string {
-    const position = this.items.length ? this.cursor + 1 : 0;
+    const position = this.items.length > 0 ? this.cursor + 1 : 0;
     return this.theme.fg(
       "dim",
       ` ${this.scrollHint(start, shown)}${this.checked.size} selected · ${position}/${this.items.length}`,