token-goat 2.9.18 → 2.9.20

package/dist/{token-goat-chunk-QML7ITHJ.mjs → token-goat-chunk-3VTJC7KU.mjs}

@@ -5,7 +5,7 @@ import {
   isTextHeavy,
   ocrImage,
   ocrIntegrityFailed
-} from "./token-goat-chunk-H3FONFBO.mjs";
+} from "./token-goat-chunk-MNJWG2ZO.mjs";
 import {
   formatSqliteQueryTable,
   formatSqliteSchema,
@@ -13,37 +13,43 @@ import {
   getSqliteSchema,
   getSqliteTables,
   runReadOnlySqliteQuery
-} from "./token-goat-chunk-LMFO66YD.mjs";
+} from "./token-goat-chunk-DA43OE7L.mjs";
 import {
   ImageDecodeError,
+  LARGE_SYMBOL_LINE_THRESHOLD,
   NOTEBOOK_CELL_LINES_SUFFIX,
   SKIP_DIRS,
   canShrinkFormat,
-  capJsonRows,
   emptyIndexMessage,
   enqueueDirtyPathSafe,
-  estimateTokens,
   fenceUntrusted,
   formatSymbolLocation,
   getEmbeddingCoverage,
   getTrackedFiles,
   indexedSourceText,
-  isImagePath,
+  isIgnoredIndexPath,
   isIndexEmptyForProject,
   isPrivateIpv4Octets,
   isPrivateIpv6Groups,
   isVirtualIndexedPath,
   parseIpv6Groups,
   probeImageMeta,
+  recordKnownRootThrottled,
+  resolveLineRegions,
   scanAndRecord,
   searchEvidenceSemantically,
   shrinkImage,
-  trimToBudget,
   urlPolicyDenialReason,
   virtualIndexedScopeNote,
   walkProject
-} from "./token-goat-chunk-BFEWOMA3.mjs";
+} from "./token-goat-chunk-DPHJU3P7.mjs";
+import {
+  capJsonRows,
+  estimateTokens,
+  trimToBudget
+} from "./token-goat-chunk-ZHFM4DHJ.mjs";
 import {
+  BYTES_PER_TOKEN,
   colorStdout,
   isBlobStale,
   loadBlob,
@@ -51,8 +57,8 @@ import {
   redactSecrets,
   savedTokensFromBytes,
   storeBlob,
-  stripAnsi
-} from "./token-goat-chunk-HPOFR6QX.mjs";
+  stripAnsiEscapes
+} from "./token-goat-chunk-K5XPIUVB.mjs";
 import {
   extractPdfMeta,
   extractPdfOutline,
@@ -66,7 +72,7 @@ import {
   parseWhereSpecs,
   profileCsv,
   queryCsv
-} from "./token-goat-chunk-EPXNOKIV.mjs";
+} from "./token-goat-chunk-P4XBHZXU.mjs";
 import {
   MAX_ZIP_INPUT_BYTES,
   MAX_ZIP_OUTPUT_BYTES,
@@ -101,7 +107,7 @@ import {
   extractSolidity,
   extractThrift,
   stripLeadingAttributes
-} from "./token-goat-chunk-GRI6HWX3.mjs";
+} from "./token-goat-chunk-MUJV7BR3.mjs";
 import {
   MAX_OVER_FETCH,
   OVER_FETCH_FACTOR,
@@ -109,12 +115,13 @@ import {
   findContainingSection,
   indexFileSync,
   isAvailable,
+  isImagePath,
   isTreeSitterAvailable,
   listSections,
   mergeNearbyHits,
   readSection,
   searchSemantic
-} from "./token-goat-chunk-W3E65QOW.mjs";
+} from "./token-goat-chunk-ERGHDBC6.mjs";
 import {
   DEFAULT_QUERY_LIMIT,
   countRefs,
@@ -127,7 +134,7 @@ import {
   queryRefsByContext,
   querySymbols,
   searchSymbolsFts
-} from "./token-goat-chunk-I67CPTDD.mjs";
+} from "./token-goat-chunk-K3ZNBN4U.mjs";
 import {
   FILENAME_LANGUAGE,
   TREE_SITTER_LANGUAGES,
@@ -146,7 +153,7 @@ import {
   partialRefsReason,
   redactIfDotenv,
   unsupportedLanguageName
-} from "./token-goat-chunk-L7VCX33I.mjs";
+} from "./token-goat-chunk-T63VHOL3.mjs";
 import {
   fileIsAbsent,
   findProject,
@@ -156,7 +163,7 @@ import {
   loadConfig,
   resolveProjectRoot,
   shortFingerprint
-} from "./token-goat-chunk-CA6V36KW.mjs";
+} from "./token-goat-chunk-74ADIZZX.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-EEIDFMEM.mjs";
@@ -166,6 +173,7 @@ import {
   atomicWriteBytes,
   compileGrepMatcher,
   countNoun,
+  dataDir,
   decodeSource,
   ensureNewline,
   escapeRegExp,
@@ -188,7 +196,7 @@ import {
   supportRequestLine,
   windowsCmdQuoteArg,
   withExtension
-} from "./token-goat-chunk-QIDLJGXZ.mjs";
+} from "./token-goat-chunk-6LJNM4ZZ.mjs";
 import {
   UNTRUSTED_FILE_TAG,
   UNTRUSTED_GITHUB_TAG,
@@ -200,7 +208,7 @@ import {
   normalizePath,
   resolveIndexPath,
   toDisplayPath
-} from "./token-goat-chunk-ERTXEKB6.mjs";
+} from "./token-goat-chunk-NMTKNYGF.mjs";
 import {
   compileGuardedRegex
 } from "./token-goat-chunk-GMOUBOX4.mjs";
@@ -878,6 +886,20 @@ function renderContextWindow(displayFile, matchLine, window, matchSuffix = "", i
   );
 }
 
