caveat-cli 0.19.3 → 0.19.6

package/dist/index.js

@@ -74,7 +74,7 @@ import {
   userPromptSubmitReminderText,
   writeDigestMarker,
   writeUserConfigPatch
-} from "./chunk-RO2ZVJMX.js";
+} from "./chunk-EMGYSGFX.js";
 
 // ../../node_modules/.pnpm/ajv@8.18.0/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -8390,7 +8390,7 @@ function runStats(ctx) {
 
 // src/commands/serve.ts
 async function runServe(opts) {
-  const { startServer } = await import("./server-INQI6ANK.js");
+  const { startServer } = await import("./server-RSDQNLWE.js");
   const { port, host } = startServer({ port: opts.port });
   process.stdout.write(`[caveat] web portal: http://${host}:${port}/
 `);
@@ -32988,7 +32988,7 @@ ${failureText}`).join("\n");
 function pendingCleanupFailureText(host) {
   return `[${host.stderrTag}] pending reminder cleanup failed`;
 }
-function peekForSession(host, sessionId) {
+function peekForSession(host, sessionId, discardSession = false) {
   const ctx = buildContextSafely(host);
   if (!ctx) return { contexts: [], paths: [], caveatHome: null };
   const local = peekPendingRemindersDetailed(ctx.caveatHome, sessionId);
@@ -32997,7 +32997,15 @@ function peekForSession(host, sessionId) {
     process.stderr.write(`${pendingCleanupFailureText(host)}
 `);
   }
-  const reminders = [...local.reminders, ...global.reminders];
+  if (discardSession) {
+    try {
+      acknowledgePendingReminders(ctx.caveatHome, local.reminders.map(({ path }) => path));
+    } catch (error51) {
+      process.stderr.write(`[${host.stderrTag}] pending reminder cleanup failed: ${errorMessage4(error51)}
+`);
+    }
+  }
+  const reminders = discardSession ? global.reminders : [...local.reminders, ...global.reminders];
   return { contexts: reminders.map(({ text }) => text), paths: reminders.map(({ path }) => path), caveatHome: ctx.caveatHome };
 }
 function acknowledgeSessionReminders(host, peeked) {
@@ -33275,17 +33283,21 @@ async function rankKnowledge(key, turns, candidates, ask = callJev) {
   const state = {
     turns,
     currentHostOs: fingerprint().os,
-    candidates: candidates.map(({ hit, entry }) => ({
-      title: hit.title,
-      symptom: hit.symptomExcerpt,
-      cause: entry.sections.Cause?.slice(0, 300) ?? "",
-      resolution: entry.sections.Resolution?.slice(0, 600) ?? "",
-      environment: hit.environment
-    }))
+    candidates: candidates.map(({ hit, entry }) => {
+      const { applies_to_os: appliesToOs = null, ...recordedEnvironment } = hit.environment;
+      return {
+        title: hit.title,
+        symptom: hit.symptomExcerpt,
+        cause: entry.sections.Cause?.slice(0, 300) ?? "",
+        resolution: entry.sections.Resolution?.slice(0, 600) ?? "",
+        recordedEnvironment,
+        appliesToOs
+      };
+    })
   };
   const questions = Object.fromEntries(candidates.map((_, index) => [`candidate_${index}`, {
     type: "noul",
-    instructions: `Does candidates[${index}] directly apply to the unresolved problem shown in the turns and offer a useful resolution? Check the described environment against the task's target environment; currentHostOs is the host OS, which may differ from the target OS.`
+    instructions: `Does candidates[${index}] directly apply to the unresolved problem shown in the turns and offer a useful resolution? A recordedEnvironment value is where the entry was observed, not a restriction. Only appliesToOs restricts the target OS; null means any OS. currentHostOs may differ from the task's target OS.`
   }]));
   const response = await ask(key, state, questions);
   let best = null;
@@ -33513,6 +33525,7 @@ async function runWorker(workFile) {
     process.exit(0);
   }
   if (!job.failureText || !job.sessionId) process.exit(0);
