@mrclrchtr/supi-code-intelligence 1.16.0 → 2.0.0

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/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-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/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-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/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-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/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/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-runtime",
-  "version": "1.16.0",
+  "version": "2.0.0",
   "description": "SuPi code-runtime — shared workspace context, capability contracts, and canonical types for the code-understanding stack",
   "license": "MIT",
   "repository": {
@@ -23,12 +23,13 @@
     "workspace-context",
     "provider-api"
   ],
+  "type": "module",
   "files": [
     "src/**/*.ts",
     "!__tests__"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "1.16.0"
+    "@mrclrchtr/supi-core": "2.0.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/api.ts

@@ -13,9 +13,13 @@ export type {
   StructuralProvider,
   StructuralResult,
 } from "./capability/types.ts";
+// Evidence display
+export { type EvidenceBadgeInput, formatEvidenceBadge } from "./evidence-badge.ts";
 // Shared canonical types
 export type {
+  CalleeDepth,
   CalleesData,
+  CallSite,
   CodeLocation,
   CodePosition,
   CodeResult,
@@ -27,10 +31,13 @@ export type {
   ImportData,
   NodeAtData,
   OutlineData,
+  RefactorOperation,
+  RefactorRequest,
   RefactorResult,
   SourceRange,
   WorkspaceEdit,
 } from "./types.ts";
+export { normalizeRefactorOperation } from "./types.ts";
 export type { WorkspaceContext } from "./workspace/context.ts";
 // Workspace context
 export { createWorkspaceContext } from "./workspace/context.ts";

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

@@ -5,7 +5,9 @@
  */
 
 import type {
+  CalleeDepth,
   CalleesData,
+  CallSite,
   CodeLocation,
   CodePosition,
   CodeResult,
@@ -14,7 +16,9 @@ import type {
   ImportData,
   NodeAtData,
   OutlineData,
+  RefactorRequest,
   RefactorResult,
+  SourceRange,
 } from "../types.ts";
 
 // ── Availability state ─────────────────────────────────────────────────
@@ -49,17 +53,60 @@ export interface SemanticProvider {
   documentSymbols(filePath: string): Promise<CodeSymbol[] | null>;
   workspaceSymbols(query: string): Promise<CodeSymbol[] | null>;
 
+  /**
+   * Optional definition capability. Returns the definition location(s) for
+   * the symbol at the given position. When the provider cannot produce
+   * definition info, returns `null`.
+   */
+  definition?(filePath: string, position: CodePosition): Promise<CodeLocation[] | null>;
+
+  /**
+   * Optional hover capability. Returns a simplified type/signature info
+   * shape that does not depend on vscode-languageserver-types. When the
+   * provider cannot produce hover info (unavailable, unsupported file,
+   * no result at the given position), returns `null`.
+   */
+  hover?(
+    filePath: string,
+    position: CodePosition,
+  ): Promise<{ contents: string; range?: SourceRange } | null>;
+
+  /**
+   * Optional operation-aware refactor capability.
+   *
+   * This is the preferred planning entrypoint for higher-level tools because it
+   * lets the provider choose the honest substrate path per operation (rename,
+   * organize imports, dead-code cleanup, etc.) without exposing that branching
+   * to callers.
+   */
+  refactor?(request: RefactorRequest): Promise<RefactorResult>;
+
   /**
    * Optional rename capability. When present, the provider supports
-   * precise semantic rename operations.
+   * precise semantic symbol-rename operations.
+   *
+   * Kept as a low-level substrate helper for compatibility while the public
+   * tool surface still exposes a legacy `rename` alias.
    */
   rename?(file: string, position: CodePosition, newName: string): Promise<RefactorResult>;
 
   /**
    * Optional code actions capability. When present, the provider
    * supports code-action-based refactors.
+   *
+   * Kept as a low-level substrate helper and for lightweight introspection.
    */
   codeActions?(file: string, position: CodePosition): Promise<RefactorResult[]>;
+
+  /**
+   * Optional lightweight code action titles for display purposes.
+   * Returns simplified title/kind pairs at the given position.
+   * When the provider cannot produce code actions, returns `null`.
+   */
+  codeActionTitles?(
+    file: string,
+    position: CodePosition,
+  ): Promise<Array<{ title: string; kind?: string }> | null>;
 }
 
 /**
@@ -70,11 +117,18 @@ export interface SemanticProvider {
  * and runtime error states.
  */
 export interface StructuralProvider {
-  calleesAt(file: string, line: number, character: number): Promise<CodeResult<CalleesData>>;
+  calleesAt(
+    file: string,
+    line: number,
+    character: number,
+    depth?: CalleeDepth,
+  ): Promise<CodeResult<CalleesData>>;
   exports(file: string): Promise<CodeResult<ExportData[]>>;
   outline(file: string): Promise<CodeResult<OutlineData[]>>;
   imports(file: string): Promise<CodeResult<ImportData[]>>;
   nodeAt(file: string, line: number, character: number): Promise<CodeResult<NodeAtData>>;
+  /** Find all call-site identifiers in a file. Returns name + start line for each match. */
+  callSites(file: string): Promise<CodeResult<CallSite[]>>;
 }
 
 /** Convenience alias for `CodeResult` used in structural contexts. */

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/evidence-badge.ts

@@ -0,0 +1,40 @@
+/**
+ * TUI-facing evidence badge string formatter.
+ *
+ * Pure string formatting — no pi-tui dependency. Consumes evidence
+ * completeness metadata and produces compact human-readable badges.
+ */
+
+/** Metadata describing how many evidence atoms were shown vs exist. */
+export interface EvidenceBadgeInput {
+  shownCount: number;
+  totalCount: number | null;
+  omittedCount: number | null;
+  partialReason: string | null;
+  /** Human-readable label for the badge, e.g. "references", "symbols". */
+  label: string;
+}
+
+/**
+ * Format a compact evidence completeness badge.
+ *
+ * | Input                                                | Output                                |
+ * |------------------------------------------------------|---------------------------------------|
+ * | shown=12, total=12, omitted=0, label="references"   | `12 references`                       |
+ * | shown=8,  total=20, omitted=12, label="symbols"     | `8 of 20 symbols (12 omitted)`        |
+ * | shown=5,  total=null, reason="timeout", label="matches" | `5 matches — timeout`              |
+ */
+export function formatEvidenceBadge(input: EvidenceBadgeInput): string {
+  const { shownCount, totalCount, omittedCount, partialReason, label } = input;
+
+  if (totalCount === null) {
+    const reasonSuffix = partialReason ? ` — ${partialReason}` : "";
+    return `${shownCount} ${label}${reasonSuffix}`;
+  }
+
+  if (omittedCount !== null && omittedCount > 0) {
+    return `${shownCount} of ${totalCount} ${label} (${omittedCount} omitted)`;
+  }
+
+  return `${shownCount} ${label}`;
+}

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/src/index.ts

@@ -6,7 +6,9 @@
  */
 
 export type {
+  CalleeDepth,
   CalleesData,
+  CallSite,
   CapabilityState,
   CodeLocation,
   CodePosition,
@@ -17,6 +19,8 @@ export type {
   ImportData,
   NodeAtData,
   OutlineData,
+  RefactorOperation,
+  RefactorRequest,
   SemanticProvider,
   SourceRange,
   StructuralProvider,
@@ -27,5 +31,6 @@ export type {
 export {
   createWorkspaceContext,
   getDefaultWorkspaceRuntime,
+  normalizeRefactorOperation,
   WorkspaceRuntime,
 } from "./api.ts";

package/node_modules/@mrclrchtr/supi-tree-sitter/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-tree-sitter/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-tree-sitter/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"