@mrclrchtr/supi-tree-sitter 1.4.0 → 1.5.0

package/node_modules/@mrclrchtr/supi-core/src/registry-utils.ts

@@ -0,0 +1,86 @@
+// Shared registry utility for SuPi extensions.
+//
+// Provides a globalThis-backed registry pattern so that all jiti module instances
+// (resolved through different node_modules symlinks) share the same Map.
+// Without this, each symlink path gets its own module copy and its own Map,
+// so registrations from one instance are invisible to consumers in another.
+
+import * as path from "node:path";
+
+const SYMBOL_PREFIX = "@mrclrchtr/supi-core/";
+
+function getGlobalRegistryMap<T>(name: string): Map<string, T> {
+  const key = Symbol.for(SYMBOL_PREFIX + name);
+  let map = (globalThis as Record<symbol, unknown>)[key] as Map<string, T> | undefined;
+  if (!map) {
+    map = new Map<string, T>();
+    (globalThis as Record<symbol, unknown>)[key] = map;
+  }
+  return map;
+}
+
+/**
+ * Create a named registry backed by `globalThis` + `Symbol.for`.
+ *
+ * The registry is lazily initialized on first access and shared across all
+ * jiti module instances via the global symbol namespace.
+ *
+ * @typeParam T - The value type stored in the registry.
+ * @param name - Unique registry name (used to construct the `Symbol.for` key).
+ * @returns An object with `register`, `getAll`, and `clear` functions.
+ */
+export function createRegistry<T>(name: string) {
+  const getMap = (): Map<string, T> => getGlobalRegistryMap<T>(name);
+
+  return {
+    /**
+     * Register a value by id. Duplicate ids silently replace the previous registration.
+     */
+    register: (id: string, value: T): void => {
+      getMap().set(id, value);
+    },
+
+    /**
+     * Get all registered values in registration order.
+     */
+    getAll: (): T[] => {
+      return Array.from(getMap().values());
+    },
+
+    /**
+     * Clear all entries from the registry (primarily for tests).
+     */
+    clear: (): void => {
+      getMap().clear();
+    },
+  };
+}
+
+/**
+ * Create a named session-state registry keyed by normalized cwd.
+ *
+ * This helper is intended for session-scoped runtime services that should be
+ * shared across duplicate jiti module instances while keeping package-specific
+ * state unions and convenience wrappers local to the calling package.
+ */
+export function createSessionStateRegistry<TState>(name: string) {
+  const getMap = (): Map<string, TState> => getGlobalRegistryMap<TState>(name);
+  const normalizeCwd = (cwd: string): string => path.resolve(cwd);
+
+  return {
+    /** Get the current state for one session cwd. */
+    get: (cwd: string): TState | undefined => {
+      return getMap().get(normalizeCwd(cwd));
+    },
+
+    /** Store the current state for one session cwd. */
+    set: (cwd: string, state: TState): void => {
+      getMap().set(normalizeCwd(cwd), state);
+    },
+
+    /** Clear the current state for one session cwd. */
+    clear: (cwd: string): void => {
+      getMap().delete(normalizeCwd(cwd));
+    },
+  };
+}

package/node_modules/@mrclrchtr/supi-core/src/session-utils.ts

@@ -0,0 +1,29 @@
+// Generic session-file tree-walking utilities.
+
+import type { FileEntry, SessionEntry } from "@earendil-works/pi-coding-agent";
+
+/**
+ * Resolve the active branch path using PI's append-only tree semantics.
+ *
+ * The active branch is the path from the **last entry** (current leaf)
+ * back to the root via `parentId`. This follows PI's tree structure where
+ * entries are append-only and the last entry in the file is always the
+ * current leaf of the active branch.
+ */
+export function getActiveBranchEntries(entries: FileEntry[]): SessionEntry[] {
+  const sessionEntries = entries.filter((e): e is SessionEntry => e.type !== "session");
+  const byId = new Map(sessionEntries.map((entry) => [entry.id, entry]));
+  const leaf = sessionEntries.at(-1);
+  if (!leaf) return [];
+
+  const path: SessionEntry[] = [];
+  const visited = new Set<string>();
+  let current: SessionEntry | undefined = leaf;
+  while (current) {
+    if (visited.has(current.id)) break;
+    visited.add(current.id);
+    path.unshift(current);
+    current = current.parentId ? byId.get(current.parentId) : undefined;
+  }
+  return path;
+}

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

