@d3ara1n/pi-command-palette 0.3.0 → 0.4.0

package/README.md

@@ -46,6 +46,8 @@ 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).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-command-palette",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "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/index.ts

@@ -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,36 @@ function buildPaletteItems(pi: ExtensionAPI, ctx: ExtensionContext): PaletteItem
 
 // ── Model selector ─────────────────────────────────────────────────
 
+const STAR = "★ ";
+
+/**
+ * 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 +199,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>(