@mrclrchtr/supi-code-intelligence 1.8.0 → 1.9.0

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

@@ -1,29 +1,20 @@
+![SuPi](assets/logo.png)
+
 # @mrclrchtr/supi-core
 
 Shared infrastructure for SuPi extensions.
 
-This package is mainly for extension authors. It gives you a common config system, settings plumbing, context helpers, registries, and a small extension surface that registers `/supi-settings`.
+This is a **pure library** — it does not register any pi commands or tools. The `/supi-settings` command is now available through `@mrclrchtr/supi-settings`.
 
 ## Install
 
-### As a dependency for another extension
-
 ```bash
 pnpm add @mrclrchtr/supi-core
 ```
 
-### As a pi package
-
-```bash
-pi install npm:@mrclrchtr/supi-core
-```
-
-Installing it as a pi package adds the minimal `/supi-settings` extension surface.
-
 ## Package surfaces
 
 - `@mrclrchtr/supi-core/api` — reusable helpers for other packages and extensions
-- `@mrclrchtr/supi-core/extension` — minimal pi extension that registers `/supi-settings`
 
 ## What you get from the API
 
@@ -101,7 +92,6 @@ const message = wrapExtensionContext("my-extension", "hello", {
 ## Source
 
 - `src/api.ts` — exported library surface
-- `src/extension.ts` — minimal `/supi-settings` entrypoint
 - `src/config.ts` — shared config loading and writing
 - `src/config-settings.ts` — config-backed settings registration helper
 - `src/settings-ui.ts` — shared settings overlay

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -40,7 +40,6 @@
     "./config": "./src/config.ts",
     "./context": "./src/context.ts",
     "./debug": "./src/debug-registry.ts",
-    "./extension": "./src/extension.ts",
     "./package.json": "./package.json",
     "./path": "./src/path.ts",
     "./project": "./src/project.ts",
@@ -50,10 +49,5 @@
     "./terminal": "./src/terminal.ts",
     "./tool-framework": "./src/tool-framework.ts",
     "./types": "./src/types.ts"
-  },
-  "pi": {
-    "extensions": [
-      "./src/extension.ts"
-    ]
   }
 }

