@esso0428/pi-subagents 0.17.23 → 0.17.25

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.25] - 2026-10-02
+
+### Fixed
+- **Suspended the roster key listener for the remaining widget-owned dialogs**: v0.17.24 routed `ctx.ui.select`, `ctx.ui.editor`, and `ctx.ui.custom` through `withModal()` but left `ctx.ui.input` and `ctx.ui.confirm` outside it. Those dialogs are reached only after a wrapped modal has already cleared roster navigation, so the listener could still swallow a stray `↓`, and any future path that opens one directly would lose `escape`/`↑`/`↓`/`enter` entirely. Every remaining modal call now runs inside `withModal()` as well.
+
+## [0.17.24] - 2026-10-02
+
+### Fixed
+- **Restored agents roster ↑/↓ selection and stopped it stealing keys from this extension's modals**: v0.17.23 replaced the widget's focus probe with a structural check for the prompt editor, which broke roster navigation outright. The probe is unworkable in general — pi can replace the focused editor through `ctx.ui.setEditorComponent()` (pi-tmux-cursor-focus wraps it whenever pi runs under tmux), and an extension may also resolve its own copy of `@earendil-works/pi-tui` at a different version than the host's, so neither `instanceof` nor a structural test can identify it. The widget now tracks the state it actually controls: every `ctx.ui.select`, `ctx.ui.editor`, and `ctx.ui.custom` call in this extension runs inside `withModal()`, which suspends the widget's global terminal listener for as long as the modal holds the keyboard. Roster selection works again, and open modals receive `↑`/`↓`/`enter`/`escape` unimpeded.
+
 ## [0.17.23] - 2026-10-02
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esso0428/pi-subagents",
-  "version": "0.17.23",
+  "version": "0.17.25",
   "description": "A pi extension that brings smart Claude Code-style autonomous sub-agents to pi, with npm:pi-subagents-style JSON agent overrides.",
   "author": "ESSO0428",
   "repository": {

package/src/index.ts

@@ -674,6 +674,21 @@ export default function (pi: ExtensionAPI) {
       },
     },
   );
+
+  /**
+   * Run an AgentWidget-owned modal while the widget's global key listener
+   * stands down. The listener runs before the focused component, so without
+   * this it would consume ↑/↓/enter/escape from the modal itself.
+   */
+  async function withModal<T>(open: () => Promise<T>): Promise<T> {
+    widget.setModalOpen(true);
+    try {
+      return await open();
+    } finally {
+      widget.setModalOpen(false);
+    }
+  }
+
   function setWidgetMode(m: WidgetMode): void {
     widgetMode = m;
     widget.update();
@@ -1845,7 +1860,7 @@ Terse command-style prompts produce shallow, generic work.
       ctx.ui.notify(noAgentsMsg, "info");
     }
 
-    const choice = await ctx.ui.select("Agents", options);
+    const choice = await withModal(() => ctx.ui.select("Agents", options));
     if (!choice) return;
 
     if (choice.startsWith("Running agents (")) {
@@ -1909,7 +1924,7 @@ Terse command-style prompts produce shallow, generic work.
     if (hasCustom) legendParts.push("• = project  ◦ = global");
     if (hasDisabled) legendParts.push("✕ = disabled");
 
-    const selected = await ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
+    const selected = await withModal(() => ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
       const slTheme = getSettingsListTheme();
       const list = new SettingsList(
         items,
@@ -1928,7 +1943,7 @@ Terse command-style prompts produce shallow, generic work.
         invalidate: () => container.invalidate(),
         handleInput: (data: string) => list.handleInput?.(data),
       };
-    });
+    }));
 
     if (selected && getAgentConfig(selected)) {
       await showAgentDetail(ctx, selected);
@@ -1978,7 +1993,7 @@ Terse command-style prompts produce shallow, generic work.
       }
     };
 
-    const choice = await ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
+    const choice = await withModal(() => ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
       const list = new SelectList(
         options,
         Math.min(options.length, 10),
@@ -2003,7 +2018,7 @@ Terse command-style prompts produce shallow, generic work.
         invalidate: () => container.invalidate(),
         handleInput: (data: string) => list.handleInput(data),
       };
-    });
+    }));
 
     if (!choice) return undefined;
     return pairs.find(({ record }) => record.id === choice)?.record;
@@ -2082,7 +2097,7 @@ Terse command-style prompts produce shallow, generic work.
 
     const activity = agentActivity.get(record.id);
     const isLive = mode === "live";
