@d3ara1n/pi-command-palette 0.1.2 → 0.2.1

package/README.md

@@ -6,7 +6,11 @@ Global command palette for [Pi Coding Agent](https://pi.dev) — press **Ctrl+Sh
 
 Pi's slash commands (`/model`, `/compact`, extension commands, etc.) only work when the editor is empty. If you've typed something and want to switch models or run a command, you're stuck. This extension opens a floating command palette via keyboard shortcut, regardless of editor state.
 
-## Install
+## Dependencies
+
+None.
+
+## Installation
 
 ```bash
 pi install npm:@d3ara1n/pi-command-palette
@@ -24,7 +28,7 @@ Or add to `~/.pi/agent/settings.json`:
 
 | Shortcut | Action |
 |----------|--------|
-| `Ctrl+Shift+P` | Open command palette |
+| `Ctrl+Shift+P` _(default, configurable)_ | Open command palette |
 
 The palette lists:
 
@@ -42,4 +46,28 @@ The "Model: Switch Model" action opens a secondary overlay listing all models wi
 
 ## Configuration
 
-No configuration needed. Works out of the box.
+The default shortcut is `Ctrl+Shift+P`. If it conflicts with your terminal, override it via either of the following (evaluated in order, first match wins).
+
+### 1. Environment variable
+
+Useful for terminals that intercept `Ctrl+Shift+<key>` before it reaches the session (e.g. Termius on Windows/WSL2):
+
+```bash
+export PI_COMMAND_PALETTE_KEY=ctrl+alt+k
+```
+
+Add it to your shell profile to persist (`~/.zshrc` on macOS, `~/.bashrc` on bash).
+
+### 2. settings.json
+
+Set `commandPalette.shortcut` in `~/.pi/agent/settings.json` (global) or `.pi/settings.json` in your project (project overrides global):
+
+```jsonc
+{
+  "commandPalette": {
+    "shortcut": "ctrl+alt+k"
+  }
+}
+```
+
+Any valid pi keybinding string works (e.g. `ctrl+shift+k`, `ctrl+alt+p`, `ctrl+k`). Restart pi (or run `/reload`) after changing the shortcut.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-command-palette",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "type": "module",
   "description": "Global command palette for pi — press Ctrl+Shift+P to search and run commands from anywhere",
   "main": "src/index.ts",

package/src/config.ts

@@ -0,0 +1,67 @@
+/**
+ * Resolve the command-palette shortcut key from configuration sources.
+ *
+ * Priority (highest wins):
+ *   1. `PI_COMMAND_PALETTE_KEY` env var — works even when the terminal intercepts
+ *      `Ctrl+Shift+P` before it reaches the session (e.g. Termius on Windows/WSL2).
+ *   2. `settings.json` `commandPalette.shortcut` (project `.pi/settings.json`
+ *      overrides global `~/.pi/agent/settings.json`)
+ *   3. default `"ctrl+shift+p"`
+ *
+ * Why not a CLI flag? Flags are applied to the extension runtime AFTER extensions
+ * load, so `pi.getFlag()` only returns the registered default at `registerShortcut()`
+ * time. Env vars and settings files are both available immediately at process
+ * start, so they are the correct mechanisms here.
+ */
+
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { KeyId } from "@earendil-works/pi-tui";
+
+export const DEFAULT_SHORTCUT = "ctrl+shift+p";
+
+function getAgentDir(): string {
+  const envDir = process.env.PI_AGENT_DIR;
+  if (envDir) return envDir;
+  return path.join(os.homedir(), ".pi", "agent");
+}
+
+function readSettings(filePath: string): Record<string, unknown> {
+  try {
+    if (!fs.existsSync(filePath)) return {};
+    return JSON.parse(fs.readFileSync(filePath, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+
+/** Lowercase + trim; returns undefined for empty/non-string input. */
+function normalizeKey(raw: unknown): string | undefined {
+  if (typeof raw !== "string") return undefined;
+  const trimmed = raw.trim().toLowerCase();
+  return trimmed || undefined;
+}
+
+/**
+ * Resolve the command-palette shortcut key from env var → settings → default.
+ *
+ * @param cwd - Project working directory, for project-level settings override.
+ *   Defaults to `process.cwd()` (accurate at pi startup when shortcuts register).
+ */
+export function resolveShortcutKey(cwd: string = process.cwd()): KeyId {
+  // 1. Env var — highest priority, for terminals that intercept the default combo.
+  const envKey = normalizeKey(process.env.PI_COMMAND_PALETTE_KEY);
+  if (envKey) return envKey as KeyId;
+
+  // 2. settings.json — global ~/.pi/agent/settings.json; project overrides global.
+  const globalSettings = readSettings(path.join(getAgentDir(), "settings.json"));
+  const projectSettings = readSettings(path.join(cwd, ".pi", "settings.json"));
+  const globalCfg = (globalSettings.commandPalette ?? {}) as { shortcut?: unknown };
+  const projectCfg = (projectSettings.commandPalette ?? {}) as { shortcut?: unknown };
+  const settingsKey = normalizeKey(projectCfg.shortcut ?? globalCfg.shortcut);
+  if (settingsKey) return settingsKey as KeyId;
+
+  // 3. default
+  return DEFAULT_SHORTCUT as KeyId;
+}

package/src/index.ts

@@ -15,30 +15,31 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import {
-	Container,
-	type SelectItem,
-	fuzzyFilter,
-	Key,
-	matchesKey,
-	SelectList,
-	Text,
+  Container,
+  type SelectItem,
+  fuzzyFilter,
+  Key,
+  matchesKey,
+  SelectList,
+  Text,
 } from "@earendil-works/pi-tui";
+import { resolveShortcutKey } from "./config.ts";
 
 // ── Types ──────────────────────────────────────────────────────────
 
 type CommandAction =
-	| { type: "editor"; text: string }
-	| { type: "model-select" }
-	| { type: "compact" }
-	| { type: "reload" }
-	| { type: "restore" };
+  | { type: "editor"; text: string }
+  | { type: "model-select" }
+  | { type: "compact" }
+  | { type: "reload" }
+  | { type: "restore" };
 
 interface PaletteItem {
-	value: string;
-	label: string;
-	description: string;
-	category: string;
-	action: CommandAction;
+  value: string;
+  label: string;
+  description: string;
+  category: string;
+  action: CommandAction;
 }
 
 // ── Module state ───────────────────────────────────────────────────
@@ -49,350 +50,353 @@ let savedEditorText: string | null = null;
 // ── Helpers ────────────────────────────────────────────────────────
 
 function buildPaletteItems(pi: ExtensionAPI, ctx: ExtensionContext): PaletteItem[] {
-	const items: PaletteItem[] = [];
-
-	// ── Restore option (if previous editor text was saved) ────────
-	if (savedEditorText) {
-		const preview =
-			savedEditorText.length > 40
-				? `${savedEditorText.slice(0, 37)}...`
-				: savedEditorText;
-		items.push({
-			value: "__restore",
-			label: "Restore: Previous Editor Text",
-			description: preview.replace(/\n/g, "⏎"),
-			category: "Built-in",
-			action: { type: "restore" },
-		});
-	}
-
-	// ── Built-in actions ──────────────────────────────────────────
-	items.push({
-		value: "__model_select",
-		label: "Model: Switch Model",
-		description: "Select a model from the registry",
-		category: "Built-in",
-		action: { type: "model-select" },
-	});
-
-	items.push({
-		value: "__new_session",
-		label: "Session: New",
-		description: "Start a new session",
-		category: "Built-in",
-		action: { type: "editor", text: "/new" },
-	});
-
-	items.push({
-		value: "__compact",
-		label: "Session: Compact",
-		description: "Compact conversation to free context",
-		category: "Built-in",
-		action: { type: "compact" },
-	});
-
-	items.push({
-		value: "__reload",
-		label: "Session: Reload",
-		description: "Reload extensions, skills, and config",
-		category: "Built-in",
-		action: { type: "reload" },
-	});
-
-	items.push({
-		value: "__fork",
-		label: "Session: Fork",
-		description: "Fork from selected entry",
-		category: "Built-in",
-		action: { type: "editor", text: "/fork" },
-	});
-
-	items.push({
-		value: "__tree",
-		label: "Session: Tree",
-		description: "Navigate session tree",
-		category: "Built-in",
-		action: { type: "editor", text: "/tree" },
-	});
-
-	items.push({
-		value: "__resume",
-		label: "Session: Resume",
-		description: "Resume a previous session",
-		category: "Built-in",
-		action: { type: "editor", text: "/resume" },
-	});
-
-	// ── Extension commands, skills, templates ────────────────────
-	const commands = pi.getCommands();
-	for (const cmd of commands) {
-		const editorText = `/${cmd.name}`;
-		const sourceLabel =
-			cmd.source === "extension"
-				? "Command"
-				: cmd.source === "skill"
-					? "Skill"
-					: "Template";
-
-		items.push({
-			value: `cmd:${cmd.name}`,
-			label: `${sourceLabel}: /${cmd.name}`,
-			description: cmd.description ?? "",
-			category: sourceLabel,
-			action: { type: "editor", text: editorText },
-		});
-	}
-
-	// Sort: built-in first, then alphabetically within category
-	items.sort((a, b) => {
-		if (a.category === "Built-in" && b.category !== "Built-in") return -1;
-		if (a.category !== "Built-in" && b.category === "Built-in") return 1;
-		return a.label.localeCompare(b.label);
-	});
-
-	return items;
+  const items: PaletteItem[] = [];
+
+  // ── Restore option (if previous editor text was saved) ────────
+  if (savedEditorText) {
+    const preview =
+      savedEditorText.length > 40 ? `${savedEditorText.slice(0, 37)}...` : savedEditorText;
+    items.push({
+      value: "__restore",
+      label: "Restore: Previous Editor Text",
+      description: preview.replace(/\n/g, "⏎"),
+      category: "Built-in",
+      action: { type: "restore" },
+    });
+  }
+
+  // ── Built-in actions ──────────────────────────────────────────
+  items.push({
+    value: "__model_select",
+    label: "Model: Switch Model",
+    description: "Select a model from the registry",
+    category: "Built-in",
+    action: { type: "model-select" },
+  });
+
+  items.push({
+    value: "__new_session",
+    label: "Session: New",
+    description: "Start a new session",
+    category: "Built-in",
+    action: { type: "editor", text: "/new" },
+  });
+
+  items.push({
+    value: "__compact",
+    label: "Session: Compact",
+    description: "Compact conversation to free context",
+    category: "Built-in",
+    action: { type: "compact" },
+  });
+
+  items.push({
+    value: "__reload",
+    label: "Session: Reload",
+    description: "Reload extensions, skills, and config",
+    category: "Built-in",
+    action: { type: "reload" },
+  });
+
+  items.push({
+    value: "__fork",
+    label: "Session: Fork",
+    description: "Fork from selected entry",
+    category: "Built-in",
+    action: { type: "editor", text: "/fork" },
+  });
+
+  items.push({
+    value: "__tree",
+    label: "Session: Tree",
+    description: "Navigate session tree",
+    category: "Built-in",
+    action: { type: "editor", text: "/tree" },
+  });
+
+  items.push({
+    value: "__resume",
+    label: "Session: Resume",
+    description: "Resume a previous session",
+    category: "Built-in",
+    action: { type: "editor", text: "/resume" },
+  });
+
+  // ── Extension commands, skills, templates ────────────────────
+  const commands = pi.getCommands();
+  for (const cmd of commands) {
+    const editorText = `/${cmd.name}`;
+    const sourceLabel =
+      cmd.source === "extension" ? "Command" : cmd.source === "skill" ? "Skill" : "Template";
+
+    items.push({
+      value: `cmd:${cmd.name}`,
+      label: `${sourceLabel}: /${cmd.name}`,
+      description: cmd.description ?? "",
+      category: sourceLabel,
+      action: { type: "editor", text: editorText },
+    });
+  }
+
+  // Sort: built-in first, then alphabetically within category
+  items.sort((a, b) => {
+    if (a.category === "Built-in" && b.category !== "Built-in") return -1;
+    if (a.category !== "Built-in" && b.category === "Built-in") return 1;
+    return a.label.localeCompare(b.label);
+  });
+
+  return items;
 }
 
 // ── Model selector ─────────────────────────────────────────────────
 
 async function showModelSelector(pi: ExtensionAPI, ctx: ExtensionContext): Promise<void> {
-	let models: Awaited<ReturnType<typeof ctx.modelRegistry.getAvailable>>;
-	try {
-		models = await ctx.modelRegistry.getAvailable();
-	} catch {
-		ctx.ui.notify("Cannot enumerate models. Use Ctrl+L instead.", "warning");
-		return;
-	}
-
-	if (models.length === 0) {
-		ctx.ui.notify("No models available.", "warning");
-		return;
-	}
-
-	const items: SelectItem[] = models.map((m) => ({
-		value: `${m.provider}/${m.id}`,
-		label: m.name,
-		description: m.provider,
-	}));
-
-	const result = await ctx.ui.custom<string | null>((tui, theme, _kb, done) => {
-		const container = new Container();
-		container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
-		container.addChild(new Text(theme.fg("accent", theme.bold("Switch Model")), 1, 0));
-
-		const selectList = new SelectList(items, Math.min(items.length, 12), {
-			selectedPrefix: (t: string) => theme.fg("accent", t),
-			selectedText: (t: string) => theme.fg("accent", t),
-			description: (t: string) => theme.fg("muted", t),
-			scrollInfo: (t: string) => theme.fg("dim", t),
-			noMatch: (t: string) => theme.fg("warning", t),
-		});
-
-		selectList.onSelect = (item) => done(item.value);
-		selectList.onCancel = () => done(null);
-
-		// Type-to-filter state
-		let query = "";
-		const queryText = new Text(theme.fg("accent", "> "), 1, 0);
-
-		function applyQuery() {
-			const filtered = query
-				? fuzzyFilter(items, query, (item: SelectItem) => `${item.label} ${item.description ?? ""}`)
-				: items;
-			(selectList as any).filteredItems = filtered;
-			selectList.setSelectedIndex(0);
-			queryText.setText(theme.fg("accent", `> ${query}▎`));
-			container.invalidate();
-			tui.requestRender();
-		}
-
-		container.addChild(queryText);
-		container.addChild(selectList);
-		container.addChild(
-			new Text(theme.fg("dim", "type to filter • ↑↓ navigate • enter select • esc cancel"), 1, 0),
-		);
-		container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
-
-		return {
-			render(w: number) {
-				return container.render(w);
-			},
-			invalidate() {
-				container.invalidate();
-			},
-			handleInput(data: string) {
-				// Backspace → trim query
-				if (matchesKey(data, Key.backspace)) {
-					if (query.length > 0) {
-						query = query.slice(0, -1);
-						applyQuery();
-					}
-					return;
-				}
-				// Printable character → append to query
-				if (data.length === 1 && data.charCodeAt(0) >= 32) {
-					query += data;
-					applyQuery();
-					return;
-				}
-				// Navigation / confirm / cancel → pass to SelectList
-				selectList.handleInput(data);
-				tui.requestRender();
-			},
-		};
-	}, { overlay: true });
-
-	if (!result) return;
-
-	const [provider, modelId] = result.split("/");
-	const model = ctx.modelRegistry.find(provider, modelId);
-	if (model) {
-		const success = await pi.setModel(model);
-		if (success) {
-			ctx.ui.notify(`Model: ${provider}/${modelId}`, "info");
-		} else {
-			ctx.ui.notify(`No API key for ${provider}/${modelId}`, "error");
-		}
-	}
+  let models: Awaited<ReturnType<typeof ctx.modelRegistry.getAvailable>>;
+  try {
+    models = await ctx.modelRegistry.getAvailable();
+  } catch {
+    ctx.ui.notify("Cannot enumerate models. Use Ctrl+L instead.", "warning");
+    return;
+  }
+
+  if (models.length === 0) {
+    ctx.ui.notify("No models available.", "warning");
+    return;
+  }
+
+  const items: SelectItem[] = models.map((m) => ({
+    value: `${m.provider}/${m.id}`,
+    label: m.name,
+    description: m.provider,
+  }));
+
+  const result = await ctx.ui.custom<string | null>(
+    (tui, theme, _kb, done) => {
+      const container = new Container();
+      container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+      container.addChild(new Text(theme.fg("accent", theme.bold("Switch Model")), 1, 0));
+
+      const selectList = new SelectList(items, Math.min(items.length, 12), {
+        selectedPrefix: (t: string) => theme.fg("accent", t),
+        selectedText: (t: string) => theme.fg("accent", t),
+        description: (t: string) => theme.fg("muted", t),
+        scrollInfo: (t: string) => theme.fg("dim", t),
+        noMatch: (t: string) => theme.fg("warning", t),
+      });
+
+      selectList.onSelect = (item) => done(item.value);
+      selectList.onCancel = () => done(null);
+
+      // Type-to-filter state
+      let query = "";
+      const queryText = new Text(theme.fg("accent", "> "), 1, 0);
+
+      function applyQuery() {
+        const filtered = query
+          ? fuzzyFilter(
+              items,
+              query,
+              (item: SelectItem) => `${item.label} ${item.description ?? ""}`,
+            )
+          : items;
+        (selectList as any).filteredItems = filtered;
+        selectList.setSelectedIndex(0);
+        queryText.setText(theme.fg("accent", `> ${query}▎`));
+        container.invalidate();
+        tui.requestRender();
+      }
+
+      container.addChild(queryText);
+      container.addChild(selectList);
+      container.addChild(
+        new Text(theme.fg("dim", "type to filter • ↑↓ navigate • enter select • esc cancel"), 1, 0),
+      );
+      container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+
+      return {
+        render(w: number) {
+          return container.render(w);
+        },
+        invalidate() {
+          container.invalidate();
+        },
+        handleInput(data: string) {
+          // Backspace → trim query
+          if (matchesKey(data, Key.backspace)) {
+            if (query.length > 0) {
+              query = query.slice(0, -1);
+              applyQuery();
+            }
+            return;
+          }
+          // Printable character → append to query
+          if (data.length === 1 && data.charCodeAt(0) >= 32) {
+            query += data;
+            applyQuery();
+            return;
+          }
+          // Navigation / confirm / cancel → pass to SelectList
+          selectList.handleInput(data);
+          tui.requestRender();
+        },
+      };
+    },
+    { overlay: true },
+  );
+
+  if (!result) return;
+
+  const [provider, modelId] = result.split("/");
+  const model = ctx.modelRegistry.find(provider, modelId);
+  if (model) {
+    const success = await pi.setModel(model);
+    if (success) {
+      ctx.ui.notify(`Model: ${provider}/${modelId}`, "info");
+    } else {
+      ctx.ui.notify(`No API key for ${provider}/${modelId}`, "error");
+    }
+  }
 }
 
 // ── Command palette overlay ────────────────────────────────────────
 
 async function showCommandPalette(pi: ExtensionAPI, ctx: ExtensionContext): Promise<void> {
-	if (!ctx.hasUI) return;
-
-	const paletteItems = buildPaletteItems(pi, ctx);
-	const selectItems: SelectItem[] = paletteItems.map((item) => ({
-		value: item.value,
-		label: item.label,
-		description: item.description,
-	}));
-
-	const result = await ctx.ui.custom<PaletteItem | null>(
-		(tui, theme, _kb, done) => {
-			const container = new Container();
-			container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
-			container.addChild(
-				new Text(theme.fg("accent", theme.bold("Command Palette")), 1, 0),
-			);
-
-			const selectList = new SelectList(selectItems, Math.min(selectItems.length, 15), {
-				selectedPrefix: (t: string) => theme.fg("accent", t),
-				selectedText: (t: string) => theme.fg("accent", t),
-				description: (t: string) => theme.fg("muted", t),
-				scrollInfo: (t: string) => theme.fg("dim", t),
-				noMatch: (t: string) => theme.fg("warning", t),
-			});
-
-			selectList.onSelect = (item) => {
-				const paletteItem = paletteItems.find((p) => p.value === item.value);
-				done(paletteItem ?? null);
-			};
-			selectList.onCancel = () => done(null);
-
-			// Type-to-filter state
-			let query = "";
-			const queryText = new Text(theme.fg("accent", "> "), 1, 0);
-
-			function applyQuery() {
-				const filtered = query
-					? fuzzyFilter(selectItems, query, (item: SelectItem) => `${item.label} ${item.description ?? ""}`)
-					: selectItems;
-				(selectList as any).filteredItems = filtered;
-				selectList.setSelectedIndex(0);
-				queryText.setText(theme.fg("accent", `> ${query}▎`));
-				container.invalidate();
-				tui.requestRender();
-			}
-
-			container.addChild(queryText);
-			container.addChild(selectList);
-			container.addChild(
-				new Text(theme.fg("dim", "type to filter • ↑↓ navigate • enter select • esc cancel"), 1, 0),
-			);
-			container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
-
-			return {
-				render(w: number) {
-					return container.render(w);
-				},
-				invalidate() {
-					container.invalidate();
-				},
-				handleInput(data: string) {
-					// Backspace → trim query
-					if (matchesKey(data, Key.backspace)) {
-						if (query.length > 0) {
-							query = query.slice(0, -1);
-							applyQuery();
-						}
-						return;
-					}
-					// Printable character → append to query
-					if (data.length === 1 && data.charCodeAt(0) >= 32) {
-						query += data;
-						applyQuery();
-						return;
-					}
-					// Navigation / confirm / cancel → pass to SelectList
-					selectList.handleInput(data);
-					tui.requestRender();
-				},
-			};
-		},
-		{ overlay: true },
-	);
-
-	if (!result) return;
-
-	// Execute the selected action
-	const action = result.action;
-	switch (action.type) {
-		case "restore": {
-			if (savedEditorText !== null) {
-				ctx.ui.setEditorText(savedEditorText);
-				savedEditorText = null;
-			}
-			break;
-		}
-		case "editor": {
-			// Save current editor text before overwriting, so user can restore
-			const currentText = ctx.ui.getEditorText();
-			if (currentText && currentText.trim()) {
-				savedEditorText = currentText;
-			}
-			ctx.ui.setEditorText(action.text);
-			break;
-		}
-		case "model-select": {
-			await showModelSelector(pi, ctx);
-			break;
-		}
-		case "compact": {
-			ctx.compact({
-				onComplete: () => ctx.ui.notify("Compaction completed", "info"),
-				onError: (err) => ctx.ui.notify(`Compaction failed: ${err.message}`, "error"),
-			});
-			break;
-		}
-		case "reload": {
-			const currentText = ctx.ui.getEditorText();
-			if (currentText && currentText.trim()) {
-				savedEditorText = currentText;
-			}
-			ctx.ui.setEditorText("/reload");
-			break;
-		}
-	}
+  if (!ctx.hasUI) return;
+
+  const paletteItems = buildPaletteItems(pi, ctx);
+  const selectItems: SelectItem[] = paletteItems.map((item) => ({
+    value: item.value,
+    label: item.label,
+    description: item.description,
+  }));
+
+  const result = await ctx.ui.custom<PaletteItem | null>(
+    (tui, theme, _kb, done) => {
+      const container = new Container();
+      container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+      container.addChild(new Text(theme.fg("accent", theme.bold("Command Palette")), 1, 0));
+
+      const selectList = new SelectList(selectItems, Math.min(selectItems.length, 15), {
+        selectedPrefix: (t: string) => theme.fg("accent", t),
+        selectedText: (t: string) => theme.fg("accent", t),
+        description: (t: string) => theme.fg("muted", t),
+        scrollInfo: (t: string) => theme.fg("dim", t),
+        noMatch: (t: string) => theme.fg("warning", t),
+      });
+
+      selectList.onSelect = (item) => {
+        const paletteItem = paletteItems.find((p) => p.value === item.value);
+        done(paletteItem ?? null);
+      };
+      selectList.onCancel = () => done(null);
+
+      // Type-to-filter state
+      let query = "";
+      const queryText = new Text(theme.fg("accent", "> "), 1, 0);
+
+      function applyQuery() {
+        const filtered = query
+          ? fuzzyFilter(
+              selectItems,
+              query,
+              (item: SelectItem) => `${item.label} ${item.description ?? ""}`,
+            )
+          : selectItems;
+        (selectList as any).filteredItems = filtered;
+        selectList.setSelectedIndex(0);
+        queryText.setText(theme.fg("accent", `> ${query}▎`));
+        container.invalidate();
+        tui.requestRender();
+      }
+
+      container.addChild(queryText);
+      container.addChild(selectList);
+      container.addChild(
+        new Text(theme.fg("dim", "type to filter • ↑↓ navigate • enter select • esc cancel"), 1, 0),
+      );
+      container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+
+      return {
+        render(w: number) {
+          return container.render(w);
+        },
+        invalidate() {
+          container.invalidate();
+        },
+        handleInput(data: string) {
+          // Backspace → trim query
+          if (matchesKey(data, Key.backspace)) {
+            if (query.length > 0) {
+              query = query.slice(0, -1);
+              applyQuery();
+            }
+            return;
+          }
+          // Printable character → append to query
+          if (data.length === 1 && data.charCodeAt(0) >= 32) {
+            query += data;
+            applyQuery();
+            return;
+          }
+          // Navigation / confirm / cancel → pass to SelectList
+          selectList.handleInput(data);
+          tui.requestRender();
+        },
+      };
+    },
+    { overlay: true },
+  );
+
+  if (!result) return;
+
+  // Execute the selected action
+  const action = result.action;
+  switch (action.type) {
+    case "restore": {
+      if (savedEditorText !== null) {
+        ctx.ui.setEditorText(savedEditorText);
+        savedEditorText = null;
+      }
+      break;
+    }
+    case "editor": {
+      // Save current editor text before overwriting, so user can restore
+      const currentText = ctx.ui.getEditorText();
+      if (currentText && currentText.trim()) {
+        savedEditorText = currentText;
+      }
+      ctx.ui.setEditorText(action.text);
+      break;
+    }
+    case "model-select": {
+      await showModelSelector(pi, ctx);
+      break;
+    }
+    case "compact": {
+      ctx.compact({
+        onComplete: () => ctx.ui.notify("Compaction completed", "info"),
+        onError: (err) => ctx.ui.notify(`Compaction failed: ${err.message}`, "error"),
+      });
+      break;
+    }
+    case "reload": {
+      const currentText = ctx.ui.getEditorText();
+      if (currentText && currentText.trim()) {
+        savedEditorText = currentText;
+      }
+      ctx.ui.setEditorText("/reload");
+      break;
+    }
+  }
 }
 
 // ── Extension entry point ──────────────────────────────────────────
 
 export default function commandPaletteExtension(pi: ExtensionAPI) {
-	pi.registerShortcut("ctrl+shift+p", {
-		description: "Open command palette",
-		handler: async (ctx) => {
-			await showCommandPalette(pi, ctx);
-		},
-	});
+  pi.registerShortcut(resolveShortcutKey(), {
+    description: "Open command palette",
+    handler: async (ctx) => {
+      await showCommandPalette(pi, ctx);
+    },
+  });
 }