@mrclrchtr/supi-code-intelligence 1.16.0 → 2.0.0

package/node_modules/@mrclrchtr/supi-code-runtime/src/types.ts

@@ -28,13 +28,29 @@ export interface CodeLocation {
 
 // ── Symbol types ───────────────────────────────────────────────────────
 
-/** A discovered symbol / declaration. */
+/** A 1-based source position used as a symbol anchor. */
+export interface SymbolAnchor {
+  line: number;
+  character: number;
+}
+
+/**
+ * A discovered symbol / declaration.
+ *
+ * Per ADR 0003, anchors are split so position-strict substrates
+ * (structural callee lookup, LSP `rename`) cannot silently consume a
+ * declaration anchor (the `export` keyword) as if it were the identifier.
+ * - `declarationAnchor` is always present (the defining node start).
+ * - `nameAnchor` is best-effort (the identifier token), present when the
+ *   provider can derive it (LSP `selectionRange`, or a tree-sitter snap).
+ *   Strict consumers must prefer it and hard-fail when it is absent.
+ */
 export interface CodeSymbol {
   name: string;
   kind: string;
   file: string;
-  line: number;
-  character: number;
+  declarationAnchor: SymbolAnchor;
+  nameAnchor?: SymbolAnchor;
   container?: string | null;
 }
 
@@ -125,6 +141,44 @@ export interface WorkspaceEdit {
   edits: FileEdit[];
 }
 
+/**
+ * Supported refactor operation names for the current semantic planning path.
+ *
+ * `rename` is kept as a legacy alias for the public rename-only surface.
+ */
+export type RefactorOperation =
+  | "rename"
+  | "rename_symbol"
+  | "extract_function"
+  | "extract_variable"
+  | "rename_file"
+  | "move_file"
+  | "update_imports"
+  | "delete_dead_code";
+
+/** Normalize legacy refactor aliases to their canonical operation names. */
+export function normalizeRefactorOperation(
+  operation: RefactorOperation,
+): Exclude<RefactorOperation, "rename"> {
+  return operation === "rename" ? "rename_symbol" : operation;
+}
+
+/**
+ * Operation-aware refactor planning request.
+ *
+ * Consumers provide a target file/position plus operation-specific options.
+ * File/resource operations remain requestable so providers can reject them
+ * explicitly and honestly until shared workspace-edit resource ops exist.
+ */
+export interface RefactorRequest {
+  operation: RefactorOperation;
+  file: string;
+  position: CodePosition;
+  range?: SourceRange;
+  newName?: string;
+  destination?: string;
+}
+
 /**
  * A disambiguation candidate when a refactor target is ambiguous.
  */
@@ -149,7 +203,26 @@ export type RefactorResult =
 
 // ── Structural data shapes (value types, range-flattened) ──────────────
 
+/** Callee collection depth. */
+export type CalleeDepth = "direct" | "deep";
+
+/**
+ * Structural outgoing calls from the enclosing executable scope at a
+ * position. Callee names are source-shape facts, not resolved symbol
+ * identities.
+ *
+ * In `direct` depth, nested function/callback scopes are excluded from the
+ * outer scope. In `deep` depth, all callees within the enclosing scope are
+ * included, including those inside nested scopes.
+ */
 export interface CalleesData {
   enclosingScope: { name: string; startLine: number; endLine: number };
   callees: Array<{ name: string; startLine: number }>;
+  depth: CalleeDepth;
+}
+
+/** A single call-site match with name and start line. */
+export interface CallSite {
+  name: string;
+  startLine: number;
 }

package/node_modules/@mrclrchtr/supi-code-runtime/src/workspace/runtime.ts

@@ -48,7 +48,12 @@ function createDefaultCapabilities(): WorkspaceCapabilities {
 }
 
 function hasRefactorCapability(provider: SemanticProvider | null): boolean {
-  return !!(provider && (provider.rename !== undefined || provider.codeActions !== undefined));
+  return !!(
+    provider &&
+    (provider.refactor !== undefined ||
+      provider.rename !== undefined ||
+      provider.codeActions !== undefined)
+  );
 }
 
 // ── Runtime ────────────────────────────────────────────────────────────
@@ -78,7 +83,27 @@ export class WorkspaceRuntime {
   }
 
   /**
-   * Register a semantic provider for a workspace.
+   * Register a semantic provider for a workspace in pending state.
+   *
+   * Use this when the provider object exists and can accept calls, but the
+   * underlying semantic substrate is still warming (for example, an LSP server
+   * that has started but has not finished initial indexing yet).
+   */
+  registerSemanticPending(cwd: string, provider: SemanticProvider): void {
+    const refactorAvailable = hasRefactorCapability(provider);
+    const existing = this.#workspaces.get(cwd);
+    if (existing) {
+      existing.semantic = { state: { kind: "pending" }, provider, refactorAvailable };
+    } else {
+      this.#workspaces.set(cwd, {
+        semantic: { state: { kind: "pending" }, provider, refactorAvailable },
+        structural: createDefaultCapabilities().structural,
+      });
+    }
+  }
+
+  /**
+   * Register a semantic provider for a workspace as ready.
    * Replaces any existing semantic provider for the same cwd
    * without affecting the structural provider.
    */
