token-goat 2.9.11 → 2.9.13

package/dist/{token-goat-chunk-HDL77BN3.mjs → token-goat-chunk-JVNPCQB7.mjs}

@@ -8,14 +8,17 @@ import {
   leftoverIntegrations,
   run,
   visualStudioManualSteps
-} from "./token-goat-chunk-MRZ555B3.mjs";
-import "./token-goat-chunk-LKOYKSID.mjs";
-import "./token-goat-chunk-2ZUPQYLO.mjs";
-import "./token-goat-chunk-V53Z47ZH.mjs";
-import "./token-goat-chunk-SY7WTZMW.mjs";
-import "./token-goat-chunk-AAEYU2U2.mjs";
+} from "./token-goat-chunk-3ESRORNM.mjs";
+import "./token-goat-chunk-FQCNJV4V.mjs";
+import "./token-goat-chunk-U7X6LQD2.mjs";
+import "./token-goat-chunk-ZZI3IDQZ.mjs";
+import "./token-goat-chunk-JOXLE672.mjs";
+import "./token-goat-chunk-YOA4N6WA.mjs";
+import "./token-goat-chunk-UM47DRD3.mjs";
+import "./token-goat-chunk-UMXJN7DI.mjs";
 import "./token-goat-chunk-EEIDFMEM.mjs";
