mixdog 1.2.5 → 1.2.6

package/src/runtime/agent/orchestrator/tools/shell-command.mjs

@@ -313,7 +313,9 @@ function queueSaturatedAsTask(run, saturation, spec) {
           jobId: taskId,
           abortSignal: queuedAbort.signal,
           admissionWaitMs: 0,
-          // The call already returned: nobody renders live progress.
+          // The call already returned: nobody renders live progress, and no
+          // hold remains for user input to end.
+          wakeSignal: null,
           onProgress: null,
           onOutputTail: null,
         });
@@ -465,7 +467,27 @@ const promotable = (run, backgroundOnTimeout) =>
   run.child?.exitCode == null &&
   run.child?.signalCode == null;
 
-function armDeadlines(run, { timeoutMs, autoBackgroundMs, backgroundOnTimeout, abortSignal }, fireAutoBackground) {
+// New user input or a queued task notification during the hold moves a
+// still-running command to the background at once (never a kill): the call
+// returns to the agent loop, which delivers it at the next boundary.
+function armInputWake(run, wakeSignal, fireAutoBackground) {
+  if (!wakeSignal) return;
+  const onWake = () => {
+    const reason = wakeSignal.reason === 'notification' ? 'notification' : 'input';
+    if (promotable(run, true)) fireAutoBackground({ reason });
+  };
+  if (wakeSignal.aborted) {
+    onWake();
+    return;
+  }
+  wakeSignal.addEventListener('abort', onWake, { once: true });
+}
+
+function armDeadlines(
+  run,
+  { timeoutMs, autoBackgroundMs, autoBackgroundReason, backgroundOnTimeout, abortSignal },
+  fireAutoBackground
+) {
   if (timeoutMs > 0) {
     run.timer = setTimeout(() => {
       // Promote-on-timeout: if the caller allows backgrounding and the child
@@ -490,7 +512,7 @@ function armDeadlines(run, { timeoutMs, autoBackgroundMs, backgroundOnTimeout, a
     (timeoutMs <= 0 || autoBackgroundMs < timeoutMs)
   ) {
     run.autoBgTimer = setTimeout(() => {
-      fireAutoBackground();
+      fireAutoBackground({ reason: autoBackgroundReason || 'threshold' });
     }, autoBackgroundMs);
     if (run.autoBgTimer.unref) run.autoBgTimer.unref();
   }
@@ -525,7 +547,11 @@ export function execShellCommand(options) {
     cwd,
     timeoutMs,
     abortSignal,
+    // Aborted when new user input should end the hold (task-wait-control).
+    wakeSignal = null,
     autoBackgroundMs,
+    // 'background' for an explicit background start; the hold otherwise.
+    autoBackgroundReason = 'threshold',
     onProgress,
     onOutputTail,
     clientHostPid,
@@ -597,7 +623,12 @@ export function execShellCommand(options) {
         promotedTimeoutMs,
         backgroundDeadlineMs,
       });
-      armDeadlines(run, { timeoutMs, autoBackgroundMs, backgroundOnTimeout, abortSignal }, fireAutoBackground);
+      armDeadlines(
+        run,
+        { timeoutMs, autoBackgroundMs, autoBackgroundReason, backgroundOnTimeout, abortSignal },
+        fireAutoBackground
+      );
+      armInputWake(run, wakeSignal, fireAutoBackground);
       armProgressTimers(run, { onProgress, onOutputTail });
     } catch (err) {
       settleSetupFailure(run, err);

package/src/runtime/agent/orchestrator/tools/shell-policy.mjs

@@ -273,6 +273,8 @@ export function isBlockedCommand(command) {
   return decoded !== null && _blockedText(decoded);
 }
 
+const WMIC_PROCESS_COMMAND_RE = /^\s*(?:&\s*)?(?:cmd(?:\.exe)?\s+\/c\s+["']?)?(?:\S*[\\/])?wmic(?:\.exe)?\s+process\b/i;
+
 const WMIC_PROCESS_DEFAULT_FIELDS = Object.freeze([
   'ProcessId',
   'Name',
@@ -336,8 +338,11 @@ export function maybeRewriteWmicProcessCommand(command) {
   // silently drop surrounding `cd`, pipes, `&&`/`;` segments. For composite
   // commands containing wmic, return null so the caller falls back to other
   // policy handling instead of dropping context.
-  if (/[|&;]|\$\(|`/.test(text) && /\bwmic(?:\.exe)?\s+process\b/i.test(text)) return null;
-  if (!/\bwmic(?:\.exe)?\s+process\b/i.test(text)) return null;
+  // Only a command that IS a wmic call is rewritten. The words `wmic process`
+  // inside a search pattern, a commit message or a file being written are text:
+  // replacing that whole command would discard it.
+  if (!WMIC_PROCESS_COMMAND_RE.test(text)) return null;
+  if (/[|&;]|\$\(|`/.test(text)) return null;
   if (!/\bget\b/i.test(text)) {
     return {
       error:

package/src/runtime/agent/orchestrator/tools/shell-powershell.mjs

@@ -8,6 +8,8 @@
 // `powershell -Command "<inline>"` / `pwsh -Command "<inline>"` to
 // `-EncodedCommand <utf16le-base64>` so the payload stays opaque to the
 // outer shell. Other shells / non-Windows are no-op pass-through.
+import { codeMask } from './builtin/bash-tool/bashism-rewrite.mjs';
+
 // Match -Command "<body>" where the body may contain escaped quotes
 // (`\"` or `""`). Stops at the first unescaped closing quote so nested
 // patterns like `"... \"inner\" ..."` survive intact. Common PowerShell
@@ -16,49 +18,63 @@
 // Single-quoted -Command '<body>' is also covered.
 const _POWERSHELL_FLAGS_RE =
   /\s+-(?:NoProfile|NonInteractive|WindowStyle\s+\S+|ExecutionPolicy\s+\S+|Sta|Mta|NoLogo|NoExit)/.source;
+// What may follow the closing quote: the end of the command or a shell
+// operator. Anything else (`pwsh -Command "a" "b"`) is more arguments, which
+// PowerShell appends to the command text and an -EncodedCommand would drop.
+const _POWERSHELL_TRAILING = '(?=[ \\t]*(?:$|[\\r\\n;|&<>]|\\d+>))';
 const _POWERSHELL_DOUBLE_RE = new RegExp(
   '\\b(powershell(?:\\.exe)?|pwsh(?:\\.exe)?)((?:' +
     _POWERSHELL_FLAGS_RE +
-    ')*)\\s+(?:-Command|-c)\\s+"((?:[^"\\\\]|\\\\.|"")+?)"(?=\\s|$|;|&&|\\|\\|)',
+    ')*)\\s+(?:-Command|-c)\\s+"((?:[^"\\\\]|\\\\.|"")+?)"' +
+    _POWERSHELL_TRAILING,
   'gi'
 );
 const _POWERSHELL_SINGLE_RE = new RegExp(
   '\\b(powershell(?:\\.exe)?|pwsh(?:\\.exe)?)((?:' +
     _POWERSHELL_FLAGS_RE +
-    ")*)\\s+(?:-Command|-c)\\s+'((?:[^'\\\\]|\\\\.|'')+?)'(?=\\s|$|;|&&|\\|\\|)",
+    ")*)\\s+(?:-Command|-c)\\s+'((?:[^'\\\\]|\\\\.|'')+?)'" +
+    _POWERSHELL_TRAILING,
   'gi'
 );
 
-export function _maybeEncodePowerShellCommand(command) {
-  if (process.platform !== 'win32') return command;
-  if (typeof command !== 'string' || command.length === 0) return command;
-  const replaceFn = (match, exe, flags, body) => {
+// One pass of one quote style. Only an invocation the outer shell itself runs
+// is rewritten: the same text inside a string, here-string or comment (a
+// README being written, a commit message) is data, not a command.
+function _encodePass(command, pattern, quote) {
+  const live = codeMask(command);
+  if (!live) return command;
+  return command.replace(pattern, (match, exe, flags, body, offset) => {
+    if (!live[offset]) return match;
     try {
-      // Unescape doubled-up quotes the caller used to embed " / ' inside
-      // the -Command literal. We're handing the body to powershell as
-      // base64 so the outer-shell escaping is no longer needed.
-      // Unescape both PowerShell-style doubled quotes (`""` / `''`) AND
-      // bash-style backslash-escaped quotes (`\"` / `\'`) since POSIX
-      // outer-shell wrappers commonly use backslash form. Without
-      // backslash unescape, `pwsh -Command "Get-Process \"foo\""` would
-      // base64-encode the literal backslash, breaking inside PowerShell.
-      const unescaped = _unescapePowerShellCommandBody(body);
+      // Unescape the quote the caller used to embed the body: the PowerShell
+      // doubled form (`""` / `''`) AND the bash-style backslash form (`\"` /
+      // `\'`) POSIX outer-shell wrappers commonly use. Without the backslash
+      // unescape, `pwsh -Command "Get-Process \"foo\""` would base64-encode the
+      // literal backslash. The OTHER quote is the body's own syntax and stays.
+      const unescaped = _unescapePowerShellCommandBody(body, quote);
       const encoded = Buffer.from(unescaped, 'utf16le').toString('base64');
       const trimmedFlags = (flags || '').replace(/\s+/g, ' ').trim();
       return `${exe}${trimmedFlags ? ` ${trimmedFlags}` : ''} -EncodedCommand ${encoded}`;
     } catch {
       return match;
     }
-  };
-  return command.replace(_POWERSHELL_DOUBLE_RE, replaceFn).replace(_POWERSHELL_SINGLE_RE, replaceFn);
+  });
+}
+
+export function _maybeEncodePowerShellCommand(command) {
+  if (process.platform !== 'win32') return command;
+  if (typeof command !== 'string' || command.length === 0) return command;
+  return _encodePass(_encodePass(command, _POWERSHELL_DOUBLE_RE, '"'), _POWERSHELL_SINGLE_RE, "'");
 }
 
-function _unescapePowerShellCommandBody(body) {
-  return String(body || '')
-    .replace(/""/g, '"')
-    .replace(/''/g, "'")
-    .replace(/\\"/g, '"')
-    .replace(/\\'/g, "'");
+// `quote` names the delimiter that wrapped the body, so only its own escapes
+// are removed. Without it (policy scanning, which wants every reading of the
+// body) both styles are removed.
+function _unescapePowerShellCommandBody(body, quote) {
+  let text = String(body || '');
+  if (quote !== "'") text = text.replace(/""/g, '"').replace(/\\"/g, '"');
+  if (quote !== '"') text = text.replace(/''/g, "'").replace(/\\'/g, "'");
+  return text;
 }
 
 // Extract inline `powershell -Command "…"` bodies for policy scan parity

package/src/runtime/agent/orchestrator/tools/shell-snapshot.mjs

@@ -126,11 +126,15 @@ function getSnapshotScript(shellPath, snapshotFilePath, configFileExists) {
         declare -f "$func" >> "$SNAPSHOT_FILE" 2>/dev/null
       done
     `;
+  // Options are matched on their state column: a name containing "on"
+  // (monitor, onecmd) must not turn an OFF option on. Job control (monitor)
+  // is never restored: it gives every pipeline its own process group, which
+  // the runner's group kill then cannot reach.
   const optDump = isZsh
-    ? `setopt 2>/dev/null | sed 's/^/setopt /' | head -n 1000 >> "$SNAPSHOT_FILE"`
+    ? `setopt 2>/dev/null | grep -vxE '(no)?monitor' | sed 's/^/setopt /' | head -n 1000 >> "$SNAPSHOT_FILE"`
     : `
       shopt -p 2>/dev/null | head -n 1000 >> "$SNAPSHOT_FILE"
-      set -o 2>/dev/null | grep "on" | awk '{print "set -o " $1}' | head -n 1000 >> "$SNAPSHOT_FILE"
+      set -o 2>/dev/null | awk '$2 == "on" && $1 != "monitor" {print "set -o " $1}' | head -n 1000 >> "$SNAPSHOT_FILE"
       echo "shopt -s expand_aliases" >> "$SNAPSHOT_FILE"
     `;
   const aliasDump = `

package/src/runtime/agent/orchestrator/tools/spawn-manifest.json

@@ -1,30 +1,30 @@
 {
-  "version": "0.1.10",
+  "version": "0.1.11",
   "_comment": "Synced from immutable spawn-v release assets.",
   "assets": {
     "darwin-arm64": {
-      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.10/mixdog-spawn-darwin-arm64",
-      "sha256": "8c20f4096c08a5159c62b28ada8aaed9d49d18ab21faaa1631e3eadadaadc91c"
+      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.11/mixdog-spawn-darwin-arm64",
+      "sha256": "6f1a7e6597dcc8785d12c5a13c42388110d9f4a2e5378ca2773172adbf50de60"
     },
     "darwin-x64": {
-      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.10/mixdog-spawn-darwin-x64",
-      "sha256": "a35c66bf5c0121f1202ea69cc22a5804b0587a37929ebf3b66e08ec2b18b6b86"
+      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.11/mixdog-spawn-darwin-x64",
+      "sha256": "ff755eb9848cb3ce90f3df24136bb84a52f9ff6c67002c4d764beb6d7906e6b2"
     },
     "linux-arm64": {
-      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.10/mixdog-spawn-linux-arm64",
-      "sha256": "463bc8bdb6abe49fd99fee53397365417cb6613ebabbfcd332e6b62fa3e79c37"
+      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.11/mixdog-spawn-linux-arm64",
+      "sha256": "3bc0fccde46537046d498a2b953aa92ef4afacc95c96c563ce1d6fb92d74e593"
     },
     "linux-x64": {
-      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.10/mixdog-spawn-linux-x64",
-      "sha256": "329a940ae3affc9fa5bcc9e6a48b2f7c8a783900f2de3a952de2422aa60413f5"
+      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.11/mixdog-spawn-linux-x64",
+      "sha256": "16dc4e3bf6636335c1325c88bbb5245529731525953466e761d363897b59aac7"
     },
     "win32-arm64": {
-      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.10/mixdog-spawn-win32-arm64.exe",
-      "sha256": "a1719d2ea8f87707cb515a5e8e055ed56d6b48f3b717346b0a4ee63d40e562df"
+      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.11/mixdog-spawn-win32-arm64.exe",
+      "sha256": "c2fb5499d3d44405e27c79f8db65694299d61ddf029f466df68549fc2f2c5f5c"
     },
     "win32-x64": {
-      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.10/mixdog-spawn-win32-x64.exe",
-      "sha256": "ac65bd416d03f9c4e9e65eb04c6455a948551e726f74bd73bb32acbf4bc66d93"
+      "url": "https://github.com/tribgames/mixdog/releases/download/spawn-v0.1.11/mixdog-spawn-win32-x64.exe",
+      "sha256": "50531a9f033dc22eff3ec5b2a9d10441ffdfac0e50d9acf9047e4f302e5d70d9"
     }
   }
 }

package/src/runtime/attachments/office-extract.mjs

@@ -13,7 +13,10 @@ const ATTR_BOUND = 4096;
 const ATTRS = `[^<>]{0,${ATTR_BOUND}}`;
 const A = ATTRS;
 // A regex built from a raw template; the interpolations are pattern text.
-const re = (flags = '') => (strings, ...values) => new RegExp(String.raw(strings, ...values), flags);
+const re =
+  (flags = '') =>
+  (strings, ...values) =>
+    new RegExp(String.raw(strings, ...values), flags);
 // The patterns the per-cell / per-run loops use are built once.
 const V_RE = re()`<v(?:\s${A})?>([^<]*)</v>`;
 const T_RUN_RE = re('g')`<t(?:\s${A})?>([^<]*)</t>`;
@@ -384,16 +387,12 @@ function relationshipList(xml) {
 
 function sharedStringTable(xml) {
   if (!xml) return [];
-  return [...scanElements(xml, 'si')]
-    .filter((item) => item.inner !== null)
-    .map((item) => textRuns(item.inner));
+  return [...scanElements(xml, 'si')].filter((item) => item.inner !== null).map((item) => textRuns(item.inner));
 }
 
 // Concatenated <t> character data of one fragment.
 function textRuns(fragment) {
-  return [...fragment.matchAll(T_RUN_RE)]
-    .map(([, text]) => decodeXmlEntities(text))
-    .join('');
+  return [...fragment.matchAll(T_RUN_RE)].map(([, text]) => decodeXmlEntities(text)).join('');
 }
 
 // Excel stores a date as a day count and a percentage as a fraction, so a
@@ -421,7 +420,10 @@ function cellNumberFormats(xml) {
   if (!xml) return [];
   const custom = new Map(
     [...xml.matchAll(re('g')`<numFmt\b(${A}?)/?>`)]
-      .map(([, attributes]) => [/\bnumFmtId="(\d+)"/.exec(attributes)?.[1], /\bformatCode="([^"<>]*)"/.exec(attributes)?.[1]])
+      .map(([, attributes]) => [
+        /\bnumFmtId="(\d+)"/.exec(attributes)?.[1],
+        /\bformatCode="([^"<>]*)"/.exec(attributes)?.[1],
+      ])
       .filter(([id, code]) => id !== undefined && code !== undefined)
       .map(([id, code]) => [Number(id), decodeXmlEntities(code)])
   );
@@ -629,7 +631,7 @@ function relatedPart(target, ownerPart) {
   const base = String(ownerPart).replace(/\/[^/]+$/, '');
   const value = String(target).replace(/^\//, '');
   if (!value.startsWith('..')) return value.startsWith('xl/') ? value : `${base}/${value}`;
-  return value.replace(/^\.\.\//, `${base.replace(/\/[^/]+$/, '')}/`);
+  return value.replace(/^\.\.\//, () => `${base.replace(/\/[^/]+$/, '')}/`);
 }
 
 // A sheet's chart is its message, and it lives outside the cell grid: read as

package/src/runtime/memory/lib/embedding-tokenizer.mjs

@@ -15,7 +15,10 @@ const META = '\u2581';
 // The library's stand-in for SentencePiece's precompiled charsmap.
 function precompiledNormalize(text) {
   text = text.replace(/[\u0001-\u0008\u000B\u000E-\u001F\u007F\u008F\u009F]/gm, '');
-  text = text.replace(/[\u0009\u000A\u000C\u000D\u00A0\u1680\u2000-\u200F\u2028\u2029\u202F\u205F\u2581\u3000\uFEFF\uFFFD]/gm, ' ');
+  text = text.replace(
+    /[\u0009\u000A\u000C\u000D\u00A0\u1680\u2000-\u200F\u2028\u2029\u202F\u205F\u2581\u3000\uFEFF\uFFFD]/gm,
+    ' '
+  );
   return text.includes('\uFF5E')
     ? text
         .split('\uFF5E')
@@ -30,9 +33,10 @@ function buildNormalizer(spec) {
     if (step.type === 'Precompiled') return precompiledNormalize;
     if (step.type === 'Replace' && step.pattern?.Regex != null) {
       const re = new RegExp(step.pattern.Regex, 'gu');
-      return (text) => text.replace(re, step.content);
+      return (text) => text.replace(re, () => step.content);
     }
-    if (step.type === 'Replace' && step.pattern?.String != null) return (text) => text.replaceAll(step.pattern.String, step.content);
+    if (step.type === 'Replace' && step.pattern?.String != null)
+      return (text) => text.replaceAll(step.pattern.String, () => step.content);
     throw new UnsupportedTokenizerError(`unsupported normalizer ${step.type}`);
   });
   return (text) => fns.reduce((acc, fn) => fn(acc), text);
@@ -58,18 +62,10 @@ function splitOn(words, text) {
   return out;
 }
 
-/** Loads tokenizer.json; throws UnsupportedTokenizerError for any other layout. */
-export function loadUnigramTokenizer(tokenizerJsonPath, { maxLength = 512 } = {}) {
-  const json = JSON.parse(readFileSync(tokenizerJsonPath, 'utf8'));
-  const model = json.model;
-  const pre = json.pre_tokenizer;
-  const template = json.post_processor;
-  if (model?.type !== 'Unigram') throw new UnsupportedTokenizerError(`unsupported model ${model?.type}`);
-  if (pre?.type !== 'Metaspace') throw new UnsupportedTokenizerError(`unsupported pre-tokenizer ${pre?.type}`);
-  if (template?.type !== 'TemplateProcessing') throw new UnsupportedTokenizerError(`unsupported post-processor ${template?.type}`);
-  const normalize = buildNormalizer(json.normalizer);
-
-  const n = model.vocab.length;
+// Packs the vocabulary into one string pool with typed-array scores and an
+// open-addressing index; `lookup(str, a, b)` returns the id of str[a, b) or -1.
+function buildVocabIndex(vocab) {
+  const n = vocab.length;
   const scores = new Float64Array(n);
   const offsets = new Int32Array(n + 1);
   const pieces = [];
@@ -77,7 +73,7 @@ export function loadUnigramTokenizer(tokenizerJsonPath, { maxLength = 512 } = {}
   let maxChars = 1;
   let minScore = Infinity;
   for (let i = 0; i < n; i++) {
-    const [piece, score] = model.vocab[i];
+    const [piece, score] = vocab[i];
     scores[i] = score;
     if (score < minScore) minScore = score;
     offsets[i] = length;
@@ -119,6 +115,21 @@ export function loadUnigramTokenizer(tokenizerJsonPath, { maxLength = 512 } = {}
       slot = (slot + 1) & mask;
     }
   };
+  return { scores, minScore, maxChars, lookup };
+}
+
+/** Loads tokenizer.json; throws UnsupportedTokenizerError for any other layout. */
+export function loadUnigramTokenizer(tokenizerJsonPath, { maxLength = 512 } = {}) {
+  const json = JSON.parse(readFileSync(tokenizerJsonPath, 'utf8'));
+  const model = json.model;
+  const pre = json.pre_tokenizer;
+  const template = json.post_processor;
+  if (model?.type !== 'Unigram') throw new UnsupportedTokenizerError(`unsupported model ${model?.type}`);
+  if (pre?.type !== 'Metaspace') throw new UnsupportedTokenizerError(`unsupported pre-tokenizer ${pre?.type}`);
+  if (template?.type !== 'TemplateProcessing')
+    throw new UnsupportedTokenizerError(`unsupported post-processor ${template?.type}`);
+  const normalize = buildNormalizer(json.normalizer);
+  const { scores, minScore, maxChars, lookup } = buildVocabIndex(model.vocab);
   const unkId = model.unk_id;
   const unkScore = minScore - 10;
   scores[unkId] = unkScore;
@@ -229,8 +240,11 @@ export function loadUnigramTokenizer(tokenizerJsonPath, { maxLength = 512 } = {}
       return stripAround(splitOn(normalizedAdded, normalized)).flatMap((sub) => {
         if (sub.length === 0) return [];
         if (added.has(sub)) return [sub];
-        let piece = sub.replaceAll(' ', strRep);
-        if (!piece.startsWith(replacement) && (prependScheme === 'always' || (prependScheme === 'first' && sectionIndex === 0))) {
+        let piece = sub.replaceAll(' ', () => strRep);
+        if (
+          !piece.startsWith(replacement) &&
+          (prependScheme === 'always' || (prependScheme === 'first' && sectionIndex === 0))
+        ) {
           piece = strRep + piece;
         }
         return fuseUnk(viterbi(piece));

package/src/runtime/memory/lib/runtime-fetcher.mjs

@@ -188,7 +188,7 @@ function runtimeAssetUrlCandidates(url) {
     .map((repo) => repo.trim())
     .filter(Boolean);
   for (const repo of overrides) {
-    if (repo && repo !== releaseRepo) add(value.replace(`/github.com/${releaseRepo}/`, `/github.com/${repo}/`));
+    if (repo && repo !== releaseRepo) add(value.replace(`/github.com/${releaseRepo}/`, () => `/github.com/${repo}/`));
   }
   return out;
 }

package/src/runtime/memory/lib/tool-call-handler.mjs

@@ -1,5 +1,6 @@
 import {
   capLineOrientedToolOutput,
+  capMarker,
   RECALL_OUTPUT_MAX_BYTES,
 } from '../../agent/orchestrator/tools/builtin/tool-output-limit.mjs';
 
@@ -8,11 +9,12 @@ import {
 // footer, so a huge multi-query/grouped browse cannot flood the caller's
 // context (42KB single-call observed before the cap).
 function capRecallText(text) {
-  return capLineOrientedToolOutput(
-    text,
-    RECALL_OUTPUT_MAX_BYTES,
-    (kept, lines) =>
-      `... [recall output capped at ${Math.round(RECALL_OUTPUT_MAX_BYTES / 1024)}KB after ${kept.length} of ${lines.length} lines; narrow query[]/category/period or page with the returned cursor]`
+  return capLineOrientedToolOutput(text, RECALL_OUTPUT_MAX_BYTES, (kept, lines) =>
+    capMarker({
+      limit: RECALL_OUTPUT_MAX_BYTES,
+      shown: `${kept.length} of ${lines.length} lines shown`,
+      narrow: 'narrow query[]/category/period, lower limit, or page with the cursor/offset shown in the results',
+    })
   );
 }
 

package/src/runtime/office/authoring/pptx-script-normalize.mjs

@@ -135,7 +135,9 @@ async function giveNotesMasterOwnTheme(zip) {
   await ensureContentTypeOverride(zip, `/${own}`, THEME_TYPE);
   zip.file(
     relsPath,
-    rels.replace(theme.tag, theme.tag.replace(/\bTarget="[^"]+"/, `Target="../theme/${posix.basename(own)}"`))
+    rels.replace(theme.tag, () =>
+      theme.tag.replace(/\bTarget="[^"]+"/, () => `Target="../theme/${posix.basename(own)}"`)
+    )
   );
   return true;
 }
@@ -269,8 +271,8 @@ export function normalizeChartFonts(xml) {
     const txPr = `<c:txPr><a:bodyPr/><a:lstStyle/><a:p><a:pPr><a:defRPr><a:latin typeface="${face}"/><a:ea typeface="${face}"/><a:cs typeface="${face}"/></a:defRPr></a:pPr><a:endParaRPr lang="en-US"/></a:p></c:txPr>`;
     // Schema order after </c:chart>: c:spPr?, c:txPr?, c:externalData?, …
     if (/<\/c:chart>\s*<c:spPr>[\s\S]*?<\/c:spPr>/.test(output))
-      output = output.replace(/(<\/c:chart>\s*<c:spPr>[\s\S]*?<\/c:spPr>)/, `$1${txPr}`);
-    else output = output.replace('</c:chart>', `</c:chart>${txPr}`);
+      output = output.replace(/(<\/c:chart>\s*<c:spPr>[\s\S]*?<\/c:spPr>)/, (__m, __1) => `${__1}${txPr}`);
+    else output = output.replace('</c:chart>', () => `</c:chart>${txPr}`);
     changed += 1;
   }
   return { xml: output, changed, face };
@@ -323,11 +325,11 @@ export function nativeGradients(xml) {
         // Schema order inside spPr: xfrm, geometry, fill, ln, effects — the fill is swapped in place and the
         // outline becomes none, so a gradient never shows a solid rim of its first stop.
         let inner = SHAPE_FILL.test(properties)
-          ? properties.replace(SHAPE_FILL, fill)
-          : properties.replace(/(<\/a:prstGeom>|<a:prstGeom\b[^>]*\/>|<\/a:custGeom>)/, `$1${fill}`);
+          ? properties.replace(SHAPE_FILL, () => fill)
+          : properties.replace(/(<\/a:prstGeom>|<a:prstGeom\b[^>]*\/>|<\/a:custGeom>)/, (__m, __1) => `${__1}${fill}`);
         inner = SHAPE_LINE.test(inner)
           ? inner.replace(SHAPE_LINE, '<a:ln><a:noFill/></a:ln>')
-          : inner.replace(fill, `${fill}<a:ln><a:noFill/></a:ln>`);
+          : inner.replace(fill, () => `${fill}<a:ln><a:noFill/></a:ln>`);
         return inner;
       });
   });
@@ -380,12 +382,13 @@ async function attachSvgIcons(zip, slidePart, xml) {
     const id = nextRelationshipId(relationships);
     relationships = relationships.replace(
       '</Relationships>',
-      `<Relationship Id="${id}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/${mediaName.split('/').pop()}"/></Relationships>`
+      () =>
+        `<Relationship Id="${id}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/${mediaName.split('/').pop()}"/></Relationships>`
     );
     const extension = `<a:extLst><a:ext uri="${SVG_EXTENSION_URI}"><asvg:svgBlip xmlns:asvg="${SVG_NAMESPACE}" r:embed="${id}"/></a:ext></a:extLst>`;
     const withSvg = blip.endsWith('/>')
       ? `${blip.slice(0, -2)}>${extension}</a:blip>`
-      : blip.replace('</a:blip>', `${extension}</a:blip>`);
+      : blip.replace('</a:blip>', () => `${extension}</a:blip>`);
     output = output.replace(picture, () =>
       picture.replace(blip, () => withSvg).replace(/(<p:cNvPr\b[^>]*\bname=)"[^"]*"/, '$1"Icon"')
     );

package/src/runtime/office/core/tabular.mjs

@@ -236,7 +236,7 @@ export async function applyTabularBatch(path, format, operations) {
           const before = String(row[column]);
           if (!find || !before.includes(find)) continue;
           count += before.split(find).length - 1;
-          row[column] = before.replaceAll(find, String(operation.replace ?? ''));
+          row[column] = before.replaceAll(find, () => String(operation.replace ?? ''));
         }
       }
       results.push({ op, changed: count > 0, count });

package/src/runtime/office/design/library/design-template-inspect.mjs

@@ -82,7 +82,10 @@ export async function pptxSlideEntries(zip) {
 
 function xmlSetAttribute(source, name, value) {
   const escaped = String(name).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  return String(source).replace(new RegExp(`(\\b${escaped}=")[^"]*(")`, 'i'), `$1${String(value)}$2`);
+  return String(source).replace(
+    new RegExp(`(\\b${escaped}=")[^"]*(")`, 'i'),
+    (__m, __1, __2) => `${__1}${String(value)}${__2}`
+  );
 }
 
 function relationshipType(block, suffix) {
@@ -93,7 +96,7 @@ function ensureContentTypeOverride(xml, partName, contentType) {
   if (!xml || new RegExp(`\\bPartName="${String(partName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}"`, 'i').test(xml)) {
     return xml;
   }
-  return xml.replace(/<\/Types>/i, `<Override PartName="${partName}" ContentType="${contentType}"/></Types>`);
+  return xml.replace(/<\/Types>/i, () => `<Override PartName="${partName}" ContentType="${contentType}"/></Types>`);
 }
 
 const RELATIONSHIP_BLOCK = /<(?:\w+:)?Relationship\b[^>]*\/?>/gi;
@@ -150,7 +153,7 @@ function presentationWithSlideList(presentationXml, relationshipIds) {
   if (!slideListMatch) throw new Error('PPTX presentation slide list is missing');
   const prefix = slideListMatch[1] || '';
   const slideIds = relationshipIds.map((id, index) => `<${prefix}sldId id="${256 + index}" r:id="${id}"/>`).join('');
-  return presentationXml.replace(slideListPattern, `<${prefix}sldIdLst>${slideIds}</${prefix}sldIdLst>`);
+  return presentationXml.replace(slideListPattern, () => `<${prefix}sldIdLst>${slideIds}</${prefix}sldIdLst>`);
 }
 
 function presentationRelationshipsWithSlides(relationshipsXml, relationshipIds) {
@@ -162,7 +165,7 @@ function presentationRelationshipsWithSlides(relationshipsXml, relationshipIds)
     .join('');
   return relationshipsXml
     .replace(RELATIONSHIP_BLOCK, (block) => (relationshipType(block, 'slide') ? '' : block))
-    .replace(/<\/Relationships>/i, `${slideRelationships}</Relationships>`);
+    .replace(/<\/Relationships>/i, () => `${slideRelationships}</Relationships>`);
 }
 
 // Writes one selected slide (and its notes) under its new ordinal, retargeting

package/src/runtime/office/portable/docx-formatting.mjs

@@ -73,7 +73,7 @@ export function patchParagraphFormat(xml, properties, numbering = null) {
 // opened in its place first, so the patch lands inside the schema's order rather than ahead of the style's name.
 function openStyleProperties(styleXml, tag) {
   if (new RegExp(`<w:${tag}(?:\\s[^>]*)?(?:/>|>)`).test(styleXml)) {
-    return styleXml.replace(new RegExp(`<w:${tag}(?:\\s[^>]*)?/>`), `<w:${tag}></w:${tag}>`);
+    return styleXml.replace(new RegExp(`<w:${tag}(?:\\s[^>]*)?/>`), () => `<w:${tag}></w:${tag}>`);
   }
   const before = tag === 'pPr' ? /<w:(?:rPr|tblPr|trPr|tcPr|tblStylePr)\b/ : /<w:(?:tblPr|trPr|tcPr|tblStylePr)\b/;
   const at = before.exec(styleXml)?.index ?? styleXml.lastIndexOf('</w:style>');

package/src/runtime/office/portable/docx-runs.mjs

@@ -205,7 +205,7 @@ function resolveDocxRowMarks(documentXml, { resolution = 'accept', author = '' }
       continue;
     }
     const clearedProperties = properties.replace(marker('del', author), '').replace(marker('ins', author), '');
-    xml = `${xml.slice(0, row.start)}${rowXml.replace(properties, clearedProperties)}${xml.slice(row.end)}`;
+    xml = `${xml.slice(0, row.start)}${rowXml.replace(properties, () => clearedProperties)}${xml.slice(row.end)}`;
     cleared += 1;
   }
   xml = xml.replace(

package/src/runtime/office/portable/docx-tracked-edits.mjs

@@ -12,8 +12,8 @@ export function trackedParagraphRewrite(paragraphXml, text, id, author) {
   const properties = /<w:r(?:\s[^>]*)?>\s*(<w:rPr(?:\s[^>]*)?>[\s\S]*?<\/w:rPr>)/.exec(paragraphXml)?.[1] || '';
   const deleted = markRunsDeleted(paragraphXml, id, author);
   const inserted = `<w:ins ${revisionAttributes(id + runCount, author)}><w:r>${properties}${wordTextContent(text, { preserve: true })}</w:r></w:ins>`;
-  if (/<\/w:p>\s*$/.test(deleted)) return deleted.replace(/<\/w:p>\s*$/, `${inserted}</w:p>`);
-  if (/\/>\s*$/.test(deleted)) return deleted.replace(/\/>\s*$/, `>${inserted}</w:p>`);
+  if (/<\/w:p>\s*$/.test(deleted)) return deleted.replace(/<\/w:p>\s*$/, () => `${inserted}</w:p>`);
+  if (/\/>\s*$/.test(deleted)) return deleted.replace(/\/>\s*$/, () => `>${inserted}</w:p>`);
   throw new Error('DOCX paragraph is malformed');
 }