agentsmesh 0.40.0 → 0.41.0

package/dist/engine.js

@@ -1,7 +1,7 @@
-import { z } from 'zod';
-import { parse, stringify, parseDocument, isMap, Document, isSeq, isScalar, Scalar, Pair, YAMLSeq } from 'yaml';
 import { existsSync, readFileSync, constants, readdirSync, realpathSync, statSync } from 'fs';
 import { basename, join, dirname, relative, extname, win32, posix, sep, resolve } from 'path';
+import { parse, stringify, parseDocument, isMap, Document, isSeq, isScalar, Scalar, Pair, YAMLSeq } from 'yaml';
+import { z } from 'zod';
 import { readFile, rm, mkdir, readdir, lstat, open, access, stat, realpath, rename, writeFile, mkdtemp, cp } from 'fs/promises';
 import { setTimeout } from 'timers/promises';
 import { randomUUID, createHash } from 'crypto';
@@ -9,7 +9,7 @@ import picomatch from 'picomatch';
 import { parse as parse$1, stringify as stringify$1 } from 'smol-toml';
 import { Buffer } from 'buffer';
 import { homedir, tmpdir } from 'os';
-import { execFile } from 'child_process';
+import { execFile, spawnSync } from 'child_process';
 import { fileURLToPath, pathToFileURL, URL as URL$1 } from 'url';
 import { promisify } from 'util';
 import * as tar from 'tar';
@@ -24,6 +24,21 @@ var __export = (target34, all) => {
   for (var name in all)
     __defProp(target34, name, { get: all[name], enumerable: true });
 };
+var init_cli_invocation = __esm({
+  "src/lessons/cli-invocation.ts"() {
+  }
+});
+function isRecallHookCommand(command) {
+  return typeof command === "string" && command.includes(RECALL_HOOK_COMMAND);
+}
+var RECALL_SUBCOMMAND, RECALL_HOOK_COMMAND;
+var init_recall_hook_scaffold = __esm({
+  "src/lessons/recall-hook-scaffold.ts"() {
+    init_cli_invocation();
+    RECALL_SUBCOMMAND = "lessons hook";
+    RECALL_HOOK_COMMAND = `agentsmesh ${RECALL_SUBCOMMAND}`;
+  }
+});
 function capabilityLevel(capability) {
   return typeof capability === "string" ? capability : capability.level;
 }
@@ -183,6 +198,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();
     targetDescriptorSchema = targetDescriptorSchemaBase.superRefine((value, ctx) => {
@@ -578,12 +594,6 @@ var init_guards = __esm({
   "src/utils/types/guards.ts"() {
   }
 });
-var RECALL_HOOK_COMMAND;
-var init_recall_hook_scaffold = __esm({
-  "src/lessons/recall-hook-scaffold.ts"() {
-    RECALL_HOOK_COMMAND = "agentsmesh lessons hook";
-  }
-});
 
 // src/core/hook-types.ts
 function isBestEffortHookEvent(event, entries) {
@@ -911,8 +921,10 @@ function executableModeFor(path) {
 }
 function normalizeTextPayload(path, content) {
   if (!shouldNormalizeLineEndings(path)) return content;
-  const withoutBom = content.startsWith(UTF8_BOM) ? content.slice(UTF8_BOM.length) : content;
-  return normalizeLineEndings(withoutBom);
+  return normalizeLineEndings(stripBom(content));
+}
+function stripBom(text) {
+  return text.startsWith(UTF8_BOM) ? text.slice(UTF8_BOM.length) : text;
 }
 var UTF8_BOM, TEXT_EXTENSIONS, TEXT_DOTFILES, BINARY_EXTENSIONS, EXECUTABLE_SCRIPT_EXTENSIONS;
 var init_fs_text_encoding = __esm({
@@ -2110,6 +2122,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);
@@ -2139,11 +2160,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();
@@ -2152,6 +2169,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;
   }
@@ -7045,10 +7064,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) => {
@@ -7063,7 +7078,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();
@@ -7072,6 +7087,8 @@ var init_generator4 = __esm({
     init_hooks_format2();
     init_agents_format();
     init_constants5();
+    init_ignore_output();
+    generateIgnore3 = ignoreOutput(ANTIGRAVITY_IGNORE_FILE);
     generatePermissions3 = NO_OUTPUTS;
   }
 });
@@ -8665,16 +8682,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) {
@@ -10493,11 +10508,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();
@@ -10507,6 +10518,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;
@@ -13019,53 +13032,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);
@@ -13077,10 +13074,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 ruleSlug2(source) {
@@ -13186,18 +13197,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 "*";
@@ -13285,11 +13285,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) {
@@ -13526,7 +13531,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"
@@ -13549,11 +13554,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;
@@ -13581,9 +13584,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, " ");
 }
@@ -13598,15 +13598,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) {
@@ -13620,7 +13618,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()];
@@ -13630,7 +13627,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.*)?)$/;
   }
 });
@@ -13948,6 +13945,7 @@ var init_copilot2 = __esm({
     init_command_prompt();
     init_lint10();
     init_hook_assets();
+    init_hook_format();
     init_scope_extras2();
     init_importer_spec2();
     init_capabilities6();
@@ -14078,6 +14076,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: {
@@ -14165,11 +14164,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 = {};
@@ -14187,7 +14181,7 @@ function buildCrushHooksFromCanonical(canonical) {
   }
   return result2;
 }
-var generateRules12;
+var generateRules12, generateIgnore9;
 var init_generator13 = __esm({
   "src/targets/crush/generator.ts"() {
     init_managed_blocks();
@@ -14196,7 +14190,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 = {}) {
@@ -14732,7 +14728,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();
@@ -14740,6 +14736,7 @@ var init_hook_format2 = __esm({
     CANONICAL_TO_CURSOR = {
       PreToolUse: "preToolUse",
       PostToolUse: "postToolUse",
+      PostToolUseFailure: "postToolUseFailure",
       UserPromptSubmit: "beforeSubmitPrompt",
       SubagentStart: "subagentStart",
       SubagentStop: "subagentStop",
@@ -14748,6 +14745,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])
     );
@@ -14756,7 +14758,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);
@@ -14770,14 +14772,12 @@ var init_hooks3 = __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);
   }
 });
 
