@mrclrchtr/supi-lsp 2.0.6 → 2.2.0

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

@@ -1,327 +1,114 @@
-// Generic settings overlay for SuPi extensions.
+// Declarative settings overlay for SuPi extensions.
 //
-// Uses pi-tui's SettingsList with scope toggle (Tab), extension grouping,
-// and search. Each extension declares its settings via registerSettings().
+// Thin orchestration layer that collects settings contributions and opens the
+// scoped settings list inside a pi-tui custom component overlay.
 
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { Container, Key, matchesKey, Text } from "@earendil-works/pi-tui";
+import { ScopedSettingsList } from "./scoped-settings-list.ts";
+import type { SettingsCollectionDiagnostic, SettingsScope } from "./settings-registry.ts";
 import {
-  Container,
-  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,
-  type SettingsSection,
+  createSettingsContributionCollector,
+  SUPI_SETTINGS_COLLECT_EVENT,
 } from "./settings-registry.ts";
 
-// ── Input submenu component ──────────────────────────────────
+// Re-export submenu helpers
+export { createInputSubmenu, createModelPickerSubmenu } from "./settings-submenus.ts";
 
-/**
- * Creates a pi-tui Input-backed submenu component with enter-to-confirm
- * and escape-to-cancel handling.
- *
- * @param currentValue - Initial value for the text input.
- * @param label - Label text displayed above the input.
- * @param done - Callback invoked with the confirmed value, or undefined on cancel.
- */
-export function createInputSubmenu(
-  currentValue: string,
-  label: string,
-  done: (selectedValue?: string) => void,
-): {
-  render: (width: number) => string[];
-  invalidate: () => void;
-  handleInput: (data: string) => boolean;
-} {
-  const input = new Input();
-  input.setValue(currentValue);
+// ── Overlay ────────────────────────────────────────────────────────────────
 
-  return {
-    render: (_width: number) => {
-      const lines = [`  ${label}`];
-      lines.push(...input.render(_width));
-      lines.push("  enter confirm • esc cancel");
-      return lines;
-    },
-    invalidate: () => {
-      input.invalidate();
-    },
-    handleInput: (data: string) => {
-      if (matchesKey(data, Key.escape)) {
-        done();
-        return true;
-      }
-      if (matchesKey(data, Key.enter)) {
-        done(input.getValue());
-        return true;
-      }
-      input.handleInput(data);
-      return true;
-    },
-  };
+interface OverlayStatus {
+  kind: "warning" | "error";
+  message: string;
 }
 
-// ── Types ────────────────────────────────────────────────────
-
 interface OverlayState {
   scope: SettingsScope;
   cwd: string;
+  status?: OverlayStatus;
 }
 
-// ── Pure helpers ─────────────────────────────────────────────
-
 function getScopeLabel(scope: SettingsScope): string {
   return scope === "project" ? "Project" : "Global";
 }
 
-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, ctx);
-    for (const item of sectionItems) {
-      items.push({
-        ...item,
-        id: `${section.id}.${item.id}`,
-        label: `${section.label}: ${item.label}`,
-      });
-    }
-  }
-  return items;
-}
-
-function findSectionAndId(
-  sections: SettingsSection[],
-  flatId: string,
-): { section: SettingsSection; itemId: string } | null {
-  const dotIndex = flatId.indexOf(".");
-  if (dotIndex === -1) return null;
-  const sectionId = flatId.slice(0, dotIndex);
-  const itemId = flatId.slice(dotIndex + 1);
-  const section = sections.find((s) => s.id === sectionId);
-  if (!section) return null;
-  return { section, itemId };
-}
-
-// ── Component ────────────────────────────────────────────────
-
-interface SettingsOverlayDeps {
-  ctx: ExtensionContext;
-  state: OverlayState;
-  container: Container;
-  settingsList: SettingsList | null;
-  tui: Parameters<Parameters<ExtensionContext["ui"]["custom"]>[0]>[0];
-  theme: Parameters<Parameters<ExtensionContext["ui"]["custom"]>[0]>[1];
-  done: () => void;
-}
-
-function createSettingsList(deps: SettingsOverlayDeps): SettingsList {
-  const sections = getRegisteredSettings();
-  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,
-        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, deps.ctx);
-    for (const updated of updatedItems) {
-      const existing = items.find((i) => i.id === updated.id);
-      if (existing && existing.currentValue !== updated.currentValue) {
-        settingsList.updateValue(updated.id, updated.currentValue);
-      }
-    }
-    deps.tui.requestRender();
-  };
-  const settingsList = new SettingsList(
-    items,
-    Math.min(items.length + 4, 20),
-    getSettingsListTheme(),
-    onChange,
-    () => deps.done(),
-    { enableSearch: true },
-  );
-  return settingsList;
-}
-
-function rebuildSettingsList(deps: SettingsOverlayDeps): SettingsList {
-  const settingsList = createSettingsList(deps);
-  deps.settingsList = settingsList;
-
-  deps.container.clear();
-  deps.container.addChild(createHeaderComponent(deps));
-  deps.container.addChild(settingsList);
-
-  return settingsList;
-}
-
-function createHeaderComponent(deps: SettingsOverlayDeps): Text {
-  const { theme, state } = deps;
-  const scopeLabel = getScopeLabel(state.scope);
-  const otherScope = state.scope === "project" ? "Global" : "Project";
-  const headerText = new Text(
-    `${theme.fg("accent", theme.bold("SuPi Settings"))}  ${theme.fg("text", `Scope: ${scopeLabel}`)} ${theme.fg("dim", `(tab → ${otherScope})`)}`,
-    0,
-    0,
-  );
-  return headerText;
-}
-
-function handleScopeToggle(deps: SettingsOverlayDeps): void {
-  deps.state.scope = deps.state.scope === "project" ? "global" : "project";
-  rebuildSettingsList(deps);
-  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;
-    },
-  };
+function collectSettingsSections(pi: ExtensionAPI) {
+  const collector = createSettingsContributionCollector();
+  pi.events.emit(SUPI_SETTINGS_COLLECT_EVENT, collector);
+  return collector.result();
 }
 