@@ -0,0 +1,15 @@
+// /supi-settings command registration.
+//
+// Thin wrapper that registers the command and delegates to openSettingsOverlay.
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { openSettingsOverlay } from "./settings-ui.ts";
+
+export function registerSettingsCommand(pi: ExtensionAPI): void {
+  pi.registerCommand("supi-settings", {
+    description: "Manage SuPi extension settings",
+    handler: async (_args, ctx) => {
+      openSettingsOverlay(ctx);
+    },
+  });
+}

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

@@ -0,0 +1,41 @@
+// Settings registry for SuPi extensions.
+//
+// Extensions declare their settings via `registerSettings()` during their
+// factory function. The generic settings UI reads them via `getRegisteredSettings()`.
+
+import type { SettingItem } from "@earendil-works/pi-tui";
+import { createRegistry } from "../registry-utils.ts";
+
+export type SettingsScope = "project" | "global";
+
+export interface SettingsSection {
+  /** Extension identifier — e.g. "lsp", "claude-md" */
+  id: string;
+  /** Human-readable label shown in the UI */
+  label: string;
+  /** Load current SettingItem[] for the given scope */
+  loadValues: (scope: SettingsScope, cwd: string) => SettingItem[];
+  /** Persist a change back to config */
+  persistChange: (scope: SettingsScope, cwd: string, settingId: string, value: string) => void;
+}
+
+const registry = createRegistry<SettingsSection>("settings-registry");
+
+/**
+ * Register a settings section for an extension.
+ * Call during the extension factory function (not async handlers).
+ * Duplicate ids replace the previous registration.
+ */
+export function registerSettings(section: SettingsSection): void {
+  registry.register(section.id, section);
+}
+
+/** Get all registered settings sections in registration order. */
+export function getRegisteredSettings(): SettingsSection[] {
+  return registry.getAll();
+}
+
+/** Clear the registry — used by tests. */
+export function clearRegisteredSettings(): void {
+  registry.clear();
+}

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

@@ -0,0 +1,226 @@
+// Generic 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().
+
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
+import {
+  Container,
+  Input,
+  Key,
+  matchesKey,
+  type SettingItem,
+  SettingsList,
+  Text,
+} from "@earendil-works/pi-tui";
+import {
+  getRegisteredSettings,
+  type SettingsScope,
+  type SettingsSection,
+} 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;
+    },
+  };
+}
+
+// ── Types ────────────────────────────────────────────────────
+
+interface OverlayState {
+  scope: SettingsScope;
+  cwd: string;
+}
+
+// ── Pure helpers ─────────────────────────────────────────────
+
+function getScopeLabel(scope: SettingsScope): string {
+  return scope === "project" ? "Project" : "Global";
+}
+
+function buildFlatItems(
+  sections: SettingsSection[],
+  scope: SettingsScope,
+  cwd: string,
+): SettingItem[] {
+  const items: SettingItem[] = [];
+  for (const section of sections) {
+    const sectionItems = section.loadValues(scope, cwd);
+    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 {
+  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);
+  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);
+    }
+    // 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);
+    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();
+}
+
+// ── Entry point ──────────────────────────────────────────────
+
+export function openSettingsOverlay(ctx: ExtensionContext): void {
+  const sections = getRegisteredSettings();
+  if (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 deps: SettingsOverlayDeps = {
+      state,
+      container,
+      settingsList: null,
+      tui,
+      theme,
+      done,
+    };
+
+    rebuildSettingsList(deps);
+
+    const component = {
+      render: (width: number) => container.render(width),
+      invalidate: () => container.invalidate(),
+      handleInput: (data: string) => {
+        if (matchesKey(data, Key.tab)) {
+          handleScopeToggle(deps);
+          return true;
+        }
+        // Delegate input to the settings list (always set after rebuildSettingsList)
+        deps.settingsList?.handleInput?.(data);
+        deps.tui.requestRender();
+        return true;
+      },
+    };
+
+    return component;
+  });
+}

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

