severally-mcp 2.3.1 → 2.4.0

package/src/consultants.mjs

@@ -26,7 +26,11 @@ const table = (entries) => Object.freeze(Object.assign(Object.create(null), entr
 // deliberately absent: they name model families, and a Claude model hosted on
 // OpenCode should answer to "claude" too.
 export const CLI_ALIASES = table({
-  codex: 'codex', 'claude-code': 'claude-code', antigravity: 'antigravity', agy: 'antigravity', opencode: 'opencode',
+  codex: 'codex',
+  'claude-code': 'claude-code',
+  antigravity: 'antigravity',
+  agy: 'antigravity',
+  opencode: 'opencode',
 });
 
 // Names that mean "that vendor's consultants, on any CLI".
@@ -34,7 +38,12 @@ export const VENDOR_WORDS = table({ openai: 'openai', chatgpt: 'openai', anthrop
 
 // The lineage of a model, read off the first word of its stem.
 const STEM_VENDORS = table({
-  gpt: 'openai', claude: 'anthropic', gemini: 'google', glm: 'zai', deepseek: 'deepseek', nemotron: 'nvidia',
+  gpt: 'openai',
+  claude: 'anthropic',
+  gemini: 'google',
+  glm: 'zai',
+  deepseek: 'deepseek',
+  nemotron: 'nvidia',
 });
 
 // Built-in "higher first" orders, each used only inside one model family: an
@@ -53,13 +62,19 @@ export const RESERVED_NAMES = Object.freeze(['all']);
 /** Case, runs of spaces and underscores folded away: "Claude Code" -> "claude-code". */
 export function normalizeName(raw) {
   if (typeof raw !== 'string') return raw;
-  return raw.trim().toLowerCase().replace(/[\s_]+/g, '-');
+  return raw
+    .trim()
+    .toLowerCase()
+    .replace(/[\s_]+/g, '-');
 }
 
 /** "zai-coding-plan/glm-5.3" -> ["glm", "5", "3"]: the provider prefix is not part of the model. */
 export function modelWords(model) {
   const s = String(model ?? '').toLowerCase();
-  return s.slice(s.lastIndexOf('/') + 1).split(/[-._#:\s]+/).filter(Boolean);
+  return s
+    .slice(s.lastIndexOf('/') + 1)
+    .split(/[-._#:\s]+/)
+    .filter(Boolean);
 }
 
 const isDigitWord = (w) => /^v?\d+$/.test(w);
@@ -89,8 +104,7 @@ export function vendorOf(model, explicit = null) {
   return STEM_VENDORS[first] ?? null;
 }
 
-const containsRun = (hay, needle) => needle.length > 0
-  && hay.some((_, i) => needle.every((w, j) => hay[i + j] === w));
+const containsRun = (hay, needle) => needle.length > 0 && hay.some((_, i) => needle.every((w, j) => hay[i + j] === w));
 
 /** Does the name appear in the model id as whole words? "claude opus" in "claude-opus-5-5": yes; "g" in "gpt-6": no. */
 export function matchesWords(model, wanted) {
@@ -221,7 +235,10 @@ export function buildConsultants(config) {
   const global = [];
   const broken = {};
   const brokenClis = {};
-  const fault = (msg) => { problems.push(msg); global.push(msg); };
+  const fault = (msg) => {
+    problems.push(msg);
+    global.push(msg);
+  };
   const cfg = isObject(config) ? config : {};
   if (!isObject(config)) fault('the config file must hold a JSON object');
   for (const key of Object.keys(cfg)) {
@@ -236,7 +253,8 @@ export function buildConsultants(config) {
 
   let ranking = [];
   if (cfg.ranking !== undefined) {
-    if (Array.isArray(cfg.ranking) && cfg.ranking.every((r) => typeof r === 'string' && r.trim() !== '')) ranking = cfg.ranking.map((r) => r.trim());
+    if (Array.isArray(cfg.ranking) && cfg.ranking.every((r) => typeof r === 'string' && r.trim() !== ''))
+      ranking = cfg.ranking.map((r) => r.trim());
     else fault('ranking must be an array of non-empty strings');
   }
 
@@ -244,19 +262,32 @@ export function buildConsultants(config) {
     if (!isObject(cfg.clis)) fault('clis must be an object keyed by CLI');
     else {
       for (const [id, def] of Object.entries(cfg.clis)) {
-        if (!CLI_IDS.includes(id)) { problems.push(`clis.${id}: unknown CLI (known: ${CLI_IDS.join(', ')})`); continue; }
+        if (!CLI_IDS.includes(id)) {
+          problems.push(`clis.${id}: unknown CLI (known: ${CLI_IDS.join(', ')})`);
+          continue;
+        }
         const before = problems.length;
-        if (!isObject(def)) { problems.push(`clis.${id} must be an object`); brokenClis[id] = problems.slice(before); continue; }
-        for (const k of Object.keys(def)) if (!CLI_KEYS.includes(k)) problems.push(`clis.${id}.${k}: unknown key (allowed: ${CLI_KEYS.join(', ')})`);
+        if (!isObject(def)) {
+          problems.push(`clis.${id} must be an object`);
+          brokenClis[id] = problems.slice(before);
+          continue;
+        }
+        for (const k of Object.keys(def))
+          if (!CLI_KEYS.includes(k)) problems.push(`clis.${id}.${k}: unknown key (allowed: ${CLI_KEYS.join(', ')})`);
         // A wrong type must not fall back to a default: enabled: "false"
         // read as "unset" would turn on the CLI the operator meant to stop.
-        if (def.enabled !== undefined && typeof def.enabled !== 'boolean') problems.push(`clis.${id}.enabled: must be true or false`);
-        for (const k of ['bin', 'note']) if (def[k] !== undefined && typeof def[k] !== 'string') problems.push(`clis.${id}.${k}: must be a string`);
-        if (def.args !== undefined && !(Array.isArray(def.args) && def.args.every((a) => typeof a === 'string'))) problems.push(`clis.${id}.args: must be an array of strings`);
-        if (def.env !== undefined && !(isObject(def.env) && Object.values(def.env).every((v) => typeof v === 'string'))) problems.push(`clis.${id}.env: must be an object of strings`);
+        if (def.enabled !== undefined && typeof def.enabled !== 'boolean')
+          problems.push(`clis.${id}.enabled: must be true or false`);
+        for (const k of ['bin', 'note'])
+          if (def[k] !== undefined && typeof def[k] !== 'string') problems.push(`clis.${id}.${k}: must be a string`);
+        if (def.args !== undefined && !(Array.isArray(def.args) && def.args.every((a) => typeof a === 'string')))
+          problems.push(`clis.${id}.args: must be an array of strings`);
+        if (def.env !== undefined && !(isObject(def.env) && Object.values(def.env).every((v) => typeof v === 'string')))
+          problems.push(`clis.${id}.env: must be an object of strings`);
         if (def.provider !== undefined) {
           if (id !== 'opencode') problems.push(`clis.${id}.provider: only OpenCode takes provider definitions`);
-          else if (!(isObject(def.provider) && Object.values(def.provider).every(isObject))) problems.push(`clis.${id}.provider: must be an object of provider objects, as in opencode.json`);
+          else if (!(isObject(def.provider) && Object.values(def.provider).every(isObject)))
+            problems.push(`clis.${id}.provider: must be an object of provider objects, as in opencode.json`);
         }
         if (problems.length > before) brokenClis[id] = problems.slice(before);
       }
@@ -272,11 +303,22 @@ export function buildConsultants(config) {
     const seen = new Map();
     for (const [name, def] of Object.entries(cfg.consultants)) {
       const at = `consultants.${name}`;
-      if (!/^[a-z0-9][a-z0-9.-]{0,63}$/.test(name)) { problems.push(`${at}: a name is lower-case letters, digits, "." and "-", at most 64 characters`); continue; }
-      if (RESERVED_NAMES.includes(name)) { problems.push(`${at}: "${name}" is reserved`); continue; }
+      if (!/^[a-z0-9][a-z0-9.-]{0,63}$/.test(name)) {
+        problems.push(`${at}: a name is lower-case letters, digits, "." and "-", at most 64 characters`);
+        continue;
+      }
+      if (RESERVED_NAMES.includes(name)) {
+        problems.push(`${at}: "${name}" is reserved`);
+        continue;
+      }
       const before = problems.length;
-      if (!isObject(def)) { problems.push(`${at} must be an object`); broken[name] = problems.slice(before); continue; }
-      for (const k of Object.keys(def)) if (!CONSULTANT_KEYS.includes(k)) problems.push(`${at}.${k}: unknown key (allowed: ${CONSULTANT_KEYS.join(', ')})`);
+      if (!isObject(def)) {
+        problems.push(`${at} must be an object`);
+        broken[name] = problems.slice(before);
+        continue;
+      }
+      for (const k of Object.keys(def))
+        if (!CONSULTANT_KEYS.includes(k)) problems.push(`${at}.${k}: unknown key (allowed: ${CONSULTANT_KEYS.join(', ')})`);
       if (!CLI_IDS.includes(def.cli)) problems.push(`${at}.cli: must be one of ${CLI_IDS.join(', ')}`);
       if (typeof def.model !== 'string' || def.model.trim() === '') problems.push(`${at}.model: required`);
       for (const k of ['effort', 'vendor', 'note']) {
@@ -284,12 +326,18 @@ export function buildConsultants(config) {
       }
       if (def.enabled !== undefined && typeof def.enabled !== 'boolean') problems.push(`${at}.enabled: must be true or false`);
       for (const k of ['timeout_ms', 'max_budget_usd']) {
-        if (def[k] !== undefined && !(typeof def[k] === 'number' && Number.isFinite(def[k]))) problems.push(`${at}.${k}: must be a number`);
+        if (def[k] !== undefined && !(typeof def[k] === 'number' && Number.isFinite(def[k])))
+          problems.push(`${at}.${k}: must be a number`);
       }
-      if (def.max_budget_usd !== undefined && def.cli !== 'claude-code') problems.push(`${at}.max_budget_usd: only a claude-code consultant has a budget`);
+      if (def.max_budget_usd !== undefined && def.cli !== 'claude-code')
+        problems.push(`${at}.max_budget_usd: only a claude-code consultant has a budget`);
       // agy takes the effort from the model name and rejects --effort.
-      if (def.effort !== undefined && def.cli === 'antigravity') problems.push(`${at}.effort: Antigravity takes the effort from the model name (e.g. gemini-3.8-flash-low)`);
-      if (problems.length > before) { broken[name] = problems.slice(before); continue; }
+      if (def.effort !== undefined && def.cli === 'antigravity')
+        problems.push(`${at}.effort: Antigravity takes the effort from the model name (e.g. gemini-3.8-flash-low)`);
+      if (problems.length > before) {
+        broken[name] = problems.slice(before);
+        continue;
+      }
       const pair = `${def.cli}\n${def.model.trim()}`;
       if (seen.has(pair)) {
         problems.push(`${at}: same cli and model as consultants.${seen.get(pair)}; asking one model twice adds no independence`);

package/src/export.mjs

@@ -24,13 +24,21 @@ export class ExportError extends Error {
 const historyDir = () => path.join(POLICY.home, 'history');
 
 function readJson(p) {
-  try { return JSON.parse(fs.readFileSync(p, 'utf8')); } catch { return null; }
+  try {
+    return JSON.parse(fs.readFileSync(p, 'utf8'));
+  } catch {
+    return null;
+  }
 }
 
 function roundsOf(chainId) {
   const dir = path.join(historyDir(), chainId);
   let names = [];
-  try { names = fs.readdirSync(dir); } catch { return []; }
+  try {
+    names = fs.readdirSync(dir);
+  } catch {
+    return [];
+  }
   return names
     .filter((n) => /^round-\d+\.json$/.test(n))
     .sort()
@@ -51,7 +59,9 @@ function chainsOfGroup(groupId) {
       const row = JSON.parse(line);
       byJob.set(row.job_id, row.chain_id);
     }
-  } catch { /* an unreadable index leaves the group unresolvable, handled below */ }
+  } catch {
+    /* an unreadable index leaves the group unresolvable, handled below */
+  }
   const chains = [];
   for (const jobId of group.job_ids ?? []) {
     const chainId = byJob.get(jobId);
@@ -80,11 +90,23 @@ function briefSection(brief) {
     out.push('');
   };
   block('Objective', brief.objective);
-  block('Success criteria', bullets(brief.success_criteria, (c) => `- ${c}`));
-  block('Constraints', bullets(brief.constraints, (c) => `- ${c}`));
-  block('Facts as given', bullets(brief.facts, (f) => `- ${f}`));
+  block(
+    'Success criteria',
+    bullets(brief.success_criteria, (c) => `- ${c}`),
+  );
+  block(
+    'Constraints',
+    bullets(brief.constraints, (c) => `- ${c}`),
+  );
+  block(
+    'Facts as given',
+    bullets(brief.facts, (f) => `- ${f}`),
+  );
   block('Proposal', brief.proposal);
-  block('Opposing claims', bullets(brief.counterpoints, (c) => `- ${c}`));
+  block(
+    'Opposing claims',
+    bullets(brief.counterpoints, (c) => `- ${c}`),
+  );
   for (const a of brief.artifacts ?? []) {
     out.push(`**Material: ${a.name}** (${[a.kind, a.language, a.source].filter(Boolean).join(', ')})`, '');
     out.push(...fence(a.excerpt, a.language));
@@ -98,15 +120,21 @@ function briefSection(brief) {
   if (exposed?.entries?.length || exposed?.skipped?.length) {
     out.push('**Files exposed to the consultant**', '');
     for (const e of exposed.entries) {
-      const since = e.changed_since_parent === undefined ? '' : e.changed_since_parent ? ', changed since the earlier round' : ', unchanged since the earlier round';
+      const since =
+        e.changed_since_parent === undefined
+          ? ''
+          : e.changed_since_parent
+            ? ', changed since the earlier round'
+            : ', unchanged since the earlier round';
       out.push(`- ${e.exposed_as} (${e.kind}, ${e.files} file(s), ${humanSize(e.bytes)}${since}) -- from ${e.source}`);
     }
     const count = (reason) => (exposed.skipped ?? []).filter((x) => x.reason === reason).length;
     if (count('symlink')) out.push(`- ${count('symlink')} symlink(s) inside those directories were skipped, not followed`);
     if (count('protected')) out.push(`- ${count('protected')} credential or history path(s) were left out on purpose`);
     if (count('gone')) out.push(`- ${count('gone')} path(s) from the earlier round no longer existed and were not copied again`);
-    if (count('masked')) out.push(`- ${count('masked')} path(s) from the earlier round were masked in its record and were not copied again`);
-    if (count('replaced')) out.push('- the earlier round\'s change was replaced by the diff given in this round');
+    if (count('masked'))
+      out.push(`- ${count('masked')} path(s) from the earlier round were masked in its record and were not copied again`);
+    if (count('replaced')) out.push("- the earlier round's change was replaced by the diff given in this round");
     out.push('');
   }
   return out;
@@ -209,7 +237,9 @@ function roundSection(round, previousBrief) {
   ];
   if (round.result) {
     head.push(`- stance as declared: ${round.result.stance ?? 'not declared'}`);
-    head.push(`- the consultant's own confidence: ${round.result.confidence ?? 'not declared'}, evidence basis: ${round.result.evidence_basis ?? 'not declared'}`);
+    head.push(
+      `- the consultant's own confidence: ${round.result.confidence ?? 'not declared'}, evidence basis: ${round.result.evidence_basis ?? 'not declared'}`,
+    );
   }
   head.push('');
   head.push('### Question', '', round.question, '');
@@ -273,5 +303,12 @@ export function exportChain({ chain_id: chainId, group_id: groupId } = {}) {
       if (round.brief) previousBrief = round.brief;
     }
   }
-  return { markdown: `${lines.join('\n').replace(/\n{3,}/g, '\n\n').trimEnd()}\n`, rounds: total, chain_ids: chainIds };
+  return {
+    markdown: `${lines
+      .join('\n')
+      .replace(/\n{3,}/g, '\n\n')
+      .trimEnd()}\n`,
+    rounds: total,
+    chain_ids: chainIds,
+  };
 }

package/src/expose-paths.mjs

@@ -57,15 +57,15 @@ function ensureRoom(totals, size) {
 function checkBudget(totals) {
   if (totals.files > POLICY.input.exposeFilesMax) {
     throw new ExposeError(
-      `expose_paths reaches more than ${POLICY.input.exposeFilesMax} files, over the file cap; name the files or `
-      + 'the subdirectory that actually matters instead of the tree above them',
+      `expose_paths reaches more than ${POLICY.input.exposeFilesMax} files, over the file cap; name the files or ` +
+        'the subdirectory that actually matters instead of the tree above them',
       'too_large',
     );
   }
   if (totals.bytes > POLICY.input.exposeBytesMax) {
     throw new ExposeError(
-      `expose_paths reaches more than ${humanSize(POLICY.input.exposeBytesMax)}, over the size cap; name the files `
-      + 'or the subdirectory that actually matters instead of the tree above them',
+      `expose_paths reaches more than ${humanSize(POLICY.input.exposeBytesMax)}, over the size cap; name the files ` +
+        'or the subdirectory that actually matters instead of the tree above them',
       'too_large',
     );
   }
@@ -158,7 +158,9 @@ function walkGit(dir, exposedAs, onFile, totals, skipped) {
   try {
     listed = [...new Set(nulSplit(git(dir, ['ls-files', '-z', '--cached', '--others', '--exclude-standard'])))];
     ignored = nulSplit(git(dir, ['ls-files', '-z', '--others', '--ignored', '--exclude-standard', '--directory']));
-  } catch { return false; }
+  } catch {
+    return false;
+  }
   if (listed.length === 0) return false;
   for (const p of ignored) skipped.push({ source: path.join(dir, p), reason: 'ignored' });
   if (fs.existsSync(path.join(dir, '.git'))) skipped.push({ source: path.join(dir, '.git'), reason: 'ignored' });
@@ -169,21 +171,43 @@ function walkGit(dir, exposedAs, onFile, totals, skipped) {
     // walkDir never enters a protected directory (.env.d/, .ssh/ ...); a
     // listed file is checked with each directory above it for the same reason.
     const parts = rel.split('/');
-    const guarded = parts.slice(0, -1).map((_, i) => path.join(dir, ...parts.slice(0, i + 1))).find(isProtectedPath);
+    const guarded = parts
+      .slice(0, -1)
+      .map((_, i) => path.join(dir, ...parts.slice(0, i + 1)))
+      .find(isProtectedPath);
     if (guarded) {
       if (!protectedDirs.has(guarded)) skipped.push({ source: guarded, reason: 'protected' });
       protectedDirs.add(guarded);
       continue;
     }
-    if (isProtectedPath(abs)) { skipped.push({ source: abs, reason: 'protected' }); continue; }
+    if (isProtectedPath(abs)) {
+      skipped.push({ source: abs, reason: 'protected' });
+      continue;
+    }
     let stat;
     // Deleted in the work tree but still in the index: not part of the tree
     // as it is now, so not part of the copy either.
-    try { stat = fs.lstatSync(abs); } catch { continue; }
+    try {
+      stat = fs.lstatSync(abs);
+    } catch {
+      continue;
+    }
     // A directory here is a submodule (or a nested repository): its own history, not this one's files.
-    if (stat.isDirectory()) { skipped.push({ source: abs, reason: 'submodule' }); continue; }
-    const inside = (() => { try { return fs.realpathSync(abs).startsWith(realDir + path.sep); } catch { return false; } })();
-    if (stat.isSymbolicLink() || !inside) { skipped.push({ source: abs, reason: 'symlink' }); continue; }
+    if (stat.isDirectory()) {
+      skipped.push({ source: abs, reason: 'submodule' });
+      continue;
+    }
+    const inside = (() => {
+      try {
+        return fs.realpathSync(abs).startsWith(realDir + path.sep);
+      } catch {
+        return false;
+      }
+    })();
+    if (stat.isSymbolicLink() || !inside) {
+      skipped.push({ source: abs, reason: 'symlink' });
+      continue;
+    }
     if (!stat.isFile()) continue;
     onFile(abs, path.normalize(rel));
     checkBudget(totals);
@@ -304,18 +328,41 @@ function copyRepoFiles(workdir, top, changes, manifest, shown, gone = null) {
   const copied = [];
   for (const c of changes) {
     const abs = path.join(top, c.path);
-    if (isProtectedPath(abs)) { manifest.skipped.push({ source: abs, reason: 'protected' }); continue; }
-    if (c.status === 'D') { shown(c); continue; }
+    if (isProtectedPath(abs)) {
+      manifest.skipped.push({ source: abs, reason: 'protected' });
+      continue;
+    }
+    if (c.status === 'D') {
+      shown(c);
+      continue;
+    }
     let stat;
     // When `gone` is given, the paths are an earlier round's, and a skipped
     // one carries the name it had there.
     const named = gone ? { exposed_as: `workspace/repo/${c.path}` } : {};
-    try { stat = fs.lstatSync(abs); } catch { gone?.(c); continue; }
+    try {
+      stat = fs.lstatSync(abs);
+    } catch {
+      gone?.(c);
+      continue;
+    }
     // A directory on the way that is now a link out of the repository.
-    const inside = (() => { try { return fs.realpathSync(abs).startsWith(realTop + path.sep); } catch { return false; } })();
-    if (stat.isSymbolicLink() || !inside) { manifest.skipped.push({ source: abs, reason: 'symlink', ...named }); continue; }
+    const inside = (() => {
+      try {
+        return fs.realpathSync(abs).startsWith(realTop + path.sep);
+      } catch {
+        return false;
+      }
+    })();
+    if (stat.isSymbolicLink() || !inside) {
+      manifest.skipped.push({ source: abs, reason: 'symlink', ...named });
+      continue;
+    }
     // A submodule: its commit line stays in the diff, nothing to copy.
-    if (!stat.isFile()) { shown(c); continue; }
+    if (!stat.isFile()) {
+      shown(c);
+      continue;
+    }
     shown(c);
     copied.push({ path: c.path, size: stat.size });
   }
@@ -346,19 +393,38 @@ export function planInheritance(parentEntries, exposePaths) {
   const paths = [];
   const skipped = [];
   const diffs = [];
-  const exists = (p) => { try { fs.lstatSync(p); return true; } catch { return false; } };
+  const exists = (p) => {
+    try {
+      fs.lstatSync(p);
+      return true;
+    } catch {
+      return false;
+    }
+  };
   for (const e of parentEntries) {
-    if (String(e.source).includes('[REDACTED')) { skipped.push({ source: e.source, reason: 'masked', exposed_as: e.exposed_as }); continue; }
-    if (!exists(e.source)) { skipped.push({ source: e.source, reason: 'gone', exposed_as: e.exposed_as }); continue; }
-    if (e.kind === 'diff' || e.kind === 'change_files') { diffs.push(e); continue; }
+    if (String(e.source).includes('[REDACTED')) {
+      skipped.push({ source: e.source, reason: 'masked', exposed_as: e.exposed_as });
+      continue;
+    }
+    if (!exists(e.source)) {
+      skipped.push({ source: e.source, reason: 'gone', exposed_as: e.exposed_as });
+      continue;
+    }
+    if (e.kind === 'diff' || e.kind === 'change_files') {
+      diffs.push(e);
+      continue;
+    }
     paths.push({ source: e.source, index: e.index });
   }
   // New paths are numbered after every name the earlier round used.
   let next = parentEntries.reduce((n, e) => Math.max(n, e.index + 1), 0);
   for (const p of exposePaths) if (!paths.some((x) => x.source === p)) paths.push({ source: p, index: next++ });
   if (paths.length > POLICY.input.exposePathsMax) {
-    throw new ExposeError(`expose_from_parent and expose_paths together name ${paths.length} entries, over the cap of `
-      + `${POLICY.input.exposePathsMax}; name fewer new paths`, 'too_large');
+    throw new ExposeError(
+      `expose_from_parent and expose_paths together name ${paths.length} entries, over the cap of ` +
+        `${POLICY.input.exposePathsMax}; name fewer new paths`,
+      'too_large',
+    );
   }
   return { paths, skipped, diffs };
 }
@@ -373,21 +439,41 @@ export function reexposeChange(workdir, entry, manifest) {
   for (const c of entry.changes ?? []) {
     const m = /^(.*) \(([^()]+)\)$/.exec(c);
     const p = m ? m[1] : c;
-    if (p.includes('[REDACTED')) { manifest.skipped.push({ source: path.join(entry.source, p), reason: 'masked', exposed_as: `workspace/repo/${p}` }); continue; }
+    if (p.includes('[REDACTED')) {
+      manifest.skipped.push({ source: path.join(entry.source, p), reason: 'masked', exposed_as: `workspace/repo/${p}` });
+      continue;
+    }
     // A file the change deleted that is back now is copied as it is.
     const deleted = m?.[2] === 'deleted';
     let back = false;
-    if (deleted) try { fs.lstatSync(path.join(entry.source, p)); back = true; } catch { /* still deleted */ }
+    if (deleted)
+      try {
+        fs.lstatSync(path.join(entry.source, p));
+        back = true;
+      } catch {
+        /* still deleted */
+      }
     changes.push({ path: p, status: deleted ? (back ? 'restored' : 'D') : (m?.[2] ?? 'M') });
   }
   const before = { ...manifest.totals };
   const shown = [];
-  const { copied, sha256 } = copyRepoFiles(workdir, entry.source, changes, manifest, (c) => shown.push(c),
-    (c) => manifest.skipped.push({ source: path.join(entry.source, c.path), reason: 'gone', exposed_as: `workspace/repo/${c.path}` }));
+  const { copied, sha256 } = copyRepoFiles(
+    workdir,
+    entry.source,
+    changes,
+    manifest,
+    (c) => shown.push(c),
+    (c) =>
+      manifest.skipped.push({ source: path.join(entry.source, c.path), reason: 'gone', exposed_as: `workspace/repo/${c.path}` }),
+  );
   // Nothing of the change is left to show: no entry, so a follow-up with
   // nothing else to go on is refused rather than sent with an empty copy.
   if (shown.length === 0) {
-    try { fs.rmdirSync(path.join(workdir, 'workspace', 'repo')); } catch { /* holds another entry's files */ }
+    try {
+      fs.rmdirSync(path.join(workdir, 'workspace', 'repo'));
+    } catch {
+      /* holds another entry's files */
+    }
     return false;
   }
   manifest.entries.push({
@@ -415,10 +501,16 @@ function git(cwd, args) {
   // at another repository), and without taking the lead's index lock.
   const env = Object.fromEntries(Object.entries(process.env).filter(([k]) => !k.toUpperCase().startsWith('GIT_')));
   const r = spawnSync('git', ['--literal-pathspecs', '-c', 'core.fsmonitor=', '-C', cwd, ...args], {
-    timeout: 20_000, maxBuffer: 64 * 1024 * 1024, windowsHide: true, env: { ...env, GIT_OPTIONAL_LOCKS: '0' },
+    timeout: 20_000,
+    maxBuffer: 64 * 1024 * 1024,
+    windowsHide: true,
+    env: { ...env, GIT_OPTIONAL_LOCKS: '0' },
   });
   if (r.error || r.status !== 0) {
-    const why = r.error?.code === 'ENOENT' ? 'git is not on PATH' : String(r.stderr ?? r.error?.message ?? '').trim();
+    const why =
+      /** @type {NodeJS.ErrnoException} */ (r.error)?.code === 'ENOENT'
+        ? 'git is not on PATH'
+        : String(r.stderr ?? r.error?.message ?? '').trim();
     throw new ExposeError(`context.expose_diff: git ${args[0]} failed in "${cwd}": ${why}`, 'not_found');
   }
   return r.stdout;
@@ -437,18 +529,23 @@ const nulSplit = (buf) => buf.toString('utf8').split('\0').filter(Boolean);
 export function exposeDiff(workdir, { repo, base = 'HEAD' }, manifest, maxChars) {
   const top = git(repo, ['rev-parse', '--show-toplevel']).toString('utf8').trim();
   git(top, ['rev-parse', '--verify', `${base}^{commit}`]);
-  const tokens = nulSplit(git(top, ['diff', '--name-status', '-z', '--no-renames', '--no-relative', '--no-ext-diff',
-    '--no-textconv', base, '--']));
+  const tokens = nulSplit(
+    git(top, ['diff', '--name-status', '-z', '--no-renames', '--no-relative', '--no-ext-diff', '--no-textconv', base, '--']),
+  );
   const changes = [];
   for (let i = 0; i + 1 < tokens.length; i += 2) changes.push({ status: tokens[i], path: tokens[i + 1] });
-  for (const p of nulSplit(git(top, ['ls-files', '--others', '--exclude-standard', '-z']))) changes.push({ status: 'untracked', path: p });
+  for (const p of nulSplit(git(top, ['ls-files', '--others', '--exclude-standard', '-z'])))
+    changes.push({ status: 'untracked', path: p });
 
   const before = { ...manifest.totals };
   const shown = [];
   const { copied, sha256 } = copyRepoFiles(workdir, top, changes, manifest, (c) => shown.push(c));
   if (shown.length === 0) {
-    throw new ExposeError(`context.expose_diff: no change against ${base} to show`
-      + (changes.length ? ' (every changed file is a protected path)' : ''), 'not_found');
+    throw new ExposeError(
+      `context.expose_diff: no change against ${base} to show` +
+        (changes.length ? ' (every changed file is a protected path)' : ''),
+      'not_found',
+    );
   }
   manifest.entries.push({
     index: manifest.entries.reduce((n, e) => Math.max(n, e.index + 1), 0),
@@ -461,7 +558,9 @@ export function exposeDiff(workdir, { repo, base = 'HEAD' }, manifest, maxChars)
     // The copies, as paths a consultant can open; the change itself, with
     // what happened to each path, is listed apart.
     paths: copied,
-    changes: shown.map((c) => `${c.path} (${c.status === 'untracked' ? 'untracked' : c.status === 'D' ? 'deleted' : c.status})`).sort(),
+    changes: shown
+      .map((c) => `${c.path} (${c.status === 'untracked' ? 'untracked' : c.status === 'D' ? 'deleted' : c.status})`)
+      .sort(),
     sha256,
   });
 
@@ -474,18 +573,37 @@ export function exposeDiff(workdir, { repo, base = 'HEAD' }, manifest, maxChars)
   // without its old content.
   const tracked = new Set(shown.filter((c) => c.status !== 'untracked').map((c) => c.path));
   const full = tracked.size
-    ? git(top, ['diff', '--no-ext-diff', '--no-textconv', '--no-color', '--src-prefix=a/', '--dst-prefix=b/',
-      '--no-relative', '--submodule=short', '--irreversible-delete', base, '--']).toString('utf8')
+    ? git(top, [
+        'diff',
+        '--no-ext-diff',
+        '--no-textconv',
+        '--no-color',
+        '--src-prefix=a/',
+        '--dst-prefix=b/',
+        '--no-relative',
+        '--submodule=short',
+        '--irreversible-delete',
+        base,
+        '--',
+      ]).toString('utf8')
     : '';
   // A section whose header names no shown path (a protected one, or one git
   // had to quote) is dropped rather than guessed at.
-  let text = redact(full.split(/^(?=diff --git )/m).filter((sec) => {
-    const rest = sec.slice('diff --git '.length, sec.indexOf('\n'));
-    const p = rest.slice(2, 2 + (rest.length - 1) / 2 - 2);
-    return tracked.has(p) && rest === `a/${p} b/${p}`;
-  }).join(''));
+  let text = redact(
+    full
+      .split(/^(?=diff --git )/m)
+      .filter((sec) => {
+        const rest = sec.slice('diff --git '.length, sec.indexOf('\n'));
+        const p = rest.slice(2, 2 + (rest.length - 1) / 2 - 2);
+        return tracked.has(p) && rest === `a/${p} b/${p}`;
+      })
+      .join(''),
+  );
   if (text.length > maxChars) {
-    text = maxChars < 500 ? '' : `${text.slice(0, maxChars - 200)}\n... [diff cut by severally: ${text.length} characters in all; every changed file is under workspace/repo/]`;
+    text =
+      maxChars < 500
+        ? ''
+        : `${text.slice(0, maxChars - 200)}\n... [diff cut by severally: ${text.length} characters in all; every changed file is under workspace/repo/]`;
   }
   return text;
 }