token-goat 2.6.36 → 2.8.0

package/dist/{token-goat-chunk-IYTVE6KN.mjs → token-goat-chunk-SRAR6DOK.mjs}

@@ -21,6 +21,7 @@ import {
   formatCsvTable,
   getFileEntry,
   indexFileSync,
+  isAvailable,
   isBlobStale,
   isImagePath,
   isIndexEmptyForProject,
@@ -50,8 +51,9 @@ import {
   walkProject,
   yamlLineClosesQuote,
   yamlOpenQuoteAfter
-} from "./token-goat-chunk-UFOVM7ZN.mjs";
+} from "./token-goat-chunk-2F6TFBZE.mjs";
 import {
+  Database,
   PER_FILE_COUNTERFACTUAL_CEILING,
   _detectOpenQuote,
   _lineClosesQuote,
@@ -101,7 +103,7 @@ import {
   unsupportedLanguageName,
   windowsCmdQuoteArg,
   withExtension
-} from "./token-goat-chunk-V465YKOR.mjs";
+} from "./token-goat-chunk-44Y77VHR.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-AO2QD2AG.mjs";
@@ -320,7 +322,15 @@ function resolveHeaderPos(headers, base, ordinal) {
     const pick2 = ordinal === null ? 0 : ordinal - 1;
     const headerPos = matches[pick2];
     if (headerPos === void 0) return null;
-    return { headerPos, redirectedFrom: null };
+    let occurrences = null;
+    if (ordinal === null && matches.length > 1) {
+      occurrences = [];
+      for (const i of matches) {
+        const h = headers[i];
+        if (h !== void 0) occurrences.push(h.index + 1);
+      }
+    }
+    return { headerPos, redirectedFrom: null, occurrences };
   }
   if (ordinal !== null || normalizedTarget.length === 0) return null;
   let prefixPos = -1;
@@ -337,7 +347,7 @@ function resolveHeaderPos(headers, base, ordinal) {
   if (distinct.size === 1 && prefixPos !== -1) {
     const chosen = headers[prefixPos];
     if (chosen === void 0) return null;
-    return { headerPos: prefixPos, redirectedFrom: base };
+    return { headerPos: prefixPos, redirectedFrom: base, occurrences: null };
   }
   const queryWords = normalizedTarget.split(/\s+/).filter((w) => w.length >= MIN_WIDEN_WORD_LEN);
   if (queryWords.length === 0) return null;
@@ -352,7 +362,7 @@ function resolveHeaderPos(headers, base, ordinal) {
   if (widenedMatches.length !== 1) return null;
   const widenedPos = widenedMatches[0];
   if (widenedPos === void 0) return null;
-  return { headerPos: widenedPos, redirectedFrom: base };
+  return { headerPos: widenedPos, redirectedFrom: base, occurrences: null };
 }
 function buildSectionResult(headers, kind, lines, headerPos, redirectedFrom) {
   const header = headers[headerPos];
@@ -378,7 +388,9 @@ function resolveSectionFromText(text, headingSpec, language) {
   const lines = text.split("\n");
   const resolved = resolveHeaderPos(headers, base, ordinal);
   if (resolved === null) return null;
-  return buildSectionResult(headers, kind, lines, resolved.headerPos, resolved.redirectedFrom);
+  const built = buildSectionResult(headers, kind, lines, resolved.headerPos, resolved.redirectedFrom);
+  if (built === null || resolved.occurrences === null) return built;
+  return { ...built, occurrences: resolved.occurrences };
 }
 function extractSection(text, headingSpec) {
   return resolveSectionFromText(text, headingSpec, "unknown");
@@ -3745,7 +3757,6 @@ ${c.body}`).join("\n\n");
 
 // src/sqlite_query.ts
 import * as fs2 from "node:fs";
-import Database from "better-sqlite3";
 var SQLITE_QUERY_ROW_CAP = 5e3;
 var SQLITE_MAGIC = Buffer.from([83, 81, 76, 105, 116, 101, 32, 102, 111, 114, 109, 97, 116, 32, 51, 0]);
 function readMagicBytes(filePath) {
@@ -4930,7 +4941,7 @@ function loadTs() {
   }
   return _ts;
 }
-function isAvailable() {
+function isAvailable2() {
   return loadTs() !== null;
 }
 function loadError() {
@@ -5094,6 +5105,7 @@ function findIdentifierNearPosition(ts, sourceFile, line0, position, name) {
 
 // src/read_commands.ts
 var DIDYOUMEAN_LIMIT = 5;
+var AMBIGUOUS_HEADING_LIMIT = 10;
 var TYPO_TWO_EDIT_MIN_LEN = 8;
 var TYPO_MAX_QUERY_LEN = 64;
 var MIN_REVERSE_MATCH_LEN = 3;
@@ -5382,13 +5394,14 @@ function filterSimilarHeadings(available, query) {
   return sortByLengthCloseness(matched, query);
 }
 function didYouMean(candidates) {
-  if (candidates.length === 0) return "";
+  const unique = [...new Set(candidates)];
+  if (unique.length === 0) return "";
   const lines = ["Did you mean:"];
-  for (const c of candidates.slice(0, DIDYOUMEAN_LIMIT)) {
+  for (const c of unique.slice(0, DIDYOUMEAN_LIMIT)) {
     lines.push(`  - ${c}`);
   }
-  if (candidates.length > DIDYOUMEAN_LIMIT) {
-    lines.push(`  (${candidates.length - DIDYOUMEAN_LIMIT} more not shown)`);
+  if (unique.length > DIDYOUMEAN_LIMIT) {
+    lines.push(`  (${unique.length - DIDYOUMEAN_LIMIT} more not shown)`);
   }
   return lines.join("\n");
 }
@@ -6018,6 +6031,18 @@ function runSection(opts) {
     if (!fs5.existsSync(filePath)) {
       return { text: `File not found: '${filePath}'`, code: 1 };
     }
+    const ordSpec = /^(.*?)#(\d+)$/.exec(heading);
+    const ordBase = ordSpec?.[1]?.trim();
+    if (ordBase !== void 0 && ordBase.length > 0) {
+      const baseResult = readSection(filePath, ordBase, readFileText);
+      if (baseResult !== null) {
+        const total = baseResult.occurrences?.length ?? 1;
+        return {
+          text: `Heading '${ordBase}' has ${countNoun(total, "occurrence")} in '${specFilePath}'; valid ordinals are #1 to #${total}`,
+          code: 1
+        };
+      }
+    }
     const messages = [`Section '${heading}' not found in '${filePath}'`];
     const allHeadings = listSections(filePath, readFileText);
     const available = filterSimilarHeadings(allHeadings, heading);
