token-goat 2.8.0 → 2.8.1

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

@@ -2,6 +2,7 @@ import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
 import {
   IMPORT_RE,
+  ImageDecodeError,
   MAX_OVER_FETCH,
   OVER_FETCH_FACTOR,
   SKIP_DIRS,
@@ -25,9 +26,11 @@ import {
   isBlobStale,
   isImagePath,
   isIndexEmptyForProject,
+  isOcrEngineAvailable,
   isTextHeavy,
   lineOpenDelimiterAfter,
   loadBlob,
+  locatePdfPages,
   mergeNearbyHits,
   ocrImage,
   parseWhereSpecs,
@@ -51,7 +54,7 @@ import {
   walkProject,
   yamlLineClosesQuote,
   yamlOpenQuoteAfter
-} from "./token-goat-chunk-2F6TFBZE.mjs";
+} from "./token-goat-chunk-2G6RAB4G.mjs";
 import {
   Database,
   PER_FILE_COUNTERFACTUAL_CEILING,
@@ -103,7 +106,7 @@ import {
   unsupportedLanguageName,
   windowsCmdQuoteArg,
   withExtension
-} from "./token-goat-chunk-44Y77VHR.mjs";
+} from "./token-goat-chunk-ELDJRLHZ.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-AO2QD2AG.mjs";
@@ -3451,6 +3454,33 @@ function mergeParameters(pathLevelParams, ownParams) {
   });
   return [...inheritedParams, ...ownParams];
 }
+function resolveJsonPointer(root, ref) {
+  const parts = ref.slice(2).split("/").map((p) => p.replace(/~1/g, "/").replace(/~0/g, "~"));
+  let cur = root;
+  for (const part of parts) {
+    if (typeof cur !== "object" || cur === null) return null;
+    cur = cur[part];
+    if (cur === void 0) return null;
+  }
+  return cur;
+}
+function dereferenceLocalRefs(node, root, seen) {
+  if (Array.isArray(node)) return node.map((item) => dereferenceLocalRefs(item, root, seen));
+  if (typeof node !== "object" || node === null) return node;
+  const rec = node;
+  const ref = rec["$ref"];
+  if (typeof ref === "string" && ref.startsWith("#/")) {
+    if (seen.has(ref)) return node;
+    const target = resolveJsonPointer(root, ref);
+    if (target === void 0 || target === null) return node;
+    return dereferenceLocalRefs(target, root, /* @__PURE__ */ new Set([...seen, ref]));
+  }
+  const out = {};
+  for (const [key, value] of Object.entries(rec)) {
+    out[key] = dereferenceLocalRefs(value, root, seen);
+  }
+  return out;
+}
 function extractOperations(spec) {
   if (typeof spec !== "object" || spec === null) return [];
   const paths = spec["paths"];
@@ -3473,9 +3503,9 @@ function extractOperations(spec) {
         ...typeof op["summary"] === "string" ? { summary: op["summary"] } : {},
         ...typeof op["description"] === "string" ? { description: op["description"] } : {},
         ...tags !== void 0 && tags.length > 0 ? { tags } : {},
-        parameters: mergeParameters(pathLevelParams, ownParams),
-        ...op["requestBody"] !== void 0 ? { requestBody: op["requestBody"] } : {},
-        responses: typeof op["responses"] === "object" && op["responses"] !== null ? op["responses"] : {}
+        parameters: dereferenceLocalRefs(mergeParameters(pathLevelParams, ownParams), spec, /* @__PURE__ */ new Set()),
+        ...op["requestBody"] !== void 0 ? { requestBody: dereferenceLocalRefs(op["requestBody"], spec, /* @__PURE__ */ new Set()) } : {},
+        responses: typeof op["responses"] === "object" && op["responses"] !== null ? dereferenceLocalRefs(op["responses"], spec, /* @__PURE__ */ new Set()) : {}
       });
     }
   }
