@mrclrchtr/supi-code-intelligence 1.5.0 → 1.7.0

package/node_modules/@mrclrchtr/supi-lsp/src/pattern-matcher.ts

@@ -1,20 +1,15 @@
+import ignore from "ignore";
+
 /** Gitignore-style glob pattern matching for path exclusion.
  *
- * Supports:
- *  - Literal names at any depth: __tests__, build
- *  - Trailing slash directory-only: __tests__ + "/"
- *  - Leading slash root-anchored: "/" + build
- *  - Stars-star-slash recursive: e.g. `**` + "/" + fixtures
- *  - Asterisk single-segment wildcard: *.generated.ts
- *  - Literal paths: packages + "/" + legacy
- */
-
-/**
- * Normalize path separators to forward slashes and trim.
+ * Delegates to the {@link https://github.com/kaelzhang/node-ignore | ignore} package,
+ * which provides battle-tested .gitignore semantics used by ESLint, Prettier, and others.
+ *
+ * Supports full gitignore syntax: literal names, `*` / `?` wildcards, `**` recursive globs,
+ * leading `/` anchored patterns, trailing `/` directory-only patterns, and `!` negation.
+ *
+ * **Note:** Patterns that start with `#` are treated as comments unless escaped with `\#`.
  */
-function normalize(p: string): string {
-  return p.replaceAll("\\", "/").trim();
-}
 
 /**
  * Check whether a project-relative file path matches a gitignore-style glob pattern.
@@ -24,174 +19,6 @@ function normalize(p: string): string {
  * @returns `true` if the file path matches the pattern
  */
 export function isGlobMatch(filePath: string, pattern: string): boolean {
-  const fp = normalize(filePath);
-  const pat = normalize(pattern);
-  if (!fp || !pat) return false;
-
-  // Leading / → anchored to root
-  const anchored = pat.startsWith("/");
-  const noLeadingSlash = anchored ? pat.slice(1) : pat;
-
-  // Trailing / → directory-only
-  const dirOnly = noLeadingSlash.endsWith("/");
-  const cleanPat = dirOnly ? noLeadingSlash.slice(0, -1) : noLeadingSlash;
-
-  if (!cleanPat) return false;
-
-  return matchGlob(fp, cleanPat, { anchored, dirOnly });
-}
-
-interface MatchOptions {
-  anchored: boolean;
-  dirOnly: boolean;
-}
-
-/**
- * Core recursive pattern matching against a multi-segment path.
- */
-function matchGlob(filePath: string, pattern: string, opts: MatchOptions): boolean {
-  // Direct match
-  if (!opts.anchored && !opts.dirOnly && filePath === pattern) return true;
-
-  // Split into segments
-  const pathSegments = filePath.split("/");
-  const patternSegments = pattern.split("/");
-
-  // ** recursive glob
-  if (pattern.startsWith("**/")) {
-    const suffix = pattern.slice(3);
-    return (
-      matchGlob(filePath, suffix, { ...opts, anchored: false }) ||
-      starStarMatch(pathSegments, suffix)
-    );
-  }
-
-  // prefix/**/suffix bounded recursive glob
-  const dstarIdx = pattern.indexOf("/**/");
-  if (dstarIdx !== -1) {
-    const prefix = pattern.slice(0, dstarIdx);
-    const suffix = pattern.slice(dstarIdx + 4);
-    return matchBoundedStar(pathSegments, prefix, suffix);
-  }
-
-  // Single-segment patterns
-  if (patternSegments.length === 1 && !opts.anchored) {
-    return matchSingleSegment(pathSegments, patternSegments[0], opts.dirOnly);
-  }
-
-  // Multi-segment: anchored or unanchored
-  if (opts.anchored) {
-    return matchSegments(pathSegments, patternSegments, opts.dirOnly);
-  }
-
-  // Unanchored multi-segment: try at each starting position
-  return matchUnanchoredSegments(pathSegments, patternSegments, opts.dirOnly);
-}
-
-/**
- * Match a ** recursive suffix across directory levels.
- */
-function starStarMatch(segments: string[], suffix: string): boolean {
-  for (let i = 0; i < segments.length; i++) {
-    const remaining = segments.slice(i).join("/");
-    if (matchGlob(remaining, suffix, { anchored: false, dirOnly: false })) return true;
-  }
-  return false;
-}
-
-/** Match prefix plus star-star-slash plus suffix bounded recursive pattern. */
-function matchBoundedStar(segments: string[], prefix: string, suffix: string): boolean {
-  // Try to find a split point where left matches prefix and right matches suffix
-  for (let i = 1; i < segments.length; i++) {
-    const left = segments.slice(0, i).join("/");
-    const right = segments.slice(i).join("/");
-    if (
-      matchGlob(left, prefix, { anchored: false, dirOnly: false }) &&
-      matchGlob(right, suffix, { anchored: false, dirOnly: false })
-    ) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Match a single-segment pattern against path segments.
- */
-function matchSingleSegment(segments: string[], patternSeg: string, dirOnly: boolean): boolean {
-  const hasGlob = patternSeg.includes("*") || patternSeg.includes("?");
-
-  if (hasGlob) {
-    // Glob pattern matches any segment
-    return segments.some((seg) => simpleMatch(seg, patternSeg));
-  }
-
-  // Literal segment name
-  if (dirOnly) {
-    // Match as directory: any segment except the last (file) one
-    return segments.slice(0, -1).some((seg) => seg === patternSeg);
-  }
-
-  // Match any segment (file or directory)
-  return segments.some((seg) => seg === patternSeg);
-}
-
-/**
- * Try to match multi-segment pattern at each start position.
- */
-function matchUnanchoredSegments(segments: string[], pattern: string[], dirOnly: boolean): boolean {
-  for (let i = 0; i < segments.length; i++) {
-    if (matchSegments(segments.slice(i), pattern, dirOnly)) return true;
-  }
-  return false;
-}
-
-/** Match segments from start. Returns true if all pattern segments match contiguously. */
-function matchSegments(segments: string[], pattern: string[], dirOnly: boolean): boolean {
-  if (pattern.length > segments.length) return false;
-
-  for (let i = 0; i < pattern.length; i++) {
-    if (!matchSegmentAtIndex(segments, pattern, i)) return false;
-  }
-
-  // dirOnly: last matched segment must not be the last path segment
-  if (dirOnly && pattern.length === segments.length) return false;
-
-  return true;
-}
-
-/** Match a single pattern segment against the corresponding path segment. */
-function matchSegmentAtIndex(segments: string[], pattern: string[], index: number): boolean {
-  const patSeg = pattern[index];
-  const pathSeg = segments[index];
-
-  if (patSeg === "**") {
-    // ** at end matches all remaining segments
-    if (index === pattern.length - 1) return true;
-    // Try rest of pattern from various positions
-    for (let j = index; j < segments.length; j++) {
-      if (matchSegments(segments.slice(j), pattern.slice(index + 1), false)) return true;
-    }
-    return false;
-  }
-
-  return simpleMatch(pathSeg, patSeg);
-}
-
-/**
- * Match a single path segment against a single pattern segment.
- * Supports `*` (any chars except `/`) and `?` (single char).
- */
-function simpleMatch(segment: string, pattern: string): boolean {
-  if (pattern === "*") return true;
-  if (pattern === segment) return true;
-  if (!pattern.includes("*") && !pattern.includes("?")) return false;
-
-  // Convert pattern to simple regex
-  const regexStr = pattern
-    .replace(/[.+^${}()|[\]\\]/g, "\\$&")
-    .replace(/\*/g, "[^/]*")
-    .replace(/\?/g, "[^/]");
-
-  return new RegExp(`^${regexStr}$`).test(segment);
+  if (!filePath || !pattern) return false;
+  return ignore().add(pattern).ignores(filePath);
 }

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

@@ -2,7 +2,7 @@
 // Extracted from lsp.ts to keep file sizes within Biome limits.
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { DetectedProjectServer, ProjectServerInfo } from "../config/types.ts";
+import type { DetectedProjectServer, ProjectServerInfo } from "../config/server-config.ts";
 import type { LspManager } from "../manager/manager.ts";
 import { LSP_TOOL_NAMES } from "../tool/names.ts";
 import type { LspInspectorState } from "../ui/ui.ts";

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

@@ -1,7 +1,7 @@
 // Prompt guidance and tool descriptions for the expert LSP toolset.
 
 import * as path from "node:path";
-import type { ProjectServerInfo } from "../config/types.ts";
+import type { ProjectServerInfo } from "../config/server-config.ts";
 import { LSP_LOOKUP_TOOL, type LspToolName } from "./names.ts";
 import { LSP_TOOL_DEFINITION_SPECS } from "./tool-specs.ts";
 

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

@@ -103,7 +103,7 @@ export const LSP_TOOL_DEFINITION_SPECS = [
     basePromptGuidelines: [
       '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.",
+      "Use lsp_lookup after code_brief, code_map, or tree_sitter has already narrowed the target file and position.",
     ],
     parameters: LookupParameters,
     run: (service, cwd, params) =>

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {
@@ -20,7 +20,8 @@
   ],
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*"
+    "@earendil-works/pi-tui": "*",
+    "typebox": "*"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-coding-agent": {
@@ -28,6 +29,9 @@
     },
     "@earendil-works/pi-tui": {
       "optional": true
+    },
+    "typebox": {
+      "optional": true
     }
   },
   "main": "src/api.ts",

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

@@ -1,11 +1,12 @@
 // supi-core — shared infrastructure for SuPi extensions.
 // Provides XML context tag wrapping, unified config system, context-message utilities,
-// and settings registry for supi-wide TUI settings.
+// settings registry for supi-wide TUI settings, and a shared tool-spec/registration framework.
 
 export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
 export {
   loadSupiConfig,
   loadSupiConfigForScope,
+  readJsonFile,
   removeSupiConfigKey,
   writeSupiConfig,
 } from "./config/config.ts";
@@ -83,3 +84,13 @@ export {
   signalWaiting,
   WAITING_SYMBOL,
 } from "./terminal.ts";
+export type { SuiPiToolPromptSurface, SuiPiToolSpec, ToolExecuteFn } from "./tool-framework.ts";
+export {
+  CharacterParam,
+  derivePromptSurface,
+  FileParam,
+  LineParam,
+  MaxResultsParam,
+  registerSuiPiTools,
+  SymbolParam,
+} from "./tool-framework.ts";

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

@@ -20,7 +20,7 @@ function getProjectConfigPath(cwd: string): string {
   return path.join(cwd, PROJECT_CONFIG_DIR, CONFIG_FILE);
 }
 
-function readJsonFile(filePath: string): Record<string, unknown> | null {
+export function readJsonFile(filePath: string): Record<string, unknown> | null {
   let content: string;
   try {
     content = fs.readFileSync(filePath, "utf-8");

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

@@ -1,11 +1,12 @@
 // supi-core — shared infrastructure for SuPi extensions.
 // Provides XML context tag wrapping, unified config system, context-message utilities,
-// and settings registry for supi-wide TUI settings.
+// settings registry for supi-wide TUI settings, and a shared tool-spec/registration framework.
 
 export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
 export {
   loadSupiConfig,
   loadSupiConfigForScope,
+  readJsonFile,
   removeSupiConfigKey,
   writeSupiConfig,
 } from "./config/config.ts";
@@ -83,3 +84,13 @@ export {
   signalWaiting,
   WAITING_SYMBOL,
 } from "./terminal.ts";
+export type { SuiPiToolPromptSurface, SuiPiToolSpec, ToolExecuteFn } from "./tool-framework.ts";
+export {
+  CharacterParam,
+  derivePromptSurface,
+  FileParam,
+  LineParam,
+  MaxResultsParam,
+  registerSuiPiTools,
+  SymbolParam,
+} from "./tool-framework.ts";

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

@@ -0,0 +1,116 @@
+// Shared tool framework for SuPi extensions.
+//
+// Provides a standard ToolSpec→PromptSurface→registerTool pipeline so
+// individual packages do not duplicate spec interfaces, guidance derivation,
+// registration loops, or common TypeBox parameter schemas.
+
+import type {
+  AgentToolResult,
+  AgentToolUpdateCallback,
+  ExtensionAPI,
+  ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
+import { type TSchema, Type } from "typebox";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+/** Minimum contract for a SuPi tool definition. */
+export interface SuiPiToolSpec {
+  name: string;
+  label: string;
+  description: string;
+  promptSnippet: string;
+  promptGuidelines: string[];
+  parameters: TSchema;
+}
+
+/** Derived prompt surface — what pi flattens into the system prompt. */
+export interface SuiPiToolPromptSurface {
+  description: string;
+  promptSnippet: string;
+  promptGuidelines: string[];
+}
+
+// ---------------------------------------------------------------------------
+// Guidance derivation
+// ---------------------------------------------------------------------------
+
+/**
+ * Static derivation: copies spec fields into a prompt surface.
+ *
+ * Packages that need dynamic guidance (e.g. server-coverage injection) should
+ * build their own surfaces, optionally starting from the output of this helper.
+ */
+export function derivePromptSurface(spec: SuiPiToolSpec): SuiPiToolPromptSurface {
+  return {
+    description: spec.description,
+    promptSnippet: spec.promptSnippet,
+    promptGuidelines: [...spec.promptGuidelines],
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Registration
+// ---------------------------------------------------------------------------
+
+// biome-ignore lint/complexity/useMaxParams: matches pi ToolDefinition.execute signature
+export type ToolExecuteFn = (
+  toolCallId: string,
+  params: unknown,
+  signal: AbortSignal | undefined,
+  onUpdate: AgentToolUpdateCallback<Record<string, unknown>> | undefined,
+  ctx: ExtensionContext,
+) => Promise<AgentToolResult<Record<string, unknown>>>;
+
+/**
+ * Register a set of tools from specs + pre-derived surfaces.
+ *
+ * `createExecute` receives the spec and returns a pi-compatible execute
+ * function.  This keeps execute-logic package-local while the framework owns
+ * the declarative surface and registration boilerplate.
+ */
+export function registerSuiPiTools(
+  pi: ExtensionAPI,
+  specs: readonly SuiPiToolSpec[],
+  surfaces: Record<string, SuiPiToolPromptSurface>,
+  createExecute: (spec: SuiPiToolSpec) => ToolExecuteFn,
+): void {
+  for (const spec of specs) {
+    const surface = surfaces[spec.name];
+    pi.registerTool({
+      name: spec.name,
+      label: spec.label,
+      description: surface?.description ?? spec.description,
+      promptSnippet: surface?.promptSnippet ?? spec.promptSnippet,
+      promptGuidelines: surface?.promptGuidelines ?? [...spec.promptGuidelines],
+      parameters: spec.parameters,
+      execute: createExecute(spec),
+    });
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Shared parameter builders
+// ---------------------------------------------------------------------------
+
+/** File path (relative or absolute). */
+export const FileParam = Type.String({ description: "File path (relative or absolute)" });
+
+/** 1-based line number. */
+export const LineParam = Type.Number({ description: "1-based line number", minimum: 1 });
+
+/** 1-based character column (UTF-16). */
+export const CharacterParam = Type.Number({
+  description: "1-based column number (UTF-16)",
+  minimum: 1,
+});
+
+/** Symbol name for discovery-based resolution. */
+export const SymbolParam = Type.String({
+  description: "Symbol name for discovery-based resolution",
+});
+
+/** Maximum results to return. */
+export const MaxResultsParam = Type.Number({ description: "Maximum results to return" });

package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Max Brunsfeld
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.