@mrclrchtr/supi-code-intelligence 1.4.0 → 1.5.0

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {

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

@@ -49,6 +49,7 @@ export {
   redactDebugData,
   resetDebugRegistry,
 } from "./debug-registry.ts";
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
 export type { KnownRootEntry } from "./project-roots.ts";
 export {
   buildKnownRootsMap,
@@ -63,6 +64,7 @@ export {
   sortRootsBySpecificity,
   walkProject,
 } from "./project-roots.ts";
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export { getActiveBranchEntries } from "./session-utils.ts";
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";

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

@@ -49,6 +49,7 @@ export {
   redactDebugData,
   resetDebugRegistry,
 } from "./debug-registry.ts";
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
 export type { KnownRootEntry } from "./project-roots.ts";
 export {
   buildKnownRootsMap,
@@ -63,6 +64,7 @@ export {
   sortRootsBySpecificity,
   walkProject,
 } from "./project-roots.ts";
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export { getActiveBranchEntries } from "./session-utils.ts";
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";

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

@@ -0,0 +1,40 @@
+import * as path from "node:path";
+
+/** Strip pi's optional leading `@` file-path prefix from a tool input. */
+export function stripToolPathPrefix(target: string): string {
+  return target.startsWith("@") ? target.slice(1) : target;
+}
+
+/**
+ * Resolve a tool-style file path from a session cwd.
+ *
+ * Built-in pi file tools accept a leading `@` prefix in path arguments, so
+ * shared SuPi path helpers normalize that prefix before resolving relative
+ * paths.
+ */
+export function resolveToolPath(cwd: string, target: string): string {
+  return path.resolve(cwd, stripToolPathPrefix(target));
+}
+
+/** Convert a file path to a file:// URI. */
+export function fileToUri(filePath: string): string {
+  const resolved = path.resolve(filePath);
+  if (process.platform === "win32") {
+    return `file:///${resolved.replace(/\\/g, "/")}`;
+  }
+  return `file://${resolved}`;
+}
+
+/** Convert a file:// URI to a file path. */
+export function uriToFile(uri: string): string {
+  if (!uri.startsWith("file://")) return uri;
+  let filePath = decodeURIComponent(uri.slice(7));
+  if (
+    process.platform === "win32" &&
+    filePath.startsWith("/") &&
+    /^[A-Za-z]:/.test(filePath.slice(1))
+  ) {
+    filePath = filePath.slice(1);
+  }
+  return filePath;
+}

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

@@ -5,8 +5,20 @@
 // 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`.
  *
@@ -18,16 +30,7 @@ const SYMBOL_PREFIX = "@mrclrchtr/supi-core/";
  * @returns An object with `register`, `getAll`, and `clear` functions.
  */
 export function createRegistry<T>(name: string) {
-  const key = Symbol.for(SYMBOL_PREFIX + name);
-
-  const getMap = (): Map<string, T> => {
-    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;
-  };
+  const getMap = (): Map<string, T> => getGlobalRegistryMap<T>(name);
 
   return {
     /**
@@ -52,3 +55,32 @@ export function createRegistry<T>(name: string) {
     },
   };
 }
+
+/**
+ * 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-lsp/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/api.ts

@@ -49,6 +49,7 @@ export {
   redactDebugData,
   resetDebugRegistry,
 } from "./debug-registry.ts";
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
 export type { KnownRootEntry } from "./project-roots.ts";
 export {
   buildKnownRootsMap,
@@ -63,6 +64,7 @@ export {
   sortRootsBySpecificity,
   walkProject,
 } from "./project-roots.ts";
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export { getActiveBranchEntries } from "./session-utils.ts";
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";

package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/index.ts

@@ -49,6 +49,7 @@ export {
   redactDebugData,
   resetDebugRegistry,
 } from "./debug-registry.ts";
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
 export type { KnownRootEntry } from "./project-roots.ts";
 export {
   buildKnownRootsMap,
@@ -63,6 +64,7 @@ export {
   sortRootsBySpecificity,
   walkProject,
 } from "./project-roots.ts";
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export { getActiveBranchEntries } from "./session-utils.ts";
 export { registerSettingsCommand } from "./settings/settings-command.ts";
 export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";

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

@@ -0,0 +1,40 @@
+import * as path from "node:path";
+
+/** Strip pi's optional leading `@` file-path prefix from a tool input. */
+export function stripToolPathPrefix(target: string): string {
+  return target.startsWith("@") ? target.slice(1) : target;
+}
+
+/**
+ * Resolve a tool-style file path from a session cwd.
+ *
+ * Built-in pi file tools accept a leading `@` prefix in path arguments, so
+ * shared SuPi path helpers normalize that prefix before resolving relative
+ * paths.
+ */
+export function resolveToolPath(cwd: string, target: string): string {
+  return path.resolve(cwd, stripToolPathPrefix(target));
+}
+
+/** Convert a file path to a file:// URI. */
+export function fileToUri(filePath: string): string {
+  const resolved = path.resolve(filePath);
+  if (process.platform === "win32") {
+    return `file:///${resolved.replace(/\\/g, "/")}`;
+  }
+  return `file://${resolved}`;
+}
+
+/** Convert a file:// URI to a file path. */
+export function uriToFile(uri: string): string {
+  if (!uri.startsWith("file://")) return uri;
+  let filePath = decodeURIComponent(uri.slice(7));
+  if (
+    process.platform === "win32" &&
+    filePath.startsWith("/") &&
+    /^[A-Za-z]:/.test(filePath.slice(1))
+  ) {
+    filePath = filePath.slice(1);
+  }
+  return filePath;
+}

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

@@ -5,8 +5,20 @@
 // 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`.
  *
@@ -18,16 +30,7 @@ const SYMBOL_PREFIX = "@mrclrchtr/supi-core/";
  * @returns An object with `register`, `getAll`, and `clear` functions.
  */
 export function createRegistry<T>(name: string) {
-  const key = Symbol.for(SYMBOL_PREFIX + name);
-
-  const getMap = (): Map<string, T> => {
-    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;
-  };
+  const getMap = (): Map<string, T> => getGlobalRegistryMap<T>(name);
 
   return {
     /**
@@ -52,3 +55,32 @@ export function createRegistry<T>(name: string) {
     },
   };
 }
+
+/**
+ * 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-lsp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "SuPi LSP extension — Language Server Protocol integration for pi",
   "license": "MIT",
   "repository": {
@@ -22,7 +22,7 @@
   ],
   "dependencies": {
     "typescript": "6.0.3",
-    "@mrclrchtr/supi-core": "1.4.0"
+    "@mrclrchtr/supi-core": "1.5.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-project-info.ts

@@ -1,6 +1,7 @@
 import type { LspClient } from "../client/client.ts";
 import type { ProjectServerInfo } from "../config/types.ts";
 import { displayRelativeFilePath } from "../summary.ts";
+import { getSupportedLspServerActions } from "../tool/tool-specs.ts";
 
 interface ProjectServerInfoInput {
   serverName: string;
@@ -28,22 +29,7 @@ export function buildProjectServerInfo(
     root: input.root,
     fileTypes: input.fileTypes,
     status,
-    supportedActions: getSupportedActions(input.client?.serverCapabilities),
+    supportedActions: getSupportedLspServerActions(input.client?.serverCapabilities),
     openFiles: input.client?.openFiles.map((file) => displayRelativeFilePath(file, cwd)) ?? [],
   };
 }
-
-function getSupportedActions(capabilities: LspClient["serverCapabilities"] | undefined): string[] {
-  if (!capabilities) return [];
-
-  const actions: string[] = ["diagnostics [optional file]"];
-  if (capabilities.hoverProvider) actions.push("hover(file,line,char)");
-  if (capabilities.definitionProvider) actions.push("definition(file,line,char)");
-  if (capabilities.referencesProvider) actions.push("references(file,line,char)");
-  if (capabilities.implementationProvider) actions.push("implementation(file,line,char)");
-  if (capabilities.documentSymbolProvider) actions.push("symbols(file)");
-  if (capabilities.workspaceSymbolProvider) actions.push("workspace_symbols(query)");
-  if (capabilities.renameProvider) actions.push("rename(file,line,char,newName)");
-  if (capabilities.codeActionProvider) actions.push("code_actions(file,line,char)");
-  return actions;
-}

package/node_modules/@mrclrchtr/supi-lsp/src/session/service-registry.ts

@@ -2,7 +2,7 @@
 // Peer extensions can import `getSessionLspService` from the package root
 // to reuse the active LSP runtime without starting duplicate servers.
 
-import * as path from "node:path";
+import { createSessionStateRegistry } from "@mrclrchtr/supi-core/api";
 import type {
   CodeAction,
   Diagnostic,
@@ -189,34 +189,18 @@ export class SessionLspService {
 
 // ── Registry ──────────────────────────────────────────────────────────
 
-const REGISTRY_KEY = Symbol.for("@mrclrchtr/supi-lsp/session-registry");
 const WAIT_INTERVAL_MS = 25;
-
-function getRegistry(): Map<string, SessionLspServiceState> {
-  const globalScope = globalThis as typeof globalThis & Record<symbol, unknown>;
-  const existing = globalScope[REGISTRY_KEY];
-  if (existing instanceof Map) return existing as Map<string, SessionLspServiceState>;
-
-  const registry = new Map<string, SessionLspServiceState>();
-  globalScope[REGISTRY_KEY] = registry;
-  return registry;
-}
-
-function normalizeCwd(cwd: string): string {
-  return path.resolve(cwd);
-}
-
-const registry = getRegistry();
+const registry = createSessionStateRegistry<SessionLspServiceState>("supi-lsp/session-registry");
 
 /** Publish the LSP service state for a session cwd. */
 export function setSessionLspServiceState(cwd: string, state: SessionLspServiceState): void {
-  registry.set(normalizeCwd(cwd), state);
+  registry.set(cwd, state);
 }
 
 /** Acquire the LSP service state for a session cwd. */
 export function getSessionLspService(cwd: string): SessionLspServiceState {
   return (
-    registry.get(normalizeCwd(cwd)) ?? {
+    registry.get(cwd) ?? {
       kind: "unavailable",
       reason: "No LSP session initialized for this workspace",
     }
@@ -241,5 +225,5 @@ export async function waitForSessionLspService(
 
 /** Remove the LSP service state for a session cwd. */
 export function clearSessionLspService(cwd: string): void {
-  registry.delete(normalizeCwd(cwd));
+  registry.clear(cwd);
 }

package/node_modules/@mrclrchtr/supi-lsp/src/tool/guidance.ts

@@ -2,15 +2,8 @@
 
 import * as path from "node:path";
 import type { ProjectServerInfo } from "../config/types.ts";
-import {
-  LSP_DIAGNOSTICS_TOOL,
-  LSP_DOCUMENT_SYMBOLS_TOOL,
-  LSP_LOOKUP_TOOL,
-  LSP_RECOVER_TOOL,
-  LSP_REFACTOR_TOOL,
-  LSP_WORKSPACE_SYMBOLS_TOOL,
-  type LspToolName,
-} from "./names.ts";
+import { LSP_LOOKUP_TOOL, type LspToolName } from "./names.ts";
+import { LSP_TOOL_DEFINITION_SPECS } from "./tool-specs.ts";
 
 export interface LspToolPromptSurface {
   description: string;
@@ -20,33 +13,6 @@ export interface LspToolPromptSurface {
 
 export type LspToolPromptSurfaceMap = Record<LspToolName, LspToolPromptSurface>;
 
-const LOOKUP_GUIDELINES = [
-  'Use lsp_lookup with `kind: "hover"` for semantic type or symbol information at a known `file`, `line`, and `character`.',
-  'Use lsp_lookup with `kind: "definition"`, `"references"`, or `"implementation"` for semantic navigation at a known position.',
-  "Use lsp_lookup after code_intel or tree_sitter has already narrowed the target file and position.",
-];
-
-const DOCUMENT_SYMBOL_GUIDELINES = [
-  "Use lsp_document_symbols(file) for semantic declarations in one supported file.",
-];
-
-const WORKSPACE_SYMBOL_GUIDELINES = [
-  "Use lsp_workspace_symbols(query) for semantic symbol-name lookup across the current project.",
-];
-
-const DIAGNOSTICS_GUIDELINES = [
-  "Use lsp_diagnostics(file?) when you need current diagnostics for one file or a workspace-level summary.",
-];
-
-const REFACTOR_GUIDELINES = [
-  'Use lsp_refactor with `kind: "rename"` for semantic rename planning at a known `file`, `line`, and `character`.',
-  'Use lsp_refactor with `kind: "code_actions"` for semantic fixes or refactors at a known position.',
-];
-
-const RECOVER_GUIDELINES = [
-  "Use lsp_recover() when diagnostics look stale after workspace-level changes or generated-file updates.",
-];
-
 export const defaultLspToolPromptSurfaces = buildLspToolPromptSurfaces([], ".");
 
 export function buildLspToolPromptSurfaces(
@@ -55,45 +21,19 @@ export function buildLspToolPromptSurfaces(
 ): LspToolPromptSurfaceMap {
   const coverageGuidelines = buildCoverageGuidelines(servers, cwd);
 
-  return {
-    [LSP_LOOKUP_TOOL]: {
-      description:
-        "Language Server Protocol lookup tool — semantic hover, definition, references, and implementation for supported files. Use lsp_lookup when you know the file and 1-based line/character position and need semantic drill-down rather than text search.",
-      promptSnippet:
-        "lsp_lookup — semantic hover/definition/references/implementation at a known file position",
-      promptGuidelines: [...LOOKUP_GUIDELINES, ...coverageGuidelines],
-    },
-    [LSP_DOCUMENT_SYMBOLS_TOOL]: {
-      description:
-        "Language Server Protocol document symbols tool — list semantic declarations in one supported file. Use lsp_document_symbols when you need a symbol-aware outline rather than raw text structure.",
-      promptSnippet: "lsp_document_symbols — semantic declarations for one supported file",
-      promptGuidelines: DOCUMENT_SYMBOL_GUIDELINES,
-    },
-    [LSP_WORKSPACE_SYMBOLS_TOOL]: {
-      description:
-        "Language Server Protocol workspace symbols tool — semantic symbol-name lookup across the current project. Use lsp_workspace_symbols to find declarations by name before opening a specific file.",
-      promptSnippet: "lsp_workspace_symbols — semantic symbol-name lookup across the project",
-      promptGuidelines: WORKSPACE_SYMBOL_GUIDELINES,
-    },
-    [LSP_DIAGNOSTICS_TOOL]: {
-      description:
-        "Language Server Protocol diagnostics tool — current diagnostics for one file or a workspace summary. Use lsp_diagnostics for semantic compiler or language-server issues instead of guessing from text alone.",
-      promptSnippet: "lsp_diagnostics — current diagnostics for one file or the workspace",
-      promptGuidelines: DIAGNOSTICS_GUIDELINES,
-    },
-    [LSP_REFACTOR_TOOL]: {
-      description:
-        "Language Server Protocol refactor tool — semantic rename planning and code actions at a known file position. Use lsp_refactor when you need language-server-backed edits or quick-fix suggestions.",
-      promptSnippet: "lsp_refactor — semantic rename planning and code actions at a known position",
-      promptGuidelines: REFACTOR_GUIDELINES,
-    },
-    [LSP_RECOVER_TOOL]: {
-      description:
-        "Language Server Protocol recover tool — refresh diagnostics after workspace changes and stale language-server state. Use lsp_recover when new files, generated types, or config updates leave diagnostics out of sync.",
-      promptSnippet: "lsp_recover — refresh stale diagnostics after workspace changes",
-      promptGuidelines: RECOVER_GUIDELINES,
-    },
-  };
+  return Object.fromEntries(
+    LSP_TOOL_DEFINITION_SPECS.map((spec) => [
+      spec.name,
+      {
+        description: spec.description,
+        promptSnippet: spec.promptSnippet,
+        promptGuidelines:
+          "includeCoverageGuidelines" in spec && spec.includeCoverageGuidelines
+            ? [...spec.basePromptGuidelines, ...coverageGuidelines]
+            : [...spec.basePromptGuidelines],
+      } satisfies LspToolPromptSurface,
+    ]),
+  ) as LspToolPromptSurfaceMap;
 }
 
 function buildCoverageGuidelines(servers: ProjectServerInfo[], cwd: string): string[] {