token-goat 2.6.11 → 2.6.12

package/dist/token-goat.mjs

@@ -130752,7 +130752,7 @@ var init_cliui = __esm({
 
 // node_modules/escalade/sync/index.mjs
 import { dirname as dirname18, resolve as resolve11 } from "path";
-import { readdirSync as readdirSync8, statSync as statSync19 } from "fs";
+import { readdirSync as readdirSync9, statSync as statSync19 } from "fs";
 function sync_default(start, callback) {
   let dir = resolve11(".", start);
   let tmp, stats = statSync19(dir);
@@ -130760,7 +130760,7 @@ function sync_default(start, callback) {
     dir = dirname18(dir);
   }
   while (true) {
-    tmp = callback(dir, readdirSync8(dir));
+    tmp = callback(dir, readdirSync9(dir));
     if (tmp) return resolve11(dir, tmp);
     dir = dirname18(tmp = dir);
     if (tmp === dir) break;
@@ -178698,7 +178698,7 @@ init_define_import_meta_env();
 import { createRequire } from "node:module";
 function resolveVersion() {
   if (true) {
-    return "2.6.11";
+    return "2.6.12";
   }
   const require3 = createRequire(import.meta.url);
   const pkg = require3("../package.json");
@@ -183058,6 +183058,21 @@ const FILE_PATH_ARG_KEY = {
   create: 'path',
 }
 
+// Copilot spawns a brand-new process for every single hook invocation (no long-lived plugin
+// process the way OpenClaw's is -- OPENCLAW_HOOK_SCRIPT's own \`copilot-\${process.pid}-\${Date.now()}\`
+// fallback is safe there specifically because that process lives for the whole session, so the
+// pid stays constant across calls). If Copilot ever omits \`sessionId\` from a payload, falling
+// back to \`process.pid\` here would mint a DIFFERENT id on every single call for what's really
+// the same session, since process.pid varies per invocation -- breaking token-goat's
+// session-based dedup/state ledger, which never accumulates across calls as a result. Derive a
+// stable id instead from the one thing that's actually constant across calls for the same
+// session: the working directory Copilot reports in \`payload.cwd\`.
+function stableFallbackSessionId(cwd) {
+  const key = typeof cwd === 'string' && cwd ? cwd : process.cwd()
+  const hash = require('node:crypto').createHash('sha256').update(key).digest('hex').slice(0, 16)
+  return 'copilot-' + hash
+}
+
 function remapToolInput(copilotToolName, input) {
   const pathKey = FILE_PATH_ARG_KEY[copilotToolName]
   if (pathKey === undefined || !input || typeof input !== 'object' || !(pathKey in input)) {
@@ -183100,7 +183115,7 @@ function main() {
 
   const toolName = payload && payload.toolName
   const canonical = {
-    session_id: (payload && payload.sessionId) || 'copilot-' + process.pid,
+    session_id: (payload && payload.sessionId) || stableFallbackSessionId(payload && payload.cwd),
     cwd: payload && payload.cwd,
   }
   if (toolName) {
@@ -183757,6 +183772,7 @@ registerReset(() => {
 var SAFE_RE = /[^a-zA-Z0-9_-]/g;
 var MAX_FILES = 500;
 var SESSIONS_SUBDIR = "sessions";
+var AGENT_SALT_MARKER = ":agent:".replace(SAFE_RE, "_");
 function sessionPath(sessionId) {
   if (!sessionId) return null;
   const safe = sessionId.replace(SAFE_RE, "_").slice(0, 64);
@@ -183945,6 +183961,25 @@ function readSessionStateFile(sessionId) {
   if (!p) return null;
   return readDiskState(p);
 }
+function listSiblingSessionStates(sessionId) {
+  if (!sessionId) return [];
+  const safeSessionId = sessionId.replace(SAFE_RE, "_");
+  if (!safeSessionId) return [];
+  const prefix = `${safeSessionId}${AGENT_SALT_MARKER}`;
+  const dir = path12.join(tokenGoatHome(), SESSIONS_SUBDIR);
+  const out2 = [];
+  try {
+    if (!fs10.existsSync(dir)) return out2;
+    for (const file2 of fs10.readdirSync(dir)) {
+      if (!file2.endsWith(".json") || !file2.startsWith(prefix)) continue;
+      const state = readDiskState(path12.join(dir, file2));
+      if (state !== null) out2.push(state);
+    }
+  } catch {
+    return out2;
+  }
+  return out2;
+}
 function loadSessionState(sessionId) {
   const p = sessionPath(sessionId);
   if (!p) return;
@@ -184189,7 +184224,7 @@ function findLatestSessionId() {
       return null;
     }
     const files = fs11.readdirSync(sessionsDir);
-    const jsonFiles = files.filter((f) => f.endsWith(".json"));
+    const jsonFiles = files.filter((f) => f.endsWith(".json") && !f.includes(AGENT_SALT_MARKER));
     if (jsonFiles.length === 0) {
       return null;
     }
@@ -184843,7 +184878,7 @@ function rerankHits(hits, query, topK) {
     return { hit, index, adjusted: hit.distance - boost + penalty };
   });
   scored.sort((a, b) => a.adjusted - b.adjusted || a.index - b.index);
-  return scored.slice(0, topK).map((entry) => entry.hit);
+  return scored.slice(0, topK).map((entry) => ({ ...entry.hit, adjustedDistance: entry.adjusted }));
 }
 function mergeNearbyHits(hits, proximity = 20) {
   if (hits.length <= 1) {
@@ -184868,6 +184903,7 @@ function mergeNearbyHits(hits, proximity = 20) {
     let curStart = current.startLine;
     let curEnd = current.endLine;
     let curDist = current.distance;
+    let curAdjusted = current.adjustedDistance ?? current.distance;
     const mergedTexts = [current.text];
     for (let i = 1; i < fileHits.length; i++) {
       const hit = fileHits[i];
@@ -184878,6 +184914,7 @@ function mergeNearbyHits(hits, proximity = 20) {
       if (gap <= proximity) {
         curEnd = Math.max(curEnd, hit.endLine);
         curDist = Math.min(curDist, hit.distance);
+        curAdjusted = Math.min(curAdjusted, hit.adjustedDistance ?? hit.distance);
         mergedTexts.push(hit.text);
       } else {
         merged.push({
@@ -184886,12 +184923,14 @@ function mergeNearbyHits(hits, proximity = 20) {
           endLine: curEnd,
           kind: current.kind,
           distance: curDist,
+          adjustedDistance: curAdjusted,
           text: mergedTexts.join("\n---\n")
         });
         current = hit;
         curStart = hit.startLine;
         curEnd = hit.endLine;
         curDist = hit.distance;
+        curAdjusted = hit.adjustedDistance ?? hit.distance;
         mergedTexts.length = 0;
         mergedTexts.push(hit.text);
       }
@@ -184902,10 +184941,11 @@ function mergeNearbyHits(hits, proximity = 20) {
       endLine: curEnd,
       kind: current.kind,
       distance: curDist,
+      adjustedDistance: curAdjusted,
       text: mergedTexts.join("\n---\n")
     });
   }
-  merged.sort((a, b) => a.distance - b.distance);
+  merged.sort((a, b) => (a.adjustedDistance ?? a.distance) - (b.adjustedDistance ?? b.distance));
   return merged;
 }
 async function indexFile(db, filePath, content, boundaries = []) {
@@ -185271,8 +185311,10 @@ function findMultilineCloser(line, from2, state) {
       return m ? { maskEnd: m[0].length } : null;
     }
     case "tripleQuote": {
-      const idx = line.indexOf('"""', from2);
-      return idx === -1 ? null : { maskEnd: idx + 3 };
+      const n = state.identifier !== "" ? parseInt(state.identifier, 10) : 3;
+      const re = new RegExp(`"{${n},}`);
+      const m = re.exec(line.slice(from2));
+      return m === null ? null : { maskEnd: from2 + m.index + m[0].length };
     }
     case "verbatim": {
       let j = from2;
@@ -185308,15 +185350,20 @@ function findMultilineOpener(line, from2, lang) {
   }
   if (lang === "kotlin") {
     const idx = line.indexOf('"""', from2);
-    if (idx === -1) return null;
+    if (idx === -1 || isInsideStringLiteral(line, idx)) return null;
     const closeIdx = line.indexOf('"""', idx + 3);
     if (closeIdx !== -1) {
-      return { openStart: idx, closesSameLine: closeIdx + 3, state: { kind: "tripleQuote", identifier: "" } };
+      return { openStart: idx, closesSameLine: closeIdx + 3, state: { kind: "tripleQuote", identifier: "3" } };
     }
-    return { openStart: idx, closesSameLine: null, state: { kind: "tripleQuote", identifier: "" } };
+    return { openStart: idx, closesSameLine: null, state: { kind: "tripleQuote", identifier: "3" } };
   }
   if (lang === "csharp") {
-    const tripleIdx = line.indexOf('"""', from2);
+    const tripleRe = /"{3,}/g;
+    tripleRe.lastIndex = from2;
+    const tripleM = tripleRe.exec(line);
+    let tripleIdx = tripleM ? tripleM.index : -1;
+    const tripleLen = tripleM ? tripleM[0].length : 0;
+    if (tripleIdx !== -1 && isInsideStringLiteral(line, tripleIdx)) tripleIdx = -1;
     const verbRe = /\$?@\$?"/g;
     verbRe.lastIndex = from2;
     const verbM = verbRe.exec(line);
@@ -185324,11 +185371,13 @@ function findMultilineOpener(line, from2, lang) {
     if (tripleIdx === -1 && verbIdx === -1) return null;
     const useTriple = tripleIdx !== -1 && (verbIdx === -1 || tripleIdx < verbIdx);
     if (useTriple) {
-      const closeIdx = line.indexOf('"""', tripleIdx + 3);
-      if (closeIdx !== -1) {
-        return { openStart: tripleIdx, closesSameLine: closeIdx + 3, state: { kind: "tripleQuote", identifier: "" } };
+      const closeRe = new RegExp(`"{${tripleLen},}`);
+      const closeM = closeRe.exec(line.slice(tripleIdx + tripleLen));
+      if (closeM !== null) {
+        const closeIdx = tripleIdx + tripleLen + closeM.index;
+        return { openStart: tripleIdx, closesSameLine: closeIdx + closeM[0].length, state: { kind: "tripleQuote", identifier: String(tripleLen) } };
       }
-      return { openStart: tripleIdx, closesSameLine: null, state: { kind: "tripleQuote", identifier: "" } };
+      return { openStart: tripleIdx, closesSameLine: null, state: { kind: "tripleQuote", identifier: String(tripleLen) } };
     }
     const quoteIdx = verbIdx + (verbM?.[0].length ?? 1) - 1;
     const closer = findMultilineCloser(line, quoteIdx + 1, { kind: "verbatim", identifier: "" });
@@ -186009,6 +186058,16 @@ var KIND_MAP = /* @__PURE__ */ new Map([
 ]);
 var MAX_SYMBOLS = 500;
 var MAX_HEADING_LEN = 120;
+function stripGraphqlDescriptions(text) {
+  let state = null;
+  const outLines = [];
+  for (const line of text.split("\n")) {
+    const { code, state: nextState } = stripMultilineStringSpan(line, state, "kotlin");
+    state = nextState;
+    outLines.push(stripStringLiterals(code));
+  }
+  return outLines.join("\n");
+}
 function extractGraphql(content, filePath) {
   const symbols = [];
   const sections = [];
@@ -186022,7 +186081,7 @@ function extractGraphql(content, filePath) {
       imports.push({ kind: "import", target, line });
     }
   }
-  const stripped = stripHashComments(content);
+  const stripped = stripGraphqlDescriptions(stripHashComments(content));
   const totalLines = content.split("\n").length;
   for (const m of stripped.matchAll(TYPE_RE)) {
     const keyword = m.groups?.["keyword"] ?? "";
@@ -186102,6 +186161,37 @@ var PATTERNS = [
   [TYPE_RE2, "sql_type"],
   [SCHEMA_RE3, "sql_schema"]
 ];
+function stripSqlStringLiterals(text) {
+  let out2 = "";
+  let i = 0;
+  while (i < text.length) {
+    const ch2 = text[i];
+    if (ch2 === "'") {
+      const quote = ch2;
+      out2 += quote;
+      i++;
+      while (i < text.length) {
+        const c = text[i];
+        if (c === quote) {
+          if (text[i + 1] === quote) {
+            out2 += "  ";
+            i += 2;
+            continue;
+          }
+          out2 += quote;
+          i++;
+          break;
+        }
+        out2 += c === "\n" ? "\n" : " ";
+        i++;
+      }
+      continue;
+    }
+    out2 += ch2;
+    i++;
+  }
+  return out2;
+}
 function unquote(name2) {
   if (name2.length >= 2 && (name2[0] === '"' && name2[name2.length - 1] === '"' || name2[0] === "`" && name2[name2.length - 1] === "`" || name2[0] === "[" && name2[name2.length - 1] === "]")) {
     return name2.slice(1, -1);
@@ -186116,9 +186206,10 @@ function extractSql(content, filePath) {
   let stripped = stripSqlLineComments(content);
   stripped = stripCstyleComments(stripped);
   const totalLines = content.split("\n").length;
+  const noStrings = stripSqlStringLiterals(stripped);
   for (const [pattern, kind] of PATTERNS) {
     pattern.lastIndex = 0;
-    for (const m of stripped.matchAll(pattern)) {
+    for (const m of noStrings.matchAll(pattern)) {
       const rawName = m[1];
       if (rawName) {
         const name2 = unquote(rawName).trim();
@@ -186590,8 +186681,8 @@ function extractApex(content, filePath) {
   const seen = /* @__PURE__ */ new Set();
   const lineIndex = buildLineIndex(content);
   const rawLines = content.split(/\r?\n/);
-  const commentFree = stripCstyleComments(content, /\/\/.*$/gm);
-  const code = stripStringLiterals(commentFree);
+  const stringFree = stripStringLiterals(content);
+  const code = stripCstyleComments(stringFree, /\/\/.*$/gm);
   const emit5 = (name2, kind, span, docstring = "") => {
     if (!name2 || symbols.length >= MAX_SYMBOLS6) return;
     const key = `${name2}\0${kind}\0${span.startLine}`;
@@ -187778,8 +187869,17 @@ function buildEmbeddingBoundaries(filePath, content, dbPath) {
   const symbols = querySymbols({ filePath, limit: 1e4 }, dbPath);
   return symbols.map((s) => ({ start: s.lineStart, end: s.lineEnd, kind: "symbol" }));
 }
+var DISABLED_EMBED_SHA_PREFIX = "disabled:";
+function disabledEmbedSha(sha) {
+  return DISABLED_EMBED_SHA_PREFIX + sha;
+}
 async function indexFileEmbeddings(filePath, dbPath = globalDbPath(), sha) {
-  if (!loadConfig().indexing.embeddings_enabled) return;
+  if (!loadConfig().indexing.embeddings_enabled) {
+    if (sha !== void 0) {
+      getDb(dbPath).prepare(`UPDATE files SET embed_sha = ? WHERE ${pathEqClause("path")}`).run(disabledEmbedSha(sha), foldPath(filePath));
+    }
+    return;
+  }
   if (filePath.toLowerCase().endsWith(".profile-meta.xml")) {
     deleteFileEmbeddings(getDb(dbPath), filePath);
     return;
@@ -188285,7 +188385,8 @@ function makeIndexer(dbPath) {
       if (!parseUnchanged) {
         indexFileSync(absPath, dbPath);
       }
-      const embedUnchanged = parseUnchanged && entry?.embedSha === sha;
+      const embeddingsEnabled = loadConfig().indexing?.embeddings_enabled ?? true;
+      const embedUnchanged = parseUnchanged && entry?.embedSha === (embeddingsEnabled ? sha : disabledEmbedSha(sha));
       if (embedUnchanged) {
         return false;
       }
@@ -189461,7 +189562,7 @@ import * as fs19 from "fs/promises";
 import { createHash as createHash4 } from "crypto";
 import { resolve as resolve7 } from "path";
 import { homedir as homedir7 } from "os";
-import { readdirSync as readdirSync6, readFileSync as readFileSync14, existsSync as existsSync13, statSync as statSync11, unlinkSync as unlinkSync7 } from "node:fs";
+import { readdirSync as readdirSync7, readFileSync as readFileSync14, existsSync as existsSync13, statSync as statSync11, unlinkSync as unlinkSync7 } from "node:fs";
 var COMPACT_END_MARKER = "<!-- COMPACT_END -->";
 var SKILLS_OUTPUT_SUBDIR = "skills";
 var _skillOutputsDirOverride = null;
@@ -189725,7 +189826,7 @@ function getCompactAnySessionSync(skillName) {
     const name2 = safeSkillName(skillName);
     if (!name2) return null;
     const dir = skillOutputsDir();
-    const entries = readdirSync6(dir, { withFileTypes: true });
+    const entries = readdirSync7(dir, { withFileTypes: true });
     const suffix = `@${sanitizeSkillId(name2)}@compact`;
     for (const entry of entries) {
       if (!entry.isFile() || !entry.name.endsWith("@compact")) continue;
@@ -189904,7 +190005,7 @@ function pruneSkillOutputs(maxCount = DEFAULT_MAX_COUNT, maxAgeMs = DEFAULT_MAX_
     if (!existsSync13(dir)) return 0;
     const cutoff = Date.now() - maxAgeMs;
     const entries = [];
-    for (const file2 of readdirSync6(dir)) {
+    for (const file2 of readdirSync7(dir)) {
       if (!file2.endsWith(".meta")) continue;
       const outputId = file2.slice(0, -".meta".length);
       let ts;
@@ -190655,7 +190756,6 @@ function preReadHandler(event) {
       const headings = extractMarkdownHeadings(fileContent);
       if (headings.length >= 3) {
         const alreadyRead = wasFileReadThisSession(normalized);
-        recordActualRead(event, normalized);
         const hintText = formatHeadingTree(headings, normalized);
         const wellKnown = getWellKnownSections(basename17);
         const wellKnownText = wellKnown.length > 0 ? "\nQuick access: " + wellKnown.map((s) => 'token-goat section "' + normalized + "::" + s + '"').join(" | ") : "";
@@ -190663,9 +190763,13 @@ function preReadHandler(event) {
         let message = hintText + wellKnownText + changelogExtra;
         const tooLargeForFirstRead = markdownSize !== null && markdownSize >= largeFileDenyBytes();
         if (alreadyRead || tooLargeForFirstRead) {
+          if (alreadyRead) {
+            recordActualRead(event, normalized);
+          }
           message += ' To edit it anyway, use `token-goat replace "' + normalized + '" --old-from <oldfile> --new-from <newfile>` for a snippet edit, or `token-goat write-file "' + normalized + "\" --from <newfile>` to rewrite the whole file \u2014 Read/Edit's own precondition can't be satisfied after this deny.";
           return denyOutput(message);
         }
+        recordActualRead(event, normalized);
         return contextOutput(message);
       }
     }
@@ -191023,8 +191127,31 @@ function renderReadRow(entry) {
   const edited = entry.wasEdited ? ", edited" : "";
   return `- ${entry.path} (${kb}kb, ${entry.readCount} ${plural2}${edited})`;
 }
-function buildManifest2() {
-  const files = [...getSessionFiles().values()];
+function mergeManifestFiles(parent, siblingFiles) {
+  const byPath = /* @__PURE__ */ new Map();
+  for (const f of parent) byPath.set(foldPath(f.path), f);
+  for (const f of siblingFiles) {
+    const key = foldPath(f.path);
+    const prev = byPath.get(key);
+    if (prev === void 0) {
+      byPath.set(key, f);
+      continue;
+    }
+    byPath.set(key, {
+      path: prev.path,
+      readCount: Math.max(prev.readCount, f.readCount),
+      lastReadAt: Math.max(prev.lastReadAt, f.lastReadAt),
+      wasEdited: prev.wasEdited || f.wasEdited,
+      sizeBytes: f.lastReadAt >= prev.lastReadAt ? f.sizeBytes : prev.sizeBytes,
+      ...prev.wasTruncated || f.wasTruncated ? { wasTruncated: true } : {}
+    });
+  }
+  return Array.from(byPath.values());
+}
+function buildManifest2(sessionId) {
+  const ownFiles = [...getSessionFiles().values()];
+  const siblingFiles = sessionId !== void 0 ? listSiblingSessionStates(sessionId).flatMap((s) => s.files) : [];
+  const files = siblingFiles.length > 0 ? mergeManifestFiles(ownFiles, siblingFiles) : ownFiles;
   const editedFiles = files.filter((f) => f.wasEdited);
   const readFiles = files.filter((f) => f.readCount > 0 && !f.wasEdited);
   const webFetches = [...getSessionWebFetches().entries()];
@@ -191068,8 +191195,8 @@ function buildManifest2() {
   }
   return lines.join("\n");
 }
-function preCompactHandler(_event) {
-  return contextOutput(buildManifest2());
+function preCompactHandler(event) {
+  return contextOutput(buildManifest2(event.sessionId));
 }
 registerHook("pre_compact", preCompactHandler);
 
@@ -197334,7 +197461,6 @@ var _byId2 = /* @__PURE__ */ new Map();
 var COMMAND_PATTERNS = {
   gitMutable: /^\s*git\s+(diff|status)\b/i,
   gitImmutable: /^\s*git\s+show\s+[0-9a-f]{40}\b/i,
-  gitDiffUnscoped: /^\s*git\s+diff\b/i,
   gitDiffScoped: /\s--\s+\S/,
   dirListing: /^\s*(?:ls|eza|exa|dir|Get-ChildItem|gci)\b/i,
   depList: /^\s*(?:npm\s+(?:-\S+\s+)*(?:ls|list)\b|pip\s+(?:-\S+\s+)*(?:list|freeze)\b|uv\s+pip\s+(?:-\S+\s+)*(?:list|freeze)\b|pnpm\s+(?:-\S+\s+)*(?:list|ls)\b|yarn\s+(?:-\S+\s+)*(?:list)\b|cargo\s+(?:-\S+\s+)*tree\b|bundle\s+(?:-\S+\s+)*(?:list|show)\b|composer\s+(?:-\S+\s+)*show\b)/i,
@@ -212436,6 +212562,9 @@ async function relay(eventName) {
     const rawPayload = await readStdinJson();
     const payload = eventName === "pre_tool_use" || eventName === "post_tool_use" ? normalizePayload(rawPayload, harnessForNormalization()) : rawPayload;
     const event = buildEvent(eventName, payload);
+    if (!process.env["CLAUDE_CODE_SESSION_ID"] && event.sessionId) {
+      process.env["CLAUDE_CODE_SESSION_ID"] = event.sessionId;
+    }
     const stateKey = sessionStateKey(event);
     try {
       loadSessionState(stateKey);
@@ -238004,6 +238133,19 @@ function trimToBudget(text, budgetTokens, command2) {
   const marker = `[token-goat: output capped at ~${budgetTokens} tokens to protect context \u2014 showing ${shown} of ${totalLines} lines. ${hint}]`;
   return kept.join("\n") + "\n" + marker;
 }
+function capJsonRows(items, budgetTokens) {
+  const totalCount = items.length;
+  const charBudget = Math.max(1, budgetTokens * 3);
+  const kept = [];
+  let used = 0;
+  for (const item of items) {
+    const cost = JSON.stringify(item).length + 2;
+    if (kept.length > 0 && used + cost > charBudget) break;
+    kept.push(item);
+    used += cost;
+  }
+  return { items: kept, truncated: kept.length < totalCount, totalCount };
+}
 function getHintFor(command2) {
   const cmd = (command2 || "").toLowerCase().trim();
   if (cmd === "symbol") {
@@ -238018,6 +238160,9 @@ function getHintFor(command2) {
   if (cmd === "bash-output" || cmd === "web-output") {
     return "Use --grep PATTERN, --section HEADING, or --tail N to narrow the cached output.";
   }
+  if (cmd === "semantic") {
+    return "Narrow your query text or pass --limit to reduce the number of matches returned.";
+  }
   return "Narrow your query or raise overflow_guard max_tokens in config.";
 }
 
@@ -240781,6 +240926,11 @@ function guardText(text, command2) {
   const cfg = loadConfig();
   return cfg.overflow_guard.enabled ? trimToBudget(text, cfg.overflow_guard.max_tokens, command2) : text;
 }
+function guardJsonRows(items) {
+  const cfg = loadConfig();
+  if (!cfg.overflow_guard.enabled) return { items: [...items], truncated: false, totalCount: items.length };
+  return capJsonRows(items, cfg.overflow_guard.max_tokens);
+}
 function findSpecSeparator(spec) {
   return spec.lastIndexOf("::");
 }
@@ -240819,7 +240969,9 @@ function runSymbol(opts) {
     return { text: `No matches for '${opts.name ?? "*"}'`, code: 1 };
   }
   if (opts.json === true) {
-    return { text: JSON.stringify(results, null, 2), code: 0 };
+    const capped = guardJsonRows(results);
+    const payload = capped.truncated ? { results: capped.items, truncated: true, totalCount: capped.totalCount } : results;
+    return { text: JSON.stringify(payload, null, 2), code: 0 };
   }
   const blocks = results.map((sym) => {
     const header = `# ${sym.name} (${sym.kind}) \u2014 ${sym.filePath}:${sym.lineStart}-${sym.lineEnd}`;
@@ -241061,7 +241213,8 @@ function runRefs(opts) {
     const results = queryRefs(queryOpts);
     if (results.length > 0) anyFound = true;
     if (opts.json === true) {
-      jsonOut[sym] = results;
+      const capped = guardJsonRows(results);
+      jsonOut[sym] = capped.truncated ? { references: capped.items, truncated: true, totalCount: capped.totalCount } : capped.items;
       continue;
     }
     if (results.length === 0) {
@@ -241094,7 +241247,9 @@ function runRefsSingle(opts) {
     return 1;
   }
   if (opts.json === true) {
-    emit3(JSON.stringify(results, null, 2));
+    const capped = guardJsonRows(results);
+    const payload = capped.truncated ? { references: capped.items, truncated: true, totalCount: capped.totalCount } : results;
+    emit3(JSON.stringify(payload, null, 2));
     return 0;
   }
   const lines = opts.callers === true ? renderCallerGroups(results) : results.map((ref) => `${ref.filePath}:${ref.line}: ${ref.context}`);
@@ -241132,20 +241287,16 @@ function runSkeleton(opts) {
   const filtered = opts.minLines !== void 0 ? symbols.filter((s) => s.lineEnd - s.lineStart + 1 >= (opts.minLines ?? 0)) : symbols;
   const refCounts = opts.stats === true ? queryRefCounts(filtered.map((s) => s.name)) : void 0;
   if (opts.json === true) {
-    return {
-      text: JSON.stringify(
-        filtered.map((s) => ({
-          name: s.name,
-          kind: s.kind,
-          lineStart: s.lineStart,
-          lineEnd: s.lineEnd,
-          ...refCounts !== void 0 ? { refCount: refCounts.get(s.name) ?? 0, hasDoc: s.docstring.trim().length > 0 } : {}
-        })),
-        null,
-        2
-      ),
-      code: 0
-    };
+    const rows = filtered.map((s) => ({
+      name: s.name,
+      kind: s.kind,
+      lineStart: s.lineStart,
+      lineEnd: s.lineEnd,
+      ...refCounts !== void 0 ? { refCount: refCounts.get(s.name) ?? 0, hasDoc: s.docstring.trim().length > 0 } : {}
+    }));
+    const capped = guardJsonRows(rows);
+    const payload = capped.truncated ? { symbols: capped.items, truncated: true, totalCount: capped.totalCount } : rows;
+    return { text: JSON.stringify(payload, null, 2), code: 0 };
   }
   const totalLines = filtered.length > 0 ? Math.max(...filtered.map((s) => s.lineEnd)) : 0;
   const lines = [`# Skeleton: ${opts.file}  (${filtered.length} symbols, ${totalLines} lines)`];
@@ -241168,18 +241319,14 @@ function runOutline(opts) {
   const filtered = opts.minLines !== void 0 ? symbols.filter((s) => s.lineEnd - s.lineStart + 1 >= (opts.minLines ?? 0)) : symbols;
   const refCounts = opts.stats === true ? queryRefCounts(filtered.map((s) => s.name)) : void 0;
   if (opts.json === true) {
-    return {
-      text: JSON.stringify(
-        refCounts !== void 0 ? filtered.map((s) => ({
-          ...s,
-          refCount: refCounts.get(s.name) ?? 0,
-          hasDoc: s.docstring.trim().length > 0
-        })) : filtered,
-        null,
-        2
-      ),
-      code: 0
-    };
+    const rows = refCounts !== void 0 ? filtered.map((s) => ({
+      ...s,
+      refCount: refCounts.get(s.name) ?? 0,
+      hasDoc: s.docstring.trim().length > 0
+    })) : filtered;
+    const capped = guardJsonRows(rows);
+    const payload = capped.truncated ? { symbols: capped.items, truncated: true, totalCount: capped.totalCount } : rows;
+    return { text: JSON.stringify(payload, null, 2), code: 0 };
   }
   const lines = [`# Outline: ${opts.file}  (${filtered.length} symbols)`];
   for (const sym of filtered) {
@@ -241852,7 +241999,7 @@ async function runSemantic(query, opts) {
       (h) => `# ${h.filePath}:${h.startLine}-${h.endLine} (distance ${h.distance.toFixed(3)})
 ${previewLines(h.text, 3)}`
     );
-    return { text: blocks2.join("\n\n"), code: 0 };
+    return { text: guardText(blocks2.join("\n\n"), "semantic"), code: 0 };
   }
   const results = searchSymbolsFts(query, n);
   if (results.length === 0) {
@@ -241860,7 +242007,7 @@ ${previewLines(h.text, 3)}`
   }
   const blocks = results.map((s) => `${symbolHeader(s)}
 ${previewLines(s.body, 3)}`);
-  return { text: blocks.join("\n\n"), code: 0 };
+  return { text: guardText(blocks.join("\n\n"), "semantic"), code: 0 };
 }
 
 // src/mcp_server.ts
@@ -246909,6 +247056,9 @@ var CACHE_ENV_GATES = [
 function pad(s, n) {
   return s.length >= n ? s : s + " ".repeat(n - s.length);
 }
+function listParentSessionBlobs() {
+  return listBlobs(SESSIONS_SUBDIR).filter((b) => !b.id.includes(AGENT_SALT_MARKER)).sort((a, b) => b.mtime - a.mtime);
+}
 function cmdBashHistory(opts) {
   let limit = 30;
   if (opts.limit !== void 0) {
@@ -247111,7 +247261,7 @@ function cmdCompactHint(opts) {
   }
 }
 function cmdSessionSummary(opts) {
-  const blobs = listBlobs(SESSIONS_SUBDIR).sort((a, b) => b.mtime - a.mtime);
+  const blobs = listParentSessionBlobs();
   if (blobs.length === 0) {
     if (opts.json === true) {
       process.stdout.write(JSON.stringify({ sessionCount: 0, message: "no session blobs found" }, null, 2) + "\n");
@@ -247144,7 +247294,7 @@ function cmdSessionSummary(opts) {
 }
 function cmdCost(opts) {
   if (opts.session === true) {
-    const blobs = listBlobs(SESSIONS_SUBDIR).sort((a, b) => b.mtime - a.mtime);
+    const blobs = listParentSessionBlobs();
     if (blobs.length === 0) {
       if (opts.json === true) {
         process.stdout.write(JSON.stringify({ session: true, message: "no session blobs found" }, null, 2) + "\n");
@@ -247481,6 +247631,11 @@ function levenshtein2(a, b, cap = 3) {
 function closestKeys(unknown2, known) {
   return known.map((k) => ({ k, d: levenshtein2(unknown2, k) })).filter((x) => x.d <= 3).sort((a, b) => a.d - b.d).slice(0, 3).map((x) => x.k);
 }
+function didYouMeanKeySuffix(unknownKey) {
+  const knownKeys = flattenConfig(defaultConfig()).map(([k]) => k);
+  const suggestions = closestKeys(unknownKey, knownKeys);
+  return suggestions.length > 0 ? ` (did you mean: ${suggestions.join(", ")}?)` : "";
+}
 function walkGet(obj, parts) {
   let cur = obj;
   for (const part of parts) {
@@ -247557,15 +247712,13 @@ function cmdConfig(opts) {
   }
   if (action === "get") {
     if (!opts.key) {
-      emitErr4("config get requires a key (e.g. compact_assist.enabled)");
-      throw new Error("missing key");
+      throw new Error("config get requires a key (e.g. compact_assist.enabled)");
     }
     const parts = opts.key.split(".");
     const cfg = loadConfig();
     const result = walkGet(cfg, parts);
     if (!result.found) {
-      emitErr4(`key not found: ${opts.key}`);
-      throw new Error(`key not found: ${opts.key}`);
+      throw new Error(`key not found: ${opts.key}${didYouMeanKeySuffix(opts.key)}`);
     }
     if (opts.json === true) {
       emit4(JSON.stringify({ key: opts.key, value: result.value }, null, 2));
@@ -247576,28 +247729,23 @@ function cmdConfig(opts) {
   }
   if (action === "set") {
     if (!opts.key) {
-      emitErr4("config set requires a key (e.g. compact_assist.enabled)");
-      throw new Error("missing key");
+      throw new Error("config set requires a key (e.g. compact_assist.enabled)");
     }
     if (opts.value === void 0) {
-      emitErr4("config set requires a value");
-      throw new Error("missing value");
+      throw new Error("config set requires a value");
     }
     const parts = opts.key.split(".");
     const cfg = loadPersistedConfig();
     const ref = walkParent(cfg, parts);
     if (!ref) {
-      emitErr4(`key not found: ${opts.key}`);
-      throw new Error(`key not found: ${opts.key}`);
+      throw new Error(`key not found: ${opts.key}${didYouMeanKeySuffix(opts.key)}`);
     }
     const existing = ref.parent[ref.leaf];
     if (existing === void 0) {
-      emitErr4(`key not found: ${opts.key}`);
-      throw new Error(`key not found: ${opts.key}`);
+      throw new Error(`key not found: ${opts.key}${didYouMeanKeySuffix(opts.key)}`);
     }
     if (typeof existing === "object" && existing !== null && !Array.isArray(existing)) {
-      emitErr4(`config set: '${opts.key}' is a section, not a settable field \u2014 set an individual key within it instead (e.g. ${opts.key}.<field>)`);
-      throw new Error(`cannot set a whole config section: ${opts.key}`);
+      throw new Error(`config set: '${opts.key}' is a section, not a settable field \u2014 set an individual key within it instead (e.g. ${opts.key}.<field>)`);
     }
     const defaultAtKey = walkGet(defaultConfig(), parts);
     const coerced = coerce2(opts.value, existing, defaultAtKey.found ? defaultAtKey.value : void 0);
@@ -247606,8 +247754,7 @@ function cmdConfig(opts) {
       const revalidated = buildPersistedConfig(cfg);
       const revalidatedResult = walkGet(revalidated, parts);
       if (revalidatedResult.found && revalidatedResult.value !== coerced) {
-        emitErr4(`config set: ${opts.key} = ${coerced} is outside the allowed range (would be clamped to ${String(revalidatedResult.value)}); rejected`);
-        throw new Error(`value out of range for ${opts.key}: ${coerced}`);
+        throw new Error(`config set: ${opts.key} = ${coerced} is outside the allowed range (would be clamped to ${String(revalidatedResult.value)}); rejected`);
       }
     }
     saveConfigSafe(cfg);
@@ -247687,8 +247834,7 @@ function cmdConfig(opts) {
     emit4(`config validate: ${findings.length} issue(s) found`);
     return;
   }
-  emitErr4(`config: unknown action '${action}'. Use list, get, set, or validate.`);
-  throw new Error(`unknown config action: ${action}`);
+  throw new Error(`config: unknown action '${action}'. Use list, get, set, or validate.`);
 }
 function cmdProject(opts) {
   const { action } = opts;
@@ -247978,7 +248124,8 @@ async function cmdIndex(pathArg, opts = {}) {
     const sha = fingerprintFile(key);
     const entry = sha !== null ? getFileEntry(key, dbPath) : null;
     const parseUnchanged = sha !== null && entry?.sha === sha;
-    const embedUnchanged = parseUnchanged && entry?.embedSha === sha;
+    const embeddingsEnabled = loadConfig().indexing?.embeddings_enabled ?? true;
+    const embedUnchanged = parseUnchanged && sha !== null && entry?.embedSha === (embeddingsEnabled ? sha : disabledEmbedSha(sha));
     if (parseUnchanged && embedUnchanged) {
       skipped += 1;
       continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-goat",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "description": "Surgical token-reduction companion for Claude Code and other AI coding agents",
   "type": "module",
   "main": "./dist/token-goat.mjs",