agentsmesh 0.39.0 → 0.41.0

package/dist/canonical.js

@@ -926,6 +926,7 @@ var init_target_descriptor_schema = __esm({
       emitScopedSettings: z.function().optional(),
       mergeGeneratedOutputContent: z.function().optional(),
       postProcessHookOutputs: z.function().optional(),
+      hookContextEvents: z.array(z.string()).optional(),
       preservesManualActivation: z.boolean().optional()
     }).passthrough();
     targetDescriptorSchemaBase.superRefine((value, ctx) => {
@@ -1242,10 +1243,16 @@ var init_guards = __esm({
   "src/utils/types/guards.ts"() {
   }
 });
-var RECALL_HOOK_COMMAND;
+var init_cli_invocation = __esm({
+  "src/lessons/cli-invocation.ts"() {
+  }
+});
+var RECALL_SUBCOMMAND, RECALL_HOOK_COMMAND;
 var init_recall_hook_scaffold = __esm({
   "src/lessons/recall-hook-scaffold.ts"() {
-    RECALL_HOOK_COMMAND = "agentsmesh lessons hook";
+    init_cli_invocation();
+    RECALL_SUBCOMMAND = "lessons hook";
+    RECALL_HOOK_COMMAND = `agentsmesh ${RECALL_SUBCOMMAND}`;
   }
 });
 
@@ -2177,6 +2184,15 @@ var init_constants = __esm({
   }
 });
 
+// src/targets/catalog/ignore-output.ts
+function ignoreOutput(path) {
+  return (canonical) => canonical.ignore.length === 0 ? [] : [{ path, content: canonical.ignore.join("\n") }];
+}
+var init_ignore_output = __esm({
+  "src/targets/catalog/ignore-output.ts"() {
+  }
+});
+
 // src/targets/aider/generator.ts
 function buildAiderConventions(canonical) {
   const root = canonical.rules.find((rule) => rule.root);
@@ -2206,11 +2222,7 @@ function generateAgents(canonical) {
     content: serializeProjectedAgentSkill(agent)
   }));
 }