@@ -6026,6 +6051,18 @@ function runSection(opts) {
     else messages.push(`Try: token-goat outline ${specFilePath}`);
     return { text: messages.join("\n"), code: 1 };
   }
+  if (result.occurrences !== void 0) {
+    const lines = [
+      `Ambiguous heading '${heading}' in '${specFilePath}': ${countNoun(result.occurrences.length, "heading")} match. Retry with one of the qualified commands below to pick one:`
+    ];
+    for (const [i, line] of result.occurrences.slice(0, AMBIGUOUS_HEADING_LIMIT).entries()) {
+      lines.push(`  - line ${line}  ->  token-goat section "${specFilePath}::${heading}#${i + 1}"`);
+    }
+    if (result.occurrences.length > AMBIGUOUS_HEADING_LIMIT) {
+      lines.push(`  (${result.occurrences.length - AMBIGUOUS_HEADING_LIMIT} more not shown)`);
+    }
+    return { text: lines.join("\n"), code: 1 };
+  }
   const kind = result.redirectedFrom !== void 0 ? "section_replacement" : "section_read";
   const fullSourceBytes = sumFileSizes([filePath]);
   if (opts.json === true) {
@@ -6145,40 +6182,15 @@ function refsSpecFiles(spec) {
   const { file } = parseMultiRefsSpec(spec);
   return file === void 0 ? [] : [file];
 }
-function runRefs(opts) {
-  if (opts.limit !== void 0 && opts.limit <= 0) {
-    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
-    return 1;
-  }
-  if (opts.top !== void 0 && opts.top <= 0) {
-    emitErr(`--top must be a positive number, got: ${opts.top}`);
-    return 1;
-  }
-  const confinedRoot = confinedProjectRoot();
-  if (confinedRoot !== null) {
-    const projectDenial = opts.projectRoot === void 0 ? null : confinementRefusal("--project", opts.projectRoot, confinedRoot);
-    if (projectDenial !== null) {
-      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) {
-        emitErr(denial);
-        return 1;
-      }
-    }
-  }
-  const crossFilePairs = parseCrossFileMultiSpec(opts.spec);
-  if (crossFilePairs !== null) return runRefsCrossFile(crossFilePairs, opts);
-  const { file, symbols } = parseMultiRefsSpec(opts.spec);
-  if (symbols.length <= 1) return runRefsSingle(opts);
+function renderRefsTargets(targets, opts, {
+  annotateHiddenByGrep
+}) {
   const jsonOut = {};
   let anyFound = false;
   const lines = [];
   const refFilePaths = [];
-  for (const sym of symbols) {
-    const queryOpts = { name: sym };
+  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;
     else if (opts.limit !== void 0) queryOpts.limit = opts.limit;
     else if (opts.top !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
@@ -6186,7 +6198,7 @@ function runRefs(opts) {
     if (rootDir !== void 0) queryOpts.rootDir = rootDir;
     const scanned = queryRefs(queryOpts);
     const preScanCount = scanned.length;
-    let results = applyTypedRefsTier(sym, file, scanned);
+    let results = applyTypedRefsTier(symbol, file, scanned);
     let suppressed = 0;
     if (opts.excludeTests === true) {
       const f = applyExcludeTestsFilter(results);
@@ -6205,25 +6217,25 @@ function runRefs(opts) {
     refFilePaths.push(...results.map((r) => r.filePath));
     if (opts.json === true) {
       const hiddenByGrep = matchesGrep !== void 0 ? preGrepCount - (filteredTotal ?? results.length) : 0;
-      const withHidden = (payload) => ({ ...payload, ...hiddenByGrep > 0 ? { hiddenByGrep } : {} });
+      const withHidden = (payload) => ({ ...payload, ...annotateHiddenByGrep && hiddenByGrep > 0 ? { hiddenByGrep } : {} });
       if (opts.top !== void 0) {
-        jsonOut[sym] = withHidden(topFilesJsonPayload(results, opts.top));
+        jsonOut[key] = withHidden(topFilesJsonPayload(results, opts.top));
       } else {
         const capped = guardJsonRows(results);
         const trueTotal = opts.excludeTests === true || matchesGrep !== void 0 ? filteredTotal ?? results.length : countRefs(queryOpts);
-        jsonOut[sym] = withHidden({ items: refsJsonItems(capped.items, opts.context ?? 0), truncated: capped.truncated || trueTotal > results.length, totalCount: trueTotal });
+        jsonOut[key] = withHidden({ items: refsJsonItems(capped.items, opts.context ?? 0), truncated: capped.truncated || trueTotal > results.length, totalCount: trueTotal });
       }
       continue;
     }
     if (results.length === 0) {
       if (matchesGrep !== void 0 && preGrepCount > 0) {
-        lines.push(`${sym}: ${grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "reference", "references").trim()}`);
+        lines.push(`${key}: ${grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "reference", "references").trim()}`);
         continue;
       }
-      lines.push(opts.excludeTests === true && suppressed > 0 ? `${sym}: (no non-test references found; ${excludeTestsHiddenNote(suppressed)})` : `${sym}: (no references found)`);
+      lines.push(opts.excludeTests === true && suppressed > 0 ? `${key}: (no non-test references found; ${excludeTestsHiddenNote(suppressed)})` : `${key}: (no references found)`);
       continue;
     }
-    lines.push(`${sym}:`);
+    lines.push(`${key}:`);
     if (opts.top !== void 0) {
       lines.push(...renderTopFilesSummary(results, opts.top, suppressed));
     } else if (opts.callers === true) {
@@ -6256,90 +6268,50 @@ function runRefs(opts) {
   if (anyFound) recordReadStat("symbol_read", fullSourceBytes, text, opts.spec);
   return anyFound ? 0 : 1;
 }
-function runRefsCrossFile(pairs, opts) {
-  const distinctFiles = new Set(pairs.map((p) => p.file));
-  const keyFor = (p) => distinctFiles.size === 1 ? p.symbol : `${p.file}::${p.symbol}`;
-  const jsonOut = {};
-  let anyFound = false;
-  const lines = [];
-  const refFilePaths = [];
-  for (const { file, symbol } of pairs) {
-    const key = keyFor({ file, symbol });
-    const queryOpts = { name: symbol };
-    if (opts.excludeTests === true || opts.grep !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
-    else if (opts.limit !== void 0) queryOpts.limit = opts.limit;
-    else if (opts.top !== void 0) queryOpts.limit = REFS_TOP_SCAN_LIMIT;
-    const rootDir = refsRootDir(opts);
-    if (rootDir !== void 0) queryOpts.rootDir = rootDir;
-    const scanned = queryRefs(queryOpts);
-    const preScanCount = scanned.length;
-    let results = applyTypedRefsTier(symbol, file, scanned);
-    let suppressed = 0;
-    if (opts.excludeTests === true) {
-      const f = applyExcludeTestsFilter(results);
-      suppressed = f.suppressed;
-      results = f.refs;
-    }
-    const preGrepCount = results.length;
-    const matchesGrep = refGrepFilter(opts.grep);
-    if (matchesGrep !== void 0) results = results.filter(matchesGrep);
-    let filteredTotal;
-    if (opts.excludeTests === true || matchesGrep !== void 0) filteredTotal = results.length;
-    if ((opts.excludeTests === true || matchesGrep !== void 0) && opts.top === void 0) {
-      results = results.slice(0, opts.limit ?? 100);
-    }
-    if (results.length > 0) anyFound = true;
-    refFilePaths.push(...results.map((r) => r.filePath));
-    if (opts.json === true) {
-      if (opts.top !== void 0) {
-        jsonOut[key] = topFilesJsonPayload(results, opts.top);
-      } else {
-        const capped = guardJsonRows(results);
-        const trueTotal = opts.excludeTests === true || matchesGrep !== void 0 ? filteredTotal ?? results.length : countRefs(queryOpts);
-        jsonOut[key] = { items: refsJsonItems(capped.items, opts.context ?? 0), truncated: capped.truncated || trueTotal > results.length, totalCount: trueTotal };
-      }
-      continue;
+function runRefs(opts) {
+  if (opts.limit !== void 0 && opts.limit <= 0) {
+    emitErr(`--limit must be a positive number, got: ${opts.limit}`);
+    return 1;
+  }
+  if (opts.top !== void 0 && opts.top <= 0) {
+    emitErr(`--top must be a positive number, got: ${opts.top}`);
+    return 1;
+  }
+  const confinedRoot = confinedProjectRoot();
+  if (confinedRoot !== null) {
+    const projectDenial = opts.projectRoot === void 0 ? null : confinementRefusal("--project", opts.projectRoot, confinedRoot);
+    if (projectDenial !== null) {
+      emitErr(projectDenial);
+      return 1;
     }
-    if (results.length === 0) {
-      if (matchesGrep !== void 0 && preGrepCount > 0) {
-        lines.push(`${key}: ${grepFilteredToEmptyNotice(preGrepCount, opts.grep ?? "", "reference", "references").trim()}`);
-        continue;
+    for (const file2 of refsSpecFiles(opts.spec)) {
+      const denial = confinementRefusal("This file", resolveIndexPath(file2, opts.projectRoot ?? process.cwd()), confinedRoot);
+      if (denial !== null) {
+        emitErr(denial);
+        return 1;
       }
-      lines.push(opts.excludeTests === true && suppressed > 0 ? `${key}: (no non-test references found; ${excludeTestsHiddenNote(suppressed)})` : `${key}: (no references found)`);
-      continue;
-    }
-    lines.push(`${key}:`);
-    if (opts.top !== void 0) {
-      lines.push(...renderTopFilesSummary(results, opts.top, suppressed));
-    } else if (opts.callers === true) {
-      if (opts.excludeTests === true && suppressed > 0) lines.push(`  ${countNoun(results.length, "reference")} (${excludeTestsHiddenNote(suppressed)})`);
-      lines.push(...renderCallerGroups(results, opts.context ?? 0));
-    } else {
-      if (opts.excludeTests === true && suppressed > 0) lines.push(`  ${countNoun(results.length, "reference")} (${excludeTestsHiddenNote(suppressed)})`);
-      for (const ref of results) lines.push(...renderRefLines(ref, opts.context ?? 0));
-    }
-    if (opts.top === void 0) {
-      const notice = truncationNotice(
-        results.length,
-        opts.limit ?? 100,
-        () => refsTotal(opts.excludeTests === true || matchesGrep !== void 0, filteredTotal, results.length, () => countRefs(queryOpts), preScanCount),
-        "references",
-        "--limit"
-      );
-      if (notice !== null) lines.push(`  token-goat: ${notice}`);
     }
   }
-  const fullSourceBytes = sumFileSizes(refFilePaths);
-  if (opts.json === true) {
-    const text2 = JSON.stringify(jsonOut, null, 2);
-    emit(text2);
-    if (anyFound) recordReadStat("symbol_read", fullSourceBytes, text2, opts.spec);
-    return anyFound ? 0 : 1;
-  }
-  const text = lines.join("\n");
-  emitGuarded(text, "symbol");
-  if (anyFound) recordReadStat("symbol_read", fullSourceBytes, text, opts.spec);
-  return anyFound ? 0 : 1;
+  const crossFilePairs = parseCrossFileMultiSpec(opts.spec);
+  if (crossFilePairs !== null) return runRefsCrossFile(crossFilePairs, opts);
+  const { file, symbols } = parseMultiRefsSpec(opts.spec);
+  if (symbols.length <= 1) return runRefsSingle(opts);
+  return renderRefsTargets(
+    symbols.map((symbol) => ({ file, symbol, key: symbol })),
+    opts,
+    { annotateHiddenByGrep: true }
+  );
+}
+function runRefsCrossFile(pairs, opts) {
+  const distinctFiles = new Set(pairs.map((p) => p.file));
+  const keyFor = (p) => distinctFiles.size === 1 ? p.symbol : `${p.file}::${p.symbol}`;
+  return renderRefsTargets(
+    pairs.map((p) => ({ file: p.file, symbol: p.symbol, key: keyFor(p) })),
+    opts,
+    // Not annotated today; renderRefsTargets's own option doc explains why that is a preserved
+    // divergence rather than a decision.
+    { annotateHiddenByGrep: false }
+  );
 }
 function runRefsSingle(opts) {
   const { file, symbol } = parseReadSpec(opts.spec);
@@ -7569,7 +7541,15 @@ function runListSections(opts) {
   }
   const preFilterCount = sections.length;
   const matchesGrep = opts.grep !== void 0 ? compileGrepMatcher(opts.grep) : void 0;
-  const filtered = matchesGrep !== void 0 ? sections.filter((s) => matchesGrep(s)) : sections;
+  const totals = /* @__PURE__ */ new Map();
+  for (const heading of sections) totals.set(heading, (totals.get(heading) ?? 0) + 1);
+  const seen = /* @__PURE__ */ new Map();
+  const labelled = sections.map((heading) => {
+    const nth = (seen.get(heading) ?? 0) + 1;
+    seen.set(heading, nth);
+    return (totals.get(heading) ?? 1) > 1 ? `${heading}#${nth}` : heading;
+  });
+  const filtered = matchesGrep !== void 0 ? labelled.filter((_, i) => matchesGrep(sections[i] ?? "")) : labelled;
   if (filtered.length === 0) {
     if (opts.json === true) {
       emit(JSON.stringify({ items: [], truncated: false, totalCount: 0 }, null, 2));
@@ -7583,8 +7563,8 @@ function runListSections(opts) {
     emit(JSON.stringify({ items: capped.items, truncated: capped.truncated, totalCount: capped.totalCount }, null, 2));
     return 0;
   }
-  for (const s of filtered) {
-    emit(s);
+  for (const heading of filtered) {
+    emit(heading);
   }
   return 0;
 }
@@ -8781,15 +8761,27 @@ async function runSemantic(query, opts) {
     }
   }
   const rootDir = opts.projectRoot ?? resolveProjectRoot({ project: process.cwd() });
+  if (!isAvailable()) {
+    console.warn(
+      "Matching on meaning is off (onnxruntime-node is not installed); these results come from keyword search alone. Install it with: npm install -g onnxruntime-node (drop -g if token-goat is a project dependency)"
+    );
+  }
   const overFetchForMerge = Math.min(MAX_OVER_FETCH, n * OVER_FETCH_FACTOR);
-  const rawHits = await searchSemantic(
-    getDb(globalDbPath()),
-    query,
-    overFetchForMerge,
-    void 0,
-    void 0,
-    rootDir
-  );
+  let rawHits = [];
+  try {
+    rawHits = await searchSemantic(
+      getDb(globalDbPath()),
+      query,
+      overFetchForMerge,
+      void 0,
+      void 0,
+      rootDir
+    );
+  } catch (e) {
+    console.warn(
+      `Matching on meaning is off (${extractErrorMessage(e)}); these results come from keyword search alone.`
+    );
+  }
   const mergedHits = mergeNearbyHits(rawHits);
   const overFetchFts = Math.min(MAX_OVER_FETCH, n * OVER_FETCH_FACTOR);
   const ftsRows = searchSymbolsFts(query, overFetchFts, void 0, rootDir);
@@ -10340,7 +10332,7 @@ export {
   symbolNamesInFile,
   computeFileFingerprint,
   upsertNote,
-  isAvailable,
+  isAvailable2 as isAvailable,
   loadError,
   ConfinementIdentityError,
   ABSENT_PIN,

package/dist/{token-goat-chunk-MGOUYAA2.mjs → token-goat-chunk-TUPJRK7R.mjs}

@@ -4,7 +4,7 @@ import {
   loadConfig,
   redactSecrets,
   stripAnsiCodes
-} from "./token-goat-chunk-V465YKOR.mjs";
+} from "./token-goat-chunk-44Y77VHR.mjs";
 
 // src/tool_filters/helpers.ts
 import * as fs from "node:fs";