@@ -95,6 +120,16 @@ export class WorkspaceRuntime {
     }
   }
 
+  /**
+   * Promote an already-registered semantic provider from pending to ready.
+   * If no semantic provider is registered for the workspace, this is a no-op.
+   */
+  markSemanticReady(cwd: string): void {
+    const ws = this.#workspaces.get(cwd);
+    if (!ws || ws.semantic.provider === null) return;
+    ws.semantic.state = { kind: "ready" };
+  }
+
   /**
    * Register a structural provider for a workspace.
    * Replaces any existing structural provider for the same cwd

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.16.0",
+  "version": "2.0.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -23,6 +23,7 @@
     "settings",
     "configuration"
   ],
+  "type": "module",
   "files": [
     "src/**/*.ts",
     "!__tests__"
@@ -49,12 +50,14 @@
   },
   "main": "src/api.ts",
   "exports": {
+    "./abort-utils": "./src/abort-utils.ts",
     "./api": "./src/api.ts",
     "./config": "./src/config.ts",
     "./context": "./src/context.ts",
     "./debug": "./src/debug-registry.ts",
     "./footer-registry": "./src/footer-registry.ts",
     "./llm": "./src/llm.ts",
+    "./model-selection": "./src/model-selection.ts",
     "./package.json": "./package.json",
     "./path": "./src/path.ts",
     "./report": "./src/report.ts",
@@ -63,6 +66,8 @@
     "./session": "./src/session.ts",
     "./settings": "./src/settings.ts",
     "./settings-ui": "./src/settings-ui.ts",
+    "./spinner-frames": "./src/spinner-frames.ts",
+    "./status-spinner": "./src/status-spinner.ts",
     "./terminal": "./src/terminal.ts",
     "./tool-framework": "./src/tool-framework.ts",
     "./types": "./src/types.ts"

package/node_modules/@mrclrchtr/supi-core/src/abort-utils.ts

@@ -0,0 +1,31 @@
+/**
+ * Abort controller/signal utility helpers.
+ *
+ * @module
+ */
+
+/**
+ * Combine a caller-provided abort controller with a generation timeout signal.
+ *
+ * Returns the combined signal and a cleanup function that removes both
+ * event listeners. Callers must invoke cleanup in a `finally` block
+ * to avoid listener leaks.
+ */
+export function combineAbortSignals(
+  abort: AbortController,
+  timeoutMs: number,
+): { signal: AbortSignal; cleanup: () => void } {
+  const timeoutSignal = AbortSignal.timeout(timeoutMs);
+  const combinedController = new AbortController();
+  const onAbort = () => combinedController.abort();
+  abort.signal.addEventListener("abort", onAbort, { once: true });
+  timeoutSignal.addEventListener("abort", onAbort, { once: true });
+
+  return {
+    signal: combinedController.signal,
+    cleanup: () => {
+      abort.signal.removeEventListener("abort", onAbort);
+      timeoutSignal.removeEventListener("abort", onAbort);
+    },
+  };
+}

package/node_modules/@mrclrchtr/supi-core/src/api.ts

@@ -6,6 +6,8 @@
 // For lighter imports, use one of the domain subpaths directly
 // (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
 
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./abort-utils.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./config.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
@@ -17,6 +19,8 @@ export * from "./footer-registry.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./llm.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./model-selection.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./path.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./project.ts";
@@ -29,6 +33,10 @@ export * from "./settings.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./settings-ui.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./spinner-frames.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./status-spinner.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./terminal.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./tool-framework.ts";

package/node_modules/@mrclrchtr/supi-core/src/config/config-settings.ts

@@ -5,6 +5,7 @@
 // to enable auto-generated persistChange. When all items have a configType,
 // the persistChange callback can be omitted.
 
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SettingItem } from "@earendil-works/pi-tui";
 import type { SettingsScope } from "../settings/settings-registry.ts";
 import { registerSettings } from "../settings/settings-registry.ts";
