avorelo 0.4.0-rc.1 → 0.4.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avorelo",
-  "version": "0.4.0-rc.1",
+  "version": "0.4.0-rc.2",
   "private": false,
   "avoreloDistributionState": "ready_to_publish",
   "description": "Avorelo local-first activation, safety, and optimization runtime.",

package/scripts/lib/hook-apply.js

@@ -19,12 +19,12 @@ const AVORELO_HOOK_MARKER = "_avorelo_managed";
 // The lifecycle-hook commands that Avorelo manages
 // Uses npx to resolve the binary from the project's node_modules
 const AVORELO_LIFECYCLE_COMMANDS = Object.freeze([
-  { event: "SessionStart", command: "npx avorelo lifecycle-hook session-start --json", blocking: false },
-  { event: "UserPromptSubmit", command: "npx avorelo lifecycle-hook user-prompt-submit --json", blocking: false },
-  { event: "PreToolUse", command: "npx avorelo lifecycle-hook pre-tool-use --json", blocking: true },
-  { event: "PostToolUse", command: "npx avorelo lifecycle-hook post-tool-use --json", blocking: false },
-  { event: "Stop", command: "npx avorelo lifecycle-hook stop --json", blocking: true },
-  { event: "SessionEnd", command: "npx avorelo lifecycle-hook session-end --json", blocking: false },
+  { event: "SessionStart", command: "npx avorelo lifecycle-hook session-start --json", blocking: false, matcher: "" },
+  { event: "UserPromptSubmit", command: "npx avorelo lifecycle-hook user-prompt-submit --json", blocking: false, matcher: "" },
+  { event: "PreToolUse", command: "npx avorelo lifecycle-hook pre-tool-use --json", blocking: true, matcher: "" },
+  { event: "PostToolUse", command: "npx avorelo lifecycle-hook post-tool-use --json", blocking: false, matcher: "" },
+  { event: "Stop", command: "npx avorelo lifecycle-hook stop --json", blocking: true, matcher: "" },
+  { event: "SessionEnd", command: "npx avorelo lifecycle-hook session-end --json", blocking: false, matcher: "" },
 ]);
 
 // Supported host configs
