@mrclrchtr/supi-tree-sitter 11.2.0 → 11.3.0

package/README.md

@@ -82,11 +82,11 @@ The `type` filter accepts `class`, `interface`, `type`, `enum`, `struct`, `union
 ### Extraction limits
 
 - TS/JS, Python, Java, Go, Rust, and C/C++ outlines include nested named declarations and members. They are not complete indexes of local variables, parameters, or anonymous expressions. Other languages retain their existing extraction depth. HTML outlines list only elements with non-empty `id` attributes. SQL outlines list supported `CREATE` declarations and first-level table/type members. LaTeX outlines list section headings and selected command, environment, label, acronym, glossary-entry, and color definitions.
-- TypeScript and TSX use [checked build-time grammar patches](scripts/generate-typescript-wasm.mjs) for type-only star re-exports and arrays of qualified import types such as `import("node:fs").Dirent[]`. Runtime parsing retains the original source and coordinates; other grammar gaps still report recovered syntax.
+- TypeScript and TSX use [checked build-time grammar patches](scripts/generate-typescript-wasm.mjs) for type-only star re-exports, arrays of qualified import types such as `import("node:fs").Dirent[]`, and import types in generic calls such as `read<import("./api").Value>()` or `read<typeof import("./api")>()`. Runtime parsing retains the original source and coordinates; other grammar gaps still report recovered syntax.
 - JavaScript-family imports collect `import` statements, not CommonJS `require()` calls. Exports collect file-level `export` statements, including TypeScript `export =`; they do not collect `module.exports` assignments or nested namespace exports. An eligible `.cjs` file can therefore return no imports or exports.
 - Python imports retain `import`/`from` module targets, including relative prefixes. Java imports retain ordinary/static targets. Go imports retain single/grouped paths. Rust imports retain explicit `use` paths, `extern crate`, and external `mod` names; inline module bodies are not imports. C/C++ imports retain literal quoted and angle-bracket include targets. Grouped paths use explicit syntax only; no files or bindings are resolved. Conditional directives are written evidence, not proof of active dependencies. Dynamic loaders, computed targets, and C++20 module imports remain outside extraction support.
 - LaTeX imports include package, class, source, and bibliography directives. Bibliography directives can refer to `.bib` files, but the grammar does not parse those files.
-- Call-site and callee queries use syntax, not resolved symbol identity. Distinct sites have source ranges; repeated names on one line are not merged. Rust macro invocations are syntax evidence, not expanded calls. JSX tags are not call expressions. Library callee queries work without LSP, but new `code_graph` targets require semantic readiness in Code Intelligence.
+- Call-site and callee queries use syntax, not resolved symbol identity. Distinct sites have source ranges; repeated names on one line are not merged. Rust macro invocations are syntax evidence, not expanded calls. JSX tags and TypeScript/TSX import references in type syntax are excluded; dynamic import expressions remain call sites. Library callee queries work without LSP, but new `code_graph` targets require semantic readiness in Code Intelligence.
 - `.jsx` uses JavaScript; `.tsx` uses the separate TSX grammar. `.h` uses C by default. An explicit session association can select C++ without changing the supported suffix set. `.zsh` and `.ksh` use Bash; this is not complete support for those shell dialects.
 - Go module manifests (`.mod`), Ruby ERB templates (`.erb`), and BibTeX (`.bib`) have [built-in LSP routes](../supi-lsp/README.md#built-in-route-matrix), but no AST grammar. Unlisted extensions, including JSON, YAML, TOML, and CSS, have no grammar. Custom LSP configuration does not add one.
 

package/node_modules/@mrclrchtr/supi-code-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-runtime",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "Shared workspace context and capability contracts for code intelligence",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-code-runtime/src/capability/types.ts

@@ -77,7 +77,9 @@ export interface SemanticProvider {
   ): Promise<CodeQueryResult<DocumentCodeSymbol[]>>;
   /**
    * Collect workspace symbols from routes that can contribute within the
-   * optional canonical path scopes.
+   * optional path scopes. Completeness is relative to those scopes, but data
+   * may include out-of-scope rows; consumers must filter rows themselves.
+   * Policy exclusions proven outside every scope do not make the query partial.
    */
   workspaceSymbols(
     query: string,

package/node_modules/@mrclrchtr/supi-code-runtime/src/query-result.ts

@@ -3,8 +3,17 @@ export interface CodeQueryPartialMetadata {
   /** Automatic path-policy evidence removed from a collected result. */
   readonly automaticPathExclusion?: {
     readonly excludedCount: number;
+    /** Observed policy paths, not canonical navigation paths; retain aliases when presenting exclusions. */
     readonly examples: readonly string[];
   };
+  /**
+   * True when automatic path-policy exclusions are the only reason the result
+   * is partial: every contributing provider branch completed and no coverage
+   * gap was observed. Excluded rows matched paths the workspace policy treats
+   * as out of automatic scope, so the retained rows are the complete in-policy
+   * answer.
+   */
+  readonly exclusionOnly?: boolean;
 }
 
 /**

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-core/src/child-web-tools.ts

@@ -0,0 +1,110 @@
+// Session-provided Web tools for SuPi child sessions (Agent Runs and Reviewer Sessions).
+//
+// The loaded supi-web extension answers a synchronous request on the parent event bus.
+// Consumers never depend on supi-web; when it is absent or provides no tools, the
+// request returns undefined and the child simply lacks Web tools.
+
+import type { ExtensionAPI, ExtensionFactory } from "@earendil-works/pi-coding-agent";
+
+/** Web tools that child sessions may receive when the containing session provides them. */
+export const CHILD_WEB_TOOL_NAMES = [
+  "web_fetch_md",
+  "web_search",
+  "web_docs_search",
+  "web_docs_fetch",
+] as const;
+
+/** One session-provided Web tool name. */
+export type ChildWebToolName = (typeof CHILD_WEB_TOOL_NAMES)[number];
+
+/**
+ * Web tools currently callable in the containing session plus a child-only extension
+ * factory that registers them. The factory must not capture the parent session; it may
+ * capture plain data such as the containing session's configuration directory.
+ */
+export interface ChildWebToolProvision {
+  readonly toolNames: readonly ChildWebToolName[];
+  /** Register the requested subset of `toolNames` in a child session. */
+  readonly createFactory: (toolNames: readonly ChildWebToolName[]) => ExtensionFactory;
+}
+
+/** Plain containing-session data supplied with a child Web tool request. */
+export interface ChildWebToolsRequestContext {
+  /**
+   * Working directory whose SuPi configuration governs Web settings such as Firecrawl.
+   * Children with a different cwd (for example a frozen Review Workspace) keep this policy.
+   */
+  readonly configCwd: string;
+}
+
+type EventBusLike = Pick<ExtensionAPI["events"], "on" | "emit">;
+
+const REQUEST_CHANNEL = "supi:child-web-tools:request";
+const RESPONSE_CHANNEL = "supi:child-web-tools:response";
+
+interface ChildWebToolsRequest extends ChildWebToolsRequestContext {
+  readonly requestId: string;
+}
+
+interface ChildWebToolsResponse {
+  readonly requestId: string;
+  readonly provision: ChildWebToolProvision;
+}
+
+let nextRequestId = 0;
+
+/**
+ * Answer child Web tool requests on the parent event bus. The callback must be synchronous
+ * because Pi's event bus does not await listeners. Returns an unsubscribe function.
+ */
+export function provideChildWebTools(
+  events: EventBusLike,
+  resolve: (context: ChildWebToolsRequestContext) => ChildWebToolProvision | undefined,
+): () => void {
+  return events.on(REQUEST_CHANNEL, (data) => {
+    const request = data as Partial<ChildWebToolsRequest> | undefined;
+    if (typeof request?.requestId !== "string" || typeof request.configCwd !== "string") return;
+    const { requestId, configCwd } = request;
+    const provision = resolve({ configCwd });
+    if (!provision || provision.toolNames.length === 0) return;
+    events.emit(RESPONSE_CHANNEL, { requestId, provision } satisfies ChildWebToolsResponse);
+  });
+}
+
+/** Capture the Web tools the containing session currently provides, if any. */
+export function requestChildWebTools(
+  events: EventBusLike,
+  context: ChildWebToolsRequestContext,
+): ChildWebToolProvision | undefined {
+  const requestId = `child-web-${process.pid}-${++nextRequestId}`;
+  let provision: ChildWebToolProvision | undefined;
+  const unsubscribe = events.on(RESPONSE_CHANNEL, (data) => {
+    const response = data as Partial<ChildWebToolsResponse> | undefined;
+    if (response?.requestId === requestId && response.provision) provision = response.provision;
+  });
+  try {
+    events.emit(REQUEST_CHANNEL, { requestId, ...context } satisfies ChildWebToolsRequest);
+  } finally {
+    unsubscribe();
+  }
+  return provision;
+}
+
+/**
+ * Return the Web tools callable in a session under Pi's exposure rules: active `direct`
+ * tools, plus registered `codemode` and `deferred` tools. `model-only` and `hidden`
+ * tools are not callable.
+ */
+export function callableChildWebToolNames(
+  pi: Pick<ExtensionAPI, "getAllTools" | "getActiveTools">,
+): ChildWebToolName[] {
+  const active = new Set(pi.getActiveTools());
+  const exposures = new Map(
+    pi.getAllTools().map((tool) => [tool.name, tool.exposure ?? "direct"] as const),
+  );
+  return CHILD_WEB_TOOL_NAMES.filter((name) => {
+    const exposure = exposures.get(name);
+    if (exposure === "direct") return active.has(name);
+    return exposure === "codemode" || exposure === "deferred";
+  });
+}

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

@@ -1,5 +1,16 @@
 // supi-core session domain — session utilities and registries.
 
+export type {
+  ChildWebToolName,
+  ChildWebToolProvision,
+  ChildWebToolsRequestContext,
+} from "./child-web-tools.ts";
+export {
+  CHILD_WEB_TOOL_NAMES,
+  callableChildWebToolNames,
+  provideChildWebTools,
+  requestChildWebTools,
+} from "./child-web-tools.ts";
 export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
 export type {
   SessionCapabilitySkill,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-tree-sitter",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "Structural AST analysis for SuPi code intelligence",
   "license": "MIT",
   "repository": {
@@ -36,8 +36,8 @@
   "dependencies": {
     "jiti": "^2.7.0",
     "web-tree-sitter": "^0.27.0",
-    "@mrclrchtr/supi-core": "11.2.0",
-    "@mrclrchtr/supi-code-runtime": "11.2.0"
+    "@mrclrchtr/supi-code-runtime": "11.3.0",
+    "@mrclrchtr/supi-core": "11.3.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/resources/grammars/tsx/tree-sitter-tsx.wasm.json

@@ -18,7 +18,11 @@
     {
       "id": "import-types-as-primary-types-v1",
       "file": "common/define-grammar.js"
+    },
+    {
+      "id": "import-type-generic-calls-v1",
+      "file": "common/define-grammar.js"
     }
   ],
-  "sha256": "c5101ee00725c52a8aa083afa4749b598a5ff884482f80ed114fca18e88629a6"
+  "sha256": "aaa2904a00000d8e058708845172bd3ce7836566c7e16e9ee594c43f4ba4f451"
 }

package/resources/grammars/typescript/tree-sitter-typescript.wasm.json

@@ -18,7 +18,11 @@
     {
       "id": "import-types-as-primary-types-v1",
       "file": "common/define-grammar.js"
+    },
+    {
+      "id": "import-type-generic-calls-v1",
+      "file": "common/define-grammar.js"
     }
   ],
-  "sha256": "db071e260bcfec92f4b11997516dec49393c5086775eb8f090217d38de300c0d"
+  "sha256": "86ba3af6f8214c90f32af1ea82214a0c1da87c9e2f5ea47c19577ba5b6c78bfb"
 }

package/src/tool/call-sites.ts

@@ -2,7 +2,8 @@
 
 import type { CodeRequestControl } from "@mrclrchtr/supi-code-runtime/api";
 import type { CallSiteMatch, GrammarId, TreeSitterResult } from "../types.ts";
-import type { TreeSitterRuntime } from "../worker/runtime.ts";
+import { isTypeOnlyImportCapture } from "../worker/call-context.ts";
+import { queryParsedFile, type TreeSitterRuntime } from "../worker/runtime.ts";
 import { normalizeCallName } from "./call-name.ts";
 
 // ── Per-grammar call-site queries ─────────────────────────────────────
@@ -66,33 +67,47 @@ export async function extractCallSites(
     };
   }
 
-  const queryResult = await runtime.queryFile(filePath, queryStr, control);
-  if (queryResult.kind !== "success" && queryResult.kind !== "partial") return queryResult;
+  const parsed = await runtime.parseFile(filePath, control);
+  if (parsed.kind !== "success") return parsed;
+  const { tree, source } = parsed.data;
+  try {
+    const queryResult = await queryParsedFile(runtime, {
+      file: filePath,
+      grammarId,
+      tree,
+      source,
+      queryString: queryStr,
+      control,
+    });
+    if (queryResult.kind !== "success" && queryResult.kind !== "partial") return queryResult;
 
-  const captures = queryResult.data;
-  const seen = new Set<string>();
-  const matches: CallSiteMatch[] = [];
+    const seen = new Set<string>();
+    const matches: CallSiteMatch[] = [];
 
-  for (const capture of captures) {
-    // Normalize: trim whitespace and collapse internal whitespace to single space
-    const name = normalizeCallName(capture.text, grammarId, capture.nodeType);
-    if (name.length === 0) continue;
+    for (const capture of queryResult.data) {
+      if (isTypeOnlyImportCapture(tree.rootNode, capture, grammarId)) continue;
+      // Normalize: trim whitespace and collapse internal whitespace to single space
+      const name = normalizeCallName(capture.text, grammarId, capture.nodeType);
+      if (name.length === 0) continue;
 
-    // Collapse duplicate captures only when they identify the same source range.
-    const key = `${capture.range.startLine}:${capture.range.startCharacter}:${capture.range.endLine}:${capture.range.endCharacter}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
+      // Collapse duplicate captures only when they identify the same source range.
+      const key = `${capture.range.startLine}:${capture.range.startCharacter}:${capture.range.endLine}:${capture.range.endCharacter}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
 
-    matches.push({
-      name,
-      startLine: capture.range.startLine,
-      startCharacter: capture.range.startCharacter,
-      endLine: capture.range.endLine,
-      endCharacter: capture.range.endCharacter,
-    });
-  }
+      matches.push({
+        name,
+        startLine: capture.range.startLine,
+        startCharacter: capture.range.startCharacter,
+        endLine: capture.range.endLine,
+        endCharacter: capture.range.endCharacter,
+      });
+    }
 
-  return queryResult.kind === "partial"
-    ? { ...queryResult, data: matches }
-    : { kind: "success", data: matches };
+    return queryResult.kind === "partial"
+      ? { ...queryResult, data: matches }
+      : { kind: "success", data: matches };
+  } finally {
+    tree.delete();
+  }
 }

package/src/tool/callees.ts

@@ -6,6 +6,7 @@ import { validatePublicPositionBounds } from "../coordinates.ts";
 import { withSyntaxCompleteness } from "../syntax-errors.ts";
 import type { SyntaxNodeLike } from "../syntax-node.ts";
 import type { GrammarId, SourceRange, TreeSitterResult } from "../types.ts";
+import { isTypeOnlyImportCapture } from "../worker/call-context.ts";
 import { queryParsedFile, type TreeSitterRuntime } from "../worker/runtime.ts";
 import { normalizeCallName } from "./call-name.ts";
 import { createCalleeDisplayName, createSourceLineStarts } from "./callee-display-name.ts";
@@ -384,6 +385,7 @@ function filterCalleeCaptures(
       if (isInInner) continue;
     }
 
+    if (isTypeOnlyImportCapture(enclosingNode, capture, grammarId)) continue;
     const name = normalizeCallName(capture.text, grammarId, capture.nodeType);
     const rangeKey = sourceRangeKey(capture.range);
     if (name.length === 0 || seenRanges.has(rangeKey)) continue;

package/src/worker/call-context.ts

@@ -0,0 +1,44 @@
+import type { Node } from "web-tree-sitter";
+import type { GrammarId, QueryCapture } from "../types.ts";
+
+const TYPE_ONLY_CONTEXTS = new Set([
+  "type_annotation",
+  "type_arguments",
+  "type_parameters",
+  "type_alias_declaration",
+  "type_query",
+  "type_predicate",
+  "interface_declaration",
+  "implements_clause",
+]);
+
+/**
+ * Tree-sitter aliases TypeScript import types to call-expression nodes.
+ * Exclude those erased references without dropping dynamic import expressions.
+ */
+export function isTypeOnlyImportCapture(
+  root: Node,
+  capture: Pick<QueryCapture, "nodeType" | "range">,
+  grammarId: GrammarId,
+): boolean {
+  if (capture.nodeType !== "import" || (grammarId !== "typescript" && grammarId !== "tsx")) {
+    return false;
+  }
+
+  let node = root.descendantForPosition(
+    { row: capture.range.startLine - 1, column: capture.range.startCharacter - 1 },
+    { row: capture.range.endLine - 1, column: capture.range.endCharacter - 1 },
+  );
+  while (node?.parent) {
+    const parent = node.parent;
+    if (TYPE_ONLY_CONTEXTS.has(parent.type)) return true;
+    if (parent.type === "as_expression" || parent.type === "satisfies_expression") {
+      const value = parent.firstNamedChild;
+      if (value && (node.startIndex !== value.startIndex || node.endIndex !== value.endIndex)) {
+        return true;
+      }
+    }
+    node = parent;
+  }
+  return false;
+}