-import "./token-goat-chunk-YCKCFYTM.mjs";
+import "./token-goat-chunk-B3CTCQTH.mjs";
+import "./token-goat-chunk-QKXBGBQR.mjs";
 import "./token-goat-chunk-A37V4PBF.mjs";
 export {
   applyExitOverride,

package/dist/{token-goat-chunk-LHLQFGWQ.mjs → token-goat-chunk-OMNQUUIT.mjs}

@@ -54,10 +54,7 @@ var McpServer = class {
   constructor(info) {
     this.info = info;
   }
-  /**
-   * Registers a tool. Schema generation happens here rather than at `tools/list` time, which also
-   * means a malformed shape fails loudly at startup instead of on a client's first listing.
-   */
+  /** Registers a tool. Schema generation happens here rather than at `tools/list` time, which also means a malformed shape fails loudly at startup instead of on a client's first listing. */
   registerTool(name, definition, handler) {
     if (this.tools.has(name)) throw new Error(`MCP tool registered twice: ${name}`);
     const shape = definition.inputSchema;
@@ -65,20 +62,13 @@ var McpServer = class {
       name,
       description: definition.description,
       jsonSchema: buildJsonSchema(shape),
-      // An absent shape still needs a validator, so an argumentless tool called with arguments is
-      // not silently handed them.
-      validator: external_exports.object(shape ?? {})
+      // An absent shape still needs a validator, so an argumentless tool called with arguments is not silently handed them.
+      validator: external_exports.object(shape ?? {}),
+      annotations: definition.annotations
     });
     this.handlers.set(name, handler);
   }
-  /**
-   * Wires this server to a transport and starts it.
-   *
-   * `onmessage` is assigned before `start()` on purpose: a transport may have buffered messages
-   * that arrive the moment it starts (the SDK's in-memory transport queues anything sent before a
-   * handler exists and drains the queue inside `start()`), so a server that started first would
-   * drop the client's `initialize`.
-   */
+  /** Wires this server to a transport and starts it. `onmessage` is assigned before `start()` on purpose: a transport may have buffered messages that arrive the moment it starts (the SDK's in-memory transport queues anything sent before a handler exists and drains the queue inside `start()`), so a server that started first would drop the client's `initialize`. */
   async connect(transport) {
     this.transport = transport;
     transport.onmessage = (message) => {
@@ -135,14 +125,7 @@ var McpServer = class {
     const protocolVersion = typeof requested === "string" && SUPPORTED_PROTOCOL_VERSIONS.includes(requested) ? requested : LATEST_PROTOCOL_VERSION;
     return {
       protocolVersion,
-      // Tools only, and they never change after startup, so no `listChanged`. This is the one
-      // place we deliberately do not copy the SDK, which declares `listChanged: true` because its
-      // McpServer is *able* to send that notification. Token-goat registers every tool before it
-      // connects and never adds or removes one, so we would be promising a notification we can
-      // never have cause to send. No client behaviour turns on it either way -- a subscription
-      // that never fires and an absent subscription are the same thing when the list is fixed --
-      // so the honest declaration wins. Contrast the tool-error text below, which a model reads as
-      // content and is therefore matched to the SDK exactly.
+      // Tools only, and they never change after startup, so no `listChanged`. This is the one place we deliberately do not copy the SDK, which declares `listChanged: true` because its McpServer is *able* to send that notification. Token-goat registers every tool before it connects and never adds or removes one, so we would be promising a notification we can never have cause to send. No client behaviour turns on it either way -- a subscription that never fires and an absent subscription are the same thing when the list is fixed -- so the honest declaration wins. Contrast the tool-error text below, which a model reads as content and is therefore matched to the SDK exactly.
       capabilities: { tools: {} },
       serverInfo: { name: this.info.name, version: this.info.version }
     };
@@ -152,10 +135,9 @@ var McpServer = class {
       name: tool.name,
       ...tool.description !== void 0 ? { description: tool.description } : {},
       inputSchema: tool.jsonSchema,
-      // The SDK emits this for every tool it registers, and it is literally true of ours: we do
-      // not implement task augmentation, so a client that asks for it gets refused. Emitting the
-      // same thing keeps `tools/list` byte-identical to what token-goat sent before, which is what
-      // the differential test in tests/mcp_jsonrpc.test.ts pins.
+      // Omitted entirely when the tool registered none, rather than sent as an empty object: the SDK does the same, and a client reading an empty object cannot tell it from a tool that declined to answer.
+      ...tool.annotations !== void 0 ? { annotations: tool.annotations } : {},
+      // The SDK emits this for every tool it registers, and it is literally true of ours: we do not implement task augmentation, so a client that asks for it gets refused. Emitting the same thing keeps `tools/list` byte-identical to what token-goat sent before, which is what the differential test in tests/mcp_jsonrpc.test.ts pins.
       execution: { taskSupport: "forbidden" }
     }));
   }

package/dist/{token-goat-chunk-PJPFOOGM.mjs → token-goat-chunk-P2PU4CR5.mjs}

@@ -4,16 +4,18 @@ import {
   buildEvent,
   relay,
   relayInProcess
-} from "./token-goat-chunk-MKITQ5RY.mjs";
-import "./token-goat-chunk-FDURVZQD.mjs";
+} from "./token-goat-chunk-QWSUZWFP.mjs";
+import "./token-goat-chunk-2WC4ZUXN.mjs";
 import {
   MAX_STDIN_BYTES,
   readStdinJson
-} from "./token-goat-chunk-V53Z47ZH.mjs";
-import "./token-goat-chunk-SY7WTZMW.mjs";
-import "./token-goat-chunk-AAEYU2U2.mjs";
+} from "./token-goat-chunk-FQCNJV4V.mjs";
+import "./token-goat-chunk-ZZI3IDQZ.mjs";
+import "./token-goat-chunk-JOXLE672.mjs";
+import "./token-goat-chunk-UM47DRD3.mjs";
+import "./token-goat-chunk-UMXJN7DI.mjs";
 import "./token-goat-chunk-EEIDFMEM.mjs";