@@ -0,0 +1,60 @@
+/**
+ * Shared terminal title formatting and signaling utilities.
+ *
+ * Centralized place for pi title convention (π prefix), completion (✓)
+ * and waiting (●) indicators, and the audible terminal bell.
+ */
+import path from "node:path";
+
+/** Unicode checkmark shown when the agent finishes a turn. */
+export const DONE_SYMBOL = "\u2713";
+/** Unicode dot shown when waiting for user input. */
+export const WAITING_SYMBOL = "\u25CF";
+
+/** Minimal UI surface needed for title operations. */
+export interface TitleTarget {
+  ui: {
+    setTitle?(title: string): void;
+  };
+}
+
+/**
+ * Format pi's canonical terminal title from session name and cwd.
+ * Falls back gracefully when either is missing.
+ *
+ * @example
+ *   formatTitle("my-session", "/home/projects/foo")  // "π - my-session - foo"
+ *   formatTitle(undefined, "/home/projects/foo")      // "π - foo"
+ *   formatTitle("my-session")                         // "π - my-session"
+ *   formatTitle()                                     // "π"
+ */
+export function formatTitle(sessionName?: string, cwd?: string): string {
+  const base = cwd ? path.basename(cwd) : undefined;
+  if (sessionName && base) return `π - ${sessionName} - ${base}`;
+  if (sessionName) return `π - ${sessionName}`;
+  if (base) return `π - ${base}`;
+  return "π";
+}
+
+/** Sound the audible terminal bell (ASCII BEL). */
+export function signalBell(): void {
+  process.stdout.write("\x07");
+}
+
+/**
+ * Set the terminal title to indicate the agent is waiting for user input.
+ * Prefixes with ● and sounds the terminal bell.
+ */
+export function signalWaiting(ctx: TitleTarget, title: string): void {
+  ctx.ui.setTitle?.(`${WAITING_SYMBOL}  ${title}`);
+  signalBell();
+}
+
+/**
+ * Set the terminal title to indicate the agent turn has completed.
+ * Prefixes with ✓ and sounds the terminal bell.
+ */
+export function signalDone(ctx: TitleTarget, title: string): void {
+  ctx.ui.setTitle?.(`${DONE_SYMBOL} ${title}`);
+  signalBell();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-tree-sitter",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "SuPi Tree-sitter extension — structural AST analysis for pi",
   "license": "MIT",
   "repository": {
@@ -23,7 +23,8 @@
     "!__tests__"
   ],
   "dependencies": {
-    "web-tree-sitter": "^0.26.8"
+    "web-tree-sitter": "^0.26.8",
+    "@mrclrchtr/supi-core": "1.5.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
@@ -43,9 +44,13 @@
   },
   "pi": {
     "extensions": [
-      "./src/extension.ts"
+      "./src/extension.ts",
+      "node_modules/@mrclrchtr/supi-core/src/extension.ts"
     ]
   },
+  "bundledDependencies": [
+    "@mrclrchtr/supi-core"
+  ],
   "main": "src/api.ts",
   "exports": {
     "./api": "./src/api.ts",

package/src/api.ts

@@ -1,5 +1,6 @@
-// Public tree-sitter session factory and shared types.
+// Public tree-sitter session factory, shared session service access, and shared types.
 
+export { getSessionTreeSitterService } from "./session/service-registry.ts";
 export { createTreeSitterSession } from "./session/session.ts";
 export type {
   CalleesAtResult,
@@ -9,8 +10,11 @@ export type {
   NodeAtResult,
   OutlineItem,
   QueryCapture,
+  SessionTreeSitterService,
+  SessionTreeSitterServiceState,
   SourceRange,
   SupportedExtension,
   TreeSitterResult,
+  TreeSitterService,
   TreeSitterSession,
 } from "./types.ts";

package/src/index.ts

@@ -1,5 +1,6 @@
-// Public session factory and re-exports for @mrclrchtr/supi-tree-sitter.
+// Public session factory, shared session service access, and re-exports for @mrclrchtr/supi-tree-sitter.
 
+export { getSessionTreeSitterService } from "./session/service-registry.ts";
 export { createTreeSitterSession } from "./session/session.ts";
 export type {
   CalleesAtResult,
@@ -9,8 +10,11 @@ export type {
   NodeAtResult,
   OutlineItem,
   QueryCapture,
+  SessionTreeSitterService,
+  SessionTreeSitterServiceState,
   SourceRange,
   SupportedExtension,
   TreeSitterResult,
+  TreeSitterService,
   TreeSitterSession,
 } from "./types.ts";

package/src/session/runtime.ts

@@ -2,6 +2,7 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { resolveToolPath } from "@mrclrchtr/supi-core/api";
 import type { Language, Parser, Tree } from "web-tree-sitter";
 import { nodeToRange } from "../coordinates.ts";
 import { detectGrammar, resolveGrammarWasmPath } from "../language.ts";
@@ -113,7 +114,7 @@ export class TreeSitterRuntime {
       grammarId: GrammarId;
     }>
   > {
-    const resolvedPath = path.resolve(this.cwd, filePath);
+    const resolvedPath = resolveToolPath(this.cwd, filePath);
 
     // Check language support first
     const grammarId = detectGrammar(filePath);
@@ -212,7 +213,7 @@ export class TreeSitterRuntime {
 
   /** Resolve a file path from cwd. */
   resolvePath(filePath: string): string {
-    return path.resolve(this.cwd, filePath);
+    return resolveToolPath(this.cwd, filePath);
   }
 
   /** Dispose all held parser resources. */

package/src/session/service-registry.ts

@@ -0,0 +1,30 @@
+// Shared session-scoped Tree-sitter service registry.
+// Peer extensions can import `getSessionTreeSitterService` from the package API
+// to reuse the active structural runtime without creating duplicate sessions.
+
+import { createSessionStateRegistry } from "@mrclrchtr/supi-core/api";
+import type { SessionTreeSitterService, SessionTreeSitterServiceState } from "../types.ts";
+
+const registry = createSessionStateRegistry<SessionTreeSitterServiceState>(
+  "supi-tree-sitter/session-registry",
+);
+
+/** Publish the shared Tree-sitter service for one session cwd. */
+export function setSessionTreeSitterService(cwd: string, service: SessionTreeSitterService): void {
+  registry.set(cwd, { kind: "ready", service });
+}
+
+/** Acquire the shared Tree-sitter service state for one session cwd. */
+export function getSessionTreeSitterService(cwd: string): SessionTreeSitterServiceState {
+  return (
+    registry.get(cwd) ?? {
+      kind: "unavailable",
+      reason: "No Tree-sitter session initialized for this workspace",
+    }
+  );
+}
+
+/** Remove the shared Tree-sitter service for one session cwd. */
+export function clearSessionTreeSitterService(cwd: string): void {
+  registry.clear(cwd);
+}

package/src/session/session.ts

@@ -1,4 +1,4 @@
-// Session factory — creates a TreeSitterSession bound to a working directory.
+// Session factory — creates runtime-backed Tree-sitter services and owned sessions.
 
 import { detectGrammar, isJsTsGrammar } from "../language.ts";
 import {
@@ -16,17 +16,13 @@ import type {
   OutlineItem,
   QueryCapture,
   TreeSitterResult,
+  TreeSitterService,
   TreeSitterSession,
 } from "../types.ts";
 import { TreeSitterRuntime } from "./runtime.ts";
 
-/**
- * Create a new Tree-sitter session bound to the given working directory.
- * The session owns parser/grammar reuse and must be disposed when done.
- */
-export function createTreeSitterSession(cwd: string): TreeSitterSession {
-  const runtime = new TreeSitterRuntime(cwd);
-
+/** Create a runtime-backed structural service without taking ownership of disposal. */
+export function createTreeSitterService(runtime: TreeSitterRuntime): TreeSitterService {
   return {
     async canParse(file: string) {
       const result = await runtime.parseFile(file);
@@ -104,7 +100,19 @@ export function createTreeSitterSession(cwd: string): TreeSitterSession {
     ): Promise<TreeSitterResult<CalleesAtResult>> {
       return lookupCalleesAt(runtime, file, line, character);
     },
+  };
+}
 
+/**
+ * Create a new Tree-sitter session bound to the given working directory.
+ * The session owns parser/grammar reuse and must be disposed when done.
+ */
+export function createTreeSitterSession(cwd: string): TreeSitterSession {
+  const runtime = new TreeSitterRuntime(cwd);
+  const service = createTreeSitterService(runtime);
+
+  return {
+    ...service,
     dispose() {
       runtime.dispose();
     },