@@ -110,26 +110,31 @@ function parseExistingConfig(configAbsPath, format) {
 
 /**
  * Check if a hook entry is Avorelo-managed.
- * An entry is Avorelo-managed if its command matches one of our lifecycle commands.
+ * Supports both nested format ({matcher, hooks: [...]}) and flat format ({type, command}).
  */
 function isAvoreloManagedHook(entry) {
   if (!entry || typeof entry !== "object") return false;
-  // Check marker field
   if (entry[AVORELO_HOOK_MARKER] === true) return true;
-  // Check command match
+  if (Array.isArray(entry.hooks)) {
+    return entry.hooks.some((h) => h && typeof h.command === "string" && h.command.includes("avorelo lifecycle-hook"));
+  }
   const cmd = entry.command || "";
-  return AVORELO_LIFECYCLE_COMMANDS.some((lc) => cmd.includes("lifecycle-hook"));
+  return cmd.includes("avorelo lifecycle-hook");
 }
 
 /**
  * Build the Avorelo hook entries for Claude Code settings.json format.
- * Each entry is tagged with _avorelo_managed for idempotent apply.
+ * Claude Code v2.1+ expects: {matcher: string, hooks: [{type, command}]}
  */
 function buildClaudeCodeHookEntries() {
   return AVORELO_LIFECYCLE_COMMANDS.map((lc) => ({
-    type: "command",
-    command: lc.command,
-    blocking: lc.blocking,
+    matcher: lc.matcher,
+    hooks: [
+      {
+        type: "command",
+        command: lc.command,
+      },
+    ],
     [AVORELO_HOOK_MARKER]: true,
     _event: lc.event,
   }));
@@ -157,7 +162,6 @@ function mergeClaudeCodeConfig(existingData) {
     ? base.hooks
     : {};
 
-  // Claude Code settings.json uses nested format: { hooks: { PreToolUse: [...], PostToolUse: [...] } }
   const merged = { ...existingHooks };
   const avoreloEntries = buildClaudeCodeHookEntries();
 
@@ -204,8 +208,9 @@ function removeAvoreloHooks(existingData, format) {
       : {};
     const cleaned = {};
     for (const [event, entries] of Object.entries(hooks)) {
-      const kept = Array.isArray(entries) ? entries.filter((h) => !isAvoreloManagedHook(h)) : entries;
-      if (Array.isArray(kept) && kept.length > 0) cleaned[event] = kept;
+      if (!Array.isArray(entries)) { cleaned[event] = entries; continue; }
+      const kept = entries.filter((h) => !isAvoreloManagedHook(h));
+      if (kept.length > 0) cleaned[event] = kept;
     }
     return { ...existingData, hooks: cleaned };
   }
@@ -546,35 +551,41 @@ function validateAppliedHooks(cwd, options = {}) {
       continue;
     }
 
-    let flatHooks = [];
-    if (Array.isArray(data.hooks)) {
-      flatHooks = data.hooks;
-    } else if (data.hooks && typeof data.hooks === "object") {
-      for (const [event, entries] of Object.entries(data.hooks)) {
-        if (Array.isArray(entries)) {
-          for (const entry of entries) flatHooks.push({ ...entry, event });
+    const hooksByEvent = data.hooks && typeof data.hooks === "object" && !Array.isArray(data.hooks)
+      ? data.hooks : {};
+    let avoreloEventCount = 0;
+    const foundEvents = [];
+    const allEntries = [];
+
+    for (const [event, entries] of Object.entries(hooksByEvent)) {
+      if (!Array.isArray(entries)) continue;
+      for (const entry of entries) {
+        allEntries.push({ ...entry, _validationEvent: event });
+        if (isAvoreloManagedHook(entry)) {
+          avoreloEventCount++;
+          foundEvents.push(event);
         }
       }
     }
-    const avoreloHooks = flatHooks.filter(isAvoreloManagedHook);
+
     const expectedCount = AVORELO_LIFECYCLE_COMMANDS.length;
     const missingEvents = AVORELO_LIFECYCLE_COMMANDS
-      .filter((lc) => !avoreloHooks.some((h) => h.event === lc.event))
+      .filter((lc) => !foundEvents.includes(lc.event))
       .map((lc) => lc.event);
 
     const duplicates = AVORELO_LIFECYCLE_COMMANDS
-      .filter((lc) => avoreloHooks.filter((h) => h.event === lc.event).length > 1)
+      .filter((lc) => foundEvents.filter((e) => e === lc.event).length > 1)
       .map((lc) => lc.event);
 
     validations.push({
       host: hostKey,
-      status: avoreloHooks.length >= expectedCount && missingEvents.length === 0 ? "valid" : "incomplete",
+      status: avoreloEventCount >= expectedCount && missingEvents.length === 0 ? "valid" : "incomplete",
       configPath: hostConf.configPath,
-      avoreloHookCount: avoreloHooks.length,
+      avoreloHookCount: avoreloEventCount,
       expectedCount,
       missingEvents,
       duplicates,
-      userHookCount: flatHooks.length - avoreloHooks.length,
+      userHookCount: allEntries.length - avoreloEventCount,
     });
   }
 
@@ -788,18 +799,19 @@ function runHookDoctor(cwd, options = {}) {
       continue;
     }
 
+    const hooksByEvent = data.hooks && typeof data.hooks === "object" && !Array.isArray(data.hooks)
+      ? data.hooks : {};
+    const avoreloEvents = [];
     let flatHooks = [];
-    if (Array.isArray(data.hooks)) {
-      flatHooks = data.hooks;
-    } else if (data.hooks && typeof data.hooks === "object") {
-      for (const [event, entries] of Object.entries(data.hooks)) {
-        if (Array.isArray(entries)) {
-          for (const entry of entries) flatHooks.push({ ...entry, _event: event });
-        }
+    for (const [event, entries] of Object.entries(hooksByEvent)) {
+      if (!Array.isArray(entries)) continue;
+      for (const entry of entries) {
+        flatHooks.push({ ...entry, _event: event });
+        if (isAvoreloManagedHook(entry)) avoreloEvents.push(event);
       }
     }
     const avoreloHooks = flatHooks.filter(isAvoreloManagedHook);
-    const hasMissing = AVORELO_LIFECYCLE_COMMANDS.some((lc) => !avoreloHooks.some((h) => (h.event || h._event) === lc.event));
+    const hasMissing = AVORELO_LIFECYCLE_COMMANDS.some((lc) => !avoreloEvents.includes(lc.event));
 
     if (avoreloHooks.length === 0) {
       checks.push({ id: "hooks_installed", host: hostKey, status: "warn", message: "No Avorelo hooks found in config. Run `hooks apply --yes` to install." });