@mrclrchtr/supi-lsp 2.0.6 → 2.2.0

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-runtime",
-  "version": "2.0.6",
+  "version": "2.2.0",
   "description": "SuPi code-runtime — shared workspace context, capability contracts, and canonical types for the code-understanding stack",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
     "!__tests__"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "2.0.6"
+    "@mrclrchtr/supi-core": "2.2.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/node_modules/@mrclrchtr/supi-core/README.md

@@ -39,15 +39,17 @@ Config file locations:
 
 ### Settings helpers
 
-- `registerSettings()` — register an arbitrary settings section
-- `registerConfigSettings()` — register a config-backed settings section with scoped persistence helpers
-- `registerSettingsCommand()` — register `/supi-settings`
-- `openSettingsOverlay()` — open the shared settings UI directly
+- `registerDeclarativeSettings(pi, options)` — contribute a config-backed declarative settings section with source-aware scoped persistence
+- `registerSettingsCommand(pi)` — register `/supi-settings` (used by `@mrclrchtr/supi-settings`)
+- `openSettingsOverlay(pi, ctx)` — open the shared settings UI directly
 - `createInputSubmenu()` — helper for simple text-entry submenus
+- `createModelPickerSubmenu()` — helper for scoped model selection submenus
 
 The built-in settings UI supports:
 
 - project/global scope toggle
+- source badges for project, global, and default values
+- Inherit/Reset actions that delete scoped config keys
 - grouped extension sections
 - searchable setting lists
 
@@ -83,25 +85,32 @@ The built-in settings UI supports:
 ## Example
 
 ```ts
-import { loadSupiConfig, registerConfigSettings, wrapExtensionContext } from "@mrclrchtr/supi-core/api";
-
-const config = loadSupiConfig("my-extension", process.cwd(), {
-  enabled: true,
-});
-
-registerConfigSettings({
-  id: "my-extension",
-  label: "My Extension",
-  section: "my-extension",
-  defaults: { enabled: true },
-  buildItems: () => [],
-  persistChange: () => {},
-});
-
-const message = wrapExtensionContext("my-extension", "hello", {
-  file: "CLAUDE.md",
-  turn: 1,
-});
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { loadSupiConfig, registerDeclarativeSettings, wrapExtensionContext } from "@mrclrchtr/supi-core/api";
+
+export default function myExtension(pi: ExtensionAPI) {
+  const defaults = { enabled: true };
+  const config = loadSupiConfig("my-extension", process.cwd(), defaults);
+
+  registerDeclarativeSettings(pi, {
+    id: "my-extension",
+    label: "My Extension",
+    section: "my-extension",
+    defaults,
+    fields: [
+      {
+        kind: "boolean" as const,
+        key: "enabled",
+        label: "Enabled",
+      },
+    ],
+  });
+
+  const message = wrapExtensionContext("my-extension", "hello", {
+    enabled: config.enabled,
+  });
+  void message;
+}
 ```
 
 ## Source

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "2.0.6",
+  "version": "2.2.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -70,6 +70,7 @@
     "./status-spinner": "./src/status-spinner.ts",
     "./terminal": "./src/terminal.ts",
     "./tool-framework": "./src/tool-framework.ts",
+    "./prompt-surface": "./src/prompt-surface.ts",
     "./types": "./src/types.ts"
   }
 }

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

@@ -21,6 +21,15 @@ function getProjectConfigPath(cwd: string): string {
   return path.join(cwd, PROJECT_CONFIG_DIR, CONFIG_FILE);
 }
 
+/** Return the SuPi config file path for one scope. */
+export function getSupiConfigPath(
+  scope: "global" | "project",
+  cwd: string,
+  options?: SupiConfigOptions,
+): string {
+  return scope === "global" ? getGlobalConfigPath(options?.homeDir) : getProjectConfigPath(cwd);
+}
+
 export function readJsonFile(filePath: string): Record<string, unknown> | null {
   let content: string;
   try {
@@ -95,15 +104,22 @@ export function loadSupiConfigForScope<T>(
   defaults: T,
   options: { scope: "global" | "project" } & SupiConfigOptions,
 ): T {
-  const config =
-    options.scope === "global"
-      ? readJsonFile(getGlobalConfigPath(options.homeDir))
-      : readJsonFile(getProjectConfigPath(cwd));
+  const config = readJsonFile(getSupiConfigPath(options.scope, cwd, { homeDir: options.homeDir }));
 
   const scopedSection = extractSection(config, section);
   return shallowMerge(defaults, scopedSection);
 }
 
+/** Load the raw object for one config section and one scope. */
+export function loadSupiConfigSectionForScope(
+  section: string,
+  cwd: string,
+  options: { scope: "global" | "project" } & SupiConfigOptions,
+): Record<string, unknown> | null {
+  const config = readJsonFile(getSupiConfigPath(options.scope, cwd, { homeDir: options.homeDir }));
+  return extractSection(config, section);
+}
+
 export interface SupiConfigLocation {
   section: string;
   scope: "global" | "project";
@@ -118,8 +134,7 @@ export function writeSupiConfig(
   value: Record<string, unknown>,
   options?: SupiConfigOptions,
 ): void {
-  const configPath =
-    loc.scope === "global" ? getGlobalConfigPath(options?.homeDir) : getProjectConfigPath(loc.cwd);
+  const configPath = getSupiConfigPath(loc.scope, loc.cwd, options);
 
   const dir = path.dirname(configPath);
   fs.mkdirSync(dir, { recursive: true });
@@ -142,8 +157,7 @@ export function removeSupiConfigKey(
   key: string,
   options?: SupiConfigOptions,
 ): void {
-  const configPath =
-    loc.scope === "global" ? getGlobalConfigPath(options?.homeDir) : getProjectConfigPath(loc.cwd);
+  const configPath = getSupiConfigPath(loc.scope, loc.cwd, options);
 
   const existing = readJsonFile(configPath);
   if (!existing) return;