sprag-cli 3.56.0 → 3.57.0

package/src/doc2md.cjs

@@ -307,13 +307,19 @@ function managedPython() {
     : path.join(dir, 'bin', 'python');
 }
 
-const MARKITDOWN_SPEC = 'markitdown[pptx,pdf,xlsx,docx]';
+// Each spec carries an upper bound at the next major line. An open spec takes
+// whatever is newest on the day someone first opens a document, so a breaking
+// release (or a bad one) would reach every new machine with nothing in this
+// repository having changed. The bounds are the lines verified here:
+// markitdown 0.1.7, python-pptx 1.0.2, python-docx 1.2.0, openpyxl 3.1.5.
+// pip gets them as plain argv, with no shell in between, so `<` is safe.
+const MARKITDOWN_SPEC = 'markitdown[pptx,pdf,xlsx,docx]>=0.1,<0.2';
 
 // Editing libraries, installed alongside the converter. Reading is doc2md's
 // own job; editing is the agent's, done per-request with a short script
 // against a COPY of the document. These are the libraries those scripts need,
 // pre-installed so "swap the chart on slide 23" does not stall on pip.
-const EDIT_LIBS = ['python-pptx', 'python-docx', 'openpyxl'];
+const EDIT_LIBS = ['python-pptx>=1.0,<2', 'python-docx>=1.1,<2', 'openpyxl>=3.1,<4'];
 
 /**
  * Build the managed venv and install markitdown into it.
@@ -999,15 +1005,22 @@ function decideForWrite(context, opts = {}) {
   return null;
 }
 
-/** The decision rendered as the JSON Claude Code expects on stdout. */
+/**
+ * The decision rendered as the JSON Claude Code expects on stdout.
+ *
+ * Only a refusal answers the permission question. A note about a document
+ * that could not be converted says nothing about whether the read should be
+ * allowed, and answering `allow` for it approved the call without the prompt
+ * the user would otherwise have seen, sensitive-pattern files included. The
+ * note goes out as context instead, which is also the only form that reaches
+ * the model: an `allow` reason is shown to the user alone.
+ */
 function formatHookOutput(decision) {
   if (!decision) return null;
   return JSON.stringify({
-    hookSpecificOutput: {
-      hookEventName: 'PreToolUse',
-      permissionDecision: decision.deny ? 'deny' : 'allow',
-      permissionDecisionReason: decision.reason,
-    },
+    hookSpecificOutput: decision.deny
+      ? { hookEventName: 'PreToolUse', permissionDecision: 'deny', permissionDecisionReason: decision.reason }
+      : { hookEventName: 'PreToolUse', additionalContext: decision.reason },
   });
 }
 
