caveat-cli 0.17.4 → 0.17.6

package/dist/index.js

@@ -6900,8 +6900,8 @@ import { join as join3 } from "node:path";
 // src/installShared.ts
 import { accessSync, copyFileSync, existsSync, mkdirSync, realpathSync, statSync, writeFileSync } from "node:fs";
 import { dirname as dirname2, isAbsolute } from "node:path";
-function quoteIfSpaces(p) {
-  return p.includes(" ") ? `"${p}"` : p;
+function quoteCommandPath(p) {
+  return /[\s\\]/.test(p) ? `"${p}"` : p;
 }
 function commandTokens(command) {
   const tokens = [];
@@ -6949,7 +6949,7 @@ function mcpArgs(cliScriptPath) {
   return ["--disable-warning=ExperimentalWarning", cliScriptPath, "mcp-server"];
 }
 function hookCommand(nodePath, cliScriptPath, event) {
-  return `${quoteIfSpaces(nodePath)} ${quoteIfSpaces(cliScriptPath)} hook ${event}`;
+  return `${quoteCommandPath(nodePath)} ${quoteCommandPath(cliScriptPath)} hook ${event}`;
 }
 function upsertHook(settings, event, command) {
   settings.hooks ??= {};
@@ -6959,7 +6959,7 @@ function upsertHook(settings, event, command) {
     for (const hook2 of entry.hooks ?? []) {
       if (isSameHookCommand(hook2.command, command)) return "unchanged";
       if (subcommand && isCaveatClaudeHookCommand(hook2.command, subcommand)) {
-        hook2.command = command;
+        hook2.command = `${envPrefix(hook2.command)}${command}`;
         return "added";
       }
     }
@@ -6990,14 +6990,15 @@ function findExistingHookCommand(settings, event, command) {
 function isSameHookCommand(actual, expected) {
   return actual === expected || actual.endsWith(` ${expected}`);
 }
-function isEnvPrefixedCommand(command) {
-  return /^[A-Z_][A-Z0-9_]*=/.test(command.trim());
+function envPrefix(command) {
+  return command.match(/^((?:[A-Z_][A-Z0-9_]*=(?:"[^"]*"|'[^']*'|\S+)\s+)+)/)?.[1] ?? "";
 }
 function isCaveatClaudeHookCommand(actual, event) {
   const lower = actual.toLowerCase();
-  return !isEnvPrefixedCommand(actual) && lower.includes("caveat") && actual.includes(`hook ${event}`);
+  return lower.includes("caveat") && actual.includes(`hook ${event}`);
 }
 function isCanonicalCaveatClaudeHookCommand(actual, event, nodePath, cliScriptPath) {
+  if (actual !== hookCommand(nodePath, cliScriptPath, event)) return false;
   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;
 }
@@ -7133,7 +7134,7 @@ import { constants as constants2, existsSync as existsSync3, readFileSync as rea
 import { join as join4 } from "node:path";
 import { parse as parseToml } from "smol-toml";
 function hookCommand2(nodePath, cliScriptPath, event, platform = process.platform) {
-  return `${powershellCallPrefix(platform)}${quoteIfSpaces(nodePath)} ${quoteIfSpaces(cliScriptPath)} codex-hook ${event}`;
+  return `${powershellCallPrefix(platform)}${quoteCommandPath(nodePath)} ${quoteCommandPath(cliScriptPath)} codex-hook ${event}`;
 }
 function eventCommandFragment(event) {
   return `codex-hook ${event}`;