@@ -15473,6 +15473,7 @@ var init_cursor2 = __esm({
     init_linter13();
     init_import_map_builders();
     init_lint12();
+    init_hook_format2();
     target13 = {
       name: "cursor",
       primaryRootInstructionPath: CURSOR_GENERAL_RULE,
@@ -15594,6 +15595,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,
@@ -16855,25 +16857,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_hooks4 = __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;
@@ -16885,29 +16989,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] };
@@ -16917,19 +17002,18 @@ function generateGeminiSettingsFiles(canonical, enabledFeatures) {
 }
 var init_settings2 = __esm({
   "src/targets/gemini-cli/generator/settings.ts"() {
-    init_hook_command();
     init_constants33();
+    init_hooks4();
   }
 });
 
 // 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);
   }
 });
 
@@ -17208,27 +17292,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("+++");
@@ -17302,7 +17365,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
@@ -17312,7 +17375,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"
           }));
@@ -17341,7 +17404,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) {
@@ -17837,14 +17900,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)
   );
@@ -17852,6 +17908,7 @@ function lintHooks12(canonical) {
 var init_lint15 = __esm({
   "src/targets/gemini-cli/lint.ts"() {
     init_helpers();
+    init_hook_map();
   }
 });
 
@@ -17888,6 +17945,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",
@@ -17938,6 +17996,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) {
@@ -18030,14 +18089,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();
@@ -18047,7 +18102,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;
   }
 });
@@ -18952,10 +19009,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);
 }
@@ -18967,6 +19020,7 @@ function renderJunieGlobalInstructions(canonical) {
   });
   return appendEmbeddedRulesBlock(root?.body.trim() ?? "", nonRootRules);
 }
+var generateIgnore16;
 var init_generator22 = __esm({
   "src/targets/junie/generator.ts"() {
     init_mcp_servers();
@@ -18974,7 +19028,9 @@ var init_generator22 = __esm({
     init_managed_blocks();
     init_markdown();
     init_constants18();
+    init_ignore_output();
     init_global_config2();
+    generateIgnore16 = ignoreOutput(JUNIE_IGNORE);
   }
 });
 
@@ -19390,10 +19446,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;
@@ -19408,11 +19460,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;
@@ -21157,11 +21212,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();
@@ -21170,6 +21221,8 @@ var init_generator25 = __esm({
     init_markdown();
     init_hook_format3();
     init_constants21();
+    init_ignore_output();
+    generateIgnore18 = ignoreOutput(KIRO_IGNORE);
     generatePermissions17 = NO_OUTPUTS;
   }
 });
@@ -23812,10 +23865,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);
@@ -23833,11 +23882,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);
   }
 });
 
@@ -25535,10 +25587,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 = {};
@@ -25559,12 +25607,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);
   }
 });
 
@@ -26271,11 +26322,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();
@@ -26284,9 +26331,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);
   }
 });
 
@@ -26911,13 +26960,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);
   }
 });
 
@@ -26983,7 +27031,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();
@@ -26996,6 +27044,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])
     );
