caveat-cli 0.16.1 → 0.16.3

package/dist/index.js

@@ -10,27 +10,30 @@ import {
   __commonJS,
   __export,
   __toESM,
+  acknowledgeRuntimeErrors,
   acquireReindexLock,
-  appendPendingReminder,
+  buildAndPublishPendingReminder,
   buildCodexSidecarDiagnosticsCommand,
   buildCodexSidecarReadOnlySmokeCommand,
   buildCodexSidecarRunCommand,
   buildHookSignalSidecarContextBlock,
+  buildPendingSemanticKey,
   caveatEntriesToSidecarContextBlocks,
   cleanupStalePendingDirs,
   communityAdd,
   communityList,
   communityPull,
   communityRemove,
+  compactRuntimeErrors,
   computeEntriesDigest,
   createKeyserverKeyProvider,
   decideCodexSidecarExecution,
   defaultSelfIdentityTokens,
-  drainGlobalPendingReminders,
-  drainPendingReminders,
+  drainPendingRemindersDetailed,
   ensureUserConfig,
   findCaveatHome,
-  findCaveatsForPrompt,
+  findCaveatsForHook,
+  findCaveatsForHookSegments,
   get,
   hasAnyStruggleSignal,
   initOwnSync,
@@ -40,6 +43,7 @@ import {
   logHookQueryMiss,
   markHit,
   maybeSweepPendingDirs,
+  observeRuntimeError,
   openDb,
   prewarmSealedKeys,
   publishOwn,
@@ -53,7 +57,10 @@ import {
   resetAutoSyncFailureState,
   resolvePaths,
   runAutoSync,
+  runtimeErrorsDiagnostics,
+  runtimeErrorsSnapshot,
   search,
+  setRuntimeErrorStatus,
   stderrLogger,
   stopReminderText,
   struggleSearchText,
@@ -63,7 +70,7 @@ import {
   userPromptSubmitReminderText,
   writeDigestMarker,
   writeUserConfigPatch
-} from "./chunk-HCLEIAGO.js";
+} from "./chunk-PD5E6TFL.js";
 
 // ../../node_modules/.pnpm/ajv@8.18.0/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -442,11 +449,11 @@ var require_codegen = __commonJS({
         const rhs = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
         return `${varKind} ${this.name}${rhs};` + _n;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants4) {
         if (!names[this.name.str])
           return;
         if (this.rhs)
-          this.rhs = optimizeExpr(this.rhs, names, constants2);
+          this.rhs = optimizeExpr(this.rhs, names, constants4);
         return this;
       }
       get names() {
@@ -463,10 +470,10 @@ var require_codegen = __commonJS({
       render({ _n }) {
         return `${this.lhs} = ${this.rhs};` + _n;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants4) {
         if (this.lhs instanceof code_1.Name && !names[this.lhs.str] && !this.sideEffects)
           return;
-        this.rhs = optimizeExpr(this.rhs, names, constants2);
+        this.rhs = optimizeExpr(this.rhs, names, constants4);
         return this;
       }
       get names() {
@@ -527,8 +534,8 @@ var require_codegen = __commonJS({
       optimizeNodes() {
         return `${this.code}` ? this : void 0;
       }
-      optimizeNames(names, constants2) {
-        this.code = optimizeExpr(this.code, names, constants2);
+      optimizeNames(names, constants4) {
+        this.code = optimizeExpr(this.code, names, constants4);
         return this;
       }
       get names() {
@@ -557,12 +564,12 @@ var require_codegen = __commonJS({
         }
         return nodes.length > 0 ? this : void 0;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants4) {
         const { nodes } = this;
         let i = nodes.length;
         while (i--) {
           const n = nodes[i];
-          if (n.optimizeNames(names, constants2))
+          if (n.optimizeNames(names, constants4))
             continue;
           subtractNames(names, n.names);
           nodes.splice(i, 1);
@@ -615,12 +622,12 @@ var require_codegen = __commonJS({
           return void 0;
         return this;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants4) {
         var _a3;
-        this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants2);
-        if (!(super.optimizeNames(names, constants2) || this.else))
+        this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants4);
+        if (!(super.optimizeNames(names, constants4) || this.else))
           return;
-        this.condition = optimizeExpr(this.condition, names, constants2);
+        this.condition = optimizeExpr(this.condition, names, constants4);
         return this;
       }
       get names() {
@@ -643,10 +650,10 @@ var require_codegen = __commonJS({
       render(opts) {
         return `for(${this.iteration})` + super.render(opts);
       }
-      optimizeNames(names, constants2) {
-        if (!super.optimizeNames(names, constants2))
+      optimizeNames(names, constants4) {
+        if (!super.optimizeNames(names, constants4))
           return;
-        this.iteration = optimizeExpr(this.iteration, names, constants2);
+        this.iteration = optimizeExpr(this.iteration, names, constants4);
         return this;
       }
       get names() {
@@ -682,10 +689,10 @@ var require_codegen = __commonJS({
       render(opts) {
         return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(opts);
       }
-      optimizeNames(names, constants2) {
-        if (!super.optimizeNames(names, constants2))
+      optimizeNames(names, constants4) {
+        if (!super.optimizeNames(names, constants4))
           return;
-        this.iterable = optimizeExpr(this.iterable, names, constants2);
+        this.iterable = optimizeExpr(this.iterable, names, constants4);
         return this;
       }
       get names() {
@@ -727,11 +734,11 @@ var require_codegen = __commonJS({
         (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNodes();
         return this;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants4) {
         var _a3, _b;
-        super.optimizeNames(names, constants2);
-        (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants2);
-        (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants2);
+        super.optimizeNames(names, constants4);
+        (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants4);
+        (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants4);
         return this;
       }
       get names() {
@@ -1032,7 +1039,7 @@ var require_codegen = __commonJS({
     function addExprNames(names, from) {
       return from instanceof code_1._CodeOrName ? addNames(names, from.names) : names;
     }
-    function optimizeExpr(expr, names, constants2) {
+    function optimizeExpr(expr, names, constants4) {
       if (expr instanceof code_1.Name)
         return replaceName(expr);
       if (!canOptimize(expr))
@@ -1047,14 +1054,14 @@ var require_codegen = __commonJS({
         return items;
       }, []));
       function replaceName(n) {
-        const c = constants2[n.str];
+        const c = constants4[n.str];
         if (c === void 0 || names[n.str] !== 1)
           return n;
         delete names[n.str];
         return c;
       }
       function canOptimize(e) {
-        return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants2[c.str] !== void 0);
+        return e instanceof code_1._Code && e._items.some((c) => c instanceof code_1.Name && names[c.str] === 1 && constants4[c.str] !== void 0);
       }
     }
     function subtractNames(names, from) {
@@ -6881,8 +6888,8 @@ import { dirname as dirname4, join as join8 } from "node:path";
 
 // src/claudeInstall.ts
 import { spawnSync } from "node:child_process";
-import { copyFileSync, existsSync, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
-import { dirname as dirname2, join as join3 } from "node:path";
+import { accessSync, constants, copyFileSync, existsSync, mkdirSync, readFileSync as readFileSync2, realpathSync, statSync, writeFileSync } from "node:fs";
+import { dirname as dirname2, isAbsolute, join as join3 } from "node:path";
 var EVENT_USER_PROMPT_SUBMIT = "UserPromptSubmit";
 var EVENT_POST_TOOL_USE = "PostToolUse";
 var EVENT_POST_TOOL_USE_FAILURE = "PostToolUseFailure";
@@ -6901,10 +6908,10 @@ function upsertHook(settings, event, command) {
   const list = settings.hooks[event] ??= [];
   const subcommand = command.includes("hook user-prompt-submit") ? "user-prompt-submit" : command.includes("hook post-tool-use") ? "post-tool-use" : command.includes("hook stop") ? "stop" : null;
   for (const entry of list) {
-    for (const hook of entry.hooks ?? []) {
-      if (isSameHookCommand(hook.command, command)) return "unchanged";
-      if (subcommand && isCaveatClaudeHookCommand(hook.command, subcommand)) {
-        hook.command = command;
+    for (const hook2 of entry.hooks ?? []) {
+      if (isSameHookCommand(hook2.command, command)) return "unchanged";
+      if (subcommand && isCaveatClaudeHookCommand(hook2.command, subcommand)) {
+        hook2.command = command;
         return "added";
       }
     }
@@ -6942,6 +6949,36 @@ function isCaveatClaudeHookCommand(actual, event) {
   const lower = actual.toLowerCase();
   return !isEnvPrefixedCommand(actual) && lower.includes("caveat") && actual.includes(`hook ${event}`);
 }
+function commandTokens(command) {
+  const tokens = [];
+  const pattern = /"([^"]*)"|([^\s"]+)/g;
+  let end = 0;
+  let match;
+  while ((match = pattern.exec(command)) !== null) {
+    if (command.slice(end, match.index).trim()) return null;
+    tokens.push(match[1] ?? match[2]);
+    end = pattern.lastIndex;
+  }
+  return command.slice(end).trim() ? null : tokens;
+}
+function isCanonicalAsset(path, expectedPath, mode) {
+  if (typeof path !== "string" || !isAbsolute(path) || !isAbsolute(expectedPath)) return false;
+  try {
+    accessSync(path, mode);
+    return statSync(path).isFile() && realpathSync(path) === realpathSync(expectedPath);
+  } catch {
+    return false;
+  }
+}
+function isCanonicalCaveatClaudeHookCommand(actual, event, nodePath, cliScriptPath) {
+  const tokens = commandTokens(actual);
+  return tokens?.length === 4 && isCanonicalAsset(tokens[0], nodePath, constants.X_OK) && isCanonicalAsset(tokens[1], cliScriptPath, constants.R_OK) && tokens[2] === "hook" && tokens[3] === event;
+}
+function isCaveatClaudeMcpRegistration(value, nodePath, cliScriptPath) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const server = value;
+  return Object.keys(server).length === 4 && ["args", "command", "env", "type"].every((key) => Object.hasOwn(server, key)) && server.type === "stdio" && isCanonicalAsset(server.command, nodePath, constants.X_OK) && Array.isArray(server.args) && server.args.length === 3 && server.args[0] === "--disable-warning=ExperimentalWarning" && isCanonicalAsset(server.args[1], cliScriptPath, constants.R_OK) && server.args[2] === "mcp-server" && server.env !== null && typeof server.env === "object" && !Array.isArray(server.env) && Object.keys(server.env).length === 0;
+}
 function readSettings(path) {
   if (!existsSync(path)) return {};
   return JSON.parse(readFileSync2(path, "utf-8"));
@@ -7073,8 +7110,8 @@ function uninstallClaudeIntegration(opts) {
 }
 
 // src/codexHookInstall.ts
-import { copyFileSync as copyFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname3, join as join4 } from "node:path";
+import { accessSync as accessSync2, constants as constants2, copyFileSync as copyFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync3, realpathSync as realpathSync2, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { dirname as dirname3, isAbsolute as isAbsolute2, join as join4 } from "node:path";
 import { parse as parseToml } from "smol-toml";
 function quote2(p) {
   return p.includes(" ") ? `"${p}"` : p;
@@ -7092,6 +7129,31 @@ function isCaveatCodexHookCommand(actual, event) {
   const lower = actual.toLowerCase();
   return lower.includes("caveat") && actual.includes(eventCommandFragment(event));
 }
+function commandTokens2(command) {
+  const tokens = [];
+  const pattern = /"([^"]*)"|([^\s"]+)/g;
+  let end = 0;
+  let match;
+  while ((match = pattern.exec(command)) !== null) {
+    if (command.slice(end, match.index).trim()) return null;
+    tokens.push(match[1] ?? match[2]);
+    end = pattern.lastIndex;
+  }
+  return command.slice(end).trim() ? null : tokens;
+}
+function isCanonicalAsset2(path, expectedPath, mode) {
+  if (typeof path !== "string" || !isAbsolute2(path) || !isAbsolute2(expectedPath)) return false;
+  try {
+    accessSync2(path, mode);
+    return statSync2(path).isFile() && realpathSync2(path) === realpathSync2(expectedPath);
+  } catch {
+    return false;
+  }
+}
+function isCanonicalCaveatCodexHookCommand(actual, event, nodePath, cliScriptPath) {
+  const tokens = commandTokens2(actual);
+  return tokens?.length === 4 && isCanonicalAsset2(tokens[0], nodePath, constants2.X_OK) && isCanonicalAsset2(tokens[1], cliScriptPath, constants2.R_OK) && tokens[2] === "codex-hook" && tokens[3] === event;
+}
 function hasCaveatHook(hooksJson, event, fragment) {
   return hooksJson.hooks?.[event]?.some(
     (entry) => entry.hooks?.some((h) => h.command.includes(fragment))
@@ -7117,13 +7179,13 @@ function upsertHook2(hooksJson, event, command, subcommand) {
   hooksJson.hooks ??= {};
   const list = hooksJson.hooks[event] ??= [];
   for (const entry of list) {
-    for (const hook of entry.hooks ?? []) {
-      if (isSameHookCommand2(hook.command, command)) return "unchanged";
-      if (isCaveatCodexHookCommand(hook.command, subcommand)) {
-        hook.command = command;
-        hook.timeoutSec = 5;
-        hook.async = false;
-        hook.statusMessage = null;
+    for (const hook2 of entry.hooks ?? []) {
+      if (isSameHookCommand2(hook2.command, command)) return "unchanged";
+      if (isCaveatCodexHookCommand(hook2.command, subcommand)) {
+        hook2.command = command;
+        hook2.timeoutSec = 5;
+        hook2.async = false;
+        hook2.statusMessage = null;
         return "added";
       }
     }
@@ -7502,9 +7564,9 @@ function askOnce(question) {
 }
 
 // src/nodePath.ts
-import { existsSync as existsSync3, realpathSync } from "node:fs";
+import { existsSync as existsSync3, realpathSync as realpathSync3 } from "node:fs";
 import { delimiter, join as join5 } from "node:path";
-var defaultRealpath = (path) => realpathSync.native(path);
+var defaultRealpath = (path) => realpathSync3.native(path);
 function safeRealpath(path, realpath = defaultRealpath) {
   try {
     return realpath(path);
@@ -7544,6 +7606,16 @@ import { spawnSync as spawnSync3 } from "node:child_process";
 import { mkdtempSync, readFileSync as readFileSync4, rmSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join6 } from "node:path";
+var DEFAULT_HOOK_SIDECAR_TIMEOUT_MS = 12e4;
+var MAX_HOOK_SIDECAR_TIMEOUT_MS = 24e4;
+function resolveHookSidecarTimeoutMs(raw) {
+  if (raw === void 0) return DEFAULT_HOOK_SIDECAR_TIMEOUT_MS;
+  const value = Number(raw);
+  if (!Number.isSafeInteger(value) || value < 1 || value > MAX_HOOK_SIDECAR_TIMEOUT_MS) {
+    throw new Error(`CAVEAT_HOOK_CODEX_SIDECAR_TIMEOUT_MS must be an integer from 1 to ${MAX_HOOK_SIDECAR_TIMEOUT_MS}`);
+  }
+  return value;
+}
 function compactFailureMessage(message) {
   const singleLine = message.replace(/\s+/g, " ").trim();
   if (!singleLine) return "unknown error";
@@ -7607,7 +7679,9 @@ function runCodexSidecarAdvisory(input) {
     const result = spawnSync3(process.execPath, args, {
       cwd: input.projectRoot,
       encoding: "utf-8",
-      timeout: Number(process.env.CAVEAT_HOOK_CODEX_SIDECAR_TIMEOUT_MS ?? 12e4),
+      // Keep at least one minute between the longest supported model call and
+      // the pending single-flight claim TTL (five minutes).
+      timeout: resolveHookSidecarTimeoutMs(process.env.CAVEAT_HOOK_CODEX_SIDECAR_TIMEOUT_MS),
       maxBuffer: 10 * 1024 * 1024
     });
     if (result.error) {
@@ -8036,7 +8110,13 @@ async function runIndex(ctx, opts) {
   for (const failure of failures) {
     ctx.logger.warn(`${failure.source}: sealed key prewarm failed: ${errorMessage2(failure.error)}`);
   }
-  const db = openDb({ path: ctx.paths.dbPath, logger: ctx.logger });
+  let db;
+  try {
+    db = openDb({ path: ctx.paths.dbPath, logger: ctx.logger });
+  } catch (error51) {
+    observeRuntimeError("CAVEAT.DATABASE_OPEN_FAILED", { version: CAVEAT_VERSION });
+    throw error51;
+  }
   try {
     if (opts.full) {
       ctx.logger.info("full rebuild: DELETE FROM entries");
@@ -8051,6 +8131,9 @@ async function runIndex(ctx, opts) {
       }
     }
     writeDigestMarker(ctx.caveatHome, computeEntriesDigest(ctx.paths));
+  } catch (error51) {
+    observeRuntimeError("CAVEAT.INDEX_FAILED", { version: CAVEAT_VERSION });
+    throw error51;
   } finally {
     db.close();
   }
@@ -8205,7 +8288,7 @@ function runStats(ctx) {
 
 // src/commands/serve.ts
 async function runServe(opts) {
-  const { startServer } = await import("./server-EASKBCNK.js");
+  const { startServer } = await import("./server-ZMIRSFMH.js");
   const { port, host } = startServer({ port: opts.port });
   process.stdout.write(`[caveat] web portal: http://${host}:${port}/
 `);
@@ -8626,18 +8709,18 @@ var ParseStatus = class _ParseStatus {
     if (this.value !== "aborted")
       this.value = "aborted";
   }
-  static mergeArray(status, results) {
+  static mergeArray(status2, results) {
     const arrayValue = [];
     for (const s of results) {
       if (s.status === "aborted")
         return INVALID;
       if (s.status === "dirty")
-        status.dirty();
+        status2.dirty();
       arrayValue.push(s.value);
     }
-    return { status: status.value, value: arrayValue };
+    return { status: status2.value, value: arrayValue };
   }
-  static async mergeObjectAsync(status, pairs) {
+  static async mergeObjectAsync(status2, pairs) {
     const syncPairs = [];
     for (const pair of pairs) {
       const key = await pair.key;
@@ -8647,9 +8730,9 @@ var ParseStatus = class _ParseStatus {
         value
       });
     }
-    return _ParseStatus.mergeObjectSync(status, syncPairs);
+    return _ParseStatus.mergeObjectSync(status2, syncPairs);
   }
-  static mergeObjectSync(status, pairs) {
+  static mergeObjectSync(status2, pairs) {
     const finalObject = {};
     for (const pair of pairs) {
       const { key, value } = pair;
@@ -8658,14 +8741,14 @@ var ParseStatus = class _ParseStatus {
       if (value.status === "aborted")
         return INVALID;
       if (key.status === "dirty")
-        status.dirty();
+        status2.dirty();
       if (value.status === "dirty")
-        status.dirty();
+        status2.dirty();
       if (key.value !== "__proto__" && (typeof value.value !== "undefined" || pair.alwaysSet)) {
         finalObject[key.value] = value.value;
       }
     }
-    return { status: status.value, value: finalObject };
+    return { status: status2.value, value: finalObject };
   }
 };
 var INVALID = Object.freeze({
@@ -9125,7 +9208,7 @@ var ZodString = class _ZodString2 extends ZodType {
       });
       return INVALID;
     }
-    const status = new ParseStatus();
+    const status2 = new ParseStatus();
     let ctx = void 0;
     for (const check2 of this._def.checks) {
       if (check2.kind === "min") {
@@ -9139,7 +9222,7 @@ var ZodString = class _ZodString2 extends ZodType {
             exact: false,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "max") {
         if (input.data.length > check2.value) {
@@ -9152,7 +9235,7 @@ var ZodString = class _ZodString2 extends ZodType {
             exact: false,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "length") {
         const tooBig = input.data.length > check2.value;
@@ -9178,7 +9261,7 @@ var ZodString = class _ZodString2 extends ZodType {
               message: check2.message
             });
           }
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "email") {
         if (!emailRegex.test(input.data)) {
@@ -9188,7 +9271,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "emoji") {
         if (!emojiRegex) {
@@ -9201,7 +9284,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "uuid") {
         if (!uuidRegex.test(input.data)) {
@@ -9211,7 +9294,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "nanoid") {
         if (!nanoidRegex.test(input.data)) {
@@ -9221,7 +9304,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "cuid") {
         if (!cuidRegex.test(input.data)) {
@@ -9231,7 +9314,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "cuid2") {
         if (!cuid2Regex.test(input.data)) {
@@ -9241,7 +9324,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "ulid") {
         if (!ulidRegex.test(input.data)) {
@@ -9251,7 +9334,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "url") {
         try {
@@ -9263,7 +9346,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "regex") {
         check2.regex.lastIndex = 0;
@@ -9275,7 +9358,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "trim") {
         input.data = input.data.trim();
@@ -9287,7 +9370,7 @@ var ZodString = class _ZodString2 extends ZodType {
             validation: { includes: check2.value, position: check2.position },
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "toLowerCase") {
         input.data = input.data.toLowerCase();
@@ -9301,7 +9384,7 @@ var ZodString = class _ZodString2 extends ZodType {
             validation: { startsWith: check2.value },
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "endsWith") {
         if (!input.data.endsWith(check2.value)) {
@@ -9311,7 +9394,7 @@ var ZodString = class _ZodString2 extends ZodType {
             validation: { endsWith: check2.value },
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "datetime") {
         const regex = datetimeRegex(check2);
@@ -9322,7 +9405,7 @@ var ZodString = class _ZodString2 extends ZodType {
             validation: "datetime",
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "date") {
         const regex = dateRegex;
@@ -9333,7 +9416,7 @@ var ZodString = class _ZodString2 extends ZodType {
             validation: "date",
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "time") {
         const regex = timeRegex(check2);
@@ -9344,7 +9427,7 @@ var ZodString = class _ZodString2 extends ZodType {
             validation: "time",
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "duration") {
         if (!durationRegex.test(input.data)) {
@@ -9354,7 +9437,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "ip") {
         if (!isValidIP(input.data, check2.version)) {
@@ -9364,7 +9447,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "jwt") {
         if (!isValidJWT(input.data, check2.alg)) {
@@ -9374,7 +9457,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "cidr") {
         if (!isValidCidr(input.data, check2.version)) {
@@ -9384,7 +9467,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "base64") {
         if (!base64Regex.test(input.data)) {
@@ -9394,7 +9477,7 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "base64url") {
         if (!base64urlRegex.test(input.data)) {
@@ -9404,13 +9487,13 @@ var ZodString = class _ZodString2 extends ZodType {
             code: ZodIssueCode.invalid_string,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else {
         util.assertNever(check2);
       }
     }
-    return { status: status.value, value: input.data };
+    return { status: status2.value, value: input.data };
   }
   _regex(regex, validation, message) {
     return this.refinement((data) => regex.test(data), {
@@ -9686,7 +9769,7 @@ var ZodNumber = class _ZodNumber extends ZodType {
       return INVALID;
     }
     let ctx = void 0;
-    const status = new ParseStatus();
+    const status2 = new ParseStatus();
     for (const check2 of this._def.checks) {
       if (check2.kind === "int") {
         if (!util.isInteger(input.data)) {
@@ -9697,7 +9780,7 @@ var ZodNumber = class _ZodNumber extends ZodType {
             received: "float",
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "min") {
         const tooSmall = check2.inclusive ? input.data < check2.value : input.data <= check2.value;
@@ -9711,7 +9794,7 @@ var ZodNumber = class _ZodNumber extends ZodType {
             exact: false,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "max") {
         const tooBig = check2.inclusive ? input.data > check2.value : input.data >= check2.value;
@@ -9725,7 +9808,7 @@ var ZodNumber = class _ZodNumber extends ZodType {
             exact: false,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "multipleOf") {
         if (floatSafeRemainder(input.data, check2.value) !== 0) {
@@ -9735,7 +9818,7 @@ var ZodNumber = class _ZodNumber extends ZodType {
             multipleOf: check2.value,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "finite") {
         if (!Number.isFinite(input.data)) {
@@ -9744,13 +9827,13 @@ var ZodNumber = class _ZodNumber extends ZodType {
             code: ZodIssueCode.not_finite,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else {
         util.assertNever(check2);
       }
     }
-    return { status: status.value, value: input.data };
+    return { status: status2.value, value: input.data };
   }
   gte(value, message) {
     return this.setLimit("min", value, true, errorUtil.toString(message));
@@ -9915,7 +9998,7 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
       return this._getInvalidInput(input);
     }
     let ctx = void 0;
-    const status = new ParseStatus();
+    const status2 = new ParseStatus();
     for (const check2 of this._def.checks) {
       if (check2.kind === "min") {
         const tooSmall = check2.inclusive ? input.data < check2.value : input.data <= check2.value;
@@ -9928,7 +10011,7 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
             inclusive: check2.inclusive,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "max") {
         const tooBig = check2.inclusive ? input.data > check2.value : input.data >= check2.value;
@@ -9941,7 +10024,7 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
             inclusive: check2.inclusive,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "multipleOf") {
         if (input.data % check2.value !== BigInt(0)) {
@@ -9951,13 +10034,13 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
             multipleOf: check2.value,
             message: check2.message
           });
-          status.dirty();
+          status2.dirty();
         }
       } else {
         util.assertNever(check2);
       }
     }
-    return { status: status.value, value: input.data };
+    return { status: status2.value, value: input.data };
   }
   _getInvalidInput(input) {
     const ctx = this._getOrReturnCtx(input);
@@ -10115,7 +10198,7 @@ var ZodDate = class _ZodDate extends ZodType {
       });
       return INVALID;
     }
-    const status = new ParseStatus();
+    const status2 = new ParseStatus();
     let ctx = void 0;
     for (const check2 of this._def.checks) {
       if (check2.kind === "min") {
@@ -10129,7 +10212,7 @@ var ZodDate = class _ZodDate extends ZodType {
             minimum: check2.value,
             type: "date"
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (check2.kind === "max") {
         if (input.data.getTime() > check2.value) {
@@ -10142,14 +10225,14 @@ var ZodDate = class _ZodDate extends ZodType {
             maximum: check2.value,
             type: "date"
           });
-          status.dirty();
+          status2.dirty();
         }
       } else {
         util.assertNever(check2);
       }
     }
     return {
-      status: status.value,
+      status: status2.value,
       value: new Date(input.data.getTime())
     };
   }
@@ -10335,7 +10418,7 @@ ZodVoid.create = (params) => {
 };
 var ZodArray = class _ZodArray extends ZodType {
   _parse(input) {
-    const { ctx, status } = this._processInputParams(input);
+    const { ctx, status: status2 } = this._processInputParams(input);
     const def = this._def;
     if (ctx.parsedType !== ZodParsedType.array) {
       addIssueToContext(ctx, {
@@ -10358,7 +10441,7 @@ var ZodArray = class _ZodArray extends ZodType {
           exact: true,
           message: def.exactLength.message
         });
-        status.dirty();
+        status2.dirty();
       }
     }
     if (def.minLength !== null) {
@@ -10371,7 +10454,7 @@ var ZodArray = class _ZodArray extends ZodType {
           exact: false,
           message: def.minLength.message
         });
-        status.dirty();
+        status2.dirty();
       }
     }
     if (def.maxLength !== null) {
@@ -10384,20 +10467,20 @@ var ZodArray = class _ZodArray extends ZodType {
           exact: false,
           message: def.maxLength.message
         });
-        status.dirty();
+        status2.dirty();
       }
     }
     if (ctx.common.async) {
       return Promise.all([...ctx.data].map((item, i) => {
         return def.type._parseAsync(new ParseInputLazyPath(ctx, item, ctx.path, i));
       })).then((result2) => {
-        return ParseStatus.mergeArray(status, result2);
+        return ParseStatus.mergeArray(status2, result2);
       });
     }
     const result = [...ctx.data].map((item, i) => {
       return def.type._parseSync(new ParseInputLazyPath(ctx, item, ctx.path, i));
     });
-    return ParseStatus.mergeArray(status, result);
+    return ParseStatus.mergeArray(status2, result);
   }
   get element() {
     return this._def.type;
@@ -10486,7 +10569,7 @@ var ZodObject = class _ZodObject extends ZodType {
       });
       return INVALID;
     }
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     const { shape, keys: shapeKeys } = this._getCached();
     const extraKeys = [];
     if (!(this._def.catchall instanceof ZodNever && this._def.unknownKeys === "strip")) {
@@ -10521,7 +10604,7 @@ var ZodObject = class _ZodObject extends ZodType {
             code: ZodIssueCode.unrecognized_keys,
             keys: extraKeys
           });
-          status.dirty();
+          status2.dirty();
         }
       } else if (unknownKeys === "strip") {
       } else {
@@ -10555,10 +10638,10 @@ var ZodObject = class _ZodObject extends ZodType {
         }
         return syncPairs;
       }).then((syncPairs) => {
-        return ParseStatus.mergeObjectSync(status, syncPairs);
+        return ParseStatus.mergeObjectSync(status2, syncPairs);
       });
     } else {
-      return ParseStatus.mergeObjectSync(status, pairs);
+      return ParseStatus.mergeObjectSync(status2, pairs);
     }
   }
   get shape() {
@@ -11036,7 +11119,7 @@ function mergeValues(a, b) {
 }
 var ZodIntersection = class extends ZodType {
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     const handleParsed = (parsedLeft, parsedRight) => {
       if (isAborted(parsedLeft) || isAborted(parsedRight)) {
         return INVALID;
@@ -11049,9 +11132,9 @@ var ZodIntersection = class extends ZodType {
         return INVALID;
       }
       if (isDirty(parsedLeft) || isDirty(parsedRight)) {
-        status.dirty();
+        status2.dirty();
       }
-      return { status: status.value, value: merged.data };
+      return { status: status2.value, value: merged.data };
     };
     if (ctx.common.async) {
       return Promise.all([
@@ -11089,7 +11172,7 @@ ZodIntersection.create = (left, right, params) => {
 };
 var ZodTuple = class _ZodTuple extends ZodType {
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     if (ctx.parsedType !== ZodParsedType.array) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -11117,7 +11200,7 @@ var ZodTuple = class _ZodTuple extends ZodType {
         exact: false,
         type: "array"
       });
-      status.dirty();
+      status2.dirty();
     }
     const items = [...ctx.data].map((item, itemIndex) => {
       const schema = this._def.items[itemIndex] || this._def.rest;
@@ -11127,10 +11210,10 @@ var ZodTuple = class _ZodTuple extends ZodType {
     }).filter((x) => !!x);
     if (ctx.common.async) {
       return Promise.all(items).then((results) => {
-        return ParseStatus.mergeArray(status, results);
+        return ParseStatus.mergeArray(status2, results);
       });
     } else {
-      return ParseStatus.mergeArray(status, items);
+      return ParseStatus.mergeArray(status2, items);
     }
   }
   get items() {
@@ -11162,7 +11245,7 @@ var ZodRecord = class _ZodRecord extends ZodType {
     return this._def.valueType;
   }
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     if (ctx.parsedType !== ZodParsedType.object) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -11182,9 +11265,9 @@ var ZodRecord = class _ZodRecord extends ZodType {
       });
     }
     if (ctx.common.async) {
-      return ParseStatus.mergeObjectAsync(status, pairs);
+      return ParseStatus.mergeObjectAsync(status2, pairs);
     } else {
-      return ParseStatus.mergeObjectSync(status, pairs);
+      return ParseStatus.mergeObjectSync(status2, pairs);
     }
   }
   get element() {
@@ -11215,7 +11298,7 @@ var ZodMap = class extends ZodType {
     return this._def.valueType;
   }
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     if (ctx.parsedType !== ZodParsedType.map) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -11242,11 +11325,11 @@ var ZodMap = class extends ZodType {
             return INVALID;
           }
           if (key.status === "dirty" || value.status === "dirty") {
-            status.dirty();
+            status2.dirty();
           }
           finalMap.set(key.value, value.value);
         }
-        return { status: status.value, value: finalMap };
+        return { status: status2.value, value: finalMap };
       });
     } else {
       const finalMap = /* @__PURE__ */ new Map();
@@ -11257,11 +11340,11 @@ var ZodMap = class extends ZodType {
           return INVALID;
         }
         if (key.status === "dirty" || value.status === "dirty") {
-          status.dirty();
+          status2.dirty();
         }
         finalMap.set(key.value, value.value);
       }
-      return { status: status.value, value: finalMap };
+      return { status: status2.value, value: finalMap };
     }
   }
 };
@@ -11275,7 +11358,7 @@ ZodMap.create = (keyType, valueType, params) => {
 };
 var ZodSet = class _ZodSet extends ZodType {
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     if (ctx.parsedType !== ZodParsedType.set) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -11295,7 +11378,7 @@ var ZodSet = class _ZodSet extends ZodType {
           exact: false,
           message: def.minSize.message
         });
-        status.dirty();
+        status2.dirty();
       }
     }
     if (def.maxSize !== null) {
@@ -11308,7 +11391,7 @@ var ZodSet = class _ZodSet extends ZodType {
           exact: false,
           message: def.maxSize.message
         });
-        status.dirty();
+        status2.dirty();
       }
     }
     const valueType = this._def.valueType;
@@ -11318,10 +11401,10 @@ var ZodSet = class _ZodSet extends ZodType {
         if (element.status === "aborted")
           return INVALID;
         if (element.status === "dirty")
-          status.dirty();
+          status2.dirty();
         parsedSet.add(element.value);
       }
-      return { status: status.value, value: parsedSet };
+      return { status: status2.value, value: parsedSet };
     }
     const elements = [...ctx.data.values()].map((item, i) => valueType._parse(new ParseInputLazyPath(ctx, item, ctx.path, i)));
     if (ctx.common.async) {
@@ -11652,15 +11735,15 @@ var ZodEffects = class extends ZodType {
     return this._def.schema._def.typeName === ZodFirstPartyTypeKind.ZodEffects ? this._def.schema.sourceType() : this._def.schema;
   }
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     const effect = this._def.effect || null;
     const checkCtx = {
       addIssue: (arg) => {
         addIssueToContext(ctx, arg);
         if (arg.fatal) {
-          status.abort();
+          status2.abort();
         } else {
-          status.dirty();
+          status2.dirty();
         }
       },
       get path() {
@@ -11672,7 +11755,7 @@ var ZodEffects = class extends ZodType {
       const processed = effect.transform(ctx.data, checkCtx);
       if (ctx.common.async) {
         return Promise.resolve(processed).then(async (processed2) => {
-          if (status.value === "aborted")
+          if (status2.value === "aborted")
             return INVALID;
           const result = await this._def.schema._parseAsync({
             data: processed2,
@@ -11683,12 +11766,12 @@ var ZodEffects = class extends ZodType {
             return INVALID;
           if (result.status === "dirty")
             return DIRTY(result.value);
-          if (status.value === "dirty")
+          if (status2.value === "dirty")
             return DIRTY(result.value);
           return result;
         });
       } else {
-        if (status.value === "aborted")
+        if (status2.value === "aborted")
           return INVALID;
         const result = this._def.schema._parseSync({
           data: processed,
@@ -11699,7 +11782,7 @@ var ZodEffects = class extends ZodType {
           return INVALID;
         if (result.status === "dirty")
           return DIRTY(result.value);
-        if (status.value === "dirty")
+        if (status2.value === "dirty")
           return DIRTY(result.value);
         return result;
       }
@@ -11724,17 +11807,17 @@ var ZodEffects = class extends ZodType {
         if (inner.status === "aborted")
           return INVALID;
         if (inner.status === "dirty")
-          status.dirty();
+          status2.dirty();
         executeRefinement(inner.value);
-        return { status: status.value, value: inner.value };
+        return { status: status2.value, value: inner.value };
       } else {
         return this._def.schema._parseAsync({ data: ctx.data, path: ctx.path, parent: ctx }).then((inner) => {
           if (inner.status === "aborted")
             return INVALID;
           if (inner.status === "dirty")
-            status.dirty();
+            status2.dirty();
           return executeRefinement(inner.value).then(() => {
-            return { status: status.value, value: inner.value };
+            return { status: status2.value, value: inner.value };
           });
         });
       }
@@ -11752,13 +11835,13 @@ var ZodEffects = class extends ZodType {
         if (result instanceof Promise) {
           throw new Error(`Asynchronous transform encountered during synchronous parse operation. Use .parseAsync instead.`);
         }
-        return { status: status.value, value: result };
+        return { status: status2.value, value: result };
       } else {
         return this._def.schema._parseAsync({ data: ctx.data, path: ctx.path, parent: ctx }).then((base) => {
           if (!isValid(base))
             return INVALID;
           return Promise.resolve(effect.transform(base.value, checkCtx)).then((result) => ({
-            status: status.value,
+            status: status2.value,
             value: result
           }));
         });
@@ -11936,7 +12019,7 @@ var ZodBranded = class extends ZodType {
 };
 var ZodPipeline = class _ZodPipeline extends ZodType {
   _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+    const { status: status2, ctx } = this._processInputParams(input);
     if (ctx.common.async) {
       const handleAsync = async () => {
         const inResult = await this._def.in._parseAsync({
@@ -11947,7 +12030,7 @@ var ZodPipeline = class _ZodPipeline extends ZodType {
         if (inResult.status === "aborted")
           return INVALID;
         if (inResult.status === "dirty") {
-          status.dirty();
+          status2.dirty();
           return DIRTY(inResult.value);
         } else {
           return this._def.out._parseAsync({
@@ -11967,7 +12050,7 @@ var ZodPipeline = class _ZodPipeline extends ZodType {
       if (inResult.status === "aborted")
         return INVALID;
       if (inResult.status === "dirty") {
-        status.dirty();
+        status2.dirty();
         return {
           status: "dirty",
           value: inResult.value
@@ -28324,8 +28407,8 @@ var UrlElicitationRequiredError = class extends McpError {
 };
 
 // ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.29.0_zod@4.4.3/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
-function isTerminal(status) {
-  return status === "completed" || status === "failed" || status === "cancelled";
+function isTerminal(status2) {
+  return status2 === "completed" || status2 === "failed" || status2 === "cancelled";
 }
 
 // ../../node_modules/.pnpm/zod-to-json-schema@3.25.2_zod@4.4.3/node_modules/zod-to-json-schema/dist/esm/Options.js
@@ -30544,8 +30627,8 @@ var Protocol = class {
         }
         return task;
       },
-      storeTaskResult: async (taskId, status, result) => {
-        await taskStore.storeTaskResult(taskId, status, result, sessionId);
+      storeTaskResult: async (taskId, status2, result) => {
+        await taskStore.storeTaskResult(taskId, status2, result, sessionId);
         const task = await taskStore.getTask(taskId, sessionId);
         if (task) {
           const notification = TaskStatusNotificationSchema.parse({
@@ -30561,15 +30644,15 @@ var Protocol = class {
       getTaskResult: (taskId) => {
         return taskStore.getTaskResult(taskId, sessionId);
       },
-      updateTaskStatus: async (taskId, status, statusMessage) => {
+      updateTaskStatus: async (taskId, status2, statusMessage) => {
         const task = await taskStore.getTask(taskId, sessionId);
         if (!task) {
           throw new McpError(ErrorCode.InvalidParams, `Task "${taskId}" not found - it may have been cleaned up`);
         }
         if (isTerminal(task.status)) {
-          throw new McpError(ErrorCode.InvalidParams, `Cannot update task "${taskId}" from terminal status "${task.status}" to "${status}". Terminal states (completed, failed, cancelled) cannot transition to other states.`);
+          throw new McpError(ErrorCode.InvalidParams, `Cannot update task "${taskId}" from terminal status "${task.status}" to "${status2}". Terminal states (completed, failed, cancelled) cannot transition to other states.`);
         }
-        await taskStore.updateTaskStatus(taskId, status, statusMessage, sessionId);
+        await taskStore.updateTaskStatus(taskId, status2, statusMessage, sessionId);
         const updatedTask = await taskStore.getTask(taskId, sessionId);
         if (updatedTask) {
           const notification = TaskStatusNotificationSchema.parse({
@@ -32470,7 +32553,21 @@ function jsonResult(data) {
     ]
   };
 }
-function registerAllTools(server, ctx) {
+function expectedControlFlow(error51) {
+  const message = error51 instanceof Error ? error51.message : "";
+  return /^caveat not found:/.test(message) || /^community エントリは購読物/.test(message) || /^immutable frontmatter key:/.test(message);
+}
+function observeToolFailure(handler, productVersion = "0.0.0") {
+  return async (args) => {
+    try {
+      return jsonResult(await handler(args));
+    } catch (error51) {
+      if (!expectedControlFlow(error51)) observeRuntimeError("CAVEAT.MCP_TOOL_FAILED", { version: productVersion });
+      throw error51;
+    }
+  };
+}
+function registerAllTools(server, ctx, productVersion = "0.0.0") {
   server.registerTool(
     "caveat_search",
     {
@@ -32478,7 +32575,7 @@ function registerAllTools(server, ctx) {
       description: 'Search the "caveats" knowledge base \u2014 records of time-wasting traps someone already diagnosed, including external-spec issues (GPU/driver/CUDA versions, native-module builds, IDE/shell quirks, platform-specific behavior, library version incompatibilities) and reusable repo-specific context. Call this FIRST when a problem smells like a known trap \u2014 before reading stack traces top-to-bottom or trying fixes. Query: 3+ chars, plain tokens only (no OR/NEAR/other FTS5 operators). If it returns 0 hits, retry with synonyms and Japanese/English paraphrases. Returns summary rows including `{id, source}` \u2014 pass BOTH to caveat_get for the full body.',
       inputSchema: searchInputShape
     },
-    async (args) => jsonResult(handleSearch(ctx, args))
+    observeToolFailure((args) => handleSearch(ctx, args), productVersion)
   );
   server.registerTool(
     "caveat_get",
@@ -32487,7 +32584,7 @@ function registerAllTools(server, ctx) {
       description: 'Fetch the full body (frontmatter + H2 sections + text) of a caveat by id. IMPORTANT: when the id came from caveat_search, you MUST pass the `source` field from that same result (e.g., "community/Caveat"). The default source is "own" only; omitting source for a community entry returns not-found.',
       inputSchema: getInputShape
     },
-    async (args) => jsonResult(handleGet(ctx, args))
+    observeToolFailure((args) => handleGet(ctx, args), productVersion)
   );
   server.registerTool(
     "caveat_record",
@@ -32496,7 +32593,7 @@ function registerAllTools(server, ctx) {
       description: "Create a new caveat: a reusable record of a time-wasting trap (wrong driver, version mismatch, platform bug, IDE quirk, native-module issue, or repo-specific context) so future sessions can find it via caveat_search. REQUIRED BEFORE CALLING: run caveat_search first to avoid duplicates. Set visibility using this binary criterion: `public` if a third party could reproduce it; `private` if it is repo/workflow-specific or depends on intentional local design; when unclear, prefer `private`; follow an explicit user visibility choice. Qualifies: specific symptom + diagnosed cause (or `outcome: impossible` verdict) + environment fingerprint. Does NOT qualify: ordinary project-internal logic bugs, user preferences, session summaries, or ephemeral task notes; reusable repo-specific traps may be `private`. Auto-fills source_session and environment defaults; source_project is left null by design (shared knowledge must not leak per-user project names).",
       inputSchema: recordInputShape
     },
-    async (args) => jsonResult(handleRecord(ctx, args))
+    observeToolFailure((args) => handleRecord(ctx, args), productVersion)
   );
   server.registerTool(
     "caveat_update",
@@ -32505,7 +32602,7 @@ function registerAllTools(server, ctx) {
       description: "Patch an existing caveat \u2014 use when newer evidence extends or corrects one that already exists. Frontmatter shallow-merges, but array fields (tags etc.) REPLACE rather than append \u2014 to add one tag, read the current list first, then patch with the full new array. Sections match by case-insensitive H2 heading. When changing `Symptom`, preserve raw errors verbatim and add stable Japanese/English symptom keywords when known; do not force or guess translations. Immutable keys: id, created_at, source_session, source_project. Common uses: bump `last_verified` after re-confirming, add a resolution when it was `tentative`, flip `outcome` to `impossible`.",
       inputSchema: updateInputShape
     },
-    async (args) => jsonResult(handleUpdate(ctx, args))
+    observeToolFailure((args) => handleUpdate(ctx, args), productVersion)
   );
   server.registerTool(
     "caveat_list_recent",
@@ -32514,7 +32611,7 @@ function registerAllTools(server, ctx) {
       description: "List caveats ordered by updated_at DESC. Use for browsing recent additions \u2014 e.g., showing the user what is new after caveat_pull. Not for search; use caveat_search when you have a query.",
       inputSchema: listRecentInputShape
     },
-    async (args) => jsonResult(handleListRecent(ctx, args))
+    observeToolFailure((args) => handleListRecent(ctx, args), productVersion)
   );
   server.registerTool(
     "caveat_pull",
@@ -32523,7 +32620,7 @@ function registerAllTools(server, ctx) {
       description: "git-pull every subscribed community caveat repo (added via `caveat community add`) and re-index. Call when: (a) the user explicitly asks about others' knowledge on a topic, or (b) caveat_search returned empty for a query that feels like it should have hits and a subscribed repo might be stale. Do NOT call reflexively at session start \u2014 it is cheap but not free, and stale-by-minutes is acceptable. Safe and idempotent.",
       inputSchema: pullInputShape
     },
-    async (args) => jsonResult(await handlePull(ctx, args))
+    observeToolFailure((args) => handlePull(ctx, args), productVersion)
   );
 }
 
@@ -32534,7 +32631,7 @@ async function startMcpStdioServer(overrides = {}) {
     { name: "caveat", version: "0.0.0" },
     { capabilities: { tools: {} } }
   );
-  registerAllTools(server, ctx);
+  registerAllTools(server, ctx, overrides.productVersion);
   const transport = new StdioServerTransport();
   await server.connect(transport);
   const shutdown = () => {
@@ -32560,7 +32657,12 @@ if (invokedPath && thisPath && invokedPath.toLowerCase() === thisPath.toLowerCas
 
 // src/commands/mcpServer.ts
 async function runMcpServer() {
-  await startMcpStdioServer();
+  try {
+    await startMcpStdioServer({ productVersion: CAVEAT_VERSION });
+  } catch (error51) {
+    observeRuntimeError("CAVEAT.MCP_SERVER_FAILED", { version: CAVEAT_VERSION });
+    throw error51;
+  }
 }
 
 // src/commands/hookCmd.ts
@@ -32573,7 +32675,7 @@ import {
   mkdirSync as mkdirSync5,
   readdirSync as readdirSync2,
   readFileSync as readFileSync5,
-  realpathSync as realpathSync2,
+  realpathSync as realpathSync4,
   rmSync as rmSync2,
   writeFileSync as writeFileSync5
 } from "node:fs";
@@ -32606,14 +32708,14 @@ function maybeTriggerAutoReindex(ctx) {
 
 // src/autoSyncTrigger.ts
 import { spawn as spawn2 } from "node:child_process";
-import { existsSync as existsSync9, statSync } from "node:fs";
+import { existsSync as existsSync9, statSync as statSync3 } from "node:fs";
 import { join as join11 } from "node:path";
 function maybeTriggerAutoSync(ctx) {
   if (process.env[CAVEAT_AUTO_SYNC_ENV] === "off") return;
   const statePath = join11(ctx.caveatHome, "sync", ".last-autosync.json");
   const debounceMs = Number(process.env.CAVEAT_AUTO_SYNC_DEBOUNCE_MS ?? AUTO_SYNC_DEBOUNCE_MS);
   try {
-    if (existsSync9(statePath) && Date.now() - statSync(statePath).mtimeMs < debounceMs) return;
+    if (existsSync9(statePath) && Date.now() - statSync3(statePath).mtimeMs < debounceMs) return;
   } catch {
   }
   const cliScript = process.argv[1];
@@ -32650,6 +32752,7 @@ function parsePayload(raw) {
   try {
     return JSON.parse(raw);
   } catch (err) {
+    observeRuntimeError("CAVEAT.CLAUDE_HOOK_FAILED", { version: CAVEAT_VERSION });
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:hook] json parse error: ${msg}
 `);
@@ -32664,14 +32767,17 @@ function buildContextSafely() {
   try {
     return buildContext(silentLogger);
   } catch (err) {
+    observeRuntimeError("CAVEAT.CLAUDE_HOOK_FAILED", { version: CAVEAT_VERSION });
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:hook] context error: ${msg}
 `);
     return null;
   }
 }
-function searchCaveatsFromTextSafely(text, surface) {
-  if (!text) return [];
+function searchCaveatsSafely(input) {
+  const inputs = Array.isArray(input) ? input : [input];
+  const queryForLog = inputs.map((item) => item.surface === "user_prompt" ? item.topicText || item.failureText : item.failureText).filter(Boolean).join("\n");
+  if (inputs.length === 0 || inputs.every((item) => !item.topicText && !item.failureText)) return [];
   let db;
   let caveatHome;
   let hits;
@@ -32680,10 +32786,12 @@ function searchCaveatsFromTextSafely(text, surface) {
     if (!ctx || !existsSync10(ctx.paths.dbPath)) return [];
     caveatHome = ctx.caveatHome;
     db = openDb({ path: ctx.paths.dbPath });
-    hits = findCaveatsForPrompt(db, text, {
+    const searchOptions = {
       selfIdentity: defaultSelfIdentityTokens()
-    });
+    };
+    hits = inputs.length === 1 ? findCaveatsForHook(db, inputs[0], searchOptions) : findCaveatsForHookSegments(db, inputs, searchOptions);
   } catch (err) {
+    observeRuntimeError("CAVEAT.CLAUDE_HOOK_FAILED", { version: CAVEAT_VERSION });
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:hook] search error: ${msg}
 `);
@@ -32693,14 +32801,16 @@ function searchCaveatsFromTextSafely(text, surface) {
     try {
       markHit(db, hits);
     } catch (err) {
+      observeRuntimeError("CAVEAT.CLAUDE_HOOK_FAILED", { version: CAVEAT_VERSION });
       const msg = err instanceof Error ? err.message : String(err);
       process.stderr.write(`[caveat:hook] markHit error: ${msg}
 `);
     }
   } else {
     try {
-      logHookQueryMiss({ caveatHome, agent: "claude", surface, query: text });
+      logHookQueryMiss({ caveatHome, agent: "claude", surface: inputs[0].surface, query: queryForLog });
     } catch (err) {
+      observeRuntimeError("CAVEAT.CLAUDE_HOOK_FAILED", { version: CAVEAT_VERSION });
       const msg = err instanceof Error ? err.message : String(err);
       process.stderr.write(`[caveat:hook] query log error: ${msg}
 `);
@@ -32725,13 +32835,19 @@ function loadSignalsSafely(path) {
 function systemReminderOutput(text) {
   return `<system-reminder>${text.replace(/</g, "\u2039").replace(/>/g, "\u203A")}</system-reminder>`;
 }
+function claudePendingCleanupFailureText() {
+  return "[caveat:hook] pending reminder cleanup failed";
+}
 function drainForSession(sessionId) {
   const ctx = buildContextSafely();
   if (!ctx) return [];
-  return [
-    ...drainPendingReminders(ctx.caveatHome, sessionId),
-    ...drainGlobalPendingReminders(ctx.caveatHome)
-  ];
+  const local = drainPendingRemindersDetailed(ctx.caveatHome, sessionId);
+  const global = drainPendingRemindersDetailed(ctx.caveatHome, "_global");
+  for (const _failure of [...local.cleanupFailures, ...global.cleanupFailures]) {
+    process.stderr.write(`${claudePendingCleanupFailureText()}
+`);
+  }
+  return [...local.reminders, ...global.reminders];
 }
 function claudeContextDedupeKey(text) {
   if (text.startsWith(CLAUDE_STOP_REMINDER_PREFIX)) return "claude-stop-reminder";
@@ -32750,7 +32866,7 @@ function compactClaudeContexts(contexts) {
   }
   selected.reverse();
   const limited = selected.slice(-CLAUDE_MAX_CONTEXT_BLOCKS);
-  const omitted = contexts.filter((t) => t.trim().length > 0).length - limited.length;
+  const omitted = selected.length - limited.length;
   if (omitted > 0) {
     limited.push(
       `[caveat] pending reminder ${omitted} \u4EF6\u3092\u91CD\u8907\u307E\u305F\u306F\u4E0A\u9650\u306B\u3088\u308A\u7701\u7565\u3057\u307E\u3057\u305F\u3002`
@@ -32795,8 +32911,20 @@ function queueStopForSession(sessionId, signals, related) {
   if (!ctx) return;
   const key = stopSignalKey(signals, related);
   if (wasStopReminderQueued(ctx.caveatHome, sessionId, key)) return;
+  let result;
+  try {
+    result = buildAndPublishPendingReminder(ctx.caveatHome, sessionId, buildPendingSemanticKey({
+      agent: "claude",
+      surface: "stop",
+      refs: related,
+      stopSignalDigest: key
+    }), () => buildStopReminder(signals, related));
+  } catch {
+    process.stderr.write("[caveat:hook] pending reminder build or publish failed\n");
+    return;
+  }
+  if (!result.ran) return;
   try {
-    appendPendingReminder(ctx.caveatHome, sessionId, buildStopReminder(signals, related));
     markStopReminderQueued(ctx.caveatHome, sessionId, key);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -32827,6 +32955,20 @@ function extractToolResponseText(response) {
   }
   return "";
 }
+function toolTopicText(payload) {
+  const parts = [];
+  const toolName = payload.tool_name ?? payload.toolName;
+  if (typeof toolName === "string") parts.push(toolName);
+  const input = payload.tool_input ?? payload.toolInput;
+  if (typeof input === "string") parts.push(input);
+  if (input !== null && typeof input === "object" && !Array.isArray(input)) {
+    const record2 = input;
+    for (const key of ["command", "cmd", "query", "url"]) {
+      if (typeof record2[key] === "string") parts.push(record2[key]);
+    }
+  }
+  return parts.join("\n");
+}
 function isToolError(payload) {
   if (payload.hook_event_name === "PostToolUseFailure") return true;
   const resp = payload.tool_response ?? payload.toolResponse;
@@ -32850,7 +32992,7 @@ function spawnWorker(job) {
     workDir = mkdtempSync2(join12(root, "job-"));
     chmodSync(workDir, 448);
     workFile = join12(workDir, `${randomBytes(4).toString("hex")}.json`);
-    writeFileSync5(workFile, JSON.stringify({ ...job, schemaVersion: "caveat-worker-job/v1" }), { encoding: "utf-8", mode: 384, flag: "wx" });
+    writeFileSync5(workFile, JSON.stringify({ ...job, schemaVersion: "caveat-worker-job/v2" }), { encoding: "utf-8", mode: 384, flag: "wx" });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:hook] worker writefile error: ${msg}
@@ -32894,15 +33036,27 @@ async function runWorker(workFile) {
   } catch {
     process.exit(0);
   }
-  if (!job.searchText || !job.sessionId) process.exit(0);
-  const hits = searchCaveatsFromTextSafely(job.searchText, "tool_error");
+  if (!job.failureText || !job.sessionId) process.exit(0);
+  const hits = searchCaveatsSafely({
+    topicText: job.topicText,
+    failureText: job.failureText,
+    surface: "tool_error"
+  });
   if (hits.length === 0) process.exit(0);
   const ctx = buildContextSafely();
   if (!ctx) process.exit(0);
+  let result;
   try {
-    appendPendingReminder(ctx.caveatHome, job.sessionId, buildToolErrorReminder(job, hits));
+    result = buildAndPublishPendingReminder(ctx.caveatHome, job.sessionId, buildPendingSemanticKey({
+      agent: "claude",
+      surface: "tool_error",
+      refs: hits
+    }), () => buildToolErrorReminder(job, hits));
   } catch {
+    process.stderr.write("[caveat:hook] pending reminder build or publish failed\n");
+    process.exit(0);
   }
+  if (!result.ran) process.exit(0);
   process.exit(0);
 }
 function cleanupWorkerDir(workDir, root) {
@@ -32916,8 +33070,8 @@ function isOwnedWorkerDir(path, root = workerRoot()) {
   try {
     const inputStat = lstatSync(path);
     if (inputStat.isSymbolicLink()) return false;
-    const tmpRoot = realpathSync2(root);
-    const resolved = realpathSync2(path);
+    const tmpRoot = realpathSync4(root);
+    const resolved = realpathSync4(path);
     const stat = lstatSync(resolved);
     const uid = typeof process.getuid === "function" ? process.getuid() : void 0;
     return dirname6(resolved) === tmpRoot && basename(resolved).startsWith("job-") && stat.isDirectory() && !stat.isSymbolicLink() && hasPrivateOwnership(stat, uid);
@@ -32969,12 +33123,20 @@ function isStaleWorkerJobDir(path) {
   const stat = lstatSync(file2);
   const uid = typeof process.getuid === "function" ? process.getuid() : void 0;
   if (!stat.isFile() || stat.isSymbolicLink() || !hasPrivateOwnership(stat, uid)) return false;
-  return isWorkerJob(JSON.parse(readFileSync5(file2, "utf-8")));
+  return isKnownStaleWorkerJob(JSON.parse(readFileSync5(file2, "utf-8")));
 }
 function hasPrivateOwnership(stat, uid) {
   return process.platform === "win32" || (stat.mode & 63) === 0 && (uid === void 0 || stat.uid === uid);
 }
 function isWorkerJob(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const job = value;
+  const keys = Object.keys(job).sort();
+  if (!(keys.length === 4 && keys.join(",") === "failureText,schemaVersion,sessionId,topicText") && !(keys.length === 5 && keys.join(",") === "additionalContext,failureText,schemaVersion,sessionId,topicText")) return false;
+  return job.schemaVersion === "caveat-worker-job/v2" && typeof job.sessionId === "string" && typeof job.topicText === "string" && typeof job.failureText === "string" && (job.additionalContext === void 0 || job.additionalContext !== null && typeof job.additionalContext === "object" && !Array.isArray(job.additionalContext));
+}
+function isKnownStaleWorkerJob(value) {
+  if (isWorkerJob(value)) return true;
   if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
   const job = value;
   const keys = Object.keys(job).sort();
@@ -33070,7 +33232,7 @@ function buildToolErrorReminder(job, hits) {
   const hasSidecarConfig = existsSync10(join12(projectRoot, ".codex-sidecar.yml"));
   if (mode === "auto" && !hasSidecarConfig) return base;
   const advisory = runCodexSidecarAdvisory({
-    searchText: job.searchText,
+    searchText: job.failureText,
     limit: hits.length,
     projectRoot,
     prompt: [
@@ -33170,7 +33332,7 @@ async function runHook(name, arg) {
   const contexts = name === "stop" ? [] : drainForSession(sessionId);
   if (name === "user-prompt-submit") {
     const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
-    const hits = searchCaveatsFromTextSafely(prompt, "user_prompt");
+    const hits = searchCaveatsSafely({ topicText: prompt, failureText: prompt, surface: "user_prompt" });
     if (hits.length > 0) {
       contexts.push(userPromptSubmitReminderText(hits));
     }
@@ -33198,7 +33360,8 @@ async function runHook(name, arg) {
         toolName: payload.tool_name ?? payload.toolName,
         failureKind
       });
-      spawnWorker({ sessionId, searchText: errText, ...additionalContext ? { additionalContext } : {} });
+      const topicText = toolTopicText(payload);
+      spawnWorker({ sessionId, topicText, failureText: errText, ...additionalContext ? { additionalContext } : {} });
     }
     process.exit(0);
   }
@@ -33231,7 +33394,11 @@ async function runHook(name, arg) {
     const transcriptPath = typeof payload.transcript_path === "string" ? payload.transcript_path : "";
     const signals = transcriptPath ? loadSignalsSafely(transcriptPath) : null;
     if (!signals || !hasAnyStruggleSignal(signals)) process.exit(0);
-    const related = searchCaveatsFromTextSafely(struggleSearchText(signals), "stop");
+    const related = searchCaveatsSafely(signals.errorSnippets.map((failureText) => ({
+      topicText: "",
+      failureText,
+      surface: "stop"
+    })));
     queueStopForSession(sessionId, signals, related);
     process.exit(0);
   }
@@ -33269,6 +33436,7 @@ function parsePayload2(raw) {
   try {
     return JSON.parse(raw);
   } catch (err) {
+    observeRuntimeError("CAVEAT.CODEX_HOOK_FAILED", { version: CAVEAT_VERSION });
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:codex-hook] json parse error: ${msg}
 `);
@@ -33279,14 +33447,17 @@ function buildContextSafely2() {
   try {
     return buildContext(silentLogger2);
   } catch (err) {
+    observeRuntimeError("CAVEAT.CODEX_HOOK_FAILED", { version: CAVEAT_VERSION });
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:codex-hook] context error: ${msg}
 `);
     return null;
   }
 }
-function searchCaveatsFromTextSafely2(text, surface) {
-  if (!text) return [];
+function searchCaveatsSafely2(input) {
+  const inputs = Array.isArray(input) ? input : [input];
+  const queryForLog = inputs.map((item) => item.surface === "user_prompt" ? item.topicText || item.failureText : item.failureText).filter(Boolean).join("\n");
+  if (inputs.length === 0 || inputs.every((item) => !item.topicText && !item.failureText)) return [];
   let db;
   let caveatHome;
   let hits;
@@ -33295,10 +33466,12 @@ function searchCaveatsFromTextSafely2(text, surface) {
     if (!ctx || !existsSync11(ctx.paths.dbPath)) return [];
     caveatHome = ctx.caveatHome;
     db = openDb({ path: ctx.paths.dbPath });
-    hits = findCaveatsForPrompt(db, text, {
+    const searchOptions = {
       selfIdentity: defaultSelfIdentityTokens()
-    });
+    };
+    hits = inputs.length === 1 ? findCaveatsForHook(db, inputs[0], searchOptions) : findCaveatsForHookSegments(db, inputs, searchOptions);
   } catch (err) {
+    observeRuntimeError("CAVEAT.CODEX_HOOK_FAILED", { version: CAVEAT_VERSION });
     const msg = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[caveat:codex-hook] search error: ${msg}
 `);
@@ -33308,14 +33481,16 @@ function searchCaveatsFromTextSafely2(text, surface) {
     try {
       markHit(db, hits);
     } catch (err) {
+      observeRuntimeError("CAVEAT.CODEX_HOOK_FAILED", { version: CAVEAT_VERSION });
       const msg = err instanceof Error ? err.message : String(err);
       process.stderr.write(`[caveat:codex-hook] markHit error: ${msg}
 `);
     }
   } else {
     try {
-      logHookQueryMiss({ caveatHome, agent: "codex", surface, query: text });
+      logHookQueryMiss({ caveatHome, agent: "codex", surface: inputs[0].surface, query: queryForLog });
     } catch (err) {
+      observeRuntimeError("CAVEAT.CODEX_HOOK_FAILED", { version: CAVEAT_VERSION });
       const msg = err instanceof Error ? err.message : String(err);
       process.stderr.write(`[caveat:codex-hook] query log error: ${msg}
 `);
@@ -33443,15 +33618,17 @@ function buildCodexPostToolUseWorkerJob(payload) {
   const responseText = extractToolResponseText2(payload.tool_response ?? payload.toolResponse);
   const inputText = toolInputText(payload.tool_input);
   const transcriptOutput = transcriptPath && toolUseId ? transcriptToolOutput(transcriptPath, toolUseId) : null;
-  const searchText = [inputText, responseText, transcriptOutput ?? ""].map((s) => s.trim()).filter(Boolean).join("\n");
+  const topicText = inputText.trim();
+  const failureText = [responseText, transcriptOutput ?? ""].map((s) => s.trim()).filter(Boolean).join("\n");
   const knownError = isCodexToolError(payload);
   if (knownError) {
-    return { sessionId, searchText, knownError: true, transcriptPath, toolUseId };
+    return { sessionId, topicText, failureText, knownError: true, transcriptPath, toolUseId };
   }
-  if (transcriptPath && toolUseId && isShellLikeTool(payload) && searchText) {
+  if (transcriptPath && toolUseId && isShellLikeTool(payload) && (topicText || failureText)) {
     return {
       sessionId,
-      searchText,
+      topicText,
+      failureText,
       knownError: false,
       allowSymptomOnly: true,
       transcriptPath,
@@ -33468,13 +33645,19 @@ function codexContextOutput(text, eventName = "UserPromptSubmit") {
     }
   });
 }
+function codexPendingCleanupFailureText() {
+  return "[caveat:codex-hook] pending reminder cleanup failed";
+}
 function drainForSession2(sessionId) {
   const ctx = buildContextSafely2();
   if (!ctx) return [];
-  return [
-    ...drainPendingReminders(ctx.caveatHome, sessionId),
-    ...drainGlobalPendingReminders(ctx.caveatHome)
-  ];
+  const local = drainPendingRemindersDetailed(ctx.caveatHome, sessionId);
+  const global = drainPendingRemindersDetailed(ctx.caveatHome, "_global");
+  for (const _failure of [...local.cleanupFailures, ...global.cleanupFailures]) {
+    process.stderr.write(`${codexPendingCleanupFailureText()}
+`);
+  }
+  return [...local.reminders, ...global.reminders];
 }
 function codexContextDedupeKey(text) {
   if (text.startsWith(CODEX_STOP_REMINDER_PREFIX)) return "codex-stop-reminder";
@@ -33493,7 +33676,7 @@ function compactCodexContexts(contexts) {
   }
   selected.reverse();
   const limited = selected.slice(-CODEX_MAX_CONTEXT_BLOCKS);
-  const omitted = contexts.filter((t) => t.trim().length > 0).length - limited.length;
+  const omitted = selected.length - limited.length;
   if (omitted > 0) {
     limited.push(`[caveat] pending reminder ${omitted} \u4EF6\u3092\u91CD\u8907\u307E\u305F\u306F\u4E0A\u9650\u306B\u3088\u308A\u7701\u7565\u3057\u307E\u3057\u305F\u3002`);
   }
@@ -33536,8 +33719,20 @@ function queueStopForSession2(sessionId, signals, related) {
   if (!ctx) return;
   const key = stopSignalKey2(signals, related);
   if (wasStopReminderQueued2(ctx.caveatHome, sessionId, key)) return;
+  let result;
+  try {
+    result = buildAndPublishPendingReminder(ctx.caveatHome, sessionId, buildPendingSemanticKey({
+      agent: "codex",
+      surface: "stop",
+      refs: related,
+      stopSignalDigest: key
+    }), () => stopReminderText(signals, related));
+  } catch {
+    process.stderr.write("[caveat:codex-hook] pending reminder build or publish failed\n");
+    return;
+  }
+  if (!result.ran) return;
   try {
-    appendPendingReminder(ctx.caveatHome, sessionId, stopReminderText(signals, related));
     markStopReminderQueued2(ctx.caveatHome, sessionId, key);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -33555,8 +33750,8 @@ async function waitForTranscriptOutput(transcriptPath, toolUseId) {
   return null;
 }
 async function processCodexWorkerJob(job, opts = { waitForTranscript: true }) {
-  if (!job.searchText || !job.sessionId) return;
-  let searchText = job.searchText;
+  if (!job.topicText && !job.failureText || !job.sessionId) return;
+  let failureText = job.failureText;
   let knownError = job.knownError === true;
   if (opts.waitForTranscript && job.transcriptPath && job.toolUseId) {
     const transcriptOutput = await waitForTranscriptOutput(job.transcriptPath, job.toolUseId);
@@ -33566,18 +33761,30 @@ async function processCodexWorkerJob(job, opts = { waitForTranscript: true }) {
         if (exit2 === 0) return;
         knownError = true;
       }
-      searchText = [searchText, transcriptOutput].filter(Boolean).join("\n");
+      failureText = [failureText, transcriptOutput].filter(Boolean).join("\n");
     }
   }
   if (!knownError && job.allowSymptomOnly !== true) return;
-  const hits = searchCaveatsFromTextSafely2(searchText, "tool_error");
+  const hits = searchCaveatsSafely2({
+    topicText: job.topicText,
+    failureText,
+    surface: "tool_error"
+  });
   if (hits.length === 0) return;
   const ctx = buildContextSafely2();
   if (!ctx) return;
+  let result;
   try {
-    appendPendingReminder(ctx.caveatHome, job.sessionId, toolErrorReminderText(hits));
+    result = buildAndPublishPendingReminder(ctx.caveatHome, job.sessionId, buildPendingSemanticKey({
+      agent: "codex",
+      surface: "tool_error",
+      refs: hits
+    }), () => toolErrorReminderText(hits));
   } catch {
+    process.stderr.write("[caveat:codex-hook] pending reminder build or publish failed\n");
+    return;
   }
+  if (!result.ran) return;
 }
 async function runCodexWorker(workFile) {
   let raw;
@@ -33649,7 +33856,7 @@ async function runCodexHook(name, arg) {
   if (name === "user-prompt-submit") {
     const contexts = sessionId ? drainForSession2(sessionId) : [];
     const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
-    const hits = searchCaveatsFromTextSafely2(prompt, "user_prompt");
+    const hits = searchCaveatsSafely2({ topicText: prompt, failureText: prompt, surface: "user_prompt" });
     if (hits.length > 0) {
       contexts.push(userPromptSubmitReminderText(hits));
     }
@@ -33694,7 +33901,11 @@ async function runCodexHook(name, arg) {
     const transcriptPath = typeof payload.transcript_path === "string" ? payload.transcript_path : "";
     const signals = transcriptPath ? loadSignalsSafely2(transcriptPath) : null;
     if (!signals || !hasAnyStruggleSignal(signals)) process.exit(0);
-    const related = searchCaveatsFromTextSafely2(struggleSearchText(signals), "stop");
+    const related = searchCaveatsSafely2(signals.errorSnippets.map((failureText) => ({
+      topicText: "",
+      failureText,
+      surface: "stop"
+    })));
     if (sessionId) queueStopForSession2(sessionId, signals, related);
     process.exit(0);
   }
@@ -33751,6 +33962,11 @@ async function defaultPrivateRepoUrl(opts, deps) {
   });
 }
 async function runSync(ctx, opts, dependencies = {}) {
+  if (opts.repo && (opts.init === void 0 || opts.init === false)) {
+    ctx.logger.error("--repo requires --init");
+    process.exitCode = 1;
+    return;
+  }
   try {
     const ghRunner = dependencies.ghRunner ?? runGh;
     const isTty = dependencies.isTty ?? (() => Boolean(process.stdin.isTTY));
@@ -33771,7 +33987,6 @@ async function runSync(ctx, opts, dependencies = {}) {
       );
       return;
     }
-    if (opts.repo) throw new Error("--repo requires --init");
     const result = await syncOwn({
       ownDir: ctx.paths.knowledgeRepo,
       caveatHome: ctx.caveatHome,
@@ -33793,6 +34008,7 @@ async function runSync(ctx, opts, dependencies = {}) {
       }
     }
   } catch (err) {
+    observeRuntimeError("CAVEAT.SYNC_FAILED", { version: CAVEAT_VERSION });
     const message = err instanceof Error ? err.message : String(err);
     ctx.logger.error(message);
     process.exitCode = 1;
@@ -33801,7 +34017,7 @@ async function runSync(ctx, opts, dependencies = {}) {
 
 // src/commands/codexSidecar.ts
 import { spawnSync as spawnSync6 } from "node:child_process";
-import { closeSync, constants, fstatSync, lstatSync as lstatSync2, mkdirSync as mkdirSync7, mkdtempSync as mkdtempSync3, openSync, readSync as readSync2, realpathSync as realpathSync3, rmSync as rmSync3, writeFileSync as writeFileSync7 } from "node:fs";
+import { closeSync, constants as constants3, fstatSync, lstatSync as lstatSync2, mkdirSync as mkdirSync7, mkdtempSync as mkdtempSync3, openSync, readSync as readSync2, realpathSync as realpathSync5, rmSync as rmSync3, writeFileSync as writeFileSync7 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 import { basename as basename2, dirname as dirname7, join as join14 } from "node:path";
 import { cwd, exit } from "node:process";
@@ -33837,7 +34053,7 @@ function runCodexSidecarWithCaveats(ctx, workflow, prompt, opts) {
   }
   const contextDir = mkdtempSync3(join14(tmpdir4(), "caveat-sidecar-context-"));
   const contextFile = join14(contextDir, "context.json");
-  let status = 1;
+  let status2 = 1;
   try {
     const blocks = collectCaveatContextBlocks(ctx, {
       query: opts.query ?? prompt ?? "",
@@ -33855,11 +34071,11 @@ function runCodexSidecarWithCaveats(ctx, workflow, prompt, opts) {
       contextFile,
       cli: cliSpec(opts)
     });
-    status = executePlan(ctx.logger, plan.command, plan.args, { saveResult: opts.saveResult });
+    status2 = executePlan(ctx.logger, plan.command, plan.args, { saveResult: opts.saveResult });
   } finally {
     rmSync3(contextDir, { recursive: true, force: true });
   }
-  exit(status);
+  exit(status2);
 }
 var MAX_ADDITIONAL_CONTEXT_BYTES = 4096;
 function readHookSignalAdditionalContextFile(path, testProbe) {
@@ -33869,7 +34085,7 @@ function readHookSignalAdditionalContextFile(path, testProbe) {
   const uid = typeof process.getuid === "function" ? process.getuid() : void 0;
   assertPrivateRegular(before, uid, platform);
   testProbe?.afterLstat?.();
-  const fd = openSync(path, constants.O_RDONLY | constants.O_NONBLOCK | (constants.O_NOFOLLOW ?? 0));
+  const fd = openSync(path, constants3.O_RDONLY | constants3.O_NONBLOCK | (constants3.O_NOFOLLOW ?? 0));
   let raw;
   try {
     const opened = fstatSync(fd);
@@ -33908,8 +34124,8 @@ function assertWindowsPrivateTempContainer(path, platform) {
   if (platform !== "win32") return;
   const parent = dirname7(path);
   const parentStat = lstatSync2(parent);
-  const resolvedParent = realpathSync3(parent);
-  const resolvedTemp = realpathSync3(tmpdir4());
+  const resolvedParent = realpathSync5(parent);
+  const resolvedTemp = realpathSync5(tmpdir4());
   if (parentStat.isSymbolicLink() || !parentStat.isDirectory() || dirname7(resolvedParent) !== resolvedTemp || !basename2(resolvedParent).startsWith("caveat-")) {
     throw new Error("additional context file must be inside a reserved per-user Caveat temporary directory");
   }
@@ -34086,12 +34302,200 @@ function runCommunityRemove(ctx, handle, opts) {
   }
 }
 
+// src/commands/factoryDiagnostics.ts
+import { execFileSync } from "node:child_process";
+import { existsSync as existsSync13, readFileSync as readFileSync7 } from "node:fs";
+import { join as join15 } from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import { parse as parseToml2 } from "smol-toml";
+var status = (ok, reason) => ({ status: ok ? "ready" : "not_ready", reason_code: ok ? "ready" : reason });
+var unverified = (reason) => ({ status: "unverified", reason_code: reason });
+function hook(present) {
+  return status(present, "not_installed");
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function claudeRegistration(home, nodePath, cliScriptPath) {
+  const path = join15(home, ".claude.json");
+  if (!existsSync13(path)) return status(false, "not_registered");
+  try {
+    const value = JSON.parse(readFileSync7(path, "utf8"));
+    if (!isRecord2(value) || !isRecord2(value.mcpServers)) return status(false, "not_registered");
+    return status(isCaveatClaudeMcpRegistration(value.mcpServers.caveat, nodePath, cliScriptPath), "not_registered");
+  } catch {
+    return unverified("config_unreadable");
+  }
+}
+function claudeHooks(home, nodePath, cliScriptPath) {
+  try {
+    const settings = JSON.parse(readFileSync7(join15(home, ".claude", "settings.json"), "utf8"));
+    const present = (event, subcommand) => settings.hooks?.[event]?.some((entry) => entry.hooks?.some((item) => typeof item.command === "string" && isCanonicalCaveatClaudeHookCommand(item.command, subcommand, nodePath, cliScriptPath))) ?? false;
+    return { user_prompt_submit: hook(present("UserPromptSubmit", "user-prompt-submit")), post_tool_use: hook(present("PostToolUse", "post-tool-use")), post_tool_use_failure: hook(present("PostToolUseFailure", "post-tool-use")), stop: hook(present("Stop", "stop")) };
+  } catch {
+    const bad = unverified("config_unreadable");
+    return { user_prompt_submit: { ...bad }, post_tool_use: { ...bad }, post_tool_use_failure: { ...bad }, stop: { ...bad } };
+  }
+}
+var EXPECTED_SEARCH_SQL = /* @__PURE__ */ new Map([
+  ["entries_fts", "create virtual table entries_fts using fts5( id unindexed, title, body, tags, content='entries', content_rowid='rowid', tokenize='trigram' )"],
+  ["entries_ai", "create trigger entries_ai after insert on entries begin insert into entries_fts(rowid, id, title, body, tags) values (new.rowid, new.id, new.title, new.body, new.tags); end"],
+  ["entries_ad", "create trigger entries_ad after delete on entries begin insert into entries_fts(entries_fts, rowid, id, title, body, tags) values('delete', old.rowid, old.id, old.title, old.body, old.tags); end"],
+  ["entries_au", "create trigger entries_au after update on entries begin insert into entries_fts(entries_fts, rowid, id, title, body, tags) values('delete', old.rowid, old.id, old.title, old.body, old.tags); insert into entries_fts(rowid, id, title, body, tags) values (new.rowid, new.id, new.title, new.body, new.tags); end"]
+]);
+function strictSearchSchema(db) {
+  const normalize = (sql) => (sql ?? "").toLowerCase().replace(/\s+/g, " ");
+  const objects = db.prepare("SELECT name, sql FROM sqlite_master WHERE name = 'entries_fts' OR (type = 'trigger' AND tbl_name = 'entries')").all();
+  if (objects.length !== EXPECTED_SEARCH_SQL.size || objects.some((object3) => normalize(object3.sql) !== EXPECTED_SEARCH_SQL.get(object3.name))) return false;
+  const columns = db.prepare("PRAGMA table_xinfo(entries_fts)").all();
+  return columns.map((column) => `${column.name}:${column.hidden}`).join(",") === "id:0,title:0,body:0,tags:0,entries_fts:1,rank:1";
+}
+function database(path) {
+  if (!existsSync13(path)) return { status: "not_ready", reason_code: "missing", schema_version: null, supported_schema_version: 3, migration_status: "unverified" };
+  try {
+    const db = new DatabaseSync(path, { readOnly: true });
+    try {
+      const row = db.prepare("PRAGMA user_version").get();
+      const columns = db.prepare("PRAGMA table_info(entries)").all().map((entry) => entry.name);
+      const expectedColumns = ["rowid", "id", "source", "path", "title", "body", "frontmatter_json", "tags", "confidence", "visibility", "file_mtime", "indexed_at", "last_hit_at", "topical_text", "symptom_text"];
+      const objects = db.prepare("SELECT type, name, tbl_name, sql FROM sqlite_master WHERE name = 'entries_fts' OR (type = 'trigger' AND tbl_name = 'entries')").all();
+      const normalized = (sql) => (sql ?? "").toLowerCase().replace(/\s+/g, " ");
+      const ftsSql = normalized(objects.find((entry) => entry.type === "table" && entry.name === "entries_fts")?.sql ?? null);
+      const fts = ftsSql.startsWith("create virtual table entries_fts using fts5(") && ftsSql.includes("content='entries'") && ftsSql.includes("content_rowid='rowid'") && ftsSql.includes("tokenize='trigram'");
+      const triggers = new Map(objects.filter((entry) => entry.type === "trigger").map((entry) => [entry.name, normalized(entry.sql)]));
+      const triggerShape = triggers.size === 3 && triggers.get("entries_ai")?.includes("after insert on entries") && triggers.get("entries_ai")?.includes("insert into entries_fts") && triggers.get("entries_ad")?.includes("after delete on entries") && triggers.get("entries_ad")?.includes("values('delete'") && triggers.get("entries_au")?.includes("after update on entries") && triggers.get("entries_au")?.includes("values('delete'") && (triggers.get("entries_au")?.match(/insert into entries_fts/g)?.length ?? 0) === 2;
+      const indexes = db.prepare("PRAGMA index_list(entries)").all();
+      const uniqueSourceId = indexes.some((index) => index.unique === 1 && db.prepare(`PRAGMA index_info(${JSON.stringify(index.name)})`).all().map((part) => part.name).join(",") === "source,id");
+      const current = row.user_version === 3 && columns.join(",") === expectedColumns.join(",") && fts && Boolean(triggerShape) && uniqueSourceId && strictSearchSchema(db);
+      return { status: current ? "ready" : "not_ready", reason_code: current ? "ready" : "schema_contract_mismatch", schema_version: row.user_version, supported_schema_version: 3, migration_status: current ? "current" : "failed" };
+    } finally {
+      db.close();
+    }
+  } catch {
+    return { status: "unverified", reason_code: "open_failed", schema_version: null, supported_schema_version: 3, migration_status: "unverified" };
+  }
+}
+function codexFeature(codexHome) {
+  const path = join15(codexHome, "config.toml");
+  if (!existsSync13(path)) return status(false, "feature_disabled");
+  try {
+    const config2 = parseToml2(readFileSync7(path, "utf8"));
+    if (!isRecord2(config2.features)) return status(false, "feature_disabled");
+    const features = config2.features;
+    return status(features.hooks === true && features.codex_hooks === void 0, "feature_disabled");
+  } catch {
+    return unverified("config_unreadable");
+  }
+}
+function codexHooks(codexHome, nodePath, cliScriptPath) {
+  const value = JSON.parse(readFileSync7(join15(codexHome, "hooks.json"), "utf8"));
+  if (!isRecord2(value) || !isRecord2(value.hooks)) throw Error("config_unreadable");
+  const hooks = value.hooks;
+  const present = (event, subcommand) => Array.isArray(hooks[event]) && hooks[event].some((entry) => isRecord2(entry) && Array.isArray(entry.hooks) && entry.hooks.some((item) => isRecord2(item) && typeof item.command === "string" && isCanonicalCaveatCodexHookCommand(item.command, subcommand, nodePath, cliScriptPath)));
+  return { userPromptSubmit: present("UserPromptSubmit", "user-prompt-submit"), postToolUse: present("PostToolUse", "post-tool-use"), stop: present("Stop", "stop") };
+}
+function sync(own) {
+  try {
+    execFileSync("git", ["-C", own, "rev-parse", "--is-inside-work-tree"], { stdio: "ignore" });
+  } catch {
+    return status(false, "not_git_worktree");
+  }
+  try {
+    execFileSync("git", ["-C", own, "remote", "get-url", "origin"], { stdio: "ignore" });
+  } catch {
+    return status(false, "origin_missing");
+  }
+  try {
+    const dirty = execFileSync("git", ["-C", own, "status", "--porcelain=v1", "--untracked-files=normal"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3, env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" } }).trim();
+    if (dirty) return status(false, "worktree_dirty");
+    const upstream = execFileSync("git", ["-C", own, "rev-parse", "--symbolic-full-name", "@{upstream}"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3 }).trim();
+    if (!upstream.startsWith("refs/remotes/origin/")) return status(false, "upstream_not_origin");
+    const remoteRef = `refs/heads/${upstream.slice("refs/remotes/origin/".length)}`;
+    const remote = execFileSync("git", ["-C", own, "ls-remote", "--exit-code", "origin", remoteRef], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 1e4, maxBuffer: 16384 }).trim().split(/\s+/)[0];
+    const head = execFileSync("git", ["-C", own, "rev-parse", "HEAD"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3 }).trim();
+    if (!/^[0-9a-f]{40}$/.test(remote ?? "") || !/^[0-9a-f]{40}$/.test(head)) return unverified("sync_hash_unparseable");
+    if (remote !== head) return status(false, "remote_mismatch");
+    const counts = execFileSync("git", ["-C", own, "rev-list", "--left-right", "--count", "@{upstream}...HEAD"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5e3 }).trim().split(/\s+/).map(Number);
+    if (counts.length !== 2 || counts.some((value) => !Number.isSafeInteger(value) || value < 0)) return unverified("sync_count_unparseable");
+    if (counts[0] === 0 && counts[1] === 0) return status(true, "ready");
+    return status(false, counts[0] && counts[1] ? "diverged" : counts[0] ? "behind" : "ahead");
+  } catch {
+    return unverified("upstream_unavailable");
+  }
+}
+function factoryDiagnostics(ctx, codexHome = process.env.CODEX_HOME ?? join15(ctx.userHome, ".codex")) {
+  const nodePath = process.execPath;
+  const cliScriptPath = process.argv[1] ?? "";
+  const db = database(ctx.paths.dbPath);
+  const feature = codexFeature(codexHome);
+  let installedCodexHooks = null;
+  try {
+    installedCodexHooks = codexHooks(codexHome, nodePath, cliScriptPath);
+  } catch {
+  }
+  const codexHook2 = (present) => present === void 0 ? unverified("config_unreadable") : !present ? hook(false) : feature.status === "ready" ? hook(true) : { ...feature };
+  const output = { schema: "caveat.native_factory_diagnostics.v1", product: "caveat", version: CAVEAT_VERSION, overall: { status: "unverified" }, database: db, sync: sync(ctx.paths.knowledgeRepo), connectors: { claude: { status: "unverified", mcp: claudeRegistration(ctx.userHome, nodePath, cliScriptPath), hooks: claudeHooks(ctx.userHome, nodePath, cliScriptPath) }, codex: { status: "unverified", hooks: { user_prompt_submit: codexHook2(installedCodexHooks?.userPromptSubmit), post_tool_use: codexHook2(installedCodexHooks?.postToolUse), stop: codexHook2(installedCodexHooks?.stop) } } } };
+  const aggregate = (all) => all.includes("not_ready") ? "not_ready" : all.includes("unverified") ? "unverified" : "ready";
+  const connectorStatus = (connector) => aggregate([...Object.values(connector.hooks), ...connector.mcp ? [connector.mcp] : []].map((v) => v.status));
+  output.connectors.claude.status = connectorStatus(output.connectors.claude);
+  output.connectors.codex.status = connectorStatus(output.connectors.codex);
+  const statuses = [output.database.status, output.sync.status, output.connectors.claude.status, output.connectors.codex.status];
+  output.overall.status = aggregate(statuses);
+  return output;
+}
+
+// src/commands/runtimeErrors.ts
+function runRuntimeErrors(action, value, opts = {}) {
+  const runtime = { version: CAVEAT_VERSION };
+  if (action === "snapshot") return runtimeErrorsSnapshot(opts.afterCursor ?? 0, opts.limit ?? 256, runtime);
+  if (action === "diagnostics") return runtimeErrorsDiagnostics(runtime);
+  if (action === "ack") return acknowledgeRuntimeErrors(parseCursor(value), runtime);
+  if (action === "resolve") return setRuntimeErrorStatus(value ?? "", "resolved", runtime);
+  if (action === "reopen") return setRuntimeErrorStatus(value ?? "", "open", runtime);
+  if (action === "compact") return compactRuntimeErrors(runtime);
+  throw new Error("unknown_runtime_errors_action");
+}
+function parseCursor(value) {
+  if (!value || !/^(?:0|[1-9][0-9]*)$/.test(value)) throw Error("invalid_cursor");
+  const parsed = Number(value);
+  if (!Number.isSafeInteger(parsed)) throw Error("invalid_cursor");
+  return parsed;
+}
+
 // src/index.ts
 var program = new Command();
 function collectRepeatable(value, previous) {
   return [...previous, value];
 }
 program.name("caveat").description("External spec gotcha knowledge base CLI").version(CAVEAT_VERSION);
+program.command("factory-diagnostics").description("Emit read-only factory diagnostics").requiredOption("--json", "emit the versioned JSON contract").action((opts) => {
+  const output = factoryDiagnostics(buildContext(stdoutLogger));
+  process.stdout.write(`${JSON.stringify(output)}
+`);
+  if (output.overall.status !== "ready") process.exitCode = 1;
+});
+var runtimeErrors = program.command("runtime-errors").description("Inspect Caveat opt-in runtime errors");
+var parseLimit = (value) => {
+  const parsed = parseCursor(value);
+  if (parsed < 1 || parsed > 256) throw Error("invalid_limit");
+  return parsed;
+};
+runtimeErrors.command("snapshot").requiredOption("--json", "emit JSON").option("--after-cursor <n>", "cursor", parseCursor, 0).option("--limit <n>", "limit", parseLimit, 256).action((opts) => {
+  process.stdout.write(`${JSON.stringify(runRuntimeErrors("snapshot", void 0, opts))}
+`);
+});
+for (const action of ["diagnostics", "compact"]) runtimeErrors.command(action).requiredOption("--json", "emit JSON").action(() => {
+  process.stdout.write(`${JSON.stringify(runRuntimeErrors(action))}
+`);
+});
+runtimeErrors.command("ack <cursor>").requiredOption("--json", "emit JSON").action((cursor) => {
+  process.stdout.write(`${JSON.stringify(runRuntimeErrors("ack", cursor))}
+`);
+});
+for (const action of ["resolve", "reopen"]) runtimeErrors.command(`${action} <fingerprint>`).requiredOption("--json", "emit JSON").action((fingerprint) => {
+  process.stdout.write(`${JSON.stringify(runRuntimeErrors(action, fingerprint))}
+`);
+});
 program.command("init").description(
   "Initialize ~/.caveatrc.json, ~/.caveat/, and register Claude Code integration. Add knowledge sources later with `caveat community add <github-url>`."
 ).option("--skip-claude", "skip Claude Code MCP + hook registration", false).option("--sync [url]", "initialize private sync (optionally with its URL)").option("--publish-target [url]", "configure the sealed public mirror target").option("--yes", "approve creating conventional GitHub repositories", false).option("--skip-codex-hook", "skip Codex hook installation", false).option("--dry-run", "show planned changes without writing", false).option(