token-goat 2.6.34 → 2.6.35

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

@@ -5,6 +5,7 @@ import {
   PER_FILE_COUNTERFACTUAL_CEILING,
   SOURCE_HINT,
   SYMBOL_BODY_CHAR_CAP,
+  assignBraceBlockSpans,
   assignFlatEndLines,
   atomicWriteBytes,
   atomicWriteText,
@@ -87,7 +88,7 @@ import {
   withFileLock,
   writeIfDifferent,
   writeJsonSettings
-} from "./token-goat-chunk-7FWBSPCT.mjs";
+} from "./token-goat-chunk-K7W3P2TJ.mjs";
 import {
   registerReset
 } from "./token-goat-chunk-AO2QD2AG.mjs";
@@ -159,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) {
@@ -2288,28 +2294,254 @@ function formatCsvProfile(profiles) {
   }).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 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 wb;
+  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) {
@@ -3067,7 +3299,7 @@ function logHintEmission(category, sessionId, correlator, compensateSelfResolve
   } 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) {
@@ -7158,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 {
@@ -7168,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);
 }
@@ -7368,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({
@@ -8638,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;
@@ -12166,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;
     }
@@ -12180,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;
     }
@@ -12195,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;
     }
@@ -12216,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") };
+          }
+        }
       }
     }
   }
@@ -12258,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);
@@ -12278,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;
     }
@@ -12292,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;
     }
@@ -12309,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") };
+          }
+        }
       }
     }
   }
@@ -13036,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;
@@ -13064,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);
@@ -13072,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) {
@@ -13084,9 +13371,11 @@ function extractBash(content, filePath) {
             } else if (openCount > closeCount) {
               inFunction = true;
               functionBraceDepth = braceDepth;
+              openFunctionIndex = pushedIndex;
             }
           } else {
             awaitingFunctionBrace = true;
+            openFunctionIndex = pushedIndex;
           }
         }
       } else {
@@ -13107,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;
@@ -13691,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([
@@ -16267,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)];
@@ -16277,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,
@@ -16291,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,
@@ -16430,7 +16726,23 @@ function indexedPathSpellingIsStale(storedPath, absPath) {
   } catch {
     return false;
   }
-  return real !== stored && foldPath(real) === foldPath(stored);
+  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;
@@ -16922,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);
@@ -16943,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 = () => {
@@ -17360,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 {