-import "./token-goat-chunk-YCKCFYTM.mjs";
+import "./token-goat-chunk-QKXBGBQR.mjs";
 import "./token-goat-chunk-A37V4PBF.mjs";
 export {
   MAX_STDIN_BYTES,

package/dist/{token-goat-chunk-YCKCFYTM.mjs → token-goat-chunk-QKXBGBQR.mjs}

@@ -9,7 +9,7 @@ init_define_import_meta_env();
 import { createRequire } from "node:module";
 function resolveVersion() {
   if (true) {
-    return "2.9.11";
+    return "2.9.13";
   }
   const require2 = createRequire(import.meta.url);
   const pkg = require2("../package.json");
@@ -596,8 +596,11 @@ var PROBE_MAX_LENGTH = 512;
 var PROBE_LENGTHS = Array.from({ length: PROBE_MAX_LENGTH / PROBE_STEP }, (_, i) => (i + 1) * PROBE_STEP);
 var PROJECTED_LINE_LENGTH = 1e4;
 var PROJECTION_BUDGET_MS = 1e3;
-var PROJECTION_SIGNAL_MS = 1;
+var TIMING_SIGNAL_MS = 1;
 var PROBE_GROWTH_FACTOR = 12;
+function climbsBetweenRungs(previous, elapsed) {
+  return previous !== void 0 && elapsed > TIMING_SIGNAL_MS && elapsed > previous * PROBE_GROWTH_FACTOR;
+}
 var PROBE_TERMINATORS = ["!", "a", "0", " ", "\uFFFF", "\n", "\u2028"];
 var PROBE_BUDGET_MS = 25;
 var MAX_COUNTED_REPEAT = 8;
@@ -608,7 +611,7 @@ function timeMatch(re, input) {
   const started = performance.now();
   const matched = probe.test(input);
   const first = performance.now() - started;
-  if (first <= PROJECTION_SIGNAL_MS || first > PROBE_BUDGET_MS * 4) return { ms: first, matched };
+  if (first <= TIMING_SIGNAL_MS) return { ms: first, matched };
   const again = new RegExp(re.source, re.flags.replace("g", ""));
   const restarted = performance.now();
   again.test(input);
@@ -750,9 +753,10 @@ function probeAlphabets(source) {
 function growsExponentially(re) {
   const relaxed = detune(re.source);
   if (relaxed === null || !relaxed.hadLookaround) {
-    if (climbsPastBudget(re)) return true;
+    const cause = climbsPastBudget(re);
+    if (cause !== null) return cause;
   }
-  if (relaxed === null) return false;
+  if (relaxed === null) return null;
   for (const body of relaxed.negativeBodies) {
     let inner;
     try {
@@ -760,13 +764,14 @@ function growsExponentially(re) {
     } catch {
       continue;
     }
-    if (growsExponentially(inner)) return true;
+    const innerCause = growsExponentially(inner);
+    if (innerCause !== null) return innerCause;
   }
   let widened;
   try {
     widened = new RegExp(relaxed.source, re.flags);
   } catch {
-    return false;
+    return null;
   }
   return growsExponentially(widened);
 }
@@ -793,14 +798,14 @@ function climbsPastBudget(re) {
         return m;
       };
       for (const candidate of swept === void 0 ? candidates : [swept, ...candidates]) {
-        if (attempt(candidate) === "over-budget") return true;
+        if (attempt(candidate) === "over-budget") return "over-budget";
         if (failing !== void 0) break;
       }
       if (failing === void 0 && sweeps < MAX_SWEEPS && sweptMs < SWEEP_BUDGET_MS) {
         sweeps++;
         const sweepStarted = Date.now();
         for (const candidate of SWEEP_TAILS) {
-          if (attempt(candidate) === "over-budget") return true;
+          if (attempt(candidate) === "over-budget") return "over-budget";
           if (failing !== void 0) {
             swept = candidate;
             break;
@@ -810,14 +815,14 @@ function climbsPastBudget(re) {
       }
       if (failing !== void 0) falsified = true;
       const elapsed = (failing ?? last).ms;
-      if (previous !== void 0 && elapsed > 1 && elapsed > previous * PROBE_GROWTH_FACTOR) return true;
+      if (climbsBetweenRungs(previous, elapsed)) return "ratio";
       previous = elapsed;
       timings.push(elapsed);
     }
-    if (projectsPastBudget(timings)) return true;
+    if (projectsPastBudget(timings)) return "projection";
   }
-  if (!falsified && QUANTIFIED_GROUP.test(re.source)) return true;
-  return false;
+  if (!falsified && QUANTIFIED_GROUP.test(re.source)) return "unfalsifiable";
+  return null;
 }
 function groupEnd(source, start) {
   let depth = 0;
@@ -912,7 +917,7 @@ function projectsPastBudget(timings) {
   const top = timings[hi];
   const prior = timings[lo];
   if (top === void 0 || prior === void 0 || loLength === void 0 || loLength >= hiLength) return false;
-  if (top <= PROJECTION_SIGNAL_MS || prior <= 0) return false;
+  if (top <= TIMING_SIGNAL_MS || prior <= 0) return false;
   const exponent = Math.log2(top / prior) / Math.log2(hiLength / loLength);
   return top * (PROJECTED_LINE_LENGTH / hiLength) ** exponent > PROJECTION_BUDGET_MS;
 }
@@ -927,10 +932,12 @@ function compileGuardedRegex(pattern, flags = "") {
   } catch (e) {
     return { ok: false, reason: e instanceof Error ? e.message : "is not a valid regular expression" };
   }
-  if (growsExponentially(re)) {
+  const cause = growsExponentially(re);
+  if (cause !== null) {
     return {
       ok: false,
-      reason: hasNestedQuantifier(pattern) ? "repeats a group that already repeats, which can take exponential time to match" : "takes time that climbs steeply with the length of the line, which can stall on ordinary text"
+      reason: hasNestedQuantifier(pattern) ? "repeats a group that already repeats, which can take exponential time to match" : "takes time that climbs steeply with the length of the line, which can stall on ordinary text",
+      cause
     };
   }
   return { ok: true, re };
@@ -1073,6 +1080,77 @@ function projectPathIsConsultable(target, projectRoot) {
   return isInsideRoot(target, projectRoot);
 }
 
+// src/indexed_source.ts
+init_define_import_meta_env();
+
+// src/languages/ipynb_idx.ts
+init_define_import_meta_env();
+function normalizeSource(source) {
+  if (typeof source === "string") return source;
+  if (!Array.isArray(source)) return "";
+  const lines = source.filter((s) => typeof s === "string");
+  if (lines.length === 0) return "";
+  const noneEndWithNewline = lines.every((l) => !l.endsWith("\n"));
+  return noneEndWithNewline ? lines.join("\n") : lines.join("");
+}
+function resolveKernelLanguage(metadata) {
+  const kernelspecLang = metadata?.kernelspec?.language;
+  if (typeof kernelspecLang === "string" && kernelspecLang !== "") return kernelspecLang.toLowerCase();
+  const infoLang = metadata?.language_info?.name;
+  if (typeof infoLang === "string" && infoLang !== "") return infoLang.toLowerCase();
+  return void 0;
+}
+function ipynbToVirtualSource(raw) {
+  let data;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    return { content: "", cellLanguage: null };
+  }
+  if (typeof data !== "object" || data === null) return { content: "", cellLanguage: null };
+  const nb = data;
+  if (!Array.isArray(nb.cells)) return { content: "", cellLanguage: null };
+  const declared = resolveKernelLanguage(nb.metadata);
+  const isPython = declared === void 0 || declared === "python" || declared === "python3";
+  if (!isPython) return { content: "", cellLanguage: null };
+  const blocks = [];
+  nb.cells.forEach((cell, index) => {
+    if (typeof cell !== "object" || cell === null) return;
+    const c = cell;
+    if (c.cell_type === "code") {
+      const src = normalizeSource(c.source).replace(/\n+$/, "");
+      blocks.push(`# %% cell ${index}
+${src}`);
+    } else if (c.cell_type === "markdown") {
+      const src = normalizeSource(c.source).replace(/\n+$/, "");
+      const commented = src.split("\n").map((line) => line === "" ? "#" : `# ${line}`).join("\n");
+      blocks.push(`# %% [markdown] cell ${index}
+${commented}`);
+    }
+  });
+  return { content: blocks.join("\n\n"), cellLanguage: "python" };
+}
+
+// src/indexed_source.ts
+function indexedSourceText(filePath, raw) {
+  return isVirtualIndexedPath(filePath) ? ipynbToVirtualSource(stripBom(raw)).content : raw;
+}
+function stripBom(text) {
+  return text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+}
+function isVirtualIndexedPath(filePath) {
+  return filePath.toLowerCase().endsWith(".ipynb");
+}
+function virtualIndexedScopeNote(displayPath, consequence) {
+  return `[${displayPath} is a notebook: its indexed line numbers address the flattened cell source, not the JSON in the file, so ${consequence}.]`;
+}
+var NOTEBOOK_CELL_LINES_SUFFIX = " (notebook cell lines)";
+function formatSymbolLocation(displayPath, lineStart, lineEnd) {
+  const range = lineEnd === void 0 ? `${lineStart}` : `${lineStart}-${lineEnd}`;
+  const suffix = isVirtualIndexedPath(displayPath) ? NOTEBOOK_CELL_LINES_SUFFIX : "";
+  return `${displayPath}:${range}${suffix}`;
+}
+
 // src/util.ts
 function sleepSync(ms) {
   if (ms <= 0) return;
@@ -1477,7 +1555,7 @@ function buildContextWindow(absPath, line, contextLines) {
   if (!Number.isFinite(contextLines) || contextLines <= 0) return null;
   let text;
   try {
-    text = readFileSync2(absPath, "utf-8");
+    text = indexedSourceText(absPath, readFileSync2(absPath, "utf-8"));
   } catch {
     return null;
   }
@@ -1600,7 +1678,7 @@ function redactUrlQuery(raw) {
   const q = raw.indexOf("?");
   return q === -1 ? raw : raw.slice(0, q);
 }
-function stripBom(text) {
+function stripBom2(text) {
   return text.charCodeAt(0) === 65279 ? text.slice(1) : text;
 }
 function withExtension(filePath, format) {
@@ -2260,7 +2338,7 @@ function stripStringLiterals(line, opts = {}) {
       i++;
       continue;
     }
-    if (ch === "\\" && i + 1 < line.length) {
+    if (ch === "\\" && i + 1 < line.length && line[i + 1] !== "\n") {
       out += "  ";
       i += 2;
       continue;
@@ -2326,6 +2404,8 @@ var MULTILINE_CLOSER_ANCHOR = {
   scala: "anywhere",
   // Dart's multi-line string production is a delimiter, content, then the delimiter, with no rule about where on a line the closing delimiter falls (Dart Programming Language Specification, section "Strings").
   dart: "anywhere",
+  // A GraphQL block string closes at the next `"""` wherever it sits: the spec's BlockString production places no positional rule on the closing delimiter, and a one-line description such as `"""A user."""` is the ordinary form (GraphQL specification, section 2.9.4 "String Value").
+  graphql: "anywhere",
   // C# has two cross-line forms and they disagree, so the language-level value is the permissive one. A verbatim string (`@"..."`) closes on the next non-doubled quote wherever it sits and has no positional rule (C# language reference, "String literals"). A multi-line raw string literal does require its closing run to begin its own line (C# language reference, "Raw string literals"), but that rule is unreachable as a mis-pairing here: the same section forbids the content from holding a quote run as long as the delimiter, so no run inside the body can be mistaken for the closer in the first place, and the run-length rule already in `closingQuoteRunEnd` is what enforces it.
   csharp: "anywhere",
   // R has no fixed-delimiter multi-line form and no positional rule: an ordinary character constant runs to its next unescaped quote (R Language Definition, section 10.3.1 "Literal constants") and a raw constant to its mirrored closing punctuation (R base help page `?Quotes`, "Raw character constants"), on whatever line either lands.
@@ -2339,6 +2419,8 @@ function closerSearchStart(line, from, anchor) {
 var TRIPLE_QUOTE_RUN_CLOSE = {
   kotlin: "last",
   scala: "last",
+  // A GraphQL block string ends at the first `"""` run, because its grammar excludes that sequence from the body outright rather than letting the longest run win (GraphQL specification, section 2.9.4 "String Value", the BlockString production).
+  graphql: "first",
   // Swift's closing delimiter has to stand alone on its own line (The Swift Programming Language, "Strings and Characters", section "Multiline String Literals"), so no run longer than three ever terminates a valid Swift literal; it is grouped with Kotlin and Scala so that the same-line and cross-line paths agree, not to assert a rule Swift itself defines.
   swift: "last",
   csharp: "last",
@@ -2469,6 +2551,7 @@ function findMultilineCloser(line, from, state) {
 var MULTILINE_OPENER_COMMENT_MARKERS = {
   php: ["//", "#"],
   kotlin: ["//"],
+  graphql: ["#"],
   csharp: ["//"],
   powershell: ["#"],
   swift: ["//"],
@@ -2681,7 +2764,7 @@ function findMultilineOpener(line, from, lang) {
     const kind = m[1] === "'" ? "nowdoc" : "heredoc";
     return { openStart: m.index, closesSameLine: null, state: { kind, identifier, closerAnchor: MULTILINE_CLOSER_ANCHOR[lang] } };
   }
-  if (lang === "kotlin" || lang === "swift" || lang === "scala") {
+  if (lang === "kotlin" || lang === "swift" || lang === "scala" || lang === "graphql") {
     let swiftExt = null;
     if (lang === "swift") {
       for (let h = line.indexOf("#", from); h !== -1; h = line.indexOf("#", h + 1)) {
@@ -3457,6 +3540,12 @@ export {
   projectScopeRoot,
   assertWriteInScope,
   projectPathIsConsultable,
+  ipynbToVirtualSource,
+  indexedSourceText,
+  isVirtualIndexedPath,
+  virtualIndexedScopeNote,
+  NOTEBOOK_CELL_LINES_SUFFIX,
+  formatSymbolLocation,
   hasNestedQuantifier,
   growsExponentially,
   compileGuardedRegex,
@@ -3500,7 +3589,7 @@ export {
   escapeRegExp,
   windowsCmdQuoteArg,
   redactUrlQuery,
-  stripBom,
+  stripBom2 as stripBom,
   withExtension,
   ensureNewline,
   extractErrorMessage,

package/dist/{token-goat-chunk-MKITQ5RY.mjs → token-goat-chunk-QWSUZWFP.mjs}

@@ -4,7 +4,7 @@ import {
   canRunWrappedShell,
   clipToDeliveryCap,
   deliveredOutputBytes
-} from "./token-goat-chunk-FDURVZQD.mjs";
+} from "./token-goat-chunk-2WC4ZUXN.mjs";
 import {
   DEFAULT_RECONCILE_BUDGET_MS,
   HOOK_EVENTS,
@@ -22,7 +22,7 @@ import {
   storeWebOutput,
   summarizeResidentContext,
   taskListPruneHint
-} from "./token-goat-chunk-V53Z47ZH.mjs";
+} from "./token-goat-chunk-FQCNJV4V.mjs";
 import {
   BASH_OUTPUT_SUBDIR,
   GENERIC_SERVED_OUTPUT_KEY,
@@ -121,7 +121,6 @@ import {
   setLastTabContext,
   shrinkImage,
   storeBashOutput,
-  storeBlob,
   storeOutput,
   summarizeOutputDelta,
   takePendingLargeFileHint,
@@ -131,7 +130,7 @@ import {
   wasCliReadThisSession,
   wasFileReadThisSession,
   wasHintShown
-} from "./token-goat-chunk-SY7WTZMW.mjs";
+} from "./token-goat-chunk-ZZI3IDQZ.mjs";
 import {
   BODY_FIRST_TOOL_RESPONSE_KEYS,
   OUTPUT_FIRST_TOOL_RESPONSE_KEYS,
@@ -140,47 +139,55 @@ import {
   dedupeConsecutive,
   denyOutput,
   detectFromCommand,
-  detectHarness,
-  detectLanguage,
   emitRewrite,
   emitRewriteIfChanged,
-  envBool,
-  envInt,
   estimateTokens,
   extractToolResponseField,
   extractToolResultText,
   filterByName,
-  findProject,
   getCwd,
-  getDb,
   getFilePath,
-  getHarnessName,
   getToolInput,
   getToolName,
   hasBareBackgroundOrNewline,
   hasUnquotedOperator,
   isMcpErrorResponse,
   isRewriteWorthwhile,
-  isUnderSystemTemp,
-  languageHasFlag,
-  loadConfig,
+  isTextualContentBlock,
   makeDedupHintHandlers,
+  mcpContentBlocks,
   normalizePayload,
   passOutput,
   readCopilotHooksOwners,
-  recordStat,
-  redactSecrets,
   registerHook,
   resolveMinNetSavingsBytes,
   runHook,
-  savedTokensFromBytes,
   serializeOutput,
   sessionStateKey,
   shlexSplit,
-  shortFingerprint,
   splitOwnTrailingNotices,
+  withPreservedBlocks
+} from "./token-goat-chunk-JOXLE672.mjs";
+import {
+  storeBlob
+} from "./token-goat-chunk-UM47DRD3.mjs";
+import {
+  detectHarness,
+  detectLanguage,
+  envBool,
+  envInt,
+  findProject,
+  getDb,
+  getHarnessName,
+  isUnderSystemTemp,
+  languageHasFlag,
+  loadConfig,
+  recordStat,
+  redactSecrets,
+  savedTokensFromBytes,
+  shortFingerprint,
   stripAnsiEscapes
-} from "./token-goat-chunk-AAEYU2U2.mjs";
+} from "./token-goat-chunk-UMXJN7DI.mjs";
 import {
   ENV_KEYS,
   IDENTICAL_READ_MIN_BODY_BYTES,
@@ -207,7 +214,7 @@ import {
   runGit,
   toDisplayPath,
   toKB
-} from "./token-goat-chunk-YCKCFYTM.mjs";
+} from "./token-goat-chunk-QKXBGBQR.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -927,7 +934,7 @@ init_define_import_meta_env();
 var TRACKED_SKILL = "token-goat";
 var MAX_COMMANDS_SHOWN = 8;
 async function currentCommandNames() {
-  const { buildProgram } = await import("./token-goat-chunk-HDL77BN3.mjs");
+  const { buildProgram } = await import("./token-goat-chunk-JVNPCQB7.mjs");
   return flattenCommandNames(buildCommandManifest(buildProgram()));
 }
 async function recordSkillVersionSnapshot(sessionId, skillName) {
@@ -10745,10 +10752,14 @@ function postMcpHandler(event) {
   if (!resultText) return passOutput();
   const injectionMatches = scanAndRecord(resultText);
   const redactedResult = redactSecrets(resultText);
-  const fenced = () => emitRewriteIfChanged(
-    resultText,
-    fenceWithMatches(redactedResult.text, injectionMatches, UNTRUSTED_TOOL_TAG),
-    "mcp"
+  const preserved = (mcpContentBlocks(event.raw) ?? []).filter((b) => !isTextualContentBlock(b));
+  const preserve = (output) => withPreservedBlocks(output, preserved);
+  const fenced = () => preserve(
+    emitRewriteIfChanged(
+      resultText,
+      fenceWithMatches(redactedResult.text, injectionMatches, UNTRUSTED_TOOL_TAG),
+      "mcp"
+    )
   );
   const passOrFence = () => fenced();
   if (!event.sessionId) return passOrFence();
@@ -10776,10 +10787,12 @@ function postMcpHandler(event) {
           minNetSavingsBytes: resolveMinNetSavingsBytes()
         });
         if (worthwhile) {
-          return emitRewrite(
-            `${notice}${fenceWithMatches(redactedBody, injectionMatches, UNTRUSTED_TOOL_TAG)}`,
-            "mcp",
-            { kind: "mcp:compress", originalBytes }
+          return preserve(
+            emitRewrite(
+              `${notice}${fenceWithMatches(redactedBody, injectionMatches, UNTRUSTED_TOOL_TAG)}`,
+              "mcp",
+              { kind: "mcp:compress", originalBytes }
+            )
           );
         }
       }
@@ -10877,6 +10890,7 @@ import { createHash } from "node:crypto";
 function getResponseContentBlocks(raw) {
   const tr = raw["tool_response"];
   if (!tr || typeof tr !== "object") return null;
+  if (Array.isArray(tr)) return tr;
   const content = tr["content"];
   return Array.isArray(content) ? content : null;
 }
@@ -10915,10 +10929,7 @@ async function shrinkImageBlock(block) {
         changed: true,
         // Decoded image bytes, not base64 characters. Both branches of this function file under the same `image_shrink` kind, and the shrink branch below credits `result.originalBytes - result.shrunkBytes` -- decoded bytes, the convention documented at image_shrink.ts's own recordStat call. Base64 inflates by 4/3, so crediting `originalDataUrl.length` here booked roughly 33% more for a repeat screenshot than an identical shrink of the same image, and the ledger summed the two units into one row. The gate above deliberately still measures the data URL: it decides whether the rewrite pays off on the wire, where base64 characters are what is actually sent.
         savedBytes: buffer.length - Buffer.byteLength(SCREENSHOT_REPEAT_NOTICE, "utf-8"),
-        // The whole image is withheld here rather than resized, so the visual tokens saved are its
-        // entire billed cost less the notice standing in for it. Billed cost, not raw patch count:
-        // an oversized screenshot would have been capped by the API's own downscale, so pricing the
-        // untouched dimensions would credit a bill that was never going to be sent.
+        // The whole image is withheld here rather than resized, so the visual tokens saved are its entire billed cost less the notice standing in for it. Billed cost, not raw patch count: an oversized screenshot would have been capped by the API's own downscale, so pricing the untouched dimensions would credit a bill that was never going to be sent.
         savedTokens: Math.max(0, visionTokens(meta?.width ?? 0, meta?.height ?? 0, tier) - savedTokensFromBytes(Buffer.byteLength(SCREENSHOT_REPEAT_NOTICE, "utf-8")))
       };
     }

package/dist/{token-goat-chunk-4NZUXC4F.mjs → token-goat-chunk-RDITECDL.mjs}

@@ -3,7 +3,7 @@ const require = __cjsRequire(import.meta.url);
 import {
   deliveredOutputBytes,
   wrappedShell
-} from "./token-goat-chunk-FDURVZQD.mjs";
+} from "./token-goat-chunk-2WC4ZUXN.mjs";
 import {
   ToolFilter,
   capTokens,
@@ -11,13 +11,15 @@ import {
   deliverCompressed,
   dispatchArgv,
   filterByName,
-  loadConfig,
-  recordStat,
   selectFilter,
   shlexSplit
-} from "./token-goat-chunk-AAEYU2U2.mjs";
+} from "./token-goat-chunk-JOXLE672.mjs";
+import {
+  loadConfig,
+  recordStat
+} from "./token-goat-chunk-UMXJN7DI.mjs";
 import "./token-goat-chunk-EEIDFMEM.mjs";
-import "./token-goat-chunk-YCKCFYTM.mjs";
+import "./token-goat-chunk-QKXBGBQR.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";