+  if (buildContextSafely(CLAUDE_HOST)?.config.jevEnabled) process.exit(0);
   const hits = searchCaveatsSafely(CLAUDE_HOST, {
     topicText: job.topicText,
     failureText: job.failureText,
@@ -33724,10 +33737,10 @@ async function runHook(name, arg) {
   }
   const payload = parsePayload(CLAUDE_HOST, raw);
   const sessionId = getSessionId(payload);
-  const pending = name === "stop" ? null : peekForSession(CLAUDE_HOST, sessionId);
-  const contexts = pending?.contexts ?? [];
   if (name === "user-prompt-submit") {
     const ctx = buildContextSafely(CLAUDE_HOST);
+    const pending = peekForSession(CLAUDE_HOST, sessionId, ctx?.config.jevEnabled === true);
+    const contexts = pending.contexts;
     let jevNotice = null;
     if (ctx?.config.jevEnabled) {
       try {
@@ -33738,10 +33751,10 @@ async function runHook(name, arg) {
 `);
       }
     }
-    const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
-    const hits = searchCaveatsSafely(CLAUDE_HOST, { topicText: prompt, failureText: prompt, surface: "user_prompt" });
-    if (hits.length > 0) {
-      contexts.push(userPromptSubmitReminderText(hits));
+    if (ctx && !ctx.config.jevEnabled) {
+      const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
+      const hits = searchCaveatsSafely(CLAUDE_HOST, { topicText: prompt, failureText: prompt, surface: "user_prompt" });
+      if (hits.length > 0) contexts.push(userPromptSubmitReminderText(hits));
     }
     if (ctx) {
       try {
@@ -33762,6 +33775,9 @@ async function runHook(name, arg) {
   }
   if (name === "post-tool-use") {
     const ctx = buildContextSafely(CLAUDE_HOST);
+    if (ctx?.config.jevEnabled) process.exit(0);
+    const pending = peekForSession(CLAUDE_HOST, sessionId);
+    const contexts = pending.contexts;
     if (ctx) {
       try {
         const prepared = prepareSessionDelivery(ctx.caveatHome, sessionId, contexts);
@@ -33906,26 +33922,28 @@ function toolInputText(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);
-  if (topExit !== null) return topExit !== 0;
+function codexToolStatus(payload) {
+  if (payload.is_error === true) return "failed";
   const resp = payload.tool_response ?? payload.toolResponse;
+  if (resp !== null && typeof resp === "object" && !Array.isArray(resp) && resp.is_error === true) return "failed";
+  const topExit = numericExitCode(payload.exit_code ?? payload.exitCode);
+  if (topExit !== null) return topExit === 0 ? "succeeded" : "failed";
   if (resp !== null && typeof resp === "object" && !Array.isArray(resp)) {
     const r = resp;
-    if (r.is_error === true) return true;
     const exit = numericExitCode(r.exit_code ?? r.exitCode);
-    if (exit !== null) return exit !== 0;
+    if (exit !== null) return exit === 0 ? "succeeded" : "failed";
   }
   const responseExit = processExitCodeFromText(extractToolResponseText(resp));
-  if (responseExit !== null) return responseExit !== 0;
+  if (responseExit !== null) return responseExit === 0 ? "succeeded" : "failed";
   const transcriptExit = transcriptExitCode(payload);
-  if (transcriptExit !== null) return transcriptExit !== 0;
-  return false;
+  if (transcriptExit !== null) return transcriptExit === 0 ? "succeeded" : "failed";
+  return "unknown";
 }
 function buildCodexPostToolUseWorkerJob(payload) {
   const sessionId = codexSessionId(payload);
   if (!sessionId) return null;
+  const status2 = codexToolStatus(payload);
+  if (status2 === "succeeded") 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 = extractToolResponseText(payload.tool_response ?? payload.toolResponse);
@@ -33933,8 +33951,7 @@ function buildCodexPostToolUseWorkerJob(payload) {
   const transcriptOutput = transcriptPath && toolUseId ? transcriptToolOutput(transcriptPath, toolUseId) : null;
   const topicText = inputText.trim();
   const failureText = [responseText, transcriptOutput ?? ""].map((s) => s.trim()).filter(Boolean).join("\n");
-  const knownError = isCodexToolError(payload);
-  if (knownError) {
+  if (status2 === "failed") {
     return { sessionId, topicText, failureText, knownError: true, transcriptPath, toolUseId };
   }
   if (transcriptPath && toolUseId && isShellLikeTool(payload) && (topicText || failureText)) {
@@ -33968,6 +33985,7 @@ async function waitForTranscriptOutput(transcriptPath, toolUseId) {
   return null;
 }
 async function processCodexWorkerJob(job, opts = { waitForTranscript: true }) {
+  if (buildContextSafely(CODEX_HOST)?.config.jevEnabled) return;
   if (!job.topicText && !job.failureText || !job.sessionId) return;
   let failureText = job.failureText;
   let knownError = job.knownError === true;
@@ -34072,9 +34090,9 @@ async function runCodexHook(name, arg) {
   const sessionId = codexSessionId(payload);
   if (!sessionId) process.stderr.write("[caveat:codex-hook] missing session_id; pending drain disabled\n");
   if (name === "user-prompt-submit") {
-    const pending = sessionId ? peekForSession(CODEX_HOST, sessionId) : null;
-    const contexts = pending?.contexts ?? [];
     const ctx = buildContextSafely(CODEX_HOST);
+    const pending = sessionId ? peekForSession(CODEX_HOST, sessionId, ctx?.config.jevEnabled === true) : null;
+    const contexts = pending?.contexts ?? [];
     let jevNotice = null;
     if (ctx?.config.jevEnabled) {
       try {
@@ -34085,10 +34103,10 @@ async function runCodexHook(name, arg) {
 `);
       }
     }
-    const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
-    const hits = searchCaveatsSafely(CODEX_HOST, { topicText: prompt, failureText: prompt, surface: "user_prompt" });
-    if (hits.length > 0) {
-      contexts.push(userPromptSubmitReminderText(hits, "native-cli"));
+    if (ctx && !ctx.config.jevEnabled) {
+      const prompt = typeof payload.prompt === "string" ? payload.prompt : "";
+      const hits = searchCaveatsSafely(CODEX_HOST, { topicText: prompt, failureText: prompt, surface: "user_prompt" });
+      if (hits.length > 0) contexts.push(userPromptSubmitReminderText(hits, "native-cli"));
     }
     if (ctx) {
       try {
@@ -34108,6 +34126,7 @@ async function runCodexHook(name, arg) {
     process.exit(0);
   }
   if (name === "post-tool-use") {
+    if (buildContextSafely(CODEX_HOST)?.config.jevEnabled) process.exit(0);
     const job = buildCodexPostToolUseWorkerJob(payload);
     if (job) await processCodexWorkerJob(job, { waitForTranscript: false });
     process.exit(0);