caveat-cli 0.16.0 → 0.16.1

package/dist/index.js

@@ -63,7 +63,7 @@ import {
   userPromptSubmitReminderText,
   writeDigestMarker,
   writeUserConfigPatch
-} from "./chunk-ZNAFNCPW.js";
+} from "./chunk-HCLEIAGO.js";
 
 // ../../node_modules/.pnpm/ajv@8.18.0/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -7075,6 +7075,7 @@ 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 { parse as parseToml } from "smol-toml";
 function quote2(p) {
   return p.includes(" ") ? `"${p}"` : p;
 }
@@ -7154,74 +7155,183 @@ function removeHook2(hooksJson, event, command, subcommand) {
   return true;
 }
 function enableCodexHooksFeature(raw) {
-  const lines = raw.split(/\r?\n/);
-  const unsupportedFeatureShape = lines.find(
-    (line) => /^\s*(?:["']features["']|features)\s*(?:\.|=)/.test(line) || /^\s*\[\[?\s*(?:["']features["']|features\.)/.test(line)
-  );
-  if (unsupportedFeatureShape) {
+  let parsed;
+  try {
+    parsed = parseToml(raw);
+  } catch {
     return {
       status: "blocked",
       text: raw,
       changed: false,
-      reason: "config.toml uses a non-canonical features table shape that Caveat will not rewrite safely"
+      reason: "config.toml is invalid TOML; fix it before installing Caveat hooks"
     };
   }
-  const featureHeaders = lines.map((line, index) => /^\s*\[features]\s*(?:#.*)?$/.test(line) ? index : -1).filter((index) => index >= 0);
-  if (featureHeaders.length > 1) {
+  const featureValue = parsed.features;
+  if (featureValue !== void 0 && !isPlainRecord(featureValue)) {
+    return {
+      status: "blocked",
+      text: raw,
+      changed: false,
+      reason: "config.toml features value is not a table"
+    };
+  }
+  const features = featureValue;
+  const canonicalValue = features?.hooks;
+  const legacyValue = features?.codex_hooks;
+  if (canonicalValue !== void 0 && typeof canonicalValue !== "boolean") {
+    return { status: "blocked", text: raw, changed: false, reason: "[features].hooks must be boolean" };
+  }
+  if (legacyValue !== void 0 && typeof legacyValue !== "boolean") {
+    return { status: "blocked", text: raw, changed: false, reason: "[features].codex_hooks must be boolean" };
+  }
+  if (canonicalValue === false) {
+    return { status: "blocked", text: raw, changed: false, reason: "[features].hooks is explicitly false" };
+  }
+  if (legacyValue === false) {
     return {
       status: "blocked",
       text: raw,
       changed: false,
-      reason: "config.toml contains more than one [features] table"
+      reason: canonicalValue === true ? "[features].hooks conflicts with the deprecated codex_hooks alias" : "[features].codex_hooks is explicitly false"
     };
   }
-  const featuresStart = featureHeaders[0] ?? -1;
-  if (featuresStart === -1) {
+  if (canonicalValue === true && legacyValue === void 0) {
+    return { status: "enabled", text: raw, changed: false };
+  }
+  const lines = raw.split(/\r?\n/);
+  const codeLines = maskTomlStringsAndComments(raw).split(/\r?\n/);
+  const featureHeaders = codeLines.map((line, index) => /^\s*\[\s*features\s*]\s*$/.test(line) ? index : -1).filter((index) => index >= 0);
+  if (featureValue === void 0) {
     const prefix = raw.trimEnd();
     const text = `${prefix}${prefix ? "\n\n" : ""}[features]
-codex_hooks = true
+hooks = true
 `;
     return { status: "enabled", text, changed: true };
   }
+  if (featureHeaders.length !== 1) {
+    return {
+      status: "blocked",
+      text: raw,
+      changed: false,
+      reason: "config.toml uses a features table shape that Caveat will not rewrite safely"
+    };
+  }
+  const featuresStart = featureHeaders[0];
   const assignments = [];
   for (let i = featuresStart + 1; i < lines.length; i += 1) {
-    if (/^\s*\[\[?.+?\]?]\s*(?:#.*)?$/.test(lines[i])) {
+    if (/^\s*\[\[?/.test(codeLines[i])) {
       break;
     }
-    const assignment = /^\s*codex_hooks\s*=\s*([^#]*?)\s*(?:#.*)?$/.exec(lines[i]);
+    const assignment = /^\s*(hooks|codex_hooks)\s*=/.exec(codeLines[i]);
     if (assignment) {
-      assignments.push({ index: i, value: assignment[1].trim() });
-    } else if (/^\s*["']codex_hooks["']\s*=/.test(lines[i])) {
-      return {
-        status: "blocked",
-        text: raw,
-        changed: false,
-        reason: "[features].codex_hooks uses a quoted key that Caveat will not rewrite safely"
-      };
+      assignments.push({ index: i, key: assignment[1] });
     }
   }
-  if (assignments.length > 1) {
+  const canonical = assignments.filter((assignment) => assignment.key === "hooks");
+  const legacy = assignments.filter((assignment) => assignment.key === "codex_hooks");
+  if (canonicalValue !== void 0 && canonical.length !== 1 || legacyValue !== void 0 && legacy.length !== 1) {
     return {
       status: "blocked",
       text: raw,
       changed: false,
-      reason: "[features].codex_hooks is defined more than once"
+      reason: "[features].hooks uses a key shape that Caveat will not rewrite safely"
     };
   }
-  const existing = assignments[0];
-  if (existing) {
-    if (existing.value === "true") return { status: "enabled", text: raw, changed: false };
-    return {
-      status: "blocked",
-      text: raw,
-      changed: false,
-      reason: `[features].codex_hooks is explicitly ${existing.value || "set to a non-true value"}`
-    };
+  const current = canonical[0];
+  const deprecated = legacy[0];
+  if (canonicalValue === true && legacyValue === true && current && deprecated) {
+    const inlineComment = /(#.*)$/.exec(lines[deprecated.index])?.[1];
+    lines.splice(deprecated.index, 1);
+    if (inlineComment) {
+      const canonicalIndex = current.index > deprecated.index ? current.index - 1 : current.index;
+      lines.splice(canonicalIndex + 1, 0, inlineComment);
+    }
+    return { status: "enabled", text: `${lines.join("\n").trimEnd()}
+`, changed: true };
   }
-  lines.splice(featuresStart + 1, 0, "codex_hooks = true");
+  if (legacyValue === true && canonicalValue === void 0 && deprecated) {
+    lines[deprecated.index] = lines[deprecated.index].replace(/\bcodex_hooks\b/, "hooks");
+    return { status: "enabled", text: `${lines.join("\n").trimEnd()}
+`, changed: true };
+  }
+  lines.splice(featuresStart + 1, 0, "hooks = true");
   return { status: "enabled", text: `${lines.join("\n").trimEnd()}
 `, changed: true };
 }
+function isPlainRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function maskTomlStringsAndComments(raw) {
+  let state = "code";
+  let output = "";
+  for (let i = 0; i < raw.length; i += 1) {
+    const char = raw[i];
+    const triple = raw.slice(i, i + 3);
+    if (char === "\n") {
+      output += "\n";
+      if (state === "comment") state = "code";
+      continue;
+    }
+    if (state === "comment") {
+      output += " ";
+      continue;
+    }
+    if (state === "basic") {
+      output += " ";
+      if (char === "\\" && i + 1 < raw.length) {
+        output += raw[i + 1] === "\n" ? "\n" : " ";
+        i += 1;
+      } else if (char === '"') state = "code";
+      continue;
+    }
+    if (state === "literal") {
+      output += " ";
+      if (char === "'") state = "code";
+      continue;
+    }
+    if (state === "multi-basic") {
+      if (triple === '"""') {
+        output += "   ";
+        i += 2;
+        state = "code";
+      } else {
+        output += " ";
+        if (char === "\\" && i + 1 < raw.length) {
+          output += raw[i + 1] === "\n" ? "\n" : " ";
+          i += 1;
+        }
+      }
+      continue;
+    }
+    if (state === "multi-literal") {
+      if (triple === "'''") {
+        output += "   ";
+        i += 2;
+        state = "code";
+      } else output += " ";
+      continue;
+    }
+    if (char === "#") {
+      output += " ";
+      state = "comment";
+    } else if (triple === '"""') {
+      output += "   ";
+      i += 2;
+      state = "multi-basic";
+    } else if (triple === "'''") {
+      output += "   ";
+      i += 2;
+      state = "multi-literal";
+    } else if (char === '"') {
+      output += " ";
+      state = "basic";
+    } else if (char === "'") {
+      output += " ";
+      state = "literal";
+    } else output += char;
+  }
+  return output;
+}
 function writeConfigWithBackup(path, text) {
   const dir = dirname3(path);
   if (!existsSync2(dir)) mkdirSync2(dir, { recursive: true });
@@ -7269,7 +7379,7 @@ function installCodexHooks(opts) {
   let configBackupPath;
   if (opts.dryRun) {
     opts.logger.info(`[dry-run] would update ${hooksPath}`);
-    opts.logger.info(`[dry-run] would ensure [features].codex_hooks = true in ${configPath}`);
+    opts.logger.info(`[dry-run] would ensure [features].hooks = true in ${configPath}`);
   } else {
     if (anyHookAdded) {
       const backup = writeJsonWithBackup(hooksPath, hooksJson);
@@ -7794,7 +7904,7 @@ async function runInit(ctx, opts = { skipClaude: false, dryRun: false }, depende
       if (result.feature === "blocked") {
         codexHookState = "skipped";
         ctx.logger.warn(
-          `${result.blockedReason}; preserving explicit consent. Set \`codex_hooks = true\` in ${join8(codexHome, "config.toml")}, then rerun \`caveat init\`.`
+          `${result.blockedReason}; preserving explicit consent. Set \`hooks = true\` in ${join8(codexHome, "config.toml")}, then rerun \`caveat init\`.`
         );
       } else if (opts.dryRun) {
         codexHookState = "skipped";
@@ -8095,7 +8205,7 @@ function runStats(ctx) {
 
 // src/commands/serve.ts
 async function runServe(opts) {
-  const { startServer } = await import("./server-SZAVLE56.js");
+  const { startServer } = await import("./server-EASKBCNK.js");
   const { port, host } = startServer({ port: opts.port });
   process.stdout.write(`[caveat] web portal: http://${host}:${port}/
 `);
@@ -33492,10 +33602,11 @@ async function runCodexWorker(workFile) {
 function runDiagnostics(codexHome = process.env.CODEX_HOME ?? join13(homedir3(), ".codex")) {
   const features = spawnSync5("codex", ["features", "list"], {
     encoding: "utf-8",
-    maxBuffer: 1024 * 1024
+    maxBuffer: 1024 * 1024,
+    env: codexFeatureListEnv(codexHome)
   });
   const featureOutput = [features.stdout, features.stderr].filter(Boolean).join("\n");
-  const hasHooks = /^codex_hooks\s+\S+\s+true\b/m.test(featureOutput);
+  const hasHooks = /^hooks\s+\S+\s+true\b/m.test(featureOutput);
   const installation = detectCodexHookInstallation(codexHome);
   const result = {
     availability: features.error || features.status !== 0 || !hasHooks ? "unavailable" : "available",
@@ -33505,11 +33616,14 @@ function runDiagnostics(codexHome = process.env.CODEX_HOME ?? join13(homedir3(),
     codexHome,
     hooksPath: installation.hooksPath,
     installedHooks: installation.hooks,
-    evidence: featureOutput.split("\n").find((line) => line.trim().startsWith("codex_hooks")) ?? null
+    evidence: featureOutput.split("\n").find((line) => line.trim().startsWith("hooks")) ?? null
   };
   process.stdout.write(`${JSON.stringify(result, null, 2)}
 `);
 }
+function codexFeatureListEnv(codexHome, inherited = process.env) {
+  return { ...inherited, CODEX_HOME: codexHome };
+}
 async function runCodexHook(name, arg) {
   if (name === "diagnostics") {
     runDiagnostics(arg);
@@ -34068,7 +34182,7 @@ program.command("hook <name> [arg]").description(
   await runHook(name, arg);
 });
 var codexHook = program.command("codex-hook").description("Install or run Codex hooks for Caveat");
-codexHook.command("install").description("Install Caveat hooks into ~/.codex/hooks.json and enable codex_hooks").option("--dry-run", "show planned changes without writing", false).option("--codex-home <path>", "Codex home directory", process.env.CODEX_HOME ?? `${process.env.HOME}/.codex`).action((opts) => {
+codexHook.command("install").description("Install Caveat hooks into ~/.codex/hooks.json and enable hooks").option("--dry-run", "show planned changes without writing", false).option("--codex-home <path>", "Codex home directory", process.env.CODEX_HOME ?? `${process.env.HOME}/.codex`).action((opts) => {
   const cliScriptPath = process.argv[1];
   if (!cliScriptPath) {
     process.stderr.write("[caveat:error] cannot determine CLI script path\n");
@@ -34084,10 +34198,10 @@ codexHook.command("install").description("Install Caveat hooks into ~/.codex/hoo
   stdoutLogger.info(`UserPromptSubmit hook: ${result.hooks.userPromptSubmit}`);
   stdoutLogger.info(`PostToolUse hook: ${result.hooks.postToolUse}`);
   stdoutLogger.info(`Stop hook: ${result.hooks.stop}`);
-  stdoutLogger.info(`codex_hooks feature: ${result.feature}`);
+  stdoutLogger.info(`hooks feature: ${result.feature}`);
   if (result.feature === "blocked") {
     stdoutLogger.warn(
-      `${result.blockedReason}; preserving explicit consent. Set \`codex_hooks = true\` in ${opts.codexHome}/config.toml, then rerun \`caveat codex-hook install\`.`
+      `${result.blockedReason}; preserving explicit consent. Set \`hooks = true\` in ${opts.codexHome}/config.toml, then rerun \`caveat codex-hook install\`.`
     );
   }
   if (result.backupPath) stdoutLogger.info(`hooks.json backed up: ${result.backupPath}`);