@mrclrchtr/supi-lsp 2.1.0 → 2.2.1

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

@@ -1,79 +1,21 @@
-// 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 { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
-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 { 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 {
   createSettingsContributionCollector,
-  type SettingsCollectionDiagnostic,
-  type SettingsScope,
-  type SettingsSection,
   SUPI_SETTINGS_COLLECT_EVENT,
 } from "./settings-registry.ts";
 
-// ── Input submenu component ──────────────────────────────────
-
-/**
- * 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);
-
-  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;
-    },
-  };
-}
+// Re-export submenu helpers
+export { createInputSubmenu, createModelPickerSubmenu } from "./settings-submenus.ts";
 
-// ── Types ────────────────────────────────────────────────────
+// ── Overlay ────────────────────────────────────────────────────────────────
 
 interface OverlayStatus {
   kind: "warning" | "error";
@@ -86,45 +28,10 @@ interface OverlayState {
   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 };
-}
-
 function collectSettingsSections(pi: ExtensionAPI) {
   const collector = createSettingsContributionCollector();
   pi.events.emit(SUPI_SETTINGS_COLLECT_EVENT, collector);
@@ -136,199 +43,6 @@ function latestStatus(diagnostics: SettingsCollectionDiagnostic[]): OverlayStatu
   return latest ? { kind: latest.kind, message: latest.message } : undefined;
 }
 
-function formatSettingsError(settingId: string, error: unknown): string {
-  const message = error instanceof Error ? error.message : String(error);
-  return `Could not save SuPi setting "${settingId}": ${message}`;
-}
-
-// ── Component ────────────────────────────────────────────────
-
-interface SettingsOverlayDeps {
-  ctx: ExtensionContext;
-  sections: SettingsSection[];
-  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 items = buildFlatItems(deps.sections, deps.state.scope, deps.state.cwd, deps.ctx);
-  const onChange = (flatId: string, newValue: string) => {
-    const found = findSectionAndId(deps.sections, flatId);
-    try {
-      if (found) {
-        found.section.persistChange(deps.state.scope, deps.state.cwd, found.itemId, newValue);
-        deps.state.status = undefined;
-      }
-    } catch (error) {
-      deps.state.status = {
-        kind: "error",
-        message: formatSettingsError(found?.itemId ?? flatId, error),
-      };
-    }
-    // Re-read all values to reflect persisted changes, but keep the list
-    // instance (and its selectedIndex) intact.
-    const updatedItems = buildFlatItems(deps.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(createStatusComponent(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 createStatusComponent(deps: SettingsOverlayDeps): {
-  render: () => string[];
-  invalidate: () => void;
-} {
-  return {
-    render: () => {
-      const status = deps.state.status;
-      if (!status) return [];
-      return [deps.theme.fg(status.kind, status.message)];
-    },
-    invalidate: () => {},
-  };
-}
-
-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;
-    },
-  };
-}
-
-/** 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(pi: ExtensionAPI, ctx: ExtensionContext): void {
   const collection = collectSettingsSections(pi);
   if (collection.sections.length === 0) {
@@ -342,32 +56,59 @@ export function openSettingsOverlay(pi: ExtensionAPI, ctx: ExtensionContext): vo
       cwd: ctx.cwd,
       status: latestStatus(collection.diagnostics),
     };
-    const container = new Container();
 
-    const deps: SettingsOverlayDeps = {
+    const container = new Container();
+    const scopedList = new ScopedSettingsList(
+      collection.sections,
+      state.scope,
+      state.cwd,
       ctx,
-      sections: collection.sections,
-      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,4 +1,4 @@
-// supi-core settings domain — event-backed settings contribution types and command wiring.
+// supi-core settings domain — event-backed declarative settings contributions and command wiring.
 
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type {
@@ -13,3 +13,19 @@ export {
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "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-code-runtime": "2.1.0",
-    "@mrclrchtr/supi-core": "2.1.0"
+    "@mrclrchtr/supi-code-runtime": "2.2.1",
+    "@mrclrchtr/supi-core": "2.2.1"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/client/client.ts

@@ -2,7 +2,7 @@
 // Handles initialize handshake, document sync, shutdown, and crash recovery.
 
 // biome-ignore lint/style/noExcessiveLinesPerFile: LspClient remains a cohesive stateful wrapper; refresh logic is already split out.
-import { type ChildProcess, spawn } from "node:child_process";
+import { type ChildProcess, execSync, spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import * as path from "node:path";
 import { recordDebugEvent } from "@mrclrchtr/supi-core/debug";
@@ -37,6 +37,31 @@ import { JsonRpcClient, JsonRpcRequestError } from "./transport.ts";
 const SHUTDOWN_TIMEOUT_MS = 5_000;
 const DIAGNOSTIC_WAIT_MS = 3_000;
 
+// ── Process-tree cleanup ──────────────────────────────────────────────
+
+/**
+ * Kill a process and all its descendants.
+ *
+ * On Unix, sends SIGTERM to the process group (negative PID).
+ * This requires the child to be spawned with `detached: true`.
+ * On Windows, uses `taskkill /T /F` to force-kill the entire tree.
+ */
+function killProcessTree(pid: number): void {
+  if (process.platform === "win32") {
+    try {
+      execSync(`taskkill /PID ${pid} /T /F`, { stdio: "ignore" });
+    } catch {
+      // Process may have already exited — ignore.
+    }
+    return;
+  }
+  try {
+    process.kill(-pid, "SIGTERM");
+  } catch {
+    // Process group may already be dead — ignore.
+  }
+}
+
 // ── Types ─────────────────────────────────────────────────────────────
 export type ClientStatus = "initializing" | "running" | "error" | "shutdown";
 
@@ -116,6 +141,10 @@ export class LspClient {
         cwd: this.root,
         stdio: ["pipe", "pipe", "pipe"],
         env: { ...process.env },
+        // Run the server in its own process group so we can atomically
+        // kill the entire tree (server + subprocesses like tsserver)
+        // with `process.kill(-pid, signal)` on Unix or `taskkill /T` on Windows.
+        detached: true,
       });
     } catch (err) {
       this._status = "error";
@@ -209,18 +238,26 @@ export class LspClient {
 
     this.rpc.dispose();
 
-    // Wait briefly for clean exit, then force kill
-    if (this.process.exitCode === null) {
-      await new Promise<void>((resolve) => {
-        const timer = setTimeout(() => {
-          this.process?.kill("SIGTERM");
-          resolve();
-        }, 1_000);
-        this.process?.on("exit", () => {
-          clearTimeout(timer);
-          resolve();
+    // Kill the entire process tree (server + subprocesses like tsserver).
+    // The LSP shutdown/exit protocol above should trigger a graceful exit,
+    // but the process-group kill ensures no orphans survive.
+    const pid = this.process.pid;
+    if (this.process.exitCode === null && pid) {
+      killProcessTree(pid);
+      if (process.platform !== "win32") {
+        // Escalate to SIGKILL after a brief grace period on Unix.
+        // Windows taskkill /F is already forceful.
+        await new Promise<void>((resolve) => {
+          setTimeout(() => {
+            try {
+              process.kill(-pid, "SIGKILL");
+            } catch {
+              // Already dead — ignore.
+            }
+            resolve();
+          }, 500);
         });
-      });
+      }
     }
 
     this.openDocs.clear();

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[];