@@ -60,7 +61,12 @@ export interface ConfigSettingsOptions<T> {
    * persistChange handling. When ALL items declare a configType,
    * the `persistChange` callback can be omitted.
    */
-  buildItems: (settings: T, scope: SettingsScope, cwd: string) => ConfigSettingItem[];
+  buildItems: (
+    settings: T,
+    scope: SettingsScope,
+    cwd: string,
+    ctx?: ExtensionContext,
+  ) => ConfigSettingItem[];
   /**
    * Handle a settings change with scoped persistence helpers.
    *
@@ -141,12 +147,12 @@ export function registerConfigSettings<T>(options: ConfigSettingsOptions<T>): vo
   registerSettings({
     id: options.id,
     label: options.label,
-    loadValues: (scope, cwd) => {
+    loadValues: (scope, cwd, ctx) => {
       const settings = loadSupiConfigForScope(options.section, cwd, options.defaults, {
         scope,
         homeDir: options.homeDir,
       });
-      const items = options.buildItems(settings, scope, cwd);
+      const items = options.buildItems(settings, scope, cwd, ctx);
       cachedItems = items;
       return items;
     },
@@ -173,7 +179,7 @@ export function registerConfigSettings<T>(options: ConfigSettingsOptions<T>): vo
       }
 
       // Auto-generate when all items are declarative
-      const items = cachedItems ?? options.buildItems(options.defaults, scope, cwd);
+      const items = cachedItems ?? options.buildItems(options.defaults, scope, cwd, undefined);
       if (areAllItemsDeclarative(items)) {
         autoPersistChange(settingId, value, helpers, items);
       }

package/node_modules/@mrclrchtr/supi-core/src/config.ts

@@ -1,6 +1,7 @@
 // supi-core config domain — config loading and config-settings helpers.
 export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
 export {
+  loadSectionConfig,
   loadSupiConfig,
   loadSupiConfigForScope,
   readJsonFile,

package/node_modules/@mrclrchtr/supi-core/src/footer-registry.ts

@@ -8,7 +8,7 @@
 import { createRegistry } from "./registry-utils.ts";
 
 /** Where the contribution should appear in the footer. */
-export type FooterPlacement = "stats" | "status";
+export type FooterPlacement = "stats" | "stats-end" | "status";
 
 /** A single footer contribution registered by an extension. */
 export interface FooterContribution {

package/node_modules/@mrclrchtr/supi-core/src/index.ts

@@ -6,6 +6,8 @@
 // For lighter imports, use one of the domain subpaths directly
 // (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
 
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./abort-utils.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./config.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
@@ -15,6 +17,8 @@ export * from "./debug-registry.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./footer-registry.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./model-selection.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./path.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./project.ts";
@@ -27,6 +31,8 @@ export * from "./settings.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./settings-ui.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./status-spinner.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./terminal.ts";
 // biome-ignore lint/performance/noReExportAll: intentional convenience barrel
 export * from "./tool-framework.ts";

package/node_modules/@mrclrchtr/supi-core/src/model-selection.ts

@@ -0,0 +1,134 @@
+/**
+ * Shared model-selection helpers for SuPi extensions.
+ *
+ * Provides scoped-model listing using PI's `enabledModels` configuration,
+ * matching the same semantics as the `@mrclrchtr/supi-review` model picker.
+ *
+ * @module
+ */
+
+import type { Model } from "@earendil-works/pi-ai";
+import { type ExtensionContext, SettingsManager } from "@earendil-works/pi-coding-agent";
+
+// ── Types ──────────────────────────────────────────────────────────────────
+
+/** A selectable model entry with display metadata. */
+export interface ModelSelection {
+  /** Canonical `provider/model-id` string. */
+  canonicalId: string;
+  /** Provider name, e.g. `"anthropic"`. */
+  provider: string;
+  /** Model id, e.g. `"claude-sonnet-4-5"`. */
+  id: string;
+  // biome-ignore lint/suspicious/noExplicitAny: Model<any> is pi's canonical type
+  model: Model<any>;
+  /** Human-readable label (model name or canonicalId). */
+  label: string;
+  /** Optional description (canonicalId when different from label). */
+  description?: string;
+  /** Whether this model is the current session model. */
+  isCurrent: boolean;
+}
+
+// ── Helpers ────────────────────────────────────────────────────────────────
+
+/** Build the canonical `provider/model-id` string. */
+export function toCanonicalModelId(
+  model: Pick<NonNullable<ExtensionContext["model"]>, "provider" | "id">,
+): string {
+  return `${model.provider}/${model.id}`;
+}
+
+/**
+ * List selectable models from PI's scoped model configuration.
+ *
+ * Only models that match the configured `enabledModels` patterns are offered.
+ * The current session model is included only when it is inside that scoped set.
+ * Returns an empty array when no scoped model patterns are configured.
+ */
+export function getSelectableModels(
+  ctx: Pick<ExtensionContext, "cwd" | "modelRegistry" | "model">,
+  enabledModelPatterns = SettingsManager.create(ctx.cwd).getEnabledModels(),
+): ModelSelection[] {
+  if (!enabledModelPatterns || enabledModelPatterns.length === 0) {
+    return [];
+  }
+
+  const byCanonicalId = new Map<string, ModelSelection>();
+  const availableModels = filterByEnabledModels(
+    enabledModelPatterns,
+    ctx.modelRegistry.getAvailable(),
+  );
+
+  const addModel = (
+    // biome-ignore lint/suspicious/noExplicitAny: Model<any> is pi's canonical type
+    model: Model<any>,
+    isCurrent: boolean,
+  ) => {
+    const canonicalId = toCanonicalModelId(model);
+    const existing = byCanonicalId.get(canonicalId);
+    if (existing) {
+      if (isCurrent) existing.isCurrent = true;
+      return;
+    }
+
+    byCanonicalId.set(canonicalId, {
+      canonicalId,
+      provider: model.provider,
+      id: model.id,
+      model,
+      label: model.name ?? canonicalId,
+      description: canonicalId,
+      isCurrent,
+    });
+  };
+
+  if (ctx.model && matchModelPatterns(ctx.model, enabledModelPatterns)) {
+    addModel(ctx.model, true);
+  }
+
+  for (const model of availableModels) {
+    addModel(
+      model,
+      ctx.model ? toCanonicalModelId(model) === toCanonicalModelId(ctx.model) : false,
+    );
+  }
+
+  return Array.from(byCanonicalId.values()).sort((a, b) => {
+    if (a.isCurrent !== b.isCurrent) return a.isCurrent ? -1 : 1;
+    return a.canonicalId.localeCompare(b.canonicalId);
+  });
+}
+
+// ── Private helpers ────────────────────────────────────────────────────────
+
+function filterByEnabledModels<T extends { provider: string; id: string }>(
+  patterns: string[],
+  models: T[],
+): T[] {
+  return models.filter((model) => matchModelPatterns(model, patterns));
+}
+
+function matchModelPatterns(model: { provider: string; id: string }, patterns: string[]): boolean {
+  return patterns.some((pattern) => matchModelPattern(model, pattern));
+}
+
+function matchModelPattern(model: { provider: string; id: string }, pattern: string): boolean {
+  const canonicalId = `${model.provider}/${model.id}`;
+  if (pattern.includes("/")) {
+    return simpleGlobMatch(canonicalId, pattern);
+  }
+  return simpleGlobMatch(model.id, pattern) || simpleGlobMatch(canonicalId, pattern);
+}
+
+function simpleGlobMatch(text: string, pattern: string): boolean {
+  if (!pattern.includes("*") && !pattern.includes("?")) {
+    return text.toLowerCase() === pattern.toLowerCase();
+  }
+
+  const regex = pattern
+    .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+    .replace(/\*/g, ".*")
+    .replace(/\?/g, ".");
+  return new RegExp(`^${regex}$`, "i").test(text);
+}

package/node_modules/@mrclrchtr/supi-core/src/settings/settings-registry.ts

@@ -3,6 +3,7 @@
 // Extensions declare their settings via `registerSettings()` during their
 // factory function. The generic settings UI reads them via `getRegisteredSettings()`.
 
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { SettingItem } from "@earendil-works/pi-tui";
 import { createRegistry } from "../registry-utils.ts";
 
@@ -14,9 +15,15 @@ export interface SettingsSection {
   /** Human-readable label shown in the UI */
   label: string;
   /** Load current SettingItem[] for the given scope */
-  loadValues: (scope: SettingsScope, cwd: string) => SettingItem[];
+  loadValues: (scope: SettingsScope, cwd: string, ctx?: ExtensionContext) => SettingItem[];
   /** Persist a change back to config */
-  persistChange: (scope: SettingsScope, cwd: string, settingId: string, value: string) => void;
+  persistChange: (
+    scope: SettingsScope,
+    cwd: string,
+    settingId: string,
+    value: string,
+    ctx?: ExtensionContext,
+  ) => void;
 }
 
 const registry = createRegistry<SettingsSection>("settings-registry");

package/node_modules/@mrclrchtr/supi-core/src/settings/settings-ui.ts

@@ -10,10 +10,14 @@ import {
   Input,
   Key,
   matchesKey,
+  type SelectItem,
+  SelectList,
+  type SelectListTheme,
   type SettingItem,
   SettingsList,
   Text,
 } from "@earendil-works/pi-tui";
+import { getSelectableModels } from "../model-selection.ts";
 import {
   getRegisteredSettings,
   type SettingsScope,
@@ -84,10 +88,11 @@ function buildFlatItems(
   sections: SettingsSection[],
   scope: SettingsScope,
   cwd: string,
+  ctx?: ExtensionContext,
 ): SettingItem[] {
   const items: SettingItem[] = [];
   for (const section of sections) {
-    const sectionItems = section.loadValues(scope, cwd);
+    const sectionItems = section.loadValues(scope, cwd, ctx);
     for (const item of sectionItems) {
       items.push({
         ...item,
@@ -115,6 +120,7 @@ function findSectionAndId(
 // ── Component ────────────────────────────────────────────────
 
 interface SettingsOverlayDeps {
+  ctx: ExtensionContext;
   state: OverlayState;
   container: Container;
   settingsList: SettingsList | null;
@@ -125,15 +131,21 @@ interface SettingsOverlayDeps {
 
 function createSettingsList(deps: SettingsOverlayDeps): SettingsList {
   const sections = getRegisteredSettings();
-  const items = buildFlatItems(sections, deps.state.scope, deps.state.cwd);
+  const items = buildFlatItems(sections, deps.state.scope, deps.state.cwd, deps.ctx);
   const onChange = (flatId: string, newValue: string) => {
     const found = findSectionAndId(sections, flatId);
     if (found) {
-      found.section.persistChange(deps.state.scope, deps.state.cwd, found.itemId, newValue);
+      found.section.persistChange(
+        deps.state.scope,
+        deps.state.cwd,
+        found.itemId,
+        newValue,
+        deps.ctx,
+      );
     }
     // Re-read all values to reflect persisted changes, but keep the list
     // instance (and its selectedIndex) intact.
-    const updatedItems = buildFlatItems(sections, deps.state.scope, deps.state.cwd);
+    const updatedItems = buildFlatItems(sections, deps.state.scope, deps.state.cwd, deps.ctx);
     for (const updated of updatedItems) {
       const existing = items.find((i) => i.id === updated.id);
       if (existing && existing.currentValue !== updated.currentValue) {
@@ -182,6 +194,98 @@ function handleScopeToggle(deps: SettingsOverlayDeps): void {
   deps.tui.requestRender();
 }
 
+/** Minimal SelectList theme — uses identity so the parent SettingsList provides styling context. */
+const PASSTHROUGH_THEME: SelectListTheme = {
+  selectedPrefix: (text) => `› ${text}`,
+  selectedText: (text) => text,
+  description: (text) => text,
+  scrollInfo: (text) => text,
+  noMatch: (text) => text,
+};
+
+/**
+ * Create a model picker submenu for settings.
+ *
+ * Shows a scrollable list of selectable models from the scoped model set,
+ * with the current session model annotated `[current]`.  The first entry is
+ * always `"disabled"`.
+ *
+ * @param currentValue - Currently configured canonical model id or `"disabled"`.
+ * @param done - Callback invoked with the selected value, or undefined on cancel.
+ * @param ctx - Extension context for model listing.  When undefined, only
+ *   `"disabled"` is offered.
+ */
+export function createModelPickerSubmenu(
+  currentValue: string,
+  done: (selectedValue?: string) => void,
+  ctx?: ExtensionContext,
+): {
+  render: (width: number) => string[];
+  invalidate: () => void;
+  handleInput: (data: string) => boolean;
+} {
+  const items = buildModelItems(ctx);
+
+  const initialIndex =
+    currentValue === "disabled"
+      ? 0
+      : Math.max(
+          0,
+          items.findIndex((item) => item.value === currentValue),
+        );
+
+  const container = new Container();
+  container.addChild(new Text("  Select suggestion model", 1, 0));
+  container.addChild(new Text("", 1, 0));
+
+  const selectList = new SelectList(items, Math.min(items.length, 15), PASSTHROUGH_THEME);
+
+  if (initialIndex >= 0) {
+    selectList.setSelectedIndex(initialIndex);
+  }
+
+  selectList.onSelect = (item) => done(item.value);
+  selectList.onCancel = () => done();
+
+  container.addChild(selectList);
+  container.addChild(new Text("  ↑↓ navigate • enter select • esc cancel", 1, 0));
+
+  return {
+    render: (width: number) => container.render(width),
+    invalidate: () => container.invalidate(),
+    handleInput: (data: string) => {
+      selectList.handleInput(data);
+      return true;
+    },
+  };
+}
+
+/** Build selectable model items with "disabled" first. */
+function buildModelItems(ctx?: ExtensionContext): SelectItem[] {
+  const items: SelectItem[] = [
+    {
+      value: "disabled",
+      label: "disabled",
+      description: "No prompt suggestions",
+    },
+  ];
+
+  if (!ctx) return items;
+
+  const models = getSelectableModels(ctx);
+
+  for (const model of models) {
+    const suffix = model.isCurrent ? "  [current]" : "";
+    items.push({
+      value: model.canonicalId,
+      label: `${model.canonicalId}${suffix}`,
+      description: model.label !== model.canonicalId ? model.label : undefined,
+    });
+  }
+
+  return items;
+}
+
 // ── Entry point ──────────────────────────────────────────────
 
 export function openSettingsOverlay(ctx: ExtensionContext): void {
@@ -196,6 +300,7 @@ export function openSettingsOverlay(ctx: ExtensionContext): void {
     const container = new Container();
 
     const deps: SettingsOverlayDeps = {
+      ctx,
       state,
       container,
       settingsList: null,