@@ -27021,12 +27070,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_hooks4 = __esm({
+var init_hooks5 = __esm({
   "src/targets/windsurf/generator/hooks.ts"() {
     init_hook_command();
     init_constants34();
@@ -27078,7 +27127,7 @@ var init_generator35 = __esm({
     init_workflows();
     init_agents4();
     init_mcp4();
-    init_hooks4();
+    init_hooks5();
     init_skills4();
     init_permissions6();
   }
@@ -27197,7 +27246,7 @@ async function parseHooks(hooksPath, onParseError) {
   return result2;
 }
 var VALID_TYPES;
-var init_hooks5 = __esm({
+var init_hooks6 = __esm({
   "src/canonical/features/hooks.ts"() {
     init_syntax_error();
     init_fs();
@@ -27278,7 +27327,7 @@ var WILDCARD_MATCHER;
 var init_importer_hooks2 = __esm({
   "src/targets/windsurf/importer-hooks.ts"() {
     init_canonical_paths();
-    init_hooks5();
+    init_hooks6();
     init_fs();
     init_constants34();
     init_hook_events();
@@ -27579,6 +27628,7 @@ var init_windsurf2 = __esm({
     init_merge14();
     init_linter32();
     init_lint31();
+    init_hook_events();
     init_import_map_builders();
     init_conversions();
     init_projected_agent_skill();
@@ -27710,6 +27760,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,
@@ -28854,6 +28905,23 @@ var init_builtin_targets = __esm({
   }
 });
 
+// src/targets/catalog/recall-hook-targets.ts
+init_recall_hook_scaffold();
+init_builtin_targets();
+init_registry();
+function withTargetRecallHooks(canonical, target34) {
+  const descriptor34 = getBuiltinTargetDefinition(target34) ?? getDescriptor(target34);
+  const contextEvents = descriptor34?.hookContextEvents;
+  if (contextEvents === void 0 || canonical.hooks === null) return canonical;
+  const hooks = {};
+  for (const [event, entries] of Object.entries(canonical.hooks)) {
+    if (!Array.isArray(entries)) continue;
+    const kept = contextEvents.includes(event) ? entries : entries.filter((entry) => !isRecallHookCommand(entry?.command));
+    if (kept.length > 0) hooks[event] = kept;
+  }
+  return { ...canonical, hooks };
+}
+
 // src/core/generate/engine.ts
 init_builtin_targets();
 init_registry();
@@ -29756,11 +29824,12 @@ async function generateHooksFeature(results, targets, canonical, projectRoot, sc
     const gen = resolveTargetFeatureGenerator(target34, "hooks", config, scope) ?? getDescriptor(target34)?.generators.generateHooks;
     if (!gen) continue;
     const ctx = featureContext(target34, "hooks", scope);
-    let outputs = [...gen(canonical, ctx)];
+    const projected = withTargetRecallHooks(canonical, target34);
+    let outputs = [...gen(projected, ctx)];
     const descriptor34 = getBuiltinTargetDefinition(target34) ?? getDescriptor(target34);
     const post = descriptor34?.postProcessHookOutputs;
     if (post) {
-      outputs = [...await post(projectRoot, canonical, outputs)];
+      outputs = [...await post(projectRoot, projected, outputs)];
     }
     const options = outputMergeOptions(target34);
     for (const out2 of outputs) {
@@ -29773,7 +29842,7 @@ async function generateScopedSettingsFeature(results, targets, canonical, projec
     const descriptor34 = getBuiltinTargetDefinition(target34) ?? getDescriptor(target34);
     const emit = descriptor34?.emitScopedSettings;
     if (!emit) continue;
-    const outputs = emit(canonical, scope, enabledFeatures);
+    const outputs = emit(withTargetRecallHooks(canonical, target34), scope, enabledFeatures);
     if (outputs.length === 0) continue;
     const options = outputMergeOptions(target34);
     for (const out2 of outputs) {
@@ -29816,7 +29885,12 @@ async function generate(ctx) {
     const descriptor34 = getBuiltinTargetDefinition(target34) ?? getDescriptor(target34);
     const scopeExtras = descriptor34?.globalSupport?.scopeExtras;
     if (scopeExtras) {
-      const extras = await scopeExtras(canonical, projectRoot, scope, enabledFeatures);
+      const extras = await scopeExtras(
+        withTargetRecallHooks(canonical, target34),
+        projectRoot,
+        scope,
+        enabledFeatures
+      );
       await emitScopeExtras(results, target34, extras, projectRoot);
     }
   }
@@ -31123,7 +31197,7 @@ async function parsePermissions(permissionsPath, onParseError) {
 }
 
 // src/canonical/load/loader.ts
-init_hooks5();
+init_hooks6();
 
 // src/canonical/features/ignore.ts
 init_fs();
@@ -31172,10 +31246,10 @@ function ruleSlug4(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 = mergeMcp7(base.mcp, overlay.mcp);
   const permissions = mergePermissions2(base.permissions, overlay.permissions);
-  const hooks = mergeHooks5(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, ruleSlug4),
@@ -31214,17 +31288,31 @@ function mergeUniqueStrings(base, overlay) {
   }
   return merged;
 }
-function mergeHooks5(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();
@@ -31995,7 +32083,7 @@ function gateExtendElevatedArtifacts(canonical, ext) {
   });
 }
 init_mcp();
-init_hooks5();
+init_hooks6();
 
 // src/install/pack/pack-reader.ts
 init_fs();
@@ -32082,7 +32170,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;
 }
@@ -32133,9 +32221,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 };
 }
 
@@ -32414,6 +32503,9 @@ function lintRuleScopeInversion(input) {
   }
   return out2;
 }
+
+// src/lessons/graph-store.ts
+init_fs_text_encoding();
 var VersionSchema = z.union([z.literal(1), z.literal(2)]);
 var IdSchema = z.string().regex(/^[a-z0-9-]+$/, "id must be kebab-case");
 var DateSchema = z.string().regex(
@@ -32457,13 +32549,13 @@ function parseGraph(raw) {
 }
 
 // src/lessons/graph-store.ts
-var GRAPH_REL_PATH = ".agentsmesh/lessons/lessons.json";
+var LESSONS_GRAPH_PATH = ".agentsmesh/lessons/lessons.json";
 function graphFilePath(projectRoot) {
-  return resolve(projectRoot, GRAPH_REL_PATH);
+  return resolve(projectRoot, LESSONS_GRAPH_PATH);
 }
 function loadLessonsGraph(projectRoot) {
   const raw = readFileSync(graphFilePath(projectRoot), "utf8");
-  return parseGraph(JSON.parse(raw));
+  return parseGraph(JSON.parse(stripBom(raw)));
 }
 var BASE_REL = ".agentsmesh/lessons";
 function lessonsPaths(projectRoot) {
@@ -32480,9 +32572,76 @@ function lessonsPaths(projectRoot) {
 function toRelPath(projectRoot, absolute) {
   return relative(projectRoot, absolute).split(sep).join("/");
 }
+var MAX_OUTPUT_BYTES = 64 * 1024 * 1024;
+function runGit2(cwd, args, timeoutMs) {
+  const r = spawnSync("git", [...args], {
+    cwd,
+    encoding: "utf8",
+    maxBuffer: MAX_OUTPUT_BYTES,
+    timeout: timeoutMs,
+    windowsHide: true
+  });
+  const status = r.error === void 0 ? r.status ?? -1 : -1;
+  return { status, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
+}
+
+// src/lessons/git-path-history.ts
+var GIT_SCAN_TIMEOUT_MS = 3e3;
+var cache = /* @__PURE__ */ new Map();
+function readGitPathHistory(projectRoot) {
+  if (!cache.has(projectRoot)) cache.set(projectRoot, scanGitPathHistory(projectRoot));
+  return cache.get(projectRoot) ?? null;
+}
+var LOG_ARGS = [
+  "log",
+  "HEAD",
+  "--relative",
+  "-M",
+  "--diff-filter=DR",
+  "--name-status",
+  "-z",
+  "--no-color",
+  "--no-show-signature",
+  "--pretty=format:"
+];
+function scanGitPathHistory(projectRoot, timeoutMs = GIT_SCAN_TIMEOUT_MS) {
+  const tracked = runGit2(projectRoot, ["ls-files", "-z"], timeoutMs);
+  if (tracked.status !== 0) return null;
+  const log = runGit2(projectRoot, LOG_ARGS, timeoutMs);
+  if (log.status !== 0) return null;
+  return {
+    tracked: new Set(tracked.stdout.split("\0").filter(Boolean)),
+    ...parseRemovals(log.stdout)
+  };
+}
+function parseRemovals(out2) {
+  const deleted = /* @__PURE__ */ new Set();
+  const renamedAway = /* @__PURE__ */ new Set();
+  const tokens = out2.split("\0");
+  for (let i = 0; i < tokens.length; i += 1) {
+    const status = tokens[i] ?? "";
+    const path = tokens[i + 1] ?? "";
+    if (status.startsWith("D")) {
+      if (path !== "") deleted.add(path);
+      i += 1;
+    } else if (status.startsWith("R")) {
+      if (path !== "") renamedAway.add(path);
+      i += 2;
+    }
+  }
+  return { deleted, renamedAway };
+}
+
+// src/lessons/project-files.ts
 var SKIP_DIRS = /* @__PURE__ */ new Set([".git", "node_modules"]);
 var MAX_FILES = 2e5;
-function listProjectFiles(projectRoot) {
+function projectFilesOf(paths2, gitHistory) {
+  return Object.assign(new Set(paths2), { gitHistory });
+}
+function gitHistoryOf(paths2) {
+  return paths2.gitHistory?.() ?? null;
+}
+function listProjectFiles(projectRoot, maxFiles = MAX_FILES) {
   const out2 = /* @__PURE__ */ new Set();
   try {
     const stack = [projectRoot];
@@ -32493,14 +32652,14 @@ function listProjectFiles(projectRoot) {
           if (!SKIP_DIRS.has(entry.name)) stack.push(join(dir, entry.name));
         } else if (entry.isFile()) {
           out2.add(toRelPath(projectRoot, join(dir, entry.name)));
-          if (out2.size > MAX_FILES) return out2;
+          if (out2.size > maxFiles) return null;
         }
       }
     }
   } catch {
     return null;
   }
-  return out2;
+  return projectFilesOf(out2, () => readGitPathHistory(projectRoot));
 }
 
 // src/lessons/validate-checks.ts
@@ -32677,10 +32836,307 @@ function collectOrphans(graph, findings) {
     }
   }
 }
+
+// src/lessons/glob-expand.ts
+var MARK = "\0";
+var LED = "
";
+var MAX_EXPANSIONS = 64;
+function fail(reason) {
+  throw new Error(reason);
+}
+function skipClass(s, i) {
+  const end = s.indexOf("]", i + 1);
+  return end === -1 ? i + 1 : end + 1;
+}
+function markLedStars(body) {
+  let out2 = "";
+  let depth = 0;
+  for (let i = 0; i < body.length; ) {
+    const c2 = body[i];
+    if (c2 === "[") {
+      const end = skipClass(body, i);
+      out2 += body.slice(i, end);
+      i = end;
+      continue;
+    }
+    if (c2 === "{") depth += 1;
+    if (c2 === "}" && depth > 0) depth -= 1;
+    const prev = body[i - 1];
+    if (c2 === "*" && prev === "." && depth > 0) fail(".* inside {\u2026} is not supported");
+    const segmentStart = i === 0 || prev === "/";
+    const afterLeadingDot = prev === "." && (i === 1 || body[i - 2] === "/");
+    const led = c2 === "*" && body[i + 1] !== "*" && prev !== "*" && (segmentStart || afterLeadingDot);
+    out2 += led ? LED : c2;
+    i += 1;
+  }
+  return out2;
+}
+function expandBraces(s) {
+  let open2 = -1;
+  for (let i = 0; i < s.length && open2 === -1; ) {
+    if (s[i] === "[") i = skipClass(s, i);
+    else if (s[i] === "}") fail("unbalanced }");
+    else if (s[i] === "{") open2 = i;
+    else i += 1;
+  }
+  if (open2 === -1) return [s];
+  const options = [];
+  let depth = 0;
+  let start = open2 + 1;
+  let close = -1;
+  for (let i = open2 + 1; i < s.length && close === -1; ) {
+    const c2 = s[i];
+    if (c2 === "[") {
+      i = skipClass(s, i);
+      continue;
+    }
+    if (c2 === "{") depth += 1;
+    else if (c2 === "}" && depth > 0) depth -= 1;
+    else if (c2 === "}") close = i;
+    else if (c2 === "," && depth === 0) {
+      options.push(s.slice(start, i));
+      start = i + 1;
+    }
+    i += 1;
+  }
+  if (close === -1) fail("unclosed {");
+  if (options.length === 0)
+    fail("brace groups need a comma, e.g. {a,b} (ranges are not supported)");
+  options.push(s.slice(start, close));
+  const suffixes = expandBraces(s.slice(close + 1));
+  const out2 = [];
+  for (const option of options) {
+    for (const head of expandBraces(option)) {
+      for (const tail of suffixes) {
+        out2.push(s.slice(0, open2) + MARK + head + MARK + tail);
+        if (out2.length > MAX_EXPANSIONS) fail(`more than ${MAX_EXPANSIONS} brace expansions`);
+      }
+    }
+  }
+  return out2;
+}
+
+// src/lessons/glob-parse.ts
+var MAX_GLOB_LENGTH = 256;
+function parseGlob(pattern) {
+  try {
+    return parseOrThrow(pattern);
+  } catch (err) {
+    return err instanceof Error ? err.message : String(err);
+  }
+}
+function parseOrThrow(pattern) {
+  if (pattern.length > MAX_GLOB_LENGTH) fail(`longer than ${MAX_GLOB_LENGTH} characters`);
+  if (pattern.includes("\\")) fail("backslash escapes are not supported (use / as separator)");
+  if (/["\u0000-\u001f]/.test(pattern)) fail("quotes and control characters are not supported");
+  if (/[()|]/.test(pattern.replace(/\[[^\]/]*\]/g, ""))) {
+    fail("extglobs and (\u2026)/| groups are not supported (use {a,b})");
+  }
+  if (/[[\]{}]\+/.test(pattern)) fail("+ after a class or brace is a regex quantifier");
+  const negated = pattern.startsWith("!");
+  let body = negated ? pattern.slice(1) : pattern;
+  if (body.startsWith("./")) body = body.slice(2);
+  if (body.startsWith("!") || body.startsWith("./")) fail("use a single leading ! and ./");
+  if (body === "") fail("empty pattern");
+  const fastPath = !negated && (body === "*.*" || body === "**/*.*");
+  if (fastPath) body = `${body.slice(0, -1)}?*`;
+  return { negated, alternatives: expandBraces(markLedStars(body)).map(parseAlternative) };
+}
+function parseAlternative(alt) {
+  const raw = alt.split("/");
+  const out2 = [];
+  raw.forEach((segment, i) => {
+    if (segment.includes("**")) {
+      if (segment !== "**") fail("** must be a whole segment, outside {\u2026} (use * in a segment)");
+      if (out2.at(-1)?.k === "globstar") return;
+      const before = raw[i - 1] ?? "";
+      const trailing = raw.slice(i + 1).every((s) => s === "**");
+      const min1 = trailing && (before.endsWith("*") || before.endsWith(LED));
+      out2.push({ k: "globstar", min1 });
+      return;
+    }
+    const tokens = tokenize(segment, alt);
+    const guarded = segment.includes(LED);
+    const literal = tokens.every((t) => t.k === "lit") ? tokens.map((t) => t.k === "lit" ? t.ch : "").join("") : null;
+    const matchesEmpty = segment !== "" && !guarded && tokens.every((t) => t.k === "star");
+    out2.push({ k: "segment", tokens, literal, guarded, matchesEmpty });
+  });
+  return out2;
+}
+function tokenize(segment, alt) {
+  const tokens = [];
+  for (let i = 0; i < segment.length; i += 1) {
+    const c2 = segment[i];
+    if (c2 === MARK) continue;
+    if (c2 === "*" || c2 === LED) tokens.push({ k: "star" });
+    else if (c2 === "?") tokens.push({ k: "one" });
+    else if (c2 === "[") {
+      const end = segment.indexOf("]", i + 1);
+      if (end === -1) {
+        if (alt.includes("]")) fail("a [...] class cannot span /");
+        tokens.push({ k: "lit", ch: c2 });
+        continue;
+      }
+      tokens.push(parseClass(segment.slice(i + 1, end)));
+      i = end;
+    } else tokens.push({ k: "lit", ch: c2 });
+  }
+  return tokens;
+}
+var CLASS_SPECIAL = /[-*+?.^${}(|)[\]]/;
+function parseClass(body) {
+  if (body === "") fail("empty [] class");
+  if (body.startsWith("!")) fail("[!...] is not a negation here; use [^...]");
+  if (body.includes("[")) fail("POSIX [:classes:] and nested [ are not supported");
+  const negated = body.startsWith("^");
+  const members = negated ? body.slice(1) : body;
+  if (members === "") fail("empty [^] class");
+  const ranges = [];
+  for (let i = 0; i < members.length; i += 1) {
+    const lo = members[i];
+    const hi = members[i + 2];
+    if (members[i + 1] === "-" && hi !== void 0) {
+      if (hi < lo) fail(`class range out of order: ${lo}-${hi}`);
+      ranges.push([lo, hi]);
+      i += 2;
+    } else ranges.push([lo, lo]);
+  }
+  const inSet = (c2) => ranges.some(([lo, hi]) => c2 >= lo && c2 <= hi);
+  const literal = CLASS_SPECIAL.test(body) ? null : `[${body}]`;
+  return { k: "class", test: negated ? (c2) => c2 !== "/" && !inSet(c2) : inSet, literal };
+}
+
+// src/lessons/add-helpers.ts
 function normalizeRule(rule) {
   return rule.trim().replace(/\s+/g, " ").toLowerCase();
 }
 
+// src/lessons/glob-dp.ts
+var isDotSegment = (s) => s === "." || s === "..";
+function matchSegments(alt, segments, work) {
+  const n = segments.length;
+  let next = new Uint8Array(n + 1);
+  next[n] = 1;
+  for (let i = alt.length - 1; i >= 0; i -= 1) {
+    const seg = alt[i];
+    const cur = new Uint8Array(n + 1);
+    for (let j = n; j >= 0; j -= 1) {
+      if (--work.remaining <= 0) return false;
+      if (seg.k === "globstar") {
+        const eat = j < n && !isDotSegment(segments[j]) && (cur[j + 1] === 1 || next[j + 1] === 1);
+        cur[j] = !seg.min1 && next[j] === 1 || eat ? 1 : 0;
+      } else if (j < n && next[j + 1] === 1) {
+        const text = segments[j];
+        const ok = seg.literal !== null ? text === seg.literal : matchSegment(seg, text, j < n - 1, work);
+        cur[j] = ok ? 1 : 0;
+      }
+    }
+    if (seg.k === "globstar" && i >= 1 && tailMatchesNothing(alt, i + 1)) cur[n] = 1;
+    next = cur;
+  }
+  return next[0] === 1;
+}
+function tailMatchesNothing(alt, from) {
+  const empty = alt[from];
+  const rest = alt[from + 1];
+  if (empty?.k !== "segment" || !empty.matchesEmpty) return false;
+  return rest === void 0 || rest.k === "globstar" && !rest.min1 && from + 2 === alt.length;
+}
+function matchSegment(seg, text, followedBySlash, work) {
+  if (seg.guarded && (isDotSegment(text) || text === "" && !followedBySlash)) return false;
+  const tokens = seg.tokens;
+  const len = text.length;
+  let next = new Uint8Array(len + 1);
+  next[len] = 1;
+  for (let k = tokens.length - 1; k >= 0; k -= 1) {
+    const tok = tokens[k];
+    const cur = new Uint8Array(len + 1);
+    work.remaining -= len + 1;
+    if (work.remaining <= 0) return false;
+    for (let c2 = len; c2 >= 0; c2 -= 1) {
+      cur[c2] = tokenMatches(tok, text, c2, next, cur) ? 1 : 0;
+    }
+    next = cur;
+  }
+  return next[0] === 1;
+}
+function tokenMatches(tok, text, c2, next, cur) {
+  const ch = text[c2];
+  switch (tok.k) {
+    case "star":
+      return next[c2] === 1 || ch !== void 0 && cur[c2 + 1] === 1;
+    case "one":
+      return ch !== void 0 && next[c2 + 1] === 1;
+    case "lit":
+      return ch === tok.ch && next[c2 + 1] === 1;
+    case "class":
+      return ch !== void 0 && tok.test(ch) && next[c2 + 1] === 1 || tok.literal !== null && text.startsWith(tok.literal, c2) && next[c2 + tok.literal.length] === 1;
+  }
+}
+
+// src/lessons/glob-safety.ts
+var MAX_GLOB_PATH_LENGTH = 4096;
+var MATCH_WORK_LIMIT = 2e5;
+var CACHE_LIMIT = 2e3;
+var cache2 = /* @__PURE__ */ new Map();
+function unsafeGlobFinding(triggerId, trigger) {
+  if (trigger.kind !== "file_glob" || trigger.pattern.includes("\\")) return null;
+  const reason = parseGlob(trigger.pattern);
+  if (typeof reason !== "string") return null;
+  return {
+    level: "error",
+    code: "UNSAFE_GLOB_PATTERN",
+    message: `Trigger "${triggerId}" has a file_glob outside the safe glob subset (${trigger.pattern.slice(0, 120)}): ${reason}. Recall treats it as a non-match. Use only *, **, ?, [...] and {a,b}.`,
+    triggerId
+  };
+}
+function getGlobMatcher(pattern) {
+  const hit = cache2.get(pattern);
+  if (hit !== void 0) return hit;
+  if (cache2.size >= CACHE_LIMIT) cache2.clear();
+  const composed = pattern.normalize("NFC");
+  const parsed = parseGlob(composed);
+  const matcher = typeof parsed === "string" ? null : build(composed, parsed);
+  cache2.set(pattern, matcher);
+  return matcher;
+}
+function build(pattern, parsed) {
+  const alts = parsed.alternatives.map(prepare);
+  return {
+    test(rawPath, budget) {
+      const path = rawPath.normalize("NFC");
+      if (path === pattern) return true;
+      if (path === "" || path.length > MAX_GLOB_PATH_LENGTH) return false;
+      const live = alts.filter((a) => mayMatch(a, path));
+      if (live.length === 0) return parsed.negated;
+      const limit = Math.min(MATCH_WORK_LIMIT, budget?.remaining ?? MATCH_WORK_LIMIT);
+      const work = { remaining: limit };
+      const segments = path.split("/");
+      const hit = live.some((a) => matchSegments(a.alt, segments, work));
+      if (budget !== void 0) budget.remaining -= limit - work.remaining;
+      return work.remaining > 0 && hit !== parsed.negated;
+    }
+  };
+}
+function mayMatch({ head, tail }, path) {
+  if (!path.endsWith(tail)) return false;
+  if (head === null) return true;
+  return path.startsWith(head) && (path.length === head.length || path[head.length] === "/");
+}
+function prepare(alt) {
+  const first = alt[0];
+  const last = alt[alt.length - 1];
+  let tail = "";
+  if (last?.k === "segment" && !last.matchesEmpty) {
+    for (let k = last.tokens.length - 1; k >= 0; k -= 1) {
+      const tok = last.tokens[k];
+      if (tok.k !== "lit") break;
+      tail = tok.ch + tail;
+    }
+  }
+  return { alt, head: first?.k === "segment" ? first.literal : null, tail };
+}
+
 // src/lessons/regex-linear/nfa-compile.ts
 var MAX_NFA_STATES = 2e3;
 var Builder = class {
@@ -32872,6 +33328,9 @@ function escapeClass(c2) {
 var HEX2 = /^[0-9a-fA-F]{2}$/;
 var HEX4 = /^[0-9a-fA-F]{4}$/;
 function readUnicodeEscape(src, i, c2) {
+  if (c2 === "u" && src[i] === "{") {
+    throw new UnsupportedRegexError("\\u{\u2026} code point escapes are not supported; use \\uHHHH");
+  }
   if (c2 === "x") {
     const hex2 = src.slice(i, i + 2);
     return HEX2.test(hex2) ? { ch: String.fromCharCode(parseInt(hex2, 16)), len: 2 } : { ch: "x", len: 0 };
@@ -32961,7 +33420,7 @@ function parseRegex(src) {
   function parseAtom() {
     const c2 = peek();
     if (c2 === "(") return parseGroup2();
-    if (c2 === "[") return parseClass();
+    if (c2 === "[") return parseClass2();
     if (c2 === "\\") return parseEscape();
     if (c2 === ".") {
       i += 1;
@@ -33020,7 +33479,7 @@ function parseRegex(src) {
     }
     return { k: "char", ch: escapeLiteral(c2) };
   }
-  function parseClass() {
+  function parseClass2() {
     i += 1;
     const negate = peek() === "^";
     if (negate) i += 1;
@@ -33073,17 +33532,17 @@ function parseRegex(src) {
 }
 
 // src/lessons/regex-linear/index.ts
-var cache = /* @__PURE__ */ new Map();
+var cache3 = /* @__PURE__ */ new Map();
 function compileLinearMatcher(pattern) {
-  const hit = cache.get(pattern);
-  if (hit !== void 0 || cache.has(pattern)) return hit ?? null;
+  const hit = cache3.get(pattern);
+  if (hit !== void 0 || cache3.has(pattern)) return hit ?? null;
   let matcher;
   try {
     matcher = buildMatcher(parseRegex(pattern));
   } catch {
     matcher = null;
   }
-  cache.set(pattern, matcher);
+  cache3.set(pattern, matcher);
   return matcher;
 }
 
@@ -33124,6 +33583,8 @@ function collectDuplicateRules(graph, findings) {
 }
 function collectInvalidTriggerPatterns(graph, findings) {
   for (const [triggerId, trigger] of Object.entries(graph.triggers)) {
+    const globFinding = unsafeGlobFinding(triggerId, trigger);
+    if (globFinding !== null) findings.push(globFinding);
     if (trigger.kind !== "command_pattern") continue;
     try {
       new RegExp(trigger.pattern);
@@ -33131,7 +33592,7 @@ function collectInvalidTriggerPatterns(graph, findings) {
       findings.push({
         level: "error",
         code: "INVALID_TRIGGER_PATTERN",
-        message: `Trigger "${triggerId}" has an invalid command_pattern regex (${trigger.pattern}): ${err instanceof Error ? err.message : String(err)}.`,
+        message: `Trigger "${triggerId}" has an invalid command_pattern regex (${trigger.pattern}): ${regexSyntaxReason(err)}.`,
         triggerId
       });
       continue;
@@ -33140,12 +33601,16 @@ function collectInvalidTriggerPatterns(graph, findings) {
       findings.push({
         level: "error",
         code: "UNSAFE_TRIGGER_PATTERN",
-        message: `Trigger "${triggerId}" has a command_pattern regex outside the provably-linear subset (${trigger.pattern}): it can backtrack catastrophically (e.g. a quantified group like (a+)+ or (a|aa)+, adjacent repetition like a+a+, or a backreference/lookaround). Rewrite using a linear pattern.`,
+        message: `Trigger "${triggerId}" has a command_pattern regex the linear matcher cannot run (${trigger.pattern}). It does not support backreferences (\\1, \\k<name>), lookarounds ((?=x), (?!x), (?<=x), (?<!x)), or patterns too large to run, such as (a{1000}){10}. Nested quantifiers such as (a+)+ are fine. Rewrite the pattern without the unsupported part.`,
         triggerId
       });
     }
   }
 }
+function regexSyntaxReason(err) {
+  const text = err instanceof Error ? err.message : String(err);
+  return text.replace(/^Invalid regular expression: \/[\s\S]*\/[a-z]*: /, "");
+}
 function collectBackslashGlobPatterns(graph, findings) {
   for (const [triggerId, trigger] of Object.entries(graph.triggers)) {
     if (trigger.kind !== "file_glob") continue;
@@ -33226,7 +33691,11 @@ function collectTriggerSetCollisions(graph, findings) {
 
 // src/lessons/glob-breadth.ts
 var WILDCARD = /[*?[\]]/;
+function isNegatedGlob(pattern) {
+  return pattern.startsWith("!");
+}
 function globNarrowness(pattern) {
+  if (isNegatedGlob(pattern)) return 0;
   const segments = pattern.replaceAll("\\", "/").split("/").filter((segment) => segment !== "" && segment !== ".");
   if (segments.length === 0) return 0;
   let literal = 0;
@@ -33277,6 +33746,15 @@ function isBroadCommandPattern(pattern) {
   }
   return hits > COMMAND_PROBE_CORPUS.length * BROAD_HIT_RATIO;
 }
+function missingGlobState(pattern, history) {
+  const matcher = getGlobMatcher(pattern);
+  if (history === null || matcher === null) return "pending";
+  const matchesAny = (paths2) => [...paths2].some((p) => matcher.test(p));
+  if (matchesAny(history.tracked)) return "live";
+  if (matchesAny(history.renamedAway)) return "dead";
+  if (!picomatch.scan(pattern).isGlob && matchesAny(history.deleted)) return "dead";
+  return "pending";
+}
 
 // src/lessons/validate-liveness.ts
 function activeTriggerIds(graph) {
@@ -33287,24 +33765,33 @@ function activeTriggerIds(graph) {
   }
   return ids;
 }
-function deadFileGlobIds(graph, knownPaths) {
-  const active = activeTriggerIds(graph);
+function fileGlobLiveness(graph, knownPaths, triggerIds) {
+  const active = activeTriggerIds(graph) ;
   const paths2 = [...knownPaths];
-  const dead = /* @__PURE__ */ new Set();
+  const missing = [];
   for (const [triggerId, trigger] of Object.entries(graph.triggers)) {
-    if (trigger.kind !== "file_glob") continue;
-    if (!active.has(triggerId)) continue;
-    const isMatch = picomatch(trigger.pattern, { dot: true });
-    if (!paths2.some((p) => isMatch(p))) dead.add(triggerId);
+    if (trigger.kind !== "file_glob" || !active.has(triggerId)) continue;
+    const matcher = getGlobMatcher(trigger.pattern);
+    if (matcher === null) continue;
+    if (!paths2.some((p) => matcher.test(p))) missing.push([triggerId, trigger.pattern]);
+  }
+  const dead = /* @__PURE__ */ new Set();
+  const pending = /* @__PURE__ */ new Set();
+  if (missing.length === 0) return { dead, pending };
+  const history = gitHistoryOf(knownPaths);
+  for (const [triggerId, pattern] of missing) {
+    const state = missingGlobState(pattern, history);
+    if (state === "dead") dead.add(triggerId);
+    else if (state === "pending") pending.add(triggerId);
   }
-  return dead;
+  return { dead, pending };
 }
 function collectDeadFileGlobs(graph, findings, knownPaths) {
-  for (const triggerId of deadFileGlobIds(graph, knownPaths)) {
+  for (const triggerId of fileGlobLiveness(graph, knownPaths).dead) {
     findings.push({
       level: "warning",
       code: "DEAD_FILE_GLOB",
-      message: `file_glob trigger "${triggerId}" (${graph.triggers[triggerId]?.pattern ?? ""}) matches no file in the working tree \u2014 the lesson is unreachable via this trigger (a rename likely moved the path). Re-point it at the current path, or detach it with \`lessons untrigger\`, or run \`lessons prune --apply\`.`,
+      message: `file_glob trigger "${triggerId}" (${graph.triggers[triggerId]?.pattern ?? ""}) matches no file, and git history shows its path was renamed or deleted \u2014 the lesson is unreachable via this trigger. Re-point it at the current path, or detach it with \`lessons untrigger\`, or run \`lessons prune --apply\`.`,
       triggerId
     });
   }
@@ -33376,14 +33863,14 @@ var STOP = /* @__PURE__ */ new Set([
   "its",
   "must"
 ]);
-function tokenize(text) {
+function tokenize2(text) {
   return text.toLowerCase().split(/[^a-z0-9]+/).filter((t) => t.length >= 2 && !STOP.has(t));
 }
 
 // src/lessons/keyword-signal.ts
 var MAX_RECOMMENDED_KEYWORD_TOKENS = 5;
 function isLowSignalKeyword(pattern) {
-  return tokenize(pattern).length > MAX_RECOMMENDED_KEYWORD_TOKENS;
+  return tokenize2(pattern).length > MAX_RECOMMENDED_KEYWORD_TOKENS;
 }
 function splitRawTokens(pattern) {
   return pattern.toLowerCase().split(/[^a-z0-9]+/).filter((t) => t.length > 0);
@@ -33391,7 +33878,7 @@ function splitRawTokens(pattern) {
 function keywordNeedleLosesTokens(pattern) {
   const raw = splitRawTokens(pattern);
   if (raw.length < 2) return false;
-  return tokenize(pattern).length !== raw.length;
+  return tokenize2(pattern).length !== raw.length;
 }
 
 // src/lessons/validate-keywords.ts
@@ -33414,7 +33901,7 @@ function collectStopwordKeywords(graph, findings) {
   for (const [triggerId, trigger] of Object.entries(graph.triggers)) {
     if (trigger.kind !== "keyword") continue;
     if (!active.has(triggerId)) continue;
-    if (tokenize(trigger.pattern).length !== 0 && !keywordNeedleLosesTokens(trigger.pattern)) {
+    if (tokenize2(trigger.pattern).length !== 0 && !keywordNeedleLosesTokens(trigger.pattern)) {
       continue;
     }
     findings.push({
@@ -33462,7 +33949,6 @@ function validateLessonsGraph(graph, options = {}) {
 
 // src/core/lint/shared/lessons.ts
 var LESSONS_TARGET = "lessons";
-var GRAPH_REL = ".agentsmesh/lessons/lessons.json";
 var ROOT_RULE_REL = ".agentsmesh/rules/_root.md";
 var LESSONS_HEADING = /^## Lessons \(/m;
 function lintLessonsSubsystem(projectRoot, scope) {
@@ -33477,7 +33963,7 @@ function lintLessonsSubsystem(projectRoot, scope) {
     return [
       diag(
         "error",
-        GRAPH_REL,
+        LESSONS_GRAPH_PATH,
         `lessons.json failed to load: ${err instanceof Error ? err.message : String(err)}`
       )
     ];
@@ -33485,7 +33971,7 @@ function lintLessonsSubsystem(projectRoot, scope) {
   const knownPaths = listProjectFiles(projectRoot) ?? void 0;
   const report = validateLessonsGraph(graph, { knownPaths });
   for (const finding of report.findings) {
-    out2.push(diag(finding.level, GRAPH_REL, `[${finding.code}] ${finding.message}`));
+    out2.push(diag(finding.level, LESSONS_GRAPH_PATH, `[${finding.code}] ${finding.message}`));
   }
   const rootRuleAbs = join(projectRoot, ROOT_RULE_REL);
   const rootRuleBody = existsSync(rootRuleAbs) ? readFileSync(rootRuleAbs, "utf8") : "";
@@ -33507,8 +33993,8 @@ function diag(level, file, message) {
 // src/core/lint/linter.ts
 var EXCLUDE_DIRS = ["node_modules", ".git", "dist", "coverage", ".agentsmesh"];
 function isExcludedProjectPath(rel2) {
-  const posix8 = rel2.replaceAll("\\", "/");
-  return EXCLUDE_DIRS.some((d) => posix8.includes(`/${d}/`) || posix8.startsWith(`${d}/`));
+  const posix9 = rel2.replaceAll("\\", "/");
+  return EXCLUDE_DIRS.some((d) => posix9.includes(`/${d}/`) || posix9.startsWith(`${d}/`));
 }
 async function getProjectFiles(projectRoot) {
   const all = await readDirRecursive(projectRoot);
@@ -33901,14 +34387,22 @@ async function findUntrackedManagedDirFiles(args) {
   return [...found].sort();
 }
 
+// src/lessons/conflict-markers.ts
+function hasConflictMarkers(text) {
+  return /^(?:<{7}|>{7})(?: |\r?$)/m.test(text);
+}
+
 // src/core/check/lock-sync.ts
+init_fs();
 async function checkLockSync(opts) {
   const { config, configDir, canonicalDir, rootBase, scope = "project" } = opts;
   const lock = await readLock(canonicalDir);
   if (lock === null) {
+    const text = await readFileSafe(join(canonicalDir, ".lock"));
     return {
       inSync: false,
       hasLock: false,
+      lockConflict: text !== null && hasConflictMarkers(text),
       canonicalDrift: false,
       outputDrift: false,
       modified: [],
@@ -33978,6 +34472,7 @@ async function checkLockSync(opts) {
   return {
     inSync,
     hasLock: true,
+    lockConflict: false,
     canonicalDrift,
     outputDrift,
     modified,