-function generateIgnore(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: AIDER_IGNORE, content: canonical.ignore.join("\n") }];
-}
-var generateMcp, generatePermissions;
+var generateIgnore, generateMcp, generatePermissions;
 var init_generator = __esm({
   "src/targets/aider/generator.ts"() {
     init_no_outputs();
@@ -2219,6 +2231,8 @@ var init_generator = __esm({
     init_projected_agent_skill();
     init_command_skill();
     init_constants();
+    init_ignore_output();
+    generateIgnore = ignoreOutput(AIDER_IGNORE);
     generateMcp = NO_OUTPUTS;
     generatePermissions = NO_OUTPUTS;
   }
@@ -2914,6 +2928,9 @@ var init_link_token_context = __esm({
 });
 
 // src/core/reference/link-rebaser.ts
+function isSlashCommandToken(normalizedToken) {
+  return /^\/[A-Za-z][A-Za-z0-9-]*$/.test(normalizedToken);
+}
 function rewriteFileLinks(input) {
   const missing = /* @__PURE__ */ new Set();
   const protectedRefRanges = protectedRanges(input.content);
@@ -2964,6 +2981,7 @@ function rewriteFileLinks(input) {
     if (targetIsDirectory && !normalizedCandidate.includes("/") && !normalizedCandidate.includes("\\")) {
       return match;
     }
+    if (isSlashCommandToken(normalizedCandidate)) return match;
     if (resolvedBeforeTranslate === null) {
       let normTok = normalizeSeparators(punctStripped);
       if (normTok.startsWith("agentsmesh/")) {
@@ -7009,10 +7027,6 @@ function generateAgents4(canonical) {
     content: serializeAntigravityAgent(agent)
   }));
 }
-function generateIgnore3(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: ANTIGRAVITY_IGNORE_FILE, content: canonical.ignore.join("\n") }];
-}
 function renderAntigravityGlobalInstructions(canonical) {
   const root = canonical.rules.find((rule) => rule.root);
   const nonRootRules = canonical.rules.filter((rule) => {
@@ -7027,7 +7041,7 @@ function generateHooks2(canonical) {
   if (Object.keys(hooks).length === 0) return [];
   return [{ path: ANTIGRAVITY_HOOKS_FILE, content: JSON.stringify(hooks, null, 2) }];
 }
-var generatePermissions3;
+var generateIgnore3, generatePermissions3;
 var init_generator4 = __esm({
   "src/targets/antigravity/generator.ts"() {
     init_no_outputs();
@@ -7036,6 +7050,8 @@ var init_generator4 = __esm({
     init_hooks_format2();
     init_agents_format();
     init_constants5();
+    init_ignore_output();
+    generateIgnore3 = ignoreOutput(ANTIGRAVITY_IGNORE_FILE);
     generatePermissions3 = NO_OUTPUTS;
   }
 });
@@ -8498,16 +8514,14 @@ function generateHooks3(canonical) {
   const content = JSON.stringify({ hooks: claudeHooks }, null, 2);
   return [{ path: CLAUDE_SETTINGS, content }];
 }
-function generateIgnore5(canonical) {
-  if (!canonical.ignore || canonical.ignore.length === 0) return [];
-  const content = canonical.ignore.join("\n");
-  return [{ path: CLAUDE_IGNORE, content }];
-}
+var generateIgnore5;
 var init_generator6 = __esm({
   "src/targets/claude-code/generator.ts"() {
     init_markdown();
     init_constants7();
     init_hooks_format2();
+    init_ignore_output();
+    generateIgnore5 = ignoreOutput(CLAUDE_IGNORE);
   }
 });
 function ruleSectionTitle(rule) {
@@ -10326,11 +10340,7 @@ function generateMcp5(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
   return [{ path: CODEBUFF_MCP_FILE, content: serializeCodebuffMcp(canonical.mcp) }];
 }
-function generateIgnore7(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: CODEBUFF_IGNORE_FILE, content: canonical.ignore.join("\n") }];
-}
-var generateAgents8, generateHooks5, generatePermissions6;
+var generateIgnore7, generateAgents8, generateHooks5, generatePermissions6;
 var init_generator8 = __esm({
   "src/targets/codebuff/generator.ts"() {
     init_no_outputs();
@@ -10340,6 +10350,8 @@ var init_generator8 = __esm({
     init_nested_rules();
     init_mcp_format2();
     init_constants9();
+    init_ignore_output();
+    generateIgnore7 = ignoreOutput(CODEBUFF_IGNORE_FILE);
     generateAgents8 = NO_OUTPUTS;
     generateHooks5 = NO_OUTPUTS;
     generatePermissions6 = NO_OUTPUTS;
@@ -12852,53 +12864,37 @@ var init_mcp_generator = __esm({
   }
 });
 
-// src/targets/copilot/hook-entry.ts
-function hasHookCommand2(entry) {
-  return hasHookCommand(entry);
-}
-var init_hook_entry = __esm({
-  "src/targets/copilot/hook-entry.ts"() {
-    init_hook_command();
-  }
-});
-
 // src/targets/copilot/hook-format.ts
-function mapHookEvent(event) {
-  switch (event) {
-    case "PreToolUse":
-      return "preToolUse";
-    case "PostToolUse":
-      return "postToolUse";
-    case "Notification":
-      return "notification";
-    case "UserPromptSubmit":
-      return "userPromptSubmitted";
-    default:
-      return null;
-  }
+function copilotHookGroups(hooks) {
+  return Object.entries(hooks ?? {}).flatMap(([event, entries]) => {
+    const copilotEvent = CANONICAL_TO_COPILOT.get(event);
+    if (!copilotEvent || !Array.isArray(entries)) return [];
+    const kept = entries.filter(
+      (entry) => typeof entry === "object" && entry !== null && hasHookCommand(entry)
+    );
+    return kept.length > 0 ? [{ event, copilotEvent, entries: kept }] : [];
+  });
+}
+function wrapperScriptName(event, index) {
+  return `${event.replace(/[^a-zA-Z0-9]/g, "-").toLowerCase()}-${index}.sh`;
 }
 function buildCopilotHooksObject(hooks) {
-  if (!hooks) return null;
-  const result2 = Object.fromEntries(
-    Object.entries(hooks).flatMap(([event, entries]) => {
-      const mappedEvent = mapHookEvent(event);
-      if (!mappedEvent || !Array.isArray(entries)) return [];
-      const mappedEntries = entries.filter(
-        (entry) => typeof entry === "object" && entry !== null && hasHookCommand2(entry)
-      ).map((entry, index) => {
-        const safePhase = event.replace(/[^a-zA-Z0-9]/g, "-").toLowerCase();
+  const groups = copilotHookGroups(hooks);
+  if (groups.length === 0) return null;
+  return Object.fromEntries(
+    groups.map(({ event, copilotEvent, entries }) => [
+      copilotEvent,
+      entries.map((entry, index) => {
         const hook = {
           type: "command",
-          bash: `./scripts/${safePhase}-${index}.sh`
+          bash: `./scripts/${wrapperScriptName(event, index)}`
         };
         if (entry.matcher && entry.matcher !== "*") hook.matcher = entry.matcher;
         if (entry.timeout !== void 0) hook.timeoutSec = Math.ceil(entry.timeout / 1e3);
         return hook;
-      });
-      return mappedEntries.length > 0 ? [[mappedEvent, mappedEntries]] : [];
-    })
+      })
+    ])
   );
-  return Object.keys(result2).length > 0 ? result2 : null;
 }
 function generateHooks8(canonical) {
   const hooks = buildCopilotHooksObject(canonical.hooks);
@@ -12910,10 +12906,24 @@ function generateHooks8(canonical) {
     }
   ];
 }
+var COPILOT_HOOK_CONTEXT_EVENTS, CANONICAL_TO_COPILOT;
 var init_hook_format = __esm({
   "src/targets/copilot/hook-format.ts"() {
     init_constants32();
-    init_hook_entry();
+    init_hook_command();
+    COPILOT_HOOK_CONTEXT_EVENTS = [
+      "SessionStart",
+      "PostToolUse",
+      "PostToolUseFailure"
+    ];
+    CANONICAL_TO_COPILOT = /* @__PURE__ */ new Map([
+      ["PreToolUse", "preToolUse"],
+      ["PostToolUse", "postToolUse"],
+      ["PostToolUseFailure", "postToolUseFailure"],
+      ["Notification", "notification"],
+      ["UserPromptSubmit", "userPromptSubmitted"],
+      ["SessionStart", "sessionStart"]
+    ]);
   }
 });
 function ruleSlug3(source) {
@@ -13019,18 +13029,7 @@ var init_generator12 = __esm({
   }
 });
 function mapCopilotHookEvent(event) {
-  switch (event) {
-    case "preToolUse":
-      return "PreToolUse";
-    case "postToolUse":
-      return "PostToolUse";
-    case "notification":
-      return "Notification";
-    case "userPromptSubmitted":
-      return "UserPromptSubmit";
-    default:
-      return null;
-  }
+  return COPILOT_TO_CANONICAL.get(event) ?? null;
 }
 function extractMatcher(comment) {
   if (typeof comment !== "string") return "*";
@@ -13118,11 +13117,16 @@ async function importHooks(projectRoot, results, options = {}) {
     feature: "hooks"
   });
 }
+var COPILOT_TO_CANONICAL;
 var init_hook_parser = __esm({
   "src/targets/copilot/hook-parser.ts"() {
     init_canonical_paths();
     init_fs();
     init_constants32();
+    init_hook_format();
+    COPILOT_TO_CANONICAL = new Map(
+      [...CANONICAL_TO_COPILOT].map(([canonical, copilot]) => [copilot, canonical])
+    );
   }
 });
 async function importSkills2(projectRoot, results, normalize, skillsDirRel = COPILOT_SKILLS_DIR) {
@@ -13359,7 +13363,7 @@ function lintCommands4(canonical) {
 }
 function lintHooks9(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
-  const supported = ["PreToolUse", "PostToolUse", "Notification", "UserPromptSubmit"];
+  const supported = [...CANONICAL_TO_COPILOT.keys()];
   const diagnostics = unsupportedHookEventNames(canonical.hooks, supported).map(
     (event) => createUnsupportedHookWarning(event, "copilot", supported, {
       unsupportedBy: "Copilot hooks"
@@ -13382,11 +13386,9 @@ function lintHooks9(canonical) {
 var init_lint10 = __esm({
   "src/targets/copilot/lint.ts"() {
     init_helpers();
+    init_hook_format();
   }
 });
-function safePhaseName(phase) {
-  return phase.replace(/[^a-zA-Z0-9]/g, "-").toLowerCase();
-}
 function toRepoRelative(projectRoot, sourcePath) {
   const repoRelative = relative(projectRoot, sourcePath).replace(/\\/g, "/");
   if (!repoRelative || repoRelative.startsWith("../")) return null;
@@ -13414,9 +13416,6 @@ async function buildAssetOutput(projectRoot, command, hooksDirRel) {
     rewrittenCommand: rewriteWrapperCommand(command, repoRelative)
   };
 }
-function wrapperPath(event, index, hooksDirRel) {
-  return `${hooksDirRel}/scripts/${safePhaseName(event)}-${index}.sh`;
-}
 function safeShellLine2(value) {
   return value.replace(/[\r\n]+/g, " ");
 }
@@ -13431,15 +13430,13 @@ function buildWrapper(command, matcher) {
   ].join("\n");
 }
 async function addHookScriptAssets(projectRoot, canonical, outputs, hooksDirRel = COPILOT_HOOKS_DIR) {
-  if (!canonical.hooks) return outputs;
+  const groups = copilotHookGroups(canonical.hooks);
+  if (groups.length === 0) return outputs;
   const wrapperOutputs = [];
   const assetOutputs = /* @__PURE__ */ new Map();
-  for (const [event, entries] of Object.entries(canonical.hooks)) {
-    if (!Array.isArray(entries)) continue;
-    let index = 0;
-    for (const entry of entries) {
-      if (!hasHookCommand2(entry)) continue;
-      const scriptPath = wrapperPath(event, index, hooksDirRel);
+  for (const { event, entries } of groups) {
+    for (const [index, entry] of entries.entries()) {
+      const scriptPath = `${hooksDirRel}/scripts/${wrapperScriptName(event, index)}`;
       let command = entry.command;
       const asset = await buildAssetOutput(projectRoot, entry.command, hooksDirRel);
       if (asset) {
@@ -13453,7 +13450,6 @@ async function addHookScriptAssets(projectRoot, canonical, outputs, hooksDirRel
         'set -eu\nHOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"\n'
       );
       wrapperOutputs.push({ path: scriptPath, content: wrapper });
-      index++;
     }
   }
   return [...outputs, ...wrapperOutputs, ...assetOutputs.values()];
@@ -13463,7 +13459,7 @@ var init_hook_assets = __esm({
   "src/targets/copilot/hook-assets.ts"() {
     init_fs();
     init_constants32();
-    init_hook_entry();
+    init_hook_format();
     SCRIPT_PREFIX_RE = /^(?<prefix>\s*(?:(?:bash|sh|zsh)\s+)?)["']?(?<path>(?:\.\.\/|\.\/|[^/\s"'`]+\/)[^\s"'`]+)["']?(?<suffix>(?:\s.*)?)$/;
   }
 });
@@ -13781,6 +13777,7 @@ var init_copilot2 = __esm({
     init_command_prompt();
     init_lint10();
     init_hook_assets();
+    init_hook_format();
     init_scope_extras2();
     init_importer_spec2();
     init_capabilities6();
@@ -13911,6 +13908,7 @@ var init_copilot2 = __esm({
         permissions: lintPermissions7
       },
       postProcessHookOutputs: async (projectRoot, canonical, outputs) => addHookScriptAssets(projectRoot, canonical, [...outputs]),
+      hookContextEvents: COPILOT_HOOK_CONTEXT_EVENTS,
       mergeGeneratedOutputContent: mergeCopilotMcpJson,
       project: project7,
       globalSupport: {
@@ -13998,11 +13996,6 @@ function generatePermissions8(canonical) {
   });
   return [{ path: CRUSH_CONFIG_FILE, content: JSON.stringify(crushConfig, null, 2) }];
 }
-function generateIgnore9(canonical) {
-  if (!canonical.ignore || canonical.ignore.length === 0) return [];
-  const content = canonical.ignore.join("\n");
-  return [{ path: CRUSH_IGNORE, content }];
-}
 function buildCrushHooksFromCanonical(canonical) {
   if (!canonical.hooks) return {};
   const result2 = {};
@@ -14020,7 +14013,7 @@ function buildCrushHooksFromCanonical(canonical) {
   }
   return result2;
 }
-var generateRules12;
+var generateRules12, generateIgnore9;
 var init_generator13 = __esm({
   "src/targets/crush/generator.ts"() {
     init_managed_blocks();
@@ -14029,7 +14022,9 @@ var init_generator13 = __esm({
     init_command_skill();
     init_constants12();
     init_config_format();
+    init_ignore_output();
     generateRules12 = (canonical) => embeddedRootRule(canonical, CRUSH_TARGET, CRUSH_ROOT_FILE);
+    generateIgnore9 = ignoreOutput(CRUSH_IGNORE);
   }
 });
 async function importFromCrush(projectRoot, options = {}) {
@@ -14565,7 +14560,7 @@ function cursorHooksToCanonical(hooks) {
   }
   return result2;
 }
-var CANONICAL_TO_CURSOR, CURSOR_TO_CANONICAL;
+var CANONICAL_TO_CURSOR, CURSOR_HOOK_CONTEXT_EVENTS, CURSOR_TO_CANONICAL;
 var init_hook_format2 = __esm({
   "src/targets/cursor/hook-format.ts"() {
     init_hook_types();
@@ -14573,6 +14568,7 @@ var init_hook_format2 = __esm({
     CANONICAL_TO_CURSOR = {
       PreToolUse: "preToolUse",
       PostToolUse: "postToolUse",
+      PostToolUseFailure: "postToolUseFailure",
       UserPromptSubmit: "beforeSubmitPrompt",
       SubagentStart: "subagentStart",
       SubagentStop: "subagentStop",
@@ -14581,6 +14577,11 @@ var init_hook_format2 = __esm({
       SessionEnd: "sessionEnd",
       PreCompact: "preCompact"
     };
+    CURSOR_HOOK_CONTEXT_EVENTS = [
+      "SessionStart",
+      "PostToolUse",
+      "PostToolUseFailure"
+    ];
     CURSOR_TO_CANONICAL = new Map(
       Object.entries(CANONICAL_TO_CURSOR).map(([canonical, cursor]) => [cursor, canonical])
     );
@@ -14589,7 +14590,7 @@ var init_hook_format2 = __esm({
 
 // src/targets/cursor/generator/hooks.ts
 function generateHooks10(canonical) {
-  if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
+  if (!canonical.hooks) return [];
   const cursorHooks = toCursorHooks(canonical.hooks);
   if (Object.keys(cursorHooks).length === 0) return [];
   const content = JSON.stringify({ version: 1, hooks: cursorHooks }, null, 2);
@@ -14603,14 +14604,12 @@ var init_hooks4 = __esm({
 });
 
 // src/targets/cursor/generator/ignore.ts
-function generateIgnore10(canonical) {
-  if (!canonical.ignore || canonical.ignore.length === 0) return [];
-  const content = canonical.ignore.join("\n");
-  return [{ path: CURSOR_IGNORE, content }];
-}
+var generateIgnore10;
 var init_ignore = __esm({
   "src/targets/cursor/generator/ignore.ts"() {
     init_constants13();
+    init_ignore_output();
+    generateIgnore10 = ignoreOutput(CURSOR_IGNORE);
   }
 });
 
@@ -15164,7 +15163,7 @@ var init_importer13 = __esm({
 });
 
 // src/targets/cursor/merge.ts
-var mergeMcp3, mergeHooks2, mergePermissions2, mergeCursorOutput;
+var mergeMcp3, mergeHooks, mergePermissions2, mergeCursorOutput;
 var init_merge4 = __esm({
   "src/targets/cursor/merge.ts"() {
     init_target_descriptor();
@@ -15172,14 +15171,14 @@ var init_merge4 = __esm({
     init_mcp_servers_merge();
     init_constants13();
     mergeMcp3 = mcpServersJsonMerger([CURSOR_MCP], CANONICAL_MCP_SERVER_KEYS);
-    mergeHooks2 = ownedJsonKeysMerger([CURSOR_HOOKS], ["version", "hooks"]);
+    mergeHooks = ownedJsonKeysMerger([CURSOR_HOOKS], ["version", "hooks"]);
     mergePermissions2 = ownedJsonKeysMerger(
       [CURSOR_CLI_JSON, CURSOR_GLOBAL_CLI_CONFIG],
       ["permissions"]
     );
     mergeCursorOutput = firstMerger([
       mergeMcp3,
-      mergeHooks2,
+      mergeHooks,
       mergePermissions2
     ]);
   }
@@ -15306,6 +15305,7 @@ var init_cursor2 = __esm({
     init_linter13();
     init_import_map_builders();
     init_lint12();
+    init_hook_format2();
     target13 = {
       name: "cursor",
       primaryRootInstructionPath: CURSOR_GENERAL_RULE,
@@ -15427,6 +15427,7 @@ var init_cursor2 = __esm({
         permissions: "native"
       },
       emptyImportMessage: "No Cursor config found (AGENTS.md or .cursor/rules/*.mdc; with --global: ~/.cursor/{rules/*.mdc,AGENTS.md,mcp.json,hooks.json,cursorignore,skills/,agents/,commands/} and legacy ~/.agentsmesh-exports/cursor/user-rules.md).",
+      hookContextEvents: CURSOR_HOOK_CONTEXT_EVENTS,
       lintRules: lintRules13,
       lint: {
         commands: lintCommands6,
@@ -16324,7 +16325,7 @@ var init_importer15 = __esm({
 });
 
 // src/targets/factory-droid/merge.ts
-var mergeMcp4, mergeHooks3, mergeSettings, mergeFactoryDroidOutput;
+var mergeMcp4, mergeHooks2, mergeSettings, mergeFactoryDroidOutput;
 var init_merge5 = __esm({
   "src/targets/factory-droid/merge.ts"() {
     init_target_descriptor();
@@ -16335,7 +16336,7 @@ var init_merge5 = __esm({
       [FACTORY_DROID_MCP_FILE, FACTORY_DROID_GLOBAL_MCP_FILE],
       CANONICAL_MCP_SERVER_KEYS
     );
-    mergeHooks3 = ownedJsonKeysMerger(
+    mergeHooks2 = ownedJsonKeysMerger(
       [FACTORY_DROID_HOOKS_FILE, FACTORY_DROID_GLOBAL_HOOKS_FILE],
       ["hooks"]
     );
@@ -16345,7 +16346,7 @@ var init_merge5 = __esm({
     );
     mergeFactoryDroidOutput = firstMerger([
       mergeMcp4,
-      mergeHooks3,
+      mergeHooks2,
       mergeSettings
     ]);
   }
@@ -16688,25 +16689,127 @@ var init_skills3 = __esm({
   }
 });
 
-// src/targets/gemini-cli/generator/settings.ts
-function mapHookEvent2(event) {
-  switch (event) {
-    case "PreToolUse":
-      return "BeforeTool";
-    case "PostToolUse":
-      return "AfterTool";
-    case "Notification":
-      return "Notification";
-    case "SubagentStart":
-      return "BeforeAgent";
-    case "SubagentStop":
-      return "AfterAgent";
-    case "SessionStart":
-      return "SessionStart";
-    default:
-      return null;
+// src/targets/gemini-cli/hook-map.ts
+function geminiHookEvent(event) {
+  return CANONICAL_TO_GEMINI.get(event) ?? null;
+}
+function mapGeminiHookEvent(event) {
+  return GEMINI_TO_CANONICAL.get(event) ?? null;
+}
+function splitNames(list, separator) {
+  return list.split(separator).map((name) => name.trim()).filter((name) => name.length > 0);
+}
+function toGeminiMatcher(geminiEvent, matcher) {
+  if (!TOOL_EVENTS.has(geminiEvent) || !NAME_LIST.test(matcher)) return matcher;
+  const tools = unique(
+    splitNames(matcher, /[|,]/).flatMap((name) => CANONICAL_TO_GEMINI_TOOLS.get(name) ?? [name])
+  );
+  return tools.length > 0 ? `^(?:${tools.join("|")})$` : matcher;
+}
+function fromGeminiMatcher(geminiEvent, matcher) {
+  if (!TOOL_EVENTS.has(geminiEvent)) return matcher;
+  const list = ANCHORED_LIST.exec(matcher)?.[1] ?? matcher;
+  if (!NAME_LIST.test(list) || list.includes(",")) return matcher;
+  return unique(
+    splitNames(list, /\|/).map((name) => GEMINI_TO_CANONICAL_TOOLS.get(name) ?? name)
+  ).join("|");
+}
+var GEMINI_HOOK_CONTEXT_EVENTS, CANONICAL_TO_GEMINI, GEMINI_TO_CANONICAL, TOOL_EVENTS, CANONICAL_TO_GEMINI_TOOLS, GEMINI_TO_CANONICAL_TOOLS, NAME_LIST, ANCHORED_LIST, unique;
+var init_hook_map = __esm({
+  "src/targets/gemini-cli/hook-map.ts"() {
+    GEMINI_HOOK_CONTEXT_EVENTS = [
+      "UserPromptSubmit",
+      "SessionStart",
+      "PostToolUse"
+    ];
+    CANONICAL_TO_GEMINI = /* @__PURE__ */ new Map([
+      ["PreToolUse", "BeforeTool"],
+      ["PostToolUse", "AfterTool"],
+      ["Notification", "Notification"],
+      // BeforeAgent fires after the user submits a prompt and carries `prompt`.
+      ["UserPromptSubmit", "BeforeAgent"],
+      // Older mapping, kept so existing SubagentStart hooks still reach Gemini.
+      ["SubagentStart", "BeforeAgent"],
+      ["SubagentStop", "AfterAgent"],
+      ["SessionStart", "SessionStart"]
+    ]);
+    GEMINI_TO_CANONICAL = new Map([
+      ...[...CANONICAL_TO_GEMINI].map(([canonical, gemini]) => [gemini, canonical]),
+      // BeforeAgent is shared with SubagentStart; import it as the prompt event.
+      ["BeforeAgent", "UserPromptSubmit"],
+      // Legacy lowercase names.
+      ["preToolUse", "PreToolUse"],
+      ["postToolUse", "PostToolUse"],
+      ["notification", "Notification"]
+    ]);
+    TOOL_EVENTS = /* @__PURE__ */ new Set(["BeforeTool", "AfterTool"]);
+    CANONICAL_TO_GEMINI_TOOLS = /* @__PURE__ */ new Map([
+      ["Bash", ["run_shell_command"]],
+      ["PowerShell", ["run_shell_command"]],
+      ["Edit", ["replace"]],
+      ["MultiEdit", ["replace"]],
+      ["Write", ["write_file"]],
+      ["NotebookEdit", []],
+      ["Read", ["read_file", "read_many_files"]],
+      ["Grep", ["grep_search"]],
+      ["Glob", ["glob"]],
+      ["LS", ["list_directory"]],
+      ["WebFetch", ["web_fetch"]],
+      ["WebSearch", ["google_web_search"]],
+      ["TodoWrite", ["write_todos"]]
+    ]);
+    GEMINI_TO_CANONICAL_TOOLS = /* @__PURE__ */ new Map([
+      ["run_shell_command", "Bash"],
+      ["replace", "Edit"],
+      ["write_file", "Write"],
+      ["read_file", "Read"],
+      ["read_many_files", "Read"],
+      ["grep_search", "Grep"],
+      ["search_file_content", "Grep"],
+      ["glob", "Glob"],
+      ["list_directory", "LS"],
+      ["web_fetch", "WebFetch"],
+      ["google_web_search", "WebSearch"],
+      ["write_todos", "TodoWrite"]
+    ]);
+    NAME_LIST = /^[\w\s,|-]+$/;
+    ANCHORED_LIST = /^\^\(\?:(.*)\)\$$/;
+    unique = (values) => [...new Set(values)];
   }
+});
+
+// src/targets/gemini-cli/generator/hooks.ts
+function buildGeminiHooks(hooks) {
+  const result2 = {};
+  for (const [event, entries] of Object.entries(hooks ?? {})) {
+    const geminiEvent = geminiHookEvent(event);
+    if (!geminiEvent || !Array.isArray(entries)) continue;
+    for (const entry of entries) {
+      if (typeof entry !== "object" || entry === null || !hasHookCommand(entry)) continue;
+      const list = result2[geminiEvent] ??= [];
+      list.push({
+        matcher: typeof entry.matcher === "string" ? toGeminiMatcher(geminiEvent, entry.matcher) : entry.matcher,
+        hooks: [
+          {
+            name: `${geminiEvent}-${list.length + 1}`,
+            type: "command",
+            command: getHookCommand(entry),
+            timeout: entry.timeout
+          }
+        ]
+      });
+    }
+  }
+  return Object.keys(result2).length > 0 ? result2 : null;
 }
+var init_hooks5 = __esm({
+  "src/targets/gemini-cli/generator/hooks.ts"() {
+    init_hook_command();
+    init_hook_map();
+  }
+});
+
+// src/targets/gemini-cli/generator/settings.ts
 function generateGeminiSettingsFiles(canonical, enabledFeatures) {
   const settings = {};
   let hasAnyNativeSettings = false;
@@ -16718,29 +16821,10 @@ function generateGeminiSettingsFiles(canonical, enabledFeatures) {
     settings.experimental = { enableAgents: true };
     hasAnyNativeSettings = true;
   }
-  if (enabledFeatures.has("hooks") && canonical.hooks) {
-    const hookEntries = Object.entries(canonical.hooks).flatMap(([event, entries]) => {
-      const mappedEvent = mapHookEvent2(event);
-      if (!mappedEvent || !Array.isArray(entries)) return [];
-      const mappedEntries = entries.filter(
-        (entry) => typeof entry === "object" && entry !== null && hasHookCommand(entry)
-      ).map((entry, index) => ({
-        matcher: entry.matcher,
-        hooks: [
-          {
-            name: `${mappedEvent}-${index + 1}`,
-            type: "command",
-            command: getHookCommand(entry),
-            timeout: entry.timeout
-          }
-        ]
-      }));
-      return mappedEntries.length > 0 ? [[mappedEvent, mappedEntries]] : [];
-    });
-    if (hookEntries.length > 0) {
-      settings.hooks = Object.fromEntries(hookEntries);
-      hasAnyNativeSettings = true;
-    }
+  const hooks = enabledFeatures.has("hooks") ? buildGeminiHooks(canonical.hooks) : null;
+  if (hooks) {
+    settings.hooks = hooks;
+    hasAnyNativeSettings = true;
   }
   if (hasAnyNativeSettings) {
     settings.context = { fileName: [GEMINI_ROOT, GEMINI_COMPAT_AGENTS] };
@@ -16750,19 +16834,18 @@ function generateGeminiSettingsFiles(canonical, enabledFeatures) {
 }
 var init_settings2 = __esm({
   "src/targets/gemini-cli/generator/settings.ts"() {
-    init_hook_command();
     init_constants33();
+    init_hooks5();
   }
 });
 
 // src/targets/gemini-cli/generator/ignore.ts
-function generateIgnore13(canonical) {
-  if (!canonical.ignore || canonical.ignore.length === 0) return [];
-  return [{ path: GEMINI_IGNORE, content: canonical.ignore.join("\n") }];
-}
+var generateIgnore13;
 var init_ignore2 = __esm({
   "src/targets/gemini-cli/generator/ignore.ts"() {
     init_constants33();
+    init_ignore_output();
+    generateIgnore13 = ignoreOutput(GEMINI_IGNORE);
   }
 });
 
@@ -17041,27 +17124,6 @@ var init_layout6 = __esm({
     };
   }
 });
-function mapGeminiHookEvent(event) {
-  switch (event) {
-    case "BeforeTool":
-    case "preToolUse":
-      return "PreToolUse";
-    case "AfterTool":
-    case "postToolUse":
-      return "PostToolUse";
-    case "Notification":
-    case "notification":
-      return "Notification";
-    case "BeforeAgent":
-      return "SubagentStart";
-    case "AfterAgent":
-      return "SubagentStop";
-    case "SessionStart":
-      return "SessionStart";
-    default:
-      return null;
-  }
-}
 function parseFlexibleFrontmatter(content) {
   const yamlOpen = content.indexOf("---");
   const tomlOpen = content.indexOf("+++");
@@ -17135,7 +17197,7 @@ async function importGeminiSettings(projectRoot, results) {
           (entry) => entry.hooks.filter(
             (hook) => hook !== null && typeof hook === "object" && hasHookCommand(hook)
           ).map((hook) => ({
-            matcher: entry.matcher,
+            matcher: fromGeminiMatcher(event, entry.matcher),
             command: getHookCommand(hook),
             type: "command",
             timeout: typeof hook.timeout === "number" ? hook.timeout : void 0
@@ -17145,7 +17207,7 @@ async function importGeminiSettings(projectRoot, results) {
           const legacyMapped = value.filter(
             (entry) => entry !== null && typeof entry === "object" && typeof entry.matcher === "string" && hasHookCommand(entry)
           ).map((entry) => ({
-            matcher: entry.matcher,
+            matcher: fromGeminiMatcher(event, entry.matcher),
             command: getHookCommand(entry),
             type: "command"
           }));
@@ -17174,7 +17236,7 @@ var init_format_helpers_settings = __esm({
     init_hook_command();
     init_fs();
     init_constants33();
-    init_format_helpers_shared();
+    init_hook_map();
   }
 });
 async function importGeminiIgnore(projectRoot, results) {
@@ -17670,14 +17732,7 @@ function lintPermissions10(canonical, options) {
 }
 function lintHooks12(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
-  const supported = [
-    "PreToolUse",
-    "PostToolUse",
-    "Notification",
-    "SubagentStart",
-    "SubagentStop",
-    "SessionStart"
-  ];
+  const supported = [...CANONICAL_TO_GEMINI.keys()];
   return unsupportedHookEventNames(canonical.hooks, supported).map(
     (event) => createUnsupportedHookWarning(event, "gemini-cli", supported)
   );
@@ -17685,6 +17740,7 @@ function lintHooks12(canonical) {
 var init_lint15 = __esm({
   "src/targets/gemini-cli/lint.ts"() {
     init_helpers();
+    init_hook_map();
   }
 });
 
@@ -17721,6 +17777,7 @@ var init_gemini_cli2 = __esm({
     init_import_map_builders();
     init_lint15();
     init_scoped_settings_emit();
+    init_hook_map();
     init_settings();
     target16 = {
       name: "gemini-cli",
@@ -17771,6 +17828,7 @@ var init_gemini_cli2 = __esm({
         permissions: lintPermissions10
       },
       emitScopedSettings: emitScopedGeminiSettings,
+      hookContextEvents: GEMINI_HOOK_CONTEXT_EVENTS,
       mergeGeneratedOutputContent(existing, pending, newContent, resolvedPath) {
         const base = pending?.content ?? existing;
         if (base !== null && resolvedPath === GEMINI_SETTINGS) {
@@ -17863,14 +17921,10 @@ function generateAgents17(canonical) {
     content: serializeProjectedAgentSkill(agent)
   }));
 }
-function generateIgnore14(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: GOOSE_IGNORE, content: canonical.ignore.join("\n") }];
-}
 function generateHooks12(canonical) {
   return buildWrappedCommandHooks(canonical, GOOSE_HOOKS_FILE);
 }
-var generateRules17, generatePermissions12;
+var generateRules17, generateIgnore14, generatePermissions12;
 var init_generator20 = __esm({
   "src/targets/goose/generator.ts"() {
     init_managed_blocks();
@@ -17880,7 +17934,9 @@ var init_generator20 = __esm({
     init_command_skill();
     init_wrapped_command_hooks();
     init_constants16();
+    init_ignore_output();
     generateRules17 = (canonical) => embeddedRootRule(canonical, GOOSE_TARGET, GOOSE_ROOT_FILE);
+    generateIgnore14 = ignoreOutput(GOOSE_IGNORE);
     generatePermissions12 = NO_OUTPUTS;
   }
 });
@@ -18785,10 +18841,6 @@ function generateAgents18(canonical) {
     };
   });
 }
-function generateIgnore16(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: JUNIE_IGNORE, content: canonical.ignore.join("\n") }];
-}
 function generateSkills17(canonical) {
   return generateEmbeddedSkills(canonical, JUNIE_SKILLS_DIR);
 }
@@ -18800,6 +18852,7 @@ function renderJunieGlobalInstructions(canonical) {
   });
   return appendEmbeddedRulesBlock(root?.body.trim() ?? "", nonRootRules);
 }
+var generateIgnore16;
 var init_generator22 = __esm({
   "src/targets/junie/generator.ts"() {
     init_mcp_servers();
@@ -18807,7 +18860,9 @@ var init_generator22 = __esm({
     init_managed_blocks();
     init_markdown();
     init_constants18();
+    init_ignore_output();
     init_global_config2();
+    generateIgnore16 = ignoreOutput(JUNIE_IGNORE);
   }
 });
 
@@ -19223,10 +19278,6 @@ function generateMcp15(canonical) {
     }
   ];
 }
-function generateIgnore17(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: KILO_CODE_IGNORE, content: canonical.ignore.join("\n") }];
-}
 function generatePermissions15(canonical) {
   if (!canonical.permissions) return [];
   const { allow, deny } = canonical.permissions;
@@ -19241,11 +19292,14 @@ function generatePermissions15(canonical) {
 function generateSkills18(canonical) {
   return generateEmbeddedSkills(canonical, KILO_CODE_SKILLS_DIR);
 }
+var generateIgnore17;
 var init_generator23 = __esm({
   "src/targets/kilo-code/generator.ts"() {
     init_embedded_skill();
     init_markdown();
     init_constants19();
+    init_ignore_output();
+    generateIgnore17 = ignoreOutput(KILO_CODE_IGNORE);
   }
 });
 var kiloNonRootRuleMapper, kiloCommandMapper, kiloAgentMapper;
@@ -20990,11 +21044,7 @@ function buildKiroAgentOutputs(canonical, rules = []) {
 function generateAgents21(canonical) {
   return buildKiroAgentOutputs(canonical);
 }
-function generateIgnore18(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: KIRO_IGNORE, content: canonical.ignore.join("\n") }];
-}
-var generatePermissions17;
+var generateIgnore18, generatePermissions17;
 var init_generator25 = __esm({
   "src/targets/kiro/generator.ts"() {
     init_no_outputs();
@@ -21003,6 +21053,8 @@ var init_generator25 = __esm({
     init_markdown();
     init_hook_format3();
     init_constants21();
+    init_ignore_output();
+    generateIgnore18 = ignoreOutput(KIRO_IGNORE);
     generatePermissions17 = NO_OUTPUTS;
   }
 });
@@ -23645,10 +23697,6 @@ function generateMcp19(canonical) {
   const content = JSON.stringify({ mcpServers: canonical.mcp.mcpServers }, null, 2);
   return [{ path: QWEN_SETTINGS, content }];
 }
-function generateIgnore21(canonical) {
-  if (!canonical.ignore || canonical.ignore.length === 0) return [];
-  return [{ path: QWEN_IGNORE, content: canonical.ignore.join("\n") }];
-}
 function generateHooks18(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   const hooks = buildClaudeHooksObjectFromCanonical(canonical);
@@ -23666,11 +23714,14 @@ function generatePermissions21(canonical) {
   if (ask.length > 0) permissions.ask = ask;
   return [{ path: QWEN_SETTINGS, content: JSON.stringify({ permissions }, null, 2) }];
 }
+var generateIgnore21;
 var init_generator29 = __esm({
   "src/targets/qwen-code/generator.ts"() {
     init_markdown();
     init_hooks_format2();
     init_constants25();
+    init_ignore_output();
+    generateIgnore21 = ignoreOutput(QWEN_IGNORE);
   }
 });
 
@@ -25368,10 +25419,6 @@ function generateMcp23(canonical) {
     }
   ];
 }
-function generateIgnore24(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: TRAE_IGNORE, content: canonical.ignore.join("\n") }];
-}
 function generateHooks20(canonical) {
   if (!canonical.hooks) return [];
   const hooks = {};
@@ -25392,12 +25439,15 @@ function generateHooks20(canonical) {
   if (Object.keys(hooks).length === 0) return [];
   return [{ path: TRAE_HOOKS_FILE, content: JSON.stringify({ version: 1, hooks }, null, 2) }];
 }
+var generateIgnore24;
 var init_generator33 = __esm({
   "src/targets/trae/generator.ts"() {
     init_embedded_skill();
     init_markdown();
     init_hook_command();
     init_constants29();
+    init_ignore_output();
+    generateIgnore24 = ignoreOutput(TRAE_IGNORE);
   }
 });
 
@@ -25772,7 +25822,7 @@ var init_importer30 = __esm({
 });
 
 // src/targets/trae/merge.ts
-var mergeMcp6, mergeHooks4, mergeTraeOutput;
+var mergeMcp6, mergeHooks3, mergeTraeOutput;
 var init_merge12 = __esm({
   "src/targets/trae/merge.ts"() {
     init_target_descriptor();
@@ -25783,11 +25833,11 @@ var init_merge12 = __esm({
       [TRAE_MCP_FILE, TRAE_GLOBAL_MCP_FILE],
       CANONICAL_MCP_SERVER_KEYS
     );
-    mergeHooks4 = ownedJsonKeysMerger(
+    mergeHooks3 = ownedJsonKeysMerger(
       [TRAE_HOOKS_FILE, TRAE_GLOBAL_HOOKS_FILE],
       ["version", "hooks"]
     );
-    mergeTraeOutput = firstMerger([mergeMcp6, mergeHooks4]);
+    mergeTraeOutput = firstMerger([mergeMcp6, mergeHooks3]);
   }
 });
 
@@ -26104,11 +26154,7 @@ function generateMcp24(canonical, ctx) {
   const content = JSON.stringify({ mcpServers: canonical.mcp.mcpServers }, null, 2);
   return [{ path, content }];
 }
-function generateIgnore25(canonical) {
-  if (canonical.ignore.length === 0) return [];
-  return [{ path: WARP_IGNORE_FILE, content: canonical.ignore.join("\n") }];
-}
-var generateRules31, generatePermissions24, generateHooks21;
+var generateRules31, generatePermissions24, generateHooks21, generateIgnore25;
 var init_generator34 = __esm({
   "src/targets/warp/generator.ts"() {
     init_managed_blocks();
@@ -26117,9 +26163,11 @@ var init_generator34 = __esm({
     init_projected_agent_skill();
     init_command_skill();
     init_constants30();
+    init_ignore_output();
     generateRules31 = (canonical) => embeddedRootRule(canonical, WARP_TARGET, WARP_ROOT_FILE);
     generatePermissions24 = NO_OUTPUTS;
     generateHooks21 = NO_OUTPUTS;
+    generateIgnore25 = ignoreOutput(WARP_IGNORE_FILE);
   }
 });
 
@@ -26744,13 +26792,12 @@ var init_rules4 = __esm({
 });
 
 // src/targets/windsurf/generator/ignore.ts
-function generateIgnore26(canonical) {
-  if (!canonical.ignore || canonical.ignore.length === 0) return [];
-  return [{ path: CODEIUM_IGNORE, content: canonical.ignore.join("\n") }];
-}
+var generateIgnore26;
 var init_ignore3 = __esm({
   "src/targets/windsurf/generator/ignore.ts"() {
     init_constants34();
+    init_ignore_output();
+    generateIgnore26 = ignoreOutput(CODEIUM_IGNORE);
   }
 });
 
@@ -26816,7 +26863,7 @@ function canonicalHookEventName(event) {
   if (KNOWN_CANONICAL_HOOK_EVENTS.includes(event)) return event;
   return WINDSURF_TO_CANONICAL.get(event) ?? null;
 }
-var KNOWN_CANONICAL_HOOK_EVENTS, WINDSURF_TO_CANONICAL;
+var KNOWN_CANONICAL_HOOK_EVENTS, WINDSURF_HOOK_CONTEXT_EVENTS, WINDSURF_TO_CANONICAL;
 var init_hook_events = __esm({
   "src/targets/windsurf/hook-events.ts"() {
     init_hook_types();
@@ -26829,6 +26876,7 @@ var init_hook_events = __esm({
       "SubagentStop",
       ...BEST_EFFORT_HOOK_EVENTS
     ];
+    WINDSURF_HOOK_CONTEXT_EVENTS = [];
     WINDSURF_TO_CANONICAL = new Map(
       KNOWN_CANONICAL_HOOK_EVENTS.map((event) => [windsurfEventName(event), event])
     );
@@ -26854,12 +26902,12 @@ function toWindsurfHooks(hooks) {
   return result2;
 }
 function generateHooks22(canonical) {
-  if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
+  if (!canonical.hooks) return [];
   const hooks = toWindsurfHooks(canonical.hooks);
   if (Object.keys(hooks).length === 0) return [];
   return [{ path: WINDSURF_HOOKS_FILE, content: JSON.stringify({ hooks }, null, 2) }];
 }
-var init_hooks5 = __esm({
+var init_hooks6 = __esm({
   "src/targets/windsurf/generator/hooks.ts"() {
     init_hook_command();
     init_constants34();
@@ -26911,7 +26959,7 @@ var init_generator35 = __esm({
     init_workflows();
     init_agents4();
     init_mcp4();
-    init_hooks5();
+    init_hooks6();
     init_skills4();
     init_permissions6();
   }
@@ -27249,7 +27297,7 @@ var init_importer32 = __esm({
 });
 
 // src/targets/windsurf/merge.ts
-var mergeMcp7, mergeHooks5, mergeWindsurfOutput;
+var mergeMcp7, mergeHooks4, mergeWindsurfOutput;
 var init_merge14 = __esm({
   "src/targets/windsurf/merge.ts"() {
     init_target_descriptor();
@@ -27257,11 +27305,11 @@ var init_merge14 = __esm({
     init_mcp_servers_merge();
     init_constants34();
     mergeMcp7 = mcpServersJsonMerger([WINDSURF_GLOBAL_MCP_FILE], CANONICAL_MCP_SERVER_KEYS);
-    mergeHooks5 = ownedJsonKeysMerger(
+    mergeHooks4 = ownedJsonKeysMerger(
       [WINDSURF_HOOKS_FILE, WINDSURF_GLOBAL_HOOKS_FILE],
       ["hooks"]
     );
-    mergeWindsurfOutput = firstMerger([mergeMcp7, mergeHooks5]);
+    mergeWindsurfOutput = firstMerger([mergeMcp7, mergeHooks4]);
   }
 });
 function lintRules32(canonical, projectRoot, _projectFiles) {
@@ -27361,6 +27409,7 @@ var init_windsurf2 = __esm({
     init_merge14();
     init_linter32();
     init_lint31();
+    init_hook_events();
     init_import_map_builders();
     init_conversions();
     init_projected_agent_skill();
@@ -27492,6 +27541,7 @@ var init_windsurf2 = __esm({
       },
       emptyImportMessage: "No Windsurf config found (.windsurfrules, .windsurf/rules, .windsurfignore, or .codeiumignore).",
       supportsConversion: { agents: true },
+      hookContextEvents: WINDSURF_HOOK_CONTEXT_EVENTS,
       lintRules: lintRules32,
       lint: {
         commands: lintCommands10,
@@ -29712,10 +29762,10 @@ function ruleSlug(r) {
 function mergeByKey(base, overlay, key) {
   return [...new Map([...base, ...overlay].map((item) => [key(item), item])).values()];
 }
-function mergeCanonicalFiles(base, overlay) {
+function mergeCanonicalFiles(base, overlay, options = {}) {
   const mcp = mergeMcp(base.mcp, overlay.mcp);
   const permissions = mergePermissions(base.permissions, overlay.permissions);
-  const hooks = mergeHooks(base.hooks, overlay.hooks);
+  const hooks = options.hooks === "combine" ? combineHooks(base.hooks, overlay.hooks) : overrideHooks(base.hooks, overlay.hooks);
   const ignore = mergeUniqueStrings(base.ignore, overlay.ignore);
   return {
     rules: mergeByKey(base.rules, overlay.rules, ruleSlug),
@@ -29754,17 +29804,31 @@ function mergeUniqueStrings(base, overlay) {
   }
   return merged;
 }
-function mergeHooks(base, overlay) {
+function overrideHooks(base, overlay) {
   if (!base && !overlay) return null;
   const result2 = {};
-  const keys = /* @__PURE__ */ new Set([...Object.keys(base ?? {}), ...Object.keys(overlay ?? {})]);
-  for (const k of keys) {
+  for (const k of hookEvents(base, overlay)) {
     const o = overlay?.[k];
-    const b = base?.[k];
-    result2[k] = o !== void 0 && o.length > 0 ? o : b ?? [];
+    result2[k] = o !== void 0 && o.length > 0 ? o : base?.[k] ?? [];
+  }
+  return result2;
+}
+function combineHooks(first, then) {
+  if (!first && !then) return null;
+  const result2 = {};
+  for (const k of hookEvents(first, then)) {
+    const kept = first?.[k] ?? [];
+    const defined = new Set(kept.map(hookKey));
+    result2[k] = [...kept, ...(then?.[k] ?? []).filter((entry) => !defined.has(hookKey(entry)))];
   }
   return result2;
 }
+function hookEvents(a, b) {
+  return [.../* @__PURE__ */ new Set([...Object.keys(a ?? {}), ...Object.keys(b ?? {})])];
+}
+function hookKey(entry) {
+  return JSON.stringify([entry.type ?? "command", entry.matcher, entry.command]);
+}
 
 // src/config/resolve/native-format-detector.ts
 init_fs();
@@ -30705,7 +30769,7 @@ async function loadPacksCanonical(abDir) {
     const canonical = await loadPackCanonical(packDir);
     const filtered = filterCanonicalByFeatures(canonical, meta.features);
     const picked = applyExtendPick(filtered, meta.features, meta.pick, meta.name);
-    merged = mergeCanonicalFiles(merged, picked);
+    merged = mergeCanonicalFiles(merged, picked, { hooks: "combine" });
   }
   return merged;
 }
@@ -30756,9 +30820,10 @@ async function loadCanonicalWithExtends(config, configDir, options = {}, canonic
     merged = mergeCanonicalFiles(merged, picked);
   }
   const packsCanonical = await loadPacksCanonical(canonicalDir);
-  merged = mergeCanonicalFiles(merged, packsCanonical);
+  merged = mergeCanonicalFiles(merged, packsCanonical, { hooks: "combine" });
   const localCanonical = await loadCanonicalFiles(canonicalDir);
   merged = mergeCanonicalFiles(merged, localCanonical);
+  merged = { ...merged, hooks: combineHooks(merged.hooks, packsCanonical.hooks) };
   return { canonical: merged, resolvedExtends };
 }