package/node_modules/@mrclrchtr/supi-tree-sitter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-tree-sitter",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "SuPi Tree-sitter extension — structural AST analysis for pi",
   "license": "MIT",
   "repository": {
@@ -24,7 +24,8 @@
   ],
   "dependencies": {
     "web-tree-sitter": "^0.26.8",
-    "@mrclrchtr/supi-core": "1.8.0"
+    "@mrclrchtr/supi-code-runtime": "1.9.0",
+    "@mrclrchtr/supi-core": "1.9.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
@@ -44,18 +45,20 @@
   },
   "pi": {
     "extensions": [
-      "./src/extension.ts",
-      "node_modules/@mrclrchtr/supi-core/src/extension.ts"
-    ]
+      "./src/extension.ts"
+    ],
+    "image": "https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-tree-sitter/assets/logo.png"
   },
   "bundledDependencies": [
+    "@mrclrchtr/supi-code-runtime",
     "@mrclrchtr/supi-core"
   ],
   "main": "src/api.ts",
   "exports": {
     "./api": "./src/api.ts",
     "./extension": "./src/extension.ts",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./provider/tree-sitter-provider": "./src/provider/tree-sitter-provider.ts"
   },
   "scripts": {
     "vendor:wasm": "node scripts/vendor-wasm.mjs",

package/node_modules/@mrclrchtr/supi-tree-sitter/src/provider/tree-sitter-provider.ts

@@ -0,0 +1,144 @@
+// Structural provider adapter — wraps TreeSitterService into the shared
+// StructuralProvider contract from supi-code-runtime.
+
+import type {
+  CalleesData,
+  CodeResult,
+  ExportData,
+  ImportData,
+  NodeAtData,
+  OutlineData,
+  StructuralProvider,
+} from "@mrclrchtr/supi-code-runtime/api";
+import type {
+  CalleesAtResult,
+  ExportRecord,
+  ImportRecord,
+  NodeAtResult,
+  OutlineItem,
+  TreeSitterResult,
+  TreeSitterService,
+} from "../types.ts";
+
+/**
+ * Create a StructuralProvider backed by a TreeSitterService.
+ * Maps tree-sitter's nested `range` shapes into the flat range
+ * fields used by the shared code-runtime types.
+ */
+export function createTreeSitterProvider(service: TreeSitterService): StructuralProvider {
+  return {
+    async calleesAt(file, line, character) {
+      const result = await service.calleesAt(file, line, character);
+      return mapTreeSitterResult(result, mapCalleesAtResult);
+    },
+
+    async exports(file) {
+      const result = await service.exports(file);
+      return mapTreeSitterResult(result, mapExportRecords);
+    },
+
+    async outline(file) {
+      const result = await service.outline(file);
+      return mapTreeSitterResult(result, mapOutlineItems);
+    },
+
+    async imports(file) {
+      const result = await service.imports(file);
+      return mapTreeSitterResult(result, mapImportRecords);
+    },
+
+    async nodeAt(file, line, character) {
+      const result = await service.nodeAt(file, line, character);
+      return mapTreeSitterResult(result, mapNodeAtResult);
+    },
+  };
+}
+
+// ── Generic result mapper ─────────────────────────────────────────────
+
+function mapTreeSitterResult<T, U>(
+  result: TreeSitterResult<T>,
+  mapData: (data: T) => U,
+): CodeResult<U> {
+  switch (result.kind) {
+    case "success":
+      return { kind: "success", data: mapData(result.data) };
+    case "unsupported-language":
+      return { kind: "unsupported-language", file: result.file, message: result.message };
+    case "file-access-error":
+      return { kind: "file-access-error", file: result.file, message: result.message };
+    case "validation-error":
+      return { kind: "validation-error", message: result.message };
+    case "runtime-error":
+      return { kind: "runtime-error", message: result.message };
+  }
+}
+
+// ── Data mappers (nested range → flat fields) ─────────────────────────
+
+type RangeLike = {
+  startLine: number;
+  startCharacter: number;
+  endLine: number;
+  endCharacter: number;
+};
+
+function takeRange(r: RangeLike) {
+  return {
+    startLine: r.startLine,
+    startCharacter: r.startCharacter,
+    endLine: r.endLine,
+    endCharacter: r.endCharacter,
+  };
+}
+
+function mapOutlineItems(items: OutlineItem[]): OutlineData[] {
+  return items.map((item) => ({
+    name: item.name,
+    kind: item.kind,
+    ...takeRange(item.range),
+    children: item.children ? mapOutlineItems(item.children) : undefined,
+  }));
+}
+
+function mapExportRecords(records: ExportRecord[]): ExportData[] {
+  return records.map((record) => ({
+    name: record.name,
+    kind: record.kind,
+    ...takeRange(record.range),
+    moduleSpecifier: record.moduleSpecifier,
+  }));
+}
+
+function mapImportRecords(records: ImportRecord[]): ImportData[] {
+  return records.map((record) => ({
+    moduleSpecifier: record.moduleSpecifier,
+    ...takeRange(record.range),
+  }));
+}
+
+function mapNodeAtResult(result: NodeAtResult): NodeAtData {
+  return {
+    type: result.type,
+    ...takeRange(result.range),
+    text: result.text,
+    ancestry: result.ancestry.map((a) => ({
+      type: a.type,
+      ...takeRange(a.range),
+    })),
+  };
+}
+
+function mapCalleesAtResult(result: CalleesAtResult): CalleesData {
+  return {
+    enclosingScope: {
+      name: result.enclosingScope.name,
+      startLine: result.enclosingScope.range.startLine,
+      endLine: result.enclosingScope.range.endLine,
+    },
+    callees: result.callees.map((c) => ({
+      name: c.name,
+      startLine: c.range.startLine,
+    })),
+  };
+}

package/node_modules/@mrclrchtr/supi-tree-sitter/src/session/runtime-registration.ts

@@ -0,0 +1,37 @@
+/**
+ * Tree-sitter-to-runtime capability registration.
+ *
+ * Adapts a TreeSitterService into the runtime's StructuralProvider interface
+ * via the existing tree-sitter-provider adapter, and registers/unregisters it
+ * with the shared WorkspaceRuntime at session lifecycle boundaries.
+ */
+
+import type { WorkspaceRuntime } from "@mrclrchtr/supi-code-runtime/api";
+import { createTreeSitterProvider } from "../provider/tree-sitter-provider.ts";
+import type { TreeSitterService } from "../types.ts";
+
+/**
+ * Register tree-sitter structural capabilities for a workspace cwd.
+ *
+ * Wraps TreeSitterService into a StructuralProvider via the existing
+ * structural adapter and publishes it into the shared workspace runtime.
+ */
+export function registerTreeSitterCapabilities(
+  runtime: WorkspaceRuntime,
+  cwd: string,
+  service: TreeSitterService,
+): void {
+  const provider = createTreeSitterProvider(service);
+  runtime.registerStructural(cwd, provider);
+}
+
+/**
+ * Unregister tree-sitter structural capabilities for a workspace cwd.
+ *
+ * Clears only the structural capability slot — semantic (LSP) state
+ * is left intact so that a tree-sitter session restart does not wipe
+ * LSP capabilities that were registered earlier in the same lifecycle.
+ */
+export function unregisterTreeSitterCapabilities(runtime: WorkspaceRuntime, cwd: string): void {
+  runtime.clearStructural(cwd);
+}

package/node_modules/@mrclrchtr/supi-tree-sitter/src/tree-sitter.ts

@@ -1,7 +1,12 @@
 // Tree-sitter extension entry point — registers 6 focused tree_sitter_* tools.
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { getDefaultWorkspaceRuntime } from "@mrclrchtr/supi-code-runtime/api";
 import { TreeSitterRuntime } from "./session/runtime.ts";
+import {
+  registerTreeSitterCapabilities,
+  unregisterTreeSitterCapabilities,
+} from "./session/runtime-registration.ts";
 import {
   clearSessionTreeSitterService,
   setSessionTreeSitterService,
@@ -10,28 +15,33 @@ import { createTreeSitterService } from "./session/session.ts";
 import { registerFocusedTreeSitterTools } from "./tool/register-tools.ts";
 
 export default function treeSitterExtension(pi: ExtensionAPI) {
-  let runtime: TreeSitterRuntime | undefined;
+  let treeSitterRuntime: TreeSitterRuntime | undefined;
   let activeCwd: string | null = null;
+  const workspaceRuntime = getDefaultWorkspaceRuntime();
 
-  registerFocusedTreeSitterTools(pi, () => runtime);
+  registerFocusedTreeSitterTools(pi, () => treeSitterRuntime);
 
   pi.on("session_start", (_event, ctx) => {
-    if (runtime && activeCwd) {
+    if (treeSitterRuntime && activeCwd) {
+      unregisterTreeSitterCapabilities(workspaceRuntime, activeCwd);
       clearSessionTreeSitterService(activeCwd);
-      runtime.dispose();
+      treeSitterRuntime.dispose();
     }
 
     activeCwd = ctx.cwd;
-    runtime = new TreeSitterRuntime(ctx.cwd);
-    setSessionTreeSitterService(ctx.cwd, createTreeSitterService(runtime));
+    treeSitterRuntime = new TreeSitterRuntime(ctx.cwd);
+    const service = createTreeSitterService(treeSitterRuntime);
+    setSessionTreeSitterService(ctx.cwd, service);
+    registerTreeSitterCapabilities(workspaceRuntime, ctx.cwd, service);
   });
 
   pi.on("session_shutdown", () => {
     if (activeCwd) {
+      unregisterTreeSitterCapabilities(workspaceRuntime, activeCwd);
       clearSessionTreeSitterService(activeCwd);
     }
-    runtime?.dispose();
-    runtime = undefined;
+    treeSitterRuntime?.dispose();
+    treeSitterRuntime = undefined;
     activeCwd = null;
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-intelligence",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "SuPi Code Intelligence extension — architecture briefs, caller/callee analysis, impact assessment, and pattern search for pi",
   "license": "MIT",
   "repository": {
@@ -19,11 +19,13 @@
     "src/**/*.ts"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-lsp": "1.8.0",
-    "@mrclrchtr/supi-core": "1.8.0",
-    "@mrclrchtr/supi-tree-sitter": "1.8.0"
+    "@mrclrchtr/supi-code-runtime": "1.9.0",
+    "@mrclrchtr/supi-core": "1.9.0",
+    "@mrclrchtr/supi-lsp": "1.9.0",
+    "@mrclrchtr/supi-tree-sitter": "1.9.0"
   },
   "bundledDependencies": [
+    "@mrclrchtr/supi-code-runtime",
     "@mrclrchtr/supi-core",
     "@mrclrchtr/supi-lsp",
     "@mrclrchtr/supi-tree-sitter"
@@ -48,9 +50,9 @@
     "extensions": [
       "./src/extension.ts",
       "node_modules/@mrclrchtr/supi-lsp/src/extension.ts",
-      "node_modules/@mrclrchtr/supi-core/src/extension.ts",
       "node_modules/@mrclrchtr/supi-tree-sitter/src/extension.ts"
-    ]
+    ],
+    "image": "https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-code-intelligence/assets/logo.png"
   },
   "main": "src/api.ts",
   "exports": {

package/src/api.ts

@@ -1,27 +1,28 @@
 // Reusable architecture and target-resolution helpers for peer extensions.
+// Non-provider contracts for the code-understanding stack.
 
-export type { ArchitectureModel, DependencyEdge, ModuleInfo } from "./architecture.ts";
+// Provider contracts re-exported from the shared runtime for convenience.
+export type {
+  SemanticProvider,
+  StructuralProvider,
+  StructuralResult,
+} from "@mrclrchtr/supi-code-runtime/api";
+export { generateFocusedBrief, generateOverview, generateProjectBrief } from "./brief.ts";
+// Architecture model hosted locally in supi-code-intelligence.
+export type {
+  ArchitectureModel,
+  DependencyEdge,
+  ModuleInfo,
+} from "./model.ts";
 export {
   buildArchitectureModel,
   findModuleForPath,
   getDependencies,
   getDependents,
-} from "./architecture.ts";
-
-export { generateFocusedBrief, generateOverview, generateProjectBrief } from "./brief.ts";
-export { createSemanticSubstrate } from "./substrates/lsp-adapter.ts";
-export { createStructuralSubstrate } from "./substrates/tree-sitter-adapter.ts";
-
-// Substrate adapters
+} from "./model.ts";
+// Substrate adapters (type aliases for provider contracts)
 export type {
-  CalleesData,
-  CodeSymbol,
-  ExportData,
-  ImportData,
-  NodeAtData,
-  OutlineData,
   SemanticSubstrate,
-  StructuralResult,
   StructuralSubstrate,
 } from "./substrates/types.ts";
 export type { ResolvedTarget, TargetResolutionResult } from "./target-resolution.ts";
@@ -31,13 +32,27 @@ export {
   resolveSymbolTarget,
   toZeroBased,
 } from "./target-resolution.ts";
-
+// Shared canonical types
 export type {
   AffectedDetails,
   BriefDetails,
+  CalleesData,
   CodeIntelResult,
+  CodeLocation,
+  CodePosition,
+  CodeResult,
+  CodeSymbol,
   ConfidenceMode,
   DisambiguationCandidate,
+  ExportData,
+  ImportData,
   MapDetails,
+  NodeAtData,
+  OutlineData,
+  ProviderAvailability,
   SearchDetails,
+  SourceRange,
 } from "./types.ts";
+// Code provider — reads capabilities from the shared workspace runtime.
+export type { CodeProvider, CodeProviderState } from "./workspace/request-context.ts";
+export { getCodeProvider } from "./workspace/request-context.ts";

package/src/brief-focused.ts

@@ -3,9 +3,9 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { ArchitectureModel } from "./architecture.ts";
-import { findModuleForPath, getDependencies, getDependents } from "./architecture.ts";
 import { formatGitContext, gatherGitContext } from "./git-context.ts";
+import type { ArchitectureModel } from "./model.ts";
+import { findModuleForPath, getDependencies, getDependents } from "./model.ts";
 import {
   appendPrioritySignalsSection,
   summarizePrioritySignalsForFiles,

package/src/brief.ts

@@ -1,9 +1,9 @@
 // Public facade — delegates to the new use-case and presentation layers.
 // Existing callers (api.ts, index.ts, code-intelligence.ts) remain compatible.
 
-import type { ArchitectureModel } from "./architecture.ts";
-import { getDependents } from "./architecture.ts";
 import { formatGitContext, gatherGitContext } from "./git-context.ts";
+import type { ArchitectureModel } from "./model.ts";
+import { getDependents } from "./model.ts";
 import { renderOverview } from "./presentation/markdown/overview.ts";
 import type { BriefDetails, ConfidenceMode } from "./types.ts";
 import { buildOverviewData } from "./use-case/build-overview.ts";

package/src/code-intelligence.ts

@@ -1,8 +1,11 @@
 // Code Intelligence extension entry point — registers the focused code-intelligence tools.
 // Provides architecture briefs, project maps, relationship tracing, impact assessment, and pattern search.
+//
+// No longer wires CodeProviders — the substrate packages (supi-lsp, supi-tree-sitter)
+// publish their capabilities directly into the shared workspace runtime.
 
 import type { BeforeAgentStartEventResult, ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { buildArchitectureModel } from "./architecture.ts";
+import { buildArchitectureModel } from "./model.ts";
 import { renderOverview } from "./presentation/markdown/overview.ts";
 import { registerCodeIntelligenceTools } from "./tool/register-tools.ts";
 import { buildOverviewData } from "./use-case/build-overview.ts";
@@ -12,12 +15,17 @@ const OVERVIEW_CUSTOM_TYPE = "code-intelligence-overview";
 /**
  * Register the focused code-intelligence tools and inject a lightweight
  * architecture overview once per session.
+ *
+ * Capabilities are published by substrate packages into the shared
+ * workspace runtime — no local provider wiring needed.
  */
 export default function codeIntelligenceExtension(pi: ExtensionAPI) {
   let hasInjectedOverview = false;
+  let _activeCwd: string | null = null;
 
   pi.on("session_start", (_event, ctx) => {
     hasInjectedOverview = false;
+    _activeCwd = ctx.cwd;
 
     // Scan active branch for existing overview to avoid duplicates on reload/resume
     const branch = ctx.sessionManager.getBranch();
@@ -55,4 +63,8 @@ export default function codeIntelligenceExtension(pi: ExtensionAPI) {
   );
 
   registerCodeIntelligenceTools(pi);
+
+  pi.on("session_shutdown", () => {
+    _activeCwd = null;
+  });
 }

package/src/index.ts

@@ -1,28 +1,27 @@
 // Package root exports for @mrclrchtr/supi-code-intelligence.
 // Peer extensions can import these APIs for programmatic access.
 
-export type { ArchitectureModel, DependencyEdge, ModuleInfo } from "./architecture.ts";
+// Provider contracts re-exported from the shared runtime for convenience.
+export type {
+  SemanticProvider,
+  StructuralProvider,
+  StructuralResult,
+} from "@mrclrchtr/supi-code-runtime/api";
+export { generateFocusedBrief, generateOverview, generateProjectBrief } from "./brief.ts";
+export type {
+  ArchitectureModel,
+  DependencyEdge,
+  ModuleInfo,
+} from "./model.ts";
 export {
   buildArchitectureModel,
   findModuleForPath,
   getDependencies,
   getDependents,
-} from "./architecture.ts";
-
-export { generateFocusedBrief, generateOverview, generateProjectBrief } from "./brief.ts";
-export { createSemanticSubstrate } from "./substrates/lsp-adapter.ts";
-export { createStructuralSubstrate } from "./substrates/tree-sitter-adapter.ts";
-
-// Substrate adapters
+} from "./model.ts";
+// Substrate adapters (type aliases for provider contracts)
 export type {
-  CalleesData,
-  CodeSymbol,
-  ExportData,
-  ImportData,
-  NodeAtData,
-  OutlineData,
   SemanticSubstrate,
-  StructuralResult,
   StructuralSubstrate,
 } from "./substrates/types.ts";
 export type { ResolvedTarget, TargetResolutionResult } from "./target-resolution.ts";
@@ -32,13 +31,27 @@ export {
   resolveSymbolTarget,
   toZeroBased,
 } from "./target-resolution.ts";
-
+// Shared canonical types
 export type {
   AffectedDetails,
   BriefDetails,
+  CalleesData,
   CodeIntelResult,
+  CodeLocation,
+  CodePosition,
+  CodeResult,
+  CodeSymbol,
   ConfidenceMode,
   DisambiguationCandidate,
+  ExportData,
+  ImportData,
   MapDetails,
+  NodeAtData,
+  OutlineData,
+  ProviderAvailability,
   SearchDetails,
+  SourceRange,
 } from "./types.ts";
+// Code provider — reads capabilities from the shared workspace runtime.
+export type { CodeProvider, CodeProviderState } from "./workspace/request-context.ts";
+export { getCodeProvider } from "./workspace/request-context.ts";