caveat-cli 0.14.0 → 0.14.2

package/dist/index.js

@@ -6861,6 +6861,7 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync as readFileSync2, wri
 import { dirname as dirname2, 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";
 var EVENT_STOP = "Stop";
 function quote(p) {
   return p.includes(" ") ? `"${p}"` : p;
@@ -6892,6 +6893,15 @@ function removeHook(settings, event, command) {
   settings.hooks[event] = filtered;
   return true;
 }
+function findExistingHookCommand(settings, event, command) {
+  const list = settings.hooks?.[event];
+  if (!list) return void 0;
+  for (const entry of list) {
+    const found = entry.hooks?.find((h) => isSameHookCommand(h.command, command));
+    if (found) return found.command;
+  }
+  return void 0;
+}
 function isSameHookCommand(actual, expected) {
   return actual === expected || actual.endsWith(` ${expected}`);
 }
@@ -6971,21 +6981,31 @@ function installClaudeIntegration(opts) {
   const usCmd = hookCommand(opts.nodePath, opts.cliScriptPath, "user-prompt-submit");
   const ptCmd = hookCommand(opts.nodePath, opts.cliScriptPath, "post-tool-use");
   const stopCmd = hookCommand(opts.nodePath, opts.cliScriptPath, "stop");
+  const ptInstallCmd = findExistingHookCommand(settings, EVENT_POST_TOOL_USE, ptCmd) ?? ptCmd;
   const userPromptSubmit = upsertHook(settings, EVENT_USER_PROMPT_SUBMIT, usCmd);
-  const postToolUse = upsertHook(settings, EVENT_POST_TOOL_USE, ptCmd);
+  const postToolUse = upsertHook(settings, EVENT_POST_TOOL_USE, ptInstallCmd);
+  const postToolUseFailure = upsertHook(
+    settings,
+    EVENT_POST_TOOL_USE_FAILURE,
+    ptInstallCmd
+  );
   const stop = upsertHook(settings, EVENT_STOP, stopCmd);
   let backupPath;
-  const anyAdded = userPromptSubmit === "added" || postToolUse === "added" || stop === "added";
+  const anyAdded = userPromptSubmit === "added" || postToolUse === "added" || postToolUseFailure === "added" || stop === "added";
   if (!opts.dryRun && anyAdded) {
     const backup = writeSettings(settingsPath, settings);
     if (backup) backupPath = backup;
   } else if (opts.dryRun) {
     opts.logger.info(
-      `[dry-run] would ${userPromptSubmit === "added" ? "add" : "keep"} UserPromptSubmit, ${postToolUse === "added" ? "add" : "keep"} PostToolUse, ${stop === "added" ? "add" : "keep"} Stop hook in ${settingsPath}`
+      `[dry-run] would ${userPromptSubmit === "added" ? "add" : "keep"} UserPromptSubmit, ${postToolUse === "added" ? "add" : "keep"} PostToolUse, ${postToolUseFailure === "added" ? "add" : "keep"} PostToolUseFailure, ${stop === "added" ? "add" : "keep"} Stop hook in ${settingsPath}`
     );
   }
   const mcp = opts.skipMcpRegistration ? { action: "skipped", detail: "skipped by caller" } : registerMcp(opts.nodePath, opts.cliScriptPath, opts.dryRun, opts.logger);
-  return { mcp, hooks: { userPromptSubmit, postToolUse, stop }, backupPath };
+  return {
+    mcp,
+    hooks: { userPromptSubmit, postToolUse, postToolUseFailure, stop },
+    backupPath
+  };
 }
 function uninstallClaudeIntegration(opts) {
   const settingsPath = join3(opts.claudeDir, "settings.json");
@@ -6995,9 +7015,10 @@ function uninstallClaudeIntegration(opts) {
   const stopCmd = hookCommand(opts.nodePath, opts.cliScriptPath, "stop");
   const removedUs = removeHook(settings, EVENT_USER_PROMPT_SUBMIT, usCmd);
   const removedPt = removeHook(settings, EVENT_POST_TOOL_USE, ptCmd);
+  const removedPtf = removeHook(settings, EVENT_POST_TOOL_USE_FAILURE, ptCmd);
   const removedStop = removeHook(settings, EVENT_STOP, stopCmd);
   let backupPath;
-  if (!opts.dryRun && (removedUs || removedPt || removedStop)) {
+  if (!opts.dryRun && (removedUs || removedPt || removedPtf || removedStop)) {
     const backup = writeSettings(settingsPath, settings);
     if (backup) backupPath = backup;
   }
@@ -7007,6 +7028,7 @@ function uninstallClaudeIntegration(opts) {
     hooks: {
       userPromptSubmit: removedUs ? "added" : "unchanged",
       postToolUse: removedPt ? "added" : "unchanged",
+      postToolUseFailure: removedPtf ? "added" : "unchanged",
       stop: removedStop ? "added" : "unchanged"
     },
     backupPath
@@ -7110,6 +7132,12 @@ function runUninstall(ctx, opts) {
   ctx.logger.info(
     `UserPromptSubmit hook: ${result.hooks.userPromptSubmit === "added" ? "removed" : "not present"}`
   );
+  ctx.logger.info(
+    `PostToolUse hook: ${result.hooks.postToolUse === "added" ? "removed" : "not present"}`
+  );
+  ctx.logger.info(
+    `PostToolUseFailure hook: ${result.hooks.postToolUseFailure === "added" ? "removed" : "not present"}`
+  );
   ctx.logger.info(
     `Stop hook: ${result.hooks.stop === "added" ? "removed" : "not present"}`
   );
@@ -7125,6 +7153,10 @@ function reportInstallResult(ctx, result, dryRun) {
   ctx.logger.info(
     `${prefix}UserPromptSubmit hook: ${result.hooks.userPromptSubmit}`
   );
+  ctx.logger.info(`${prefix}PostToolUse hook: ${result.hooks.postToolUse}`);
+  ctx.logger.info(
+    `${prefix}PostToolUseFailure hook: ${result.hooks.postToolUseFailure}`
+  );
   ctx.logger.info(`${prefix}Stop hook: ${result.hooks.stop}`);
   if (result.backupPath) {
     ctx.logger.info(`settings.json backed up: ${result.backupPath}`);
@@ -21935,11 +21967,13 @@ function extractToolResponseText(response) {
   return "";
 }
 function isToolError(payload) {
+  if (payload.hook_event_name === "PostToolUseFailure") return true;
   const resp = payload.tool_response ?? payload.toolResponse;
   if (resp !== null && typeof resp === "object" && !Array.isArray(resp)) {
     if (resp.is_error === true) return true;
   }
   if (payload.is_error === true) return true;
+  if (typeof payload.error === "string" && payload.error.length > 0) return true;
   return false;
 }
 function spawnWorker(job) {
@@ -22163,7 +22197,9 @@ async function runHook(name, arg) {
   }
   if (name === "post-tool-use") {
     if (!isToolError(payload)) process.exit(0);
-    const errText = extractToolResponseText(payload.tool_response ?? payload);
+    const errText = extractToolResponseText(
+      payload.tool_response ?? payload.toolResponse ?? payload.error ?? payload
+    );
     if (errText) {
       spawnWorker({ sessionId, searchText: errText });
     }
@@ -22500,9 +22536,11 @@ function extractToolResponseText2(response) {
 function numericExitCode(v) {
   return typeof v === "number" && Number.isInteger(v) ? v : null;
 }
-function transcriptExitCode(payload) {
-  const transcriptPath = typeof payload.transcript_path === "string" ? payload.transcript_path : "";
-  const toolUseId = typeof payload.tool_use_id === "string" ? payload.tool_use_id : "";
+function processExitCodeFromText(text) {
+  const m = /Process exited with code\s+(-?\d+)/.exec(text);
+  return m ? Number(m[1]) : null;
+}
+function transcriptToolOutput(transcriptPath, toolUseId) {
   if (!transcriptPath || !toolUseId || !existsSync7(transcriptPath)) return null;
   let raw = "";
   try {
@@ -22523,12 +22561,32 @@ function transcriptExitCode(payload) {
     if (payloadObj === null || typeof payloadObj !== "object") continue;
     const p = payloadObj;
     if (p.type !== "function_call_output" || p.call_id !== toolUseId) continue;
-    const output = typeof p.output === "string" ? p.output : "";
-    const m = /Process exited with code\s+(-?\d+)/.exec(output);
-    if (m) return Number(m[1]);
+    return typeof p.output === "string" ? p.output : "";
   }
   return null;
 }
+function transcriptExitCode(payload) {
+  const transcriptPath = typeof payload.transcript_path === "string" ? payload.transcript_path : "";
+  const toolUseId = typeof payload.tool_use_id === "string" ? payload.tool_use_id : "";
+  const output = transcriptToolOutput(transcriptPath, toolUseId);
+  return output === null ? null : processExitCodeFromText(output);
+}
+function isShellLikeTool(payload) {
+  const name = typeof payload.tool_name === "string" ? payload.tool_name : "";
+  if (name === "Bash" || name === "exec_command") return true;
+  const input = payload.tool_input;
+  if (input !== null && typeof input === "object" && !Array.isArray(input)) {
+    const r = input;
+    return typeof r.command === "string" || typeof r.cmd === "string";
+  }
+  return false;
+}
+function toolInputText(input) {
+  if (input === null || typeof input !== "object" || Array.isArray(input)) return "";
+  const r = input;
+  const command = r.command ?? r.cmd;
+  return typeof command === "string" ? command : "";
+}
 function isCodexToolError(payload) {
   if (payload.is_error === true) return true;
   const topExit = numericExitCode(payload.exit_code ?? payload.exitCode);
@@ -22540,10 +22598,37 @@ function isCodexToolError(payload) {
     const exit2 = numericExitCode(r.exit_code ?? r.exitCode);
     if (exit2 !== null) return exit2 !== 0;
   }
+  const responseExit = processExitCodeFromText(extractToolResponseText2(resp));
+  if (responseExit !== null) return responseExit !== 0;
   const transcriptExit = transcriptExitCode(payload);
   if (transcriptExit !== null) return transcriptExit !== 0;
   return false;
 }
+function buildCodexPostToolUseWorkerJob(payload) {
+  const sessionId = codexSessionId(payload);
+  if (!sessionId) return null;
+  const transcriptPath = typeof payload.transcript_path === "string" ? payload.transcript_path : void 0;
+  const toolUseId = typeof payload.tool_use_id === "string" ? payload.tool_use_id : void 0;
+  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 knownError = isCodexToolError(payload);
+  if (knownError) {
+    return { sessionId, searchText, knownError: true, transcriptPath, toolUseId };
+  }
+  if (transcriptPath && toolUseId && isShellLikeTool(payload) && searchText) {
+    return {
+      sessionId,
+      searchText,
+      knownError: false,
+      allowSymptomOnly: true,
+      transcriptPath,
+      toolUseId
+    };
+  }
+  return null;
+}
 function codexContextOutput(text, eventName = "UserPromptSubmit") {
   return JSON.stringify({
     hookSpecificOutput: {
@@ -22567,37 +22652,39 @@ function drainForSession2(sessionId, eventName = "UserPromptSubmit") {
 `);
   }
 }
-function spawnCodexWorker(job) {
-  const workFile = join10(
-    tmpdir2(),
-    `caveat-codex-worker-${Date.now()}-${randomBytes2(4).toString("hex")}.json`
-  );
-  try {
-    writeFileSync5(workFile, JSON.stringify(job), "utf-8");
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[caveat:codex-hook] worker writefile error: ${msg}
-`);
-    return;
+async function waitForTranscriptOutput(transcriptPath, toolUseId) {
+  const deadline = Date.now() + 2e3;
+  while (Date.now() <= deadline) {
+    const output = transcriptToolOutput(transcriptPath, toolUseId);
+    if (output !== null) return output;
+    await new Promise((resolve) => setTimeout(resolve, 100));
   }
-  const cliScript = process.argv[1];
-  if (!cliScript) return;
-  try {
-    const child = spawn2(
-      process.execPath,
-      ["--disable-warning=ExperimentalWarning", cliScript, "codex-hook", "worker", workFile],
-      { detached: true, stdio: "ignore", windowsHide: true }
-    );
-    child.unref();
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[caveat:codex-hook] worker spawn error: ${msg}
-`);
-    try {
-      unlinkSync2(workFile);
-    } catch {
+  return null;
+}
+async function processCodexWorkerJob(job, opts = { waitForTranscript: true }) {
+  if (!job.searchText || !job.sessionId) return;
+  let searchText = job.searchText;
+  let knownError = job.knownError === true;
+  if (opts.waitForTranscript && job.transcriptPath && job.toolUseId) {
+    const transcriptOutput = await waitForTranscriptOutput(job.transcriptPath, job.toolUseId);
+    if (transcriptOutput) {
+      const exit2 = processExitCodeFromText(transcriptOutput);
+      if (exit2 !== null) {
+        if (exit2 === 0) return;
+        knownError = true;
+      }
+      searchText = [searchText, transcriptOutput].filter(Boolean).join("\n");
     }
   }
+  if (!knownError && job.allowSymptomOnly !== true) return;
+  const hits = searchCaveatsFromTextSafely2(searchText);
+  if (hits.length === 0) return;
+  const ctx = buildContextSafely2();
+  if (!ctx) return;
+  try {
+    appendPendingReminder(ctx.caveatHome, job.sessionId, toolErrorReminderText(hits));
+  } catch {
+  }
 }
 async function runCodexWorker(workFile) {
   let raw;
@@ -22616,15 +22703,7 @@ async function runCodexWorker(workFile) {
   } catch {
     process.exit(0);
   }
-  if (!job.searchText || !job.sessionId) process.exit(0);
-  const hits = searchCaveatsFromTextSafely2(job.searchText);
-  if (hits.length === 0) process.exit(0);
-  const ctx = buildContextSafely2();
-  if (!ctx) process.exit(0);
-  try {
-    appendPendingReminder(ctx.caveatHome, job.sessionId, toolErrorReminderText(hits));
-  } catch {
-  }
+  await processCodexWorkerJob(job);
   process.exit(0);
 }
 function runDiagnostics(codexHome = process.env.CODEX_HOME ?? join10(homedir3(), ".codex")) {
@@ -22669,8 +22748,8 @@ async function runCodexHook(name, arg) {
   }
   const payload = parsePayload2(raw);
   const sessionId = codexSessionId(payload);
-  if (sessionId) drainForSession2(sessionId);
-  else process.stderr.write("[caveat:codex-hook] missing session_id; pending drain disabled\n");
+  if (sessionId && name === "user-prompt-submit") drainForSession2(sessionId);
+  else if (!sessionId) process.stderr.write("[caveat:codex-hook] missing session_id; pending drain disabled\n");
   if (name === "user-prompt-submit") {
     const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
     const hits = searchCaveatsFromTextSafely2(prompt);
@@ -22681,10 +22760,8 @@ async function runCodexHook(name, arg) {
     process.exit(0);
   }
   if (name === "post-tool-use") {
-    if (!sessionId) process.exit(0);
-    if (!isCodexToolError(payload)) process.exit(0);
-    const errText = extractToolResponseText2(payload.tool_response ?? payload.toolResponse ?? payload);
-    if (errText) spawnCodexWorker({ sessionId, searchText: errText });
+    const job = buildCodexPostToolUseWorkerJob(payload);
+    if (job) await processCodexWorkerJob(job, { waitForTranscript: false });
     process.exit(0);
   }
   if (name === "stop") {