@d3ara1n/pi-command-palette 0.3.0 → 0.4.1

package/README.md

@@ -1,6 +1,6 @@
 # pi-command-palette
 
-Global command palette for [Pi Coding Agent](https://pi.dev) — press **Ctrl+Shift+P** to search and run commands from anywhere.
+Global command palette for [Pi Coding Agent](https://pi.dev) — press **Ctrl+Alt+P** to search and run commands from anywhere.
 
 ## Why?
 
@@ -18,7 +18,7 @@ pi install npm:@d3ara1n/pi-command-palette
 
 Or add to `~/.pi/agent/settings.json`:
 
-```jsonc
+```json
 {
   "extensions": [
     "/absolute/path/to/pi-extensions/packages/pi-command-palette"
@@ -30,7 +30,7 @@ Or add to `~/.pi/agent/settings.json`:
 
 | Shortcut | Action |
 |----------|--------|
-| `Ctrl+Shift+P` _(default, configurable)_ | Open command palette |
+| `Ctrl+Alt+P` _(default, configurable)_ | Open command palette |
 
 The palette lists:
 
@@ -46,30 +46,32 @@ When a command replaces your current editor text, the original content is saved
 
 The "Model: Switch Model" action opens a secondary overlay listing all models with configured API keys. Select one to switch instantly — no need to go through `/model` or `Ctrl+P`.
 
+**Scoped models float to the top**, marked with a ★ (favorite) prefix. "Scoped" here means the same set pi uses for its built-in selector's scoped tab and `Ctrl+P` cycling — the `enabledModels` patterns in your `settings.json` (project `.pi/settings.json` overrides global `~/.pi/agent/settings.json`). Everything else follows alphabetically. If no scope is configured, the list is a plain alphabetical roster — nothing breaks.
+
 ## Configuration
 
-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).
+The default shortcut is `Ctrl+Alt+P`. This avoids pi's built-in `Ctrl+P` / `Ctrl+Shift+P` model cycling shortcuts while keeping the palette mnemonic. 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
+export PI_COMMAND_PALETTE_KEY=ctrl+shift+p
 ```
 
 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):
+Set `commandPalette.shortcut` in `~/.pi/agent/settings.json` (global) or `.pi/settings.json` in your project. A present project `commandPalette` block replaces the global block:
 
-```jsonc
+```json
 {
   "commandPalette": {
-    "shortcut": "ctrl+alt+k"
+    "shortcut": "ctrl+shift+p"
   }
 }
 ```
 
-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.
+Any valid pi keybinding string works (e.g. `ctrl+shift+p`, `ctrl+shift+k`, `ctrl+alt+k`, `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.3.0",
+  "version": "0.4.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

@@ -4,9 +4,9 @@
  * 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"`
+ *   2. `settings.json` `commandPalette.shortcut` (a present project
+ *      `commandPalette` block replaces the global block)
+ *   3. default `"ctrl+alt+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()`
@@ -19,7 +19,7 @@ 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";
+export const DEFAULT_SHORTCUT = "ctrl+alt+p";
 
 function getAgentDir(): string {
   const envDir = process.env.PI_AGENT_DIR;
@@ -54,12 +54,13 @@ export function resolveShortcutKey(cwd: string = process.cwd()): KeyId {
   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.
+  // 2. settings.json — a present project block replaces the global block.
   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);
+  const globalRaw = globalSettings.commandPalette;
+  const projectRaw = projectSettings.commandPalette;
+  const config = (projectRaw ?? globalRaw ?? {}) as { shortcut?: unknown };
+  const settingsKey = normalizeKey(config.shortcut);
   if (settingsKey) return settingsKey as KeyId;
 
   // 3. default

package/src/index.test.ts

@@ -0,0 +1,25 @@
+/**
+ * Regression tests for model reference parsing.
+ * Run: node --test packages/pi-command-palette/src/index.test.ts
+ */
+
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { parseModelRef } from "./index.ts";
+
+test("parseModelRef splits provider and model at the first slash", () => {
+  assert.deepEqual(parseModelRef("anthropic/claude-sonnet"), {
+    provider: "anthropic",
+    modelId: "claude-sonnet",
+  });
+  assert.deepEqual(parseModelRef("openrouter/vendor/model/with/slashes"), {
+    provider: "openrouter",
+    modelId: "vendor/model/with/slashes",
+  });
+});
+
+test("parseModelRef preserves empty provider or model segments", () => {
+  assert.equal(parseModelRef("model-without-provider"), undefined);
+  assert.deepEqual(parseModelRef("/model"), { provider: "", modelId: "model" });
+  assert.deepEqual(parseModelRef("provider/"), { provider: "provider", modelId: "" });
+});

package/src/index.ts

@@ -1,7 +1,7 @@
 /**
  * pi-command-palette — Global command palette for pi.
  *
- * Press Ctrl+Shift+P to open a searchable command palette overlay,
+ * Press Ctrl+Alt+P to open a searchable command palette overlay,
  * regardless of whether the editor has content.
  *
  * Features:
@@ -13,7 +13,12 @@
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { DynamicBorder } from "@earendil-works/pi-coding-agent";
+import {
+  DynamicBorder,
+  getAgentDir,
+  resolveModelScopeWithDiagnostics,
+  SettingsManager,
+} from "@earendil-works/pi-coding-agent";
 import {
   Container,
   type SelectItem,
@@ -150,6 +155,48 @@ function buildPaletteItems(pi: ExtensionAPI, ctx: ExtensionContext): PaletteItem
 
 // ── Model selector ─────────────────────────────────────────────────
 
+const STAR = "★ ";
+
+/**
+ * @internal — exported for testing; parses the selector's `provider/model-id` values.
+ */
+export function parseModelRef(modelRef: string): { provider: string; modelId: string } | undefined {
+  const slash = modelRef.indexOf("/");
+  if (slash === -1) return undefined;
+  return {
+    provider: modelRef.slice(0, slash),
+    modelId: modelRef.slice(slash + 1),
+  };
+}
+
+/**
+ * Resolve the set of "scoped" model full-ids (`provider/id`) — the same models
+ * pi surfaces in its built-in selector's "scoped" tab and Ctrl+P cycling.
+ *
+ * Fully official-API driven, no manual settings parsing:
+ * - `SettingsManager.getEnabledModels()` reads the `enabledModels` scope
+ *   patterns (global + project merge handled by pi).
+ * - `resolveModelScopeWithDiagnostics()` expands those patterns (globs, aliases,
+ *   thinking-level suffixes) into concrete models — identical to pi's scope tab.
+ *
+ * Any failure degrades to an empty set: the selector still works, just without
+ * the scoped grouping.
+ */
+async function resolveScopedModelIds(
+  modelRegistry: ExtensionContext["modelRegistry"],
+  cwd: string,
+): Promise<Set<string>> {
+  try {
+    const settings = SettingsManager.create(cwd, getAgentDir());
+    const patterns = settings.getEnabledModels();
+    if (!patterns || patterns.length === 0) return new Set();
+    const { scopedModels } = await resolveModelScopeWithDiagnostics(patterns, modelRegistry);
+    return new Set(scopedModels.map((s) => `${s.model.provider}/${s.model.id}`));
+  } catch {
+    return new Set();
+  }
+}
+
 async function showModelSelector(pi: ExtensionAPI, ctx: ExtensionContext): Promise<void> {
   let models: Awaited<ReturnType<typeof ctx.modelRegistry.getAvailable>>;
   try {
@@ -164,10 +211,24 @@ async function showModelSelector(pi: ExtensionAPI, ctx: ExtensionContext): Promi
     return;
   }
 
-  const items: SelectItem[] = models.map((m) => ({
-    value: `${m.provider}/${m.id}`,
-    label: m.name,
-    description: m.provider,
+  const scopedIds = await resolveScopedModelIds(ctx.modelRegistry, ctx.cwd);
+
+  // Scoped models float to the top with a ★ prefix (favorites); the rest follow
+  // alphabetically. Within the scoped group we also sort alphabetically so the
+  // ordering is stable and predictable regardless of registry order.
+  const decorated = models.map((m) => {
+    const value = `${m.provider}/${m.id}`;
+    return { model: m, value, scoped: scopedIds.has(value) };
+  });
+  decorated.sort((a, b) => {
+    if (a.scoped !== b.scoped) return a.scoped ? -1 : 1;
+    return a.model.name.localeCompare(b.model.name);
+  });
+
+  const items: SelectItem[] = decorated.map((d) => ({
+    value: d.value,
+    label: d.scoped ? `${STAR}${d.model.name}` : d.model.name,
+    description: d.model.provider,
   }));
 
   const result = await ctx.ui.custom<string | null>(
@@ -249,7 +310,9 @@ async function showModelSelector(pi: ExtensionAPI, ctx: ExtensionContext): Promi
 
   if (!result) return;
 
-  const [provider, modelId] = result.split("/");
+  const parsed = parseModelRef(result);
+  if (!parsed) return;
+  const { provider, modelId } = parsed;
   const model = ctx.modelRegistry.find(provider, modelId);
   if (model) {
     const success = await pi.setModel(model);