-    await ctx.ui.custom<undefined>(
+    await withModal(() => ctx.ui.custom<undefined>(
       (tui, theme, keybindings, done) => {
         return new ConversationViewer(tui, session, record, activity, theme, done,
           isLive ? () => {
@@ -2098,7 +2113,7 @@ Terse command-style prompts produce shallow, generic work.
         overlay: true,
         overlayOptions: { anchor: "center", width: "90%", maxHeight: `${VIEWPORT_HEIGHT_PCT}%` },
       },
-    );
+    ));
   }
 
   async function showAgentDetail(ctx: ExtensionCommandContext, name: string) {
@@ -2129,12 +2144,12 @@ Terse command-style prompts produce shallow, generic work.
       menuOptions = ["Edit", "Disable", "Delete", "Back"];
     }
 
-    const choice = await ctx.ui.select(name, menuOptions);
+    const choice = await withModal(() => ctx.ui.select(name, menuOptions));
     if (!choice || choice === "Back") return;
 
     if (choice === "Edit" && file) {
       const content = readFileSync(file.path, "utf-8");
-      const edited = await ctx.ui.editor(`Edit ${name}`, content);
+      const edited = await withModal(() => ctx.ui.editor(`Edit ${name}`, content));
       if (edited !== undefined && edited !== content) {
         const { writeFileSync } = await import("node:fs");
         writeFileSync(file.path, edited, "utf-8");
@@ -2143,7 +2158,7 @@ Terse command-style prompts produce shallow, generic work.
       }
     } else if (choice === "Delete") {
       if (file) {
-        const confirmed = await ctx.ui.confirm("Delete agent", `Delete ${name} from ${file.location} (${file.path})?`);
+        const confirmed = await withModal(() => ctx.ui.confirm("Delete agent", `Delete ${name} from ${file.location} (${file.path})?`));
         if (confirmed) {
           unlinkSync(file.path);
           reloadCustomAgents();
@@ -2151,7 +2166,7 @@ Terse command-style prompts produce shallow, generic work.
         }
       }
     } else if (choice === "Reset to default" && file) {
-      const confirmed = await ctx.ui.confirm("Reset to default", `Delete override ${file.path} and restore embedded default?`);
+      const confirmed = await withModal(() => ctx.ui.confirm("Reset to default", `Delete override ${file.path} and restore embedded default?`));
       if (confirmed) {
         unlinkSync(file.path);
         reloadCustomAgents();
@@ -2168,10 +2183,10 @@ Terse command-style prompts produce shallow, generic work.
 
   /** Eject a default agent: write its embedded config as a .md file. */
   async function ejectAgent(ctx: ExtensionCommandContext, name: string, cfg: AgentConfig) {
-    const location = await ctx.ui.select("Choose location", [
+    const location = await withModal(() => ctx.ui.select("Choose location", [
       "Project (.pi/agents/)",
       `Personal (${personalAgentsDir()})`,
-    ]);
+    ]));
     if (!location) return;
 
     const targetDir = location.startsWith("Project") ? projectAgentsDir() : personalAgentsDir();
@@ -2179,7 +2194,7 @@ Terse command-style prompts produce shallow, generic work.
 
     const targetPath = join(targetDir, `${name}.md`);
     if (existsSync(targetPath)) {
-      const overwrite = await ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
+      const overwrite = await withModal(() => ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`));
       if (!overwrite) return;
     }
 
@@ -2232,10 +2247,10 @@ Terse command-style prompts produce shallow, generic work.
     }
 
     // No file (built-in default) — create a stub
-    const location = await ctx.ui.select("Choose location", [
+    const location = await withModal(() => ctx.ui.select("Choose location", [
       "Project (.pi/agents/)",
       `Personal (${personalAgentsDir()})`,
-    ]);
+    ]));
     if (!location) return;
 
     const targetDir = location.startsWith("Project") ? projectAgentsDir() : personalAgentsDir();
@@ -2270,18 +2285,18 @@ Terse command-style prompts produce shallow, generic work.
   }
 
   async function showCreateWizard(ctx: ExtensionCommandContext) {
-    const location = await ctx.ui.select("Choose location", [
+    const location = await withModal(() => ctx.ui.select("Choose location", [
       "Project (.pi/agents/)",
       `Personal (${personalAgentsDir()})`,
-    ]);
+    ]));
     if (!location) return;
 
     const targetDir = location.startsWith("Project") ? projectAgentsDir() : personalAgentsDir();
 
-    const method = await ctx.ui.select("Creation method", [
+    const method = await withModal(() => ctx.ui.select("Creation method", [
       "Generate with Claude (recommended)",
       "Manual configuration",
-    ]);
+    ]));
     if (!method) return;
 
     if (method.startsWith("Generate")) {
@@ -2292,17 +2307,17 @@ Terse command-style prompts produce shallow, generic work.
   }
 
   async function showGenerateWizard(ctx: ExtensionCommandContext, targetDir: string) {
-    const description = await ctx.ui.input("Describe what this agent should do");
+    const description = await withModal(() => ctx.ui.input("Describe what this agent should do"));
     if (!description) return;
 
-    const name = await ctx.ui.input("Agent name (filename, no spaces)");
+    const name = await withModal(() => ctx.ui.input("Agent name (filename, no spaces)"));
     if (!name) return;
 
     mkdirSync(targetDir, { recursive: true });
 
     const targetPath = join(targetDir, `${name}.md`);
     if (existsSync(targetPath)) {
-      const overwrite = await ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
+      const overwrite = await withModal(() => ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`));
       if (!overwrite) return;
     }
 
@@ -2369,15 +2384,15 @@ Write the file using the write tool. Only write the file, nothing else.`;
 
   async function showManualWizard(ctx: ExtensionCommandContext, targetDir: string) {
     // 1. Name
-    const name = await ctx.ui.input("Agent name (filename, no spaces)");
+    const name = await withModal(() => ctx.ui.input("Agent name (filename, no spaces)"));
     if (!name) return;
 
     // 2. Description
-    const description = await ctx.ui.input("Description (one line)");
+    const description = await withModal(() => ctx.ui.input("Description (one line)"));
     if (!description) return;
 
     // 3. Tools
-    const toolChoice = await ctx.ui.select("Tools", ["all", "none", "read-only (read, bash, grep, find, ls)", "custom..."]);
+    const toolChoice = await withModal(() => ctx.ui.select("Tools", ["all", "none", "read-only (read, bash, grep, find, ls)", "custom..."]));
     if (!toolChoice) return;
 
     let tools: string;
@@ -2388,19 +2403,19 @@ Write the file using the write tool. Only write the file, nothing else.`;
     } else if (toolChoice.startsWith("read-only")) {
       tools = "read, bash, grep, find, ls";
     } else {
-      const customTools = await ctx.ui.input("Tools (comma-separated)", BUILTIN_TOOL_NAMES.join(", "));
+      const customTools = await withModal(() => ctx.ui.input("Tools (comma-separated)", BUILTIN_TOOL_NAMES.join(", ")));
       if (!customTools) return;
       tools = customTools;
     }
 
     // 4. Model
-    const modelChoice = await ctx.ui.select("Model", [
+    const modelChoice = await withModal(() => ctx.ui.select("Model", [
       "inherit (parent model)",
       "haiku",
       "sonnet",
       "opus",
       "custom...",
-    ]);
+    ]));
     if (!modelChoice) return;
 
     let modelLine = "";
@@ -2408,20 +2423,20 @@ Write the file using the write tool. Only write the file, nothing else.`;
     else if (modelChoice === "sonnet") modelLine = "\nmodel: anthropic/claude-sonnet-4-6";
     else if (modelChoice === "opus") modelLine = "\nmodel: anthropic/claude-opus-4-6";
     else if (modelChoice === "custom...") {
-      const customModel = await ctx.ui.input("Model (provider/modelId)");
+      const customModel = await withModal(() => ctx.ui.input("Model (provider/modelId)"));
       if (customModel) modelLine = `\nmodel: ${customModel}`;
     }
 
     // 5. Thinking
     // "inherit" is a UI-only pseudo-choice (omit the field); the rest mirror pi.
-    const thinkingChoice = await ctx.ui.select("Thinking level", ["inherit", ...THINKING_LEVELS]);
+    const thinkingChoice = await withModal(() => ctx.ui.select("Thinking level", ["inherit", ...THINKING_LEVELS]));
     if (!thinkingChoice) return;
 
     let thinkingLine = "";
     if (thinkingChoice !== "inherit") thinkingLine = `\nthinking: ${thinkingChoice}`;
 
     // 6. System prompt
-    const systemPrompt = await ctx.ui.editor("System prompt", "");
+    const systemPrompt = await withModal(() => ctx.ui.editor("System prompt", ""));
     if (systemPrompt === undefined) return;
 
     // Build the file
@@ -2438,7 +2453,7 @@ ${systemPrompt}
     const targetPath = join(targetDir, `${name}.md`);
 
     if (existsSync(targetPath)) {
-      const overwrite = await ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
+      const overwrite = await withModal(() => ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`));
       if (!overwrite) return;
     }
 
