@shanepadgett/tau-agent 0.33.1 → 0.35.0

package/shared/settings/load.ts

@@ -1,5 +1,5 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { IsObject, type TSchema } from "typebox";
+import { IsObject, type TObject, type TSchema } from "typebox";
 import { Value } from "typebox/value";
 import type { JsonObject, TauExtensionSettingsSpec } from "./define.ts";
 import { asObject, readJsonStatus, writeJsonObject } from "./json.ts";
@@ -63,6 +63,47 @@ function extensionSection(root: JsonObject, key: string): JsonObject | undefined
 
 const NO_DEFAULT = Symbol("no-default");
 
+function repairKnownProperties(
+	schema: TObject,
+	valueObject: JsonObject,
+	defaultObject: JsonObject | undefined,
+): JsonObject | typeof NO_DEFAULT {
+	const repaired: JsonObject = {};
+	const required = new Set(Array.isArray(schema.required) ? schema.required : []);
+	for (const [key, propertySchema] of Object.entries(schema.properties)) {
+		if (!Object.hasOwn(valueObject, key)) {
+			if (!required.has(key)) continue;
+			const requiredDefault = propertyDefault(propertySchema, defaultObject, key);
+			if (requiredDefault === NO_DEFAULT) return NO_DEFAULT;
+			repaired[key] = Value.Clone(requiredDefault);
+			continue;
+		}
+
+		const propertyValue = replaceInvalidProperties(
+			propertySchema,
+			valueObject[key],
+			propertyDefault(propertySchema, defaultObject, key),
+		);
+		if (propertyValue !== NO_DEFAULT) repaired[key] = propertyValue;
+		else if (required.has(key)) return NO_DEFAULT;
+	}
+	return repaired;
+}
+
+function repairAdditionalProperties(schema: TObject, valueObject: JsonObject, repaired: JsonObject): void {
+	const additionalProperties = asObject(schema)?.additionalProperties;
+	if (additionalProperties === false) return;
+	for (const [key, additionalValue] of Object.entries(valueObject)) {
+		if (Object.hasOwn(schema.properties, key)) continue;
+		if (additionalProperties === undefined || additionalProperties === true) {
+			repaired[key] = additionalValue;
+			continue;
+		}
+		const repairedAdditional = replaceInvalidProperties(additionalProperties as TSchema, additionalValue, NO_DEFAULT);
+		if (repairedAdditional !== NO_DEFAULT) repaired[key] = repairedAdditional;
+	}
+}
+
 function replaceInvalidProperties(
 	schema: TSchema,
 	value: unknown,
@@ -73,43 +114,9 @@ function replaceInvalidProperties(
 	const valueObject = asObject(value);
 	if (IsObject(schema) && valueObject) {
 		const defaultObject = documentedDefault === NO_DEFAULT ? undefined : asObject(documentedDefault);
-		const repaired: JsonObject = {};
-		const required = new Set(Array.isArray(schema.required) ? schema.required : []);
-		for (const [key, propertySchema] of Object.entries(schema.properties)) {
-			if (!Object.hasOwn(valueObject, key)) {
-				if (!required.has(key)) continue;
-				const requiredDefault = propertyDefault(propertySchema, defaultObject, key);
-				if (requiredDefault === NO_DEFAULT) return validatedDefault(schema, documentedDefault);
-				repaired[key] = Value.Clone(requiredDefault);
-				continue;
-			}
-
-			const propertyValue = replaceInvalidProperties(
-				propertySchema,
-				valueObject[key],
-				propertyDefault(propertySchema, defaultObject, key),
-			);
-			if (propertyValue !== NO_DEFAULT) repaired[key] = propertyValue;
-			else if (required.has(key)) return validatedDefault(schema, documentedDefault);
-		}
-
-		const schemaObject = asObject(schema);
-		const additionalProperties = schemaObject?.additionalProperties;
-		if (additionalProperties !== false) {
-			for (const [key, additionalValue] of Object.entries(valueObject)) {
-				if (Object.hasOwn(schema.properties, key)) continue;
-				if (additionalProperties === undefined || additionalProperties === true) repaired[key] = additionalValue;
-				else {
-					const repairedAdditional = replaceInvalidProperties(
-						additionalProperties as TSchema,
-						additionalValue,
-						NO_DEFAULT,
-					);
-					if (repairedAdditional !== NO_DEFAULT) repaired[key] = repairedAdditional;
-				}
-			}
-		}
-
+		const repaired = repairKnownProperties(schema, valueObject, defaultObject);
+		if (repaired === NO_DEFAULT) return validatedDefault(schema, documentedDefault);
+		repairAdditionalProperties(schema, valueObject, repaired);
 		if (Value.Check(schema, repaired)) return repaired;
 	}
 

package/shared/temporary-output-store.ts

@@ -126,6 +126,7 @@ export class TemporaryOutputStore {
 		return writer;
 	}
 
+	// fallow-ignore-next-line unused-class-member -- called via createTemporaryOutputStore() from explore session lifecycle
 	async shutdown(): Promise<void> {
 		if (this.shutdownPromise) return this.shutdownPromise;
 		this.shutdownPromise = this.performShutdown();
@@ -177,6 +178,20 @@ export class TemporaryOutputStore {
 		this.active.delete(writer);
 	}
 
+	private async isRemovableOrphan(path: string): Promise<boolean> {
+		const metadata = await stat(path);
+		if (Date.now() - metadata.mtimeMs < this.orphanLifetimeMs) return false;
+		const marker = JSON.parse(await readFile(join(path, OWNER_FILE), "utf8")) as Partial<OwnerMarker>;
+		if (marker.kind !== "tau-tool-output" || marker.version !== 1 || typeof marker.pid !== "number") return false;
+		try {
+			process.kill(marker.pid, 0);
+			return false;
+		} catch (error) {
+			if (!isErrorCode(error, "ESRCH")) return false;
+		}
+		return true;
+	}
+
 	private async removeStaleOrphans(): Promise<void> {
 		let directory;
 		try {
@@ -188,16 +203,7 @@ export class TemporaryOutputStore {
 			if (!entry.isDirectory() || !entry.name.startsWith(DIRECTORY_PREFIX)) continue;
 			const path = join(this.baseDirectory, entry.name);
 			try {
-				const metadata = await stat(path);
-				if (Date.now() - metadata.mtimeMs < this.orphanLifetimeMs) continue;
-				const marker = JSON.parse(await readFile(join(path, OWNER_FILE), "utf8")) as Partial<OwnerMarker>;
-				if (marker.kind !== "tau-tool-output" || marker.version !== 1 || typeof marker.pid !== "number") continue;
-				try {
-					process.kill(marker.pid, 0);
-					continue;
-				} catch (error) {
-					if (!isErrorCode(error, "ESRCH")) continue;
-				}
+				if (!(await this.isRemovableOrphan(path))) continue;
 				await rm(path, { recursive: true, force: true });
 			} catch {
 				// An untrusted or concurrently changing directory is not ours to remove.

package/{extensions/explore → src}/ast/adapter.ts

@@ -1,5 +1,5 @@
 import type { Tree } from "web-tree-sitter";
-import type { Decl, ImportRef } from "./ir.ts";
+import type { CallSite, Decl, ImportRef } from "./ir.ts";
 import type { PackageSurfaceResolver } from "./package-surface.ts";
 
 export type LanguageCapabilities = {
@@ -8,6 +8,8 @@ export type LanguageCapabilities = {
 	fileDeps: boolean;
 	callEdges: boolean;
 	packageSurface: boolean;
+	/** Interfaces are satisfied by method set, not by naming them (Go). */
+	structuralImplements: boolean;
 };
 
 /**
@@ -25,11 +27,18 @@ export type AstSearchPatternContext = {
 export type ExtractResult = {
 	decls: Decl[];
 	imports: ImportRef[];
+	/** Call sites in top-level statements — outside any declaration body. */
+	fileCalls: CallSite[];
 };
 
-/** Result of adapter-owned import specifier → file resolution. */
+/**
+ * Result of adapter-owned import specifier → file resolution.
+ * `package` is an in-repo directory too large to list file by file — distinct
+ * from `external`, which means "not in this repository".
+ */
 export type FileDepResolution =
 	| { kind: "internal"; paths: string[] }
+	| { kind: "package"; id: string; dir: string; fileCount: number }
 	| { kind: "external"; id: string }
 	| { kind: "unresolved" };
 

package/{extensions/explore → src}/ast/engine.ts

@@ -13,7 +13,7 @@ import type { AdapterRegistry } from "./registry.ts";
 import { createDefaultRegistry } from "./registry.ts";
 import type { FileIr } from "./ir.ts";
 import { grammarWasmPath, loadGrammarManifest, runtimeWasmPath, type GrammarPin } from "./grammars/manifest.ts";
-import { formatPathForDisplay, pathResolutionError, resolveExplorePath } from "../traverse.ts";
+import { formatPathForDisplay, pathResolutionError, resolveExplorePath } from "./traverse.ts";
 
 export type FileSource = {
 	ir: FileIr;
@@ -95,6 +95,40 @@ function pinById(id: string): GrammarPin {
 	return pin;
 }
 
+function isMetaVarStart(c: string): boolean {
+	return (c >= "A" && c <= "Z") || c === "_";
+}
+
+function isMetaVarContinue(c: string): boolean {
+	return isMetaVarStart(c) || (c >= "0" && c <= "9");
+}
+
+function pushUniqueName(list: string[], name: string): void {
+	if (!list.includes(name)) list.push(name);
+}
+
+/** Read `$NAME` / `$$$NAME` starting at `start` (must point at `$`). */
+function readMetaVarAt(pattern: string, start: number): { dollars: number; name: string; next: number } {
+	let i = start;
+	let dollars = 0;
+	while (i < pattern.length && pattern[i] === "$") {
+		dollars += 1;
+		i += 1;
+	}
+	let name = "";
+	while (i < pattern.length) {
+		const c = pattern[i];
+		if (c === undefined) break;
+		if ((name.length === 0 && isMetaVarStart(c)) || (name.length > 0 && isMetaVarContinue(c))) {
+			name += c;
+			i += 1;
+			continue;
+		}
+		break;
+	}
+	return { dollars, name, next: i };
+}
+
 /** ast-grep metavars: `$NAME` one node, `$$$NAME` sibling sequence. Skip `$_`. */
 function metaVarNames(pattern: string): { singles: string[]; multis: string[] } {
 	const singles: string[] = [];
@@ -105,30 +139,11 @@ function metaVarNames(pattern: string): { singles: string[]; multis: string[] }
 			i += 1;
 			continue;
 		}
-		let dollars = 0;
-		while (i < pattern.length && pattern[i] === "$") {
-			dollars += 1;
-			i += 1;
-		}
-		let name = "";
-		while (i < pattern.length) {
-			const c = pattern[i];
-			if (c === undefined) break;
-			const isAlpha = (c >= "A" && c <= "Z") || c === "_";
-			const isAlnum = isAlpha || (c >= "0" && c <= "9");
-			if ((name.length === 0 && isAlpha) || (name.length > 0 && isAlnum)) {
-				name += c;
-				i += 1;
-				continue;
-			}
-			break;
-		}
+		const { dollars, name, next } = readMetaVarAt(pattern, i);
+		i = next;
 		if (name.length === 0 || name === "_") continue;
-		if (dollars >= 3) {
-			if (!multis.includes(name)) multis.push(name);
-		} else if (dollars === 1) {
-			if (!singles.includes(name)) singles.push(name);
-		}
+		if (dollars >= 3) pushUniqueName(multis, name);
+		else if (dollars === 1) pushUniqueName(singles, name);
 	}
 	return { singles, multis };
 }
@@ -228,6 +243,17 @@ export function createExploreEngine(options: ExploreEngineOptions): ExploreEngin
 		}
 	};
 
+	const requireSearchableAdapter = (languageId: string) => {
+		const adapter = registry.adapterForId(languageId);
+		if (adapter === undefined) {
+			throw new Error(`Unregistered language: ${languageId}`);
+		}
+		if (adapter.mode !== "grammar" || !adapter.capabilities.search) {
+			throw new Error(`Language does not support structural search: ${languageId}`);
+		}
+		return adapter;
+	};
+
 	const ensureReady = async (): Promise<Parser> => {
 		assertLive();
 		if (parser !== undefined) return parser;
@@ -257,13 +283,7 @@ export function createExploreEngine(options: ExploreEngineOptions): ExploreEngin
 	const ensureSearchLanguage = async (languageId: string): Promise<void> => {
 		assertLive();
 		if (searchLangReady.has(languageId)) return;
-		const adapter = registry.adapterForId(languageId);
-		if (adapter === undefined) {
-			throw new Error(`Unregistered language: ${languageId}`);
-		}
-		if (adapter.mode !== "grammar" || !adapter.capabilities.search) {
-			throw new Error(`Language does not support structural search: ${languageId}`);
-		}
+		requireSearchableAdapter(languageId);
 		await ensureSearchReady();
 		assertLive();
 		await registerDynamicLanguage({
@@ -320,6 +340,7 @@ export function createExploreEngine(options: ExploreEngineOptions): ExploreEngin
 				lineCount,
 				decls: extracted.decls,
 				imports: extracted.imports,
+				fileCalls: extracted.fileCalls,
 				parseDegraded: false,
 			};
 		}
@@ -342,6 +363,7 @@ export function createExploreEngine(options: ExploreEngineOptions): ExploreEngin
 				lineCount,
 				decls: extracted.decls,
 				imports: extracted.imports,
+				fileCalls: extracted.fileCalls,
 				parseDegraded: tree.rootNode.hasError,
 			};
 		} finally {
@@ -386,13 +408,7 @@ export function createExploreEngine(options: ExploreEngineOptions): ExploreEngin
 
 		async searchInSource(languageId: string, source: string, pattern: string): Promise<AstSearchHit[]> {
 			assertLive();
-			const adapter = registry.adapterForId(languageId);
-			if (adapter === undefined) {
-				throw new Error(`Unregistered language: ${languageId}`);
-			}
-			if (adapter.mode !== "grammar" || !adapter.capabilities.search) {
-				throw new Error(`Language does not support structural search: ${languageId}`);
-			}
+			const adapter = requireSearchableAdapter(languageId);
 			await ensureSearchLanguage(languageId);
 			assertLive();
 

package/{extensions/explore → src}/ast/format/ast-search.ts

@@ -1,27 +1,36 @@
 import type { AstSearchMatch, AstSearchResult } from "../queries/ast-search.ts";
 import type { ScanOutcome } from "../scan.ts";
-import type { TraversalLimit } from "../../traverse.ts";
-import { formatPathForDisplay } from "../../traverse.ts";
+import type { TraversalLimit } from "../traverse.ts";
+import { formatPathForDisplay } from "../traverse.ts";
 
 function lineRange(startLine: number, endLine: number): string {
 	return startLine === endLine ? `L${startLine}` : `L${startLine}-${endLine}`;
 }
 
+/** Head-retained line budget per match. resultLimit caps match count, not match size. */
+const MATCH_MAX_LINES = 12;
+
 function formatMatchRows(match: AstSearchMatch): string[] {
 	const lines: string[] = [];
 	const preview = match.text.length > 0 ? match.text : "(empty)";
 	const previewLines = preview.split("\n");
 	const first = previewLines[0] ?? "(empty)";
 	lines.push(`${lineRange(match.startLine, match.endLine)} ${first}`);
-	for (let i = 1; i < previewLines.length; i += 1) {
+	const shown = Math.min(previewLines.length, MATCH_MAX_LINES);
+	for (let i = 1; i < shown; i += 1) {
 		lines.push(`  ${previewLines[i] ?? ""}`);
 	}
+	if (previewLines.length > shown) {
+		lines.push(`  ... +${previewLines.length - shown} lines`);
+	}
 	for (const binding of match.bindings) {
 		const bindLines = binding.text.split("\n");
-		lines.push(`  $${binding.name} = ${bindLines[0] ?? ""}`);
-		for (let i = 1; i < bindLines.length; i += 1) {
-			lines.push(`    ${bindLines[i] ?? ""}`);
+		// A multi-line capture is a span, not a value — report its size.
+		if (bindLines.length > 1) {
+			lines.push(`  $${binding.name} = <${bindLines.length} lines>`);
+			continue;
 		}
+		lines.push(`  $${binding.name} = ${bindLines[0] ?? ""}`);
 	}
 	if (match.enclosing !== undefined) {
 		lines.push(`  in ${match.enclosing.kind} ${match.enclosing.name} L${match.enclosing.startLine}`);

package/{extensions/explore → src}/ast/format/context.ts

@@ -1,7 +1,7 @@
-import { formatPathForDisplay } from "../../traverse.ts";
+import { formatPathForDisplay } from "../traverse.ts";
 import type { ContextEntry, ContextGroup, ContextResult, ContextTarget } from "../queries/context.ts";
 import { compositeSectionBlocks, type CompositeBlock } from "./composite.ts";
-import { formatCandidateList } from "./relationships.ts";
+import { formatTargetedResult } from "./targeted-result.ts";
 
 function formatTargetHeader(target: ContextTarget, budget: number, used: number, cwd: string): string {
 	const path = formatPathForDisplay(target.path, cwd);
@@ -43,10 +43,7 @@ function formatResolved(result: Extract<ContextResult, { kind: "resolved" }>, cw
 }
 
 export function formatContextResult(result: ContextResult, cwd: string): string {
-	if (result.kind === "error") return result.message;
-	if (result.kind === "notFound") return "No matching declaration.";
-	if (result.kind === "candidates") return formatCandidateList(result.candidates, cwd);
-	return formatResolved(result, cwd);
+	return formatTargetedResult(result, cwd, formatResolved);
 }
 
 export function contextSectionBlocks(

package/src/ast/format/deps.ts

@@ -0,0 +1,94 @@
+import type { FileDepQueryResult } from "../graph/file-graph.ts";
+import { formatPathForDisplay } from "../traverse.ts";
+
+function depthPrefix(depth: number, showDepth: boolean): string {
+	return showDepth ? `d${depth} ` : "";
+}
+
+function commonDirPrefixLength(split: readonly string[][]): number {
+	const first = split[0];
+	if (first === undefined || split.length <= 1) return 0;
+	let common = 0;
+	while (common < first.length - 1) {
+		const part = first[common];
+		if (part === undefined) break;
+		if (!split.every((parts) => parts[common] === part)) break;
+		common += 1;
+	}
+	return common;
+}
+
+/** Factor shared directory prefixes into a small indent tree. */
+function formatInternalTree(rows: readonly { depth: number; display: string }[], showDepth: boolean): string[] {
+	if (rows.length === 0) return [];
+
+	const split = rows.map((row) => row.display.split("/"));
+	const common = commonDirPrefixLength(split);
+	const first = split[0];
+	const lines: string[] = [];
+	if (common > 0 && first !== undefined) {
+		lines.push(first.slice(0, common).join("/"));
+	}
+
+	for (let i = 0; i < rows.length; i += 1) {
+		const row = rows[i];
+		const parts = split[i];
+		if (row === undefined || parts === undefined) continue;
+		const leaf = common > 0 ? parts.slice(common).join("/") : row.display;
+		const indent = common > 0 ? "  " : "";
+		lines.push(`${indent}${depthPrefix(row.depth, showDepth)}${leaf}`);
+	}
+	return lines;
+}
+
+export function formatDepsResult(result: FileDepQueryResult, cwd: string, emptyLabel: string): string {
+	const showDepth = result.depth > 1;
+	const inRepo: { depth: number; display: string }[] = [];
+	const external: { depth: number; id: string }[] = [];
+	for (const hit of result.hits) {
+		if (hit.kind === "internal") {
+			inRepo.push({ depth: hit.depth, display: formatPathForDisplay(hit.path, cwd) });
+			continue;
+		}
+		if (hit.kind === "package") {
+			// In-repo directory, listed as a package because file-by-file would flood.
+			inRepo.push({
+				depth: hit.depth,
+				display: `${formatPathForDisplay(hit.dir, cwd)}/ (${hit.fileCount} files)`,
+			});
+			continue;
+		}
+		external.push({ depth: hit.depth, id: hit.id });
+	}
+
+	if (inRepo.length === 0 && external.length === 0) {
+		return emptyLabel;
+	}
+
+	const lines: string[] = [];
+	lines.push(...formatInternalTree(inRepo, showDepth));
+
+	if (external.length > 0) {
+		lines.push("external:");
+		for (const hit of external) {
+			lines.push(`  ${depthPrefix(hit.depth, showDepth)}${hit.id}`);
+		}
+	}
+	if (result.externalOmitted > 0) {
+		lines.push(`  +${result.externalOmitted} more external`);
+	}
+
+	if (result.resultLimitReached) {
+		lines.push(`omitted (result limit ${result.resultLimit})`);
+	}
+
+	return lines.join("\n");
+}
+
+export function formatDepsEmpty(): string {
+	return "No file dependencies";
+}
+
+export function formatReverseDepsEmpty(): string {
+	return "No reverse file dependencies";
+}

package/{extensions/explore → src}/ast/format/discover.ts

@@ -1,7 +1,7 @@
 import type { DiscoverCandidate, DiscoverResult } from "../queries/discover.ts";
 import type { ScanOutcome } from "../scan.ts";
-import type { TraversalLimit } from "../../traverse.ts";
-import { formatPathForDisplay } from "../../traverse.ts";
+import type { TraversalLimit } from "../traverse.ts";
+import { formatPathForDisplay } from "../traverse.ts";
 
 function lineRange(startLine: number, endLine: number): string {
 	return startLine === endLine ? `L${startLine}` : `L${startLine}-${endLine}`;

package/{extensions/explore → src}/ast/format/impact.ts

@@ -1,7 +1,7 @@
-import { formatPathForDisplay } from "../../traverse.ts";
+import { formatPathForDisplay } from "../traverse.ts";
 import type { ImpactFileRow, ImpactResult, ImpactSection, ImpactSiteRow, ImpactTarget } from "../queries/impact.ts";
 import { compositeSectionBlocks, type CompositeBlock } from "./composite.ts";
-import { formatCandidateList } from "./relationships.ts";
+import { formatTargetedResult } from "./targeted-result.ts";
 
 function formatTargetHeader(target: ImpactTarget, cwd: string): string {
 	const path = formatPathForDisplay(target.path, cwd);
@@ -17,10 +17,11 @@ function formatSiteRow(row: ImpactSiteRow): string {
 
 function formatFileRow(row: ImpactFileRow, cwd: string, showDepth: boolean): string {
 	const depth = showDepth ? `d${row.depth} ` : "";
-	if (row.path !== undefined) {
-		return `  ${depth}${formatPathForDisplay(row.path, cwd)}`;
+	if (row.target.kind === "internal") return `  ${depth}${formatPathForDisplay(row.target.path, cwd)}`;
+	if (row.target.kind === "package") {
+		return `  ${depth}${formatPathForDisplay(row.target.dir, cwd)}/ (${row.target.fileCount} files)`;
 	}
-	return `  ${depth}${row.externalId ?? "?"}`;
+	return `  ${depth}${row.target.id}`;
 }
 
 function formatSection(section: ImpactSection, cwd: string): string[] {
@@ -41,8 +42,8 @@ function formatSection(section: ImpactSection, cwd: string): string[] {
 	}
 
 	if (fileRows.length > 0) {
-		const internal = fileRows.filter((row) => row.path !== undefined);
-		const external = fileRows.filter((row) => row.externalId !== undefined);
+		const internal = fileRows.filter((row) => row.target.kind !== "external");
+		const external = fileRows.filter((row) => row.target.kind === "external");
 		for (const row of internal) {
 			lines.push(formatFileRow(row, cwd, showDepth));
 		}
@@ -80,10 +81,7 @@ function formatResolved(result: Extract<ImpactResult, { kind: "resolved" }>, cwd
 }
 
 export function formatImpactResult(result: ImpactResult, cwd: string): string {
-	if (result.kind === "error") return result.message;
-	if (result.kind === "notFound") return "No matching declaration.";
-	if (result.kind === "candidates") return formatCandidateList(result.candidates, cwd);
-	return formatResolved(result, cwd);
+	return formatTargetedResult(result, cwd, formatResolved);
 }
 
 export function impactSectionBlocks(

package/{extensions/explore → src}/ast/format/outline.ts

@@ -1,7 +1,7 @@
 import type { OutlineFileView, OutlineRow } from "../queries/outline.ts";
 import type { ScanOutcome } from "../scan.ts";
-import type { TraversalLimit } from "../../traverse.ts";
-import { formatPathForDisplay } from "../../traverse.ts";
+import type { TraversalLimit } from "../traverse.ts";
+import { formatPathForDisplay } from "../traverse.ts";
 
 function lineRange(startLine: number, endLine: number): string {
 	return startLine === endLine ? `L${startLine}` : `L${startLine}-${endLine}`;

package/{extensions/explore → src}/ast/format/relationships.ts

@@ -1,13 +1,19 @@
 import type { Candidate } from "../identity.ts";
 import type { RelationshipQueryResult, RelationshipSite, RelationshipTarget } from "../graph/relationships.ts";
-import { formatPathForDisplay } from "../../traverse.ts";
+import { compactSignature } from "../slice.ts";
+import { formatPathForDisplay } from "../traverse.ts";
+
+function candidateParts(candidate: Candidate, cwd: string): { path: string; signature: string } {
+	return {
+		path: formatPathForDisplay(candidate.path, cwd),
+		signature: compactSignature(candidate.signature),
+	};
+}
 
 function formatCompetitors(competitors: readonly Candidate[], cwd: string): string[] {
 	const lines: string[] = [];
 	for (const c of competitors) {
-		const path = formatPathForDisplay(c.path, cwd);
-		const sig = c.signature.replace(/\s+/gu, " ").trim();
-		const short = sig.length > 80 ? `${sig.slice(0, 77)}...` : sig;
+		const { path, signature: short } = candidateParts(c, cwd);
 		lines.push(`    - ${path}:${c.startLine}  ${c.kind} ${c.qualifiedName || c.name}  ${short}`);
 	}
 	return lines;
@@ -57,9 +63,7 @@ function formatResolved(
 export function formatCandidateList(candidates: readonly Candidate[], cwd: string): string {
 	const lines = ["Ambiguous target — disambiguate with targetPath or line:", ""];
 	for (const c of candidates) {
-		const path = formatPathForDisplay(c.path, cwd);
-		const sig = c.signature.replace(/\s+/gu, " ").trim();
-		const short = sig.length > 80 ? `${sig.slice(0, 77)}...` : sig;
+		const { path, signature: short } = candidateParts(c, cwd);
 		lines.push(`${path}:${c.startLine}  ${c.kind} ${c.qualifiedName || c.name}`);
 		if (short.length > 0) lines.push(`  ${short}`);
 	}

package/{extensions/explore → src}/ast/format/show.ts

@@ -1,5 +1,5 @@
 import type { ShowBatch, ShowBlock } from "../queries/show.ts";
-import { formatPathForDisplay } from "../../traverse.ts";
+import { formatPathForDisplay } from "../traverse.ts";
 
 function lineRange(startLine: number, endLine: number): string {
 	return startLine === endLine ? `L${startLine}` : `L${startLine}-${endLine}`;

package/src/ast/format/targeted-result.ts

@@ -0,0 +1,20 @@
+import type { Candidate } from "../identity.ts";
+import { formatCandidateList } from "./relationships.ts";
+
+type TargetedResult<Resolved extends { kind: "resolved" }> =
+	| Resolved
+	| { kind: "candidates"; candidates: Candidate[] }
+	| { kind: "notFound" }
+	| { kind: "error"; message: string };
+
+/** Shared dispatch for query results that resolve one declaration target. */
+export function formatTargetedResult<Resolved extends { kind: "resolved" }>(
+	result: TargetedResult<Resolved>,
+	cwd: string,
+	formatResolved: (resolved: Resolved, cwd: string) => string,
+): string {
+	if (result.kind === "error") return result.message;
+	if (result.kind === "notFound") return "No matching declaration.";
+	if (result.kind === "candidates") return formatCandidateList(result.candidates, cwd);
+	return formatResolved(result, cwd);
+}

package/{extensions/explore → src}/ast/grammars/manifest.json

@@ -1,14 +1,20 @@
 {
 	"webTreeSitter": "0.26.11",
 	"vscodeTreeSitterWasm": "0.3.1",
-	"treeSitterCli": "0.26.11",
-	"wasiSdk": "wasi-sdk-29",
 	"grammars": [
 		{ "id": "typescript", "source": "vscode", "file": "tree-sitter-typescript.wasm" },
 		{ "id": "tsx", "source": "vscode", "file": "tree-sitter-tsx.wasm" },
 		{ "id": "go", "source": "vscode", "file": "tree-sitter-go.wasm" },
 		{ "id": "rust", "source": "vscode", "file": "tree-sitter-rust.wasm" },
-		{ "id": "c_sharp", "source": "vscode", "file": "tree-sitter-c-sharp.wasm" },
+		{
+			"id": "c_sharp",
+			"source": "release",
+			"file": "c_sharp.wasm",
+			"repo": "https://github.com/tree-sitter/tree-sitter-c-sharp",
+			"tag": "v0.23.5",
+			"rev": "cac6d5fb595f5811a076336682d5d595ac1c9e85",
+			"url": "https://github.com/tree-sitter/tree-sitter-c-sharp/releases/download/v0.23.5/tree-sitter-c_sharp.wasm"
+		},
 		{ "id": "java", "source": "vscode", "file": "tree-sitter-java.wasm" },
 		{
 			"id": "kotlin",
@@ -27,15 +33,6 @@
 			"tag": "0.7.3",
 			"rev": "b8b22bffbb3441780e6471665bacfb263741c86a",
 			"url": "https://github.com/alex-pinkus/tree-sitter-swift/releases/download/0.7.3/tree-sitter-swift.wasm"
-		},
-		{
-			"id": "odin",
-			"source": "built",
-			"file": "odin.wasm",
-			"repo": "https://github.com/tree-sitter-grammars/tree-sitter-odin",
-			"tag": "v1.3.0",
-			"rev": "e8adc739b78409a99f8c31313f0bb54cc538cf73",
-			"subdir": "."
 		}
 	]
 }