@gobing-ai/superskill 0.2.18 → 0.2.19

package/dist/index.js

@@ -98521,7 +98521,7 @@ if (false) {}
 // package.json
 var package_default = {
   name: "@gobing-ai/superskill",
-  version: "0.2.18",
+  version: "0.2.19",
   description: "A manager for multi-agent skill, slash command, subagent, hook, MCP and etc.",
   keywords: [
     "cli",
@@ -98823,7 +98823,7 @@ function registerHookRun(cmd, readInput) {
 init_src();
 init_dist();
 import {
-  copyFileSync as copyFileSync2,
+  copyFileSync,
   existsSync as existsSync18,
   mkdirSync as mkdirSync12,
   readdirSync as readdirSync5,
@@ -98836,7 +98836,7 @@ import { homedir as homedir6 } from "os";
 import { join as join226 } from "path";
 
 // src/hooks.ts
-import { copyFileSync, existsSync as existsSync16, mkdirSync as mkdirSync10, readFileSync as readFileSync15, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync10, readFileSync as readFileSync15, writeFileSync as writeFileSync9 } from "fs";
 import { join as join223 } from "path";
 var CANONICAL_TO_PI_EVENT = {
   sessionStart: "session_start",
@@ -98888,6 +98888,38 @@ function readCanonicalHooks(rulesyncDir) {
     return null;
   }
 }
+function mergePiHooks(hooksPath, newHooks) {
+  let existing = {};
+  if (existsSync16(hooksPath)) {
+    try {
+      const raw = JSON.parse(readFileSync15(hooksPath, "utf-8"));
+      if (raw && typeof raw.hooks === "object" && raw.hooks !== null) {
+        existing = raw.hooks;
+      }
+    } catch {
+      existing = {};
+    }
+  }
+  const commandOf = (entry) => typeof entry === "string" ? entry : entry.command;
+  const merged = {};
+  const allEvents = new Set([...Object.keys(existing), ...Object.keys(newHooks)]);
+  for (const event of allEvents) {
+    const ex = existing[event] ?? [];
+    const nx = newHooks[event] ?? [];
+    const seen = new Set;
+    const acc = [];
+    for (const entry of [...ex, ...nx]) {
+      const cmd = commandOf(entry);
+      if (seen.has(cmd))
+        continue;
+      seen.add(cmd);
+      acc.push(entry);
+    }
+    if (acc.length > 0)
+      merged[event] = acc;
+  }
+  return merged;
+}
 function emitPiStyleHooks(rulesyncDir, outputRoot, targetDir, targetName, options2) {
   const config4 = readCanonicalHooks(rulesyncDir);
   if (!config4?.hooks) {
@@ -98912,7 +98944,8 @@ function emitPiStyleHooks(rulesyncDir, outputRoot, targetDir, targetName, option
   const hooksPath = join223(hooksDir, "hooks.json");
   if (!options2.dryRun) {
     mkdirSync10(hooksDir, { recursive: true });
-    writeFileSync9(hooksPath, `${JSON.stringify({ hooks: piHooks }, null, 2)}
+    const merged = mergePiHooks(hooksPath, piHooks);
+    writeFileSync9(hooksPath, `${JSON.stringify({ hooks: merged }, null, 2)}
 `);
   }
   return {
@@ -98923,6 +98956,43 @@ function emitPiStyleHooks(rulesyncDir, outputRoot, targetDir, targetName, option
     message: `${targetName}: ${hookCount} hook(s) emitted (rung b \u2014 @vahor/pi-hooks config; install with: pi install npm:@vahor/pi-hooks)`
   };
 }
+function mergeCanonicalHooks(hooksPath, newConfig) {
+  let existingHooks = {};
+  if (existsSync16(hooksPath)) {
+    try {
+      const raw = JSON.parse(readFileSync15(hooksPath, "utf-8"));
+      if (raw && typeof raw.hooks === "object" && raw.hooks !== null) {
+        existingHooks = raw.hooks;
+      }
+    } catch {
+      existingHooks = {};
+    }
+  }
+  const signatureOf = (def) => {
+    const matcher = def.matcher ?? "*";
+    const hooks = def.hooks;
+    const commands = Array.isArray(hooks) && hooks.length > 0 ? hooks.filter((h2) => h2.type !== "command" || h2.command !== undefined).map((h2) => `${h2.type}:${h2.command ?? ""}:${h2.timeout ?? ""}`) : [`${def.type ?? ""}:${def.command ?? ""}:${def.timeout ?? ""}`];
+    return `${matcher}|${commands.sort().join("||")}`;
+  };
+  const merged = {};
+  const allEvents = new Set([...Object.keys(existingHooks), ...Object.keys(newConfig.hooks ?? {})]);
+  for (const event of allEvents) {
+    const ex = existingHooks[event] ?? [];
+    const nx = newConfig.hooks?.[event] ?? [];
+    const seen = new Set;
+    const acc = [];
+    for (const def of [...ex, ...nx]) {
+      const sig = signatureOf(def);
+      if (seen.has(sig))
+        continue;
+      seen.add(sig);
+      acc.push(def);
+    }
+    if (acc.length > 0)
+      merged[event] = acc;
+  }
+  return { hooks: merged };
+}
 function emitHermesHooks(rulesyncDir, outputRoot, options2) {
   const config4 = readCanonicalHooks(rulesyncDir);
   if (!config4?.hooks) {
@@ -98946,14 +99016,16 @@ function emitHermesHooks(rulesyncDir, outputRoot, options2) {
   const hooksPath = join223(hooksDir, "hooks.json");
   if (!options2.dryRun) {
     mkdirSync10(hooksDir, { recursive: true });
-    copyFileSync(join223(rulesyncDir, "hooks.json"), hooksPath);
+    const merged = mergeCanonicalHooks(hooksPath, config4);
+    writeFileSync9(hooksPath, `${JSON.stringify(merged, null, 2)}
+`);
   }
   return {
     target: "hermes",
     emitted: true,
     count: hookCount,
     path: hooksPath,
-    message: `hermes: ${hookCount} hook(s) copied (rung c \u2014 copy-step)`
+    message: `hermes: ${hookCount} hook(s) merged (rung c \u2014 copy-step)`
   };
 }
 
@@ -99007,7 +99079,7 @@ function buildModuleContent(hook2) {
   const parts = hook2.command.split(/\s+/).map((p) => `'${p}'`).join(", ");
   const timeoutMs = hook2.timeout ? hook2.timeout * 1000 : undefined;
   const timeoutArg = timeoutMs ? `, timeout: ${timeoutMs}` : "";
-  const matcherGuard = hook2.matcher !== "*" && BLOCKABLE_OMP_EVENTS[hook2.ompEvent] === true ? `  if (event.toolName !== '${hook2.matcher}') return;
+  const matcherGuard = hook2.matcher !== "*" && BLOCKABLE_OMP_EVENTS[hook2.ompEvent] === true ? `  if (!new RegExp(${JSON.stringify(hook2.matcher)}, 'i').test(event.toolName)) return;
 ` : "";
   const blockLogic = BLOCKABLE_OMP_EVENTS[hook2.ompEvent] === true ? `    if (result.status === 2) {
 ` + `      return { block: true, reason: String(result.stderr || 'Blocked by ${hook2.name}') };
@@ -99319,7 +99391,7 @@ function postInstallOmp(pluginRoot, installPath, hooksSourceDir, plugin, options
   const sourceManifest = join226(pluginRoot, "plugin.json");
   if (existsSync18(sourceManifest)) {
     mkdirSync12(manifestDir, { recursive: true });
-    copyFileSync2(sourceManifest, join226(manifestDir, "plugin.json"));
+    copyFileSync(sourceManifest, join226(manifestDir, "plugin.json"));
     if (options2.verbose)
       echo(`  OMP manifest: copied plugin.json \u2192 ${join226(manifestDir, "plugin.json")}`);
   }
@@ -99427,7 +99499,7 @@ function copyDirectory(source, destination, options2 = {}) {
     if (statSync7(sourcePath).isDirectory()) {
       copyDirectory(sourcePath, destinationPath, options2);
     } else {
-      copyFileSync2(sourcePath, destinationPath);
+      copyFileSync(sourcePath, destinationPath);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobing-ai/superskill",
-    "version": "0.2.18",
+    "version": "0.2.19",
     "description": "A manager for multi-agent skill, slash command, subagent, hook, MCP and etc.",
     "keywords": [
         "cli",