-/** 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;
+function latestStatus(diagnostics: SettingsCollectionDiagnostic[]): OverlayStatus | undefined {
+  const latest = diagnostics.at(-1);
+  return latest ? { kind: latest.kind, message: latest.message } : undefined;
 }
 
-// ── Entry point ──────────────────────────────────────────────
-
-export function openSettingsOverlay(ctx: ExtensionContext): void {
-  const sections = getRegisteredSettings();
-  if (sections.length === 0) {
+export function openSettingsOverlay(pi: ExtensionAPI, ctx: ExtensionContext): void {
+  const collection = collectSettingsSections(pi);
+  if (collection.sections.length === 0) {
     ctx.ui.notify("No settings registered by SuPi extensions", "info");
     return;
   }
 
   void ctx.ui.custom<void>((tui, theme, _kb, done) => {
-    const state: OverlayState = { scope: "project", cwd: ctx.cwd };
-    const container = new Container();
+    const state: OverlayState = {
+      scope: "project",
+      cwd: ctx.cwd,
+      status: latestStatus(collection.diagnostics),
+    };
 
-    const deps: SettingsOverlayDeps = {
+    const container = new Container();
+    const scopedList = new ScopedSettingsList(
+      collection.sections,
+      state.scope,
+      state.cwd,
       ctx,
-      state,
-      container,
-      settingsList: null,
-      tui,
       theme,
+      tui,
       done,
+      (message) => {
+        state.status = { kind: "error", message };
+        rebuildOverlay();
+        tui.requestRender();
+      },
+    );
+    scopedList.enableSearch();
+
+    const rebuildOverlay = () => {
+      container.clear();
+      const scopeLabel = getScopeLabel(state.scope);
+      const otherScope = state.scope === "project" ? "Global" : "Project";
+      container.addChild(
+        new Text(
+          `${theme.fg("accent", theme.bold("SuPi Settings"))}  ${theme.fg("text", `Scope: ${scopeLabel}`)} ${theme.fg("dim", `(tab → ${otherScope})`)}`,
+          0,
+          0,
+        ),
+      );
+      if (state.status) {
+        container.addChild(new Text(theme.fg(state.status.kind, state.status.message), 0, 0));
+      }
     };
 
-    rebuildSettingsList(deps);
+    rebuildOverlay();
 
     const component = {
-      render: (width: number) => container.render(width),
-      invalidate: () => container.invalidate(),
+      render: (width: number) => [...container.render(width), ...scopedList.render(width)],
+      invalidate: () => {
+        container.invalidate();
+        scopedList.invalidate();
+      },
       handleInput: (data: string) => {
         if (matchesKey(data, Key.tab)) {
-          handleScopeToggle(deps);
+          state.scope = state.scope === "project" ? "global" : "project";
+          state.status = undefined;
+          scopedList.reload(state.scope, state.cwd, ctx);
+          rebuildOverlay();
+          tui.requestRender();
           return true;
         }
-        // Delegate input to the settings list (always set after rebuildSettingsList)
-        deps.settingsList?.handleInput?.(data);
-        deps.tui.requestRender();
+        scopedList.handleInput(data);
+        tui.requestRender();
         return true;
       },
     };

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

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

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

@@ -1,9 +1,31 @@
-// supi-core settings domain — settings registry (lightweight, type-only pi-tui import).
+// supi-core settings domain — event-backed declarative settings contributions and command wiring.
 
 export { registerSettingsCommand } from "./settings/settings-command.ts";
-export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";
+export type {
+  SettingsCollectionDiagnostic,
+  SettingsCollectionResult,
+  SettingsContributionCollector,
+  SettingsScope,
+  SettingsSection,
+} from "./settings/settings-registry.ts";
 export {
-  clearRegisteredSettings,
-  getRegisteredSettings,
-  registerSettings,
+  createSettingsContributionCollector,
+  isSettingsContributionCollector,
+  SUPI_SETTINGS_COLLECT_EVENT,
 } from "./settings/settings-registry.ts";
+export type {
+  BoolField,
+  ConfigHelpers,
+  CustomField,
+  DeclarativeSettingsOptions,
+  EnumField,
+  ModelPickerField,
+  NumberField,
+  ScopedFieldValue,
+  SettingsField,
+  SettingsFieldAction,
+  SettingsPersistedChange,
+  StringListField,
+  ValueSource,
+} from "./settings/settings-schema.ts";
+export { registerDeclarativeSettings } from "./settings/settings-schema.ts";

package/node_modules/@mrclrchtr/supi-core/src/tool-framework.ts

@@ -53,6 +53,16 @@ export function derivePromptSurface(spec: SuiPiToolSpec): SuiPiToolPromptSurface
   };
 }
 
+// Re-export prompt-surface types (implemented in config/prompt-surface.ts)
+export {
+  notifyToolPromptSurfaceDiagnostics,
+  type ResolveToolPromptSurfaceOptions,
+  type ResolveToolPromptSurfaceResult,
+  resolveToolPromptSurface,
+  type ToolPromptSurfaceDiagnostic,
+  type ToolPromptSurfaceDiagnosticCode,
+} from "./config/prompt-surface.ts";
+
 // ---------------------------------------------------------------------------
 // Registration
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "2.0.6",
+  "version": "2.2.0",
   "description": "SuPi LSP extension — Language Server Protocol integration for pi",
   "license": "MIT",
   "repository": {
@@ -38,8 +38,8 @@
     "vscode-jsonrpc": "^9.0.0",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-types": "^3.17.5",
-    "@mrclrchtr/supi-core": "2.0.6",
-    "@mrclrchtr/supi-code-runtime": "2.0.6"
+    "@mrclrchtr/supi-code-runtime": "2.2.0",
+    "@mrclrchtr/supi-core": "2.2.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/config/lsp-settings.ts

@@ -8,7 +8,7 @@ import { loadSupiConfig, loadSupiConfigForScope } from "@mrclrchtr/supi-core/con
 
 // ── Types ────────────────────────────────────────────────────
 
-export interface LspSettings {
+export interface LspSettings extends Record<string, unknown> {
   enabled: boolean;
   severity: number;
   active: string[];

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

@@ -1,188 +0,0 @@
-// Config-aware settings helper for SuPi config-backed settings sections.
-// Wraps registerSettings() and centralizes selected-scope loading + scoped persistence.
-//
-// Setting items can declare a `configType` ("boolean" | "number" | "stringList")
-// 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";
-import { loadSupiConfigForScope, removeSupiConfigKey, writeSupiConfig } from "./config.ts";
-
-// ── Types ──────────────────────────────────────────────────────────────────
-
-/**
- * Supported config value types for declarative persistChange.
- *
- * - `"boolean"`: maps "on" → true, "off" → false
- * - `"number"`: parses integer via Number.parseInt, falls back to unset on invalid
- * - `"stringList"`: splits on comma, trims whitespace, unsets on empty
- */
-export type ConfigSettingType = "boolean" | "number" | "stringList";
-
-/**
- * Extended setting item that can declare its config type for auto-generated
- * persistence handling.
- */
-export interface ConfigSettingItem extends SettingItem {
-  /**
-   * When set, persistChange for this item is auto-generated.
-   * All items must declare a configType for auto-generation to activate.
-   */
-  configType?: ConfigSettingType;
-}
-
-/**
- * Helpers provided to the persistChange callback for writing or removing
- * scoped config values.
- */
-export interface ConfigSettingsHelpers {
-  /** Write a key to the selected scope's config section. */
-  set(key: string, value: unknown): void;
-  /** Remove a key from the selected scope's config section. */
-  unset(key: string): void;
-}
-
-export interface ConfigSettingsOptions<T> {
-  /** Extension identifier — e.g. "lsp", "claude-md" */
-  id: string;
-  /** Human-readable label shown in the UI */
-  label: string;
-  /** SuPi config section name — e.g. "lsp", "claude-md" */
-  section: string;
-  /** Default config values */
-  defaults: T;
-  /**
-   * Build SettingItem[] from scoped config. Called by loadValues.
-   *
-   * Items can include a `configType` property for auto-generated
-   * persistChange handling. When ALL items declare a configType,
-   * the `persistChange` callback can be omitted.
-   */
-  buildItems: (
-    settings: T,
-    scope: SettingsScope,
-    cwd: string,
-    ctx?: ExtensionContext,
-  ) => ConfigSettingItem[];
-  /**
-   * Handle a settings change with scoped persistence helpers.
-   *
-   * Optional when all items returned by `buildItems` declare a `configType`.
-   * Required when any item lacks a `configType`.
-   */
-  persistChange?: (
-    scope: SettingsScope,
-    cwd: string,
-    settingId: string,
-    value: string,
-    helpers: ConfigSettingsHelpers,
-  ) => void;
-  /** Optional home directory for config resolution (testing). */
-  homeDir?: string;
-}
-
-// ── Auto-generated persistChange ───────────────────────────────────────────
-
-function autoPersistChange(
-  settingId: string,
-  value: string,
-  helpers: ConfigSettingsHelpers,
-  items: ConfigSettingItem[],
-): void {
-  const item = items.find((i) => i.id === settingId);
-  if (!item?.configType) return;
-
-  switch (item.configType) {
-    case "boolean": {
-      helpers.set(settingId, value === "on");
-      break;
-    }
-    case "number": {
-      const num = Number.parseInt(value, 10);
-      if (Number.isFinite(num) && num > 0) {
-        helpers.set(settingId, num);
-      } else {
-        helpers.unset(settingId);
-      }
-      break;
-    }
-    case "stringList": {
-      const names = value
-        .split(",")
-        .map((s) => s.trim())
-        .filter((s) => s.length > 0);
-      if (names.length > 0) {
-        helpers.set(settingId, names);
-      } else {
-        helpers.unset(settingId);
-      }
-      break;
-    }
-  }
-}
-
-function areAllItemsDeclarative(items: ConfigSettingItem[]): boolean {
-  return items.length > 0 && items.every((i) => i.configType !== undefined);
-}
-
-// ── Registration ───────────────────────────────────────────────────────────
-
-/**
- * Register a config-backed settings section.
- *
- * Loads display values from the selected scope only (`defaults <- selected scope`)
- * instead of merged effective runtime config. Provides scoped `set` / `unset`
- * persistence helpers so extensions don't need to wire `writeSupiConfig` /
- * `removeSupiConfigKey` by hand.
- *
- * When every item returned by `buildItems` declares a `configType`, the
- * `persistChange` callback is optional and will be auto-generated.
- */
-export function registerConfigSettings<T>(options: ConfigSettingsOptions<T>): void {
-  let cachedItems: ConfigSettingItem[] | undefined;
-
-  registerSettings({
-    id: options.id,
-    label: options.label,
-    loadValues: (scope, cwd, ctx) => {
-      const settings = loadSupiConfigForScope(options.section, cwd, options.defaults, {
-        scope,
-        homeDir: options.homeDir,
-      });
-      const items = options.buildItems(settings, scope, cwd, ctx);
-      cachedItems = items;
-      return items;
-    },
-    persistChange: (scope, cwd, settingId, value) => {
-      const helpers: ConfigSettingsHelpers = {
-        set: (key, val) => {
-          writeSupiConfig(
-            { section: options.section, scope, cwd },
-            { [key]: val },
-            { homeDir: options.homeDir },
-          );
-        },
-        unset: (key) => {
-          removeSupiConfigKey({ section: options.section, scope, cwd }, key, {
-            homeDir: options.homeDir,
-          });
-        },
-      };
-
-      // Use manual persistChange when provided
-      if (options.persistChange) {
-        options.persistChange(scope, cwd, settingId, value, helpers);
-        return;
-      }
-
-      // Auto-generate when all items are declarative
-      const items = cachedItems ?? options.buildItems(options.defaults, scope, cwd, undefined);
-      if (areAllItemsDeclarative(items)) {
-        autoPersistChange(settingId, value, helpers, items);
-      }
-    },
-  });
-}