@@ -5105,6 +5135,7 @@ function findIdentifierNearPosition(ts, sourceFile, line0, position, name) {
 
 // src/read_commands.ts
 var DIDYOUMEAN_LIMIT = 5;
+var SYMBOL_PREVIEW_LINES = 5;
 var AMBIGUOUS_HEADING_LIMIT = 10;
 var TYPO_TWO_EDIT_MIN_LEN = 8;
 var TYPO_MAX_QUERY_LEN = 64;
@@ -5657,9 +5688,13 @@ ${emptyIndexMessage(emptyIndexRoot)}`;
     const goneTag = fileIsGone(sym.filePath) ? `  ${DELETED_TAG}` : "";
     const header = `# ${sym.name} (${sym.kind}) \u2014 ${toDisplayPath(symbolDisplayRoot, sym.filePath)}:${sym.lineStart}-${sym.lineEnd}${statsStr}${goneTag}`;
     const body = resolveBody(sym);
-    const preview = body.split(/\r?\n/).slice(0, 5).join("\n");
+    const bodyLines = body.split(/\r?\n/);
+    const preview = bodyLines.slice(0, SYMBOL_PREVIEW_LINES).join("\n");
+    const dropped = bodyLines.length - SYMBOL_PREVIEW_LINES;
+    const elided = dropped > 0 ? `
+  ...(${countNoun(dropped, "more line")}; full body: token-goat read "${toDisplayPath(symbolDisplayRoot, sym.filePath)}::${sym.name}")` : "";
     return preview.trim() !== "" ? `${header}
-${preview}` : header;
+${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");
@@ -6773,8 +6808,29 @@ function runQueryCommand(opts, parse, formatLabel, guardTag, kind) {
 function runJsonQuery(opts) {
   return runQueryCommand(opts, JSON.parse, "JSON", "json-query", "json_query");
 }
+function isPlainObject2(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v) && Object.getPrototypeOf(v) === Object.prototype;
+}
+function resolveYamlMergeKeys(node) {
+  if (Array.isArray(node)) return node.map(resolveYamlMergeKeys);
+  if (!isPlainObject2(node)) return node;
+  const merged = {};
+  const mergeVal = node["<<"];
+  if (mergeVal !== void 0) {
+    const sources = Array.isArray(mergeVal) ? mergeVal : [mergeVal];
+    for (const src of [...sources].reverse()) {
+      const resolved = resolveYamlMergeKeys(src);
+      if (isPlainObject2(resolved)) Object.assign(merged, resolved);
+    }
+  }
+  for (const [key, value] of Object.entries(node)) {
+    if (key === "<<") continue;
+    merged[key] = resolveYamlMergeKeys(value);
+  }
+  return merged;
+}
 function parseYamlDocument(text) {
-  const docs = loadAll(text);
+  const docs = loadAll(text).map(resolveYamlMergeKeys);
   return docs.length === 1 ? docs[0] : docs;
 }
 function runYamlOutline(opts) {
@@ -7277,6 +7333,13 @@ async function runPdfMeta(file) {
   const data = fs5.readFileSync(file);
   return extractPdfMeta(new Uint8Array(data));
 }
+async function runPdfLocate(file, pattern, opts) {
+  if (!fileExists(file)) {
+    throw new Error(`Could not read: ${file}`);
+  }
+  const data = fs5.readFileSync(file);
+  return locatePdfPages(new Uint8Array(data), pattern, opts);
+}
 async function runImageMeta(file) {
   if (!fileExists(file)) {
     throw new Error(`Could not read: ${file}`);
@@ -7286,7 +7349,15 @@ async function runImageMeta(file) {
   }
   const data = fs5.readFileSync(file);
   const bytes = data.length;
-  const probe = await probeImageMeta(data);
+  let probe;
+  try {
+    probe = await probeImageMeta(data);
+  } catch (e) {
+    if (e instanceof ImageDecodeError) {
+      throw new Error(`${file} is not a readable image: ${e.message}`, { cause: e });
+    }
+    throw e;
+  }
   if (probe === null) {
     return { width: 0, height: 0, format: null, bytes, sharpAvailable: false, wouldShrink: false, shrunkBytes: null };
   }
@@ -7311,6 +7382,9 @@ async function runImageText(file) {
   const data = fs5.readFileSync(file);
   const ocr = await ocrImage(data);
   if (ocr === null) {
+    if (isOcrEngineAvailable()) {
+      throw new Error(`${file} could not be processed by OCR (unreadable image, timeout, or offline model fetch)`);
+    }
     return { ocrAvailable: false, confidence: 0, chars: 0, textHeavy: false, text: null };
   }
   const minConfidence = loadConfig().image_shrink.ocr_min_confidence;
@@ -9753,6 +9827,14 @@ function runScope(opts) {
   const filePath = resolveIndexPath(file);
   const syms = querySymbols({ filePath, limit: ALL_SYMBOLS_IN_FILE_LIMIT });
   const enclosing = syms.filter((s) => s.lineStart <= line && line <= s.lineEnd).sort((a, b) => b.lineStart - a.lineStart);
+  if (syms.length === 0) {
+    if (!fs6.existsSync(filePath)) {
+      emitErr2(`Could not read: ${file}`);
+      return 1;
+    }
+    emitErr2(`No indexed symbols in '${file}' \u2014 the file exists but nothing is indexed for it, so every line looks empty`);
+    return 1;
+  }
   if (enclosing.length === 0) {
     emitErr2(`No symbols enclosing line ${line} in '${file}'`);
     return 1;
@@ -10088,9 +10170,9 @@ function runBlame(opts) {
   }
   if (opts.json === true) {
     const lines = raw.split("\n").filter((l) => l.length > 0).map((l) => {
-      const m = /^([0-9a-f]+)\s+\((.+?)\s+(\d{4}-\d{2}-\d{2}[^)]*)\s+(\d+)\)(.*)/.exec(l);
+      const m = /^(\^?)([0-9a-f]+)\s+\((.+?)\s+(\d{4}-\d{2}-\d{2}[^)]*)\s+(\d+)\)(.*)/.exec(l);
       if (!m) return { raw: l };
-      return { commit: m[1], author: (m[2] ?? "").trim(), date: (m[3] ?? "").trim(), line: Number.parseInt(m[4] ?? "0", 10), content: m[5] };
+      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(JSON.stringify({ symbol: sym.name, file: filePath, lines }, null, 2));
     return 0;
@@ -10334,6 +10416,7 @@ export {
   upsertNote,
   isAvailable2 as isAvailable,
   loadError,
+  AMBIGUOUS_HEADING_LIMIT,
   ConfinementIdentityError,
   ABSENT_PIN,
   pinKey,
@@ -10373,6 +10456,7 @@ export {
   runPdfExtractText,
   runPdfOutline,
   runPdfMeta,
+  runPdfLocate,
   runImageMeta,
   runImageText,
   runScreenshot,