@@ -2610,7 +2625,7 @@ ${systemPrompt}
     // Updated on arrow keys so Enter knows which field is selected immediately.
     let currentIndex = 0;
 
-    const result = await ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
+    const result = await withModal(() => ctx.ui.custom<string | undefined>((_tui, _theme, _kb, done) => {
       const items = buildItems();
 
       list = new SettingsList(
@@ -2647,7 +2662,7 @@ ${systemPrompt}
           list.handleInput?.(data);
         },
       };
-    });
+    }));
 
     // If a numeric field ID was returned, prompt for typed input
     if (result && NUMERIC_IDS.has(result)) {
@@ -2665,7 +2680,7 @@ ${systemPrompt}
 
       // Loop until user enters a valid integer or cancels (Esc / null).
       // Silently trims whitespace; rejects non-numeric input by re-prompting.
-      let input: string | undefined = await ctx.ui.input(label, current);
+      let input: string | undefined = await withModal(() => ctx.ui.input(label, current));
       while (input != null) {
         const trimmed = input.trim();
         const n = Number(trimmed);
@@ -2675,7 +2690,7 @@ ${systemPrompt}
           return;
         }
         // Invalid — re-prompt with the user's last entry so they can edit it
-        input = await ctx.ui.input(label, trimmed);
+        input = await withModal(() => ctx.ui.input(label, trimmed));
       }
     }
   }

