@usevalt/cli 0.6.0 → 0.7.0

package/dist/index.js

@@ -499,16 +499,36 @@ var doctorCommand = new Command5("doctor").description("Check Valt configuration
     warn("Signing keys: not configured (using ephemeral keys \u2014 certificates will not survive restart)");
     issues++;
   }
+  const EXPECTED_HOOKS = [
+    "SessionStart",
+    "PreToolUse",
+    "PostToolUse",
+    "PostToolUseFailure",
+    "SubagentStart",
+    "SubagentStop",
+    "UserPromptSubmit",
+    "SessionEnd"
+  ];
   const hooksPath = `${process.env["HOME"] ?? "~"}/.claude/hooks.json`;
   try {
     const { existsSync: exists, readFileSync: read } = await import("fs");
     if (exists(hooksPath)) {
       const hooksContent = read(hooksPath, "utf-8");
-      const hookCount = (hooksContent.match(/valt/g) ?? []).length;
-      if (hookCount >= 3) {
-        success(`Claude Code hooks: ${dim(hooksPath)} (${hookCount} hooks)`);
+      const hooksConfig = JSON.parse(hooksContent);
+      const registeredHooks = hooksConfig.hooks ?? {};
+      const presentHooks = EXPECTED_HOOKS.filter((name) => {
+        const hookEntries = registeredHooks[name];
+        return Array.isArray(hookEntries) && JSON.stringify(hookEntries).includes("valt");
+      });
+      const missingHooks = EXPECTED_HOOKS.filter((h) => !presentHooks.includes(h));
+      if (missingHooks.length === 0) {
+        success(`Claude Code hooks: all ${EXPECTED_HOOKS.length} registered`);
+      } else if (presentHooks.length === 0) {
+        info("Claude Code hooks: not installed. Run `valt setup` to enable.");
       } else {
-        warn("Claude Code hooks: partially configured. Run `valt setup`.");
+        warn(
+          `Claude Code hooks: ${presentHooks.length}/${EXPECTED_HOOKS.length} registered. Missing: ${missingHooks.join(", ")}. Run \`valt setup\` to update.`
+        );
         issues++;
       }
     } else {
@@ -1685,11 +1705,12 @@ var hookCommand = new Command13("hook").description("Claude Code hook handlers f
 
 // src/commands/setup.ts
 import { Command as Command14 } from "commander";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync2, existsSync as existsSync4 } from "fs";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync2, existsSync as existsSync4, unlinkSync as unlinkSync3 } from "fs";
 import { join as join2 } from "path";
 import os3 from "os";
 var CLAUDE_DIR = join2(os3.homedir(), ".claude");
-var HOOKS_FILE = join2(CLAUDE_DIR, "hooks.json");
+var SETTINGS_FILE = join2(CLAUDE_DIR, "settings.json");
+var LEGACY_HOOKS_FILE = join2(CLAUDE_DIR, "hooks.json");
 var HOOK_PREFIX = "npx --yes @usevalt/cli";
 function getValtHooks() {
   return {
@@ -1794,17 +1815,17 @@ var setupCommand = new Command14("setup").description("Configure Claude Code hoo
       removeHooks();
       return;
     }
-    let config = { hooks: {} };
-    if (existsSync4(HOOKS_FILE)) {
+    let config = {};
+    if (existsSync4(SETTINGS_FILE)) {
       try {
-        const raw = readFileSync4(HOOKS_FILE, "utf-8");
+        const raw = readFileSync4(SETTINGS_FILE, "utf-8");
         config = JSON.parse(raw);
-        if (!config.hooks) config.hooks = {};
       } catch {
-        warn("Could not parse existing hooks.json. Creating new one.");
-        config = { hooks: {} };
+        warn("Could not parse existing settings.json. Will merge hooks into it.");
+        config = {};
       }
     }
+    if (!config.hooks) config.hooks = {};
     const valtHooks = getValtHooks();
     for (const [event, hooks] of Object.entries(valtHooks)) {
       const existing = config.hooks[event];
@@ -1820,12 +1841,19 @@ var setupCommand = new Command14("setup").description("Configure Claude Code hoo
         config.hooks[event] = hooks;
       }
     }
-    writeFileSync4(HOOKS_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
+    writeFileSync4(SETTINGS_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
+    if (existsSync4(LEGACY_HOOKS_FILE)) {
+      try {
+        removeLegacyHooks();
+        info(`Migrated hooks from legacy hooks.json to settings.json.`);
+      } catch {
+      }
+    }
     success("Claude Code hooks configured.");
     info("");
     info("Every Claude Code session will now be tracked by Valt.");
     info(`Projects are auto-detected from git repo name or folder name.`);
-    info(`Hooks written to: ${dim(HOOKS_FILE)}`);
+    info(`Hooks written to: ${dim(SETTINGS_FILE)}`);
     info("");
     info("To remove: valt setup --remove");
   } catch (err) {
@@ -1833,34 +1861,64 @@ var setupCommand = new Command14("setup").description("Configure Claude Code hoo
     process.exit(1);
   }
 });
-function removeHooks() {
-  if (!existsSync4(HOOKS_FILE)) {
-    info("No hooks.json found. Nothing to remove.");
-    return;
+function removeValtHooksFromConfig(config) {
+  if (!config.hooks) return;
+  for (const event of Object.keys(config.hooks)) {
+    const entries = config.hooks[event];
+    if (!Array.isArray(entries)) continue;
+    config.hooks[event] = entries.filter((h) => {
+      const entry = h;
+      return !entry.hooks?.some((hk) => hk.command?.includes("valt") && hk.command?.includes("hook"));
+    });
+    if (config.hooks[event].length === 0) {
+      delete config.hooks[event];
+    }
+  }
+  if (Object.keys(config.hooks).length === 0) {
+    delete config.hooks;
   }
+}
+function removeLegacyHooks() {
+  if (!existsSync4(LEGACY_HOOKS_FILE)) return;
   try {
-    const raw = readFileSync4(HOOKS_FILE, "utf-8");
+    const raw = readFileSync4(LEGACY_HOOKS_FILE, "utf-8");
     const config = JSON.parse(raw);
-    if (!config.hooks) {
-      info("No hooks configured. Nothing to remove.");
-      return;
-    }
-    for (const event of Object.keys(config.hooks)) {
-      const entries = config.hooks[event];
-      if (!Array.isArray(entries)) continue;
-      config.hooks[event] = entries.filter((h) => {
-        const entry = h;
-        return !entry.hooks?.some((hk) => hk.command?.includes("valt") && hk.command?.includes("hook"));
-      });
-      if (config.hooks[event].length === 0) {
-        delete config.hooks[event];
+    removeValtHooksFromConfig(config);
+    if (!config.hooks || Object.keys(config.hooks).length === 0) {
+      const remaining = Object.keys(config).filter((k) => k !== "hooks");
+      if (remaining.length === 0) {
+        unlinkSync3(LEGACY_HOOKS_FILE);
+      } else {
+        writeFileSync4(LEGACY_HOOKS_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
       }
+    } else {
+      writeFileSync4(LEGACY_HOOKS_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
     }
-    writeFileSync4(HOOKS_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
-    success("Valt hooks removed from Claude Code.");
   } catch {
-    error("Could not parse hooks.json.");
-    process.exit(1);
+  }
+}
+function removeHooks() {
+  if (existsSync4(SETTINGS_FILE)) {
+    try {
+      const raw = readFileSync4(SETTINGS_FILE, "utf-8");
+      const config = JSON.parse(raw);
+      removeValtHooksFromConfig(config);
+      writeFileSync4(SETTINGS_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
+      success("Valt hooks removed from Claude Code settings.");
+    } catch {
+      error("Could not parse settings.json.");
+      process.exit(1);
+    }
+  }
+  if (existsSync4(LEGACY_HOOKS_FILE)) {
+    try {
+      removeLegacyHooks();
+      info("Legacy hooks.json cleaned up.");
+    } catch {
+    }
+  }
+  if (!existsSync4(SETTINGS_FILE) && !existsSync4(LEGACY_HOOKS_FILE)) {
+    info("No hooks configured. Nothing to remove.");
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usevalt/cli",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Valt CLI — trust layer for AI-assisted development",
   "license": "MIT",
   "repository": {
@@ -39,8 +39,8 @@
     "tsup": "^8.4.0",
     "typescript": "^5.7.0",
     "vitest": "^3.2.0",
-    "@usevalt/eslint-config": "0.0.0",
-    "@usevalt/typescript-config": "0.0.0"
+    "@usevalt/typescript-config": "0.0.0",
+    "@usevalt/eslint-config": "0.0.0"
   },
   "scripts": {
     "build": "tsup",