decorated-pi 0.7.1 → 0.7.3

package/ui/ask.ts

@@ -28,10 +28,6 @@ export interface AskQuestion {
   question: string;
   options?: string[];
   default?: string;
-  /** When true on single/multi, an "Other" row is appended after the
-   *  regular options. Picking it switches the row into an inline text
-   *  input — lets the user type a custom answer not in the preset list. */
-  allowCustom?: boolean;
 }
 
 export interface AskAnswer {
@@ -41,7 +37,7 @@ export interface AskAnswer {
 
 interface QuestionState {
   value: string | string[];
-  cursor: number; // option cursor; for allowCustom, opts.length = "Other" row
+  cursor: number; // option cursor; opts.length maps to the "Other" row
   /** Typed text when the cursor sits on the "Other" row (single or multi). */
   customText: string;
   /** Multi only: whether "Other" is currently toggled into the selection. */
@@ -62,10 +58,39 @@ function parseDefault(type: AskQuestionType, options: string[] | undefined, defa
   return { value: selected, cursor: 0, customText: "", customSelected: false };
 }
 
-/** For single/multi with allowCustom, returns the effective option count
+/** Returns true for single/multi choice questions, which always get an
+ *  "Other" row for entering a custom answer not in the preset list. */
+function hasOtherRow(q: AskQuestion): boolean {
+  return q.type === "single" || q.type === "multi";
+}
+
+/** For single/multi questions, returns the effective option count
  *  (regular options plus the "Other" row). */
 function effectiveOptionCount(q: AskQuestion): number {
-  return (q.options?.length ?? 0) + (q.allowCustom ? 1 : 0);
+  return (q.options?.length ?? 0) + (hasOtherRow(q) ? 1 : 0);
+}
+
+const BRACKETED_PASTE_START = "\x1b[200~";
+const BRACKETED_PASTE_END = "\x1b[201~";
+
+/** Extract content from a bracketed-paste sequence. Returns undefined if the
+ *  data is not a complete paste. Any trailing input after the end marker is
+ *  returned as `remaining` so it can be processed recursively. */
+function extractBracketedPaste(data: string): { content: string; remaining: string } | undefined {
+  if (!data.startsWith(BRACKETED_PASTE_START)) return undefined;
+  const afterStart = data.slice(BRACKETED_PASTE_START.length);
+  const endIndex = afterStart.indexOf(BRACKETED_PASTE_END);
+  if (endIndex === -1) return undefined;
+  return {
+    content: afterStart.slice(0, endIndex),
+    remaining: afterStart.slice(endIndex + BRACKETED_PASTE_END.length),
+  };
+}
+
+/** Normalize pasted text for a single-line input: strip line breaks and
+ *  expand tabs to spaces (matches pi-tui's built-in Input behavior). */
+function cleanPastedText(text: string): string {
+  return text.replace(/\r\n/g, "").replace(/\r/g, "").replace(/\n/g, "").replace(/\t/g, "    ");
 }
 
 class DynamicBorder implements Component {
@@ -133,31 +158,31 @@ export class AskComponent extends Container {
     const state = this.currentState();
     if (q.type === "text") return (state.value as string).trim() !== "";
     if (q.type === "single") {
-      if (q.allowCustom && state.cursor === (q.options?.length ?? 0)) {
+      if (state.cursor === (q.options?.length ?? 0)) {
         return state.customText.trim() !== "";
       }
       return (state.value as string) !== "";
     }
     // multi: valid if any regular option is selected, or "Other" is
     // toggled AND has non-empty custom text.
-    if (q.allowCustom && state.customSelected) {
+    if (state.customSelected) {
       return state.customText.trim() !== "" || (state.value as string[]).length > 0;
     }
     return (state.value as string[]).length > 0;
   }
 
   /** The answer that will actually be submitted for this question. Differs
-   *  from state.value when allowCustom is in play and "Other" is chosen. */
+   *  from state.value when the cursor is on the "Other" row. */
   private committedValue(q: AskQuestion, state: QuestionState): string | string[] {
     if (q.type === "single") {
-      if (q.allowCustom && state.cursor === (q.options?.length ?? 0)) {
+      if (state.cursor === (q.options?.length ?? 0)) {
         return state.customText.trim();
       }
       return state.value as string;
     }
     if (q.type === "multi") {
       const base = state.value as string[];
-      if (q.allowCustom && state.customSelected && state.customText.trim() !== "") {
+      if (state.customSelected && state.customText.trim() !== "") {
         return [...base, state.customText.trim()];
       }
       return base;
@@ -209,6 +234,35 @@ export class AskComponent extends Container {
   handleInput(data: string): void {
     const kb = getKeybindings();
 
+    // ── Bracketed paste ─────────────────────────────────────────────
+    // Terminals that support bracketed paste mode wrap pasted content in
+    // \x1b[200~ ... \x1b[201~. Without handling this, the leading ESC is
+    // rejected as a control character and nothing is inserted.
+    const paste = extractBracketedPaste(data);
+    if (paste) {
+      if (!this.summaryMode) {
+        const text = cleanPastedText(paste.content);
+        const q = this.currentQuestion();
+        const state = this.currentState();
+        if (q.type === "text") {
+          state.value = (state.value as string) + text;
+        } else if (hasOtherRow(q)) {
+          const opts = q.options ?? [];
+          if (state.cursor === opts.length) {
+            state.customText += text;
+            if (q.type === "multi") {
+              state.customSelected = true;
+            }
+          }
+        }
+        this.renderView();
+      }
+      if (paste.remaining) {
+        this.handleInput(paste.remaining);
+      }
+      return;
+    }
+
     // ── Summary mode ────────────────────────────────────────────────
     if (this.summaryMode) {
       if (data === "\r" || data === "\n" || kb.matches(data, "tui.select.confirm")) {
@@ -264,7 +318,7 @@ export class AskComponent extends Container {
     } else if (q.type === "single" && q.options) {
       const opts = q.options;
       const totalLen = effectiveOptionCount(q);
-      const onCustomRow = q.allowCustom === true && state.cursor === opts.length;
+      const onCustomRow = state.cursor === opts.length;
 
       if (kb.matches(data, "tui.select.up")) {
         const next = (state.cursor - 1 + totalLen) % totalLen;
@@ -290,7 +344,7 @@ export class AskComponent extends Container {
     } else if (q.type === "multi" && q.options) {
       const opts = q.options;
       const totalLen = effectiveOptionCount(q);
-      const onCustomRow = q.allowCustom === true && state.cursor === opts.length;
+      const onCustomRow = state.cursor === opts.length;
 
       if (kb.matches(data, "tui.select.up")) {
         state.cursor = (state.cursor - 1 + totalLen) % totalLen;
@@ -367,7 +421,7 @@ export class AskComponent extends Container {
       const opts = q.options;
       const totalLen = effectiveOptionCount(q);
       for (let j = 0; j < totalLen; j++) {
-        const isCustomRow = q.allowCustom === true && j === opts.length;
+        const isCustomRow = j === opts.length;
         const optLabel = isCustomRow ? "Other" : opts[j];
         const selected = isCustomRow ? false : optLabel === state.value;
         const atCursor = j === state.cursor;
@@ -389,7 +443,7 @@ export class AskComponent extends Container {
       const opts = q.options;
       const totalLen = effectiveOptionCount(q);
       for (let j = 0; j < totalLen; j++) {
-        const isCustomRow = q.allowCustom === true && j === opts.length;
+        const isCustomRow = j === opts.length;
         const optLabel = isCustomRow ? "Other" : opts[j];
         const inValue = !isCustomRow && (state.value as string[]).includes(optLabel);
         const customOn = isCustomRow && state.customSelected;
@@ -413,13 +467,9 @@ export class AskComponent extends Container {
     if (q.type === "text") {
       hint = "Enter next · Esc cancel";
     } else if (q.type === "single") {
-      hint = q.allowCustom
-        ? "↑↓ move · Enter next · Esc cancel"
-        : "↑↓ move · Enter next · Esc cancel";
+      hint = "↑↓ move · Enter next · Esc cancel";
     } else {
-      hint = q.allowCustom
-        ? "↑↓ move · Space toggle · Enter next · Esc cancel"
-        : "↑↓ move · Space toggle · Enter next · Esc cancel";
+      hint = "↑↓ move · Space toggle · Enter next · Esc cancel";
     }
     this.hintComponent.setText(this.theme.fg("dim", "  " + hint));
   }

package/ui/module-settings.ts

@@ -6,9 +6,11 @@
  * category so the user can toggle each one.
  */
 
-import type { Theme as PiTheme } from "@earendil-works/pi-coding-agent";
+import type { Theme as PiTheme, ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import { Container, SettingsList, type TUI, type SettingsListTheme, type SettingItem, type Component } from "@earendil-works/pi-tui";
-import { getAllModuleSettings, setModuleEnabled, type ModuleSettings } from "../settings.js";
+import { getAllModuleSettings, setModuleEnabled, type ModuleSettings, getDependencyPath, setDependencyPath, isDontBother, setDontBother, getDependencyView, listDependencyViewNames } from "../settings.js";
+import { listLspBinaryNames } from "../tools/lsp/servers.js";
+import { listMcpBinaryNames } from "../tools/mcp/config.js";
 
 type ModuleName =
   | "patchOverrideEdit"
@@ -48,7 +50,7 @@ const MODULE_DESCS: Record<ModuleName, string> = {
   usage: "/usage command for token stats",
 };
 
-type CategoryId = "tools" | "hooks" | "commands";
+type CategoryId = "commands" | "hooks" | "tools";
 
 interface CategoryDef {
   label: string;
@@ -57,23 +59,27 @@ interface CategoryDef {
 }
 
 const CATEGORIES: Record<CategoryId, CategoryDef> = {
-  tools: {
-    label: "Tools",
-    description: "LLM-callable tools",
-    modules: ["patchOverrideEdit", "ask", "lsp", "mcp"],
+  commands: {
+    label: "Commands",
+    description: "Slash commands",
+    modules: ["atOverride", "retry", "usage"],
   },
   hooks: {
     label: "Hooks",
     description: "Agent-loop event handlers",
-    modules: ["secretRedaction", "rtk", "wakatime"],
+    modules: ["rtk", "secretRedaction", "wakatime"],
   },
-  commands: {
-    label: "Commands",
-    description: "Slash commands",
-    modules: ["atOverride", "retry", "usage"],
+  tools: {
+    label: "Tools",
+    description: "LLM-callable tools",
+    modules: ["ask", "lsp", "mcp", "patchOverrideEdit"],
   },
 };
 
+// Hard-coded display order, alphabetized by visible label. Dependencies is
+// inserted between Commands and Hooks in ModuleSettingsComponent below.
+const CATEGORY_ORDER: CategoryId[] = ["commands", "hooks", "tools"];
+
 class DynamicBorder implements Component {
   private colorFn: (str: string) => string;
   constructor(theme: PiTheme) { this.colorFn = (str: string) => theme.fg("border", str); }
@@ -135,8 +141,6 @@ class CategorySubmenu extends Container {
       (id: string, newValue: string) => {
         setModuleEnabled(id, newValue === "on");
         this.list.updateValue(id, newValue);
-        // Stay open so the user can toggle multiple items; the parent
-        // summary updates when the submenu is closed with Esc.
       },
       () => done(summaryFor(getAllModuleSettings(), category.modules)),
     );
@@ -152,14 +156,132 @@ class CategorySubmenu extends Container {
   }
 }
 
+/** Submenu for configuring binary path overrides. Each row is a binary
+ *  that decorated-pi looks up at startup; Enter opens an input dialog
+ *  where the user can type an absolute path (or clear it). */
+function dependencyDisplayValue(name: string): string {
+  const view = getDependencyView(name);
+  if (view.path) return view.path;
+  if (view.resolvedPath) return view.resolvedPath;
+  if (view.resolvedState === undefined) return view.dontBother ? "(not checked, silenced)" : "(not checked)";
+  return view.dontBother ? "(not found, silenced)" : "(not found)";
+}
+
+class DependencyBinarySubmenu extends Container {
+  private list: SettingsList;
+  private name: string;
+  private ui: ExtensionUIContext;
+
+  constructor(name: string, theme: PiTheme, ui: ExtensionUIContext, done: (summary?: string) => void) {
+    super();
+    this.name = name;
+    this.ui = ui;
+
+    const items: SettingItem[] = [
+      {
+        id: "path",
+        label: "Path override",
+        description: "Enter to edit; empty to clear override",
+        currentValue: dependencyDisplayValue(name),
+        values: ["edit"],
+      },
+      {
+        id: "dontBother",
+        label: "dontBother",
+        description: "Silence missing-dependency notification for this binary",
+        currentValue: isDontBother(name) ? "on" : "off",
+        values: ["off", "on"],
+      },
+    ];
+
+    this.list = new SettingsList(
+      items,
+      10,
+      getSettingsListTheme(theme),
+      (id: string, newValue: string) => {
+        if (id === "dontBother") {
+          setDontBother(this.name, newValue === "on");
+          this.list.updateValue("dontBother", newValue);
+          this.list.updateValue("path", dependencyDisplayValue(this.name));
+          return;
+        }
+        this.list.updateValue("path", dependencyDisplayValue(this.name));
+        void this.promptForPath();
+      },
+      () => done(dependencyDisplayValue(this.name)),
+    );
+    this.addChild(this.list);
+  }
+
+  handleInput(data: string) {
+    this.list.handleInput(data);
+  }
+
+  private async promptForPath(): Promise<void> {
+    const current = getDependencyPath(this.name) ?? "";
+    const input = await this.ui.input(
+      `Path for ${this.name} (empty to clear)`,
+      current || `/absolute/path/to/${this.name}`,
+    );
+    if (input === undefined) return;
+    setDependencyPath(this.name, input.trim() === "" ? null : input.trim());
+    this.list.updateValue("path", dependencyDisplayValue(this.name));
+  }
+
+  render(width: number): string[] {
+    return this.list.render(width);
+  }
+}
+
+class DependenciesSubmenu extends Container {
+  private list: SettingsList;
+  private binaryNames: string[];
+
+  constructor(theme: PiTheme, ui: ExtensionUIContext, done: (summary?: string) => void) {
+    super();
+    // Builtins we know about plus entries already present in config/shadow.
+    this.binaryNames = listDependencyViewNames([
+      "rtk",
+      "wakatime-cli",
+      ...listLspBinaryNames(),
+      ...listMcpBinaryNames(),
+    ]);
+
+    const items: SettingItem[] = this.binaryNames.map((name) => ({
+      id: name,
+      label: name,
+      description: "Enter to configure path override and dontBother",
+      currentValue: dependencyDisplayValue(name),
+      submenu: (_currentValue, submenuDone) => new DependencyBinarySubmenu(name, theme, ui, submenuDone),
+    }));
+
+    this.list = new SettingsList(
+      items,
+      10,
+      getSettingsListTheme(theme),
+      () => {},
+      () => done(summaryForDependencies()),
+    );
+    this.addChild(this.list);
+  }
+
+  handleInput(data: string) {
+    this.list.handleInput(data);
+  }
+
+  render(width: number): string[] {
+    return this.list.render(width);
+  }
+}
+
 export class ModuleSettingsComponent extends Container {
   private settingsList: SettingsList;
 
-  constructor(tui: TUI, theme: PiTheme, onDone: () => void) {
+  constructor(tui: TUI, theme: PiTheme, ui: ExtensionUIContext, onDone: () => void) {
     super();
     const modules = getAllModuleSettings();
 
-    const categoryItems: SettingItem[] = (Object.keys(CATEGORIES) as CategoryId[]).map((id) => ({
+    const categoryItems: SettingItem[] = CATEGORY_ORDER.map((id) => ({
       id,
       label: CATEGORIES[id].label,
       description: CATEGORIES[id].description,
@@ -167,6 +289,17 @@ export class ModuleSettingsComponent extends Container {
       submenu: (_currentValue, done) => new CategorySubmenu(id, theme, done),
     }));
 
+    // Dependencies is a separate top-level category — it doesn't fit
+    // ModuleSettings' on/off toggle model. Insert it alphabetically between
+    // Commands and Hooks.
+    categoryItems.splice(1, 0, {
+      id: "dependencies",
+      label: "Dependencies",
+      description: "Override binary paths (rtk, wakatime-cli, LSP/MCP servers)",
+      currentValue: summaryForDependencies(),
+      submenu: (_currentValue, done) => new DependenciesSubmenu(theme, ui, done),
+    });
+
     this.addChild(new DynamicBorder(theme));
 
     this.settingsList = new SettingsList(
@@ -186,3 +319,20 @@ export class ModuleSettingsComponent extends Container {
     this.settingsList.handleInput(data);
   }
 }
+
+/** Count how many binaries have an explicit override. */
+function summaryForDependencies(): string {
+  // Builtins we know about: rtk, wakatime-cli, LSP servers, MCP servers.
+  const known = listDependencyViewNames([
+    "rtk",
+    "wakatime-cli",
+    ...listLspBinaryNames(),
+    ...listMcpBinaryNames(),
+  ]);
+  const overridden = known.filter((n) => getDependencyPath(n) !== null).length;
+  const silenced = known.filter((n) => isDontBother(n)).length;
+  const parts: string[] = [];
+  if (overridden) parts.push(`${overridden} overridden`);
+  if (silenced) parts.push(`${silenced} silenced`);
+  return parts.length ? parts.join(", ") : "default";
+}

package/utils/which.ts

@@ -0,0 +1,109 @@
+/**
+ * Locate a binary by name. Pure Node — no shell required.
+ *
+ * Why no shell: the previous implementation called `bash -c "command -v X"`,
+ * which depended on `command` being a builtin in the user's shell. That's
+ * true for bash/zsh/sh/ash/dash, but not for nushell/fish/pwsh — so a user
+ * with `SHELL=/usr/bin/nu` saw the whole extension fail to start with
+ * "External command failed" errors from the `command` builtin lookup.
+ *
+ * Walking $PATH with fs.accessSync(X_OK) is universal:
+ *   - No shell dependency
+ *   - No builtin dependency
+ *   - Works on minimal Linux (alpine, busybox, distroless)
+ *   - Works regardless of $SHELL
+ *   - No execFileSync overhead per call
+ *
+ * `extendPath` lets callers inject extra search locations (user-configured
+ * override paths, module-specific fallback dirs like ~/.wakatime, project
+ * node_modules/.bin). Each entry can be a file path (checked directly) or
+ * a directory (searched for `name` inside). extendPath entries are tried
+ * before $PATH, so callers control priority by ordering.
+ */
+import { accessSync, constants, statSync } from "node:fs";
+import { delimiter, resolve } from "node:path";
+import { execFileSync } from "node:child_process";
+import { homedir } from "node:os";
+
+export interface WhichOptions {
+  /** Extra locations to search before $PATH. Each entry can be a file
+   *  path (e.g. "/custom/bin/rtk") or a directory (e.g. "~/.wakatime").
+   *  Tried in array order; first executable match wins. */
+  extendPath?: string[];
+}
+
+export function which(name: string, opts?: WhichOptions): string | null {
+  if (!name) return null;
+
+  // Absolute or relative path in name: check the file directly.
+  if (name.includes("/") || name.includes("\\")) {
+    try {
+      accessSync(name, constants.X_OK);
+      return resolve(name);
+    } catch {
+      return null;
+    }
+  }
+
+  if (process.platform === "win32") {
+    // Windows: `where` is a built-in command that handles PATHEXT
+    // (the per-user list of executable extensions — typically
+    // .COM;.EXE;.BAT;.CMD;.VBS;.JS;.WSC;.MSC;.PS1) and PATH lookup.
+    // We don't replicate that in pure Node; we defer to it.
+    try {
+      const out = execFileSync("where", [name], { encoding: "utf-8" }).trim();
+      return out.split(/\r?\n/)[0] || null;
+    } catch {
+      return null;
+    }
+  }
+
+  // Build the search list: extendPath entries first, then $PATH dirs.
+  // extendPath entries can be files (checked directly) or directories
+  // (searched for `name` inside). We stat each to tell them apart.
+  const home = homedir();
+  const expandHome = (d: string): string => {
+    if (d === "~") return home;
+    if (d.startsWith("~/") || d.startsWith("~\\")) return home + d.slice(1);
+    return d;
+  };
+
+  const tryCandidate = (candidate: string): string | null => {
+    try {
+      accessSync(candidate, constants.X_OK);
+      return resolve(candidate);
+    } catch {
+      return null;
+    }
+  };
+
+  // 1. extendPath (caller-injected): override paths + module fallbacks.
+  for (const entry of opts?.extendPath ?? []) {
+    const expanded = expandHome(entry);
+    let isDir = false;
+    try {
+      isDir = statSync(expanded).isDirectory();
+    } catch {
+      // Doesn't exist or not accessible — skip.
+      continue;
+    }
+    const candidate = isDir ? resolve(expanded, name) : expanded;
+    const found = tryCandidate(candidate);
+    if (found) return found;
+  }
+
+  // 2. $PATH walk — mirrors the standard `which(1)` command's behavior:
+  // exact match in each directory, no recursion.
+  //
+  // `~` expansion: bash expands `~/bin` when sourced from .bashrc via
+  // `export PATH=~/bin:$PATH`, but not when PATH is set in launchd,
+  // systemd Environment=, Docker ENV, or GUI app launchers. We expand
+  // it here so we don't regress on those paths.
+  const dirs = (process.env.PATH || "").split(delimiter).map(expandHome);
+  for (const dir of dirs) {
+    if (!dir) continue;
+    const found = tryCandidate(resolve(dir, name));
+    if (found) return found;
+  }
+  return null;
+}