caveat-cli 0.17.2 → 0.17.3

package/dist/index.js

@@ -7158,6 +7158,10 @@ function isCanonicalCaveatCodexHookCommand(actual, event, nodePath, cliScriptPat
   const tokens = parsed?.[0] === "&" ? parsed.slice(1) : parsed;
   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 isCanonicalCaveatCodexHookEntry(value, event, nodePath, cliScriptPath) {
+  if (!isPlainRecord(value) || typeof value.type !== "string" || typeof value.command !== "string") return false;
+  return value.type === "command" && isCanonicalCaveatCodexHookCommand(value.command, event, nodePath, cliScriptPath) && value.timeout === 5 && value.timeoutSec === void 0 && value.async === false && value.statusMessage === null;
+}
 function hasCaveatHook(hooksJson, event, fragment) {
   return hooksJson.hooks?.[event]?.some(
     (entry) => entry.hooks?.some((h) => h.command.includes(fragment))
@@ -7184,10 +7188,12 @@ function upsertHook2(hooksJson, event, command, subcommand) {
   const list = hooksJson.hooks[event] ??= [];
   for (const entry of list) {
     for (const hook2 of entry.hooks ?? []) {
-      if (isSameHookCommand2(hook2.command, command)) return "unchanged";
-      if (isCaveatCodexHookCommand(hook2.command, subcommand)) {
+      if (isSameHookCommand2(hook2.command, command) && hook2.type === "command" && hook2.timeout === 5 && hook2.timeoutSec === void 0 && hook2.async === false && hook2.statusMessage === null) return "unchanged";
+      if (isSameHookCommand2(hook2.command, command) || isCaveatCodexHookCommand(hook2.command, subcommand)) {
         hook2.command = command;
-        hook2.timeoutSec = 5;
+        hook2.type = "command";
+        hook2.timeout = 5;
+        delete hook2.timeoutSec;
         hook2.async = false;
         hook2.statusMessage = null;
         return "added";
@@ -7199,7 +7205,7 @@ function upsertHook2(hooksJson, event, command, subcommand) {
       {
         type: "command",
         command,
-        timeoutSec: 5,
+        timeout: 5,
         async: false,
         statusMessage: null
       }
@@ -7513,11 +7519,19 @@ function detectCodexHookInstallation(codexHome) {
     postToolUse: hasCaveatHook(hooksJson, "PostToolUse", eventCommandFragment("post-tool-use")),
     stop: hasCaveatHook(hooksJson, "Stop", eventCommandFragment("stop"))
   };
+  const hasLegacyTimeoutSec = (event, fragment) => hooksJson.hooks?.[event]?.some((entry) => entry.hooks?.some((hook2) => hook2.command.includes(fragment) && hook2.timeoutSec !== void 0)) ?? false;
+  const legacyTimeoutSec = {
+    userPromptSubmit: hasLegacyTimeoutSec("UserPromptSubmit", eventCommandFragment("user-prompt-submit")),
+    postToolUse: hasLegacyTimeoutSec("PostToolUse", eventCommandFragment("post-tool-use")),
+    stop: hasLegacyTimeoutSec("Stop", eventCommandFragment("stop"))
+  };
   const count = Object.values(hooks).filter(Boolean).length;
+  const hasLegacy = Object.values(legacyTimeoutSec).some(Boolean);
   return {
-    installation: count === 0 ? "not-installed" : count === 3 ? "installed" : "partial",
+    installation: count === 0 ? "not-installed" : count === 3 && !hasLegacy ? "installed" : "partial",
     hooksPath,
-    hooks
+    hooks,
+    legacyTimeoutSec
   };
 }
 
@@ -33834,6 +33848,7 @@ function runDiagnostics(codexHome = process.env.CODEX_HOME ?? join12(homedir3(),
     codexHome,
     hooksPath: installation.hooksPath,
     installedHooks: installation.hooks,
+    legacyTimeoutSec: installation.legacyTimeoutSec,
     evidence: featureOutput.split("\n").find((line) => line.trim().startsWith("hooks")) ?? null
   };
   process.stdout.write(`${JSON.stringify(result, null, 2)}
@@ -34402,7 +34417,7 @@ function codexHooks(codexHome, nodePath, cliScriptPath) {
   const value = JSON.parse(readFileSync7(join14(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)));
+  const present = (event, subcommand) => Array.isArray(hooks[event]) && hooks[event].some((entry) => isRecord2(entry) && Array.isArray(entry.hooks) && entry.hooks.some((item) => isCanonicalCaveatCodexHookEntry(item, subcommand, nodePath, cliScriptPath)));
   return { userPromptSubmit: present("UserPromptSubmit", "user-prompt-submit"), postToolUse: present("PostToolUse", "post-tool-use"), stop: present("Stop", "stop") };
 }
 function sync(own) {