package/src/ui/agent-widget.ts

@@ -238,24 +238,6 @@ export function describeActivity(activeTools: Map<string, string>, responseText?
   return "thinking…";
 }
 
-/**
- * Structural check for pi's prompt editor.
- *
- * `instanceof Editor` is unusable here: an extension can resolve its own copy
- * of `@earendil-works/pi-tui` at a different version than the host's, and the
- * two `Editor` class objects are then unrelated identities, so the check is
- * always false. Modals opened with `ctx.ui.custom()` — including the `/agents`
- * menus — focus a plain `{ render, invalidate, handleInput }` object instead,
- * so the editor's text-buffer methods identify it across pi-tui copies.
- */
-function isPromptEditor(component: unknown): boolean {
-  if (typeof component !== "object" || component === null) return false;
-  const candidate = component as { getText?: unknown; setText?: unknown; submitValue?: unknown };
-  return typeof candidate.getText === "function"
-    && typeof candidate.setText === "function"
-    && typeof candidate.submitValue === "function";
-}
-
 // ---- Widget manager ----
 
 export class AgentWidget {
@@ -265,6 +247,8 @@ export class AgentWidget {
   private inputUnsub: (() => void) | undefined;
   /** Whether arrow keys currently navigate the agent roster. */
   private navigationActive = false;
+  /** Depth of AgentWidget-owned modals currently holding the keyboard. */
+  private modalDepth = 0;
   /** Stable identity of the selected row, so roster changes do not jump selection. */
   private selectedAgentId: string | undefined;
   /** Last logical roster index of the selected row, used when it disappears. */
@@ -392,16 +376,25 @@ export class AgentWidget {
   }
 
   /**
-   * True when pi's prompt editor owns the keyboard.
+   * Track an AgentWidget-owned modal (the `/agents` menus and friends).
    *
-   * Deliberately fails closed: an unknown or absent focus target means the
-   * widget does not own the keyboard, so its global terminal listener stays out
-   * of the way. The previous `focused == null` fallback claimed input during
-   * teardown and transient render states, which let roster navigation swallow
-   * ↑/↓/enter/escape from an open modal.
+   * The widget's terminal listener runs before the focused component, so while
+   * a modal is open the listener must not claim ↑/↓/enter/escape. Whether pi's
+   * prompt editor currently owns the keyboard is deliberately not consulted:
+   * pi can replace it through `ctx.ui.setEditorComponent()` (for example
+   * pi-tmux-cursor-focus wraps it under tmux), and the extension may also
+   * resolve its own copy of `@earendil-works/pi-tui` at a different version
+   * than the host's. Neither `instanceof` nor a structural probe can identify
+   * the editor reliably in that environment, and a wrong answer silently
+   * disables roster navigation entirely.
    */
-  private editorHasFocus(): boolean {
-    return isPromptEditor((this.tui as { focusedComponent?: unknown } | undefined)?.focusedComponent);
+  setModalOpen(open: boolean): void {
+    this.modalDepth = open ? this.modalDepth + 1 : Math.max(0, this.modalDepth - 1);
+  }
+
+  /** True when no AgentWidget-owned modal is holding the keyboard. */
+  private keyboardAvailable(): boolean {
+    return this.modalDepth === 0;
   }
 
   private selectedIndexOf(records: readonly AgentRecord[]): number {
@@ -443,7 +436,7 @@ export class AgentWidget {
     if (records.length === 0 || !ui) return false;
 
     if (!this.navigationActive) {
-      if (direction !== 1 || !this.editorHasFocus() || (ui.getEditorText?.() ?? "") !== "") return false;
+      if (direction !== 1 || !this.keyboardAvailable() || (ui.getEditorText?.() ?? "") !== "") return false;
       this.activate(records);
       return true;
     }
@@ -471,7 +464,7 @@ export class AgentWidget {
   /** Handle terminal input before it reaches the focused prompt editor. */
   handleKey(data: string): { consume?: boolean; data?: string } | undefined {
     if (!this.uiCtx || isKeyRelease(data)) return undefined;
-    if (!this.editorHasFocus()) {
+    if (!this.keyboardAvailable()) {
       if (this.navigationActive) this.deactivate();
       return undefined;
     }