@@ -1016,6 +1029,7 @@ module.exports = {
   MAX_SOURCE_BYTES,
   INSTALL_HINT,
   MARKITDOWN_SPEC,
+  EDIT_LIBS,
   managedPython,
   installConverter,
   ensureConverterInstalled,

package/src/fig2md.cjs

@@ -32,6 +32,11 @@ const { spawnSync } = require('node:child_process');
 // cmd.exe, where `^` is the escape character and would be eaten before npm
 // ever saw it. The range is the same one caret means for a 0.x package.
 const FIG_PARSER_SPEC = 'openfig-core@0.4.x';
+// `--ignore-scripts`: the parser and its three dependencies are plain
+// JavaScript and ship no install script, so nothing is lost, and a release of
+// any of them that adds one cannot run code on the machine of someone who only
+// opened a .fig file.
+const FIG_INSTALL_ARGS = ['install', '--no-audit', '--no-fund', '--silent', '--ignore-scripts', FIG_PARSER_SPEC];
 
 /** Where the on-demand parser install lives, under the tool's state dir. */
 function managedFigDir(userDataDir) {
@@ -63,7 +68,7 @@ function installFigParser(userDataDir, { onProgress = () => {} } = {}) {
   // needs the shell. Elsewhere the shell is avoided, since the package spec
   // would then go through shell quoting for no benefit.
   const isWindows = process.platform === 'win32';
-  const r = spawnSync(isWindows ? 'npm.cmd' : 'npm', ['install', '--no-audit', '--no-fund', '--silent', FIG_PARSER_SPEC], {
+  const r = spawnSync(isWindows ? 'npm.cmd' : 'npm', FIG_INSTALL_ARGS, {
     cwd: dir,
     encoding: 'utf8',
     timeout: 300_000,
@@ -184,6 +189,7 @@ async function convertFig(filePath, userDataDir) {
 
 module.exports = {
   FIG_PARSER_SPEC,
+  FIG_INSTALL_ARGS,
   managedFigDir,
   installFigParser,
   convertFig,

package/src/formatters/statusline.js

@@ -304,9 +304,9 @@ function buildVersionSeg(version, update, c, isIcon, verbose, g) {
  * fallback line. Best-effort: never throws into the statusline (corrupted
  * CLAUDE.md, permission issue, etc. → null).
  */
-function buildHarnessSeg(c, isIcon, g) {
+function buildHarnessSeg(c, isIcon, g, liveWindow = null) {
   try {
-    const harnessInfo = harnessStatusForStatusline(loadConfig());
+    const harnessInfo = harnessStatusForStatusline(loadConfig(), { liveWindow });
     if (!harnessInfo) return null;
     const icon = isIcon ? g.harness : 'H';
     if (harnessInfo.warning) {
@@ -491,7 +491,7 @@ export function formatReport(data, { color = true, verbose = false, timer = true
 
   // Delegation savings — a DIFFERENT number from "Cache saved" above, which
   // covers the prompt cache only. This one is what running work on a cheaper
-  // tier saved, summed from the rule registry route-scan maintains. Hidden
+  // tier saved, the lifetime total of the delegation ledger. Hidden
   // when zero or absent: a permanent "$0" is noise for direct-API users and
   // for anyone who has not delegated yet.
   // "Routing saved" says what earned the money — work that ran on a cheaper
@@ -760,7 +760,7 @@ export function formatReport(data, { color = true, verbose = false, timer = true
   // Silent when the project hasn't opted in (no CLAUDE.md and no .claude/);
   // otherwise renders 🅷 5/5 (green) / 🅷 N/5 (yellow) so the user can spot
   // a missing section at a glance and know to run `harness init`.
-  const harnessSeg = buildHarnessSeg(c, isIcon, g);
+  const harnessSeg = buildHarnessSeg(c, isIcon, g, ctxLive?.size ?? null);
 
   // Version / upgrade chip. Read from a cache written by a detached background
   // check — this render path never touches the network.

package/src/formatters/table.js

@@ -14,8 +14,10 @@ const C = {
   yellow: '\x1b[33m',
   cyan:   '\x1b[36m',
 };
-// Wrap text with ANSI codes — gracefully strips to plain when NO_COLOR set.
-const colorOk = !process.env.NO_COLOR;
+// Wrap text with ANSI codes. Set per report by formatReport: the caller knows
+// about `--no-color` and whether stdout is a terminal, which this module cannot
+// see. NO_COLOR alone is the answer for a caller that passes nothing.
+let colorOk = !process.env.NO_COLOR;
 const r  = (s) => colorOk ? `${C.red}${s}${C.reset}` : s;
 const rb = (s) => colorOk ? `${C.bold}${C.red}${s}${C.reset}` : s;
 const rbl = (s) => colorOk ? `${C.blink}${C.bold}${C.red}${s}${C.reset}` : s;
@@ -28,6 +30,11 @@ function pad(str, len, align = 'left') {
   return s.padEnd(len);
 }
 
+// A loss reads as "-$3", not "$-3". The digits are left as cost.js rounded them.
+function usd(n) {
+  return n < 0 ? `-$${Math.abs(n)}` : `$${n}`;
+}
+
 function pct(n) {
   return (n * 100).toFixed(1) + '%';
 }
@@ -93,7 +100,7 @@ function renderSpikeSection(spikes, contextWindow) {
   }
   for (const spike of spikes) {
     const m = spike.metrics;
-    const ratioLabel = spike.ratio ? `${spike.ratio.toFixed(1)}× p95` : 'single-request > 250k';
+    const ratioLabel = spike.ratio && spike.byRatio !== false ? `${spike.ratio.toFixed(1)}× p95` : 'single-request > 250k';
     lines.push(
       r(`  • ${shortSessionId(m.sessionId)} [${m.projectDir || 'unknown'}]  `) +
         rb(`total input ${formatContextSize(m.totalInput)}`) +
@@ -140,7 +147,7 @@ function renderSpikeSection(spikes, contextWindow) {
       lines.push('');
     }
   }
-  lines.push(rbl('  ▶ 상세 처치법: ') + rb(`${CLI_NAME} last`));
+  lines.push(rbl('  ▶ How to handle it: ') + rb(`${CLI_NAME} last`));
   lines.push('');
   return lines;
 }
@@ -169,12 +176,13 @@ function renderCapWarnSection(caps) {
   lines.push(rb(`    ${CLI_NAME} handoff`));
   lines.push(r('  (writes a HANDOFF-*.md so a fresh session can pick up.)'));
   lines.push('');
-  lines.push(rbl('  ▶ 상세 처치법: ') + rb(`${CLI_NAME} last`));
+  lines.push(rbl('  ▶ How to handle it: ') + rb(`${CLI_NAME} last`));
   lines.push('');
   return lines;
 }
 
-export function formatReport({ summary: sum, trend, ttl, anomalies, cost, options, spikeReport, contextWindow, caps }) {
+export function formatReport({ summary: sum, trend, ttl, anomalies, cost, options, spikeReport, contextWindow, caps }, { color } = {}) {
+  colorOk = color ?? !process.env.NO_COLOR;
   const lines = [];
 
   // Header
@@ -240,17 +248,17 @@ export function formatReport({ summary: sum, trend, ttl, anomalies, cost, option
   const costW = [24, 12];
   const costA = ['left', 'right'];
   lines.push('  ' + tableTop(costW));
-  lines.push('  ' + tableRow(['Actual cost', `$${cost.actual}`], costW, costA));
-  lines.push('  ' + tableRow(['Without cache', `$${cost.noCacheCost}`], costW, costA));
+  lines.push('  ' + tableRow(['Actual cost', usd(cost.actual)], costW, costA));
+  lines.push('  ' + tableRow(['Without cache', usd(cost.noCacheCost)], costW, costA));
   lines.push('  ' + tableSep(costW));
-  lines.push('  ' + tableRow(['Savings', `$${cost.savings} (${pct(cost.savingsRate)})`], costW, costA));
+  lines.push('  ' + tableRow(['Savings', `${usd(cost.savings)} (${pct(cost.savingsRate)})`], costW, costA));
   // Only worth asking of someone who has 1h writes to lose. Everyone else got
   // a `+$0` that read as an endorsement of the 5m bucket they were already
   // stuck in.
   if (cost.extraCostIf5mApplicable === false) {
     lines.push('  ' + tableRow(['Already 5m-only', ttl.gatewayObserved ? 'gateway' : 'yes'], costW, costA));
   } else {
-    lines.push('  ' + tableRow(['Extra cost if 5m-only', `+$${cost.extraCostIf5m}`], costW, costA));
+    lines.push('  ' + tableRow(['Extra cost if 5m-only', cost.extraCostIf5m < 0 ? usd(cost.extraCostIf5m) : `+${usd(cost.extraCostIf5m)}`], costW, costA));
   }
   lines.push('  ' + tableBot(costW));
   if (cost.unpriced > 0) lines.push(`  ${cost.unpriced} session(s) not priced by the gateway are left out.`);

package/src/gateway-auth.js

@@ -21,7 +21,7 @@
 
 import { readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
-import { join } from 'node:path';
+import { join, resolve, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { debug } from './debug.js';
 
@@ -40,6 +40,29 @@ export function gatewayBase(env = process.env) {
   return base;
 }
 
+/**
+ * Claude Code 가 신뢰 확인을 받아 둔 폴더인지 판정합니다. 기록은
+ * ~/.claude.json 의 projects[<절대 경로>].hasTrustDialogAccepted 에 있고, 상위
+ * 폴더를 신뢰했으면 하위 폴더에도 적용됩니다. 기록을 읽지 못하면 신뢰하지 않은
+ * 것으로 봅니다.
+ */
+export function isTrustedProject(cwd = process.cwd(), { home = homedir() } = {}) {
+  let projects;
+  try {
+    projects = JSON.parse(readFileSync(join(home, '.claude.json'), 'utf8'))?.projects;
+  } catch {
+    return false;
+  }
+  if (!projects || typeof projects !== 'object') return false;
+  let dir = resolve(cwd);
+  for (;;) {
+    if (projects[dir]?.hasTrustDialogAccepted === true) return true;
+    const parent = dirname(dir);
+    if (parent === dir) return false;
+    dir = parent;
+  }
+}
+
 /**
  * Claude Code 와 같은 방식으로 apiKeyHelper 를 실행해 토큰을 얻습니다.
  * 환경변수에 토큰을 두지 않고 헬퍼 스크립트로 매번 발급받는 구성이 공식 인증
@@ -50,9 +73,14 @@ export function gatewayBase(env = process.env) {
  * 부릅니다. 수 초 간격으로 도는 렌더 경로에서 부르면 통계선이 그만큼 느려집니다.
  */
 export function keyFromApiKeyHelper(cwd = process.cwd()) {
+  // 프로젝트 설정의 헬퍼는 그 저장소가 넣어 둔 셸 명령입니다. Claude Code 는 신뢰
+  // 확인을 거친 폴더에서만 그것을 실행하므로, 같은 기록을 보고 같은 조건으로만
+  // 실행합니다. 그러지 않으면 내려받은 저장소 안에서 이 CLI 를 돌리는 것만으로
+  // 그 저장소의 명령이 실행됩니다.
   const candidates = [
-    join(cwd, '.claude', 'settings.local.json'),
-    join(cwd, '.claude', 'settings.json'),
+    ...(isTrustedProject(cwd)
+      ? [join(cwd, '.claude', 'settings.local.json'), join(cwd, '.claude', 'settings.json')]
+      : []),
     join(homedir(), '.claude', 'settings.json'),
   ];
   for (const p of candidates) {

package/src/harness.js

@@ -214,16 +214,38 @@ export function harnessInit({ root = findProjectRoot(), force = false, scope = '
   const block = harnessClaudeMdBlock(scope);
   if (existsSync(cmPath)) {
     const existing = readFileSync(cmPath, 'utf8');
-    if (existing.includes(HARNESS_BLOCK_BEGIN) && !force) {
+    const hasBegin = existing.includes(HARNESS_BLOCK_BEGIN);
+    const blockRe = new RegExp(
+      `${escapeRe(HARNESS_BLOCK_BEGIN)}[\\s\\S]*?${escapeRe(HARNESS_BLOCK_END)}\\n?`,
+      'm',
+    );
+    const hasCompleteBlock = blockRe.test(existing);
+    if (hasBegin && !hasCompleteBlock) {
+      // A begin marker with no end marker after it: the extent of our block is
+      // unknowable, so replacing or appending would either eat the user's text
+      // or leave a second block beside the broken one. Touch nothing.
+      result.skipped.push(`${cmPath} (harness block has a begin marker but no end marker — fix it manually)`);
+      result.brokenBlock = true;
+    } else if (hasCompleteBlock) {
       // Already has a harness block — replace it in-place, preserving the
-      // user's other content above/below.
-      const re = new RegExp(
-        `${escapeRe(HARNESS_BLOCK_BEGIN)}[\\s\\S]*?${escapeRe(HARNESS_BLOCK_END)}\\n?`,
-        'm',
-      );
-      const next = existing.replace(re, block);
-      writeFileSync(cmPath, next);
-      result.wrote.push(cmPath + ' (block updated in place)');
+      // user's other content above/below. This holds with or without --force:
+      // --force used to fall through to the append branch, which added a second
+      // block on every run.
+      // A replacer function, not the string: `$&` or `$1` in a block would be
+      // read as a replacement pattern.
+      const next = existing.replace(blockRe, () => block);
+      if (next === existing) {
+        result.skipped.push(`${cmPath} (harness block already up to date)`);
+      } else {
+        if (force) {
+          const stamp = new Date().toISOString().replace(/[:.]/g, '').slice(0, 15);
+          const bak = `${cmPath}.bak-${stamp}`;
+          writeFileSync(bak, existing);
+          result.backedUp.push(bak);
+        }
+        writeFileSync(cmPath, next);
+        result.wrote.push(cmPath + ' (block updated in place)');
+      }
     } else {
       // Backup as safety net, then APPEND the harness block to existing
       // content (do not clobber). Users keep all their prior CLAUDE.md content;
@@ -295,7 +317,16 @@ export function harnessUninit({ root = findProjectRoot(), purgeRatchet = false,
 
   if (existsSync(cmPath)) {
     const existing = readFileSync(cmPath, 'utf8');
-    if (existing.includes(HARNESS_BLOCK_BEGIN)) {
+    const beginIdx = existing.indexOf(HARNESS_BLOCK_BEGIN);
+    const uninitRe = new RegExp(
+      `\\n*${escapeRe(HARNESS_BLOCK_BEGIN)}[\\s\\S]*?${escapeRe(HARNESS_BLOCK_END)}\\n?`,
+      'm',
+    );
+    if (beginIdx !== -1 && !uninitRe.test(existing)) {
+      // Begin marker without an end marker: nothing to cut safely, and writing
+      // the file back unchanged would still report a removal.
+      result.skipped.push(`${cmPath} (harness block has a begin marker but no end marker — fix it manually)`);
+    } else if (beginIdx !== -1) {
       const stamp = new Date().toISOString().replace(/[:.]/g, '').slice(0, 15);
       const bak = `${cmPath}.bak-${stamp}`;
       writeFileSync(bak, existing);
@@ -575,7 +606,7 @@ export function harnessRmRule(n, { root = findProjectRoot(), scope = 'project',
  * has explicitly disabled harness display, or when there's no CLAUDE.md and
  * no .claude/ at all (silent in non-init'd projects so we don't nag).
  */
-export function harnessStatusForStatusline(cfg, { root } = {}) {
+export function harnessStatusForStatusline(cfg, { root, liveWindow = null } = {}) {
   if (cfg && cfg.harness && cfg.harness.enabled === false) return null;
   const projectRoot = root || findProjectRoot();
   const status = harnessStatus(projectRoot);
@@ -620,7 +651,7 @@ export function harnessStatusForStatusline(cfg, { root } = {}) {
   // exempt — the setting cannot change anything for them.
   if (!warning) {
     try {
-      warning = compactWindowWarningForStatusline(projectRoot, cfg);
+      warning = compactWindowWarningForStatusline(projectRoot, cfg, { liveWindow });
     } catch { /* settings unreadable — stay silent */ }
   }
   // Below session-quality warnings: a promoted delegation rule whose

package/src/history.js

@@ -50,7 +50,8 @@ function hms(d = new Date()) {
 
 function loadState() {
   try {
-    return JSON.parse(readFileSync(STATE_PATH, 'utf8'));
+    const s = JSON.parse(readFileSync(STATE_PATH, 'utf8'));
+    return s && typeof s === 'object' && !Array.isArray(s) ? s : { chip: null, ts: null };
   } catch {
     return { chip: null, ts: null };
   }
@@ -218,7 +219,10 @@ export function recordChip(chip, contextHints = {}) {
     ko = `✓ 해소됨 (이전: ${chipKo(last)})`;
   }
   appendDayLine(en, ko, now, tips);
-  saveState({ chip: current, ts: now.toISOString() });
+  // The state file also holds one `cap_<window>` slot per rate-limit window
+  // (recordCapTransition). Saving the chip alone wiped them, so the next render
+  // saw a window at 90% as newly crossed and logged the cap warning again.
+  saveState({ ...state, chip: current, ts: now.toISOString() });
   return true;
 }
 

package/src/hook-manager.js

@@ -9,21 +9,26 @@
  * removes the copy, the staleness, and the orphan in one move.
  */
 
-import { readFile, writeFile, rm } from 'node:fs/promises';
+import { rm } from 'node:fs/promises';
+import { mkdirSync } from 'node:fs';
 import { join } from 'node:path';
-import { homedir } from 'node:os';
 import { CLI_NAME } from './cli-name.js';
+import { claudeUserDir } from './paths.js';
+import { isOurSubcommand, isLegacyCacheMonitorCommand, readSettings, writeSettings } from './installer.js';
 
-const SETTINGS_PATH = join(homedir(), '.claude', 'settings.json');
+// Resolved per call, not at import: the paths follow the current home directory.
+const settingsPath = () => join(claudeUserDir(), 'settings.json');
 // Legacy copied-file location — removed on install/uninstall so machines that
 // installed an older version don't keep a dead hook script around.
-const LEGACY_HOOK_DEST = join(homedir(), '.claude', 'cache-monitor-hook.cjs');
-const HOOK_MARKER = 'cache-monitor-hook';
+const legacyHookDest = () => join(claudeUserDir(), 'cache-monitor-hook.cjs');
 
+// Ours means the current subcommand form (`<cli> --hook-run ...`) or the exact
+// legacy copied-file form. A command that only mentions either string, such as
+// `echo "sprag --hook-run"`, belongs to somebody else.
 function isCacheMonitorHook(nh) {
   const cmd = nh?.command;
   if (typeof cmd !== 'string') return false;
-  return cmd.includes(HOOK_MARKER) || cmd.includes('--hook-run');
+  return isOurSubcommand(cmd, '--hook-run') || isLegacyCacheMonitorCommand(cmd);
 }
 
 /**
@@ -51,21 +56,31 @@ function countCacheMonitorHooks(groups) {
   return n;
 }
 
+function fail(message) {
+  console.log(message);
+  process.exitCode = 1;
+  return false;
+}
+
 export async function installHook({ threshold = 0.7 } = {}) {
-  let settings;
-  try {
-    const raw = await readFile(SETTINGS_PATH, 'utf8');
-    settings = JSON.parse(raw);
-  } catch {
-    settings = {};
+  const SETTINGS_PATH = settingsPath();
+  // Only a missing file starts from an empty object. A file that exists but
+  // cannot be parsed (or is not an object) is the user's configuration;
+  // replacing it with a fresh object would wipe everything in it.
+  const read = readSettings(SETTINGS_PATH);
+  if (read.state === 'unusable') {
+    return fail(`✗ ${SETTINGS_PATH} is ${read.reason} — hook not installed, file left untouched.`);
   }
+  const settings = read.settings;
 
-  if (!settings.hooks) settings.hooks = {};
+  if (settings.hooks === undefined || settings.hooks === null) settings.hooks = {};
+  if (typeof settings.hooks !== 'object' || Array.isArray(settings.hooks)) {
+    return fail(`✗ hooks in ${SETTINGS_PATH} is not an object — hook not installed, file left untouched.`);
+  }
   if (settings.hooks.PostToolUse !== undefined && !Array.isArray(settings.hooks.PostToolUse)) {
     // Someone else's data in a shape we do not understand; overwriting it with
     // [] would discard it. Leave the file alone and say so.
-    console.log(`⚠ hooks.PostToolUse in ${SETTINGS_PATH} is not an array — hook not installed.`);
-    return;
+    return fail(`✗ hooks.PostToolUse in ${SETTINGS_PATH} is not an array — hook not installed, file left untouched.`);
   }
   if (!settings.hooks.PostToolUse) settings.hooks.PostToolUse = [];
 
@@ -84,10 +99,12 @@ export async function installHook({ threshold = 0.7 } = {}) {
     ],
   });
 
-  await writeFile(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n', 'utf8');
+  mkdirSync(claudeUserDir(), { recursive: true });
+  const writeProblem = writeSettings(SETTINGS_PATH, settings);
+  if (writeProblem) return fail(`✗ Hook not installed: ${writeProblem}`);
 
   // Clean up the legacy copy left by older versions.
-  await rm(LEGACY_HOOK_DEST, { force: true }).catch(() => {});
+  await rm(legacyHookDest(), { force: true }).catch(() => {});
 
   console.log(`✓ Hook installed (PostToolUse → ${CLI_NAME} --hook-run)`);
   console.log(`  Settings updated: ${SETTINGS_PATH}`);
@@ -96,29 +113,34 @@ export async function installHook({ threshold = 0.7 } = {}) {
 }
 
 export async function uninstallHook() {
-  let settings;
-  try {
-    const raw = await readFile(SETTINGS_PATH, 'utf8');
-    settings = JSON.parse(raw);
-  } catch {
+  const SETTINGS_PATH = settingsPath();
+  const read = readSettings(SETTINGS_PATH);
+  if (read.state === 'absent') {
     console.log('No settings.json found, nothing to uninstall.');
     return;
   }
+  if (read.state === 'unusable') {
+    return fail(`✗ ${SETTINGS_PATH} is ${read.reason} — nothing removed, file left untouched.`);
+  }
+  const settings = read.settings;
 
   if (Array.isArray(settings.hooks?.PostToolUse)) {
-    const before = countCacheMonitorHooks(settings.hooks.PostToolUse);
-    settings.hooks.PostToolUse = withoutCacheMonitorHooks(settings.hooks.PostToolUse);
-    const removed = before;
-
-    if (settings.hooks.PostToolUse.length === 0) delete settings.hooks.PostToolUse;
-    if (Object.keys(settings.hooks).length === 0) delete settings.hooks;
-
-    await writeFile(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n', 'utf8');
-    console.log(`✓ Removed ${removed} hook(s) from settings.json`);
+    const removed = countCacheMonitorHooks(settings.hooks.PostToolUse);
+    if (removed > 0) {
+      settings.hooks.PostToolUse = withoutCacheMonitorHooks(settings.hooks.PostToolUse);
+      if (settings.hooks.PostToolUse.length === 0) delete settings.hooks.PostToolUse;
+      if (Object.keys(settings.hooks).length === 0) delete settings.hooks;
+
+      const writeProblem = writeSettings(SETTINGS_PATH, settings);
+      if (writeProblem) return fail(`✗ Hook not removed: ${writeProblem}`);
+      console.log(`✓ Removed ${removed} hook(s) from settings.json`);
+    } else {
+      console.log('No cache-monitor hook found in settings.');
+    }
   } else {
     console.log('No cache-monitor hook found in settings.');
   }
 
   // The legacy copied hook file is dead weight either way.
-  await rm(LEGACY_HOOK_DEST, { force: true }).catch(() => {});
+  await rm(legacyHookDest(), { force: true }).catch(() => {});
 }