@mrclrchtr/supi-code-intelligence 1.7.0 → 1.8.0

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

@@ -1,96 +1,30 @@
 // supi-core — shared infrastructure for SuPi extensions.
 // Provides XML context tag wrapping, unified config system, context-message utilities,
 // settings registry for supi-wide TUI settings, and a shared tool-spec/registration framework.
+//
+// Convenience barrel — re-exports all domain entry points.
+// For lighter imports, use one of the domain subpaths directly
+// (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
 
-export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
-export {
-  loadSupiConfig,
-  loadSupiConfigForScope,
-  readJsonFile,
-  removeSupiConfigKey,
-  writeSupiConfig,
-} from "./config/config.ts";
-export type { ConfigSettingsHelpers, ConfigSettingsOptions } from "./config/config-settings.ts";
-export { registerConfigSettings } from "./config/config-settings.ts";
-export type { ContextMessageLike } from "./context/context-messages.ts";
-export {
-  findLastUserMessageIndex,
-  getContextToken,
-  getPromptContent,
-  pruneAndReorderContextMessages,
-  restorePromptContent,
-} from "./context/context-messages.ts";
-export type { ContextProvider } from "./context/context-provider-registry.ts";
-export {
-  clearRegisteredContextProviders,
-  getRegisteredContextProviders,
-  registerContextProvider,
-} from "./context/context-provider-registry.ts";
-export { wrapExtensionContext } from "./context/context-tag.ts";
-export type {
-  DebugAgentAccess,
-  DebugEvent,
-  DebugEventInput,
-  DebugEventQuery,
-  DebugEventQueryResult,
-  DebugEventView,
-  DebugLevel,
-  DebugNotifyLevel,
-  DebugRegistryConfig,
-  DebugSummary,
-} from "./debug-registry.ts";
-export {
-  clearDebugEvents,
-  configureDebugRegistry,
-  DEBUG_REGISTRY_DEFAULTS,
-  getDebugEvents,
-  getDebugRegistryConfig,
-  getDebugSummary,
-  recordDebugEvent,
-  redactDebugData,
-  resetDebugRegistry,
-} from "./debug-registry.ts";
-export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
-export type { KnownRootEntry } from "./project-roots.ts";
-export {
-  buildKnownRootsMap,
-  byPathDepth,
-  dedupeTopmostRoots,
-  findProjectRoot,
-  isWithin,
-  isWithinOrEqual,
-  mergeKnownRoots,
-  resolveKnownRoot,
-  segmentCount,
-  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";
-export {
-  clearRegisteredSettings,
-  getRegisteredSettings,
-  registerSettings,
-} from "./settings/settings-registry.ts";
-export { createInputSubmenu, openSettingsOverlay } from "./settings/settings-ui.ts";
-export type { TitleTarget } from "./terminal.ts";
-export {
-  DONE_SYMBOL,
-  formatTitle,
-  signalBell,
-  signalDone,
-  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";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./config.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./context.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./debug-registry.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./path.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./project.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./session.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./settings.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./settings-ui.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./terminal.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./tool-framework.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./types.ts";

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

@@ -0,0 +1,11 @@
+// supi-core config domain — config loading and config-settings helpers.
+export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
+export {
+  loadSupiConfig,
+  loadSupiConfigForScope,
+  readJsonFile,
+  removeSupiConfigKey,
+  writeSupiConfig,
+} from "./config/config.ts";
+export type { ConfigSettingsHelpers, ConfigSettingsOptions } from "./config/config-settings.ts";
+export { registerConfigSettings } from "./config/config-settings.ts";

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

@@ -0,0 +1,16 @@
+// supi-core context domain — context messages, providers, and XML tags.
+export type { ContextMessageLike } from "./context/context-messages.ts";
+export {
+  findLastUserMessageIndex,
+  getContextToken,
+  getPromptContent,
+  pruneAndReorderContextMessages,
+  restorePromptContent,
+} from "./context/context-messages.ts";
+export type { ContextProvider } from "./context/context-provider-registry.ts";
+export {
+  clearRegisteredContextProviders,
+  getRegisteredContextProviders,
+  registerContextProvider,
+} from "./context/context-provider-registry.ts";
+export { wrapExtensionContext } from "./context/context-tag.ts";

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

@@ -1,96 +1,30 @@
 // supi-core — shared infrastructure for SuPi extensions.
 // Provides XML context tag wrapping, unified config system, context-message utilities,
 // settings registry for supi-wide TUI settings, and a shared tool-spec/registration framework.
+//
+// Convenience barrel — re-exports all domain entry points.
+// For lighter imports, use one of the domain subpaths directly
+// (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
 
-export type { SupiConfigLocation, SupiConfigOptions } from "./config/config.ts";
-export {
-  loadSupiConfig,
-  loadSupiConfigForScope,
-  readJsonFile,
-  removeSupiConfigKey,
-  writeSupiConfig,
-} from "./config/config.ts";
-export type { ConfigSettingsHelpers, ConfigSettingsOptions } from "./config/config-settings.ts";
-export { registerConfigSettings } from "./config/config-settings.ts";
-export type { ContextMessageLike } from "./context/context-messages.ts";
-export {
-  findLastUserMessageIndex,
-  getContextToken,
-  getPromptContent,
-  pruneAndReorderContextMessages,
-  restorePromptContent,
-} from "./context/context-messages.ts";
-export type { ContextProvider } from "./context/context-provider-registry.ts";
-export {
-  clearRegisteredContextProviders,
-  getRegisteredContextProviders,
-  registerContextProvider,
-} from "./context/context-provider-registry.ts";
-export { wrapExtensionContext } from "./context/context-tag.ts";
-export type {
-  DebugAgentAccess,
-  DebugEvent,
-  DebugEventInput,
-  DebugEventQuery,
-  DebugEventQueryResult,
-  DebugEventView,
-  DebugLevel,
-  DebugNotifyLevel,
-  DebugRegistryConfig,
-  DebugSummary,
-} from "./debug-registry.ts";
-export {
-  clearDebugEvents,
-  configureDebugRegistry,
-  DEBUG_REGISTRY_DEFAULTS,
-  getDebugEvents,
-  getDebugRegistryConfig,
-  getDebugSummary,
-  recordDebugEvent,
-  redactDebugData,
-  resetDebugRegistry,
-} from "./debug-registry.ts";
-export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";
-export type { KnownRootEntry } from "./project-roots.ts";
-export {
-  buildKnownRootsMap,
-  byPathDepth,
-  dedupeTopmostRoots,
-  findProjectRoot,
-  isWithin,
-  isWithinOrEqual,
-  mergeKnownRoots,
-  resolveKnownRoot,
-  segmentCount,
-  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";
-export {
-  clearRegisteredSettings,
-  getRegisteredSettings,
-  registerSettings,
-} from "./settings/settings-registry.ts";
-export { createInputSubmenu, openSettingsOverlay } from "./settings/settings-ui.ts";
-export type { TitleTarget } from "./terminal.ts";
-export {
-  DONE_SYMBOL,
-  formatTitle,
-  signalBell,
-  signalDone,
-  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";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./config.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./context.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./debug-registry.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./path.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./project.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./session.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./settings.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./settings-ui.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./terminal.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./tool-framework.ts";
+// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
+export * from "./types.ts";

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

@@ -0,0 +1,2 @@
+// supi-core path domain — file and URI path utilities.
+export { fileToUri, resolveToolPath, stripToolPathPrefix, uriToFile } from "./path-utils.ts";

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

@@ -0,0 +1,15 @@
+// supi-core project domain — project root discovery and traversal.
+export type { KnownRootEntry } from "./project-roots.ts";
+export {
+  buildKnownRootsMap,
+  byPathDepth,
+  dedupeTopmostRoots,
+  findProjectRoot,
+  isWithin,
+  isWithinOrEqual,
+  mergeKnownRoots,
+  resolveKnownRoot,
+  segmentCount,
+  sortRootsBySpecificity,
+  walkProject,
+} from "./project-roots.ts";

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

@@ -0,0 +1,4 @@
+// supi-core session domain — session utilities and registries.
+
+export { createRegistry, createSessionStateRegistry } from "./registry-utils.ts";
+export { getActiveBranchEntries } from "./session-utils.ts";

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

@@ -0,0 +1,2 @@
+// supi-core settings-ui domain — settings TUI components (imports pi-tui at runtime, heavy).
+export { createInputSubmenu, openSettingsOverlay } from "./settings/settings-ui.ts";

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

@@ -0,0 +1,9 @@
+// supi-core settings domain — settings registry (lightweight, type-only pi-tui import).
+
+export { registerSettingsCommand } from "./settings/settings-command.ts";
+export type { SettingsScope, SettingsSection } from "./settings/settings-registry.ts";
+export {
+  clearRegisteredSettings,
+  getRegisteredSettings,
+  registerSettings,
+} from "./settings/settings-registry.ts";

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

@@ -0,0 +1,11 @@
+/** 0-based position used by LSP and code-intelligence internally. */
+export interface CodePosition {
+  line: number;
+  character: number;
+}
+
+/** Normalized location — flat replacement for LSP's nested Location/range shape. */
+export interface CodeLocation {
+  uri: string;
+  range: { start: CodePosition; end: CodePosition };
+}

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

@@ -0,0 +1,2 @@
+// supi-core types domain — shared substrate types (zero dependencies, pure types).
+export type { CodeLocation, CodePosition } from "./substrate-types.ts";

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-tree-sitter",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "SuPi Tree-sitter extension — structural AST analysis for pi",
   "license": "MIT",
   "repository": {
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "web-tree-sitter": "^0.26.8",
-    "@mrclrchtr/supi-core": "1.7.0"
+    "@mrclrchtr/supi-core": "1.8.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",

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

@@ -2,7 +2,7 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { resolveToolPath } from "@mrclrchtr/supi-core/api";
+import { resolveToolPath } from "@mrclrchtr/supi-core/path";
 import type { Language, Parser, Tree } from "web-tree-sitter";
 import { nodeToRange } from "../coordinates.ts";
 import { detectGrammar, resolveGrammarWasmPath } from "../language.ts";

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

@@ -2,7 +2,7 @@
 // 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 { createSessionStateRegistry } from "@mrclrchtr/supi-core/session";
 import type { SessionTreeSitterService, SessionTreeSitterServiceState } from "../types.ts";
 
 const registry = createSessionStateRegistry<SessionTreeSitterServiceState>(

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

@@ -1,31 +1,35 @@
-// Prompt guidance and tool description for the tree_sitter tool.
+// Guidance surfaces for the focused tree_sitter_* tool set.
 //
-// Note: We intentionally do NOT include cross-tool routing (e.g., "use lsp for
-// type info") because this package can be installed standalone without supi-lsp.
+// Derives from tool-specs.ts so prompt surfaces stay in sync with
+// the public tool metadata.
 
-import {
-  formatTreeSitterActionList,
-  getTreeSitterActionNamesByGuidanceGroup,
-} from "./action-specs.ts";
+import { TREE_SITTER_TOOL_SPECS, type TreeSitterToolName } from "./tool-specs.ts";
 
-const jsTsStructureActions = getTreeSitterActionNamesByGuidanceGroup("js-ts-structure")
-  .map((action) => `tree_sitter.${action}(file)`)
-  .join(", ");
+export interface TreeSitterToolPromptSurface {
+  description: string;
+  promptSnippet: string;
+  promptGuidelines: string[];
+}
 
-export const toolDescription = `Tree-sitter tool — parser-level structure and syntax queries for supported files.
+export type TreeSitterToolPromptSurfaceMap = Record<
+  TreeSitterToolName,
+  TreeSitterToolPromptSurface
+>;
 
-Actions: ${formatTreeSitterActionList()}.
+const _DEFAULT_SURFACES = buildTreeSitterToolPromptSurfaces();
 
-Use tree_sitter for exact syntax nodes, shallow structure, parsed imports/exports, outgoing calls, or custom AST queries within one file. file is required for all actions. line and character are 1-based UTF-16 coordinates for node_at and callees. query is required for query. outline, imports, and exports are JavaScript/TypeScript-only; node_at and query work across supported grammars; callees works for many grammars. Relative paths resolve from the session working directory, and a leading @ on file paths is stripped.`;
-
-export const promptGuidelines = [
-  `Use ${jsTsStructureActions} for shallow JavaScript or TypeScript structure without reading the whole file.`,
-  "Use tree_sitter.node_at(file, line, character) for the exact syntax node and ancestry at a known position.",
-  "Use tree_sitter.callees(file, line, character) for outgoing calls from the enclosing function or method at a known position.",
-  "Use tree_sitter.query(file, query) for custom Tree-sitter patterns when the built-in actions are not specific enough.",
-  "Use tree_sitter for syntax, node types, source ranges, and other parser-backed structure within one supported file.",
-  "Do not use tree_sitter for type information, cross-file references, semantic renames, or codebase-wide orientation.",
-];
-
-export const promptSnippet =
-  "tree_sitter — parser-backed single-file structure, node lookup, callees, and AST queries";
+/**
+ * Build the full prompt-surface map for all 6 tree_sitter_* tools.
+ */
+export function buildTreeSitterToolPromptSurfaces(): TreeSitterToolPromptSurfaceMap {
+  return Object.fromEntries(
+    TREE_SITTER_TOOL_SPECS.map((spec) => [
+      spec.name,
+      {
+        description: spec.description,
+        promptSnippet: spec.promptSnippet,
+        promptGuidelines: [...spec.promptGuidelines],
+      } satisfies TreeSitterToolPromptSurface,
+    ]),
+  ) as TreeSitterToolPromptSurfaceMap;
+}

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

@@ -0,0 +1,196 @@
+// Per-action handler functions for the focused tree_sitter tool surface.
+//
+// Each handler receives only the parameters it needs (no action dispatch).
+// Handlers are shared between the extension factory (tree-sitter.ts) and the
+// tool registration layer (register-tools.ts).
+
+import { detectGrammar, isJsTsGrammar } from "../language.ts";
+import type { TreeSitterRuntime } from "../session/runtime.ts";
+import {
+  formatNonSuccess,
+  formatOutlineItemsCapped,
+  MAX_ITEMS,
+  truncate,
+  truncatedNotice,
+  truncateText,
+} from "./formatting.ts";
+import { collectOutline } from "./outline.ts";
+import { extractExports, extractImports, lookupCalleesAt, lookupNodeAt } from "./structure.ts";
+
+// ---------------------------------------------------------------------------
+// Outline — JS/TS only
+// ---------------------------------------------------------------------------
+
+export async function handleOutline(runtime: TreeSitterRuntime, file: string): Promise<string> {
+  const parseResult = await runtime.parseFile(file);
+  if (parseResult.kind !== "success") return formatNonSuccess(parseResult);
+  if (!isJsTsGrammar(parseResult.data.grammarId)) {
+    return "Unsupported language: outline is only supported for JavaScript and TypeScript files";
+  }
+
+  const { tree, source } = parseResult.data;
+  let items: ReturnType<typeof collectOutline>;
+  try {
+    items = collectOutline(tree.rootNode, source);
+  } finally {
+    tree.delete();
+  }
+
+  if (items.length === 0) return `No structural declarations found in ${file}`;
+
+  const lines = [`## Outline: ${file}`, ""];
+  const { omitted } = formatOutlineItemsCapped(items, lines, MAX_ITEMS);
+  if (omitted) lines.push("", truncatedNotice(omitted, "outline items"));
+  return lines.join("\n");
+}
+
+// ---------------------------------------------------------------------------
+// Imports — JS/TS only
+// ---------------------------------------------------------------------------
+
+export async function handleImports(runtime: TreeSitterRuntime, file: string): Promise<string> {
+  const grammarId = detectGrammar(file);
+  if (grammarId && !isJsTsGrammar(grammarId)) {
+    return "Unsupported language: imports is only supported for JavaScript and TypeScript files";
+  }
+  const result = await extractImports(runtime, file);
+  if (result.kind !== "success") return formatNonSuccess(result);
+
+  const { data: imports } = result;
+  if (imports.length === 0) return `No imports found in ${file}`;
+
+  const { included, truncated } = truncate(imports, MAX_ITEMS);
+  const lines = [`## Imports: ${file}`, ""];
+  for (const imp of included) {
+    const r = imp.range;
+    lines.push(`- "${imp.moduleSpecifier}" (L${r.startLine}:${r.startCharacter})`);
+  }
+  if (truncated) lines.push("", truncatedNotice(truncated, "imports"));
+  return lines.join("\n");
+}
+
+// ---------------------------------------------------------------------------
+// Exports — JS/TS only
+// ---------------------------------------------------------------------------
+
+export async function handleExports(runtime: TreeSitterRuntime, file: string): Promise<string> {
+  const grammarId = detectGrammar(file);
+  if (grammarId && !isJsTsGrammar(grammarId)) {
+    return "Unsupported language: exports is only supported for JavaScript and TypeScript files";
+  }
+  const result = await extractExports(runtime, file);
+  if (result.kind !== "success") return formatNonSuccess(result);
+
+  const { data: exports } = result;
+  if (exports.length === 0) return `No exports found in ${file}`;
+
+  const { included, truncated } = truncate(exports, MAX_ITEMS);
+  const lines = [`## Exports: ${file}`, ""];
+  for (const exp of included) {
+    const r = exp.range;
+    const from = exp.moduleSpecifier ? ` from "${exp.moduleSpecifier}"` : "";
+    lines.push(`- ${exp.kind}: ${exp.name}${from} (L${r.startLine}:${r.startCharacter})`);
+  }
+  if (truncated) lines.push("", truncatedNotice(truncated, "exports"));
+  return lines.join("\n");
+}
+
+// ---------------------------------------------------------------------------
+// Node at position — all supported grammars
+// ---------------------------------------------------------------------------
+
+export async function handleNodeAt(
+  runtime: TreeSitterRuntime,
+  file: string,
+  line: number,
+  character: number,
+): Promise<string> {
+  const result = await lookupNodeAt(runtime, file, line, character);
+  if (result.kind !== "success") return formatNonSuccess(result);
+
+  const { data } = result;
+  const lines = [
+    `## Node at ${file}:${line}:${character}`,
+    "",
+    `**Type:** ${data.type}`,
+    `**Range:** L${data.range.startLine}:${data.range.startCharacter} — L${data.range.endLine}:${data.range.endCharacter}`,
+    `**Text:** ${truncateText(data.text, 200)}`,
+  ];
+
+  if (data.ancestry.length > 0) {
+    lines.push("", "**Ancestry:**");
+    const { included, truncated } = truncate(data.ancestry, MAX_ITEMS);
+    for (const ancestor of included) {
+      lines.push(
+        `- ${ancestor.type} (L${ancestor.range.startLine}:${ancestor.range.startCharacter}-L${ancestor.range.endLine}:${ancestor.range.endCharacter})`,
+      );
+    }
+    if (truncated) lines.push("", truncatedNotice(truncated, "ancestry entries"));
+  }
+
+  return lines.join("\n");
+}
+
+// ---------------------------------------------------------------------------
+// Query — all supported grammars
+// ---------------------------------------------------------------------------
+
+export async function handleQuery(
+  runtime: TreeSitterRuntime,
+  file: string,
+  query: string,
+): Promise<string> {
+  const result = await runtime.queryFile(file, query);
+  if (result.kind !== "success") return formatNonSuccess(result);
+
+  const { data: captures } = result;
+  if (captures.length === 0) return `No matches for query in ${file}`;
+
+  const { included, truncated } = truncate(captures, MAX_ITEMS);
+  const lines = [`## Query results: ${file}`, ""];
+  for (const capture of included) {
+    const r = capture.range;
+    lines.push(
+      `- ${capture.name}: ${capture.nodeType} (L${r.startLine}:${r.startCharacter}-L${r.endLine}:${r.endCharacter})`,
+    );
+    lines.push(`  \`${truncateText(capture.text, 120)}\``);
+  }
+  if (truncated) lines.push("", truncatedNotice(truncated, "captures"));
+  return lines.join("\n");
+}
+
+// ---------------------------------------------------------------------------
+// Callees — many supported grammars
+// ---------------------------------------------------------------------------
+
+export async function handleCallees(
+  runtime: TreeSitterRuntime,
+  file: string,
+  line: number,
+  character: number,
+): Promise<string> {
+  const result = await lookupCalleesAt(runtime, file, line, character);
+  if (result.kind !== "success") return formatNonSuccess(result);
+
+  const { enclosingScope, callees } = result.data;
+  if (callees.length === 0) {
+    return `No outgoing calls found in \`${enclosingScope.name}\` at ${file}:${line}:${character}`;
+  }
+
+  const lines: string[] = [];
+  lines.push(`## Callees: ${file}:${line}:${character}`);
+  lines.push("");
+  lines.push(
+    `**${callees.length} outgoing call${callees.length > 1 ? "s" : ""}** from \`${enclosingScope.name}\` at L${enclosingScope.range.startLine}-L${enclosingScope.range.endLine}`,
+  );
+  lines.push("");
+
+  for (const c of callees.slice(0, MAX_ITEMS)) {
+    lines.push(`- \`${c.name}\` (L${c.range.startLine})`);
+  }
+  if (callees.length > MAX_ITEMS) {
+    lines.push("", truncatedNotice(callees.length - MAX_ITEMS, "callees"));
+  }
+
+  return lines.join("\n");
+}