@mrclrchtr/supi-lsp 1.16.1 → 2.0.1

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,

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

@@ -1,2 +1,6 @@
 // supi-core settings-ui domain — settings TUI components (imports pi-tui at runtime, heavy).
-export { createInputSubmenu, openSettingsOverlay } from "./settings/settings-ui.ts";
+export {
+  createInputSubmenu,
+  createModelPickerSubmenu,
+  openSettingsOverlay,
+} from "./settings/settings-ui.ts";

package/node_modules/@mrclrchtr/supi-core/src/spinner-frames.ts

@@ -0,0 +1,11 @@
+/**
+ * Shared UI constants for SuPi extensions.
+ *
+ * @module
+ */
+
+/** Braille spinner frames used across SuPi extensions for animated loaders. */
+export const BRAILLE_SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+/** Tick interval (ms) shared by all braille-spinner consumers. */
+export const SPINNER_INTERVAL_MS = 80;

package/node_modules/@mrclrchtr/supi-core/src/status-spinner.ts

@@ -0,0 +1,68 @@
+/**
+ * Lightweight status-bar spinner for SuPi extensions.
+ *
+ * Manages a setInterval-based animated spinner that writes to
+ * `ctx.ui.setStatus`.  Each tick advances the frame and re-renders
+ * with the current message.
+ *
+ * @module
+ */
+
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { BRAILLE_SPINNER_FRAMES, SPINNER_INTERVAL_MS } from "./spinner-frames.ts";
+
+/**
+ * Manages an animated braille spinner on the status bar.
+ *
+ * Usage:
+ * ```ts
+ * const spinner = new StatusSpinner(ctx, "my-package");
+ * spinner.start("generating…");
+ * // later
+ * spinner.stop();
+ * ```
+ */
+export class StatusSpinner {
+  private interval: ReturnType<typeof setInterval> | null = null;
+  private frame = 0;
+  private currentMessage = "";
+
+  constructor(
+    private ctx: ExtensionContext,
+    private source: string,
+    private frames: readonly string[] = BRAILLE_SPINNER_FRAMES,
+  ) {}
+
+  /** Start the spinner with the given message. Overwrites any active spinner. */
+  start(message: string): void {
+    this.stop();
+    this.currentMessage = message;
+    this.render();
+
+    this.interval = setInterval(() => {
+      this.frame++;
+      this.render();
+    }, SPINNER_INTERVAL_MS);
+  }
+
+  /** Update the display message without resetting the spinner. */
+  update(message: string): void {
+    this.currentMessage = message;
+  }
+
+  /** Stop the spinner and clear the status. */
+  stop(): void {
+    if (this.interval !== null) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+    this.ctx.ui.setStatus(this.source, "");
+  }
+
+  // ── Private ──────────────────────────────────────────────────────────
+
+  private render(): void {
+    const icon = this.frames[this.frame % this.frames.length];
+    this.ctx.ui.setStatus(this.source, `${icon} ${this.currentMessage}`);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "1.16.1",
+  "version": "2.0.1",
   "description": "SuPi LSP extension — Language Server Protocol integration for pi",
   "license": "MIT",
   "repository": {
@@ -16,7 +16,6 @@
     "access": "public"
   },
   "keywords": [
-    "pi-package",
     "pi",
     "pi-coding-agent",
     "pi-extension",
@@ -27,6 +26,7 @@
     "rename",
     "diagnostics"
   ],
+  "type": "module",
   "files": [
     "src/**/*.ts",
     "src/**/*.json",
@@ -38,8 +38,8 @@
     "vscode-jsonrpc": "^9.0.0",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-types": "^3.17.5",
-    "@mrclrchtr/supi-code-runtime": "1.16.1",
-    "@mrclrchtr/supi-core": "1.16.1"
+    "@mrclrchtr/supi-code-runtime": "2.0.1",
+    "@mrclrchtr/supi-core": "2.0.1"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",
@@ -50,36 +50,9 @@
     "vscode-languageserver-protocol",
     "vscode-languageserver-types"
   ],
-  "peerDependencies": {
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "typebox": "*"
-  },
-  "peerDependenciesMeta": {
-    "@earendil-works/pi-ai": {
-      "optional": true
-    },
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    },
-    "@earendil-works/pi-tui": {
-      "optional": true
-    },
-    "typebox": {
-      "optional": true
-    }
-  },
-  "pi": {
-    "extensions": [
-      "./src/extension.ts"
-    ],
-    "image": "https://raw.githubusercontent.com/mrclrchtr/supi/main/screenshots/supi-lsp-status.png"
-  },
   "main": "src/api.ts",
   "exports": {
     "./api": "./src/api.ts",
-    "./extension": "./src/extension.ts",
     "./package.json": "./package.json",
     "./provider/lsp-semantic-provider": "./src/provider/lsp-semantic-provider.ts"
   }

package/src/api.ts

@@ -1,12 +1,24 @@
 // Public API surface for the LSP session-scoped service.
 
+export { type LoadConfigOptions, loadConfig } from "./config/config.ts";
+export type { DeprecatedLspKeys, LspSettings } from "./config/lsp-settings.ts";
+export {
+  getDeprecatedLspKeys,
+  getLspDisabledMessage,
+  hasDeprecatedLspKeys,
+  loadLspSettings,
+} from "./config/lsp-settings.ts";
+export { clearTsconfigCache } from "./config/tsconfig-scope.ts";
 export type {
   CodeAction,
   Diagnostic,
   DocumentSymbol,
+  FileEvent,
   Hover,
   Location,
   LocationLink,
+  LspConfig,
+  MissingServer,
   Position,
   ProjectServerInfo,
   Range,
@@ -14,15 +26,30 @@ export type {
   WorkspaceEdit,
   WorkspaceSymbol,
 } from "./config/types.ts";
+export { FileChangeType } from "./config/types.ts";
 export { toLspPosition, toOneBasedPosition } from "./coordinates.ts";
+export { isLikelyStaleDiagnostic } from "./diagnostics/stale-diagnostics.ts";
+export {
+  scanWorkspaceSentinels,
+  syncWorkspaceSentinelSnapshot,
+} from "./diagnostics/workspace-sentinels.ts";
+export type {
+  LspControllerState,
+  LspStartResult,
+} from "./session/runtime-controller.ts";
+export { LspRuntimeController } from "./session/runtime-controller.ts";
+export { scanMissingServers } from "./session/scanner.ts";
 export type {
   OutstandingDiagnosticSummaryEntry,
   RecoverDiagnosticsResult,
+  SemanticReadinessResult,
   SessionLspServiceState,
   WorkspaceDiagnosticSummaryEntry,
 } from "./session/service-registry.ts";
 export {
+  clearSessionLspService,
   getSessionLspService,
   SessionLspService,
+  setSessionLspServiceState,
   waitForSessionLspService,
 } from "./session/service-registry.ts";

package/src/client/client-refresh.ts

@@ -147,6 +147,11 @@ async function pullDocumentDiagnostics(
   }
 
   const previousResultId = accessClient(client).diagnosticStore.get(uri)?.resultId;
+  // Wait for server readiness before pulling diagnostics. In steady state
+  // this resolves immediately (isReady check). During active indexing, this
+  // may add extra latency on top of the per-URI timeout budget — acceptable
+  // because the server wouldn't return useful diagnostics while indexing anyway.
+  await client.getReady();
   return rpc.sendRequest(
     "textDocument/diagnostic",
     {