+// src/emit.ts
+init_define_import_meta_env();
+function emit(text) {
+  const payload = colorStdout() ? text : stripAnsiEscapes(text);
+  process.stdout.write(ensureNewline(payload));
+}
+function emitErr(text) {
+  process.stderr.write(ensureNewline(text));
+}
+
+// src/query_limits.ts
+init_define_import_meta_env();
+var UNBOUNDED_QUERY_LIMIT = -1;
+
 // src/ref_blindness.ts
 init_define_import_meta_env();
 var REF_INDEXED_LANGUAGES = /* @__PURE__ */ new Set([
@@ -932,8 +954,8 @@ import { randomUUID } from "node:crypto";
 // src/graph_traversal.ts
 init_define_import_meta_env();
 var DEFAULT_REF_QUERY_LIMIT = 500;
-var ALL_SYMBOLS_IN_FILE_LIMIT = -1;
-var UNBOUNDED_REF_LIMIT = -1;
+var ALL_SYMBOLS_IN_FILE_LIMIT = UNBOUNDED_QUERY_LIMIT;
+var UNBOUNDED_REF_LIMIT = UNBOUNDED_QUERY_LIMIT;
 function enclosingSymbol(symbols, line) {
   let best = null;
   for (const s of symbols) {
@@ -1273,13 +1295,6 @@ function findCyclesCapped(graph) {
 init_define_import_meta_env();
 import * as fs from "node:fs";
 import * as path2 from "node:path";
-function emit(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function runDead(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
     emitErr(`--top must be a positive number, got: ${opts.top}`);
@@ -1947,21 +1962,14 @@ function renderModules(result, top) {
 }
 
 // src/graph_analysis.ts
-function emit2(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr2(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function runSimilar(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr2(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const sepIdx = opts.spec.lastIndexOf("::");
   if (sepIdx < 0) {
-    emitErr2(`Invalid spec - expected "file::symbol", got: ${opts.spec}`);
+    emitErr(`Invalid spec - expected "file::symbol", got: ${opts.spec}`);
     return 1;
   }
   const top = opts.top ?? 10;
@@ -1974,18 +1982,18 @@ function runSimilar(opts) {
   const matches = hits.filter((h) => !(h.filePath === anchor.filePath && h.name === anchor.name));
   const results = matches.slice(0, top);
   if (matches.length > results.length) {
-    emitErr2(`Showing top ${results.length} of ${matches.length} similar symbols (raise --top to see the rest).`);
+    emitErr(`Showing top ${results.length} of ${matches.length} similar symbols (raise --top to see the rest).`);
   }
   if (opts.json === true) {
-    emit2(displaySafeJson(results.map((h) => ({ name: h.name, kind: h.kind, file: h.filePath, line: h.lineStart }))));
+    emit(displaySafeJson(results.map((h) => ({ name: h.name, kind: h.kind, file: h.filePath, line: h.lineStart }))));
     return 0;
   }
-  for (const h of results) emit2(`${displaySafeText(h.name)}	${displaySafeText(h.kind)}	${formatSymbolLocation(displaySafeText(toDisplayPath(rootDir, h.filePath)), h.lineStart)}`);
+  for (const h of results) emit(`${displaySafeText(h.name)}	${displaySafeText(h.kind)}	${formatSymbolLocation(displaySafeText(toDisplayPath(rootDir, h.filePath)), h.lineStart)}`);
   return 0;
 }
 function runContextFor(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr2(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const top = opts.top ?? 12;
@@ -1995,7 +2003,7 @@ function runContextFor(opts) {
   const moreBeyondTop = fetched.length > top;
   const hits = fetched.slice(0, top);
   if (hits.length === 0) {
-    emitErr2(`No matches found for '${opts.task}'`);
+    emitErr(`No matches found for '${opts.task}'`);
     return 1;
   }
   const entries = [];
@@ -2014,19 +2022,19 @@ function runContextFor(opts) {
     );
   }
   if (moreBeyondTop) notices.push(`More matches exist beyond --top ${top} (raise it to see them).`);
-  for (const n of notices) emitErr2(n);
+  for (const n of notices) emitErr(n);
   if (opts.json === true) {
-    emit2(displaySafeJson(entries));
+    emit(displaySafeJson(entries));
     return 0;
   }
-  for (const e of entries) emit2(`token-goat read "${displaySafeText(toDisplayPath(rootDir, e.file))}::${displaySafeText(e.symbol)}@${e.line}"`);
+  for (const e of entries) emit(`token-goat read "${displaySafeText(toDisplayPath(rootDir, e.file))}::${displaySafeText(e.symbol)}@${e.line}"`);
   return 0;
 }
 function runTestFor(opts) {
   const filePath = resolveIndexPath(opts.file);
   const symbols = querySymbols({ filePath, limit: ALL_SYMBOLS_IN_FILE_LIMIT });
   if (!fs3.existsSync(opts.file) && symbols.length === 0) {
-    emitErr2(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const rootDir = resolveProjectRoot({ project: process.cwd() });
@@ -2051,22 +2059,22 @@ function runTestFor(opts) {
   }
   if (opts.json === true) {
     const capped = guardJsonRows(results.map((r) => ({ ...r, testFile: toDisplayPath(rootDir, r.testFile) })));
-    emit2(displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }));
+    emit(displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }));
     return 0;
   }
   if (results.length === 0) {
-    emit2(`No test files found referencing symbols in '${displaySafeText(opts.file)}'`);
+    emit(`No test files found referencing symbols in '${displaySafeText(opts.file)}'`);
     return 0;
   }
   for (const r of results) {
-    emit2(toDisplayPath(rootDir, r.testFile));
-    for (const fn of r.testFunctions) emit2(`  ${fn}`);
+    emit(toDisplayPath(rootDir, r.testFile));
+    for (const fn of r.testFunctions) emit(`  ${fn}`);
   }
   return 0;
 }
 function runCoverageGaps(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr2(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const top = opts.top ?? 50;
@@ -2084,30 +2092,30 @@ function runCoverageGaps(opts) {
   }
   const sliced = gaps.slice(0, top);
   if (gaps.length > sliced.length) {
-    emitErr2(`Showing top ${sliced.length} of ${gaps.length} coverage gaps (raise --top to see the rest).`);
+    emitErr(`Showing top ${sliced.length} of ${gaps.length} coverage gaps (raise --top to see the rest).`);
   }
   if (opts.json === true) {
-    emit2(displaySafeJson(sliced));
+    emit(displaySafeJson(sliced));
     return 0;
   }
   if (sliced.length === 0) {
-    emit2("No coverage gaps found.");
-    if (isIndexEmptyForProject(globalDbPath(), rootDir)) emit2(emptyIndexMessage(rootDir));
+    emit("No coverage gaps found.");
+    if (isIndexEmptyForProject(globalDbPath(), rootDir)) emit(emptyIndexMessage(rootDir));
     return 0;
   }
-  for (const g of sliced) emit2(`${displaySafeText(g.name)}	${displaySafeText(g.kind)}	${displaySafeText(toDisplayPath(rootDir, g.file))}:${g.line}`);
+  for (const g of sliced) emit(`${displaySafeText(g.name)}	${displaySafeText(g.kind)}	${displaySafeText(toDisplayPath(rootDir, g.file))}:${g.line}`);
   return 0;
 }
 function runArch(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr2(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const cwd = opts.cwd ?? process.cwd();
   const top = opts.top ?? 10;
   const { files, graph, importedBy, resolve: resolve8 } = buildImportGraph(cwd);
   if (files.length === 0 && opts.json !== true) {
-    emit2(`no tracked files found under '${toDisplayPath(getDisplayRoot(cwd), cwd)}' (is it a git repo?). Nothing to analyse.`);
+    emit(`no tracked files found under '${toDisplayPath(getDisplayRoot(cwd), cwd)}' (is it a git repo?). Nothing to analyse.`);
     return 0;
   }
   const allHubs = [...importedBy.entries()].sort((a, b) => b[1].size - a[1].size).map(([f, importers]) => ({ file: f, importedBy: importers.size }));
@@ -2120,22 +2128,22 @@ function runArch(opts) {
   const moduleResult = opts.modules === true ? detectModules({ files, graph, importedBy, resolve: resolve8 }, cwd, top) : null;
   if (opts.json === true) {
     const modulePayload = moduleResult === null ? {} : { modules: moduleResult.modules, modulesTotal: moduleResult.modulesTotal, modulesTruncated: moduleResult.modules.length < moduleResult.modulesTotal, modularity: moduleResult.modularity, isolatedCount: moduleResult.isolatedCount, crossImports: moduleResult.crossImports, crossImportsTotal: moduleResult.crossImportsTotal, crossImportsTruncated: moduleResult.crossImports.length < moduleResult.crossImportsTotal, noImportEdges: moduleResult.noEdges };
-    emit2(displaySafeJson({ hubs, hubsTotal, hubsTruncated: hubs.length < hubsTotal, entryPoints, entryPointsTotal, entryPointsTruncated: entryPoints.length < entryPointsTotal, cycles, ...cyclesTruncated ? { cyclesTruncated: true } : {}, ...modulePayload }));
+    emit(displaySafeJson({ hubs, hubsTotal, hubsTruncated: hubs.length < hubsTotal, entryPoints, entryPointsTotal, entryPointsTruncated: entryPoints.length < entryPointsTotal, cycles, ...cyclesTruncated ? { cyclesTruncated: true } : {}, ...modulePayload }));
     return 0;
   }
-  emit2(hubs.length < hubsTotal ? `hubs (top ${hubs.length} of ${hubsTotal} most-imported):` : `hubs (${hubsTotal} most-imported):`);
-  for (const h of hubs) emit2(`  ${h.importedBy} importers	${displaySafeText(toDisplayPath(getDisplayRoot(opts.cwd), h.file))}`);
-  emit2(entryPoints.length < entryPointsTotal ? `entry points (imported by nobody, top ${entryPoints.length} of ${entryPointsTotal}):` : `entry points (imported by nobody, ${entryPointsTotal} found):`);
-  for (const e of entryPoints) emit2(`  ${displaySafeText(toDisplayPath(getDisplayRoot(opts.cwd), e.file))}`);
-  emit2(cyclesTruncated ? `cycles (first ${cycles.length}, truncated at the ${MAX_CYCLES}-cycle enumeration limit: more cycles exist):` : `cycles (${cycles.length} found):`);
-  for (const c of cycles) emit2(`  ${c.map((f) => toDisplayPath(getDisplayRoot(opts.cwd), f)).join(" -> ")}`);
-  if (moduleResult !== null) for (const line of renderModules(moduleResult, top)) emit2(line);
+  emit(hubs.length < hubsTotal ? `hubs (top ${hubs.length} of ${hubsTotal} most-imported):` : `hubs (${hubsTotal} most-imported):`);
+  for (const h of hubs) emit(`  ${h.importedBy} importers	${displaySafeText(toDisplayPath(getDisplayRoot(opts.cwd), h.file))}`);
+  emit(entryPoints.length < entryPointsTotal ? `entry points (imported by nobody, top ${entryPoints.length} of ${entryPointsTotal}):` : `entry points (imported by nobody, ${entryPointsTotal} found):`);
+  for (const e of entryPoints) emit(`  ${displaySafeText(toDisplayPath(getDisplayRoot(opts.cwd), e.file))}`);
+  emit(cyclesTruncated ? `cycles (first ${cycles.length}, truncated at the ${MAX_CYCLES}-cycle enumeration limit: more cycles exist):` : `cycles (${cycles.length} found):`);
+  for (const c of cycles) emit(`  ${c.map((f) => toDisplayPath(getDisplayRoot(opts.cwd), f)).join(" -> ")}`);
+  if (moduleResult !== null) for (const line of renderModules(moduleResult, top)) emit(line);
   return 0;
 }
 function runBlame(opts) {
   const sepIdx = opts.spec.lastIndexOf("::");
   if (sepIdx < 0) {
-    emitErr2(`Invalid spec - expected "file::symbol", got: ${displaySafeText(opts.spec)}`);
+    emitErr(`Invalid spec - expected "file::symbol", got: ${displaySafeText(opts.spec)}`);
     return 1;
   }
   const cwd = opts.cwd ?? process.cwd();
@@ -2148,12 +2156,12 @@ function runBlame(opts) {
   try {
     const result = runGit(["blame", "-L", `${start},${end}`, "--", filePath], { cwd });
     if (result.exitCode !== 0) {
-      emitErr2(`git blame failed: ${displaySafeText(result.stderr)}`);
+      emitErr(`git blame failed: ${displaySafeText(result.stderr)}`);
       return 1;
     }
     raw = result.stdout;
   } catch (e) {
-    emitErr2(`git blame failed: ${extractErrorMessage(e)}`);
+    emitErr(`git blame failed: ${extractErrorMessage(e)}`);
     return 1;
   }
   if (opts.json === true) {
@@ -2162,32 +2170,25 @@ function runBlame(opts) {
       if (!m) return { raw: l };
       return { commit: m[2], boundary: m[1] === "^", author: (m[3] ?? "").trim(), date: (m[4] ?? "").trim(), line: Number.parseInt(m[5] ?? "0", 10), content: m[6] };
     });
-    emit2(displaySafeJson({ symbol: sym.name, file: filePath, lines }));
+    emit(displaySafeJson({ symbol: sym.name, file: filePath, lines }));
     return 0;
   }
-  emit2(`${displaySafeText(sym.name)}	${displaySafeText(toDisplayPath(getDisplayRoot(opts.cwd), filePath))}:${start}-${end}`);
-  emit2(fenceUntrusted(raw.trim(), UNTRUSTED_FILE_TAG));
+  emit(`${displaySafeText(sym.name)}	${displaySafeText(toDisplayPath(getDisplayRoot(opts.cwd), filePath))}:${start}-${end}`);
+  emit(fenceUntrusted(raw.trim(), UNTRUSTED_FILE_TAG));
   return 0;
 }
 
 // src/graph_commands.ts
-function emit3(text) {
-  const payload = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(payload));
-}
-function emitErr3(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function runCallers(opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
-    emitErr3(`--limit must be a positive number, got: ${opts.limit}`);
+    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
     return 1;
   }
   const rootDir = resolveProjectRoot({ project: process.cwd() });
   const { name, file } = parseGraphSymbolSpec(opts.symbol);
   const fileHint = file !== void 0 ? resolveIndexPath(file, rootDir) : void 0;
   if (fileHint !== void 0 && querySymbols({ name, filePath: fileHint, limit: 1 }).length === 0) {
-    emitErr3(`Symbol '${name}' not found in '${file}'`);
+    emitErr(`Symbol '${name}' not found in '${file}'`);
     return 1;
   }
   const unbounded = opts.excludeTests === true || opts.grep !== void 0 || fileHint !== void 0;
@@ -2204,41 +2205,41 @@ function runCallers(opts) {
   if (entries.length === 0) {
     if (matchesGrep !== void 0 && preGrepCount > 0) {
       if (opts.json === true) {
-        emit3(displaySafeJson({ items: [], truncated: false, totalCount: 0, hiddenByGrep: preGrepCount }));
+        emit(displaySafeJson({ items: [], truncated: false, totalCount: 0, hiddenByGrep: preGrepCount }));
         return 0;
       }
-      emit3(grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "caller", "callers"));
+      emit(grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "caller", "callers"));
       return 0;
     }
     if (opts.excludeTests === true && suppressed > 0) {
       if (opts.json === true) {
-        emit3(displaySafeJson({ items: [], truncated: false, totalCount: 0, hiddenByExcludeTests: suppressed }));
+        emit(displaySafeJson({ items: [], truncated: false, totalCount: 0, hiddenByExcludeTests: suppressed }));
         return 1;
       }
-      emitErr3(`No non-test references found for '${opts.symbol}' (${excludeTestsHiddenNote(suppressed)})`);
+      emitErr(`No non-test references found for '${opts.symbol}' (${excludeTestsHiddenNote(suppressed)})`);
       return 1;
     }
     const defRows = querySymbols({ name, rootDir, limit: REF_BLIND_DEF_PROBE_LIMIT });
     if (defRows.length === 0) {
-      emitErr3(`Symbol not found: ${opts.symbol}${unknownSymbolSuggestion(name, rootDir)}`);
-      if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr3(emptyIndexMessage(rootDir));
+      emitErr(`Symbol not found: ${opts.symbol}${unknownSymbolSuggestion(name, rootDir)}`);
+      if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr(emptyIndexMessage(rootDir));
       return 1;
     }
     const defPaths = fileHint !== void 0 ? [fileHint] : defRows.map((r) => r.filePath);
     const firstDefPath = defPaths[0];
     if (firstDefPath !== void 0 && defPaths.every((fp) => !isRefIndexedFile(fp))) {
-      emitErr3(refBlindLanguageNotice(name, detectLanguageOfFile(firstDefPath), toDisplayPath(rootDir, firstDefPath)));
+      emitErr(refBlindLanguageNotice(name, detectLanguageOfFile(firstDefPath), toDisplayPath(rootDir, firstDefPath)));
       return 1;
     }
     const kindRows = fileHint !== void 0 ? querySymbols({ name, filePath: fileHint, limit: REF_BLIND_DEF_PROBE_LIMIT }) : defRows;
     const kindVerdict = refBlindKindVerdict(kindRows);
     if (kindVerdict.allBlind) {
-      emitErr3(refBlindKindNotice(name, kindVerdict.blindKinds));
+      emitErr(refBlindKindNotice(name, kindVerdict.blindKinds));
       return 1;
     }
-    emitErr3(`No references found for '${opts.symbol}'`);
-    if (kindVerdict.blindCount > 0) emitErr3(refBlindKindPartialNote(name, kindVerdict.blindKinds, kindVerdict.blindCount, kindRows.length));
-    if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr3(emptyIndexMessage(rootDir));
+    emitErr(`No references found for '${opts.symbol}'`);
+    if (kindVerdict.blindCount > 0) emitErr(refBlindKindPartialNote(name, kindVerdict.blindKinds, kindVerdict.blindCount, kindRows.length));
+    if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr(emptyIndexMessage(rootDir));
     return 1;
   }
   const contextLines = opts.context ?? 0;
@@ -2251,7 +2252,7 @@ function runCallers(opts) {
     const capped = guardJsonRows(rows);
     const limitTruncated = entries.length < filtered.length || sqlTruncated;
     const hiddenByGrep = preGrepCount - filtered.length;
-    emit3(displaySafeJson({
+    emit(displaySafeJson({
       items: capped.items,
       truncated: capped.truncated || limitTruncated,
       totalCount: filtered.length,
@@ -2261,19 +2262,24 @@ function runCallers(opts) {
     return 0;
   }
   if (opts.excludeTests === true && suppressed > 0) {
-    emit3(`${countNoun(entries.length, "caller")} found (${excludeTestsHiddenNote(suppressed)})`);
+    emit(`${countNoun(entries.length, "caller")} found (${excludeTestsHiddenNote(suppressed)})`);
+  }
+  const overflowed = sqlTruncated || entries.length < filtered.length;
+  if (overflowed) {
+    const totalCallers = sqlTruncated ? countRefs({ name, rootDir }) : filtered.length;
+    emitErr(`Showing the first ${entries.length} of ${countNoun(totalCallers, "caller")} (raise --limit to see the rest).`);
   }
   for (const e of entries) {
     const displayPath = toDisplayPath(rootDir, e.file);
-    emit3(`${e.caller}	${displayPath}:${e.line}`);
+    emit(`${e.caller}	${displayPath}:${e.line}`);
     const window = buildContextWindow(e.file, e.line, contextLines);
-    if (window !== null) for (const l of renderContextWindow(displayPath, e.line, window, "", "    ")) emit3(l);
+    if (window !== null) for (const l of renderContextWindow(displayPath, e.line, window, "", "    ")) emit(l);
   }
   return 0;
 }
 function runCallChain(opts) {
   if (opts.depth !== void 0 && opts.depth <= 0) {
-    emitErr3(`--depth must be a positive number, got: ${opts.depth}`);
+    emitErr(`--depth must be a positive number, got: ${opts.depth}`);
     return 1;
   }
   const maxDepth = opts.depth ?? 8;
@@ -2282,13 +2288,13 @@ function runCallChain(opts) {
   const fileHint = file !== void 0 ? resolveIndexPath(file, rootDir) : void 0;
   if (fileHint !== void 0) {
     if (querySymbols({ name, filePath: fileHint, limit: 1 }).length === 0) {
-      emitErr3(`Symbol '${name}' not found in '${file}'`);
-      if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr3(emptyIndexMessage(rootDir));
+      emitErr(`Symbol '${name}' not found in '${file}'`);
+      if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr(emptyIndexMessage(rootDir));
       return 1;
     }
   } else if (querySymbols({ name, rootDir, limit: 1 }).length === 0) {
-    emitErr3(`Symbol not found: ${opts.symbol}${unknownSymbolSuggestion(name, rootDir)}`);
-    if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr3(emptyIndexMessage(rootDir));
+    emitErr(`Symbol not found: ${opts.symbol}${unknownSymbolSuggestion(name, rootDir)}`);
+    if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir)) emitErr(emptyIndexMessage(rootDir));
     return 1;
   }
   const refBlindRootPath = () => {
@@ -2326,7 +2332,7 @@ function runCallChain(opts) {
     const refBlindKinds = noCallers ? refBlindRootKinds().blindKinds : [];
     const blindRootPath = noCallers ? refBlindRootPath() : void 0;
     const refBlindLanguage = blindRootPath !== void 0 ? { language: detectLanguageOfFile(blindRootPath), definedIn: toDisplayPath(rootDir, blindRootPath) } : void 0;
-    emit3(displaySafeJson({
+    emit(displaySafeJson({
       chains: filteredChains,
       ...hiddenByGrep > 0 ? { hiddenByGrep } : {},
       ...hiddenByExcludeTests > 0 ? { hiddenByExcludeTests } : {},
@@ -2337,37 +2343,37 @@ function runCallChain(opts) {
   }
   if (noCallers) {
     if (opts.excludeTests === true && suppressedCount > 0) {
-      emit3(`${name}  (no non-test callers; ${excludeTestsHiddenNote(suppressedCount)})`);
+      emit(`${name}  (no non-test callers; ${excludeTestsHiddenNote(suppressedCount)})`);
       return 0;
     }
     const blindRoot = refBlindRootPath();
     if (blindRoot !== void 0) {
-      emitErr3(refBlindLanguageNotice(name, detectLanguageOfFile(blindRoot), toDisplayPath(rootDir, blindRoot)));
-      emit3(`${name}  (no callers recorded)`);
+      emitErr(refBlindLanguageNotice(name, detectLanguageOfFile(blindRoot), toDisplayPath(rootDir, blindRoot)));
+      emit(`${name}  (no callers recorded)`);
       return 0;
     }
     const rootKinds = refBlindRootKinds();
     if (rootKinds.allBlind) {
-      emitErr3(refBlindKindNotice(name, rootKinds.blindKinds));
-      emit3(`${name}  (no callers recorded)`);
+      emitErr(refBlindKindNotice(name, rootKinds.blindKinds));
+      emit(`${name}  (no callers recorded)`);
       return 0;
     }
-    emit3(`${name}  (no callers)`);
-    if (rootKinds.blindCount > 0) emitErr3(refBlindKindPartialNote(name, rootKinds.blindKinds, rootKinds.blindCount, rootKinds.total));
+    emit(`${name}  (no callers)`);
+    if (rootKinds.blindCount > 0) emitErr(refBlindKindPartialNote(name, rootKinds.blindKinds, rootKinds.blindCount, rootKinds.total));
     return 0;
   }
   if (matchesGrep !== void 0 && filteredChains.length === 0) {
-    emit3(grepFilteredToEmptyNotice(chains.length, opts.grep, "chain", "chains"));
+    emit(grepFilteredToEmptyNotice(chains.length, opts.grep, "chain", "chains"));
     return 0;
   }
   for (const chain of filteredChains) {
-    emit3(chain.join(" -> "));
+    emit(chain.join(" -> "));
   }
   return 0;
 }
 function runImpact(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr3(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const top = opts.top ?? 20;
@@ -2376,7 +2382,7 @@ function runImpact(opts) {
   const { name: rootName, file } = parseGraphSymbolSpec(opts.symbol);
   const fileHint = file !== void 0 ? resolveIndexPath(file, rootDir) : void 0;
   if (fileHint !== void 0 && querySymbols({ name: rootName, filePath: fileHint, limit: 1 }).length === 0) {
-    emitErr3(`Symbol '${rootName}' not found in '${file}'`);
+    emitErr(`Symbol '${rootName}' not found in '${file}'`);
     return 1;
   }
   const getSyms = buildFileSymCache();
@@ -2421,64 +2427,64 @@ function runImpact(opts) {
   const grepped = matchesGrep !== void 0 ? allSorted.filter(([symbol]) => matchesGrep(symbol)) : allSorted;
   const sorted = grepped.slice(0, top);
   if (depthCapped > 0) {
-    emitErr3(`Impact truncated at the ${DEPTH_CAP}-hop depth limit: ${depthCapped} symbol${depthCapped === 1 ? "" : "s"} at that depth ${depthCapped === 1 ? "was" : "were"} not expanded, so callers reachable only beyond ${DEPTH_CAP} hops are missing.`);
+    emitErr(`Impact truncated at the ${DEPTH_CAP}-hop depth limit: ${depthCapped} symbol${depthCapped === 1 ? "" : "s"} at that depth ${depthCapped === 1 ? "was" : "were"} not expanded, so callers reachable only beyond ${DEPTH_CAP} hops are missing.`);
   }
   if (grepped.length > sorted.length) {
-    emitErr3(`Showing top ${sorted.length} of ${grepped.length} impacted symbols (raise --top to see the rest).`);
+    emitErr(`Showing top ${sorted.length} of ${grepped.length} impacted symbols (raise --top to see the rest).`);
   }
   if (matchesGrep !== void 0 && sorted.length === 0 && allSorted.length > 0) {
     if (opts.json === true) {
-      emitErr3(grepFilteredToEmptyNotice(allSorted.length, opts.grep, "impacted symbol", "impacted symbols"));
-      emit3(displaySafeJson([]));
+      emitErr(grepFilteredToEmptyNotice(allSorted.length, opts.grep, "impacted symbol", "impacted symbols"));
+      emit(displaySafeJson([]));
       return 0;
     }
-    emit3(grepFilteredToEmptyNotice(allSorted.length, opts.grep, "impacted symbol", "impacted symbols"));
+    emit(grepFilteredToEmptyNotice(allSorted.length, opts.grep, "impacted symbol", "impacted symbols"));
     return 0;
   }
   if (sorted.length === 0) {
     if (opts.excludeTests === true && suppressedCount > 0) {
       if (opts.json === true) {
-        emit3(displaySafeJson([]));
+        emit(displaySafeJson([]));
         return 1;
       }
-      emitErr3(`No non-test impact found for '${opts.symbol}' (${excludeTestsHiddenNote(suppressedCount)})`);
+      emitErr(`No non-test impact found for '${opts.symbol}' (${excludeTestsHiddenNote(suppressedCount)})`);
       return 1;
     }
     const defRows = querySymbols({ name: rootName, rootDir, limit: REF_BLIND_DEF_PROBE_LIMIT });
     if (defRows.length === 0) {
-      emitErr3(`Symbol not found: ${opts.symbol}${unknownSymbolSuggestion(rootName, rootDir)}`);
+      emitErr(`Symbol not found: ${opts.symbol}${unknownSymbolSuggestion(rootName, rootDir)}`);
       return 1;
     }
     const defPaths = fileHint !== void 0 ? [fileHint] : defRows.map((r) => r.filePath);
     const firstDefPath = defPaths[0];
     if (firstDefPath !== void 0 && defPaths.every((fp) => !isRefIndexedFile(fp))) {
-      emitErr3(refBlindLanguageNotice(rootName, detectLanguageOfFile(firstDefPath), toDisplayPath(rootDir, firstDefPath)));
+      emitErr(refBlindLanguageNotice(rootName, detectLanguageOfFile(firstDefPath), toDisplayPath(rootDir, firstDefPath)));
       return 1;
     }
     const kindRows = fileHint !== void 0 ? querySymbols({ name: rootName, filePath: fileHint, limit: REF_BLIND_DEF_PROBE_LIMIT }) : defRows;
     const kindVerdict = refBlindKindVerdict(kindRows);
     if (kindVerdict.allBlind) {
-      emitErr3(refBlindKindNotice(rootName, kindVerdict.blindKinds));
+      emitErr(refBlindKindNotice(rootName, kindVerdict.blindKinds));
       return 1;
     }
-    emitErr3(`No callers found for '${opts.symbol}'`);
-    if (kindVerdict.blindCount > 0) emitErr3(refBlindKindPartialNote(rootName, kindVerdict.blindKinds, kindVerdict.blindCount, kindRows.length));
+    emitErr(`No callers found for '${opts.symbol}'`);
+    if (kindVerdict.blindCount > 0) emitErr(refBlindKindPartialNote(rootName, kindVerdict.blindKinds, kindVerdict.blindCount, kindRows.length));
     return 1;
   }
   if (opts.json === true) {
-    emit3(displaySafeJson(sorted.map(([symbol, h]) => ({ symbol, hops: h }))));
+    emit(displaySafeJson(sorted.map(([symbol, h]) => ({ symbol, hops: h }))));
     return 0;
   }
   const MODULE_SCOPE_PREFIX = "(module scope) ";
   for (const [symbol, h] of sorted) {
     const displaySymbol = symbol.startsWith(MODULE_SCOPE_PREFIX) ? MODULE_SCOPE_PREFIX + toDisplayPath(rootDir, symbol.slice(MODULE_SCOPE_PREFIX.length)) : symbol;
-    emit3(`${displaySymbol}	(hops: ${h})`);
+    emit(`${displaySymbol}	(hops: ${h})`);
   }
   return 0;
 }
 function runAsk(opts) {
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr3(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const top = opts.top ?? 8;
@@ -2487,7 +2493,7 @@ function runAsk(opts) {
   const moreBeyondTop = fetched.length > top;
   const hits = fetched.slice(0, top);
   if (moreBeyondTop) {
-    emitErr3(`Answer is grounded in the top ${countNoun(top, "match", "matches")}; more matched (raise --top to widen the evidence).`);
+    emitErr(`Answer is grounded in the top ${countNoun(top, "match", "matches")}; more matched (raise --top to widen the evidence).`);
   }
   warnIfFilesStale(hits.map((h) => h.filePath));
   const BACKEND_ENV = "TOKEN_GOAT_ASK_BACKEND";
@@ -2495,12 +2501,12 @@ function runAsk(opts) {
   const entries = hits.map((h) => ({ file: h.filePath, symbol: h.name, kind: h.kind, line: h.lineStart, readCmd: `token-goat read "${h.filePath}::${h.name}@${h.lineStart}"` }));
   const degrade = (reason, extraNote) => {
     if (opts.json === true) {
-      emit3(displaySafeJson({ degraded: true, note: reason, ...extraNote !== void 0 ? { hint: extraNote } : {}, context: entries }));
+      emit(displaySafeJson({ degraded: true, note: reason, ...extraNote !== void 0 ? { hint: extraNote } : {}, context: entries }));
       return 0;
     }
-    emit3(`[degraded mode - ${reason}]`);
-    if (extraNote !== void 0) emit3(extraNote);
-    for (const e of entries) emit3(`token-goat read "${displaySafeText(toDisplayPath(rootDir, e.file))}::${displaySafeText(e.symbol)}@${e.line}"`);
+    emit(`[degraded mode - ${reason}]`);
+    if (extraNote !== void 0) emit(extraNote);
+    for (const e of entries) emit(`token-goat read "${displaySafeText(toDisplayPath(rootDir, e.file))}::${displaySafeText(e.symbol)}@${e.line}"`);
     return 0;
   };
   if (!backendLabel) return degrade(`set ${BACKEND_ENV}=claude|codex for LLM synthesis`);
@@ -2547,9 +2553,9 @@ ANSWER:`;
     }
     if (answer) {
       if (opts.json === true) {
-        emit3(displaySafeJson({ answer, context: entries }));
+        emit(displaySafeJson({ answer, context: entries }));
       } else {
-        emit3(answer);
+        emit(answer);
       }
       return 0;
     }
@@ -3046,6 +3052,17 @@ async function takeScreenshot(url, destPath, opts) {
   return { path: finalPath, originalBytes: buffer.length, finalBytes: finalBuffer.length };
 }
 
+// src/symbol_scan.ts
+init_define_import_meta_env();
+var SYMBOL_SCAN_PAGE = 1e4;
+function forEachSymbol(queryOpts, visit) {
+  for (let offset = 0; ; offset += SYMBOL_SCAN_PAGE) {
+    const rows = querySymbols({ ...queryOpts, limit: SYMBOL_SCAN_PAGE, offset });
+    for (const row of rows) visit(row);
+    if (rows.length < SYMBOL_SCAN_PAGE) return;
+  }
+}
+
 // src/ts_refs.ts
 init_define_import_meta_env();
 import { createRequire } from "node:module";
@@ -7368,7 +7385,7 @@ function fenceHtmlText(text) {
 function runCsvQuery(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const columns = opts.columns ? opts.columns.split(",").map((c) => c.trim()).filter(Boolean) : void 0;
@@ -7376,7 +7393,7 @@ function runCsvQuery(opts) {
   try {
     head = opts.head !== void 0 ? requireNonNegativeStrictInt("--head", opts.head) : void 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
   try {
@@ -7389,7 +7406,7 @@ function runCsvQuery(opts) {
       ...opts.noHeader === true ? { noHeader: true } : {}
     });
     if (result.header.length === 0) {
-      emit4(`No data rows found in ${displaySafeText(opts.file)}`);
+      emit(`No data rows found in ${displaySafeText(opts.file)}`);
       return 0;
     }
     const fullSourceBytes = sumFileSizes([opts.file]);
@@ -7398,23 +7415,23 @@ function runCsvQuery(opts) {
       const headTruncated = result.rows.length < result.totalRows;
       const capped = guardJsonRows(rowsJson);
       const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated || headTruncated, totalCount: result.totalRows, ...result.totalRows === 0 && result.preFilterRows > 0 ? { filteredFromRows: result.preFilterRows } : {} }, 0);
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("csv_query", fullSourceBytes, jsonText, opts.file);
     } else {
       const tableText = formatCsvTable(result, (opts.where ?? []).map((w) => `--where ${w}`));
-      emit4(tableText);
+      emit(tableText);
       recordReadStat("csv_query", fullSourceBytes, tableText, opts.file);
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
 function runCsvProfile(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   try {
@@ -7423,41 +7440,41 @@ function runCsvProfile(opts) {
       ...opts.noHeader === true ? { noHeader: true } : {}
     });
     if (profiles.length === 0) {
-      emit4(`No data rows found in ${displaySafeText(opts.file)}`);
+      emit(`No data rows found in ${displaySafeText(opts.file)}`);
       return 0;
     }
     const fullSourceBytes = sumFileSizes([opts.file]);
     const profileText = formatCsvProfile(profiles);
-    emit4(profileText);
+    emit(profileText);
     recordReadStat("csv_profile", fullSourceBytes, profileText, opts.file);
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
 function runOutlineCommand(opts, parse, formatLabel, kind) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let data;
   try {
     data = parse(text);
   } catch {
-    emitErr4(`Failed to parse ${formatLabel}: ${opts.file}`);
+    emitErr(`Failed to parse ${formatLabel}: ${opts.file}`);
     return 1;
   }
   const outline = outlineJson(data);
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(outline, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat(kind, fullSourceBytes, jsonText, opts.file);
   } else {
     const text2 = formatJsonOutline(outline);
-    emit4(text2);
+    emit(text2);
     recordReadStat(kind, fullSourceBytes, text2, opts.file);
   }
   return 0;
@@ -7468,21 +7485,21 @@ function runJsonOutline(opts) {
 function runQueryCommand(opts, parse, formatLabel, guardTag, kind) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let data;
   try {
     data = parse(text);
   } catch {
-    emitErr4(`Failed to parse ${formatLabel}: ${opts.file}`);
+    emitErr(`Failed to parse ${formatLabel}: ${opts.file}`);
     return 1;
   }
   let head;
   try {
     head = opts.head !== void 0 ? requireNonNegativeStrictInt("--head", opts.head) : void 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
   try {
@@ -7491,7 +7508,7 @@ function runQueryCommand(opts, parse, formatLabel, guardTag, kind) {
     if (!result.fanned) {
       const value = result.items[0];
       const valueText = opts.json === true ? displaySafeJson(value, 0) : displaySafeJson(value);
-      emit4(valueText);
+      emit(valueText);
       recordReadStat(kind, fullSourceBytes, valueText, opts.file);
       return 0;
     }
@@ -7501,7 +7518,7 @@ function runQueryCommand(opts, parse, formatLabel, guardTag, kind) {
     if (opts.json === true) {
       const capped = guardJsonRows(limited);
       const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated || headTruncated || result.truncated, totalCount }, 0);
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat(kind, fullSourceBytes, jsonText, opts.file);
     } else {
       const lines = limited.map((item) => displaySafeJson(item, 0));
@@ -7517,7 +7534,7 @@ function runQueryCommand(opts, parse, formatLabel, guardTag, kind) {
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
@@ -7559,21 +7576,21 @@ function runYamlQuery(opts) {
 function runXmlOutline(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let summary;
   try {
     summary = outlineXml(text, { ...opts.maxDepth !== void 0 ? { maxDepth: opts.maxDepth } : {} });
   } catch (e) {
-    emitErr4(`Failed to parse XML: ${opts.file}
+    emitErr(`Failed to parse XML: ${opts.file}
 ${extractErrorMessage(e)}`);
     return 1;
   }
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(summary);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("xml_outline", fullSourceBytes, jsonText, opts.file);
   } else {
     const outlineText = formatXmlOutline(summary);
@@ -7585,19 +7602,19 @@ ${extractErrorMessage(e)}`);
 function runXmlQuery(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const queryPath = (opts.xpath ?? opts.path ?? "").trim();
   if (!queryPath) {
-    emitErr4("Must provide a path or --xpath <expression>");
+    emitErr("Must provide a path or --xpath <expression>");
     return 1;
   }
   let head;
   try {
     head = opts.head !== void 0 ? requireNonNegativeStrictInt("--head", opts.head) : void 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
   try {
@@ -7607,10 +7624,10 @@ function runXmlQuery(opts) {
       if (result.attributeValues.length === 0) {
         if (opts.json === true) {
           const jsonText = displaySafeJson({ items: [], truncated: false, totalCount: 0 }, 0);
-          emit4(jsonText);
+          emit(jsonText);
           recordReadStat("xml_query", fullSourceBytes, jsonText, opts.file);
         } else {
-          emit4(`No attributes matched path: '${displaySafeText(queryPath)}'`);
+          emit(`No attributes matched path: '${displaySafeText(queryPath)}'`);
         }
         return 0;
       }
@@ -7642,7 +7659,7 @@ ${val}`;
             outText = val;
           }
         }
-        emit4(outText);
+        emit(outText);
         recordReadStat("xml_query", fullSourceBytes, outText, opts.file);
         return 0;
       }
@@ -7672,7 +7689,7 @@ ${val}`;
           { items: capped.items, truncated: capped.truncated || headTruncated2, totalCount: totalCount2 },
           0
         );
-        emit4(jsonText);
+        emit(jsonText);
         recordReadStat("xml_query", fullSourceBytes, jsonText, opts.file);
       } else {
         const lines = [];
@@ -7702,10 +7719,10 @@ ${val}`);
     if (result.items.length === 0) {
       if (opts.json === true) {
         const jsonText = displaySafeJson({ items: [], truncated: false, totalCount: 0 }, 0);
-        emit4(jsonText);
+        emit(jsonText);
         recordReadStat("xml_query", fullSourceBytes, jsonText, opts.file);
       } else {
-        emit4(`No elements matched path: '${displaySafeText(queryPath)}'`);
+        emit(`No elements matched path: '${displaySafeText(queryPath)}'`);
       }
       return 0;
     }
@@ -7717,7 +7734,7 @@ ${val}`);
           ...opts.decodeEmbeddedXml ? { decodeEmbedded: true } : {}
         });
         const jsonText = displaySafeJson(jsonVal);
-        emit4(jsonText);
+        emit(jsonText);
         recordReadStat("xml_query", fullSourceBytes, jsonText, opts.file);
       } else {
         let xmlText = serializeXmlNode(
@@ -7749,7 +7766,7 @@ ${xmlText}`;
         { items: capped.items, truncated: capped.truncated || headTruncated, totalCount },
         0
       );
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("xml_query", fullSourceBytes, jsonText, opts.file);
     } else {
       const blocks = limited.map((node) => {
@@ -7773,21 +7790,21 @@ ${block}`;
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
 function runHtmlOutline(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const summary = outlineHtml(text);
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(summary);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("html_outline", fullSourceBytes, jsonText, opts.file);
   } else {
     const outlineText = formatHtmlOutline(summary);
@@ -7799,14 +7816,14 @@ function runHtmlOutline(opts) {
 function runHtmlQuery(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let head;
   try {
     head = opts.head !== void 0 ? requireNonNegativeStrictInt("--head", opts.head) : void 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
   try {
@@ -7817,10 +7834,10 @@ function runHtmlQuery(opts) {
       if (result.attributeValues.length === 0) {
         if (opts.json === true) {
           const jsonText = displaySafeJson({ items: [], truncated: false, totalCount: 0 }, 0);
-          emit4(jsonText);
+          emit(jsonText);
           recordReadStat("html_query", fullSourceBytes, jsonText, opts.file);
         } else {
-          emit4(`No attributes matched selector: '${displaySafeText(opts.selector)}'`);
+          emit(`No attributes matched selector: '${displaySafeText(opts.selector)}'`);
         }
         return 0;
       }
@@ -7830,7 +7847,7 @@ function runHtmlQuery(opts) {
       if (opts.json === true) {
         const capped = guardJsonRows(limited2);
         const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated || headTruncated2, totalCount: totalCount2 }, 0);
-        emit4(jsonText);
+        emit(jsonText);
         recordReadStat("html_query", fullSourceBytes, jsonText, opts.file);
       } else {
         const lines = limited2.map((item) => item);
@@ -7846,10 +7863,10 @@ function runHtmlQuery(opts) {
     if (result.elements.length === 0) {
       if (opts.json === true) {
         const jsonText = displaySafeJson({ items: [], truncated: false, totalCount: 0 }, 0);
-        emit4(jsonText);
+        emit(jsonText);
         recordReadStat("html_query", fullSourceBytes, jsonText, opts.file);
       } else {
-        emit4(`No elements matched selector: '${displaySafeText(opts.selector)}'`);
+        emit(`No elements matched selector: '${displaySafeText(opts.selector)}'`);
       }
       return 0;
     }
@@ -7866,7 +7883,7 @@ function runHtmlQuery(opts) {
       }));
       const capped = guardJsonRows(jsonItems);
       const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated || headTruncated, totalCount });
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("html_query", fullSourceBytes, jsonText, opts.file);
     } else if (opts.text === true) {
       const textLines = limited.map((n) => extractNodeText(n, text)).filter(Boolean);
@@ -7887,24 +7904,24 @@ function runHtmlQuery(opts) {
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
 function runHtmlLint(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const report = lintHtml(text);
   const isClean = opts.strict ? report.errors.length === 0 && report.warnings.length === 0 : report.errors.length === 0;
   if (opts.json === true) {
-    emit4(displaySafeJson(report));
+    emit(displaySafeJson(report));
     return isClean ? 0 : 1;
   }
   if (report.errors.length === 0 && report.warnings.length === 0) {
-    emit4(`\u2713 ${displaySafeText(opts.file)}: HTML structure is valid (all tags balanced, no duplicate IDs, void elements respected).`);
+    emit(`\u2713 ${displaySafeText(opts.file)}: HTML structure is valid (all tags balanced, no duplicate IDs, void elements respected).`);
     return 0;
   }
   const lines = [];
@@ -7928,20 +7945,20 @@ function runHtmlLint(opts) {
       lines.push(`  <${tag}>: open=${counts.open}, close=${counts.close}, diff=${counts.diff}`);
     }
   }
-  emit4(lines.join("\n"));
+  emit(lines.join("\n"));
   return isClean ? 0 : 1;
 }
 function loadOpenApiOperations(file) {
   const text = readFileText(file);
   if (text === null) {
-    emitErr4(`Could not read: ${file}`);
+    emitErr(`Could not read: ${file}`);
     return null;
   }
   let spec;
   try {
     spec = parseOpenApiSpec(text, file);
   } catch {
-    emitErr4(`Failed to parse OpenAPI spec (not valid JSON or YAML): ${file}`);
+    emitErr(`Failed to parse OpenAPI spec (not valid JSON or YAML): ${file}`);
     return null;
   }
   return extractOperations(spec);
@@ -7952,7 +7969,7 @@ function runOpenApiOutline(opts) {
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(operations, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("openapi_outline", fullSourceBytes, jsonText, opts.file);
   } else {
     const text = formatOpenApiOutline(operations);
@@ -7970,13 +7987,13 @@ function runOpenApiOp(opts) {
     const closes = rankSimilarNames(operations.map(operationLabel), opts.operation);
     if (closes.length > 0) messages.push(didYouMean(closes));
     else if (operations.length > 0) messages.push(`Try: token-goat openapi-outline ${opts.file}`);
-    emitErr4(messages.join("\n"));
+    emitErr(messages.join("\n"));
     return 1;
   }
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(match, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("openapi_op", fullSourceBytes, jsonText, opts.operation);
   } else {
     const text = formatOperationDetail(match);
@@ -7995,7 +8012,6 @@ var MIN_WORD_SIMILARITY_LEN = 3;
 var STRUCTURED_MISS_MAX_BYTES = 128 * 1024;
 var STRUCTURED_MISS_MAX_FILES = 12;
 var STRUCTURED_MISS_MAX_NODES = 2e4;
-var FIND_SCAN_LIMIT = 2e4;
 function endsWithPathBoundary(full, suffix) {
   if (!full.endsWith(suffix)) return false;
   if (full.length === suffix.length) return true;
@@ -8076,8 +8092,9 @@ function didYouMean(candidates) {
   return lines.join("\n");
 }
 function unknownSymbolSuggestion(name, rootDir) {
-  const rawSymbols = querySymbols({ limit: FIND_SCAN_LIMIT, rootDir });
-  const candidates = rankSimilarNames(rawSymbols.map((s) => s.name), name);
+  const names = /* @__PURE__ */ new Set();
+  forEachSymbol({ rootDir }, (s) => names.add(s.name));
+  const candidates = rankSimilarNames([...names], name);
   return candidates.length > 0 ? `
 ${didYouMean(candidates)}` : "";
 }
@@ -8564,14 +8581,14 @@ ${sub.text}`);
 }
 function runBrief(opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
-    emitErr4(`--limit must be a positive number, got: ${opts.limit}`);
+    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
     return 1;
   }
   const crossFilePairs = parseCrossFileMultiSpec(opts.spec);
   if (crossFilePairs !== null) {
     const { text: text2, code: code2 } = runBriefCrossFile(crossFilePairs, opts);
-    if (code2 === 0) emit4(text2);
-    else emitErr4(text2);
+    if (code2 === 0) emit(text2);
+    else emitErr(text2);
     return code2;
   }
   const { file, symbol } = parseReadSpec(opts.spec);
@@ -8579,14 +8596,14 @@ function runBrief(opts) {
     const multiSymbols = symbol.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
     if (multiSymbols.length > 1) {
       const { text: text2, code: code2 } = runBriefMulti(file, multiSymbols, opts);
-      if (code2 === 0) emit4(text2);
-      else emitErr4(text2);
+      if (code2 === 0) emit(text2);
+      else emitErr(text2);
       return code2;
     }
   }
   const { text, code } = runBriefCore(opts);
-  if (code === 0) emit4(text);
-  else emitErr4(text);
+  if (code === 0) emit(text);
+  else emitErr(text);
   return code;
 }
 
@@ -8601,7 +8618,7 @@ var OURS_RE = /^<{7}(?:\s+(.*))?$/;
 var BASE_RE = /^\|{7}(?:\s+(.*))?$/;
 var SEP_RE = /^={7}\s*$/;
 var THEIRS_RE = /^>{7}(?:\s+(.*))?$/;
-function parseConflicts(filePath, text) {
+function parseConflicts(filePath, text, contextLines = 3) {
   const lines = text.split(/\r?\n/);
   const regions = [];
   const warnings = [];
@@ -8664,13 +8681,29 @@ function parseConflicts(filePath, text) {
       const theirsMatch = THEIRS_RE.exec(line);
       if (theirsMatch !== null) {
         const theirsLabel = (theirsMatch[1] ?? "").trim();
+        const beforeContext = [];
+        if (contextLines > 0) {
+          const ctxStart = Math.max(0, startLine - 1 - contextLines);
+          for (let c = ctxStart; c < startLine - 1; c++) {
+            beforeContext.push({ line: c + 1, text: lines[c] ?? "" });
+          }
+        }
+        const afterContext = [];
+        if (contextLines > 0) {
+          const ctxEnd = Math.min(lines.length, lineNo + contextLines);
+          for (let c = lineNo; c < ctxEnd; c++) {
+            afterContext.push({ line: c + 1, text: lines[c] ?? "" });
+          }
+        }
         regions.push({
           filePath,
           lineStart: startLine,
           lineEnd: lineNo,
           ours: { label: oursLabel, content: oursLines.join("\n") },
           base: sawBase ? { label: baseLabel, content: baseLines.join("\n") } : null,
-          theirs: { label: theirsLabel, content: theirsLines.join("\n") }
+          theirs: { label: theirsLabel, content: theirsLines.join("\n") },
+          ...beforeContext.length > 0 ? { beforeContext } : {},
+          ...afterContext.length > 0 ? { afterContext } : {}
         });
         resetRegion();
         continue;
@@ -8713,6 +8746,11 @@ function formatSingleFileConflicts(result) {
     lines.push(`${displaySafeText(result.filePath)} -- ${result.regions.length} conflict${result.regions.length === 1 ? "" : "s"}`);
     for (const r of result.regions) {
       lines.push(`  lines ${r.lineStart}-${r.lineEnd}`);
+      if (r.beforeContext && r.beforeContext.length > 0) {
+        for (const c of r.beforeContext) {
+          lines.push(`      ${c.line} | ${displaySafeText(c.text)}`);
+        }
+      }
       lines.push(`    <<<<<<< ${displaySafeText(r.ours.label || "(ours)")}`);
       lines.push(indentBlock(r.ours.content));
       if (r.base !== null) {
@@ -8722,6 +8760,11 @@ function formatSingleFileConflicts(result) {
       lines.push("    =======");
       lines.push(indentBlock(r.theirs.content));
       lines.push(`    >>>>>>> ${displaySafeText(r.theirs.label || "(theirs)")}`);
+      if (r.afterContext && r.afterContext.length > 0) {
+        for (const c of r.afterContext) {
+          lines.push(`      ${c.line} | ${displaySafeText(c.text)}`);
+        }
+      }
     }
   } else {
     lines.push(`${displaySafeText(result.filePath)} -- no conflicts`);
@@ -8771,23 +8814,24 @@ function runConflicts(opts) {
     try {
       stat = fs8.statSync(abs);
     } catch {
-      emitErr4(`Could not read: ${opts.path}`);
+      emitErr(`Could not read: ${opts.path}`);
       return 1;
     }
     files = stat.isDirectory() ? walkProject(abs).files : [abs];
   }
+  const contextLines = opts.context !== void 0 ? opts.context : 3;
   const results = [];
   for (const f of files) {
     const text = readFileText(f);
     if (text === null) continue;
-    const parsed = parseConflicts(f, text);
+    const parsed = parseConflicts(f, text, contextLines);
     if (parsed.regions.length > 0 || parsed.warnings.length > 0) results.push(parsed);
   }
   const fullSourceBytes = sumFileSizes(files);
   const detail = opts.path ?? ".";
   if (opts.json === true) {
     const jsonText = displaySafeJson(opts.summary === true ? results.map(summarizeFileConflicts) : results, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("conflicts", fullSourceBytes, jsonText, detail);
   } else if (opts.summary === true) {
     const text = formatConflictSummaries(results.map(summarizeFileConflicts));
@@ -8865,7 +8909,7 @@ function refIsSafe(ref) {
   return !ref.startsWith("-");
 }
 function emitUnsafeRef(ref) {
-  emitErr4(`Refusing a git ref that starts with '-': ${ref}`);
+  emitErr(`Refusing a git ref that starts with '-': ${ref}`);
 }
 function changedDiffBaselineBytes(cwd, ref, files) {
   if (files.length === 0) return 0;
@@ -8888,25 +8932,25 @@ function runChanged(opts = {}) {
   try {
     const result = runGit(["diff", ref, "--name-only"], { cwd });
     if (result.exitCode !== 0) {
-      emitErr4(`git diff failed: ${result.stderr}`);
+      emitErr(`git diff failed: ${result.stderr}`);
       const hint = buildChangedRefHint(cwd, ref);
       if (hint !== null) {
-        emitErr4(hint);
+        emitErr(hint);
       }
       return 1;
     }
     changedFiles = result.stdout.trim().split(/\r?\n/).filter(Boolean);
   } catch {
-    emitErr4(`Could not run git diff against '${ref}'`);
+    emitErr(`Could not run git diff against '${ref}'`);
     return 1;
   }
   const emptyEnvelope = () => {
-    emit4(displaySafeJson({ items: [], truncated: false, totalCount: 0 }));
+    emit(displaySafeJson({ items: [], truncated: false, totalCount: 0 }));
     return 0;
   };
   if (changedFiles.length === 0) {
     if (opts.json === true) return emptyEnvelope();
-    emit4("No files changed.");
+    emit("No files changed.");
     return 0;
   }
   const preGrepFileCount = changedFiles.length;
@@ -8914,7 +8958,7 @@ function runChanged(opts = {}) {
   if (matchesGrep !== void 0) changedFiles = changedFiles.filter((f) => matchesGrep(f));
   if (matchesGrep !== void 0 && changedFiles.length === 0) {
     if (opts.json === true) return emptyEnvelope();
-    emit4(grepFilteredToEmptyNotice(preGrepFileCount, opts.grep ?? "", "changed file", "changed files"));
+    emit(grepFilteredToEmptyNotice(preGrepFileCount, opts.grep ?? "", "changed file", "changed files"));
     return 0;
   }
   const postGrepFileCount = changedFiles.length;
@@ -8928,12 +8972,12 @@ function runChanged(opts = {}) {
     if (opts.json === true) return emptyEnvelope();
     const grepRemoved = preGrepFileCount - postGrepFileCount;
     if (matchesGrep !== void 0 && grepRemoved > 0) {
-      emit4(
+      emit(
         `No non-test files matched --grep ${opts.grep ?? ""} (${excludeTestsHiddenNote(hiddenTestFiles)}; ${countNoun(grepRemoved, "other changed file")} did not match the filter)`
       );
       return 0;
     }
-    emit4(`No non-test files changed (${excludeTestsHiddenNote(hiddenTestFiles)})`);
+    emit(`No non-test files changed (${excludeTestsHiddenNote(hiddenTestFiles)})`);
     return 0;
   }
   if (opts.symbolMode === true) {
@@ -8949,27 +8993,27 @@ function runChanged(opts = {}) {
     }
     const allSymbols = [];
     for (const f of changedFiles) {
-      const fileSymbols = querySymbols({ filePath: resolveIndexPath(f, projectRoot), limit: FIND_SCAN_LIMIT2 });
+      const fileSymbols = querySymbols({ filePath: resolveIndexPath(f, projectRoot), limit: FIND_SCAN_LIMIT });
       const hunks = hunksByFile.get(f);
       const scoped = hunks === void 0 || isVirtualIndexedPath(f) ? fileSymbols : fileSymbols.filter((s) => hunks.some((h) => h.start <= s.lineEnd && h.end >= s.lineStart));
       allSymbols.push(...scoped);
     }
     if (allSymbols.length === 0) {
       if (opts.json === true) return emptyEnvelope();
-      emit4("No symbols changed.");
+      emit("No symbols changed.");
       return 0;
     }
     const symbolFullBytes = symbolDiffBaselineBytes;
     if (opts.json === true) {
       const capped = guardJsonRows(allSymbols);
       const text = displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount });
-      emit4(text);
+      emit(text);
       recordReadStat("changed_lookup", symbolFullBytes, text, ref);
       return 0;
     }
     const symbolText = allSymbols.map((s) => `${s.name} (${s.kind}) \u2014 ${formatSymbolLocation(toDisplayPath(projectRoot, s.filePath), s.lineStart)}`).join("\n");
     for (const s of allSymbols) {
-      emit4(`${displaySafeText(s.name)} (${displaySafeText(s.kind)}) \u2014 ${formatSymbolLocation(displaySafeText(toDisplayPath(projectRoot, s.filePath)), s.lineStart)}`);
+      emit(`${displaySafeText(s.name)} (${displaySafeText(s.kind)}) \u2014 ${formatSymbolLocation(displaySafeText(toDisplayPath(projectRoot, s.filePath)), s.lineStart)}`);
     }
     recordReadStat("changed_lookup", symbolFullBytes, symbolText, ref);
     return 0;
@@ -8978,12 +9022,12 @@ function runChanged(opts = {}) {
   if (opts.json === true) {
     const capped = guardJsonRows(changedFiles);
     const text = displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount });
-    emit4(text);
+    emit(text);
     recordReadStat("changed_lookup", fullBytes, text, ref);
     return 0;
   }
   for (const f of changedFiles) {
-    emit4(f);
+    emit(f);
   }
   recordReadStat("changed_lookup", fullBytes, changedFiles.join("\n"), ref);
   return 0;
@@ -9033,27 +9077,27 @@ function runDiff(opts) {
   try {
     diffResult = runGit(diffArgs, { cwd });
   } catch {
-    emitErr4(`Could not run git diff for '${match.filePath}'`);
+    emitErr(`Could not run git diff for '${match.filePath}'`);
     return 1;
   }
   if (diffResult.exitCode !== 0) {
-    emitErr4(`git diff failed: ${diffResult.stderr}`);
+    emitErr(`git diff failed: ${diffResult.stderr}`);
     return 1;
   }
   if (diffResult.stdout.trim() === "") {
-    emit4(`No changes to '${displaySafeText(match.name)}' in '${displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath))}'.`);
+    emit(`No changes to '${displaySafeText(match.name)}' in '${displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath))}'.`);
     return 0;
   }
   const { hunks } = splitDiffHunks(diffResult.stdout);
   const diffFileScoped = isVirtualIndexedPath(match.filePath);
   const overlapping = diffFileScoped ? hunks : hunks.filter((h) => h.start <= match.lineEnd && h.end >= match.lineStart);
   if (overlapping.length === 0) {
-    emit4(`No changes to '${displaySafeText(match.name)}' (lines ${match.lineStart}-${match.lineEnd}) in '${displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath))}'.`);
+    emit(`No changes to '${displaySafeText(match.name)}' (lines ${match.lineStart}-${match.lineEnd}) in '${displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath))}'.`);
     return 0;
   }
   if (opts.json === true) {
     const capped = guardJsonRows(overlapping.map((h) => ({ start: h.start, end: h.end, text: h.text })));
-    emit4(
+    emit(
       displaySafeJson(
         {
           symbol: match.name,
@@ -9070,7 +9114,7 @@ function runDiff(opts) {
   }
   const header = `# ${displaySafeText(match.name)} (${displaySafeText(match.kind)}) \u2014 ${formatSymbolLocation(displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath)), match.lineStart, match.lineEnd)}`;
   const diffNote = diffFileScoped ? [virtualIndexedScopeNote(displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath)), "these hunks cover the whole file rather than this symbol alone")] : [];
-  emit4(guardText([header, ...diffNote, ...overlapping.map((h) => h.text)].join("\n"), "diff"));
+  emit(guardText([header, ...diffNote, ...overlapping.map((h) => h.text)].join("\n"), "diff"));
   return 0;
 }
 var DEFAULT_LOG_MAX_COUNT = 20;
@@ -9131,20 +9175,20 @@ function runLog(opts) {
   try {
     logResult = runGit(logArgs, { cwd });
   } catch {
-    emitErr4(`Could not run git log for '${match.filePath}'`);
+    emitErr(`Could not run git log for '${match.filePath}'`);
     return 1;
   }
   if (logResult.exitCode !== 0) {
-    emitErr4(`git log failed: ${displaySafeText(logResult.stderr)}`);
+    emitErr(`git log failed: ${displaySafeText(logResult.stderr)}`);
     return 1;
   }
   if (logResult.stdout.trim() === "") {
-    emit4(`No history for '${displaySafeText(match.name)}' (lines ${match.lineStart}-${match.lineEnd}) in '${displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath))}'.`);
+    emit(`No history for '${displaySafeText(match.name)}' (lines ${match.lineStart}-${match.lineEnd}) in '${displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath))}'.`);
     return 0;
   }
   if (opts.json === true) {
     const capped = guardJsonRows(parseLogDashLOutput(logResult.stdout));
-    emit4(
+    emit(
       displaySafeJson(
         {
           symbol: match.name,
@@ -9161,7 +9205,7 @@ function runLog(opts) {
   }
   const header = `# ${displaySafeText(match.name)} (${displaySafeText(match.kind)}) \u2014 ${formatSymbolLocation(displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath)), match.lineStart, match.lineEnd)}`;
   const logNote = fileScoped ? [virtualIndexedScopeNote(displaySafeText(toDisplayPath(getDisplayRoot(opts.projectRoot), match.filePath)), "this history covers the whole file rather than this symbol alone")] : [];
-  emit4(guardText([header, ...logNote, logResult.stdout].join("\n"), "diff"));
+  emit(guardText([header, ...logNote, logResult.stdout].join("\n"), "diff"));
   return 0;
 }
 
@@ -9611,26 +9655,26 @@ async function runZipList(opts) {
     data = readFileBytes(opts.file);
   } catch (err) {
     if (err instanceof ZipInputTooLargeError) {
-      emitErr4(err.message);
+      emitErr(err.message);
       return 1;
     }
     throw err;
   }
   if (data === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let entries;
   try {
     entries = await listZipEntries(data);
   } catch (err) {
-    emitErr4(archiveReadFailure(err, opts.file));
+    emitErr(archiveReadFailure(err, opts.file));
     return 1;
   }
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(entries, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("zip_list", fullSourceBytes, jsonText, opts.file);
   } else {
     const text = formatZipList(entries);
@@ -9645,13 +9689,13 @@ async function runZipRead(opts) {
     data = readFileBytes(opts.file);
   } catch (err) {
     if (err instanceof ZipInputTooLargeError) {
-      emitErr4(err.message);
+      emitErr(err.message);
       return 1;
     }
     throw err;
   }
   if (data === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let entries;
@@ -9660,12 +9704,12 @@ async function runZipRead(opts) {
     entries = await listZipEntries(data);
     content = await extractZipEntry(data, opts.entry);
   } catch (err) {
-    emitErr4(archiveReadFailure(err, opts.file));
+    emitErr(archiveReadFailure(err, opts.file));
     return 1;
   }
   const matchedEntry = entries.find((e) => e.path === opts.entry);
   if (matchedEntry?.isDirectory === true) {
-    emitErr4(`Entry '${opts.entry}' is a directory, not a file, in '${opts.file}'`);
+    emitErr(`Entry '${opts.entry}' is a directory, not a file, in '${opts.file}'`);
     return 1;
   }
   if (content === void 0) {
@@ -9673,7 +9717,7 @@ async function runZipRead(opts) {
     const closes = rankSimilarNames(entries.map((e) => e.path), opts.entry);
     if (closes.length > 0) messages.push(didYouMean(closes));
     else if (entries.length > 0) messages.push(`Try: token-goat zip-list ${opts.file}`);
-    emitErr4(messages.join("\n"));
+    emitErr(messages.join("\n"));
     return 1;
   }
   const buf = Buffer.from(content);
@@ -9681,7 +9725,7 @@ async function runZipRead(opts) {
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson({ path: opts.entry, text }, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("zip_read", fullSourceBytes, jsonText, opts.entry);
   } else {
     emitGuarded(text, "zip-read");
@@ -9695,16 +9739,16 @@ function runSqliteSchema(opts) {
     const fullSourceBytes = sumFileSizes([opts.file]);
     if (opts.json === true) {
       const jsonText = displaySafeJson(schema, 0);
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("sqlite_schema", fullSourceBytes, jsonText, opts.file);
     } else {
       const text = formatSqliteSchema(schema);
-      emit4(text);
+      emit(text);
       recordReadStat("sqlite_schema", fullSourceBytes, text, opts.file);
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
@@ -9714,16 +9758,16 @@ function runSqliteTables(opts) {
     const fullSourceBytes = sumFileSizes([opts.file]);
     if (opts.json === true) {
       const jsonText = displaySafeJson(tables, 0);
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("sqlite_tables", fullSourceBytes, jsonText, opts.file);
     } else {
       const text = formatSqliteTables(tables);
-      emit4(text);
+      emit(text);
       recordReadStat("sqlite_tables", fullSourceBytes, text, opts.file);
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
@@ -9732,7 +9776,7 @@ function runSqliteQuery(opts) {
   try {
     head = opts.head !== void 0 ? requireNonNegativeStrictInt("--head", opts.head) : void 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
   try {
@@ -9749,7 +9793,7 @@ function runSqliteQuery(opts) {
         totalCount,
         rowCapped: result.rowCapped
       }, 0);
-      emit4(jsonText);
+      emit(jsonText);
       const uncappedFull = guardJsonRows(result.rows);
       const baselineJsonText = displaySafeJson({
         columns: result.columns,
@@ -9761,27 +9805,27 @@ function runSqliteQuery(opts) {
       recordReadStat("sqlite_query", Buffer.byteLength(baselineJsonText, "utf8"), jsonText, opts.file);
     } else {
       const text = formatSqliteQueryTable({ ...result, rows }, { headTruncated });
-      emit4(text);
+      emit(text);
       const baselineText = formatSqliteQueryTable({ ...result, rows: result.rows }, { headTruncated: false });
       recordReadStat("sqlite_query", Buffer.byteLength(baselineText, "utf8"), text, opts.file);
     }
     return 0;
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
 function runCoverageReportGaps(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   let report;
   try {
     report = parseCoverageReport(text);
   } catch (e) {
-    emitErr4(`Failed to parse coverage report (not valid LCOV or Istanbul JSON): ${opts.file}
+    emitErr(`Failed to parse coverage report (not valid LCOV or Istanbul JSON): ${opts.file}
 ${extractErrorMessage(e)}`);
     return 1;
   }
@@ -9789,7 +9833,7 @@ ${extractErrorMessage(e)}`);
   const fullSourceBytes = sumFileSizes([opts.file]);
   if (opts.json === true) {
     const jsonText = displaySafeJson(scoped, 0);
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("coverage_report_gaps", fullSourceBytes, jsonText, opts.file);
   } else {
     const text2 = formatCoverageGaps(scoped);
@@ -9867,17 +9911,17 @@ function extractFrontmatter(lines) {
 function runConfigGet(opts) {
   const text = readFileText(opts.file);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const frontmatterLines = extractFrontmatter(text.split(/\r?\n/));
   if (frontmatterLines !== null) {
     const value = lookupYaml(frontmatterLines, opts.key);
     if (value === null) {
-      emitErr4(`Key '${opts.key}' not found in ${opts.file}`);
+      emitErr(`Key '${opts.key}' not found in ${opts.file}`);
       return 1;
     }
-    emit4(value);
+    emit(value);
     return 0;
   }
   const ext = path10.extname(opts.file).toLowerCase();
@@ -9886,29 +9930,29 @@ function runConfigGet(opts) {
       let obj = JSON.parse(text);
       for (const part of opts.key.split(".")) {
         if (typeof obj !== "object" || obj === null) {
-          emitErr4(`Key '${opts.key}' not found in ${opts.file}`);
+          emitErr(`Key '${opts.key}' not found in ${opts.file}`);
           return 1;
         }
         obj = obj[part];
         if (obj === void 0) {
-          emitErr4(`Key '${opts.key}' not found in ${opts.file}`);
+          emitErr(`Key '${opts.key}' not found in ${opts.file}`);
           return 1;
         }
       }
-      emit4(displaySafeJson(obj, 0));
+      emit(displaySafeJson(obj, 0));
       return 0;
     } catch {
-      emitErr4(`Failed to parse JSON: ${opts.file}`);
+      emitErr(`Failed to parse JSON: ${opts.file}`);
       return 1;
     }
   }
   if (ext === ".yaml" || ext === ".yml") {
     const value = lookupYaml(text.split(/\r?\n/), opts.key);
     if (value === null) {
-      emitErr4(`Key '${opts.key}' not found in ${opts.file}`);
+      emitErr(`Key '${opts.key}' not found in ${opts.file}`);
       return 1;
     }
-    emit4(value);
+    emit(value);
     return 0;
   }
   const keyParts = opts.key.split(".");
@@ -9929,18 +9973,18 @@ function runConfigGet(opts) {
     if (new RegExp(`^${escapeRegExp(leafKey)}\\s*=`).test(trimmed)) {
       const eqIdx = trimmed.indexOf("=");
       const rawValue = stripInlineComment(trimmed.slice(eqIdx + 1)).trim();
-      emit4(stripPairedQuotes(rawValue));
+      emit(stripPairedQuotes(rawValue));
       return 0;
     }
   }
-  emitErr4(`Key '${opts.key}' not found in ${opts.file}`);
+  emitErr(`Key '${opts.key}' not found in ${opts.file}`);
   return 1;
 }
 function runPerFileEmitting(files, label, run) {
   let anyOk = false;
   files.forEach((file, i) => {
-    if (i > 0) emit4("");
-    emit4(`# ${label}: ${file}`);
+    if (i > 0) emit("");
+    emit(`# ${label}: ${file}`);
     if (run(file) === 0) anyOk = true;
   });
   return anyOk ? 0 : 1;
@@ -9950,7 +9994,7 @@ function runExports(opts) {
   if (multiFiles.length > 1) return runPerFileEmitting(multiFiles, "Exports", (file) => runExports({ ...opts, file }));
   const confined = fileConfinementRefusal("This file", opts.file, opts.projectRoot);
   if (confined !== null) {
-    emitErr4(confined);
+    emitErr(confined);
     return 1;
   }
   const diskPath = resolveAgainstProjectRoot(opts.file, opts.projectRoot);
@@ -9969,7 +10013,7 @@ function runExports(opts) {
   const ext = path10.extname(opts.file).toLowerCase();
   const text = readFileText(diskPath);
   if (text === null && symbols.length === 0) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   if (text !== null) {
@@ -9979,7 +10023,7 @@ function runExports(opts) {
     for (const n of extractExportNames(text, ext)) if (!names.includes(n)) names.push(n);
   }
   if (names.length === 0) {
-    emit4(`No exported symbols found in '${displaySafeText(opts.file)}'`);
+    emit(`No exported symbols found in '${displaySafeText(opts.file)}'`);
     return 0;
   }
   const preFilterCount = names.length;
@@ -9989,12 +10033,12 @@ function runExports(opts) {
   if (filteredNames.length === 0) {
     if (opts.json === true) {
       const jsonText = displaySafeJson([]);
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("exports", fullSourceBytes, jsonText, opts.file);
       return 0;
     }
     const textOut = grepFilteredToEmptyNotice(preFilterCount, opts.grep ?? "", "exported symbol", "exported symbols");
-    emit4(textOut);
+    emit(textOut);
     recordReadStat("exports", fullSourceBytes, textOut, opts.file);
     return 0;
   }
@@ -10005,7 +10049,7 @@ function runExports(opts) {
         return { name: n, kind: kindOf(n), lineStart: loc?.lineStart ?? null, lineEnd: loc?.lineEnd ?? null };
       })
     );
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("exports", fullSourceBytes, jsonText, opts.file);
     return 0;
   }
@@ -10015,7 +10059,7 @@ function runExports(opts) {
     return `${kindOf(n).padEnd(10)} ${n}${locSuffix}`;
   });
   for (const line of outLines) {
-    emit4(line);
+    emit(line);
   }
   recordReadStat("exports", fullSourceBytes, outLines.join("\n"), opts.file);
   return 0;
@@ -10026,12 +10070,12 @@ function runImports(opts) {
   const diskPath = resolveAgainstProjectRoot(opts.file, opts.projectRoot);
   const text = readFileText(diskPath);
   if (text === null) {
-    emitErr4(`Could not read: ${opts.file}`);
+    emitErr(`Could not read: ${opts.file}`);
     return 1;
   }
   const imports = extractImports(text, importsExtensionFor(opts.file));
   if (imports.length === 0) {
-    emit4(`No imports found in '${displaySafeText(opts.file)}'`);
+    emit(`No imports found in '${displaySafeText(opts.file)}'`);
     return 0;
   }
   const preFilterCount = imports.length;
@@ -10041,25 +10085,25 @@ function runImports(opts) {
   if (filteredImports.length === 0) {
     if (opts.json === true) {
       const jsonText = displaySafeJson({ items: [], truncated: false, totalCount: 0 });
-      emit4(jsonText);
+      emit(jsonText);
       recordReadStat("imports", fullSourceBytes, jsonText, opts.file);
       return 0;
     }
     const text2 = grepFilteredToEmptyNotice(preFilterCount, opts.grep ?? "", "import", "imports");
-    emit4(text2);
+    emit(text2);
     recordReadStat("imports", fullSourceBytes, text2, opts.file);
     return 0;
   }
   if (opts.json === true) {
     const capped = guardJsonRows(filteredImports);
     const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount });
-    emit4(jsonText);
+    emit(jsonText);
     recordReadStat("imports", fullSourceBytes, jsonText, opts.file);
     return 0;
   }
   const outLines = filteredImports.map((imp) => `import  ${imp}`);
   for (const line of outLines) {
-    emit4(line);
+    emit(line);
   }
   recordReadStat("imports", fullSourceBytes, outLines.join("\n"), opts.file);
   return 0;
@@ -10157,50 +10201,55 @@ function runNoteList(opts = {}) {
 }
 function runFind(opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
-    emitErr4(`--limit must be a positive number, got: ${opts.limit}`);
+    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
     return 1;
   }
   const rootDir = resolveProjectRoot({ project: process.cwd() });
   const patternLower = opts.pattern.toLowerCase();
-  const rawSymbols = querySymbols({ limit: FIND_SCAN_LIMIT2, rootDir });
-  const symbols = rawSymbols.filter(
-    (s) => s.name.toLowerCase().includes(patternLower)
-  );
+  const matchedFiles = /* @__PURE__ */ new Set();
+  const allNames = /* @__PURE__ */ new Set();
+  forEachSymbol({ rootDir }, (s) => {
+    allNames.add(s.name);
+    if (s.name.toLowerCase().includes(patternLower)) matchedFiles.add(s.filePath);
+  });
   let fuzzyNames = [];
-  if (symbols.length === 0) {
-    fuzzyNames = rankSimilarNames(rawSymbols.map((s) => s.name), opts.pattern);
+  if (matchedFiles.size === 0) {
+    fuzzyNames = rankSimilarNames([...allNames], opts.pattern);
+    if (fuzzyNames.length > 0) {
+      const byName = new Map(fuzzyNames.map((n) => [n, []]));
+      forEachSymbol({ rootDir }, (s) => {
+        byName.get(s.name)?.push(s.filePath);
+      });
+      for (const n of fuzzyNames) for (const f of byName.get(n) ?? []) matchedFiles.add(f);
+    }
   }
-  const matched = fuzzyNames.length > 0 ? fuzzyNames.flatMap((n) => rawSymbols.filter((s) => s.name === n)) : symbols;
-  const allFiles = [...new Set(matched.map((s) => s.filePath))];
+  const allFiles = [...matchedFiles];
   const files = allFiles.slice(0, opts.limit ?? 50);
   const limitDropped = allFiles.length - files.length;
-  const truncated = rawSymbols.length === FIND_SCAN_LIMIT2 || limitDropped > 0;
+  const truncated = limitDropped > 0;
   if (files.length === 0) {
-    emitErr4(`No indexed files match '${opts.pattern}'`);
+    emitErr(`No indexed files match '${opts.pattern}'`);
     return 1;
   }
   if (opts.json === true) {
     const fuzzyPayload = fuzzyNames.length > 0 ? { fuzzy: true, matchedNames: fuzzyNames } : {};
-    emit4(displaySafeJson({ files, truncated, totalCount: allFiles.length, ...fuzzyPayload }));
+    emit(displaySafeJson({ files, truncated, totalCount: allFiles.length, ...fuzzyPayload }));
     return 0;
   }
   if (fuzzyNames.length > 0) {
-    emitErr4(`No symbol name contains '${opts.pattern}'; showing files for the nearest indexed ${fuzzyNames.length === 1 ? "name" : "names"}: ${fuzzyNames.join(", ")}`);
+    emitErr(`No symbol name contains '${opts.pattern}'; showing files for the nearest indexed ${fuzzyNames.length === 1 ? "name" : "names"}: ${fuzzyNames.join(", ")}`);
   }
   for (const f of files) {
-    emit4(toDisplayPath(rootDir, f));
+    emit(toDisplayPath(rootDir, f));
   }
   if (limitDropped > 0) {
-    emitErr4(`Showing ${files.length} of ${allFiles.length} matching files; rerun with --limit ${allFiles.length} to see them all`);
-  }
-  if (rawSymbols.length === FIND_SCAN_LIMIT2) {
-    emitErr4(`Results may be incomplete; index scan hit limit of ${FIND_SCAN_LIMIT2} symbols`);
+    emitErr(`Showing ${files.length} of ${allFiles.length} matching files; rerun with --limit ${allFiles.length} to see them all`);
   }
   return 0;
 }
 function runLocate(opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
-    emitErr4(`--limit must be a positive number, got: ${opts.limit}`);
+    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
     return 1;
   }
   const rootDir = opts.projectRoot ?? resolveProjectRoot({ project: process.cwd() });
@@ -10211,35 +10260,55 @@ function runLocate(opts) {
     targetFile = targetSpec.slice(0, colonIdx);
     targetSpec = targetSpec.slice(colonIdx + 2);
   }
-  const queryOpts = {
-    limit: FIND_SCAN_LIMIT2
-  };
+  const scanOpts = {};
   if (targetFile !== void 0) {
-    queryOpts.filePath = resolveIndexPath(targetFile, rootDir);
-    healStaleIndex(queryOpts.filePath);
+    scanOpts.filePath = resolveIndexPath(targetFile, rootDir);
+    healStaleIndex(scanOpts.filePath);
   } else {
-    queryOpts.rootDir = rootDir;
+    scanOpts.rootDir = rootDir;
   }
-  let rawSymbols = querySymbols(queryOpts);
+  const limit = opts.limit ?? 25;
+  const specLower = targetSpec.toLowerCase();
+  const scan = () => {
+    const found2 = { exact: [], exactCount: 0, partial: [], partialCount: 0, names: /* @__PURE__ */ new Set(), files: /* @__PURE__ */ new Set() };
+    forEachSymbol(scanOpts, (s) => {
+      found2.names.add(s.name);
+      found2.files.add(s.filePath);
+      const nameLower = s.name.toLowerCase();
+      if (nameLower === specLower) {
+        found2.exactCount++;
+        if (found2.exact.length < limit) found2.exact.push(s);
+      } else if (nameLower.includes(specLower)) {
+        found2.partialCount++;
+        if (found2.partial.length < limit) found2.partial.push(s);
+      }
+    });
+    return found2;
+  };
+  let found = scan();
   if (targetFile === void 0) {
-    const heal = healStaleResultFiles(rawSymbols.map((s) => s.filePath));
-    if (heal.healed) rawSymbols = querySymbols(queryOpts);
+    const heal = healStaleResultFiles([...found.files]);
+    if (heal.healed) found = scan();
   }
-  const specLower = targetSpec.toLowerCase();
-  const exactMatches = rawSymbols.filter((s) => s.name.toLowerCase() === specLower);
-  const partialMatches = rawSymbols.filter(
-    (s) => s.name.toLowerCase() !== specLower && s.name.toLowerCase().includes(specLower)
-  );
-  const combined = [...exactMatches, ...partialMatches];
+  let matchCount = found.exactCount + found.partialCount;
+  let combined = [...found.exact, ...found.partial];
   let fuzzyNames = [];
-  if (combined.length === 0) {
-    fuzzyNames = rankSimilarNames(rawSymbols.map((s) => s.name), targetSpec);
+  if (matchCount === 0) {
+    fuzzyNames = rankSimilarNames([...found.names], targetSpec);
+    if (fuzzyNames.length > 0) {
+      const byName = new Map(fuzzyNames.map((n) => [n, []]));
+      forEachSymbol(scanOpts, (s) => {
+        const bucket = byName.get(s.name);
+        if (bucket === void 0) return;
+        matchCount++;
+        if (bucket.length < limit) bucket.push(s);
+      });
+      combined = fuzzyNames.flatMap((n) => byName.get(n) ?? []);
+    }
   }
-  const matched = fuzzyNames.length > 0 ? fuzzyNames.flatMap((n) => rawSymbols.filter((s) => s.name === n)) : combined;
-  const limit = opts.limit ?? 25;
-  const shown = matched.slice(0, limit);
+  const shown = combined.slice(0, limit);
   if (shown.length === 0) {
-    emitErr4(`No landmark or symbol located for '${targetSpec}'`);
+    emitErr(`No landmark or symbol located for '${targetSpec}'`);
     return 1;
   }
   const hits = shown.map((s) => ({
@@ -10251,22 +10320,22 @@ function runLocate(opts) {
     span: `${s.lineStart}-${s.lineEnd}`
   }));
   if (opts.json === true) {
-    emit4(displaySafeJson({
+    emit(displaySafeJson({
       items: hits,
-      totalCount: matched.length,
-      truncated: matched.length > limit,
+      totalCount: matchCount,
+      truncated: matchCount > limit,
       ...fuzzyNames.length > 0 ? { fuzzy: true, matchedNames: fuzzyNames } : {}
     }));
     return 0;
   }
   if (fuzzyNames.length > 0) {
-    emitErr4(`No exact landmark for '${targetSpec}'; nearest matches: ${fuzzyNames.join(", ")}`);
+    emitErr(`No exact landmark for '${targetSpec}'; nearest matches: ${fuzzyNames.join(", ")}`);
   }
   for (const hit of hits) {
-    emit4(`${displaySafeText(hit.filePath)}:${hit.span} [${displaySafeText(hit.kind)}] ${displaySafeText(hit.name)}`);
+    emit(`${displaySafeText(hit.filePath)}:${hit.span} [${displaySafeText(hit.kind)}] ${displaySafeText(hit.name)}`);
   }
-  if (matched.length > limit) {
-    emitErr4(`Showing ${limit} of ${matched.length} locations; rerun with --limit ${matched.length} to see them all`);
+  if (matchCount > limit) {
+    emitErr(`Showing ${limit} of ${matchCount} locations; rerun with --limit ${matchCount} to see them all`);
   }
   return 0;
 }
@@ -10274,10 +10343,10 @@ function runListSections(opts) {
   const sections = listSections(opts.file);
   if (sections.length === 0) {
     if (!fileExists(opts.file)) {
-      emitErr4(`Could not read: ${opts.file}`);
+      emitErr(`Could not read: ${opts.file}`);
       return 1;
     }
-    emitErr4(`No sections found in '${opts.file}'`);
+    emitErr(`No sections found in '${opts.file}'`);
     return 1;
   }
   const preFilterCount = sections.length;
@@ -10293,19 +10362,19 @@ function runListSections(opts) {
   const filtered = matchesGrep !== void 0 ? labelled.filter((_, i) => matchesGrep(sections[i] ?? "")) : labelled;
   if (filtered.length === 0) {
     if (opts.json === true) {
-      emit4(displaySafeJson({ items: [], truncated: false, totalCount: 0 }));
+      emit(displaySafeJson({ items: [], truncated: false, totalCount: 0 }));
       return 0;
     }
-    emit4(grepFilteredToEmptyNotice(preFilterCount, opts.grep ?? "", "section", "sections"));
+    emit(grepFilteredToEmptyNotice(preFilterCount, opts.grep ?? "", "section", "sections"));
     return 0;
   }
   if (opts.json === true) {
     const capped = guardJsonRows(filtered);
-    emit4(displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }));
+    emit(displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }));
     return 0;
   }
   for (const heading of filtered) {
-    emit4(heading);
+    emit(heading);
   }
   return 0;
 }
@@ -10314,6 +10383,16 @@ function runListSections(opts) {
 init_define_import_meta_env();
 import * as fs11 from "node:fs";
 import * as path11 from "node:path";
+function htmlIdSectionFallback(filePath, heading) {
+  if (detectLanguage(filePath) !== "html") return null;
+  healStaleIndex(filePath);
+  const hit = querySymbols({ name: stripHtmlIdSpelling(heading, filePath), filePath, kind: "html_id", limit: 1 })[0];
+  if (hit === void 0) return null;
+  const text = readFileText(filePath);
+  if (text === null) return null;
+  const lines = text.split("\n");
+  return { heading: hit.name, content: lines.slice(hit.lineStart - 1, hit.lineEnd).join("\n"), lineStart: hit.lineStart, lineEnd: hit.lineEnd };
+}
 var AMBIGUOUS_HEADING_LIMIT = 10;
 function literalHeadingExists(filePath, heading) {
   const ordinalMatch = /^([^#\r\n]+)#(\d+)$/.exec(heading);
@@ -10335,7 +10414,7 @@ function runSection(opts) {
     const multiHeadings = heading.split(",").map((h) => h.trim()).filter((h) => h.length > 0);
     if (multiHeadings.length > 1) return runSectionMulti(specFilePath, filePath, multiHeadings, opts);
   }
-  const result = readSection(filePath, heading, readFileText);
+  const result = readSection(filePath, heading, readFileText) ?? htmlIdSectionFallback(filePath, heading);
   if (result === null) {
     if (!fs11.existsSync(filePath)) {
       return { text: `File not found: '${filePath}'`, code: 1 };
@@ -10374,15 +10453,38 @@ function runSection(opts) {
   }
   const kind = result.redirectedFrom !== void 0 ? "section_replacement" : "section_read";
   const fullSourceBytes = sumFileSizes([filePath]);
+  let content = result.content;
+  let lineEnd = result.lineEnd;
+  let truncatedNotice = "";
+  if (opts.maxLines !== void 0 && opts.maxLines > 0) {
+    const lines = content.split("\n");
+    if (lines.length > opts.maxLines) {
+      const remaining = lines.length - opts.maxLines;
+      content = lines.slice(0, opts.maxLines).join("\n");
+      lineEnd = Math.min(result.lineEnd, result.lineStart + opts.maxLines - 1);
+      truncatedNotice = `
+... (${countNoun(remaining, "more line")} not shown; pass a larger --max-lines or omit to read full section)`;
+    }
+  }
   if (opts.json === true) {
-    const text2 = displaySafeJson(result);
+    const jsonPayload = {
+      ...result,
+      content,
+      lineEnd,
+      ...opts.maxLines !== void 0 && opts.maxLines > 0 ? {
+        totalLines: result.content.split("\n").length,
+        shownLines: content.split("\n").length,
+        truncated: truncatedNotice.length > 0
+      } : {}
+    };
+    const text2 = displaySafeJson(jsonPayload);
     if (opts.suppressStat !== true) recordReadStat(kind, fullSourceBytes, text2, heading);
     return { text: text2, code: 0 };
   }
   const redirectNote = result.redirectedFrom !== void 0 ? ` (redirected from: '${result.redirectedFrom}')` : "";
   const text = guardText(
-    `# ${result.heading} \u2014 ${filePath}:${result.lineStart}-${result.lineEnd}${redirectNote}
-${result.content}`,
+    `# ${result.heading} \u2014 ${filePath}:${result.lineStart}-${lineEnd}${redirectNote}
+${content}${truncatedNotice}`,
     "heading"
   );
   if (opts.suppressStat !== true) recordReadStat(kind, fullSourceBytes, text, heading);
@@ -10503,8 +10605,7 @@ ${sub.text}`);
 // src/read_commands.ts
 var SYMBOL_PREVIEW_LINES = 5;
 var GREP_MAX_LINES = 200;
-var FIND_SCAN_LIMIT2 = 2e4;
-var REFS_TOP_SCAN_LIMIT = 2e4;
+var FIND_SCAN_LIMIT = 2e4;
 function fileExists2(p) {
   try {
     fs12.statSync(p);
@@ -10579,6 +10680,7 @@ function verifyPin(p, pinned) {
   verifyPinnedIdentity(p, pinned);
 }
 function indexFileSyncPinned(resolvedPath, dbPath) {
+  recordKnownRootThrottled(resolvedPath, dataDir(), dbPath);
   const pinned = activePins?.get(pinKey(path12.resolve(resolvedPath)));
   if (pinned === void 0) {
     indexFileSync(resolvedPath, dbPath);
@@ -10719,15 +10821,8 @@ function warnIfFilesStale(filePaths) {
     );
   }
 }
-function emit4(text) {
-  const out = colorStdout() ? text : stripAnsi(text);
-  process.stdout.write(ensureNewline(out));
-}
-function emitErr4(text) {
-  process.stderr.write(ensureNewline(text));
-}
 function emitGuarded(text, command) {
-  emit4(guardText(text, command));
+  emit(guardText(text, command));
 }
 function guardText(text, command) {
   const cfg = loadConfig();
@@ -10782,6 +10877,11 @@ function resolveEnclosingSymbol(filePath, chunkStartLine) {
   }
   return best === null ? null : { name: best.name, kind: best.kind, lineStart: best.lineStart };
 }
+var IMPORT_BIND_BODY_RE = /^\s*(?:const|let|var)\s*\{[^}]*\}\s*=\s*(?:await\s+)?(?:import|require)\s*\(/;
+function stableSortImportBindsLast(rows) {
+  const isBind = (r) => typeof r.body === "string" && IMPORT_BIND_BODY_RE.test(r.body) ? 1 : 0;
+  return [...rows].sort((a, b) => isBind(a) - isBind(b));
+}
 function runSymbol(opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
     return { text: `--limit must be a positive number, got: ${opts.limit}`, code: 1 };
@@ -10797,6 +10897,7 @@ function runSymbol(opts) {
   }
   const matchesGrep = opts.grep !== void 0 ? compileGrepMatcher(opts.grep) : void 0;
   const excludeTests = opts.excludeTests === true;
+  const excludeVendored = opts.excludeVendored === true;
   const baseConfined = confinedProjectRoot();
   const confinedRoot = opts.projectRoot !== void 0 && baseConfined !== null && isProjectRootAllowed(opts.projectRoot, baseConfined) ? confinedProjectRoot(opts.projectRoot) ?? baseConfined : baseConfined;
   if (baseConfined !== null) {
@@ -10809,33 +10910,48 @@ function runSymbol(opts) {
     }
   }
   const queryOpts = {};
-  if (opts.name !== void 0) queryOpts.name = opts.name;
   if (opts.file !== void 0) {
     queryOpts.filePath = resolveIndexPath(opts.file, opts.projectRoot ?? process.cwd());
     healStaleIndex(queryOpts.filePath);
   }
+  if (opts.name !== void 0) queryOpts.name = queryOpts.filePath !== void 0 ? stripHtmlIdSpelling(opts.name, queryOpts.filePath) : opts.name;
   if (opts.kind !== void 0) queryOpts.kind = opts.kind;
-  if (matchesGrep !== void 0 || excludeTests) {
-    queryOpts.limit = FIND_SCAN_LIMIT2;
-  } else if (opts.limit !== void 0) {
+  const anyClientFilter = matchesGrep !== void 0 || excludeTests || excludeVendored;
+  const effectiveLimit = opts.limit ?? DEFAULT_QUERY_LIMIT;
+  if (!anyClientFilter && opts.limit !== void 0) {
     queryOpts.limit = opts.limit;
   }
   if (opts.file === void 0 && opts.projectRoot !== void 0) queryOpts.rootDir = opts.projectRoot;
   if (opts.file === void 0 && queryOpts.rootDir === void 0 && confinedRoot !== null) queryOpts.rootDir = confinedRoot;
-  let rawResults = querySymbols(queryOpts);
+  const runSweep = () => {
+    const found = { kept: [], keptCount: 0, scanned: 0, hiddenByExcludeTests: 0, files: /* @__PURE__ */ new Set() };
+    const take = (s) => {
+      found.scanned++;
+      found.files.add(s.filePath);
+      const nameKept = matchesGrep === void 0 || matchesGrep(s.name);
+      if (nameKept && !(excludeTests && isTestFile(s.filePath)) && !(excludeVendored && isIgnoredIndexPath(s.filePath))) {
+        found.keptCount++;
+        if (found.kept.length < effectiveLimit) found.kept.push(s);
+      } else if (excludeTests && nameKept && isTestFile(s.filePath)) {
+        found.hiddenByExcludeTests++;
+      }
+    };
+    if (anyClientFilter) forEachSymbol(queryOpts, take);
+    else for (const row of querySymbols(queryOpts)) take(row);
+    return found;
+  };
+  let sweep = runSweep();
   let stillStale = EMPTY_PATH_SET;
   if (opts.file === void 0) {
-    const heal = healStaleResultFiles(rawResults.map((s) => s.filePath));
+    const heal = healStaleResultFiles([...sweep.files]);
     stillStale = heal.stillStale;
-    if (heal.healed) rawResults = querySymbols(queryOpts);
-  }
-  const preFilterCount = rawResults.length;
-  const effectiveLimit = opts.limit ?? 100;
-  const anyClientFilter = matchesGrep !== void 0 || excludeTests;
-  const filtered = anyClientFilter ? rawResults.filter((s) => (matchesGrep === void 0 || matchesGrep(s.name)) && !(excludeTests && isTestFile(s.filePath))) : rawResults;
-  const results = anyClientFilter ? filtered.slice(0, effectiveLimit) : filtered;
-  const hiddenByExcludeTests = excludeTests ? rawResults.filter((s) => (matchesGrep === void 0 || matchesGrep(s.name)) && isTestFile(s.filePath)).length : 0;
-  if (excludeTests && filtered.length === 0 && hiddenByExcludeTests > 0) {
+    if (heal.healed) sweep = runSweep();
+  }
+  const preFilterCount = sweep.scanned;
+  const unordered = sweep.kept.slice(0, effectiveLimit);
+  const results = opts.name === void 0 ? unordered : stableSortImportBindsLast(unordered);
+  const hiddenByExcludeTests = sweep.hiddenByExcludeTests;
+  if (excludeTests && sweep.keptCount === 0 && hiddenByExcludeTests > 0) {
     const label = opts.name ?? opts.grep ?? "*";
     const notice = `no non-test matches for '${label}' (${excludeTestsHiddenNote(hiddenByExcludeTests)})`;
     if (opts.json === true) {
@@ -10843,7 +10959,7 @@ function runSymbol(opts) {
     }
     return { text: `token-goat: ${notice}`, code: 0 };
   }
-  if (matchesGrep !== void 0 && filtered.length === 0 && preFilterCount > 0) {
+  if (matchesGrep !== void 0 && sweep.keptCount === 0 && preFilterCount > 0) {
     if (opts.json === true) {
       const text2 = displaySafeJson({ items: [], truncated: false, totalCount: 0 });
       return { text: text2, code: 0 };
@@ -10856,8 +10972,14 @@ function runSymbol(opts) {
     const indexEmpty = emptyIndexRoot !== null && isIndexEmptyForProject(globalDbPath(), emptyIndexRoot);
     if (opts.name !== void 0 && emptyIndexRoot !== null) {
       const rootDir = emptyIndexRoot;
-      const rawSymbols = querySymbols({ limit: FIND_SCAN_LIMIT2, rootDir });
-      const exactMatches = rawSymbols.filter((s) => s.name === opts.name);
+      const exactMatches = [];
+      const allNames = /* @__PURE__ */ new Set();
+      const structuredFileSet = /* @__PURE__ */ new Set();
+      forEachSymbol({ rootDir }, (s) => {
+        allNames.add(s.name);
+        structuredFileSet.add(s.filePath);
+        if (s.name === opts.name) exactMatches.push(s);
+      });
       if (exactMatches.length > 0) {
         const shown = exactMatches.slice(0, DIDYOUMEAN_LIMIT);
         const where = shown.map((s) => `${s.kind} at ${formatSymbolLocation(toDisplayPath(rootDir, s.filePath), s.lineStart)}`).join("; ");
@@ -10867,12 +10989,12 @@ function runSymbol(opts) {
         text2 += `
 '${opts.name}' IS indexed (${where}${more}) -- ${widen}`;
       } else {
-        const candidates = rankSimilarNames(rawSymbols.map((s) => s.name), opts.name);
+        const candidates = rankSimilarNames([...allNames], opts.name);
         text2 += candidates.length > 0 ? `
 ${didYouMean(candidates)}` : indexEmpty ? "" : `
 Try: token-goat semantic "${opts.name}"`;
       }
-      const structuredFiles = [...new Set(rawSymbols.map((s) => s.filePath))].sort();
+      const structuredFiles = [...structuredFileSet].sort();
       const hit = findStructuredKeyPath(opts.name, structuredFiles);
       if (hit !== null) {
         const display = toDisplayPath(rootDir, hit.filePath);
@@ -10898,8 +11020,8 @@ ${emptyIndexMessage(emptyIndexRoot)}`;
     let trueTotal;
     let truncatedFlag;
     if (anyClientFilter) {
-      trueTotal = filtered.length;
-      truncatedFlag = capped.truncated || results.length < filtered.length;
+      trueTotal = sweep.keptCount;
+      truncatedFlag = capped.truncated || results.length < sweep.keptCount;
     } else {
       trueTotal = countSymbols(queryOpts);
       truncatedFlag = capped.truncated || trueTotal > results.length;
@@ -10935,7 +11057,7 @@ ${preview}${elided}` : header;
   const warning = opts.file !== void 0 ? staleWarning(resolveIndexPath(opts.file, opts.projectRoot ?? process.cwd())) : "";
   const text = guardText(warning + blocks.join("\n\n"), "symbol");
   recordReadStat("symbol_lookup", fullSourceBytes, text, opts.name ?? opts.file ?? opts.grep);
-  const symbolTotal = () => anyClientFilter ? { count: filtered.length, exact: rawResults.length < FIND_SCAN_LIMIT2 } : { count: countSymbols(queryOpts), exact: true };
+  const symbolTotal = () => anyClientFilter ? { count: sweep.keptCount, exact: true } : { count: countSymbols(queryOpts), exact: true };
   return { text: text + truncationFooter(results.length, effectiveLimit, symbolTotal, "matches", "--limit"), code: 0 };
 }
 function truncationFooter(shown, limit, total, plural, flag) {
@@ -10946,6 +11068,7 @@ token-goat: ${notice}`;
 }
 function refsTotal(clientFiltered, filteredTotal, shown, countExact, preScanCount, scanLimit) {
   if (!clientFiltered) return { count: countExact(), exact: true };
+  if (scanLimit < 0) return { count: filteredTotal ?? shown, exact: true };
   return { count: filteredTotal ?? shown, exact: preScanCount < scanLimit };
 }
 function truncationNotice(shown, limit, total, plural, flag) {
@@ -10957,6 +11080,8 @@ function truncationNotice(shown, limit, total, plural, flag) {
 function runRead(opts) {
   const range = parseLineRange(opts.spec);
   if (range !== null) return runLineRange(range, opts);
+  const region = parseColonLineSpec(opts.spec);
+  if (region !== null) return runLineRegion(region, opts);
   const crossFilePairs = parseCrossFileMultiSpec(opts.spec);
   if (crossFilePairs !== null) return runReadMulti(crossFilePairs, opts);
   const { file, symbol } = parseReadSpec(opts.spec);
@@ -10996,7 +11121,7 @@ function runRead(opts) {
     const crossFileLead = formatCrossFileLead("read", symbol, file, opts.projectRoot);
     if (crossFileLead !== "") messages.push(crossFileLead);
     const resolved = resolveIndexPath(file, opts.projectRoot ?? process.cwd());
-    const scanned = querySymbols({ filePath: resolved, limit: FIND_SCAN_LIMIT2 }).map((s) => s.name);
+    const scanned = querySymbols({ filePath: resolved, limit: FIND_SCAN_LIMIT }).map((s) => s.name);
     const closes = rankSimilarNames(scanned, symbol);
     if (closes.length > 0) messages.push(didYouMean(closes));
     else if (scanned.length > 0) {
@@ -11046,8 +11171,7 @@ Query subtree: token-goat json-query ${file} '<path>'`);
       {
         ...match,
         body: resolveBody(match),
-        // The text branch below prepends staleWarning's DELETED line; without this the JSON form
-        // would be the one surface that still passes a deleted file's body off as a live read.
+        // The text branch below prepends staleWarning's DELETED line; without this the JSON form would be the one surface that still passes a deleted file's body off as a live read.
         ...fileIsGone(match.filePath) ? { deleted: true } : {},
         ...refCounts !== void 0 ? { refCount: refCounts.get(match.name) ?? 0 } : {}
       }
@@ -11063,7 +11187,9 @@ Query subtree: token-goat json-query ${file} '<path>'`);
     body
   ];
   const warning = staleWarning(match.filePath);
-  const text = guardText(warning + trimBlankLines(lines).join("\n"), "symbol");
+  const narrowerSliceHint = bodyLen > LARGE_SYMBOL_LINE_THRESHOLD ? `
+# for a narrower slice: token-goat grep "<pattern>" ${file} -C 15 --symbol` : "";
+  const text = guardText(warning + trimBlankLines(lines).join("\n"), "symbol") + narrowerSliceHint;
   if (opts.suppressStat !== true) recordReadStat("read_replacement", fullSourceBytes, text, opts.spec);
   return { text, code: 0 };
 }
@@ -11164,9 +11290,9 @@ function renderRefsTargets(targets, opts, {
   const refRows = [];
   for (const { file, symbol, key } of targets) {
     const queryOpts = { name: symbol };
-    if (opts.excludeTests === true || opts.grep !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
+    if (opts.excludeTests === true || opts.grep !== void 0) queryOpts.limit = UNBOUNDED_QUERY_LIMIT;
     else if (opts.limit !== void 0) queryOpts.limit = opts.limit;
-    else if (opts.top !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
+    else if (opts.top !== void 0) queryOpts.limit = UNBOUNDED_QUERY_LIMIT;
     const rootDir = refsRootDir(opts);
     if (rootDir !== void 0) queryOpts.rootDir = rootDir;
     const scanned = queryRefs(queryOpts);
@@ -11236,7 +11362,7 @@ function renderRefsTargets(targets, opts, {
   const fullSourceBytes = refsSearchBaselineBytes(refRows);
   if (opts.json === true) {
     const text2 = displaySafeJson(jsonOut);
-    emit4(text2);
+    emit(text2);
     if (anyFound) recordReadStat("symbol_read", fullSourceBytes, text2, opts.spec);
     return anyFound ? 0 : 1;
   }
@@ -11247,11 +11373,11 @@ function renderRefsTargets(targets, opts, {
 }
 function runRefs(opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
-    emitErr4(`--limit must be a positive number, got: ${opts.limit}`);
+    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
     return 1;
   }
   if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr4(`--top must be a positive number, got: ${opts.top}`);
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
     return 1;
   }
   const baseConfined = confinedProjectRoot();
@@ -11260,13 +11386,13 @@ function runRefs(opts) {
     const requested = opts.projectRoot;
     const projectDenial = requested === void 0 || confinedRoot !== baseConfined ? null : confinementRefusal("--project", requested, baseConfined);
     if (projectDenial !== null) {
-      emitErr4(projectDenial);
+      emitErr(projectDenial);
       return 1;
     }
     for (const file2 of refsSpecFiles(opts.spec)) {
       const denial = confinementRefusal("This file", resolveIndexPath(file2, opts.projectRoot ?? process.cwd()), confinedRoot);
       if (denial !== null) {
-        emitErr4(denial);
+        emitErr(denial);
         return 1;
       }
     }
@@ -11297,9 +11423,9 @@ function runRefsSingle(opts) {
   const symName = symbol ?? file;
   const queryOpts = { name: symName };
   const defFileHint = symbol !== void 0 ? resolveIndexPath(file, opts.projectRoot ?? process.cwd()) : void 0;
-  if (opts.excludeTests === true || opts.grep !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
+  if (opts.excludeTests === true || opts.grep !== void 0) queryOpts.limit = UNBOUNDED_QUERY_LIMIT;
   else if (opts.limit !== void 0) queryOpts.limit = opts.limit;
-  else if (opts.top !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
+  else if (opts.top !== void 0) queryOpts.limit = UNBOUNDED_QUERY_LIMIT;
   const rootDir = refsRootDir(opts);
   if (rootDir !== void 0) queryOpts.rootDir = rootDir;
   const scanned = queryRefs(queryOpts);
@@ -11325,39 +11451,39 @@ function runRefsSingle(opts) {
   if (results.length === 0) {
     if (matchesGrep !== void 0 && preGrepCount > 0) {
       if (opts.json === true) {
-        emit4(displaySafeJson({ items: [], truncated: false, totalCount: 0, hiddenByGrep: preGrepCount }));
+        emit(displaySafeJson({ items: [], truncated: false, totalCount: 0, hiddenByGrep: preGrepCount }));
         return 0;
       }
-      emit4(grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "reference", "references"));
+      emit(grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "reference", "references"));
       return 0;
     }
     if (opts.excludeTests === true && suppressed > 0) {
-      emitErr4(`No non-test references found for '${symName}' (${excludeTestsHiddenNote(suppressed)})`);
+      emitErr(`No non-test references found for '${symName}' (${excludeTestsHiddenNote(suppressed)})`);
       return 1;
     }
     const rootDir2 = opts.projectRoot ?? resolveProjectRoot({ project: process.cwd() });
     const defRows = querySymbols({ name: symName, rootDir: rootDir2, limit: REF_BLIND_DEF_PROBE_LIMIT });
     if (defRows.length === 0) {
-      emitErr4(`Symbol not found: ${symName}${unknownSymbolSuggestion(symName, rootDir2)}`);
-      if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir2)) emitErr4(emptyIndexMessage(rootDir2));
+      emitErr(`Symbol not found: ${symName}${unknownSymbolSuggestion(symName, rootDir2)}`);
+      if (opts.json !== true && isIndexEmptyForProject(globalDbPath(), rootDir2)) emitErr(emptyIndexMessage(rootDir2));
       return 1;
     }
     const defPaths = defFileHint !== void 0 ? [defFileHint] : defRows.map((r) => r.filePath);
     const firstDefPath = defPaths[0];
     if (firstDefPath !== void 0 && defPaths.every((fp) => !isRefIndexedFile(fp))) {
-      emitErr4(refBlindLanguageNotice(symName, detectLanguageOfFile(firstDefPath), refsDisplayPath(firstDefPath)));
+      emitErr(refBlindLanguageNotice(symName, detectLanguageOfFile(firstDefPath), refsDisplayPath(firstDefPath)));
       return 1;
     }
     const kindRows = defFileHint !== void 0 ? querySymbols({ name: symName, filePath: defFileHint, rootDir: rootDir2, limit: REF_BLIND_DEF_PROBE_LIMIT }) : defRows;
     const kindVerdict = refBlindKindVerdict(kindRows);
     if (kindVerdict.allBlind) {
-      emitErr4(refBlindKindNotice(symName, kindVerdict.blindKinds));
+      emitErr(refBlindKindNotice(symName, kindVerdict.blindKinds));
       return 1;
     }
-    emitErr4(`No references found for '${symName}'`);
-    if (kindVerdict.blindCount > 0) emitErr4(refBlindKindPartialNote(symName, kindVerdict.blindKinds, kindVerdict.blindCount, kindRows.length));
+    emitErr(`No references found for '${symName}'`);
+    if (kindVerdict.blindCount > 0) emitErr(refBlindKindPartialNote(symName, kindVerdict.blindKinds, kindVerdict.blindCount, kindRows.length));
     if (opts.json !== true) {
-      if (isIndexEmptyForProject(globalDbPath(), rootDir2)) emitErr4(emptyIndexMessage(rootDir2));
+      if (isIndexEmptyForProject(globalDbPath(), rootDir2)) emitErr(emptyIndexMessage(rootDir2));
     }
     return 1;
   }
@@ -11374,14 +11500,14 @@ function runRefsSingle(opts) {
     }
     const hiddenByGrep = matchesGrep !== void 0 ? preGrepCount - (filteredTotal ?? results.length) : 0;
     const text2 = displaySafeJson({ ...payload, ...hiddenByGrep > 0 ? { hiddenByGrep } : {} });
-    emit4(text2);
+    emit(text2);
     recordReadStat("symbol_read", fullSourceBytes, text2, symName);
     return 0;
   }
   const lines = opts.top !== void 0 ? renderTopFilesSummary(results, opts.top, suppressed) : opts.callers === true ? [...opts.excludeTests === true && suppressed > 0 ? [`${countNoun(results.length, "reference")} (${excludeTestsHiddenNote(suppressed)})`] : [], ...renderCallerGroups(results, opts.context ?? 0)] : [...opts.excludeTests === true && suppressed > 0 ? [`${countNoun(results.length, "reference")} (${excludeTestsHiddenNote(suppressed)})`] : [], ...results.flatMap((ref) => renderRefLines(ref, opts.context ?? 0, ""))];
   const refsFooter = opts.top !== void 0 ? "" : truncationFooter(results.length, opts.limit ?? 100, () => refsTotal(clientFiltered, filteredTotal, results.length, () => countRefs(queryOpts), preScanCount, scanLimit), "references", "--limit");
   const text = lines.join("\n");
-  emit4(guardText(text, "symbol") + refsFooter);
+  emit(guardText(text, "symbol") + refsFooter);
   recordReadStat("symbol_read", fullSourceBytes, text + refsFooter, symName);
   return 0;
 }
@@ -11437,11 +11563,11 @@ function renderCallerGroups(refs, contextLines = 0) {
 function runPrSlice(opts) {
   const parsed = parsePrSliceArg(opts.slice);
   if (parsed === null) {
-    emitErr4(`Invalid slice '${opts.slice}' -- expected one of: files, diff:<path>, comments, description`);
+    emitErr(`Invalid slice '${opts.slice}' -- expected one of: files, diff:<path>, comments, description`);
     return 1;
   }
   if (!isGhAvailable()) {
-    emitErr4("gh (GitHub CLI) not found on PATH -- install it from https://cli.github.com and run `gh auth login`");
+    emitErr("gh (GitHub CLI) not found on PATH -- install it from https://cli.github.com and run `gh auth login`");
     return 1;
   }
   let repo = opts.repo;
@@ -11455,21 +11581,21 @@ function runPrSlice(opts) {
     }
     const resolved = remoteUrl.length > 0 ? parseGithubRepoFromRemoteUrl(remoteUrl) : null;
     if (resolved === null) {
-      emitErr4("Could not resolve a GitHub repo from the current directory's git remote 'origin' -- pass --repo owner/repo");
+      emitErr("Could not resolve a GitHub repo from the current directory's git remote 'origin' -- pass --repo owner/repo");
       return 1;
     }
     repo = resolved;
   }
   if (!isSafeRepoSlug(repo)) {
-    emitErr4(`"${repo}" is not a plain owner/name repository slug -- pass --repo owner/repo`);
+    emitErr(`"${repo}" is not a plain owner/name repository slug -- pass --repo owner/repo`);
     return 1;
   }
   if (!isSafePrNumber(opts.pr)) {
-    emitErr4(`"${opts.pr}" is not a pull request number`);
+    emitErr(`"${opts.pr}" is not a pull request number`);
     return 1;
   }
   if (!isGhAuthenticated()) {
-    emitErr4("gh is not authenticated -- run `gh auth login`");
+    emitErr("gh is not authenticated -- run `gh auth login`");
     return 1;
   }
   try {
@@ -11480,7 +11606,7 @@ function runPrSlice(opts) {
         if (opts.json === true) {
           const capped = guardJsonRows(files);
           const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }, 0);
-          emit4(jsonText);
+          emit(jsonText);
           recordReadStat("pr_slice", fullSourceBytes, jsonText, `${repo}#${opts.pr} files`);
         } else {
           const text = formatFilesSlice(files);
@@ -11493,14 +11619,14 @@ function runPrSlice(opts) {
         const diffText = fetchPrDiff(opts.pr, repo);
         const rawFileDiff = extractFileDiff(diffText, parsed.path);
         if (rawFileDiff === null) {
-          emitErr4(`No diff found for '${parsed.path}' in PR #${opts.pr}`);
+          emitErr(`No diff found for '${parsed.path}' in PR #${opts.pr}`);
           return 1;
         }
         const fileDiff = redactSecrets(rawFileDiff).text;
         const fullSourceBytes = Buffer.byteLength(diffText, "utf8");
         if (opts.json === true) {
           const jsonText = displaySafeJson({ path: parsed.path, diff: fenceGithubFieldIfMatched(fileDiff) }, 0);
-          emit4(jsonText);
+          emit(jsonText);
           recordReadStat("pr_slice", fullSourceBytes, jsonText, `${repo}#${opts.pr} diff:${parsed.path}`);
         } else {
           emitGuarded(fenceGithubText(fileDiff), "pr-slice");
@@ -11520,7 +11646,7 @@ function runPrSlice(opts) {
           const fencedComments = comments.map((c) => ({ ...c, body: fenceGithubFieldIfMatched(c.body) }));
           const capped = guardJsonRows(fencedComments);
           const jsonText = displaySafeJson({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }, 0);
-          emit4(jsonText);
+          emit(jsonText);
           recordReadStat("pr_slice", fullSourceBytes, jsonText, `${repo}#${opts.pr} comments`);
         } else {
           const text = formatCommentsSlice(comments);
@@ -11544,7 +11670,7 @@ function runPrSlice(opts) {
             body: desc.body !== null ? fenceGithubFieldIfMatched(desc.body) : null
           };
           const jsonText = displaySafeJson(fencedDesc, 0);
-          emit4(jsonText);
+          emit(jsonText);
           recordReadStat("pr_slice", fullSourceBytes, jsonText, `${repo}#${opts.pr} description`);
         } else {
           const text = formatDescriptionSlice(desc);
@@ -11555,7 +11681,7 @@ function runPrSlice(opts) {
       }
     }
   } catch (e) {
-    emitErr4(extractErrorMessage(e));
+    emitErr(extractErrorMessage(e));
     return 1;
   }
 }
@@ -11654,7 +11780,7 @@ function runGrep(opts) {
   const contextLines = opts.context ?? 0;
   const guarded = compileGuardedRegex(opts.pattern);
   if (!guarded.ok) {
-    emitErr4(`Invalid regex: ${opts.pattern} -- ${guarded.reason}`);
+    emitErr(`Invalid regex: ${opts.pattern} -- ${guarded.reason}`);
     return 1;
   }
   const regex = guarded.re;
@@ -11740,7 +11866,7 @@ function runGrep(opts) {
   }
   for (const searchPath of searchPaths) {
     if (!fileExists2(searchPath)) {
-      emitErr4(`Path not found: ${searchPath}`);
+      emitErr(`Path not found: ${searchPath}`);
       return 1;
     }
     const stat = fs12.statSync(searchPath);
@@ -11767,7 +11893,7 @@ function runGrep(opts) {
     }
   }
   if (hits.length === 0) {
-    emitErr4(`No matches for '${opts.pattern}'`);
+    emitErr(`No matches for '${opts.pattern}'`);
     return 1;
   }
   const truncated = hits.slice(0, maxLines);
@@ -11783,32 +11909,44 @@ function runGrep(opts) {
       hit.symbol = enc === null ? null : { name: enc.name, kind: enc.kind, lineStart: enc.lineStart, lineEnd: enc.lineEnd };
     }
     for (const file of new Set(truncated.map((h) => h.file).filter(isVirtualIndexedPath))) {
-      emit4(virtualIndexedScopeNote(displaySafeText(file), "a match in it cannot be attributed to a symbol and these hits carry no label"));
+      emit(virtualIndexedScopeNote(displaySafeText(file), "a match in it cannot be attributed to a symbol and these hits carry no label"));
     }
   }
   if (opts.json === true) {
     const payload = { items: truncated, truncated: hits.length > maxLines, totalCount: hits.length };
-    emit4(displaySafeJson(payload));
+    emit(displaySafeJson(payload));
     return 0;
   }
   for (const hit of truncated) {
     const symbolTag = opts.symbol === true && hit.symbol != null ? ` [${hit.symbol.name} (${hit.symbol.kind})]` : "";
     if (hit.context !== void 0) {
-      for (const line of renderContextWindow(hit.file, hit.line, hit.context, symbolTag)) emit4(line);
+      for (const line of renderContextWindow(hit.file, hit.line, hit.context, symbolTag)) emit(line);
     } else {
-      emit4(`${displaySafeText(hit.file)}:${hit.line}: ${hit.text}${symbolTag}`);
+      emit(`${displaySafeText(hit.file)}:${hit.line}: ${hit.text}${symbolTag}`);
     }
   }
   if (hits.length > maxLines) {
-    emitErr4(`... (${hits.length - maxLines} more lines omitted)`);
-    emitErr4(`Tip: To avoid broad grepping and reduce token expenditure, locate specific symbols with:`);
-    emitErr4(`  token-goat symbol <name>`);
-    emitErr4(`  token-goat locate <name>`);
-    emitErr4(`  token-goat outline <file> / token-goat skeleton <file>`);
+    emitErr(`... (${hits.length - maxLines} more lines omitted)`);
+    emitErr(`Tip: To avoid broad grepping and reduce token expenditure, locate specific symbols with:`);
+    emitErr(`  token-goat symbol <name>`);
+    emitErr(`  token-goat locate <name>`);
+    emitErr(`  token-goat outline <file> / token-goat skeleton <file>`);
   }
   return 0;
 }
 var RRF_K = 60;
+function applyRelevanceFloor(hits, floor) {
+  const kept = [];
+  let nearestRejected = null;
+  for (const h of hits) {
+    if (h.distance <= floor) {
+      kept.push(h);
+    } else if (nearestRejected === null || h.distance < nearestRejected) {
+      nearestRejected = h.distance;
+    }
+  }
+  return { kept, nearestRejected };
+}
 async function runSemantic(query, opts) {
   if (opts.limit !== void 0 && opts.limit <= 0) {
     const message = `--limit must be a positive number, got: ${opts.limit}`;
@@ -11897,7 +12035,19 @@ async function runSemantic(query, opts) {
       }
     }
   }
-  if (rawHits.length === 0 && isAvailable() && preflight.status === "ready" && !searchSemanticError) {
+  let floorNearestRejected = null;
+  if (rawHits.length > 0) {
+    const floor = loadConfig().semantic.max_distance;
+    const { kept, nearestRejected } = applyRelevanceFloor(rawHits, floor);
+    floorNearestRejected = nearestRejected;
+    if (kept.length === 0 && nearestRejected !== null) {
+      console.warn(
+        `Matching on meaning found nothing within ${floor} (closest was ${nearestRejected.toFixed(3)}); these results come from keyword search alone. Raise semantic.max_distance to see weaker matches.`
+      );
+    }
+    rawHits = kept;
+  }
+  if (rawHits.length === 0 && floorNearestRejected === null && isAvailable() && preflight.status === "ready" && !searchSemanticError) {
     try {
       const enabled = loadConfig().indexing.embeddings_enabled;
       const { indexedFiles, embeddedFiles } = enabled ? getEmbeddingCoverage(globalDbPath(), rootDir) : { indexedFiles: 0, embeddedFiles: 0 };
@@ -11925,7 +12075,9 @@ async function runSemantic(query, opts) {
       kind: enclosing?.kind ?? null,
       distance: h.distance,
       previewText: h.text,
-      rrf: 1 / (RRF_K + denseRank)
+      rrf: 1 / (RRF_K + denseRank),
+      inDense: true,
+      inLexical: false
     });
   });
   ftsRows.forEach((s, ftsRank) => {
@@ -11933,6 +12085,7 @@ async function runSemantic(query, opts) {
     const existing = fused.get(key);
     if (existing !== void 0) {
       existing.rrf += 1 / (RRF_K + ftsRank);
+      existing.inLexical = true;
     } else {
       fused.set(key, {
         filePath: s.filePath,
@@ -11942,7 +12095,9 @@ async function runSemantic(query, opts) {
         kind: s.kind,
         distance: null,
         previewText: s.body,
-        rrf: 1 / (RRF_K + ftsRank)
+        rrf: 1 / (RRF_K + ftsRank),
+        inDense: false,
+        inLexical: true
       });
     }
   });
@@ -11965,12 +12120,15 @@ async function runSemantic(query, opts) {
   warnIfFilesStale(hits.map((h) => h.filePath));
   if (hits.length > 0) {
     if (opts.json === true) {
-      const items = hits.map((h) => ({
+      const items = hits.map((h, i) => ({
         filePath: toDisplayPath(rootDir, h.filePath),
         name: h.name,
         kind: h.kind,
         startLine: h.startLine,
         endLine: h.endLine,
+        rank: i + 1,
+        rrf: h.rrf,
+        retrieval: h.inDense && h.inLexical ? "both" : h.inDense ? "dense" : "lexical",
         distance: h.distance,
         preview: previewLines(h.previewText, 3)
       }));
@@ -11994,18 +12152,19 @@ async function runSemantic(query, opts) {
       recordReadStat("semantic_search", sumFileSizes(hits.map((h) => h.filePath)), text3, query);
       return { text: text3, code: 0 };
     }
-    const blocks = hits.map((h) => {
+    const blocks = hits.map((h, i) => {
+      const mark = h.inDense && h.inLexical ? ", +keyword" : "";
       if (h.distance !== null) {
         const suffix = h.name !== null ? ` \u2014 inside ${h.name} (${h.kind})` : "";
-        return `# ${toDisplayPath(rootDir, h.filePath)}:${h.startLine}-${h.endLine} (distance ${h.distance.toFixed(3)})${suffix}
+        return `# ${i + 1}. ${toDisplayPath(rootDir, h.filePath)}:${h.startLine}-${h.endLine} (distance ${h.distance.toFixed(3)}${mark})${suffix}
 ${previewLines(h.previewText, 3)}`;
       }
-      return `# ${h.name} (${h.kind}) \u2014 ${toDisplayPath(rootDir, h.filePath)}:${h.startLine}-${h.endLine}
+      return `# ${i + 1}. ${h.name} (${h.kind}) \u2014 ${toDisplayPath(rootDir, h.filePath)}:${h.startLine}-${h.endLine} (keyword)
 ${previewLines(h.previewText, 3)}`;
     });
     const text2 = guardText(blocks.join("\n\n"), "semantic");
     if (hits.length < eligibleCount) {
-      emitErr4(`Showing ${hits.length} of ${candidatesClipped ? "at least " : ""}${countNoun(eligibleCount, "match", "matches")} (raise --limit to see the rest).`);
+      emitErr(`Showing ${hits.length} of ${candidatesClipped ? "at least " : ""}${countNoun(eligibleCount, "match", "matches")} (raise --limit to see the rest).`);
     }
     recordReadStat("semantic_search", sumFileSizes(hits.map((h) => h.filePath)), text2, query);
     return { text: text2, code: 0 };
@@ -12105,7 +12264,7 @@ function fileExists3(p) {
     return false;
   }
 }
-var FIND_SCAN_LIMIT3 = 2e4;
+var FIND_SCAN_LIMIT2 = FIND_SCAN_LIMIT;
 var PARENT_IDENTIFIER_RE2 = /^[\w$]+$/;
 function parseReadSpec(spec) {
   const colonIdx = findSpecSeparator(spec);
@@ -12142,7 +12301,7 @@ function parseMultiFileSpec(spec) {
 function extraFileArgsNote(command, first, extras, opts = {}) {
   const noun = opts.noun ?? "file";
   const head = `Note: ${extras.length} extra ${noun} argument(s) ignored (${extras.join(", ")}).`;
-  if (opts.mergeable === false) return `${head} ${command} takes one ${noun} at a time.`;
+  if (opts.mergeable === false) return `${head} Run ${command} once per ${noun}.`;
   return `${head} ${command} reads one ${noun}, or a comma-separated list: token-goat ${command} "${[first, ...extras].join(",")}"`;
 }
 function parseLineRange(spec) {
@@ -12154,6 +12313,22 @@ function parseLineRange(spec) {
   const end = m[3] !== void 0 ? parseInt(m[3], 10) : start;
   return { file: m[1], start, end };
 }
+function parseColonLineSpec(spec) {
+  const colonIdx = spec.lastIndexOf(":");
+  if (colonIdx <= 0) return null;
+  const suffix = spec.slice(colonIdx + 1);
+  if (!/^\d+(?:-\d+)?$/.test(suffix)) return null;
+  const file = spec.slice(0, colonIdx);
+  if (file === "") return null;
+  if (/^[A-Za-z]$/.test(file)) return null;
+  const pastDrive = /^[A-Za-z]:/.test(file) ? file.slice(2) : file;
+  if (pastDrive === "" || pastDrive.includes(":")) return null;
+  if (fileExists3(spec)) return null;
+  const dash = suffix.indexOf("-");
+  const start = parseInt(dash === -1 ? suffix : suffix.slice(0, dash), 10);
+  const end = dash === -1 ? start : parseInt(suffix.slice(dash + 1), 10);
+  return { file, start, end };
+}
 function parseColonLineRange(symbol) {
   const m = /^(\d+)(?:[-:,](\d+))?$/.exec(symbol);
   if (m === null) return null;
@@ -12161,6 +12336,19 @@ function parseColonLineRange(symbol) {
   const end = m[2] !== void 0 ? parseInt(m[2], 10) : start;
   return { start, end };
 }
+function readSpecsMergeable(specs) {
+  if (specs.length < 2) return true;
+  const joined = specs.join(",");
+  if (parseLineRange(joined) !== null) return false;
+  if (parseColonLineSpec(joined) !== null) return false;
+  if (parseCrossFileMultiSpec(joined) !== null) return true;
+  const { symbol } = parseReadSpec(joined);
+  return symbol !== void 0 && symbol !== "" && symbol.includes(",") && parseColonLineRange(symbol) === null;
+}
+function namedSpecsMergeable(specs) {
+  if (specs.length < 2) return true;
+  return specs.every((spec) => spec.includes("::"));
+}
 function runLineRange(range, opts) {
   const { file, start, end } = range;
   const diskPath = resolveAgainstProjectRoot(file, opts.projectRoot);
@@ -12193,6 +12381,64 @@ function runLineRange(range, opts) {
     code: 0
   };
 }
+function runLineRegion(range, opts) {
+  const { file, start, end } = range;
+  if (start < 1) return { text: `Invalid line range: start must be >= 1 (got ${start})`, code: 1 };
+  if (end < start) return { text: `Invalid line range: end (${end}) is before start (${start})`, code: 1 };
+  const resolved = resolveIndexPath(file, opts.projectRoot ?? process.cwd());
+  const confined = confinementRefusal("This file", resolved, confinedProjectRoot(opts.projectRoot));
+  if (confined !== null) return { text: confined, code: 1 };
+  const text = readFileText(resolveAgainstProjectRoot(file, opts.projectRoot));
+  if (text === null) return { text: `Could not read: ${file}`, code: 1 };
+  const allLines = text.split(/\r?\n/);
+  if (allLines.length > 1 && allLines[allLines.length - 1] === "") allLines.pop();
+  if (start > allLines.length) {
+    return { text: `Line ${start} is past end of file (${countNoun(allLines.length, "line")}): ${file}`, code: 1 };
+  }
+  if (opts.forceRefresh === true) {
+    indexFileSyncPinned(resolved, globalDbPath());
+    enqueueDirtyPathSafe(resolved, { alreadyResolved: true });
+  } else {
+    healStaleIndex(resolved);
+  }
+  const symbols = querySymbols({ filePath: resolved, limit: FIND_SCAN_LIMIT2 });
+  const regions = resolveLineRegions(symbols, allLines.length, start, end);
+  const asked = start === end ? `${start}` : `${start}-${end}`;
+  if (regions.length === 0) {
+    return {
+      text: `No indexed symbols in '${file}', so line ${asked} cannot be resolved to a region.
+Read the raw lines instead: token-goat read "${file}@${asked}"`,
+      code: 1
+    };
+  }
+  const slice = (r) => allLines.slice(r.start - 1, Math.min(r.end, allLines.length)).join("\n");
+  if (opts.json === true) {
+    return {
+      text: displaySafeJson({
+        file,
+        requested: { start, end },
+        regions: regions.map((r) => ({
+          kind: r.kind,
+          label: r.label,
+          start: r.start,
+          end: Math.min(r.end, allLines.length),
+          lines: allLines.slice(r.start - 1, Math.min(r.end, allLines.length))
+        }))
+      }),
+      code: 0
+    };
+  }
+  const blocks = [];
+  if (regions.length > 1) blocks.push(`# ${file}:${asked} -> ${countNoun(regions.length, "region")}`);
+  regions.forEach((r, i) => {
+    const body = slice(r);
+    const tag = regions.length > 1 ? `[${i + 1}/${regions.length}] ` : `${file}:${asked} -> `;
+    const span = `lines ${r.start}-${Math.min(r.end, allLines.length)} of ${allLines.length}`;
+    blocks.push(`# ${tag}${r.label}  ${span} (~${Math.ceil(body.length / 4)} tok)
+${body}`);
+  });
+  return { text: guardText(staleWarning(resolved) + blocks.join("\n\n"), "lines"), code: 0 };
+}
 function findParentName(entry, fileSymbols) {
   let best = null;
   for (const s of fileSymbols) {
@@ -12219,7 +12465,7 @@ function formatAmbiguity(symbol, file, candidates, explicitRoot, commandName = "
   const getFileSyms = (filePath) => {
     let fileSyms = fileSymCache.get(filePath);
     if (fileSyms === void 0) {
-      fileSyms = querySymbols({ filePath, limit: FIND_SCAN_LIMIT3 });
+      fileSyms = querySymbols({ filePath, limit: FIND_SCAN_LIMIT2 });
       fileSymCache.set(filePath, fileSyms);
     }
     return fileSyms;
@@ -12267,13 +12513,17 @@ function fileConfinementRefusal(label, file, projectRoot) {
   if (root === null) return null;
   return confinementRefusal(label, resolveIndexPath(file, projectRoot ?? process.cwd()), root);
 }
+function stripHtmlIdSpelling(name, filePath) {
+  return name.startsWith("#") && detectLanguage(filePath) === "html" ? name.slice(1) : name;
+}
 function resolveSymbolSpec(spec, forceRefresh, projectRoot) {
   const { file, symbol: rawSymbol } = parseReadSpec(spec);
   if (rawSymbol === void 0 || rawSymbol === "") return { kind: "none" };
   const anchorMatch = /^(.+)@(\d+)$/.exec(rawSymbol);
-  const symbol = anchorMatch !== null ? anchorMatch[1] : rawSymbol;
+  const anchorSymbol = anchorMatch !== null ? anchorMatch[1] : rawSymbol;
   const lineAnchor = anchorMatch !== null ? parseInt(anchorMatch[2], 10) : void 0;
   const resolved = resolveIndexPath(file, projectRoot ?? process.cwd());
+  const symbol = stripHtmlIdSpelling(anchorSymbol, resolved);
   const confined = confinementRefusal("This file", resolved, confinedProjectRoot(projectRoot));
   if (confined !== null) return { kind: "confined", message: confined };
   if (forceRefresh === true) {
@@ -12343,16 +12593,16 @@ function resolveSymbolSpec(spec, forceRefresh, projectRoot) {
 function resolveSymbolSpecOrEmitError(commandName, spec, projectRoot) {
   const { file, symbol } = parseReadSpec(spec);
   if (symbol === void 0 || symbol === "") {
-    emitErr4(`'token-goat ${commandName}' requires a 'file::symbol' spec (got '${spec}')`);
+    emitErr(`'token-goat ${commandName}' requires a 'file::symbol' spec (got '${spec}')`);
     return null;
   }
   const resolution = resolveSymbolSpec(spec, void 0, projectRoot);
   if (resolution.kind === "confined") {
-    emitErr4(resolution.message);
+    emitErr(resolution.message);
     return null;
   }
   if (resolution.kind === "ambiguous") {
-    emitErr4(
+    emitErr(
       formatAmbiguity(
         resolution.symbol,
         resolution.file,
@@ -12368,11 +12618,11 @@ function resolveSymbolSpecOrEmitError(commandName, spec, projectRoot) {
     const crossFileLead = formatCrossFileLead(commandName, symbol, file, projectRoot);
     if (crossFileLead !== "") messages.push(crossFileLead);
     const resolved = resolveIndexPath(file, projectRoot ?? process.cwd());
-    const scanned = querySymbols({ filePath: resolved, limit: FIND_SCAN_LIMIT3 }).map((s) => s.name);
+    const scanned = querySymbols({ filePath: resolved, limit: FIND_SCAN_LIMIT2 }).map((s) => s.name);
     const closes = rankSimilarNames(scanned, symbol);
     if (closes.length > 0) messages.push(didYouMean(closes));
     else if (scanned.length > 0) messages.push(`Try: token-goat outline ${file}`);
-    emitErr4(messages.join("\n"));
+    emitErr(messages.join("\n"));
     return null;
   }
   return resolution.entry;
@@ -12387,13 +12637,13 @@ var CONTENT_MAX_ITEMS = 256;
 var CONTENT_MAX_BYTES = 32 * 1024 * 1024;
 var CONTENT_MAX_ITEM_BYTES = CONTENT_MAX_INPUT_CHARS * 7;
 var CONTENT_SUBDIR = "content";
-var TEXT_BYTES_PER_TOKEN = 4;
-var BASE64URL_BYTES_PER_TOKEN = 1.45;
+var TEXT_BYTES_PER_TOKEN = BYTES_PER_TOKEN.text;
+var BASE64URL_BYTES_PER_TOKEN = BYTES_PER_TOKEN.dense;
 function estimateTextTokens(bytes) {
-  return Math.round(bytes / TEXT_BYTES_PER_TOKEN);
+  return savedTokensFromBytes(bytes, "text");
 }
 function estimateBase64urlTokens(bytes) {
-  return Math.round(bytes / BASE64URL_BYTES_PER_TOKEN);
+  return savedTokensFromBytes(bytes, "dense");
 }
 function assertInput(text) {
   if (text.length > CONTENT_MAX_INPUT_CHARS) {
@@ -12504,6 +12754,8 @@ function resolveHandoff(name, opts = {}) {
 export {
   isAvailable2 as isAvailable,
   loadError,
+  emit,
+  emitErr,
   ALL_SYMBOLS_IN_FILE_LIMIT,
   enclosingSymbol,
   runDead,
@@ -12541,6 +12793,9 @@ export {
   didYouMean,
   extraFileArgsNote,
   parseLineRange,
+  parseColonLineSpec,
+  readSpecsMergeable,
+  namedSpecsMergeable,
   runSkeleton,
   runOutline,
   runBrief,