token-goat 2.6.33 → 2.6.35

package/dist/{token-goat-chunk-TDYTBCT4.mjs → token-goat-chunk-I2KCEGIP.mjs}

@@ -5,20 +5,26 @@ import {
   PER_FILE_COUNTERFACTUAL_CEILING,
   SOURCE_HINT,
   SYMBOL_BODY_CHAR_CAP,
+  assignBraceBlockSpans,
   assignFlatEndLines,
   atomicWriteBytes,
   atomicWriteText,
   backupFile,
   buildLineIndex,
+  countContentLines,
   countNoun,
   dataDir,
+  decodeSource,
   detectHarness,
   detectLanguage,
+  displaySafePath,
+  displaySafeText,
   ensureDirSync,
   escapeRegExp,
   extractEnv,
   extractErrorMessage,
   extractIni,
+  fileIsAbsent,
   findHtmlHeadingMatches,
   findMatchingBraceEndLine,
   findProject,
@@ -82,7 +88,7 @@ import {
   withFileLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-WFRR2DBG.mjs";
+} from "./token-goat-chunk-K7W3P2TJ.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-AO2QD2AG.mjs";
@@ -154,7 +160,12 @@ function decodeZipEntry(entries, entryPath) {
 async function parseOoxmlPart(xmlText2) {
   const fxp = await loadXmlParser();
   if (!fxp) throw new Error("fast-xml-parser is not installed; run `npm install fast-xml-parser` to enable this command");
-  const parser = new fxp.XMLParser({ ignoreAttributes: false, preserveOrder: false, trimValues: false });
+  const parser = new fxp.XMLParser({
+    ignoreAttributes: false,
+    preserveOrder: false,
+    trimValues: false,
+    parseTagValue: false
+  });
   return parser.parse(xmlText2);
 }
 function pushTextValue(runs, val) {
@@ -514,7 +525,7 @@ var ResizeableBuffer = class {
   }
   toString(encoding) {
     if (encoding) {
-      return this.buf.slice(0, this.length).toString(encoding);
+      return this.buf.toString(encoding, 0, this.length);
     } else {
       return Uint8Array.prototype.slice.call(this.buf.slice(0, this.length));
     }
@@ -1766,14 +1777,19 @@ var transform = function(original_options = {}) {
           const obj = {};
           for (let i = 0, l = record.length; i < l; i++) {
             if (columns[i] === void 0 || columns[i].disabled) continue;
-            if (group_columns_by_name === true && obj[columns[i].name] !== void 0) {
+            if (group_columns_by_name === true && Object.hasOwn(obj, columns[i].name)) {
               if (Array.isArray(obj[columns[i].name])) {
                 obj[columns[i].name] = obj[columns[i].name].concat(record[i]);
               } else {
                 obj[columns[i].name] = [obj[columns[i].name], record[i]];
               }
             } else {
-              obj[columns[i].name] = record[i];
+              Object.defineProperty(obj, columns[i].name, {
+                value: record[i],
+                enumerable: true,
+                writable: true,
+                configurable: true
+              });
             }
           }
           if (raw === true || info2 === true) {
@@ -2268,35 +2284,264 @@ function profileCsv(content, opts = {}) {
 }
 function formatCsvProfile(profiles) {
   return profiles.map((p) => {
-    const lines2 = [`${p.name}  (${p.inferredType})`, `  nulls: ${p.nullCount}  distinct: ${p.distinctCount}`];
-    if (p.min !== void 0) lines2.push(`  range: ${p.min} .. ${p.max}`);
-    if (p.topValues !== void 0) lines2.push(`  values: ${p.topValues.map((t) => `${t.value} (${t.count})`).join(", ")}`);
+    const lines2 = [
+      `${displaySafeText(p.name)}  (${p.inferredType})`,
+      `  nulls: ${p.nullCount}  distinct: ${p.distinctCount}`
+    ];
+    if (p.min !== void 0) lines2.push(`  range: ${displaySafeText(p.min)} .. ${displaySafeText(p.max ?? "")}`);
+    if (p.topValues !== void 0) lines2.push(`  values: ${p.topValues.map((t) => `${displaySafeText(t.value)} (${t.count})`).join(", ")}`);
     return lines2.join("\n");
   }).join("\n\n");
 }
 
-// src/xlsx_extract.ts
-var loadExcelJs = createLazyModuleLoader(async () => {
-  const mod = await import("exceljs");
-  return mod.default ?? mod;
-}, "xlsx reading disabled (exceljs package unavailable)");
-async function requireExcelJs() {
-  const mod = await loadExcelJs();
-  if (!mod) throw new Error("exceljs is not installed; run `npm install exceljs` to enable this command");
-  return mod;
+// src/xlsx_reader.ts
+var EMPTY_CELL = Object.freeze({ value: null, text: "" });
+function asArray(val) {
+  if (val === void 0 || val === null) return [];
+  if (Array.isArray(val)) return val.filter((v) => v !== null && typeof v === "object");
+  if (typeof val === "object") return [val];
+  return [];
+}
+function textOf(node) {
+  if (node === void 0 || node === null) return "";
+  if (typeof node === "string") return node;
+  if (typeof node === "number" || typeof node === "boolean") return String(node);
+  if (Array.isArray(node)) return node.map(textOf).join("");
+  const t = node["#text"];
+  return t === void 0 ? "" : String(t);
+}
+function attr(node, name) {
+  if (node === void 0) return void 0;
+  const v = node[`@_${name}`];
+  return v === void 0 || v === null ? void 0 : String(v);
+}
+function isTruthyAttr(v) {
+  return v === "1" || v === "true";
+}
+function refToColumn(ref2) {
+  let n = 0;
+  for (const ch of ref2) {
+    const code = ch.toUpperCase().charCodeAt(0);
+    if (code < 65 || code > 90) break;
+    n = n * 26 + (code - 64);
+  }
+  return n;
 }
-async function loadWorkbook(filePath) {
-  const ExcelJS = await requireExcelJs();
-  const wb = new ExcelJS.Workbook();
-  try {
-    await wb.xlsx.readFile(filePath);
-  } catch (err) {
-    const msg = extractErrorMessage(err);
-    if (msg.startsWith("File not found:")) throw err;
-    throw new Error(`not a valid .xlsx file: ${filePath}`, { cause: err });
+function refToRow(ref2) {
+  const m = /(\d+)\s*$/.exec(ref2);
+  return m ? parseInt(m[1], 10) : 0;
+}
+var BUILTIN_DATE_FORMAT_IDS = /* @__PURE__ */ new Set([14, 15, 16, 17, 18, 19, 20, 21, 22, 45, 46, 47]);
+function formatCodeIsDate(formatCode) {
+  const stripped = formatCode.replace(/"[^"]*"/g, "").replace(/\[[^\]]*\]/g, "").replace(/\\./g, "");
+  return /[ymdhs]/i.test(stripped);
+}
+function serialToDate(serial, date1904) {
+  if (date1904) return new Date(Date.UTC(1904, 0, 1) + Math.round(serial * 864e5));
+  const adjusted = serial >= 61 ? serial - 1 : serial;
+  return new Date(Date.UTC(1899, 11, 31) + Math.round(adjusted * 864e5));
+}
+function numberToText(n) {
+  return String(n);
+}
+function parseStyles(xml, parsed) {
+  if (xml === null || parsed === null || typeof parsed !== "object") return { dateStyles: [] };
+  const sheet = parsed["styleSheet"];
+  if (sheet === void 0 || sheet === null || typeof sheet !== "object") return { dateStyles: [] };
+  const root = sheet;
+  const customDateFormats = /* @__PURE__ */ new Set();
+  for (const fmt of asArray(root["numFmts"]?.["numFmt"])) {
+    const id = Number(attr(fmt, "numFmtId"));
+    const code = attr(fmt, "formatCode");
+    if (Number.isFinite(id) && code !== void 0 && formatCodeIsDate(code)) customDateFormats.add(id);
+  }
+  const dateStyles = [];
+  for (const xf of asArray(root["cellXfs"]?.["xf"])) {
+    const id = Number(attr(xf, "numFmtId") ?? "0");
+    dateStyles.push(Number.isFinite(id) && (BUILTIN_DATE_FORMAT_IDS.has(id) || customDateFormats.has(id)));
+  }
+  return { dateStyles };
+}
+function parseSharedStrings(parsed) {
+  if (parsed === null || typeof parsed !== "object") return [];
+  const sst = parsed["sst"];
+  if (sst === void 0 || sst === null || typeof sst !== "object") return [];
+  return asArray(sst["si"]).map((si) => {
+    if (si["t"] !== void 0) return textOf(si["t"]);
+    const runs = asArray(si["r"]);
+    if (runs.length > 0) return runs.map((r) => textOf(r["t"])).join("");
+    return "";
+  });
+}
+function parseWorkbookRels(parsed) {
+  const out = /* @__PURE__ */ new Map();
+  if (parsed === null || typeof parsed !== "object") return out;
+  const rels = parsed["Relationships"];
+  if (rels === void 0 || rels === null || typeof rels !== "object") return out;
+  for (const rel of asArray(rels["Relationship"])) {
+    const id = attr(rel, "Id");
+    const target = attr(rel, "Target");
+    if (id === void 0 || target === void 0) continue;
+    const normalized = target.startsWith("/") ? target.slice(1) : `xl/${target.replace(/^\.\//, "")}`;
+    out.set(id, normalized);
   }
-  return wb;
+  return out;
 }
+function buildCell(c, shared, styles, date1904) {
+  const type = attr(c, "t") ?? "n";
+  const styleIdx = Number(attr(c, "s") ?? "-1");
+  const isDateStyle = Number.isInteger(styleIdx) && styleIdx >= 0 && styles.dateStyles[styleIdx] === true;
+  const hasV = c["v"] !== void 0;
+  const hasIs = c["is"] !== void 0;
+  const fNode = c["f"];
+  const formula = fNode === void 0 ? "" : textOf(fNode);
+  if (!hasV && !hasIs && formula === "") return null;
+  let raw;
+  let text;
+  if (type === "s") {
+    const idx = Number(textOf(c["v"]));
+    const s = Number.isInteger(idx) ? shared[idx] ?? "" : "";
+    raw = s;
+    text = s;
+  } else if (type === "inlineStr") {
+    const isNode = c["is"];
+    const s = isNode !== void 0 && isNode !== null && typeof isNode === "object" ? (() => {
+      const node = isNode;
+      if (node["t"] !== void 0) return textOf(node["t"]);
+      return asArray(node["r"]).map((r) => textOf(r["t"])).join("");
+    })() : textOf(isNode);
+    raw = s;
+    text = s;
+  } else if (type === "str") {
+    const s = textOf(c["v"]);
+    raw = s;
+    text = s;
+  } else if (type === "b") {
+    const b = textOf(c["v"]).trim() === "1";
+    raw = b;
+    text = b ? "TRUE" : "FALSE";
+  } else if (type === "e") {
+    const e = textOf(c["v"]);
+    raw = { error: e };
+    text = e;
+  } else {
+    const n = Number(textOf(c["v"]));
+    if (!Number.isFinite(n)) {
+      raw = null;
+      text = "";
+    } else if (isDateStyle) {
+      const d = serialToDate(n, date1904);
+      raw = d;
+      text = d.toISOString();
+    } else {
+      raw = n;
+      text = numberToText(n);
+    }
+  }
+  if (formula !== "") return { value: { formula, result: raw }, text, formula };
+  return { value: raw, text };
+}
+function parseSheet(parsed, shared, styles, date1904) {
+  const cells = /* @__PURE__ */ new Map();
+  let rowCount = 0;
+  let columnCount = 0;
+  let populatedRows = 0;
+  if (parsed === null || typeof parsed !== "object") return { cells, rowCount, columnCount, populatedRows };
+  const ws = parsed["worksheet"];
+  if (ws === void 0 || ws === null || typeof ws !== "object") return { cells, rowCount, columnCount, populatedRows };
+  const sheetData = ws["sheetData"];
+  if (sheetData === void 0 || sheetData === null || typeof sheetData !== "object") {
+    return { cells, rowCount, columnCount, populatedRows };
+  }
+  let fallbackRow = 0;
+  for (const row of asArray(sheetData["row"])) {
+    const declaredRow = Number(attr(row, "r"));
+    const rowIdx = Number.isInteger(declaredRow) && declaredRow > 0 ? declaredRow : fallbackRow + 1;
+    fallbackRow = rowIdx;
+    let fallbackCol = 0;
+    const rowCells = /* @__PURE__ */ new Map();
+    for (const c of asArray(row["c"])) {
+      const ref2 = attr(c, "r");
+      const declaredCol = ref2 === void 0 ? 0 : refToColumn(ref2);
+      const colIdx = declaredCol > 0 ? declaredCol : fallbackCol + 1;
+      fallbackCol = colIdx;
+      const cell = buildCell(c, shared, styles, date1904);
+      if (cell === null) continue;
+      rowCells.set(colIdx, cell);
+      if (colIdx > columnCount) columnCount = colIdx;
+    }
+    if (rowCells.size === 0) continue;
+    cells.set(rowIdx, rowCells);
+    populatedRows++;
+    if (rowIdx > rowCount) rowCount = rowIdx;
+  }
+  return { cells, rowCount, columnCount, populatedRows };
+}
+function makeWorksheet(name, data) {
+  function getRow(r) {
+    const rowCells = data.cells.get(r);
+    return {
+      get values() {
+        const out = [];
+        if (rowCells !== void 0) for (const [col, cell] of rowCells) out[col] = cell.value;
+        return out;
+      },
+      eachCell(opts, cb) {
+        if (opts.includeEmpty) {
+          const maxCol = data.columnCount;
+          for (let c = 1; c <= maxCol; c++) cb(rowCells?.get(c) ?? EMPTY_CELL, c);
+          return;
+        }
+        if (rowCells === void 0) return;
+        for (const col of [...rowCells.keys()].sort((a, b) => a - b)) cb(rowCells.get(col), col);
+      }
+    };
+  }
+  return {
+    name,
+    rowCount: data.rowCount,
+    columnCount: data.columnCount,
+    actualRowCount: data.populatedRows,
+    getRow,
+    getCell(addr) {
+      return data.cells.get(refToRow(addr))?.get(refToColumn(addr)) ?? EMPTY_CELL;
+    }
+  };
+}
+async function readXlsxWorkbook(filePath) {
+  const entries = await readOoxmlZip(filePath, ".xlsx");
+  const workbookXml = decodeZipEntry(entries, "xl/workbook.xml");
+  if (workbookXml === null) throw new Error(`not a valid .xlsx file: ${filePath}`);
+  const workbookRoot = await parseOoxmlPart(workbookXml);
+  const wbNode = workbookRoot?.["workbook"];
+  if (wbNode === void 0 || wbNode === null || typeof wbNode !== "object") {
+    throw new Error(`not a valid .xlsx file: ${filePath}`);
+  }
+  const wb = wbNode;
+  const date1904 = isTruthyAttr(attr(wb["workbookPr"], "date1904"));
+  const relsXml = decodeZipEntry(entries, "xl/_rels/workbook.xml.rels");
+  const rels = parseWorkbookRels(relsXml === null ? null : await parseOoxmlPart(relsXml));
+  const sharedXml = decodeZipEntry(entries, "xl/sharedStrings.xml");
+  const shared = sharedXml === null ? [] : parseSharedStrings(await parseOoxmlPart(sharedXml));
+  const stylesXml = decodeZipEntry(entries, "xl/styles.xml");
+  const styles = parseStyles(stylesXml, stylesXml === null ? null : await parseOoxmlPart(stylesXml));
+  const worksheets = [];
+  for (const sheet of asArray(wb["sheets"]?.["sheet"])) {
+    const name = attr(sheet, "name") ?? "";
+    const rid = attr(sheet, "r:id") ?? attr(sheet, "relationshipId");
+    const partPath = rid === void 0 ? void 0 : rels.get(rid);
+    const sheetXml = partPath === void 0 ? null : decodeZipEntry(entries, partPath);
+    const data = sheetXml === null ? { cells: /* @__PURE__ */ new Map(), rowCount: 0, columnCount: 0, populatedRows: 0 } : parseSheet(await parseOoxmlPart(sheetXml), shared, styles, date1904);
+    worksheets.push(makeWorksheet(name, data));
+  }
+  return {
+    worksheets,
+    getWorksheet: (name) => worksheets.find((ws) => ws.name === name)
+  };
+}
+
+// src/xlsx_extract.ts
+var loadWorkbook = readXlsxWorkbook;
 function requireSheet(wb, sheetName) {
   const ws = wb.getWorksheet(sheetName);
   if (ws === void 0) {
@@ -3035,10 +3280,11 @@ function logHintEmission(category, sessionId, correlator, compensateSelfResolve
   try {
     const db = getDb(globalDbPath());
     const resolved = correlator === null ? 1 : 0;
+    const actedOn = resolved === 1 && isSuppressionCategory(category) ? 1 : 0;
     const window = ACTED_ON_WINDOW + (compensateSelfResolve ? 1 : 0);
     db.prepare(
       `INSERT INTO hint_emissions (category, session_id, harness, correlator, emitted_at, resolved, acted_on, calls_remaining, bytes_emitted)
-       VALUES (@category, @sessionId, @harness, @correlator, @emittedAt, @resolved, 0, @callsRemaining, @bytesEmitted)`
+       VALUES (@category, @sessionId, @harness, @correlator, @emittedAt, @resolved, @actedOn, @callsRemaining, @bytesEmitted)`
     ).run({
       category,
       sessionId,
@@ -3046,13 +3292,14 @@ function logHintEmission(category, sessionId, correlator, compensateSelfResolve
       correlator,
       emittedAt: Date.now(),
       resolved,
+      actedOn,
       callsRemaining: correlator === null ? 0 : window,
       bytesEmitted
     });
   } catch {
   }
 }
-var TOKEN_GOAT_INVOCATION_RE = /(?:^|[\s;&|])token-goat(?=[\s]|$)/;
+var TOKEN_GOAT_INVOCATION_RE = /(?:^|[\s;&|])(?:token-goat|tg)(?=[\s]|$)/;
 function commandMentionsCorrelator(command, correlator) {
   let idx = command.indexOf(correlator);
   while (idx !== -1) {
@@ -3065,6 +3312,30 @@ function commandMentionsCorrelator(command, correlator) {
   }
   return false;
 }
+var SUPPRESSION_HINT_CATEGORIES = /* @__PURE__ */ new Set([
+  "read_reread_dedup",
+  "edit_reread_suggest"
+]);
+function isSuppressionCategory(category) {
+  return SUPPRESSION_HINT_CATEGORIES.has(category);
+}
+var EVENT_PATH_KEYS = ["file_path", "filePath", "notebook_path", "path"];
+function eventTargetText(event) {
+  if (event.toolName === "Bash") {
+    const c = event.toolInput["command"];
+    return typeof c === "string" ? c : "";
+  }
+  for (const key of EVENT_PATH_KEYS) {
+    const v = event.toolInput[key];
+    if (typeof v === "string" && v !== "") return v;
+  }
+  return "";
+}
+function isDefiance(correlator, target) {
+  if (target === "") return false;
+  if (TOKEN_GOAT_INVOCATION_RE.test(target)) return false;
+  return commandMentionsCorrelator(target, correlator);
+}
 function isActedOn(category, correlator, command) {
   if (!TOKEN_GOAT_INVOCATION_RE.test(command)) return false;
   if (category === "bash_recall") {
@@ -3076,10 +3347,29 @@ function resolvePendingHintsForEvent(event) {
   try {
     const db = getDb(globalDbPath());
     const command = event.toolName === "Bash" && typeof event.toolInput["command"] === "string" ? event.toolInput["command"] : "";
+    const target = eventTargetText(event);
     const pending = db.prepare(`SELECT id, category, correlator, calls_remaining FROM hint_emissions WHERE session_id = ? AND resolved = 0`).all(event.sessionId);
     for (const row of pending) {
       if (!isHintCategory(row.category) || row.correlator === null) {
-        db.prepare(`UPDATE hint_emissions SET resolved = 1 WHERE id = ?`).run(row.id);
+        const unobservable = isHintCategory(row.category) && isSuppressionCategory(row.category) ? 1 : 0;
+        db.prepare(`UPDATE hint_emissions SET acted_on = ?, resolved = 1 WHERE id = ?`).run(unobservable, row.id);
+        continue;
+      }
+      if (isSuppressionCategory(row.category)) {
+        if (isDefiance(row.correlator, target)) {
+          db.prepare(`UPDATE hint_emissions SET acted_on = 0, resolved = 1 WHERE id = ?`).run(row.id);
+          continue;
+        }
+        if (command !== "" && isActedOn(row.category, row.correlator, command)) {
+          db.prepare(`UPDATE hint_emissions SET acted_on = 1, resolved = 1 WHERE id = ?`).run(row.id);
+          continue;
+        }
+        const left = row.calls_remaining - 1;
+        if (left <= 0) {
+          db.prepare(`UPDATE hint_emissions SET acted_on = 1, resolved = 1 WHERE id = ?`).run(row.id);
+        } else {
+          db.prepare(`UPDATE hint_emissions SET calls_remaining = ? WHERE id = ?`).run(left, row.id);
+        }
         continue;
       }
       if (command !== "" && isActedOn(row.category, row.correlator, command)) {
@@ -3137,15 +3427,18 @@ function manualMarks(category) {
   }
 }
 function getHintStatsSummary() {
+  const probeThresholds = loadConfig().hints.backoff_thresholds.filter((t) => t > 0);
   return HINT_CATEGORIES.map((category) => {
     const { emitted, actedOn, bytesEmitted, legacyEmissions } = categoryStats(category);
     const marks = manualMarks(category);
+    const suppressed = shouldSuppress(category, "");
     return {
       category,
       emitted,
       actedOn: actedOn ?? 0,
       efficacyPct: emitted === 0 ? null : Math.round(1e3 * (actedOn ?? 0) / emitted) / 10,
-      suppressed: shouldSuppress(category, ""),
+      suppressed,
+      suppressionPermanent: suppressed && probeThresholds.length === 0,
       manualEffective: marks.effective,
       manualIneffective: marks.ineffective,
       bytesEmitted,
@@ -3709,12 +4002,12 @@ function buildGuidanceBody(fallbackToolClause, opts = {}) {
     '- searching for a *concept* rather than a literal string \u2192 `semantic "description"`',
     "- re-reading output you already captured \u2192 `bash-output`/`web-output`/`mcp-output` by ID",
     "- a directory listing or recursive wildcard walk to orient in an unfamiliar repo \u2192 `map --compact`",
-    "- pulling one value or subtree out of a JSON/YAML file (manifest, lockfile, spec, config) \u2192 `json-query file 'a.b.c'` / `yaml-query file 'a.b.c'`",
+    "- pulling one value or subtree out of a JSON/YAML/XML file (manifest, lockfile, spec, config) \u2192 `json-query file 'a.b.c'` / `yaml-query file 'a.b.c'` / `xml-query file 'a.b.c'`",
     "- opening an image to check its dimensions, format, or size \u2192 `image-meta file`",
     "- opening a screenshot, diagram, or scan to read the text in it \u2192 `image-text file`",
     "- opening a PDF or Office document \u2192 inspect its format first, then read a narrow slice: PDF `pdf-meta`/`pdf-outline` then `pdf-extract`; Word `docx-outline` then `docx-text`; PowerPoint `pptx-outline` then `pptx-slide`/`pptx-notes`; Excel `xlsx-sheets` then `xlsx-head`/`xlsx-range`/`xlsx-query`",
     "",
-    'Commands: `symbol NAME`, `read "file::symbol"`, `brief "file::symbol"`, `section "file::Heading"`, `semantic "description"`, `outline file`/`skeleton file`, `map --compact`, `refs file::symbol --callers`, `changed --symbol`, `config-get file KEY`, `json-query file \'a.b.c\'`/`yaml-query`, `json-outline file`/`yaml-outline`, `bash-output`/`web-output`/`mcp-output`, ' + (gdrive ? "`gdrive-sections <file-id>`, " : "") + "`image-meta file`/`image-text file`, `pdf-meta`/`pdf-outline`/`pdf-extract`, `docx-outline`/`docx-text`, `pptx-outline`/`pptx-slide`/`pptx-notes`/`pptx-text`, `xlsx-sheets`/`xlsx-head`/`xlsx-range`/`xlsx-query`.",
+    'Commands: `symbol NAME`, `read "file::symbol"`, `brief "file::symbol"`, `section "file::Heading"`, `semantic "description"`, `outline file`/`skeleton file`, `map --compact`, `refs file::symbol --callers`, `changed --symbol`, `config-get file KEY`, `json-query file \'a.b.c\'`/`yaml-query`/`xml-query`, `json-outline file`/`yaml-outline`/`xml-outline`, `bash-output`/`web-output`/`mcp-output`, ' + (gdrive ? "`gdrive-sections <file-id>`, " : "") + "`image-meta file`/`image-text file`, `pdf-meta`/`pdf-outline`/`pdf-extract`, `docx-outline`/`docx-text`, `pptx-outline`/`pptx-slide`/`pptx-notes`/`pptx-text`, `xlsx-sheets`/`xlsx-head`/`xlsx-range`/`xlsx-query`.",
     "",
     "Sub-agent briefs must carry this gate verbatim: a sub-agent inherits none of this context and its reads spend the same token budget.",
     "",
@@ -6666,7 +6959,7 @@ async function ocrImage(input) {
   const entryPath = resolveTesseractEntry();
   if (entryPath === null) return null;
   if (ocrBlockedOffline()) return null;
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let settled = false;
     let child;
     try {
@@ -6675,7 +6968,7 @@ async function ocrImage(input) {
       });
     } catch {
       _ocrUnavailableThisProcess = true;
-      resolve9(null);
+      resolve10(null);
       return;
     }
     const chunks = [];
@@ -6688,7 +6981,7 @@ async function ocrImage(input) {
         child.kill();
       } catch {
       }
-      resolve9(result);
+      resolve10(result);
     };
     const timer = setTimeout(() => finish(null, true), _ocrTimeoutMs);
     child.stdout?.on("data", (c) => chunks.push(c));
@@ -6813,11 +7106,11 @@ function statInfo(absPath) {
 function imageShrinkCacheDir() {
   return path12.join(tokenGoatHome(), "image_shrink_cache");
 }
-function shrinkCacheKey(originalPath, size, mtimeMs) {
-  return createHash2("sha256").update(`${originalPath}:${size}:${mtimeMs}`).digest("hex").slice(0, 16);
+function shrinkCacheKey(originalPath, size, mtimeMs, quality) {
+  return createHash2("sha256").update(`${originalPath}:${size}:${mtimeMs}:${quality}`).digest("hex").slice(0, 16);
 }
-function findCachedShrink(originalPath, size, mtimeMs) {
-  const key = shrinkCacheKey(originalPath, size, mtimeMs);
+function findCachedShrink(originalPath, size, mtimeMs, quality) {
+  const key = shrinkCacheKey(originalPath, size, mtimeMs, quality);
   const dir = imageShrinkCacheDir();
   const candidates = [
     { ext: ".webp", format: "webp" },
@@ -6829,11 +7122,11 @@ function findCachedShrink(originalPath, size, mtimeMs) {
   }
   return null;
 }
-function writeCachedShrink(originalPath, result, mtimeMs) {
+function writeCachedShrink(originalPath, result, mtimeMs, quality) {
   try {
     const dir = imageShrinkCacheDir();
     ensureDirSync(dir);
-    const key = shrinkCacheKey(originalPath, result.originalBytes, mtimeMs);
+    const key = shrinkCacheKey(originalPath, result.originalBytes, mtimeMs, quality);
     const ext = result.format === "jpeg" ? ".jpg" : ".webp";
     atomicWriteBytes(path12.join(dir, `token-goat-shrink-${key}${ext}`), result.data);
   } catch {
@@ -6887,7 +7180,8 @@ async function preReadImageHandler(event) {
   const stat2 = statInfo(filePath);
   if (stat2 === null) return passOutput();
   const size = stat2.size;
-  const cached = findCachedShrink(filePath, stat2.size, stat2.mtimeMs);
+  const quality = loadConfig().image_shrink.jpeg_quality;
+  const cached = findCachedShrink(filePath, stat2.size, stat2.mtimeMs, quality);
   if (cached !== null) {
     let cachedData;
     try {
@@ -6940,12 +7234,12 @@ async function preReadImageHandler(event) {
       return passOutput();
     }
   }
-  const result = await shrinkImage(input, { sizeThresholdBytes: 0 });
+  const result = await shrinkImage(input, { quality, sizeThresholdBytes: 0 });
   if (result === null) {
     recordStat("image_shrink_skipped");
     return passOutput();
   }
-  writeCachedShrink(filePath, result, stat2.mtimeMs);
+  writeCachedShrink(filePath, result, stat2.mtimeMs, quality);
   return finalizeShrinkResult(result, filePath);
 }
 registerHook("pre_tool_use", preReadImageHandler, { toolName: "Read" });
@@ -6986,7 +7280,7 @@ registerReset(() => {
   PIPELINE_RETRY_DELAY_MS = DEFAULT_PIPELINE_RETRY_DELAY_MS;
 });
 function sleep(ms) {
-  return new Promise((resolve9) => setTimeout(resolve9, ms));
+  return new Promise((resolve10) => setTimeout(resolve10, ms));
 }
 async function buildExtractorWithRetry(pipelineFn, modelName) {
   let lastError;
@@ -7096,6 +7390,12 @@ async function embedTexts(texts, modelName = DEFAULT_MODEL) {
           `Dimension mismatch: model returned ${vec.length}-dim vector, expected ${expectedDim}`
         );
       }
+      const badIndex = vec.findIndex((component) => !Number.isFinite(component));
+      if (badIndex !== -1) {
+        throw new Error(
+          `Non-finite embedding component at index ${badIndex}: model returned ${String(vec[badIndex])}`
+        );
+      }
       vecs.push(vec);
     }
   } finally {
@@ -7106,6 +7406,11 @@ function packVec(vec) {
   const view = new Float32Array(vec.length);
   for (const [i, val] of vec.entries()) {
     view[i] = val;
+    if (!Number.isFinite(view[i])) {
+      throw new Error(
+        `Non-finite embedding component at index ${i}: ${String(val)} is not representable as a 32-bit float`
+      );
+    }
   }
   return Buffer.from(view.buffer);
 }
@@ -7306,7 +7611,7 @@ function fetchScopedHits(db, queryVec, k, maxDistance, rootDir) {
     if (!row) {
       continue;
     }
-    if (row.distance <= maxDistance) {
+    if (typeof row.distance === "number" && Number.isFinite(row.distance) && row.distance <= maxDistance) {
       const chunk = scopeParams !== void 0 ? chunkStmt.get(row.rowid, ...scopeParams) : chunkStmt.get(row.rowid);
       if (chunk) {
         hits.push({
@@ -7536,6 +7841,7 @@ function trimToBudget(text, budgetTokens, command) {
     return text;
   }
   const lines2 = text.split("\n");
+  if (lines2.length > 1 && lines2[lines2.length - 1] === "") lines2.pop();
   const totalLines = lines2.length;
   const bodyBudget = Math.max(1, budgetTokens - markerMarginTokens);
   const charBudget = bodyBudget * 3;
@@ -8575,9 +8881,9 @@ var MONITORING_COMMAND_PATTERNS = [
     recallHint: "--tail 50"
   },
   // token-goat section/outline/symbol repeat calls — output is stable until the file changes
-  { pattern: /^token-goat\s+section\s+["'][^"']+["']/, recallHint: "" },
-  { pattern: /^token-goat\s+outline\s+\S+/, recallHint: "" },
-  { pattern: /^token-goat\s+symbol\s+\S+/, recallHint: "" }
+  { pattern: /^(?:token-goat|tg)\s+section\s+["'][^"']+["']/, recallHint: "" },
+  { pattern: /^(?:token-goat|tg)\s+outline\s+\S+/, recallHint: "" },
+  { pattern: /^(?:token-goat|tg)\s+symbol\s+\S+/, recallHint: "" }
 ];
 function isPsMultilineSystemQuery(cmd) {
   if (!/^(?:powershell(?:\.exe)?|pwsh(?:\.exe)?)\s+/i.test(cmd)) return false;
@@ -8806,6 +9112,7 @@ ${recall}`
     if (htmlResult.shouldBlock) return htmlResult;
   }
   const lines2 = content.split("\n");
+  if (lines2.length > 1 && lines2[lines2.length - 1] === "") lines2.pop();
   const preview = [
     "--- first 5 lines ---",
     ...lines2.slice(0, 5),
@@ -9421,7 +9728,8 @@ function isSessionArtifactFile(filePath) {
   if (/[/\\]tool-results[/\\][a-z0-9]+\.txt$/i.test(filePath)) return true;
   return false;
 }
-function sessionArtifactRecall(filePath) {
+function sessionArtifactRecall(rawPath) {
+  const filePath = displaySafePath(rawPath);
   return 'Use `token-goat bash-output --file "' + filePath + '" --tail 50` (or `--grep PATTERN`) to read a slice instead of the full file.';
 }
 function readIntToolInput(event, key) {
@@ -9488,7 +9796,8 @@ function estimateRequestedSlice(event, absPath) {
   if (scan.trustworthy) return { kind: "bytes", bytes: scan.bytes };
   return { kind: "unbounded" };
 }
-function describeSliceAdvice(slice, absPath) {
+function describeSliceAdvice(slice, rawAbsPath) {
+  const absPath = displaySafePath(rawAbsPath);
   if (slice.kind === "nearSingleLine") {
     return BYTE_RANGE_ADVICE(absPath);
   }
@@ -9647,6 +9956,7 @@ function preReadHandlerInner(event) {
   }
   if (filePath === void 0) return passOutput();
   const normalized = normalizePath(filePath);
+  const shown = displaySafePath(normalized);
   if (isNodeModulesPath(normalized)) {
     return denyOutput(
       "node_modules is typically noise; use npm ls, npm outdated, or npm audit instead for dependency info. To force access, use: token-goat read node_modules/package/file.js::symbol-name or token-goat section node_modules/package/file.js::heading"
@@ -9670,7 +9980,7 @@ function preReadHandlerInner(event) {
   const basename12 = path18.basename(normalized);
   if (isLockFile(basename12)) {
     return denyOutput(
-      'Lock files are rarely useful to read in full. Use `token-goat section "' + normalized + '::<section>"` to extract a specific dependency, or read the relevant manifest instead.'
+      'Lock files are rarely useful to read in full. Use `token-goat section "' + shown + '::<section>"` to extract a specific dependency, or read the relevant manifest instead.'
     );
   }
   if (normalized.toLowerCase().endsWith(".tsbuildinfo")) {
@@ -9694,13 +10004,13 @@ function preReadHandlerInner(event) {
   if (isTsConfigFile(basename12) && wasFileReadThisSession(normalized)) {
     recordActualRead(event, normalized);
     return quietContextOutput(
-      "Already read " + basename12 + '. Use `token-goat section "' + normalized + '::compilerOptions"` to extract compiler options, or `token-goat config-get ' + normalized + " compilerOptions.target` for a single value."
+      "Already read " + basename12 + '. Use `token-goat section "' + shown + '::compilerOptions"` to extract compiler options, or `token-goat config-get ' + shown + " compilerOptions.target` for a single value."
     );
   }
   if (isManifestFile(basename12) && wasFileReadThisSession(normalized)) {
     recordActualRead(event, normalized);
     return quietContextOutput(
-      "You've already read " + basename12 + '. Use `token-goat section "' + normalized + '::<field>"` or `token-goat config-get ' + normalized + " <key>` to extract just the value you need."
+      "You've already read " + basename12 + '. Use `token-goat section "' + shown + '::<field>"` or `token-goat config-get ' + shown + " <key>` to extract just the value you need."
     );
   }
   const skillName = detectSkillFile(normalized);
@@ -9729,7 +10039,7 @@ function preReadHandlerInner(event) {
         const savedBytes = Math.max(0, fullSize - compactBody.length);
         recordStat("session_hint", savedBytes, Math.round(savedBytes / 4));
         return denyOutput(
-          "Serving the extractive compact sidecar in place of the full file (source unchanged since the last `compact-doc` build):\n\n" + fenceUntrustedFileContent(compactBody) + '\n\nUse `token-goat compact-doc "' + normalized + '" --force` to rebuild it, or `token-goat compact-doc "' + normalized + '" --show` to view it directly. ' + editAnywayHint(normalized)
+          "Serving the extractive compact sidecar in place of the full file (source unchanged since the last `compact-doc` build):\n\n" + fenceUntrustedFileContent(compactBody) + '\n\nUse `token-goat compact-doc "' + shown + '" --force` to rebuild it, or `token-goat compact-doc "' + shown + '" --show` to view it directly. ' + editAnywayHint(normalized)
         );
       }
     }
@@ -9770,7 +10080,7 @@ function preReadHandlerInner(event) {
         const hintText = formatHeadingTree(headings, normalized);
         const headingTextsLower = new Set(headings.map((h) => h.text.trim().toLowerCase()));
         const wellKnown = getWellKnownSections(basename12).filter((s) => headingTextsLower.has(s.trim().toLowerCase()));
-        const wellKnownText = wellKnown.length > 0 ? "\nQuick access: " + wellKnown.map((s) => 'token-goat section "' + normalized + "::" + s + '"').join(" | ") : "";
+        const wellKnownText = wellKnown.length > 0 ? "\nQuick access: " + wellKnown.map((s) => 'token-goat section "' + shown + "::" + s + '"').join(" | ") : "";
         const changelogExtra = basename12.toLowerCase() === "changelog.md" ? extractChangelogVersionHint(fileContent, normalized) : "";
         let message = fenceUntrustedFileContent(hintText + changelogExtra) + wellKnownText;
         const slice = estimateRequestedSlice(event, normalized);
@@ -9794,7 +10104,7 @@ function preReadHandlerInner(event) {
     recordStat("session_hint", 0, 0);
     const isMainMemory = basename12.toLowerCase() === "memory.md";
     return denyOutput(
-      isMainMemory ? "MEMORY.md was read this session. Its content is in the compact manifest as 'session memory'." : normalized + ' was already read this session. Memory files rarely change mid-session. Use `token-goat section "' + normalized + '::SectionHeading"` to extract one section.'
+      isMainMemory ? "MEMORY.md was read this session. Its content is in the compact manifest as 'session memory'." : shown + ' was already read this session. Memory files rarely change mid-session. Use `token-goat section "' + shown + '::SectionHeading"` to extract one section.'
     );
   }
   if (/^\.improve-state-.*\.json$/.test(basename12) && wasFileReadThisSession(normalized)) {
@@ -9808,7 +10118,7 @@ function preReadHandlerInner(event) {
     recordActualRead(event, normalized);
     recordStat("session_hint", 0, 0);
     return denyOutput(
-      normalized + " was already read this session. Environment files rarely change mid-session. Use `token-goat config-get " + normalized + " KEY_NAME` to extract a specific variable."
+      shown + " was already read this session. Environment files rarely change mid-session. Use `token-goat config-get " + shown + " KEY_NAME` to extract a specific variable."
     );
   }
   if (isSessionArtifactFile(normalized)) {
@@ -9839,7 +10149,7 @@ function preReadHandlerInner(event) {
       recordActualRead(event, normalized);
       recordStat("session_hint", 0, 0);
       return denyOutput(
-        normalized + " was already read this session. " + sessionArtifactRecall(normalized)
+        shown + " was already read this session. " + sessionArtifactRecall(normalized)
       );
     }
     {
@@ -9898,7 +10208,7 @@ function preReadHandlerInner(event) {
         if (scanCrossSessionManifests(project.root, project.hash, normalized, ttlSecs)) {
           recordActualRead(event, normalized);
           return quietContextOutput(
-            "This file may have already been read by another agent/session working in this project recently. If you are a subagent continuing shared work, consider whether you already have this content from context, or use `token-goat read " + normalized + "::SymbolName` for a narrower slice instead of a full re-read."
+            "This file may have already been read by another agent/session working in this project recently. If you are a subagent continuing shared work, consider whether you already have this content from context, or use `token-goat read " + shown + "::SymbolName` for a narrower slice instead of a full re-read."
           );
         }
       }
@@ -9930,7 +10240,7 @@ function preReadHandlerInner(event) {
       if (/\.(md|mdx|markdown|rst)$/i.test(basename12)) {
         recordStat("session_hint", rereadCredit, Math.round(rereadCredit / 4));
         return denyOutput(
-          'Markdown file already read this session. Use `token-goat section "' + normalized + '::HeadingName"` to read one section. ' + editAnywayHint(normalized)
+          'Markdown file already read this session. Use `token-goat section "' + shown + '::HeadingName"` to read one section. ' + editAnywayHint(normalized)
         );
       }
       const isSourceExt = isSourceExtension(basename12);
@@ -9938,22 +10248,22 @@ function preReadHandlerInner(event) {
         recordStat("read_count_deny", rereadCredit, Math.round(rereadCredit / 4));
         recordStat("session_hint", rereadCredit, Math.round(rereadCredit / 4));
         return denyOutput(
-          "Read this file " + reads + ' times already \u2014 use `token-goat read "' + normalized + '::Symbol"`, `token-goat skeleton ' + normalized + "`, or `token-goat outline " + normalized + "` to pull just the part you need. " + editAnywayHint(normalized)
+          "Read this file " + reads + ' times already \u2014 use `token-goat read "' + shown + '::Symbol"`, `token-goat skeleton ' + shown + "`, or `token-goat outline " + shown + "` to pull just the part you need. " + editAnywayHint(normalized)
         );
       }
     }
-    const hint = _isDocFile(normalized) ? 'Use `token-goat section "' + normalized + '::SectionName"` to read one section.' : "Use token-goat read/section/symbol to re-read surgically.";
+    const hint = _isDocFile(normalized) ? 'Use `token-goat section "' + shown + '::SectionName"` to read one section.' : "Use token-goat read/section/symbol to re-read surgically.";
     if (config2.hints.reread_deny && !protectedRead && (rereadBytes >= config2.hints.reread_deny_min_bytes || reads >= 2)) {
       recordStat("session_hint", rereadCredit, Math.round(rereadCredit / 4));
       return denyOutput(
-        normalized + " was already read this session (" + reads + " " + plural + "). " + hint + " " + editAnywayHint(normalized)
+        shown + " was already read this session (" + reads + " " + plural + "). " + hint + " " + editAnywayHint(normalized)
       );
     }
     if (!isWithinQuietHours(config2.hints.quiet_hours)) {
       recordStat("session_hint", 0, 0);
     }
     return quietContextOutput(
-      "Note: " + normalized + " was already read this session (" + reads + " " + plural + "). " + hint
+      "Note: " + shown + " was already read this session (" + reads + " " + plural + "). " + hint
     );
   }
   const size = statSize(normalized);
@@ -9966,12 +10276,12 @@ function preReadHandlerInner(event) {
     }
     const kb = toKB(size);
     const config2 = loadConfig();
-    const hint = _isDocFile(normalized) ? 'Use `token-goat section "' + normalized + '::SectionName"` to read one section.' : "Consider token-goat skeleton or token-goat section.";
+    const hint = _isDocFile(normalized) ? 'Use `token-goat section "' + shown + '::SectionName"` to read one section.' : "Consider token-goat skeleton or token-goat section.";
     if (gateSize >= largeFileDenyBytes()) {
       const denyCredit = Math.min(size, PER_FILE_COUNTERFACTUAL_CEILING);
       recordStat("session_hint", denyCredit, Math.round(denyCredit / 4));
       return denyOutput(
-        normalized + " is very large (" + kb + "KB). " + hint + " " + describeSliceAdvice(slice, normalized) + " " + editAnywayHint(normalized)
+        shown + " is very large (" + kb + "KB). " + hint + " " + describeSliceAdvice(slice, normalized) + " " + editAnywayHint(normalized)
       );
     }
     recordActualRead(event, normalized);
@@ -9985,7 +10295,7 @@ function preReadHandlerInner(event) {
       recordStat("session_hint", 0, 0);
     }
     return quietContextOutput(
-      "Note: " + normalized + " is large (" + kb + "KB). " + hint + contextPressureAdvisorySuffix()
+      "Note: " + shown + " is large (" + kb + "KB). " + hint + contextPressureAdvisorySuffix()
     );
   }
   const fileTypeExt = path18.extname(normalized).slice(1).toLowerCase();
@@ -10033,16 +10343,19 @@ function estimateTruncatedLineCount(normalized) {
   }
   return Infinity;
 }
-function editAnywayHint(normalized) {
+function editAnywayHint(rawPath) {
+  const normalized = displaySafePath(rawPath);
   return 'To edit it anyway, use `token-goat replace "' + normalized + '" --old-b64 <base64> --new-b64 <base64>` (preferred \u2014 no temp files needed) or `--old-from <oldfile> --new-from <newfile>` for a snippet edit, or `token-goat write-file "' + normalized + "\" --b64 <base64>` (or `--from <newfile>`) to rewrite the whole file \u2014 Read/Edit's own precondition can't be satisfied after this deny.";
 }
-function truncatedReadDenyMessage(normalized) {
+function truncatedReadDenyMessage(rawPath) {
+  const normalized = displaySafePath(rawPath);
   return 'File was truncated on last read (>33K tokens). Use `token-goat skeleton "' + normalized + '"` for structure or `token-goat read "' + normalized + '::SymbolName"` for one function. ' + editAnywayHint(normalized);
 }
 function postReadHandlerInner(event) {
   const filePath = getFilePath(event);
   if (filePath === void 0) return passOutput();
   const normalized = normalizePath(filePath);
+  const shown = displaySafePath(normalized);
   const respText = extractReadOutput(event.raw);
   if (respText.includes("[Truncated:") || respText.includes("Truncated: PARTIAL view")) {
     markFileTruncated(normalized);
@@ -10063,7 +10376,7 @@ function postReadHandlerInner(event) {
     try {
       const cwd = getCwd(event) ?? process.cwd();
       const project = findProject(cwd) ?? makeProjectAt(cwd);
-      const source = fs22.readFileSync(normalized, "utf8");
+      const source = decodeSource(fs22.readFileSync(normalized));
       recordEvidence({ projectRoot: project.root, source: normalized, representation: "file", text: source });
     } catch {
     }
@@ -10099,7 +10412,7 @@ function postReadHandlerInner(event) {
         if (lineCount >= minLines && meetsSavingsFloor(sz)) {
           recordStat("session_hint", 0, 0);
           return quietContextOutput(
-            normalized + " is " + lineCount + ' lines. Use `token-goat skeleton "' + normalized + '"` or `token-goat outline "' + normalized + '"` for structural navigation instead of a future full re-read.'
+            shown + " is " + lineCount + ' lines. Use `token-goat skeleton "' + shown + '"` or `token-goat outline "' + shown + '"` for structural navigation instead of a future full re-read.'
           );
         }
       }
@@ -10123,7 +10436,7 @@ import * as readline from "node:readline";
 async function defaultConfirm(question) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   try {
-    const answer = await new Promise((resolve9) => rl.question(question, resolve9));
+    const answer = await new Promise((resolve10) => rl.question(question, resolve10));
     return /^y(es)?$/i.test(answer.trim());
   } finally {
     rl.close();
@@ -11412,7 +11725,7 @@ function extractHtml(content, filePath) {
     }
   }
   sections.sort((a, b) => a.line - b.line);
-  const totalLines = code.split("\n").length;
+  const totalLines = countContentLines(code);
   assignFlatEndLines(sections, totalLines);
   const seenId = /* @__PURE__ */ new Set();
   const seenClass = /* @__PURE__ */ new Set();
@@ -11515,7 +11828,7 @@ function extractLiquid(content, filePath, relPath) {
     const stem = path22.basename(resolvedRel, path22.extname(resolvedRel));
     symbols.push({ filePath, name: stem, kind: "liquid_section_file", lineStart: 1, lineEnd: 1, body: "", docstring: "", parent: "" });
   }
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   for (const hm of findHtmlHeadingMatches(content)) {
     if (hm.heading) {
       const line = offsetToLine(lineIndex, hm.offset);
@@ -12096,7 +12409,7 @@ function extractLua(content, filePath) {
         symbols.push(makeLineSymbol(filePath, baseName, "function", lineNum, stripped.slice(0, 200)));
       }
       if (!lineClosesItself(stripped)) {
-        funcStack.push({ name: baseName, endKeywordNeeded: true, isBlock: false });
+        funcStack.push({ name: baseName, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       }
       continue;
     }
@@ -12110,7 +12423,7 @@ function extractLua(content, filePath) {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200)));
       }
       if (!lineClosesItself(stripped)) {
-        funcStack.push({ name: fname, endKeywordNeeded: true, isBlock: false });
+        funcStack.push({ name: fname, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       }
       continue;
     }
@@ -12125,7 +12438,7 @@ function extractLua(content, filePath) {
         symbols.push(makeLineSymbol(filePath, baseName, "function", lineNum, stripped.slice(0, 200)));
       }
       if (!lineClosesItself(stripped)) {
-        funcStack.push({ name: baseName, endKeywordNeeded: true, isBlock: false });
+        funcStack.push({ name: baseName, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       }
       continue;
     }
@@ -12146,7 +12459,13 @@ function extractLua(content, filePath) {
     if (/^(?:\bend\b[\s),;}]*)+$/.test(stripped)) {
       const popCount = (stripped.match(/\bend\b/g) ?? []).length;
       for (let k = 0; k < popCount && funcStack.length > 0; k++) {
-        funcStack.pop();
+        const popped = funcStack.pop();
+        if (popped !== void 0 && popped.symbolIndex !== void 0) {
+          const open = symbols[popped.symbolIndex];
+          if (open !== void 0 && lineNum > open.lineStart) {
+            symbols[popped.symbolIndex] = { ...open, lineEnd: lineNum, body: lines2.slice(open.lineStart - 1, lineNum).join("\n") };
+          }
+        }
       }
     }
   }
@@ -12188,14 +12507,14 @@ function extractElixir(content, filePath) {
     if (modM) {
       const modName = modM[1] ?? "";
       symbols.push(makeLineSymbol(filePath, modName, "class", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
-      moduleStack.push({ name: modName, endKeywordNeeded: true, isBlock: false });
+      moduleStack.push({ name: modName, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       continue;
     }
     const protoM = PROTOCOL_RE.exec(stripped);
     if (protoM) {
       const protoName = protoM[1] ?? "";
       symbols.push(makeLineSymbol(filePath, protoName, "protocol", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
-      moduleStack.push({ name: protoName, endKeywordNeeded: true, isBlock: false });
+      moduleStack.push({ name: protoName, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       continue;
     }
     const fm = FUNC_RE4.exec(stripped);
@@ -12208,7 +12527,7 @@ function extractElixir(content, filePath) {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
       }
       if (opensDoBlock) {
-        moduleStack.push({ name: fname, endKeywordNeeded: true, isBlock: false });
+        moduleStack.push({ name: fname, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       }
       continue;
     }
@@ -12222,7 +12541,7 @@ function extractElixir(content, filePath) {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
       }
       if (opensDoBlock) {
-        moduleStack.push({ name: fname, endKeywordNeeded: true, isBlock: false });
+        moduleStack.push({ name: fname, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
       }
       continue;
     }
@@ -12239,7 +12558,13 @@ function extractElixir(content, filePath) {
     }
     if (stripped === "end" || /^end\s/.test(stripped) || /^end$/.test(stripped)) {
       if (moduleStack.length > 0) {
-        moduleStack.pop();
+        const popped = moduleStack.pop();
+        if (popped !== void 0 && popped.symbolIndex !== void 0) {
+          const open = symbols[popped.symbolIndex];
+          if (open !== void 0 && lineNum > open.lineStart) {
+            symbols[popped.symbolIndex] = { ...open, lineEnd: lineNum, body: lines2.slice(open.lineStart - 1, lineNum).join("\n") };
+          }
+        }
       }
     }
   }
@@ -12492,12 +12817,64 @@ function extractZig(content, filePath) {
 
 // src/languages/r.ts
 var FUNC_ASSIGN_RE = /^([A-Za-z_][A-Za-z0-9_.]*)\s*(?:<-|=)\s*(?:function|\\)\s*\(/;
-var SETCLASS_RE = /setClass\s*\(\s*["']([A-Za-z_][A-Za-z0-9_.]*)/;
-var SETMETHOD_RE = /setMethod\s*\(\s*["']([A-Za-z_][A-Za-z0-9_.]*)/;
+var SETCLASS_RE = /^(?:[A-Za-z_][A-Za-z0-9_.]*\s*(?:<-|=)\s*)?setClass\s*\(\s*["']([A-Za-z_][A-Za-z0-9_.]*)/;
+var SETMETHOD_RE = /^(?:[A-Za-z_][A-Za-z0-9_.]*\s*(?:<-|=)\s*)?setMethod\s*\(\s*["']([A-Za-z_][A-Za-z0-9_.]*)/;
+function matchingParenIndex(content, openIndex) {
+  let depth = 0;
+  let quote = null;
+  for (let i = openIndex; i < content.length; i++) {
+    const ch = content[i];
+    if (quote !== null) {
+      if (ch === "\\") {
+        i++;
+        continue;
+      }
+      if (ch === quote) quote = null;
+      continue;
+    }
+    if (ch === "#") {
+      while (i < content.length && content[i] !== "\n") i++;
+      continue;
+    }
+    if (ch === '"' || ch === "'" || ch === "`") {
+      quote = ch;
+      continue;
+    }
+    if (ch === "(") depth++;
+    else if (ch === ")") {
+      depth--;
+      if (depth === 0) return i;
+    }
+  }
+  return null;
+}
+function bracedBodyEndLine(content, lineIndex, parenIndex, totalLines, fallback) {
+  const close = matchingParenIndex(content, parenIndex);
+  if (close === null) return fallback;
+  let j = close + 1;
+  while (j < content.length) {
+    const ch = content[j];
+    if (ch === "#") {
+      while (j < content.length && content[j] !== "\n") j++;
+      continue;
+    }
+    if (ch !== " " && ch !== "	" && ch !== "\r" && ch !== "\n") break;
+    j++;
+  }
+  if (content[j] !== "{") return fallback;
+  return findMatchingBraceEndLine(content, j, totalLines, lineIndex, "#");
+}
+function callEndLine(content, lineIndex, parenIndex, fallback) {
+  const close = matchingParenIndex(content, parenIndex);
+  return close === null ? fallback : offsetToLine(lineIndex, close);
+}
 function extractR(content, filePath) {
   const symbols = [];
   const imports = [];
   const lines2 = content.split(/\r?\n/);
+  const lineIndex = buildLineIndex(content);
+  const totalLines = countContentLines(content);
+  const spanBody = (startLine, endLine) => lines2.slice(startLine - 1, endLine).join("\n");
   for (let i = 0; i < lines2.length; i++) {
     const rawLine = lines2[i] ?? "";
     const lineNum = i + 1;
@@ -12510,17 +12887,21 @@ function extractR(content, filePath) {
     if (!isIndented) {
       const fm = FUNC_ASSIGN_RE.exec(stripped);
       if (fm) {
-        symbols.push(makeLineSymbol(filePath, fm[1] ?? "", "function", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
+        const parenIndex = (lineIndex[i] ?? 0) + fm[0].length - 1;
+        const endLine = bracedBodyEndLine(content, lineIndex, parenIndex, totalLines, lineNum);
+        symbols.push(makeSpanSymbol(filePath, fm[1] ?? "", "function", { startLine: lineNum, endLine, body: spanBody(lineNum, endLine) }, void 0, lines2, "hash"));
         continue;
       }
       const cm = SETCLASS_RE.exec(stripped);
       if (cm) {
-        symbols.push(makeLineSymbol(filePath, cm[1] ?? "", "class", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
+        const endLine = callEndLine(content, lineIndex, (lineIndex[i] ?? 0) + (cm.index + cm[0].indexOf("(")), lineNum);
+        symbols.push(makeSpanSymbol(filePath, cm[1] ?? "", "class", { startLine: lineNum, endLine, body: spanBody(lineNum, endLine) }, void 0, lines2, "hash"));
         continue;
       }
       const mm = SETMETHOD_RE.exec(stripped);
       if (mm) {
-        symbols.push(makeLineSymbol(filePath, mm[1] ?? "", "function", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
+        const endLine = callEndLine(content, lineIndex, (lineIndex[i] ?? 0) + (mm.index + mm[0].indexOf("(")), lineNum);
+        symbols.push(makeSpanSymbol(filePath, mm[1] ?? "", "function", { startLine: lineNum, endLine, body: spanBody(lineNum, endLine) }, void 0, lines2, "hash"));
       }
     }
   }
@@ -12587,7 +12968,7 @@ function extractGraphql(content, filePath) {
     }
   }
   const stripped = stripHashComments(descriptionsStripped);
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(stripped);
   for (const m of stripped.matchAll(TYPE_RE)) {
     const keyword = m.groups?.["keyword"] ?? "";
@@ -12863,7 +13244,7 @@ function extractSql(content, filePath) {
   const sections = [];
   const seen = /* @__PURE__ */ new Set();
   const emit2 = makeSymbolEmitter(symbols, sections, seen, filePath, MAX_SYMBOLS3, MAX_HEADING_LEN2);
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(content);
   const noStrings = stripSqlStringLiterals(content);
   const singleLineEndLines = /* @__PURE__ */ new Map();
@@ -12910,25 +13291,53 @@ function stripBashComment(line) {
   }
   return line;
 }
-function findHeredocOpeners(line) {
+function maskArithmeticSpans(line, carryDepth) {
+  const chars = line.split("");
+  let depth = carryDepth;
+  for (let i = 0; i < chars.length; i++) {
+    if (depth > 0) {
+      if (chars[i] === "(") depth++;
+      else if (chars[i] === ")") depth--;
+      chars[i] = " ";
+      continue;
+    }
+    const isDollar = chars[i] === "$" && chars[i + 1] === "(" && chars[i + 2] === "(";
+    const isBare = chars[i] === "(" && chars[i + 1] === "(";
+    if (!isDollar && !isBare) continue;
+    if (isInsideStringLiteral(line, i)) continue;
+    const open = isDollar ? i + 1 : i;
+    for (let j = open; j < chars.length; j++) {
+      if (chars[j] === "(") depth++;
+      else if (chars[j] === ")") depth--;
+      chars[j] = " ";
+      i = j;
+      if (depth === 0) break;
+    }
+  }
+  return { masked: chars.join(""), depth };
+}
+function findHeredocOpeners(line, carryDepth) {
   const terminators = [];
+  const { masked, depth } = maskArithmeticSpans(line, carryDepth);
   HEREDOC_RE.lastIndex = 0;
   let m;
-  while ((m = HEREDOC_RE.exec(line)) !== null) {
+  while ((m = HEREDOC_RE.exec(masked)) !== null) {
     if (isInsideStringLiteral(line, m.index)) continue;
     const terminator = m[2] ?? "";
     if (terminator) terminators.push(terminator);
   }
-  return terminators;
+  return { terminators, depth };
 }
 function extractBash(content, filePath) {
   const symbols = [];
   const lines2 = content.split(/\r?\n/);
   const heredocs = [];
+  let arithmeticDepth = 0;
   let braceDepth = 0;
   let inFunction = false;
   let functionBraceDepth = 0;
   let awaitingFunctionBrace = false;
+  let openFunctionIndex = null;
   for (let i = 0; i < lines2.length; i++) {
     const rawLine = lines2[i] ?? "";
     const lineNum = i + 1;
@@ -12938,7 +13347,9 @@ function extractBash(content, filePath) {
     }
     const noComment = stripBashComment(rawLine);
     const stripped = noComment.trim();
-    heredocs.push(...findHeredocOpeners(noComment));
+    const opened = findHeredocOpeners(noComment, arithmeticDepth);
+    arithmeticDepth = opened.depth;
+    heredocs.push(...opened.terminators);
     if (!stripped) continue;
     if (!inFunction && !awaitingFunctionBrace && braceDepth === 0) {
       const kwMatch = FUNC_KEYWORD_RE.exec(stripped);
@@ -12946,7 +13357,9 @@ function extractBash(content, filePath) {
       const funcMatch = kwMatch ?? posixMatch;
       if (funcMatch) {
         const fname = funcMatch[1] ?? "";
+        let pushedIndex = null;
         if (fname && symbols.length < MAX_SYMBOLS4) {
+          pushedIndex = symbols.length;
           symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines2, "hash"));
         }
         if (fname) {
@@ -12958,9 +13371,11 @@ function extractBash(content, filePath) {
             } else if (openCount > closeCount) {
               inFunction = true;
               functionBraceDepth = braceDepth;
+              openFunctionIndex = pushedIndex;
             }
           } else {
             awaitingFunctionBrace = true;
+            openFunctionIndex = pushedIndex;
           }
         }
       } else {
@@ -12981,6 +13396,13 @@ function extractBash(content, filePath) {
     braceDepth += (braceLine.match(/\{/g) ?? []).length - (braceLine.match(/\}/g) ?? []).length;
     if (inFunction && braceDepth <= functionBraceDepth) {
       inFunction = false;
+      if (openFunctionIndex !== null) {
+        const open = symbols[openFunctionIndex];
+        if (open !== void 0 && lineNum > open.lineStart) {
+          symbols[openFunctionIndex] = { ...open, lineEnd: lineNum, body: lines2.slice(open.lineStart - 1, lineNum).join("\n") };
+        }
+        openFunctionIndex = null;
+      }
     }
   }
   return symbols;
@@ -13065,7 +13487,7 @@ function extractMakefile(content, filePath) {
   const seen = /* @__PURE__ */ new Set();
   const emit2 = makeSymbolEmitter(symbols, sections, seen, filePath, MAX_SYMBOLS5, MAX_HEADING_LEN3);
   const stripped = stripComments(content);
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(stripped);
   const { noContinuation: strippedNoContinuation, forTargets: strippedForTargets } = maskContinuationAndDefines(stripped);
   for (const m of strippedForTargets.matchAll(TARGET_RE)) {
@@ -13145,7 +13567,7 @@ function extractProto(content, filePath) {
   const imports = [];
   const emit2 = makeSymbolEmitter(symbols, sections, seen, filePath, MAX_SYMBOLS6, MAX_HEADING_LEN4);
   const stripped = stripComments2(content);
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(stripped);
   const blockEndLines = /* @__PURE__ */ new Map();
   for (const m of stripped.matchAll(IMPORT_RE4)) {
@@ -13278,7 +13700,7 @@ function extractTerraform(content, filePath) {
   const seen = /* @__PURE__ */ new Set();
   const emit2 = makeSymbolEmitter(symbols, sections, seen, filePath, MAX_SYMBOLS7, MAX_HEADING_LEN5);
   const stripped = stripComments3(maskHeredocs(content));
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(stripped);
   const blockEndLines = /* @__PURE__ */ new Map();
   const matches = [
@@ -13565,7 +13987,7 @@ var TRIGGER_RE2 = new RegExp(
 var RETURN_TYPE = "(?:[A-Za-z_][A-Za-z0-9_.<>?,\\[\\] ]*[ \\t]+)";
 var STATEMENT_KEYWORD_GUARD = "(?!(?:return|throw|new|yield|else|do|try|finally|break|continue)\\b)";
 var METHOD_RE3 = new RegExp(
-  `^[ \\t]*(?:@${IDENT3}(?:\\([^\\n)]*\\))?[ \\t]+)*(?:(?:${MODIFIER}[ \\t]+)+(${RETURN_TYPE})?|(?:${MODIFIER}[ \\t]+)*${STATEMENT_KEYWORD_GUARD}(${RETURN_TYPE}))(${IDENT3})[ \\t]*\\([^;{}]*\\)[ \\t\\r\\n]*(?:\\{|;)`,
+  `^[ \\t]*(?:@${IDENT3}(?:\\([^\\n)]*\\))?[ \\t]+)*(?=[^\\n]*\\()(?:(?:${MODIFIER}[ \\t]+)+(${RETURN_TYPE})?|(?:${MODIFIER}[ \\t]+)*${STATEMENT_KEYWORD_GUARD}(${RETURN_TYPE}))(${IDENT3})[ \\t]*\\([^;{}]*\\)[ \\t\\r\\n]*(?:\\{|;)`,
   "gm"
 );
 var CONTROL_NAMES = /* @__PURE__ */ new Set([
@@ -14076,8 +14498,8 @@ function extractLwcJavaScript(content, filePath) {
   const sourceLines = lines(content);
   const bundle = bundleName(filePath);
   const symbols = [
-    symbol(filePath, bundle, "lwc_bundle", 1, sourceLines.length),
-    symbol(filePath, lwcTagAlias(bundle), "lwc_component_alias", 1, sourceLines.length)
+    symbol(filePath, bundle, "lwc_bundle", 1, countContentLines(content)),
+    symbol(filePath, lwcTagAlias(bundle), "lwc_component_alias", 1, countContentLines(content))
   ];
   const refs = [];
   const commentFree = stripJsComments(content);
@@ -14175,10 +14597,9 @@ function attributeRefs(refs, content, filePath, attribute, split = false) {
 function extractSalesforceMarkup(content, filePath) {
   const normalized = filePath.replaceAll("\\", "/");
   const extension = path24.posix.extname(normalized).toLowerCase();
-  const sourceLines = lines(content);
   const kind = MARKUP_KIND[extension] ?? "salesforce_markup";
   const symbols = [
-    symbol(filePath, markupArtifactName(normalized, extension), kind, 1, sourceLines.length)
+    symbol(filePath, markupArtifactName(normalized, extension), kind, 1, countContentLines(content))
   ];
   const refs = [];
   const isAura = [".cmp", ".app", ".evt", ".intf", ".design", ".auradoc", ".tokens"].includes(extension);
@@ -14330,7 +14751,7 @@ function componentSymbol(filePath, name, kind, totalLines) {
   return { filePath, name, kind, lineStart: 1, lineEnd: totalLines, body: "", docstring: "", parent: "" };
 }
 function extractVue(content, filePath) {
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(content);
   const name = componentName(filePath);
   const symbols = [componentSymbol(filePath, name, "vue_component", totalLines)];
@@ -14345,7 +14766,7 @@ function extractVue(content, filePath) {
   return finalize(symbols, refs);
 }
 function extractSvelte(content, filePath) {
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(content);
   const name = componentName(filePath);
   const symbols = [componentSymbol(filePath, name, "svelte_component", totalLines)];
@@ -14378,7 +14799,7 @@ function detectAstroFrontmatter(content) {
   return null;
 }
 function extractAstro(content, filePath) {
-  const totalLines = content.split("\n").length;
+  const totalLines = countContentLines(content);
   const lineIndex = buildLineIndex(content);
   const name = componentName(filePath);
   const symbols = [componentSymbol(filePath, name, "astro_component", totalLines)];
@@ -14593,6 +15014,12 @@ var TSJS_KIND_BY_TYPE = /* @__PURE__ */ new Map([
   ["method_signature", "method"],
   ["property_signature", "var"],
   ["abstract_method_signature", "method"],
+  // `declare function f(): void` parses as a `function_signature` inside an
+  // ambient_declaration -- a distinct node type from `function_declaration`, which always
+  // carries a body. Without an entry here every ambient function in a .d.ts file was
+  // missing from the index entirely, the same container-drop shape as the module entries
+  // below rather than a wrong span.
+  ["function_signature", "function"],
   // `namespace Foo { ... }` (and the legacy `module Foo { ... }` synonym) parses as
   // `internal_module`; `declare module "some-string" { ... }` (an ambient module declaration,
   // common in .d.ts files) parses as `module` -- a distinct node type from either. Neither had a
@@ -14641,15 +15068,41 @@ function nodeName(node) {
   if (named !== null) return named.text;
   return null;
 }
+var SPEC_DECLARATION_OWNER = /* @__PURE__ */ new Map([
+  ["variable_declarator", /* @__PURE__ */ new Set(["lexical_declaration", "variable_declaration"])],
+  ["var_spec", /* @__PURE__ */ new Set(["var_declaration"])],
+  ["const_spec", /* @__PURE__ */ new Set(["const_declaration"])],
+  ["type_spec", /* @__PURE__ */ new Set(["type_declaration"])]
+]);
+var PREFIX_WRAPPER_TYPES = /* @__PURE__ */ new Set(["export_statement", "ambient_declaration"]);
+function widenToDeclaration(node) {
+  let widened = node;
+  const owner = SPEC_DECLARATION_OWNER.get(widened.type);
+  if (owner !== void 0) {
+    const decl = widened.parent;
+    if (decl === null || !owner.has(decl.type)) return widened;
+    let specs = 0;
+    for (const c of decl.namedChildren) if (c.type === widened.type) specs++;
+    if (specs !== 1) return widened;
+    if (decl.startPosition.row !== widened.startPosition.row) return widened;
+    widened = decl;
+  }
+  for (; ; ) {
+    const parent = widened.parent;
+    if (parent === null || !PREFIX_WRAPPER_TYPES.has(parent.type)) return widened;
+    widened = parent;
+  }
+}
 function makeSymbol(filePath, name, kind, node, lines2, style) {
-  const lineStart = node.startPosition.row + 1;
+  const ranged = widenToDeclaration(node);
+  const lineStart = ranged.startPosition.row + 1;
   return {
     filePath,
     name,
     kind,
     lineStart,
-    lineEnd: node.endPosition.row + 1,
-    body: node.text,
+    lineEnd: ranged.endPosition.row + 1,
+    body: ranged.text,
     docstring: lines2 !== void 0 && style !== void 0 ? precedingDocComment(lines2, lineStart, style) : "",
     parent: ""
   };
@@ -14688,13 +15141,23 @@ function extractTsJsSymbols(root, filePath, lines2) {
           out.push(makeSymbol(filePath, name, kind, node, lines2, "c"));
         } else {
           const lineStart = decorators[0].startPosition.row + 1;
+          const decoratedEnd = widenToDeclaration(node).endPosition.row + 1;
           out.push({
             filePath,
             name,
             kind,
             lineStart,
-            lineEnd: node.endPosition.row + 1,
-            body: [...decorators, node].map((n) => n.text).join("\n"),
+            lineEnd: decoratedEnd,
+            // Read the body off the file rather than gluing the decorator and the node
+            // together with a newline: `@dec export class X {}` has no newline between
+            // them, and the glued form both invents one and drops the `export` that sits
+            // between the two nodes. A decorated declaration yields one symbol, so taking
+            // its whole span cannot fan out.
+            // The trailing replace keeps a convention the rest of the index follows: a
+            // tree-sitter node never carries the indentation of its own first line,
+            // because it starts at the first real character. Reading the span off the
+            // file would otherwise make decorated symbols the one shape that does.
+            body: lines2.slice(lineStart - 1, decoratedEnd).join("\n").replace(/^[ \t]+/, ""),
             docstring: precedingDocComment(lines2, lineStart, "c"),
             parent: ""
           });
@@ -14711,8 +15174,11 @@ function extractTsJsSymbols(root, filePath, lines2) {
           const isFn = value !== null && (value.type === "arrow_function" || value.type === "function_expression" || value.type === "function");
           out.push(makeSymbol(filePath, name.text, isFn ? "function" : "variable", child, lines2, "c"));
         } else {
-          for (const bound of collectPatternBindings(name)) {
-            out.push(makeSymbol(filePath, bound, "variable", child, lines2, "c"));
+          const bindings = collectPatternBindings(name);
+          const elideBodies = bindings.length > 1 && bindings.length * child.text.length > MAX_SYMBOL_BODY_CHARS;
+          for (const bound of bindings) {
+            const sym = makeSymbol(filePath, bound, "variable", child, lines2, "c");
+            out.push(elideBodies ? { ...sym, body: "" } : sym);
           }
         }
       }
@@ -16097,8 +16563,8 @@ var NO_TREE_SITTER_EXTRACTORS = {
   toml: extractTomlSymbols,
   css: extractCssSymbols,
   dockerfile: extractDockerfileSymbols,
-  csharp: (content, filePath) => extractCsharp(content, filePath).symbols,
-  php: (content, filePath) => extractPhp(content, filePath).symbols,
+  csharp: (content, filePath) => assignBraceBlockSpans(extractCsharp(content, filePath).symbols, content, "//"),
+  php: (content, filePath) => assignBraceBlockSpans(extractPhp(content, filePath).symbols, content, "//"),
   html: (content, filePath) => {
     const r = extractHtml(content, filePath);
     return [...r.symbols, ...sectionsToHeadingSymbols(r.sections, filePath)];
@@ -16107,13 +16573,13 @@ var NO_TREE_SITTER_EXTRACTORS = {
     const r = extractLiquid(content, filePath);
     return [...r.symbols, ...sectionsToHeadingSymbols(r.sections, filePath)];
   },
-  kotlin: (content, filePath) => extractKotlin(content, filePath).symbols,
-  swift: (content, filePath) => extractSwift(content, filePath).symbols,
-  scala: (content, filePath) => extractScala(content, filePath).symbols,
+  kotlin: (content, filePath) => assignBraceBlockSpans(extractKotlin(content, filePath).symbols, content, "//"),
+  swift: (content, filePath) => assignBraceBlockSpans(extractSwift(content, filePath).symbols, content, "//"),
+  scala: (content, filePath) => assignBraceBlockSpans(extractScala(content, filePath).symbols, content, "//"),
   lua: (content, filePath) => extractLua(content, filePath).symbols,
   elixir: (content, filePath) => extractElixir(content, filePath).symbols,
-  dart: (content, filePath) => extractDart(content, filePath).symbols,
-  zig: (content, filePath) => extractZig(content, filePath).symbols,
+  dart: (content, filePath) => assignBraceBlockSpans(extractDart(content, filePath).symbols, content, "//"),
+  zig: (content, filePath) => assignBraceBlockSpans(extractZig(content, filePath).symbols, content, "//"),
   r: (content, filePath) => extractR(content, filePath).symbols,
   graphql: (content, filePath) => extractGraphql(content, filePath).symbols,
   sql: extractSql,
@@ -16121,7 +16587,7 @@ var NO_TREE_SITTER_EXTRACTORS = {
   makefile: extractMakefile,
   proto: (content, filePath) => extractProto(content, filePath).symbols,
   terraform: extractTerraform,
-  powershell: (content, filePath) => extractPowershell(content, filePath).symbols,
+  powershell: (content, filePath) => assignBraceBlockSpans(extractPowershell(content, filePath).symbols, content, "#"),
   apex: (content, filePath) => extractApex(content, filePath).symbols,
   salesforce_metadata: (content, filePath) => extractSalesforceMetadata(content, filePath).symbols,
   env_file: extractEnv,
@@ -16224,7 +16690,7 @@ function indexFileSync(filePath, dbPath = globalDbPath(), preReadBytes) {
       throw err;
     }
   }
-  const content = raw.toString("utf8");
+  const content = decodeSource(raw);
   const { symbols, refs } = parseContent(content, filePath, language);
   writeParseResult(filePath, raw, { symbols, refs, language, duration: 0 }, dbPath);
 }
@@ -16249,6 +16715,35 @@ var UNAVAILABLE_EMBED_SHA_PREFIX = "unavailable:";
 function unavailableEmbedSha(sha) {
   return UNAVAILABLE_EMBED_SHA_PREFIX + sha;
 }
+function indexedPathSpellingIsStale(storedPath, absPath) {
+  if (!isCaseInsensitiveFs()) return false;
+  const stored = normalizePath(storedPath);
+  const candidate = normalizePath(path26.resolve(absPath));
+  if (foldPath(stored) !== foldPath(candidate)) return false;
+  let real;
+  try {
+    real = normalizePath(fs26.realpathSync.native(absPath));
+  } catch {
+    return false;
+  }
+  if (real === stored) return false;
+  if (foldPath(real) !== foldPath(stored)) return false;
+  const storedSegments = stored.split("/");
+  const realSegments = real.split("/");
+  if (storedSegments.length !== realSegments.length) return real !== stored;
+  const storedBase = storedSegments[storedSegments.length - 1];
+  const realBase = realSegments[realSegments.length - 1];
+  if (storedBase !== realBase) return true;
+  for (let i = storedSegments.length - 2; i >= 0; i--) {
+    if (storedSegments[i] !== realSegments[i]) {
+      if (storedSegments.slice(0, i + 1).join("/") === candidate.split("/").slice(0, i + 1).join("/")) {
+        continue;
+      }
+      return true;
+    }
+  }
+  return false;
+}
 function isEmbedFresh(storedEmbedSha, sha, embeddingsEnabled, depsAvailable) {
   if (storedEmbedSha === void 0) return false;
   if (!embeddingsEnabled) return storedEmbedSha === disabledEmbedSha(sha);
@@ -16293,7 +16788,7 @@ async function indexFileEmbeddings(filePath, dbPath = globalDbPath(), sha, onErr
   }
   let content;
   try {
-    content = await fs26.promises.readFile(filePath, "utf8");
+    content = decodeSource(await fs26.promises.readFile(filePath));
   } catch {
     return;
   }
@@ -16431,6 +16926,41 @@ function pruneSystemTempFiles(dbPath = globalDbPath()) {
   const db = getDb(dbPath);
   return removeFilesBestEffort(db, findSystemTempFiles(dbPath));
 }
+function findOrphanedChunkPaths(dbPath = globalDbPath()) {
+  return orphanedChunkGroups(getDb(dbPath)).map((g) => g.representative);
+}
+function orphanedChunkGroups(db) {
+  const known = new Set(
+    db.prepare("SELECT DISTINCT path FROM files").all().map(
+      (r) => foldPath(normalizePath(r.path))
+    )
+  );
+  const rows = db.prepare("SELECT DISTINCT file_path FROM chunks").all();
+  const byFolded = /* @__PURE__ */ new Map();
+  for (const { file_path: raw } of rows) {
+    const folded = foldPath(normalizePath(raw));
+    if (known.has(folded)) continue;
+    const group = byFolded.get(folded);
+    if (group === void 0) byFolded.set(folded, { representative: raw, spellings: [raw] });
+    else group.spellings.push(raw);
+  }
+  return [...byFolded.values()];
+}
+function pruneOrphanedChunks(dbPath = globalDbPath()) {
+  const db = getDb(dbPath);
+  const removed = [];
+  const run = db.transaction(() => {
+    for (const group of orphanedChunkGroups(db)) {
+      try {
+        for (const spelling of group.spellings) deleteFileEmbeddings(db, spelling);
+        removed.push(group.representative);
+      } catch {
+      }
+    }
+  });
+  run.immediate();
+  return removed;
+}
 function recordKnownRoot(filePath, dbPath = globalDbPath()) {
   const project = findProject(path27.dirname(filePath));
   if (project === null || isTooShallowToPrune(project.root)) return;
@@ -16485,7 +17015,8 @@ function sweepKnownRoots(dbPath = globalDbPath(), opts) {
     prunedRows += removeDeletedFilesBestEffort(db, deletable).length;
     prunedRoots.push(root);
   }
-  return { prunedRows, prunedRoots, flaggedRoots };
+  const prunedOrphanChunkPaths = pruneOrphanedChunks(dbPath);
+  return { prunedRows, prunedRoots, flaggedRoots, prunedOrphanChunkPaths };
 }
 var KNOWN_ROOT_RECORD_MIN_INTERVAL_MS = 60 * 60 * 1e3;
 function knownRootRecordMarkerPath(dir, filePath) {
@@ -16626,11 +17157,25 @@ function pidFileIsWithinStartupGrace(dir) {
     return false;
   }
 }
+var ENCODED_LINE_MARKER = "!";
+function encodeDirtyQueueLine(absPath) {
+  const needsEncoding = /[\r\n]/.test(absPath) || absPath !== absPath.trim();
+  return needsEncoding ? ENCODED_LINE_MARKER + JSON.stringify(absPath) : absPath;
+}
+function decodeDirtyQueueLine(line) {
+  if (!line.startsWith(ENCODED_LINE_MARKER)) return line;
+  try {
+    const decoded = JSON.parse(line.slice(ENCODED_LINE_MARKER.length));
+    return typeof decoded === "string" ? decoded : line;
+  } catch {
+    return line;
+  }
+}
 function parseDirtyQueueLines(raw) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
   for (const line of raw.split("\n")) {
-    const trimmed = line.trim();
+    const trimmed = decodeDirtyQueueLine(line.trim());
     if (trimmed === "") continue;
     const normalized = normalizePath(trimmed);
     const dedupeKey = foldPath(normalized);
@@ -16689,14 +17234,21 @@ var INDEX_FAILED = /* @__PURE__ */ Symbol("indexFailed");
 var inFlightEmbeddings = /* @__PURE__ */ new Map();
 var activeEmbedSlots = 0;
 var embedSlotWaiters = [];
-function releaseEmbedSlot() {
-  activeEmbedSlots -= 1;
-  const next = embedSlotWaiters.shift();
-  if (next) next();
+var embedSlotEpoch = 0;
+function makeReleaseEmbedSlot() {
+  const epoch = embedSlotEpoch;
+  return () => {
+    if (epoch !== embedSlotEpoch) return;
+    activeEmbedSlots -= 1;
+    const next = embedSlotWaiters.shift();
+    if (next) next();
+  };
 }
 registerReset(() => {
+  embedSlotEpoch += 1;
   activeEmbedSlots = 0;
   embedSlotWaiters.length = 0;
+  inFlightEmbeddings.clear();
 });
 function embedFileSerialized(absPath, dbPath, sha) {
   const key = foldPath(absPath);
@@ -16710,7 +17262,8 @@ function embedFileSerialized(absPath, dbPath, sha) {
   const limit = loadConfig().worker.max_pool_workers ?? 4;
   const dispatchEmbed = () => {
     const result = indexFileEmbeddings(absPath, dbPath, sha, onEmbedError);
-    result.then(releaseEmbedSlot, releaseEmbedSlot);
+    const release = makeReleaseEmbedSlot();
+    result.then(release, release);
     return result;
   };
   const runEmbed = () => {
@@ -16718,10 +17271,10 @@ function embedFileSerialized(absPath, dbPath, sha) {
       activeEmbedSlots += 1;
       return dispatchEmbed();
     }
-    return new Promise((resolve9) => {
+    return new Promise((resolve10) => {
       embedSlotWaiters.push(() => {
         activeEmbedSlots += 1;
-        resolve9(dispatchEmbed());
+        resolve10(dispatchEmbed());
       });
     });
   };
@@ -16775,7 +17328,7 @@ function appendToDirtyQueue(dir, absPath) {
       if (existing.length > 0 && !existing.endsWith("\n")) leadingNewline = "\n";
     } catch {
     }
-    fs28.appendFileSync(queuePath, `${leadingNewline}${absPath}
+    fs28.appendFileSync(queuePath, `${leadingNewline}${encodeDirtyQueueLine(absPath)}
 `);
   } catch {
   }
@@ -16793,7 +17346,7 @@ function makeIndexer(dbPath) {
         return true;
       }
       const entry = getFileEntry(absPath, dbPath);
-      const parseUnchanged = entry?.sha === sha;
+      const parseUnchanged = entry?.sha === sha && !(entry !== null && indexedPathSpellingIsStale(entry.filePath, absPath));
       if (!parseUnchanged) {
         indexFileSync(absPath, dbPath);
       }
@@ -16826,7 +17379,7 @@ function processDirtyBatch(paths, index = makeIndexer(globalDbPath()), remove =
     if (!p) continue;
     writeDrainHeartbeat(dir);
     if (isUnderBlockedRoot(p, blockedRoots)) continue;
-    if (!fs28.existsSync(p)) {
+    if (fileIsAbsent(p)) {
       remove(p);
       continue;
     }
@@ -17058,6 +17611,12 @@ function claimWorkerPidFile(dir, pid) {
   if (existingPid !== null && pidAlive(existingPid) && (hasFreshWorkerHeartbeat(dir, existingPid) || pidFileIsWithinStartupGrace(dir))) {
     return false;
   }
+  if (existingPid !== null && pidAlive(existingPid) && existingPid !== pid && existingPid !== process.pid) {
+    try {
+      process.kill(existingPid, "SIGTERM");
+    } catch {
+    }
+  }
   try {
     fs28.rmSync(pidPath, { force: true });
   } catch {
@@ -17121,8 +17680,12 @@ var KNOWN_ROOTS_SWEEP_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 async function runWorkerLoop(dir, pollIntervalMs, shouldStop = () => false) {
   let lastSnapshotCleanupMs = 0;
   let lastKnownRootsSweepMs = 0;
+  let ownedPidFile = false;
   while (!shouldStop()) {
     if (!fs28.existsSync(dir)) break;
+    const pidOwner = readPidFile(dir);
+    if (pidOwner === process.pid) ownedPidFile = true;
+    else if (ownedPidFile && pidOwner !== null) break;
     try {
       drainOnce(dir);
     } catch {
@@ -17157,7 +17720,7 @@ async function runWorkerLoop(dir, pollIntervalMs, shouldStop = () => false) {
       lastKnownRootsSweepMs = Date.now();
     }
     if (shouldStop()) break;
-    await new Promise((resolve9) => setTimeout(resolve9, pollIntervalMs));
+    await new Promise((resolve10) => setTimeout(resolve10, pollIntervalMs));
   }
 }
 function runDetachedWorkerDaemon() {
@@ -17196,7 +17759,7 @@ function appendDirtyPath(normalizedPath2) {
     if (existing.length > 0 && !existing.endsWith("\n")) leadingNewline = "\n";
   } catch {
   }
-  fs29.appendFileSync(queuePath, `${leadingNewline}${normalizedPath2}
+  fs29.appendFileSync(queuePath, `${leadingNewline}${encodeDirtyQueueLine(normalizedPath2)}
 `);
 }
 function enqueueDirtyPathSafe(filePath, opts) {
@@ -17552,6 +18115,7 @@ export {
   tomlBracketDelta,
   isParseSkipEligible,
   indexFileSync,
+  indexedPathSpellingIsStale,
   isEmbedFresh,
   indexFileEmbeddings,
   removeFileFromIndex,
@@ -17559,6 +18123,8 @@ export {
   pruneBlockedRoot,
   findSystemTempFiles,
   pruneSystemTempFiles,
+  findOrphanedChunkPaths,
+  pruneOrphanedChunks,
   recordKnownRootThrottled,
   WORKER_HEARTBEAT_STALE_MS,
   dirtyQueuePathFor,