agentsmesh 0.20.0 → 0.22.0

package/dist/index.js

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { stringify, parse } from 'yaml';
-import { join, basename, dirname, relative, win32, posix, sep, extname, resolve } from 'path';
+import { parse, stringify } from 'yaml';
+import { join, relative, sep, dirname, isAbsolute, resolve, basename, win32, posix, extname } from 'path';
 import { access, readdir, readFile, realpath, stat, rm, mkdir, lstat, unlink, writeFile, rename, chmod, mkdtemp, cp } from 'fs/promises';
-import { constants, existsSync, realpathSync, statSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, appendFileSync, constants, realpathSync, statSync } from 'fs';
 import { parse as parse$1 } from 'smol-toml';
 import { Buffer } from 'buffer';
 import { homedir, tmpdir } from 'os';
@@ -12,6 +12,7 @@ import { fileURLToPath, pathToFileURL, URL } from 'url';
 import { promisify } from 'util';
 import * as tar from 'tar';
 import { createTwoFilesPatch } from 'diff';
+import picomatch from 'picomatch';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -768,6 +769,33 @@ async function readDirRecursive(dir, visited, branchSegments) {
     );
   }
 }
+async function readDirRecursiveNoSymlinks(dir, branchSegments) {
+  const currentBranchSegments = branchSegments ?? [basename(dir)];
+  try {
+    const entries = await readdir(dir, { withFileTypes: true });
+    const files = [];
+    for (const ent of entries) {
+      if (ent.isSymbolicLink()) continue;
+      const full = join(dir, ent.name);
+      if (ent.isDirectory()) {
+        const nextSegments = [...currentBranchSegments, ent.name];
+        if (shouldSkipRecursiveBranch(nextSegments)) continue;
+        files.push(...await readDirRecursiveNoSymlinks(full, nextSegments));
+      } else if (ent.isFile()) {
+        files.push(full);
+      }
+    }
+    return files;
+  } catch (err) {
+    const e = err;
+    if (e.code === "ENOENT" || e.code === "ENOTDIR" || e.code === "EACCES") return [];
+    throw new FileSystemError(
+      dir,
+      `Failed to read directory ${dir}: ${e.message}. Check permissions.`,
+      { cause: err, errnoCode: e.code }
+    );
+  }
+}
 var MAX_RECURSIVE_DEPTH, MAX_SEGMENT_REPETITIONS;
 var init_fs_traverse = __esm({
   "src/utils/filesystem/fs-traverse.ts"() {
@@ -1022,7 +1050,7 @@ ${legacy}`, "");
   }
   return result.trim();
 }
-var ROOT_INSTRUCTION_BODY_V1, ROOT_INSTRUCTION_BODY_V2, ROOT_INSTRUCTION_BODY_V3, ROOT_INSTRUCTION_BODY_V4, ROOT_INSTRUCTION_BODY_V5, ROOT_INSTRUCTION_BODY_V6, ROOT_INSTRUCTION_BODY_V7, ROOT_INSTRUCTION_BODY_V8, ROOT_INSTRUCTION_BODY, LEGACY_AGENTSMESH_ROOT_INSTRUCTION_PARAGRAPH, LEGACY_AGENTSMESH_ROOT_INSTRUCTION_SECTION, AGENTSMESH_CONTRACT_WITH_V1_BODY, AGENTSMESH_CONTRACT_WITH_V2_BODY, AGENTSMESH_CONTRACT_WITH_V3_BODY, AGENTSMESH_CONTRACT_WITH_V4_BODY, AGENTSMESH_CONTRACT_WITH_V5_BODY, AGENTSMESH_CONTRACT_WITH_V6_BODY, AGENTSMESH_CONTRACT_WITH_V7_BODY, AGENTSMESH_CONTRACT_WITH_V8_BODY, AGENTSMESH_ROOT_INSTRUCTION_PARAGRAPH, LEGACY_FORMS;
+var ROOT_INSTRUCTION_BODY_V1, ROOT_INSTRUCTION_BODY_V2, ROOT_INSTRUCTION_BODY_V3, ROOT_INSTRUCTION_BODY_V4, ROOT_INSTRUCTION_BODY_V5, ROOT_INSTRUCTION_BODY_V6, ROOT_INSTRUCTION_BODY_V7, ROOT_INSTRUCTION_BODY_V8, ROOT_INSTRUCTION_BODY_V9, ROOT_INSTRUCTION_BODY_V10, ROOT_INSTRUCTION_BODY, LEGACY_AGENTSMESH_ROOT_INSTRUCTION_PARAGRAPH, LEGACY_AGENTSMESH_ROOT_INSTRUCTION_SECTION, AGENTSMESH_CONTRACT_WITH_V1_BODY, AGENTSMESH_CONTRACT_WITH_V2_BODY, AGENTSMESH_CONTRACT_WITH_V3_BODY, AGENTSMESH_CONTRACT_WITH_V4_BODY, AGENTSMESH_CONTRACT_WITH_V5_BODY, AGENTSMESH_CONTRACT_WITH_V6_BODY, AGENTSMESH_CONTRACT_WITH_V7_BODY, AGENTSMESH_CONTRACT_WITH_V8_BODY, AGENTSMESH_CONTRACT_WITH_V9_BODY, AGENTSMESH_CONTRACT_WITH_V10_BODY, AGENTSMESH_ROOT_INSTRUCTION_PARAGRAPH, LEGACY_FORMS;
 var init_root_instruction_paragraph = __esm({
   "src/targets/projection/root-instruction-paragraph.ts"() {
     init_managed_blocks();
@@ -1034,7 +1062,9 @@ var init_root_instruction_paragraph = __esm({
     ROOT_INSTRUCTION_BODY_V6 = "Create canonical files in `.agentsmesh`: `rules/_root.md` and `rules/*.md` are Markdown rules; `commands/*.md`, `agents/*.md`, and `skills/*/SKILL.md` plus supporting files use Claude-style frontmatter Markdown; `mcp.json` is MCP JSON; `hooks.yaml` and `permissions.yaml` are YAML; `ignore` is gitignore-style text. Then run `agentsmesh generate`.";
     ROOT_INSTRUCTION_BODY_V7 = "`.agentsmesh` is the only folder you edit or add these files in: `rules/_root.md` and `rules/*.md` are Markdown rules; `commands/*.md`, `agents/*.md`, and `skills/*/SKILL.md` plus supporting files use Claude-style frontmatter Markdown; `mcp.json` is MCP JSON; `hooks.yaml` and `permissions.yaml` are YAML; `ignore` is gitignore-style text. Do not edit generated tool files; run `agentsmesh generate`.";
     ROOT_INSTRUCTION_BODY_V8 = "`agentsmesh.yaml` selects targets/features (`agentsmesh.local.yaml` overrides locally), and `.agentsmesh` is the only place to add or edit canonical items: `rules/_root.md`, `rules/*.md`, `commands/*.md`, `agents/*.md`, `skills/*/SKILL.md` plus supporting files, `mcp.json`, `hooks.yaml`, `permissions.yaml`, and `ignore`; if missing run `agentsmesh init`, use `agentsmesh import --from <tool>` for native configs, `agentsmesh install <source>` or `install --sync` for reusable packs, then run `agentsmesh generate`. Use `diff`, `lint`, `check`, `watch`, `matrix`, and `merge` as needed; never edit generated tool files.";
-    ROOT_INSTRUCTION_BODY = "`agentsmesh.yaml` selects targets/features (`agentsmesh.local.yaml` overrides locally), and `.agentsmesh` is the only place to add or edit canonical items: `rules/_root.md`, `rules/*.md`, `commands/*.md`, `agents/*.md`, `skills/*/SKILL.md` plus supporting files, `mcp.json`, `hooks.yaml`, `permissions.yaml`, and `ignore`; if missing run `agentsmesh init`, use `agentsmesh import --from <tool>` for native configs, `agentsmesh install <source>` or `install --sync` for reusable packs, then run `agentsmesh generate`. Use `diff`, `lint`, `check`, `watch`, `matrix`, `merge`, and `refresh` as needed; never edit generated tool files.";
+    ROOT_INSTRUCTION_BODY_V9 = "`agentsmesh.yaml` selects targets/features (`agentsmesh.local.yaml` overrides locally), and `.agentsmesh` is the only place to add or edit canonical items: `rules/_root.md`, `rules/*.md`, `commands/*.md`, `agents/*.md`, `skills/*/SKILL.md` plus supporting files, `mcp.json`, `hooks.yaml`, `permissions.yaml`, and `ignore`; if missing run `agentsmesh init`, use `agentsmesh import --from <tool>` for native configs, `agentsmesh install <source>` or `install --sync` for reusable packs, then run `agentsmesh generate`. Use `diff`, `lint`, `check`, `watch`, `matrix`, `merge`, and `refresh` as needed; never edit generated tool files.";
+    ROOT_INSTRUCTION_BODY_V10 = "**MUST follow when changing any rule, agent, command, skill, hook, MCP server, permission, or ignore pattern.** `agentsmesh.yaml` selects targets/features (`agentsmesh.local.yaml` overrides locally), and `.agentsmesh` is the only place to add or edit canonical items: `rules/_root.md`, `rules/*.md`, `commands/*.md`, `agents/*.md`, `skills/*/SKILL.md` plus supporting files, `mcp.json`, `hooks.yaml`, `permissions.yaml`, and `ignore`; if missing run `agentsmesh init`, use `agentsmesh import --from <tool>` for native configs, `agentsmesh install <source>` or `install --sync` for reusable packs, then run `agentsmesh generate`. Use `diff`, `lint`, `check`, `watch`, `matrix`, `merge`, and `refresh` as needed; never edit generated tool files.";
+    ROOT_INSTRUCTION_BODY = "**NEVER edit generated files** (`.claude/`, `.cursor/`, `AGENTS.md`, `.github/copilot-instructions.md`, and similar target outputs) \u2014 `agentsmesh generate` overwrites them. **All changes MUST go through `.agentsmesh` first**: edit `rules/_root.md`, `rules/*.md`, `commands/*.md`, `agents/*.md`, `skills/*/SKILL.md` plus supporting files, `mcp.json`, `hooks.yaml`, `permissions.yaml`, and `ignore`; `agentsmesh.yaml` selects targets/features (`agentsmesh.local.yaml` overrides locally); if missing run `agentsmesh init`, use `agentsmesh import --from <tool>` for native configs, `agentsmesh install <source>` or `install --sync` for reusable packs, then run `agentsmesh generate`. Use `diff`, `lint`, `check`, `watch`, `matrix`, `merge`, and `refresh` as needed.";
     LEGACY_AGENTSMESH_ROOT_INSTRUCTION_PARAGRAPH = ROOT_INSTRUCTION_BODY_V1;
     LEGACY_AGENTSMESH_ROOT_INSTRUCTION_SECTION = `## Project-Specific Rules
 
@@ -1063,12 +1093,20 @@ ${ROOT_INSTRUCTION_BODY_V7}`;
     AGENTSMESH_CONTRACT_WITH_V8_BODY = `## AgentsMesh Generation Contract
 
 ${ROOT_INSTRUCTION_BODY_V8}`;
+    AGENTSMESH_CONTRACT_WITH_V9_BODY = `## AgentsMesh Generation Contract
+
+${ROOT_INSTRUCTION_BODY_V9}`;
+    AGENTSMESH_CONTRACT_WITH_V10_BODY = `## AgentsMesh Generation Contract
+
+${ROOT_INSTRUCTION_BODY_V10}`;
     AGENTSMESH_ROOT_INSTRUCTION_PARAGRAPH = `${ROOT_CONTRACT_START}
 ## AgentsMesh Generation Contract
 
 ${ROOT_INSTRUCTION_BODY}
 ${ROOT_CONTRACT_END}`;
     LEGACY_FORMS = [
+      AGENTSMESH_CONTRACT_WITH_V10_BODY,
+      AGENTSMESH_CONTRACT_WITH_V9_BODY,
       AGENTSMESH_CONTRACT_WITH_V8_BODY,
       AGENTSMESH_CONTRACT_WITH_V7_BODY,
       AGENTSMESH_CONTRACT_WITH_V6_BODY,
@@ -1248,7 +1286,7 @@ function generateEmbeddedSkills(canonical, skillsDir) {
   }
   return outputs;
 }
-async function importEmbeddedSkills(projectRoot, skillsDir, fromTool, results, normalize) {
+async function importEmbeddedSkills(projectRoot, skillsDir, fromTool, results, normalize2) {
   const entries = await readdir(join(projectRoot, skillsDir), {
     encoding: "utf8",
     withFileTypes: true
@@ -1263,7 +1301,7 @@ async function importEmbeddedSkills(projectRoot, skillsDir, fromTool, results, n
     const destinationSkillDir = join(projectRoot, AB_SKILLS, entry.name);
     const destinationSkillFile = join(destinationSkillDir, "SKILL.md");
     const { frontmatter, body } = parseFrontmatter(
-      normalize(sourceSkillContent, sourceSkillFile, destinationSkillFile)
+      normalize2(sourceSkillContent, sourceSkillFile, destinationSkillFile)
     );
     const projectedCommand = parseCommandSkillFrontmatter(frontmatter, entry.name);
     if (projectedCommand) {
@@ -1273,7 +1311,7 @@ async function importEmbeddedSkills(projectRoot, skillsDir, fromTool, results, n
       const commandPath = join(destDir, `${projectedCommand.name}.md`);
       await writeFileAtomic(
         commandPath,
-        serializeImportedCommand(projectedCommand, normalize(body, sourceSkillFile, commandPath))
+        serializeImportedCommand(projectedCommand, normalize2(body, sourceSkillFile, commandPath))
       );
       results.push({
         fromTool,
@@ -1291,7 +1329,7 @@ async function importEmbeddedSkills(projectRoot, skillsDir, fromTool, results, n
       const agentPath = join(destDir, `${projectedAgent.name}.md`);
       await writeFileAtomic(
         agentPath,
-        serializeImportedAgent(projectedAgent, normalize(body, sourceSkillFile, agentPath))
+        serializeImportedAgent(projectedAgent, normalize2(body, sourceSkillFile, agentPath))
       );
       results.push({
         fromTool,
@@ -1322,7 +1360,7 @@ async function importEmbeddedSkills(projectRoot, skillsDir, fromTool, results, n
       if (sourceContent === null) continue;
       const destinationPath = join(destinationSkillDir, relativePath);
       await mkdirp(dirname(destinationPath));
-      await writeFileAtomic(destinationPath, normalize(sourceContent, sourcePath, destinationPath));
+      await writeFileAtomic(destinationPath, normalize2(sourceContent, sourcePath, destinationPath));
       results.push({
         fromTool,
         fromPath: sourcePath,
@@ -2479,7 +2517,7 @@ var init_import_descriptor = __esm({
     ];
   }
 });
-async function runSingleFile(spec, sources, projectRoot, fromTool, normalize) {
+async function runSingleFile(spec, sources, projectRoot, fromTool, normalize2) {
   if (!spec.canonicalRootFilename) {
     throw new Error(`singleFile spec for ${spec.feature} must set canonicalRootFilename`);
   }
@@ -2490,7 +2528,7 @@ async function runSingleFile(spec, sources, projectRoot, fromTool, normalize) {
     if (content === null) continue;
     await mkdirp(destDir);
     const destPath = join(destDir, spec.canonicalRootFilename);
-    const normalizeTo = (destinationFile) => normalize(content, srcPath, destinationFile);
+    const normalizeTo = (destinationFile) => normalize2(content, srcPath, destinationFile);
     if (spec.map) {
       let mapping;
       try {
@@ -2533,7 +2571,7 @@ async function runSingleFile(spec, sources, projectRoot, fromTool, normalize) {
   }
   return [];
 }
-async function runDirectory(spec, sources, projectRoot, fromTool, normalize) {
+async function runDirectory(spec, sources, projectRoot, fromTool, normalize2) {
   const mapper = resolveMapper(spec);
   const destDir = join(projectRoot, spec.canonicalDir);
   const results = [];
@@ -2544,7 +2582,7 @@ async function runDirectory(spec, sources, projectRoot, fromTool, normalize) {
       destDir,
       extensions: [...spec.extensions ?? [".md"]],
       fromTool,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
         if (isPreservedBoilerplate(basename(srcPath))) return null;
         let mapping;
@@ -2649,28 +2687,28 @@ async function runMcpJson(spec, sources, projectRoot, fromTool) {
   }
   return [];
 }
-function dispatchSpec(spec, sources, projectRoot, fromTool, normalize) {
+function dispatchSpec(spec, sources, projectRoot, fromTool, normalize2) {
   switch (spec.mode) {
     case "singleFile":
-      return runSingleFile(spec, sources, projectRoot, fromTool, normalize);
+      return runSingleFile(spec, sources, projectRoot, fromTool, normalize2);
     case "directory":
-      return runDirectory(spec, sources, projectRoot, fromTool, normalize);
+      return runDirectory(spec, sources, projectRoot, fromTool, normalize2);
     case "flatFile":
       return runFlatFile(spec, sources, projectRoot, fromTool);
     case "mcpJson":
       return runMcpJson(spec, sources, projectRoot, fromTool);
   }
 }
-async function runSpec(spec, scope, projectRoot, fromTool, normalize) {
+async function runSpec(spec, scope, projectRoot, fromTool, normalize2) {
   const primary = resolveScopedSources(spec.source, scope);
   const fallback = resolveScopedSources(spec.fallbacks, scope);
   if (primary.length === 0 && fallback.length === 0) return [];
   if (primary.length > 0) {
-    const results = await dispatchSpec(spec, primary, projectRoot, fromTool, normalize);
+    const results = await dispatchSpec(spec, primary, projectRoot, fromTool, normalize2);
     if (results.length > 0) return results;
   }
   if (fallback.length > 0) {
-    return dispatchSpec(spec, fallback, projectRoot, fromTool, normalize);
+    return dispatchSpec(spec, fallback, projectRoot, fromTool, normalize2);
   }
   return [];
 }
@@ -2683,11 +2721,11 @@ function specsForFeature(importer, feature) {
 async function runDescriptorImport(descriptor31, projectRoot, scope, options) {
   const importer = descriptor31.importer;
   if (!importer) return [];
-  const normalize = options?.normalize ?? await createImportReferenceNormalizer(descriptor31.id, projectRoot, scope);
+  const normalize2 = options?.normalize ?? await createImportReferenceNormalizer(descriptor31.id, projectRoot, scope);
   const results = [];
   for (const feature of IMPORT_FEATURE_ORDER) {
     for (const spec of specsForFeature(importer, feature)) {
-      results.push(...await runSpec(spec, scope, projectRoot, descriptor31.id, normalize));
+      results.push(...await runSpec(spec, scope, projectRoot, descriptor31.id, normalize2));
     }
   }
   return results;
@@ -2711,10 +2749,10 @@ var init_descriptor_import_runner = __esm({
 async function importFromAider(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(AIDER_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(AIDER_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? AIDER_GLOBAL_SKILLS_DIR : AIDER_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, AIDER_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, AIDER_TARGET, results, normalize2);
   return results;
 }
 var init_importer = __esm({
@@ -4953,10 +4991,10 @@ var init_mcp_import = __esm({
 async function importFromAmp(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(AMP_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor3, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(AMP_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor3, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? AMP_GLOBAL_SKILLS_DIR : AMP_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, AMP_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, AMP_TARGET, results, normalize2);
   const mcpFile = scope === "global" ? AMP_GLOBAL_MCP_FILE : AMP_MCP_FILE;
   await importAmpMcp(projectRoot, mcpFile, results);
   return results;
@@ -5304,7 +5342,7 @@ var init_embedded_rules = __esm({
     init_import_metadata();
   }
 });
-async function importRootRule(projectRoot, results, normalize, scope) {
+async function importRootRule(projectRoot, results, normalize2, scope) {
   const primary = scope === "global" ? ANTIGRAVITY_GLOBAL_ROOT : ANTIGRAVITY_RULES_ROOT;
   const candidates = scope === "project" ? [primary, ANTIGRAVITY_RULES_ROOT_LEGACY] : [primary];
   for (const rel2 of candidates) {
@@ -5318,10 +5356,10 @@ async function importRootRule(projectRoot, results, normalize, scope) {
       rulesDir: ANTIGRAVITY_CANONICAL_RULES_DIR,
       sourcePath: srcPath,
       fromTool: ANTIGRAVITY_TARGET,
-      normalize
+      normalize: normalize2
     });
     results.push(...split.results);
-    const { body } = parseFrontmatter(normalize(split.rootContent, srcPath, destPath));
+    const { body } = parseFrontmatter(normalize2(split.rootContent, srcPath, destPath));
     const output = await serializeImportedRuleWithFallback(destPath, { root: true }, body);
     await mkdirp(join(projectRoot, ANTIGRAVITY_CANONICAL_RULES_DIR));
     await writeFileAtomic(destPath, output);
@@ -5337,15 +5375,15 @@ async function importRootRule(projectRoot, results, normalize, scope) {
 async function importFromAntigravity(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(ANTIGRAVITY_TARGET, projectRoot, scope);
-  await importRootRule(projectRoot, results, normalize, scope);
-  results.push(...await runDescriptorImport(descriptor4, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(ANTIGRAVITY_TARGET, projectRoot, scope);
+  await importRootRule(projectRoot, results, normalize2, scope);
+  results.push(...await runDescriptorImport(descriptor4, projectRoot, scope, { normalize: normalize2 }));
   await importEmbeddedSkills(
     projectRoot,
     scope === "global" ? ANTIGRAVITY_GLOBAL_SKILLS_DIR : ANTIGRAVITY_SKILLS_DIR,
     ANTIGRAVITY_TARGET,
     results,
-    normalize
+    normalize2
   );
   return results;
 }
@@ -5761,7 +5799,7 @@ function canonicalRuleMeta(frontmatter, isRoot) {
   }
   return meta;
 }
-async function importRules(projectRoot, results, normalize, scope) {
+async function importRules(projectRoot, results, normalize2, scope) {
   const rulesDir = scope === "global" ? AUGMENT_CODE_GLOBAL_RULES_DIR : AUGMENT_CODE_RULES_DIR;
   const destDir = join(projectRoot, AUGMENT_CODE_CANONICAL_RULES_DIR);
   results.push(
@@ -5770,7 +5808,7 @@ async function importRules(projectRoot, results, normalize, scope) {
       destDir,
       extensions: [".md"],
       fromTool: AUGMENT_CODE_TARGET,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ relativePath, normalizeTo }) => {
         const isRoot = relativePath === "_root.md" || basename(relativePath) === "_root.md";
         const destPath = join(destDir, relativePath);
@@ -5789,7 +5827,7 @@ async function importRules(projectRoot, results, normalize, scope) {
     })
   );
 }
-async function importCommands(projectRoot, results, normalize, scope) {
+async function importCommands(projectRoot, results, normalize2, scope) {
   const commandsDir = scope === "global" ? AUGMENT_CODE_GLOBAL_COMMANDS_DIR : AUGMENT_CODE_COMMANDS_DIR;
   const destDir = join(projectRoot, ".agentsmesh/commands");
   results.push(
@@ -5798,7 +5836,7 @@ async function importCommands(projectRoot, results, normalize, scope) {
       destDir,
       extensions: [".md"],
       fromTool: AUGMENT_CODE_TARGET,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ relativePath, normalizeTo }) => {
         const name = basename(relativePath, ".md");
         const destPath = join(destDir, `${name}.md`);
@@ -5821,11 +5859,11 @@ async function importCommands(projectRoot, results, normalize, scope) {
 async function importFromAugmentCode(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(AUGMENT_CODE_TARGET, projectRoot, scope);
-  await importRules(projectRoot, results, normalize, scope);
-  await importCommands(projectRoot, results, normalize, scope);
+  const normalize2 = await createImportReferenceNormalizer(AUGMENT_CODE_TARGET, projectRoot, scope);
+  await importRules(projectRoot, results, normalize2, scope);
+  await importCommands(projectRoot, results, normalize2, scope);
   const skillsDir = scope === "global" ? AUGMENT_CODE_GLOBAL_SKILLS_DIR : AUGMENT_CODE_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, AUGMENT_CODE_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, AUGMENT_CODE_TARGET, results, normalize2);
   const settingsFile = scope === "global" ? AUGMENT_CODE_GLOBAL_SETTINGS_FILE : AUGMENT_CODE_SETTINGS_FILE;
   await importAugmentSettings(projectRoot, settingsFile, results);
   if (scope === "project") {
@@ -6443,7 +6481,7 @@ var init_settings_helpers2 = __esm({
     init_constants7();
   }
 });
-async function importClaudeSkills(projectRoot, results, normalize) {
+async function importClaudeSkills(projectRoot, results, normalize2) {
   const skillsBaseDir = join(projectRoot, CLAUDE_SKILLS_DIR);
   const destBase = join(projectRoot, CLAUDE_CANONICAL_SKILLS_DIR);
   const allFiles = await readDirRecursive(skillsBaseDir);
@@ -6454,7 +6492,7 @@ async function importClaudeSkills(projectRoot, results, normalize) {
     const destSkillDir = join(destBase, skillName);
     const skillMdContent = await readFileSafe(skillMdPath);
     if (skillMdContent === null) continue;
-    const normalizedSkillMd = normalize(
+    const normalizedSkillMd = normalize2(
       skillMdContent,
       skillMdPath,
       join(destSkillDir, "SKILL.md")
@@ -6472,7 +6510,7 @@ async function importClaudeSkills(projectRoot, results, normalize) {
       const relPath = relative(skillDir, filePath);
       const destPath = join(destSkillDir, relPath);
       await mkdirp(dirname(destPath));
-      const normalized = normalize(fileContent, filePath, destPath);
+      const normalized = normalize2(fileContent, filePath, destPath);
       await writeFileAtomic(
         destPath,
         relPath === "SKILL.md" ? await serializeImportedSkillWithFallback(
@@ -6504,9 +6542,9 @@ var init_importer_skills = __esm({
 async function importFromClaudeCode(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer("claude-code", projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor6, projectRoot, scope, { normalize }));
-  await importClaudeSkills(projectRoot, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer("claude-code", projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor6, projectRoot, scope, { normalize: normalize2 }));
+  await importClaudeSkills(projectRoot, results, normalize2);
   await importClaudeHooksJson(projectRoot, results);
   await importSettings(projectRoot, results);
   return results;
@@ -6966,7 +7004,7 @@ var init_importer_mappers = __esm({
     init_constants8();
   }
 });
-async function importClineRules(projectRoot, results, normalize) {
+async function importClineRules(projectRoot, results, normalize2) {
   const destRulesDir = join(projectRoot, CLINE_CANONICAL_RULES_DIR);
   const clineRulesPath = join(projectRoot, CLINE_RULES_DIR);
   const clineRulesRaw = join(projectRoot, CLINE_RULES_DIR);
@@ -6982,7 +7020,7 @@ async function importClineRules(projectRoot, results, normalize) {
       await mkdirp(destRulesDir);
       const destPath = join(destRulesDir, "_root.md");
       const { frontmatter, body } = parseFrontmatter(
-        normalize(flatContent, clineRulesRaw, destPath)
+        normalize2(flatContent, clineRulesRaw, destPath)
       );
       const hasRoot = frontmatter.root === true;
       const outFm = hasRoot ? frontmatter : { ...frontmatter, root: true };
@@ -7008,7 +7046,7 @@ async function importClineRules(projectRoot, results, normalize) {
       await mkdirp(destRulesDir);
       const destPath = join(destRulesDir, "_root.md");
       const { frontmatter, body } = parseFrontmatter(
-        normalize(agentsMdContent, agentsMdPath, destPath)
+        normalize2(agentsMdContent, agentsMdPath, destPath)
       );
       const hasRoot = frontmatter.root === true;
       const outFm = hasRoot ? frontmatter : { ...frontmatter, root: true };
@@ -7030,7 +7068,7 @@ async function importClineRules(projectRoot, results, normalize) {
           rootSourcePath = first;
           await mkdirp(destRulesDir);
           const destPath = join(destRulesDir, "_root.md");
-          const { frontmatter, body } = parseFrontmatter(normalize(fc, first, destPath));
+          const { frontmatter, body } = parseFrontmatter(normalize2(fc, first, destPath));
           const hasRoot = frontmatter.root === true;
           const outFm = hasRoot ? frontmatter : { ...frontmatter, root: true };
           const outContent = await serializeImportedRuleWithFallback(destPath, outFm, body);
@@ -7048,7 +7086,7 @@ async function importClineRules(projectRoot, results, normalize) {
     rootSourcePath = rootPath;
     await mkdirp(destRulesDir);
     const destPath = join(destRulesDir, "_root.md");
-    const { frontmatter, body } = parseFrontmatter(normalize(rootContent, rootPath, destPath));
+    const { frontmatter, body } = parseFrontmatter(normalize2(rootContent, rootPath, destPath));
     const hasRoot = frontmatter.root === true;
     const outFm = hasRoot ? frontmatter : { ...frontmatter, root: true };
     const outContent = await serializeImportedRuleWithFallback(destPath, outFm, body);
@@ -7066,7 +7104,7 @@ async function importClineRules(projectRoot, results, normalize) {
       destDir: destRulesDir,
       extensions: [".md"],
       fromTool: "cline",
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ srcPath, relativePath, normalizeTo }) => {
         if (srcPath === rootSourcePath) return null;
         return mapClineRuleFile(relativePath, destRulesDir, normalizeTo);
@@ -7353,12 +7391,12 @@ var init_skill_import_pipeline = __esm({
 });
 
 // src/targets/cline/skills-adapter.ts
-async function importClineSkills(projectRoot, results, normalize, skillsRelDir = CLINE_SKILLS_DIR) {
+async function importClineSkills(projectRoot, results, normalize2, skillsRelDir = CLINE_SKILLS_DIR) {
   const options = {
     projectRoot,
     destCanonicalSkillsDir: CLINE_CANONICAL_SKILLS_DIR,
     targetName: "cline",
-    normalize,
+    normalize: normalize2,
     results
   };
   await importSkillsDirectory([skillsRelDir], options, [
@@ -7412,8 +7450,8 @@ var init_hook_importer = __esm({
 });
 async function importFromCline(projectRoot) {
   const results = [];
-  const normalize = await createImportReferenceNormalizer(CLINE_TARGET, projectRoot);
-  const clineRulesIsFile = await importClineRules(projectRoot, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(CLINE_TARGET, projectRoot);
+  const clineRulesIsFile = await importClineRules(projectRoot, results, normalize2);
   const ignorePath = join(projectRoot, CLINE_IGNORE);
   const ignoreContent = await readFileSafe(ignorePath);
   if (ignoreContent !== null && ignoreContent.trim()) {
@@ -7444,12 +7482,12 @@ async function importFromCline(projectRoot) {
         destDir: destCommandsDir,
         extensions: [".md"],
         fromTool: "cline",
-        normalize,
+        normalize: normalize2,
         mapEntry: ({ relativePath, normalizeTo }) => mapClineWorkflowFile(relativePath, destCommandsDir, normalizeTo)
       })
     );
   }
-  await importClineSkills(projectRoot, results, normalize);
+  await importClineSkills(projectRoot, results, normalize2);
   await importClineHooks(projectRoot, results);
   return results;
 }
@@ -8032,12 +8070,12 @@ var init_mcp_helpers = __esm({
 });
 
 // src/targets/codex-cli/skills-adapter.ts
-async function importSkills(projectRoot, results, normalize) {
+async function importSkills(projectRoot, results, normalize2) {
   const options = {
     projectRoot,
     destCanonicalSkillsDir: CODEX_CANONICAL_SKILLS_DIR,
     targetName: CODEX_TARGET,
-    normalize,
+    normalize: normalize2,
     results
   };
   await importSkillsDirectory([CODEX_SKILLS_DIR, CODEX_SKILLS_FALLBACK_DIR], options, [
@@ -8051,7 +8089,7 @@ var init_skills_adapter2 = __esm({
     init_constants28();
   }
 });
-async function importCodexAgentsFromToml(projectRoot, results, normalize) {
+async function importCodexAgentsFromToml(projectRoot, results, normalize2) {
   const agentsPath = join(projectRoot, CODEX_AGENTS_DIR);
   const agentsDestDir = join(projectRoot, CODEX_CANONICAL_AGENTS_DIR);
   try {
@@ -8071,7 +8109,7 @@ async function importCodexAgentsFromToml(projectRoot, results, normalize) {
       const mcpServers = Array.isArray(parsed.mcp_servers) ? parsed.mcp_servers.filter((s) => typeof s === "string") : [];
       await mkdirp(agentsDestDir);
       const destPath = join(agentsDestDir, `${name}.md`);
-      const normalizedBody = normalize(body, srcPath, destPath);
+      const normalizedBody = normalize2(body, srcPath, destPath);
       const agent = {
         name,
         description,
@@ -8147,7 +8185,7 @@ var init_codex_rules_embed = __esm({
     init_constants28();
   }
 });
-async function importCodexNonRootRuleFiles(projectRoot, destDir, normalize) {
+async function importCodexNonRootRuleFiles(projectRoot, destDir, normalize2) {
   const results = [];
   const codexRulesPath = join(projectRoot, CODEX_RULES_DIR);
   try {
@@ -8158,7 +8196,7 @@ async function importCodexNonRootRuleFiles(projectRoot, destDir, normalize) {
       if (!content) continue;
       const relativePath = relative(codexRulesPath, srcPath).replace(/\\/g, "/");
       const destPath = join(destDir, relativePath);
-      const { frontmatter, body } = parseFrontmatter(normalize(content, srcPath, destPath));
+      const { frontmatter, body } = parseFrontmatter(normalize2(content, srcPath, destPath));
       await mkdirp(destDir);
       const outFm = frontmatter.root === true ? frontmatter : { ...frontmatter, root: false };
       const outContent = await serializeImportedRuleWithFallback(destPath, outFm, body);
@@ -8186,7 +8224,7 @@ async function importCodexNonRootRuleFiles(projectRoot, destDir, normalize) {
             globs: embedded.meta.globs,
             root: false
           },
-          normalize(embedded.body, srcPath, destPath)
+          normalize2(embedded.body, srcPath, destPath)
         );
         await writeFileAtomic(destPath, outContent);
       } else {
@@ -8198,7 +8236,7 @@ async function importCodexNonRootRuleFiles(projectRoot, destDir, normalize) {
             globs: [],
             codex_emit: "execution"
           },
-          normalize(raw.trim(), srcPath, destPath)
+          normalize2(raw.trim(), srcPath, destPath)
         );
         await writeFileAtomic(destPath, outContent);
       }
@@ -8222,7 +8260,7 @@ var init_import_codex_non_root_rules = __esm({
     init_codex_rules_embed();
   }
 });
-async function importCodexRules(projectRoot, results, normalize, normalizeWindsurf, layoutScope) {
+async function importCodexRules(projectRoot, results, normalize2, normalizeWindsurf, layoutScope) {
   const codexPath = join(projectRoot, CODEX_MD);
   const agentsPath = join(projectRoot, AGENTS_MD);
   const globalOverridePath = join(projectRoot, CODEX_GLOBAL_AGENTS_OVERRIDE_MD);
@@ -8244,14 +8282,14 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
       rulesDir: CODEX_CANONICAL_RULES_DIR,
       sourcePath,
       fromTool: "codex-cli",
-      normalize
+      normalize: normalize2
     });
     results.push(...split.results);
-    const normalizedContent = sourcePath === agentsPath || sourcePath === globalAgentsPath || sourcePath === globalOverridePath ? normalize(
+    const normalizedContent = sourcePath === agentsPath || sourcePath === globalAgentsPath || sourcePath === globalOverridePath ? normalize2(
       normalizeWindsurf(split.rootContent, sourcePath, destPath),
       sourcePath,
       destPath
-    ) : normalize(split.rootContent, sourcePath, destPath);
+    ) : normalize2(split.rootContent, sourcePath, destPath);
     const { frontmatter, body } = parseFrontmatter(normalizedContent);
     const outFm = frontmatter.root === true ? frontmatter : { ...frontmatter, root: true };
     const outContent = await serializeImportedRuleWithFallback(destPath, outFm, body);
@@ -8263,8 +8301,8 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
       feature: "rules"
     });
   }
-  await importInstructionMirrors(projectRoot, destDir, results, normalize);
-  results.push(...await importCodexNonRootRuleFiles(projectRoot, destDir, normalize));
+  await importInstructionMirrors(projectRoot, destDir, results, normalize2);
+  results.push(...await importCodexNonRootRuleFiles(projectRoot, destDir, normalize2));
   if (layoutScope !== "global") {
     results.push(
       ...await importFileDirectory({
@@ -8272,7 +8310,7 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
         destDir,
         extensions: ["AGENTS.md", "AGENTS.override.md"],
         fromTool: "codex-cli",
-        normalize,
+        normalize: normalize2,
         mapEntry: async ({ srcPath, normalizeTo }) => {
           const relDir = relative(projectRoot, dirname(srcPath)).replace(/\\/g, "/");
           const fileName = basename(srcPath);
@@ -8306,7 +8344,7 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
     );
   }
 }
-async function importInstructionMirrors(projectRoot, destDir, results, normalize) {
+async function importInstructionMirrors(projectRoot, destDir, results, normalize2) {
   try {
     const files = await readDirRecursive(join(projectRoot, CODEX_INSTRUCTIONS_DIR));
     const instructionFiles = files.filter((file) => file.endsWith(".md"));
@@ -8317,7 +8355,7 @@ async function importInstructionMirrors(projectRoot, destDir, results, normalize
       const content = await readFileSafe(srcPath);
       if (!content) continue;
       const destPath = join(destDir, relativePath);
-      const { frontmatter, body } = parseFrontmatter(normalize(content, srcPath, destPath));
+      const { frontmatter, body } = parseFrontmatter(normalize2(content, srcPath, destPath));
       await mkdirp(destDir);
       const outFm = frontmatter.root === true ? frontmatter : { ...frontmatter, root: false };
       const outContent = await serializeImportedRuleWithFallback(destPath, outFm, body);
@@ -8350,15 +8388,15 @@ var init_importer_rules2 = __esm({
 async function importFromCodex(projectRoot, options) {
   const layoutScope = options?.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(CODEX_TARGET, projectRoot, layoutScope);
+  const normalize2 = await createImportReferenceNormalizer(CODEX_TARGET, projectRoot, layoutScope);
   const normalizeWindsurf = await createImportReferenceNormalizer(
     "windsurf",
     projectRoot,
     layoutScope
   );
-  await importCodexRules(projectRoot, results, normalize, normalizeWindsurf, layoutScope);
-  await importSkills(projectRoot, results, normalize);
-  await importCodexAgentsFromToml(projectRoot, results, normalize);
+  await importCodexRules(projectRoot, results, normalize2, normalizeWindsurf, layoutScope);
+  await importSkills(projectRoot, results, normalize2);
+  await importCodexAgentsFromToml(projectRoot, results, normalize2);
   await importMcp(projectRoot, results);
   return results;
 }
@@ -8731,9 +8769,9 @@ async function importMcp2(projectRoot, results) {
 }
 async function importFromContinue(projectRoot) {
   const results = [];
-  const normalize = await createImportReferenceNormalizer(CONTINUE_TARGET, projectRoot);
-  results.push(...await runDescriptorImport(descriptor9, projectRoot, "project", { normalize }));
-  await importEmbeddedSkills(projectRoot, CONTINUE_SKILLS_DIR, CONTINUE_TARGET, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(CONTINUE_TARGET, projectRoot);
+  results.push(...await runDescriptorImport(descriptor9, projectRoot, "project", { normalize: normalize2 }));
+  await importEmbeddedSkills(projectRoot, CONTINUE_SKILLS_DIR, CONTINUE_TARGET, results, normalize2);
   await importMcp2(projectRoot, results);
   return results;
 }
@@ -9398,14 +9436,14 @@ var init_hook_parser = __esm({
     init_constants29();
   }
 });
-async function importSkills2(projectRoot, results, normalize, skillsDirRel = COPILOT_SKILLS_DIR) {
+async function importSkills2(projectRoot, results, normalize2, skillsDirRel = COPILOT_SKILLS_DIR) {
   const skillsDir = join(projectRoot, skillsDirRel);
   const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
     destCanonicalSkillsDir: COPILOT_CANONICAL_SKILLS_DIR,
     targetName: COPILOT_TARGET,
-    normalize,
+    normalize: normalize2,
     results
   };
   for (const [skillName, skillDir] of directorySkills) {
@@ -9423,12 +9461,12 @@ var init_skills_adapter3 = __esm({
 async function importFromCopilot(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(COPILOT_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor10, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(COPILOT_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor10, projectRoot, scope, { normalize: normalize2 }));
   await importSkills2(
     projectRoot,
     results,
-    normalize,
+    normalize2,
     scope === "global" ? COPILOT_GLOBAL_SKILLS_DIR : COPILOT_SKILLS_DIR
   );
   if (scope === "project") await importHooks(projectRoot, results);
@@ -10049,10 +10087,10 @@ var init_generator12 = __esm({
 async function importFromCrush(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(CRUSH_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor11, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(CRUSH_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor11, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? CRUSH_GLOBAL_SKILLS_DIR : CRUSH_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, CRUSH_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, CRUSH_TARGET, results, normalize2);
   await importCrushConfigJson(projectRoot, results);
   return results;
 }
@@ -10737,7 +10775,7 @@ var init_import_root_helpers = __esm({
     init_constants11();
   }
 });
-async function importCursorRules(projectRoot, results, normalize) {
+async function importCursorRules(projectRoot, results, normalize2) {
   const destDir = join(projectRoot, CURSOR_CANONICAL_RULES_DIR);
   let rootWritten = false;
   const rulesDir = join(projectRoot, CURSOR_RULES_DIR);
@@ -10747,7 +10785,7 @@ async function importCursorRules(projectRoot, results, normalize) {
       destDir,
       extensions: [".mdc"],
       fromTool: "cursor",
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ srcPath, relativePath, normalizeTo }) => {
         if (rootWritten) {
           const raw = await readFileSafe(srcPath);
@@ -10771,7 +10809,7 @@ async function importCursorRules(projectRoot, results, normalize) {
         results,
         sourcePath: agentsPath,
         content: agentsContent,
-        normalize
+        normalize: normalize2
       });
     }
   }
@@ -10784,7 +10822,7 @@ async function importCursorRules(projectRoot, results, normalize) {
         results,
         sourcePath: cursorRulesPath,
         content: cursorRulesContent,
-        normalize
+        normalize: normalize2
       });
     }
   }
@@ -10929,14 +10967,14 @@ var init_settings_helpers3 = __esm({
     init_constants11();
   }
 });
-async function importSkills3(projectRoot, results, normalize, skillsRelDir = CURSOR_SKILLS_DIR) {
+async function importSkills3(projectRoot, results, normalize2, skillsRelDir = CURSOR_SKILLS_DIR) {
   const skillsDir = join(projectRoot, skillsRelDir);
   const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
     destCanonicalSkillsDir: CURSOR_CANONICAL_SKILLS_DIR,
     targetName: "cursor",
-    normalize,
+    normalize: normalize2,
     results
   };
   for (const [skillName, skillDir] of directorySkills) {
@@ -10988,7 +11026,7 @@ async function hasGlobalCursorArtifacts(projectRoot) {
   if (commandFiles.some((f) => f.endsWith(".md"))) return true;
   return false;
 }
-async function importGlobalCursorRulesFromDir(projectRoot, results, normalize) {
+async function importGlobalCursorRulesFromDir(projectRoot, results, normalize2) {
   const destDir = join(projectRoot, CURSOR_CANONICAL_RULES_DIR);
   let rootWritten = false;
   const rulesDir = join(projectRoot, CURSOR_RULES_DIR);
@@ -10997,7 +11035,7 @@ async function importGlobalCursorRulesFromDir(projectRoot, results, normalize) {
     destDir,
     extensions: [".mdc"],
     fromTool: CURSOR_TARGET2,
-    normalize,
+    normalize: normalize2,
     mapEntry: async ({ srcPath, relativePath, normalizeTo }) => {
       if (rootWritten) {
         const raw = await readFileSafe(srcPath);
@@ -11014,7 +11052,7 @@ async function importGlobalCursorRulesFromDir(projectRoot, results, normalize) {
   results.push(...batch);
   return rootWritten;
 }
-async function importGlobalUserRules(projectRoot, results, normalize) {
+async function importGlobalUserRules(projectRoot, results, normalize2) {
   const srcPath = join(projectRoot, CURSOR_GLOBAL_USER_RULES);
   const raw = await readFileSafe(srcPath);
   if (raw === null || raw.trim() === "") return false;
@@ -11023,10 +11061,10 @@ async function importGlobalUserRules(projectRoot, results, normalize) {
     results,
     sourcePath: srcPath,
     content: raw.trim(),
-    normalize
+    normalize: normalize2
   });
 }
-async function importGlobalDotCursorAgents(projectRoot, results, normalize) {
+async function importGlobalDotCursorAgents(projectRoot, results, normalize2) {
   const srcPath = join(projectRoot, CURSOR_DOT_CURSOR_AGENTS);
   const raw = await readFileSafe(srcPath);
   if (raw === null || raw.trim() === "") return false;
@@ -11035,7 +11073,7 @@ async function importGlobalDotCursorAgents(projectRoot, results, normalize) {
     results,
     sourcePath: srcPath,
     content: raw.trim(),
-    normalize
+    normalize: normalize2
   });
 }
 async function importGlobalMcp(projectRoot, results) {
@@ -11059,7 +11097,7 @@ async function importGlobalMcp(projectRoot, results) {
     feature: "mcp"
   });
 }
-async function importGlobalAgents(projectRoot, results, normalize) {
+async function importGlobalAgents(projectRoot, results, normalize2) {
   const agentsDir = join(projectRoot, CURSOR_AGENTS_DIR);
   const destDir = join(projectRoot, CURSOR_CANONICAL_AGENTS_DIR);
   results.push(
@@ -11068,12 +11106,12 @@ async function importGlobalAgents(projectRoot, results, normalize) {
       destDir,
       extensions: [".md"],
       fromTool: CURSOR_TARGET2,
-      normalize,
+      normalize: normalize2,
       mapEntry: ({ relativePath, normalizeTo }) => mapCursorAgentFile(relativePath, destDir, normalizeTo)
     })
   );
 }
-async function importGlobalCommands(projectRoot, results, normalize) {
+async function importGlobalCommands(projectRoot, results, normalize2) {
   const commandsDir = join(projectRoot, CURSOR_COMMANDS_DIR);
   const destDir = join(projectRoot, CURSOR_CANONICAL_COMMANDS_DIR);
   results.push(
@@ -11082,7 +11120,7 @@ async function importGlobalCommands(projectRoot, results, normalize) {
       destDir,
       extensions: [".md"],
       fromTool: CURSOR_TARGET2,
-      normalize,
+      normalize: normalize2,
       mapEntry: ({ relativePath, normalizeTo }) => mapCursorCommandFile(relativePath, destDir, normalizeTo)
     })
   );
@@ -11104,14 +11142,14 @@ var init_import_global_exports_helpers = __esm({
 async function importFromCursorGlobalExports(projectRoot) {
   if (!await hasGlobalCursorArtifacts(projectRoot)) return [];
   const results = [];
-  const normalize = await createImportReferenceNormalizer(CURSOR_TARGET2, projectRoot, "global");
-  let rootWritten = await importGlobalCursorRulesFromDir(projectRoot, results, normalize);
-  if (!rootWritten) rootWritten = await importGlobalUserRules(projectRoot, results, normalize);
-  if (!rootWritten) await importGlobalDotCursorAgents(projectRoot, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(CURSOR_TARGET2, projectRoot, "global");
+  let rootWritten = await importGlobalCursorRulesFromDir(projectRoot, results, normalize2);
+  if (!rootWritten) rootWritten = await importGlobalUserRules(projectRoot, results, normalize2);
+  if (!rootWritten) await importGlobalDotCursorAgents(projectRoot, results, normalize2);
   await importGlobalMcp(projectRoot, results);
-  await importSkills3(projectRoot, results, normalize, CURSOR_SKILLS_DIR);
-  await importGlobalAgents(projectRoot, results, normalize);
-  await importGlobalCommands(projectRoot, results, normalize);
+  await importSkills3(projectRoot, results, normalize2, CURSOR_SKILLS_DIR);
+  await importGlobalAgents(projectRoot, results, normalize2);
+  await importGlobalCommands(projectRoot, results, normalize2);
   await importSettings2(projectRoot, results);
   await importIgnore(projectRoot, results);
   return results;
@@ -11150,10 +11188,10 @@ async function importFromCursor(projectRoot, options = {}) {
     return importFromCursorGlobalExports(projectRoot);
   }
   const results = [];
-  const normalize = await createImportReferenceNormalizer("cursor", projectRoot);
-  await importCursorRules(projectRoot, results, normalize);
-  results.push(...await runDescriptorImport(descriptor12, projectRoot, "project", { normalize }));
-  await importSkills3(projectRoot, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer("cursor", projectRoot);
+  await importCursorRules(projectRoot, results, normalize2);
+  results.push(...await runDescriptorImport(descriptor12, projectRoot, "project", { normalize: normalize2 }));
+  await importSkills3(projectRoot, results, normalize2);
   await importMcp3(projectRoot, results);
   await importSettings2(projectRoot, results);
   await importIgnore(projectRoot, results);
@@ -11511,14 +11549,14 @@ var init_generator15 = __esm({
 async function importFromDeepagentsCli(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(
+  const normalize2 = await createImportReferenceNormalizer(
     DEEPAGENTS_CLI_TARGET,
     projectRoot,
     scope
   );
-  results.push(...await runDescriptorImport(descriptor13, projectRoot, scope, { normalize }));
+  results.push(...await runDescriptorImport(descriptor13, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? DEEPAGENTS_CLI_GLOBAL_SKILLS_DIR : DEEPAGENTS_CLI_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, DEEPAGENTS_CLI_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, DEEPAGENTS_CLI_TARGET, results, normalize2);
   return results;
 }
 var init_importer13 = __esm({
@@ -11845,10 +11883,10 @@ var init_mcp_import2 = __esm({
 async function importFromFactoryDroid(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(FACTORY_DROID_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor14, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(FACTORY_DROID_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor14, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? FACTORY_DROID_GLOBAL_SKILLS_DIR : FACTORY_DROID_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, FACTORY_DROID_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, FACTORY_DROID_TARGET, results, normalize2);
   const mcpFile = scope === "global" ? FACTORY_DROID_GLOBAL_MCP_FILE : FACTORY_DROID_MCP_FILE;
   await importFactoryDroidMcp(projectRoot, mcpFile, results);
   return results;
@@ -12662,7 +12700,7 @@ var init_importer_strip = __esm({
   "src/targets/gemini-cli/importer-strip.ts"() {
   }
 });
-async function importGeminiSkillsAndAgents(projectRoot, results, normalize) {
+async function importGeminiSkillsAndAgents(projectRoot, results, normalize2) {
   const geminiSkillsPath = join(projectRoot, GEMINI_SKILLS_DIR);
   const skillDirs = await readDirRecursive(geminiSkillsPath);
   const skillMdFiles = skillDirs.filter((f) => basename(f) === "SKILL.md");
@@ -12678,7 +12716,7 @@ async function importGeminiSkillsAndAgents(projectRoot, results, normalize) {
       const agentPath = join(agentsDir, `${projectedAgent.name}.md`);
       await writeFileAtomic(
         agentPath,
-        serializeImportedAgent(projectedAgent, normalize(rawParsed.body, srcPath, agentPath))
+        serializeImportedAgent(projectedAgent, normalize2(rawParsed.body, srcPath, agentPath))
       );
       results.push({
         fromTool: "gemini-cli",
@@ -12689,7 +12727,7 @@ async function importGeminiSkillsAndAgents(projectRoot, results, normalize) {
       continue;
     }
     const destPath = join(projectRoot, GEMINI_CANONICAL_SKILLS_DIR, skillName, "SKILL.md");
-    const normalized = normalize(content, srcPath, destPath);
+    const normalized = normalize2(content, srcPath, destPath);
     const skillDir = join(projectRoot, GEMINI_CANONICAL_SKILLS_DIR, skillName);
     await mkdirp(skillDir);
     const { frontmatter, body } = parseFrontmatter(normalized);
@@ -12711,7 +12749,7 @@ async function importGeminiSkillsAndAgents(projectRoot, results, normalize) {
       const relPath = relative(dirname(srcPath), absPath).replace(/\\/g, "/");
       const destSupportPath = join(skillDir, relPath);
       await mkdirp(dirname(destSupportPath));
-      await writeFileAtomic(destSupportPath, normalize(supportContent, absPath, destSupportPath));
+      await writeFileAtomic(destSupportPath, normalize2(supportContent, absPath, destSupportPath));
       results.push({
         fromTool: "gemini-cli",
         fromPath: absPath,
@@ -12733,7 +12771,7 @@ async function importGeminiSkillsAndAgents(projectRoot, results, normalize) {
       const agentsDir = join(projectRoot, GEMINI_CANONICAL_AGENTS_DIR);
       await mkdirp(agentsDir);
       const destPath = join(agentsDir, relativeMdPath);
-      const normalizedBody = normalize(body, srcPath, destPath);
+      const normalizedBody = normalize2(body, srcPath, destPath);
       await writeFileAtomic(
         destPath,
         await serializeImportedAgentWithFallback(
@@ -12767,7 +12805,7 @@ var init_importer_skills_agents = __esm({
     init_constants30();
   }
 });
-async function importRootRule2(projectRoot, results, normalize) {
+async function importRootRule2(projectRoot, results, normalize2) {
   const normalizeCodex = await createImportReferenceNormalizer("codex-cli", projectRoot);
   const rulesDir = join(projectRoot, GEMINI_CANONICAL_RULES_DIR);
   const compatAgentsRootPath = join(projectRoot, GEMINI_COMPAT_AGENTS);
@@ -12798,10 +12836,10 @@ async function importRootRule2(projectRoot, results, normalize) {
     rulesDir: GEMINI_CANONICAL_RULES_DIR,
     sourcePath: rootSourcePath,
     fromTool: GEMINI_TARGET,
-    normalize
+    normalize: normalize2
   });
   results.push(...split.results);
-  const compatNormalized = normalize(split.rootContent, rootSourcePath, destPath);
+  const compatNormalized = normalize2(split.rootContent, rootSourcePath, destPath);
   const normalizedRoot = stripProjectRootCanonicalPrefix(
     compatNormalized.replace(/\.agents\/skills\//g, ".agentsmesh/skills/").replace(/\.agents\\skills\\/g, ".agentsmesh/skills/"),
     projectRoot
@@ -12823,10 +12861,10 @@ async function importRootRule2(projectRoot, results, normalize) {
 }
 async function importFromGemini(projectRoot) {
   const results = [];
-  const normalize = await createImportReferenceNormalizer(GEMINI_TARGET, projectRoot);
-  await importRootRule2(projectRoot, results, normalize);
-  results.push(...await runDescriptorImport(descriptor15, projectRoot, "project", { normalize }));
-  await importGeminiSkillsAndAgents(projectRoot, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(GEMINI_TARGET, projectRoot);
+  await importRootRule2(projectRoot, results, normalize2);
+  results.push(...await runDescriptorImport(descriptor15, projectRoot, "project", { normalize: normalize2 }));
+  await importGeminiSkillsAndAgents(projectRoot, results, normalize2);
   await importGeminiSettings(projectRoot, results);
   await importGeminiIgnore(projectRoot, results);
   results.push(...await importGeminiPolicies(projectRoot));
@@ -13227,10 +13265,10 @@ var init_generator19 = __esm({
 async function importFromGoose(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(GOOSE_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor16, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(GOOSE_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor16, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? GOOSE_GLOBAL_SKILLS_DIR : GOOSE_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, GOOSE_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, GOOSE_TARGET, results, normalize2);
   return results;
 }
 var init_importer16 = __esm({
@@ -13462,8 +13500,8 @@ var init_generator20 = __esm({
 // src/targets/jules/importer.ts
 async function importFromJules(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
-  const normalize = await createImportReferenceNormalizer(JULES_TARGET, projectRoot, scope);
-  return runDescriptorImport(descriptor17, projectRoot, scope, { normalize });
+  const normalize2 = await createImportReferenceNormalizer(JULES_TARGET, projectRoot, scope);
+  return runDescriptorImport(descriptor17, projectRoot, scope, { normalize: normalize2 });
 }
 var init_importer17 = __esm({
   "src/targets/jules/importer.ts"() {
@@ -13732,7 +13770,7 @@ var init_generator21 = __esm({
     init_constants16();
   }
 });
-async function importRootRule3(projectRoot, results, normalize) {
+async function importRootRule3(projectRoot, results, normalize2) {
   const sources = [JUNIE_DOT_AGENTS, JUNIE_GUIDELINES, JUNIE_CI_GUIDELINES, JUNIE_AGENTS_FALLBACK];
   const destPath = join(projectRoot, JUNIE_CANONICAL_ROOT_RULE);
   for (const relPath of sources) {
@@ -13745,10 +13783,10 @@ async function importRootRule3(projectRoot, results, normalize) {
       rulesDir: JUNIE_CANONICAL_RULES_DIR,
       sourcePath: srcPath,
       fromTool: JUNIE_TARGET,
-      normalize
+      normalize: normalize2
     });
     results.push(...split.results);
-    const { frontmatter, body } = parseFrontmatter(normalize(split.rootContent, srcPath, destPath));
+    const { frontmatter, body } = parseFrontmatter(normalize2(split.rootContent, srcPath, destPath));
     const output = await serializeImportedRuleWithFallback(
       destPath,
       {
@@ -13770,10 +13808,10 @@ async function importRootRule3(projectRoot, results, normalize) {
 }
 async function importFromJunie(projectRoot) {
   const results = [];
-  const normalize = await createImportReferenceNormalizer(JUNIE_TARGET, projectRoot);
-  await importRootRule3(projectRoot, results, normalize);
-  results.push(...await runDescriptorImport(descriptor18, projectRoot, "project", { normalize }));
-  await importEmbeddedSkills(projectRoot, JUNIE_SKILLS_DIR, JUNIE_TARGET, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(JUNIE_TARGET, projectRoot);
+  await importRootRule3(projectRoot, results, normalize2);
+  results.push(...await runDescriptorImport(descriptor18, projectRoot, "project", { normalize: normalize2 }));
+  await importEmbeddedSkills(projectRoot, JUNIE_SKILLS_DIR, JUNIE_TARGET, results, normalize2);
   return results;
 }
 var init_importer18 = __esm({
@@ -14165,7 +14203,7 @@ async function pathExists(absolutePath) {
     return false;
   }
 }
-async function importLegacyRules(projectRoot, results, normalize) {
+async function importLegacyRules(projectRoot, results, normalize2) {
   const srcDir = join(projectRoot, KILO_CODE_LEGACY_RULES_DIR);
   if (!await pathExists(srcDir)) return;
   const destDir = join(projectRoot, KILO_CODE_CANONICAL_RULES_DIR);
@@ -14174,7 +14212,7 @@ async function importLegacyRules(projectRoot, results, normalize) {
   const rootContent = hasCurrentRoot ? null : await readFileSafe(rootSourceFile);
   if (rootContent !== null) {
     const destPath = join(projectRoot, CANONICAL_ROOT_RULE_PATH);
-    const normalized = normalize(rootContent, rootSourceFile, destPath);
+    const normalized = normalize2(rootContent, rootSourceFile, destPath);
     const { body } = parseFrontmatter(normalized);
     const serialized = await serializeImportedRuleWithFallback(destPath, { root: true }, body);
     await writeFileAtomic(destPath, serialized);
@@ -14191,7 +14229,7 @@ async function importLegacyRules(projectRoot, results, normalize) {
       destDir,
       extensions: [".md"],
       fromTool: KILO_CODE_TARGET,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
         const mapping = await kiloNonRootRuleMapper({
           absolutePath: srcPath,
@@ -14207,7 +14245,7 @@ async function importLegacyRules(projectRoot, results, normalize) {
     })
   );
 }
-async function importLegacyWorkflows(projectRoot, results, normalize) {
+async function importLegacyWorkflows(projectRoot, results, normalize2) {
   const srcDir = join(projectRoot, KILO_CODE_LEGACY_WORKFLOWS_DIR);
   if (!await pathExists(srcDir)) return;
   const destDir = join(projectRoot, KILO_CODE_CANONICAL_COMMANDS_DIR);
@@ -14217,7 +14255,7 @@ async function importLegacyWorkflows(projectRoot, results, normalize) {
       destDir,
       extensions: [".md"],
       fromTool: KILO_CODE_TARGET,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
         const mapping = await kiloCommandMapper({
           absolutePath: srcPath,
@@ -14232,7 +14270,7 @@ async function importLegacyWorkflows(projectRoot, results, normalize) {
     })
   );
 }
-async function importLegacyModes(projectRoot, results, normalize) {
+async function importLegacyModes(projectRoot, results, normalize2) {
   const sourceFile = join(projectRoot, KILO_CODE_LEGACY_MODES_FILE);
   const content = await readFileSafe(sourceFile);
   if (content === null) return;
@@ -14261,7 +14299,7 @@ ${whenToUse}` : role;
     if (description) frontmatter.description = description;
     if (typeof mode.name === "string" && mode.name.length > 0) frontmatter.name = mode.name;
     const serialized = await serializeImportedAgentWithFallback(destPath, frontmatter, body);
-    const normalized = normalize(serialized, sourceFile, destPath);
+    const normalized = normalize2(serialized, sourceFile, destPath);
     await writeFileAtomic(destPath, normalized);
     results.push({
       feature: "agents",
@@ -14274,25 +14312,25 @@ ${whenToUse}` : role;
 async function importFromKiloCode(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(KILO_CODE_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor19, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(KILO_CODE_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor19, projectRoot, scope, { normalize: normalize2 }));
   await importEmbeddedSkills(
     projectRoot,
     KILO_CODE_SKILLS_DIR,
     KILO_CODE_TARGET,
     results,
-    normalize
+    normalize2
   );
   if (scope === "project") {
-    await importLegacyRules(projectRoot, results, normalize);
-    await importLegacyWorkflows(projectRoot, results, normalize);
-    await importLegacyModes(projectRoot, results, normalize);
+    await importLegacyRules(projectRoot, results, normalize2);
+    await importLegacyWorkflows(projectRoot, results, normalize2);
+    await importLegacyModes(projectRoot, results, normalize2);
     await importEmbeddedSkills(
       projectRoot,
       KILO_CODE_LEGACY_SKILLS_DIR,
       KILO_CODE_TARGET,
       results,
-      normalize
+      normalize2
     );
   }
   return results;
@@ -14761,14 +14799,14 @@ function canonicalRuleMeta2(frontmatter) {
   if (inclusion === "fileMatch") meta.trigger = "glob";
   return meta;
 }
-async function importRoot(projectRoot, results, normalize, scope) {
+async function importRoot(projectRoot, results, normalize2, scope) {
   const candidates = scope === "global" ? [KIRO_GLOBAL_STEERING_AGENTS_MD, KIRO_AGENTS_MD] : [KIRO_AGENTS_MD, KIRO_GLOBAL_STEERING_AGENTS_MD];
   for (const rel2 of candidates) {
     const srcPath = join(projectRoot, rel2);
     const content = await readFileSafe(srcPath);
     if (content === null) continue;
     const destPath = join(projectRoot, KIRO_CANONICAL_ROOT_RULE);
-    const { frontmatter, body } = parseFrontmatter(normalize(content, srcPath, destPath));
+    const { frontmatter, body } = parseFrontmatter(normalize2(content, srcPath, destPath));
     await writeFileAtomic(
       destPath,
       await serializeImportedRuleWithFallback(destPath, { ...frontmatter, root: true }, body)
@@ -14782,7 +14820,7 @@ async function importRoot(projectRoot, results, normalize, scope) {
     return;
   }
 }
-async function importNonRootRules(projectRoot, results, normalize) {
+async function importNonRootRules(projectRoot, results, normalize2) {
   const destDir = join(projectRoot, KIRO_CANONICAL_RULES_DIR);
   results.push(
     ...await importFileDirectory({
@@ -14790,7 +14828,7 @@ async function importNonRootRules(projectRoot, results, normalize) {
       destDir,
       extensions: [".md"],
       fromTool: KIRO_TARGET,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ relativePath, normalizeTo }) => {
         if (basename(relativePath) === "AGENTS.md") return null;
         const destPath = join(destDir, relativePath);
@@ -14832,11 +14870,11 @@ async function importHooks2(projectRoot, results) {
 async function importFromKiro(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(KIRO_TARGET, projectRoot, scope);
-  await importRoot(projectRoot, results, normalize, scope);
-  await importNonRootRules(projectRoot, results, normalize);
-  results.push(...await runDescriptorImport(descriptor20, projectRoot, scope, { normalize }));
-  await importEmbeddedSkills(projectRoot, KIRO_SKILLS_DIR, KIRO_TARGET, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(KIRO_TARGET, projectRoot, scope);
+  await importRoot(projectRoot, results, normalize2, scope);
+  await importNonRootRules(projectRoot, results, normalize2);
+  results.push(...await runDescriptorImport(descriptor20, projectRoot, scope, { normalize: normalize2 }));
+  await importEmbeddedSkills(projectRoot, KIRO_SKILLS_DIR, KIRO_TARGET, results, normalize2);
   if (scope === "project") await importHooks2(projectRoot, results);
   return results;
 }
@@ -15220,9 +15258,9 @@ async function importMcp4(projectRoot, scope, results) {
 async function importFromOpenCode(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(OPENCODE_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor21, projectRoot, scope, { normalize }));
-  await importEmbeddedSkills(projectRoot, OPENCODE_SKILLS_DIR, OPENCODE_TARGET, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(OPENCODE_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor21, projectRoot, scope, { normalize: normalize2 }));
+  await importEmbeddedSkills(projectRoot, OPENCODE_SKILLS_DIR, OPENCODE_TARGET, results, normalize2);
   await importMcp4(projectRoot, scope, results);
   return results;
 }
@@ -15581,10 +15619,10 @@ var init_generator25 = __esm({
 async function importFromPiAgent(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(PI_AGENT_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor22, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(PI_AGENT_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor22, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? PI_AGENT_GLOBAL_SKILLS_DIR : PI_AGENT_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, PI_AGENT_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, PI_AGENT_TARGET, results, normalize2);
   return results;
 }
 var init_importer22 = __esm({
@@ -15873,9 +15911,18 @@ function generateIgnore12(canonical) {
   if (!canonical.ignore || canonical.ignore.length === 0) return [];
   return [{ path: QWEN_IGNORE, content: canonical.ignore.join("\n") }];
 }
+function renderQwenGlobalInstructions(canonical) {
+  const root = canonical.rules.find((rule) => rule.root);
+  const nonRootRules = canonical.rules.filter((rule) => {
+    if (rule.root) return false;
+    return rule.targets.length === 0 || rule.targets.includes(QWEN_CODE_TARGET);
+  });
+  return appendEmbeddedRulesBlock(root?.body.trim() ?? "", nonRootRules);
+}
 var init_generator26 = __esm({
   "src/targets/qwen-code/generator.ts"() {
     init_markdown();
+    init_managed_blocks();
     init_constants21();
   }
 });
@@ -15884,10 +15931,10 @@ var init_generator26 = __esm({
 async function importFromQwenCode(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(QWEN_CODE_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor23, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(QWEN_CODE_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor23, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? QWEN_GLOBAL_SKILLS_DIR : QWEN_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, QWEN_CODE_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, QWEN_CODE_TARGET, results, normalize2);
   return results;
 }
 var init_importer23 = __esm({
@@ -15958,6 +16005,7 @@ var init_qwen_code2 = __esm({
     };
     globalLayout22 = {
       rootInstructionPath: QWEN_GLOBAL_ROOT,
+      renderPrimaryRootInstruction: renderQwenGlobalInstructions,
       skillDir: QWEN_GLOBAL_SKILLS_DIR,
       managedOutputs: {
         dirs: [QWEN_GLOBAL_COMMANDS_DIR, QWEN_GLOBAL_AGENTS_DIR, QWEN_GLOBAL_SKILLS_DIR],
@@ -16154,14 +16202,14 @@ var init_generator27 = __esm({
 async function importFromReplitAgent(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(REPLIT_AGENT_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor24, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(REPLIT_AGENT_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor24, projectRoot, scope, { normalize: normalize2 }));
   await importEmbeddedSkills(
     projectRoot,
     REPLIT_AGENT_SKILLS_DIR,
     REPLIT_AGENT_TARGET,
     results,
-    normalize
+    normalize2
   );
   return results;
 }
@@ -16452,7 +16500,7 @@ var init_import_mappers9 = __esm({
     };
   }
 });
-async function importPerModeRules(projectRoot, results, normalize) {
+async function importPerModeRules(projectRoot, results, normalize2) {
   const rooDir = join(projectRoot, ROO_CODE_DIR);
   let entries;
   try {
@@ -16469,7 +16517,7 @@ async function importPerModeRules(projectRoot, results, normalize) {
         destDir,
         extensions: [".md"],
         fromTool: ROO_CODE_TARGET,
-        normalize,
+        normalize: normalize2,
         mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
           const mapping = await rooNonRootRuleMapper({
             absolutePath: srcPath,
@@ -16488,10 +16536,10 @@ async function importPerModeRules(projectRoot, results, normalize) {
 async function importFromRooCode(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(ROO_CODE_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor25, projectRoot, scope, { normalize }));
-  await importPerModeRules(projectRoot, results, normalize);
-  await importEmbeddedSkills(projectRoot, ROO_CODE_SKILLS_DIR, ROO_CODE_TARGET, results, normalize);
+  const normalize2 = await createImportReferenceNormalizer(ROO_CODE_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor25, projectRoot, scope, { normalize: normalize2 }));
+  await importPerModeRules(projectRoot, results, normalize2);
+  await importEmbeddedSkills(projectRoot, ROO_CODE_SKILLS_DIR, ROO_CODE_TARGET, results, normalize2);
   return results;
 }
 var init_importer25 = __esm({
@@ -16805,10 +16853,10 @@ var init_generator29 = __esm({
 async function importFromRovodev(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(ROVODEV_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor26, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(ROVODEV_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor26, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? ROVODEV_GLOBAL_SKILLS_DIR : ROVODEV_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, ROVODEV_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, ROVODEV_TARGET, results, normalize2);
   return results;
 }
 var init_importer26 = __esm({
@@ -17066,14 +17114,14 @@ var init_generator30 = __esm({
     init_constants25();
   }
 });
-async function importRoot2(projectRoot, results, normalize, scope) {
+async function importRoot2(projectRoot, results, normalize2, scope) {
   const candidates = scope === "global" ? [TRAE_GLOBAL_ROOT_RULE, TRAE_PROJECT_RULES] : [TRAE_PROJECT_RULES, TRAE_GLOBAL_ROOT_RULE];
   for (const rel2 of candidates) {
     const srcPath = join(projectRoot, rel2);
     const content = await readFileSafe(srcPath);
     if (content === null) continue;
     const destPath = join(projectRoot, CANONICAL_ROOT_RULE);
-    const { frontmatter, body } = parseFrontmatter(normalize(content, srcPath, destPath));
+    const { frontmatter, body } = parseFrontmatter(normalize2(content, srcPath, destPath));
     await mkdirp(join(projectRoot, TRAE_CANONICAL_RULES_DIR));
     await writeFileAtomic(
       destPath,
@@ -17088,7 +17136,7 @@ async function importRoot2(projectRoot, results, normalize, scope) {
     return;
   }
 }
-async function importNonRootRules2(projectRoot, results, normalize, scope) {
+async function importNonRootRules2(projectRoot, results, normalize2, scope) {
   const srcDir = join(projectRoot, scope === "global" ? TRAE_GLOBAL_RULES_DIR : TRAE_RULES_DIR);
   const destDir = join(projectRoot, TRAE_CANONICAL_RULES_DIR);
   results.push(
@@ -17097,7 +17145,7 @@ async function importNonRootRules2(projectRoot, results, normalize, scope) {
       destDir,
       extensions: [".md"],
       fromTool: TRAE_TARGET,
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ relativePath, normalizeTo }) => {
         const filename = basename(relativePath);
         if (filename === "project_rules.md" || filename === "rules.md") return null;
@@ -17120,16 +17168,16 @@ async function importNonRootRules2(projectRoot, results, normalize, scope) {
 async function importFromTrae(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(TRAE_TARGET, projectRoot, scope);
-  await importRoot2(projectRoot, results, normalize, scope);
-  await importNonRootRules2(projectRoot, results, normalize, scope);
-  results.push(...await runDescriptorImport(descriptor27, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(TRAE_TARGET, projectRoot, scope);
+  await importRoot2(projectRoot, results, normalize2, scope);
+  await importNonRootRules2(projectRoot, results, normalize2, scope);
+  results.push(...await runDescriptorImport(descriptor27, projectRoot, scope, { normalize: normalize2 }));
   await importEmbeddedSkills(
     projectRoot,
     scope === "global" ? TRAE_GLOBAL_SKILLS_DIR : TRAE_SKILLS_DIR,
     TRAE_TARGET,
     results,
-    normalize
+    normalize2
   );
   return results;
 }
@@ -17356,10 +17404,10 @@ var init_generator31 = __esm({
 async function importFromWarp(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(WARP_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor28, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(WARP_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor28, projectRoot, scope, { normalize: normalize2 }));
   const skillsDir = scope === "global" ? WARP_GLOBAL_SKILLS_DIR : WARP_SKILLS_DIR;
-  await importEmbeddedSkills(projectRoot, skillsDir, WARP_TARGET, results, normalize);
+  await importEmbeddedSkills(projectRoot, skillsDir, WARP_TARGET, results, normalize2);
   return results;
 }
 var init_importer28 = __esm({
@@ -17821,7 +17869,7 @@ function toStringArray8(value) {
   }
   return [];
 }
-async function importWorkflows(projectRoot, results, normalize) {
+async function importWorkflows(projectRoot, results, normalize2) {
   const workflowsDir = join(projectRoot, WINDSURF_WORKFLOWS_DIR);
   const workflowFiles = await readDirRecursive(workflowsDir);
   const workflowMdFiles = workflowFiles.filter((f) => f.endsWith(".md"));
@@ -17832,7 +17880,7 @@ async function importWorkflows(projectRoot, results, normalize) {
     const relativePath = relative(workflowsDir, srcPath).replace(/\\/g, "/");
     await mkdirp(destCommandsDir);
     const destPath = join(destCommandsDir, relativePath);
-    const normalized = normalize(content, srcPath, destPath);
+    const normalized = normalize2(content, srcPath, destPath);
     const { frontmatter, body } = parseFrontmatter(normalized);
     const outContent = await serializeImportedCommandWithFallback(
       destPath,
@@ -17866,12 +17914,12 @@ var init_importer_workflows = __esm({
 });
 
 // src/targets/windsurf/skills-adapter.ts
-async function importSkills4(projectRoot, results, normalize, skillsRelDir = WINDSURF_SKILLS_DIR) {
+async function importSkills4(projectRoot, results, normalize2, skillsRelDir = WINDSURF_SKILLS_DIR) {
   const options = {
     projectRoot,
     destCanonicalSkillsDir: WINDSURF_CANONICAL_SKILLS_DIR,
     targetName: "windsurf",
-    normalize,
+    normalize: normalize2,
     results
   };
   await importSkillsDirectory([skillsRelDir], options, [
@@ -17985,7 +18033,7 @@ var init_importer_hooks_mcp = __esm({
 async function importFromWindsurf(projectRoot, options) {
   const layoutScope = options?.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(WINDSURF_TARGET, projectRoot);
+  const normalize2 = await createImportReferenceNormalizer(WINDSURF_TARGET, projectRoot);
   const normalizeCodex = await createImportReferenceNormalizer("codex-cli", projectRoot);
   const destRulesDir = join(projectRoot, WINDSURF_CANONICAL_RULES_DIR);
   const rootPath = join(projectRoot, WINDSURF_RULES_ROOT);
@@ -17993,7 +18041,7 @@ async function importFromWindsurf(projectRoot, options) {
   if (rootContent !== null) {
     await mkdirp(destRulesDir);
     const destPath = join(destRulesDir, "_root.md");
-    const body = normalize(rootContent, rootPath, destPath).trim();
+    const body = normalize2(rootContent, rootPath, destPath).trim();
     const outContent = await serializeImportedRuleWithFallback(destPath, { root: true }, body);
     await writeFileAtomic(destPath, outContent);
     results.push({
@@ -18009,7 +18057,7 @@ async function importFromWindsurf(projectRoot, options) {
     if (agentsMdContent !== null) {
       await mkdirp(destRulesDir);
       const destPath = join(destRulesDir, "_root.md");
-      const body = normalize(
+      const body = normalize2(
         normalizeCodex(agentsMdContent, agentsMdPath, destPath),
         agentsMdPath,
         destPath
@@ -18031,7 +18079,7 @@ async function importFromWindsurf(projectRoot, options) {
         destDir: destRulesDir,
         extensions: ["AGENTS.md"],
         fromTool: "windsurf",
-        normalize,
+        normalize: normalize2,
         mapEntry: async ({ srcPath, normalizeTo }) => {
           const relDir = relative(projectRoot, dirname(srcPath)).replace(/\\/g, "/");
           if (!relDir || relDir === "." || basename(srcPath) !== "AGENTS.md") return null;
@@ -18062,7 +18110,7 @@ async function importFromWindsurf(projectRoot, options) {
       destDir: destRulesDir,
       extensions: [".md"],
       fromTool: "windsurf",
-      normalize,
+      normalize: normalize2,
       mapEntry: async ({ relativePath, normalizeTo }) => {
         if (relativePath === "_root.md" && rootContent !== null) return null;
         const destPath = join(destRulesDir, relativePath);
@@ -18110,8 +18158,8 @@ async function importFromWindsurf(projectRoot, options) {
       });
     }
   }
-  await importWorkflows(projectRoot, results, normalize);
-  await importSkills4(projectRoot, results, normalize);
+  await importWorkflows(projectRoot, results, normalize2);
+  await importSkills4(projectRoot, results, normalize2);
   await importWindsurfHooks(projectRoot, results);
   await importWindsurfMcp(projectRoot, results);
   return results;
@@ -18425,8 +18473,8 @@ var init_mcp_import3 = __esm({
 async function importFromZed(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
-  const normalize = await createImportReferenceNormalizer(ZED_TARGET, projectRoot, scope);
-  results.push(...await runDescriptorImport(descriptor30, projectRoot, scope, { normalize }));
+  const normalize2 = await createImportReferenceNormalizer(ZED_TARGET, projectRoot, scope);
+  results.push(...await runDescriptorImport(descriptor30, projectRoot, scope, { normalize: normalize2 }));
   const mcpFile = scope === "global" ? ZED_GLOBAL_SETTINGS_FILE : ZED_SETTINGS_FILE;
   await importZedMcp(projectRoot, mcpFile, results);
   return results;
@@ -20147,6 +20195,19 @@ init_fs();
 
 // src/config/remote/git-remote.ts
 init_fs();
+
+// src/utils/output/redact-url-secrets.ts
+var URL_WITH_CREDENTIALS = /([a-zA-Z][a-zA-Z0-9+.-]*:\/\/)([^/@\s"'<>]+)@([^\s"'<>]+)/g;
+function redactUrlSecrets(message) {
+  return message.replace(
+    URL_WITH_CREDENTIALS,
+    (_full, scheme, _userinfo, rest) => {
+      return `${scheme}***@${rest}`;
+    }
+  );
+}
+
+// src/config/remote/git-remote.ts
 var execFileAsync = promisify(execFile);
 var REPO_DIRNAME = "repo";
 function ensureNotFlag(value, kind) {
@@ -20180,12 +20241,13 @@ async function fetchGitRemoteExtend(parsed, extendName, options, cacheDir, build
     await rm(stagedRoot, { recursive: true, force: true });
     const allowFallback = options.allowOfflineFallback !== false;
     if (allowFallback && await hasCachedRepo(cacheRepoDir)) {
+      const rawMsg = err instanceof Error ? err.message : String(err);
       console.warn(
-        `[agentsmesh] Remote fetch failed for ${extendName}; using cached version. Error: ${err instanceof Error ? err.message : String(err)}`
+        `[agentsmesh] Remote fetch failed for ${extendName}; using cached version. Error: ${redactUrlSecrets(rawMsg)}`
       );
       return readCachedRepo(cacheRepoDir);
     }
-    throw err;
+    throw err instanceof Error ? Object.assign(new Error(redactUrlSecrets(err.message)), { cause: err.cause }) : err;
   }
 }
 async function readCachedRepo(repoDir) {
@@ -20346,13 +20408,14 @@ async function fetchGithubRemoteExtend(parsed, extendName, options, cacheDir, bu
     if (allowFallback && await exists(extractDir)) {
       const topDir2 = await findExtractTopDir(extractDir);
       if (topDir2) {
+        const rawMsg = err instanceof Error ? err.message : String(err);
         console.warn(
-          `[agentsmesh] Network failed for ${extendName}; using cached version. Error: ${err instanceof Error ? err.message : String(err)}`
+          `[agentsmesh] Network failed for ${extendName}; using cached version. Error: ${redactUrlSecrets(rawMsg)}`
         );
         return { resolvedPath: join(extractDir, topDir2), version: tag };
       }
     }
-    throw err;
+    throw err instanceof Error ? Object.assign(new Error(redactUrlSecrets(err.message)), { cause: err.cause }) : err;
   }
   await rm(extractDir, { recursive: true, force: true });
   await mkdir(extractDir, { recursive: true });
@@ -20363,12 +20426,14 @@ async function fetchGithubRemoteExtend(parsed, extendName, options, cacheDir, bu
       file: tarPath,
       cwd: extractDir,
       strict: true,
+      // Allowlist entry types instead of denylist: only `File` and `Directory`
+      // can be extracted. Hardlinks (`Link`), symlinks (`SymbolicLink`), FIFOs,
+      // character/block devices, and any future/exotic tar entry type are
+      // rejected. A denylist would silently let an unknown variant through.
       filter: (entryPath, entry) => {
         if (isZipSlipPath(entryPath)) return false;
-        if (entry && "type" in entry && (entry.type === "Link" || entry.type === "SymbolicLink")) {
-          return false;
-        }
-        return true;
+        const type = entry && "type" in entry ? entry.type : void 0;
+        return type === "File" || type === "Directory";
       }
     });
   } finally {
@@ -20466,8 +20531,11 @@ function parseGitSource(source) {
     return null;
   }
   const allowInsecure = process.env.AGENTSMESH_ALLOW_INSECURE_GIT === "1" || process.env.AGENTSMESH_ALLOW_INSECURE_GIT === "true";
-  const allowedProtocols = allowInsecure ? ["https:", "http:", "ssh:", "file:"] : ["https:", "ssh:", "file:"];
-  if (!allowedProtocols.includes(parsedUrl.protocol)) {
+  const allowLocalGit = process.env.AGENTSMESH_ALLOW_LOCAL_GIT === "1" || process.env.AGENTSMESH_ALLOW_LOCAL_GIT === "true";
+  const allowed = ["https:", "ssh:"];
+  if (allowInsecure) allowed.push("http:");
+  if (allowLocalGit) allowed.push("file:");
+  if (!allowed.includes(parsedUrl.protocol)) {
     return null;
   }
   return { url, ref };
@@ -20926,6 +20994,7 @@ async function parseAgents(agentsDir, opts = {}) {
 
 // src/canonical/features/skills.ts
 init_fs();
+init_fs_traverse();
 init_markdown();
 init_boilerplate_filter();
 async function readContent(path) {
@@ -20944,7 +21013,7 @@ function sanitizeSkillName(raw) {
   return raw.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
 async function listSupportingFiles(skillDir) {
-  const files = await readDirRecursive(skillDir);
+  const files = await readDirRecursiveNoSymlinks(skillDir);
   const result = [];
   for (const absPath of files) {
     const raw = absPath.slice(skillDir.length + 1);
@@ -22517,6 +22586,135 @@ function lintRuleScopeInversion(input) {
   }
   return out2;
 }
+var TriggersSchema = z.object({
+  file_globs: z.array(z.string()),
+  command_patterns: z.array(z.string()),
+  keywords: z.array(z.string())
+}).refine((t) => t.file_globs.length + t.command_patterns.length + t.keywords.length > 0, {
+  message: "cluster must declare at least one trigger of any type"
+});
+var ClusterSchema = z.object({
+  topic: z.string().regex(/^[a-z0-9-]+$/, "topic must be kebab-case"),
+  /**
+   * Project-relative path (forward slashes) to the cluster's markdown body.
+   * Conventionally `.agentsmesh/lessons/topics/<topic>.md`, but any project
+   * path is accepted — universal across every agent target.
+   */
+  file: z.string().regex(/\.md$/, "file must be a .md path"),
+  summary: z.string().min(1),
+  triggers: TriggersSchema
+});
+var LessonsIndexSchema = z.object({
+  version: z.literal(1),
+  /**
+   * Zero clusters is valid — supports `agentsmesh init --lessons` scaffolding a
+   * fresh project. Topics accumulate via `distill:apply` as failures are
+   * captured.
+   */
+  clusters: z.array(ClusterSchema)
+});
+function parseIndex(raw) {
+  return LessonsIndexSchema.parse(raw);
+}
+var BASE_REL = ".agentsmesh/lessons";
+function lessonsPaths(projectRoot) {
+  const base = join(projectRoot, BASE_REL);
+  return {
+    base,
+    journal: join(base, "journal.md"),
+    index: join(base, "index.yaml"),
+    ledger: join(base, "distill-ledger.yaml"),
+    proposal: join(base, "distill-proposal.md"),
+    topicsDir: join(base, "topics")
+  };
+}
+function toRelPath(projectRoot, absolute) {
+  return relative(projectRoot, absolute).split(sep).join("/");
+}
+var LESSONS_JOURNAL_TEMPLATE = "# Lessons Learned\n\n";
+var LESSONS_INDEX_TEMPLATE = "version: 1\nclusters: []\n";
+var LESSONS_PROCEDURAL_RULE = `## Lessons (MUST do \u2014 non-negotiable)
+
+Two rituals. Universal across every agent harness \u2014 described in tool-agnostic action verbs ("read a file", "edit a file", "run a shell command"); use whatever read / write-patch / shell-exec tool your harness exposes. Skipping either ritual is a process violation; the same paid-for failure recurs next session.
+
+**Recall \u2014 BEFORE editing any file or running any shell command:**
+
+1. Read \`.agentsmesh/lessons/index.yaml\`.
+2. For every cluster whose triggers match \u2014 \`file_globs\` against the target file path, \`command_patterns\` (regex) against the shell command, or \`keywords\` (case-insensitive substring) against the active task description \u2014 read its \`file\` (e.g. \`.agentsmesh/lessons/topics/<topic>.md\`).
+3. Apply the loaded rules to the action.
+4. Then \u2014 and only then \u2014 perform the edit or run the command.
+
+Rejected excuses: *"the edit is small"* \u2192 apply it. *"I read this earlier in the session"* \u2192 context may have compacted; re-read. *"no trigger fires"* \u2192 proceed; you've done your part.
+
+**Capture \u2014 IMMEDIATELY after any failure** (test, CI, lint, code review, user correction, regression you spotted yourself, OR any mistake by anyone in the loop):
+
+1. Append one bullet to \`.agentsmesh/lessons/journal.md\` in this exact shape:
+   \`- **<short heading>**: <what went wrong>. <root cause>. <imperative rule that prevents recurrence>.\`
+2. Read \`.agentsmesh/lessons/index.yaml\` and identify which topic the lesson belongs to (use the \`summary:\` fields).
+3. If the lesson teaches a NEW rule: edit that topic's \`## Rules\` section to add it, citing \`(Evidence: L<journal-line>)\`. If it only reinforces an existing rule, the journal entry alone suffices.
+
+Rejected excuses: *"it wasn't really a failure"* \u2192 if you fixed something, it was. *"I'll capture it later"* \u2192 no; do it now while context is fresh. *"no topic fits"* \u2192 still record in journal; an unrouted bullet is recoverable, a forgotten one is not.
+
+**These two rituals are load-bearing. Treat them with the same discipline as TDD.**`;
+
+// src/core/lint/shared/lessons.ts
+var LESSONS_TARGET = "lessons";
+var INDEX_REL = ".agentsmesh/lessons/index.yaml";
+var ROOT_RULE_REL = ".agentsmesh/rules/_root.md";
+var LESSONS_HEADING = /^## Lessons \(/m;
+var RULES_HEADING = /^## Rules\b/m;
+function lintLessonsSubsystem(projectRoot, scope) {
+  if (scope === "global") return [];
+  const paths = lessonsPaths(projectRoot);
+  if (!existsSync(paths.index)) return [];
+  const out2 = [];
+  const parsed = LessonsIndexSchema.safeParse(parse(readFileSync(paths.index, "utf8")));
+  if (!parsed.success) {
+    return [diag("error", INDEX_REL, `index.yaml is invalid: ${parsed.error.issues[0].message}`)];
+  }
+  for (const cluster of parsed.data.clusters) {
+    const topicAbs = join(projectRoot, cluster.file);
+    if (!existsSync(topicAbs)) {
+      out2.push(
+        diag("error", cluster.file, `topic file for cluster "${cluster.topic}" does not exist.`)
+      );
+      continue;
+    }
+    if (!RULES_HEADING.test(readFileSync(topicAbs, "utf8"))) {
+      out2.push(
+        diag("warning", cluster.file, `topic "${cluster.topic}" is missing a "## Rules" section.`)
+      );
+    }
+    for (const pattern of cluster.triggers.command_patterns) {
+      try {
+        new RegExp(pattern);
+      } catch {
+        out2.push(
+          diag(
+            "warning",
+            INDEX_REL,
+            `cluster "${cluster.topic}" command_patterns entry is not a valid regex: ${pattern}`
+          )
+        );
+      }
+    }
+  }
+  const rootRuleAbs = join(projectRoot, ROOT_RULE_REL);
+  const rootRuleBody = existsSync(rootRuleAbs) ? readFileSync(rootRuleAbs, "utf8") : "";
+  if (!LESSONS_HEADING.test(rootRuleBody)) {
+    out2.push(
+      diag(
+        "warning",
+        ROOT_RULE_REL,
+        'lessons procedural rule ("## Lessons (...)") is missing from _root.md \u2014 recall/capture enforcement will not fire.'
+      )
+    );
+  }
+  return out2;
+}
+function diag(level, file, message) {
+  return { level, file, target: LESSONS_TARGET, message };
+}
 
 // src/core/lint/linter.ts
 var EXCLUDE_DIRS = ["node_modules", ".git", "dist", "coverage", ".agentsmesh"];
@@ -22537,7 +22735,7 @@ async function runLint(config, canonical, projectRoot, targetFilter, options = {
   const hasMcp = config.features.includes("mcp");
   const hasPermissions = config.features.includes("permissions");
   const hasHooks = config.features.includes("hooks");
-  const diagnostics = [];
+  const diagnostics = [...lintLessonsSubsystem(projectRoot, scope)];
   const projectFiles = scope === "global" ? [] : await getProjectFiles(projectRoot);
   for (const target31 of targets) {
     const fullDesc = getDescriptor(target31);
@@ -22940,7 +23138,228 @@ function copyTargetDescriptor(descriptor31) {
 function getTargetCatalog() {
   return Object.freeze(BUILTIN_TARGETS.map(copyTargetDescriptor));
 }
+function normalize(bullet) {
+  return bullet.split("\n").map((line) => line.replace(/\s+$/, "")).join("\n").trim().replace(/^[-*]\s+/, "");
+}
+function hashBullet(bullet) {
+  return createHash("sha256").update(normalize(bullet)).digest("hex").slice(0, 16);
+}
+
+// src/lessons/bullet-parser.ts
+function parseBullets(markdown) {
+  const bullets = [];
+  let current = null;
+  let lineNumber = 0;
+  for (const line of markdown.split("\n")) {
+    lineNumber += 1;
+    if (/^[-*]\s+/.test(line)) {
+      if (current !== null) bullets.push(current);
+      current = { text: line, lineNumber };
+    } else if (current !== null) {
+      if (line.length === 0) {
+        bullets.push(current);
+        current = null;
+      } else if (/^\s+\S/.test(line)) {
+        current.text += `
+${line}`;
+      } else {
+        bullets.push(current);
+        current = null;
+      }
+    }
+  }
+  if (current !== null) bullets.push(current);
+  return bullets;
+}
+function fileMatch(globs, path) {
+  return globs.some((g) => picomatch(g, { dot: true })(path));
+}
+function cmdMatch(patterns, cmd) {
+  return patterns.some((p) => {
+    try {
+      return new RegExp(p).test(cmd);
+    } catch {
+      return false;
+    }
+  });
+}
+function kwMatch(keywords, text) {
+  const lower = text.toLowerCase();
+  return keywords.some((k) => lower.includes(k.toLowerCase()));
+}
+function matchTriggers(clusters, event) {
+  return clusters.filter((c2) => {
+    const t = c2.triggers;
+    switch (event.kind) {
+      case "edit":
+      case "write":
+        return fileMatch(t.file_globs, event.filePath);
+      case "bash":
+        return cmdMatch(t.command_patterns, event.command);
+      case "task":
+        return kwMatch(t.keywords, event.text);
+    }
+  });
+}
+var LedgerSchema = z.object({
+  version: z.literal(1),
+  assignments: z.record(z.string(), z.string())
+});
+function loadLedger(path) {
+  if (!existsSync(path)) return { version: 1, assignments: {} };
+  return LedgerSchema.parse(parse(readFileSync(path, "utf8")));
+}
+function saveLedger(path, ledger) {
+  writeFileSync(path, stringify(ledger), "utf8");
+}
+
+// src/lessons/scoring.ts
+function scoreBullet(bullet, clusters) {
+  const lower = bullet.toLowerCase();
+  return clusters.map((cluster) => {
+    const t = cluster.triggers;
+    const kwHits = t.keywords.filter((k) => lower.includes(k.toLowerCase())).length;
+    const pathHits = t.file_globs.filter((g) => {
+      const stem = g.replace(/[*{}[\]?!]/g, "").replace(/\/+/g, "/").trim();
+      return stem.length > 2 && lower.includes(stem.toLowerCase());
+    }).length;
+    const cmdHits = t.command_patterns.filter((p) => {
+      try {
+        return new RegExp(p, "i").test(bullet);
+      } catch {
+        return false;
+      }
+    }).length;
+    return { cluster, score: kwHits * 2 + pathHits + cmdHits };
+  }).filter((s) => s.score > 0).sort((a, b) => b.score - a.score);
+}
+function loadLessonsIndex(projectRoot) {
+  const raw = readFileSync(lessonsPaths(projectRoot).index, "utf8");
+  return parseIndex(parse(raw));
+}
+function readTriggeredLessons(projectRoot, event) {
+  const index = loadLessonsIndex(projectRoot);
+  const contentByPath = /* @__PURE__ */ new Map();
+  return matchTriggers(index.clusters, normalizeToolEvent(projectRoot, event)).map(
+    (cluster) => {
+      const filePath = resolveProjectFile(projectRoot, cluster.file);
+      let content = contentByPath.get(cluster.file);
+      if (content === void 0) {
+        content = readFileSync(filePath, "utf8");
+        contentByPath.set(cluster.file, content);
+      }
+      return {
+        cluster,
+        relativePath: cluster.file,
+        filePath,
+        content
+      };
+    }
+  );
+}
+function formatLessonBullet(input) {
+  const heading = compact(input.heading);
+  if (heading.length === 0) throw new Error("Lesson heading must not be empty.");
+  return [
+    `- **${heading}**:`,
+    sentence(input.whatWentWrong),
+    sentence(input.rootCause),
+    sentence(input.rule)
+  ].join(" ");
+}
+function appendLessonToJournal(projectRoot, input) {
+  const journalPath = lessonsPaths(projectRoot).journal;
+  const bullet = formatLessonBullet(input);
+  const current = existsSync(journalPath) ? readFileSync(journalPath, "utf8") : "";
+  const prefix = current.length === 0 || current.endsWith("\n") ? "" : "\n";
+  const lineNumber = nextLineNumber(current);
+  mkdirSync(dirname(journalPath), { recursive: true });
+  appendFileSync(journalPath, `${prefix}${bullet}
+`, "utf8");
+  return { journalPath, bullet, lineNumber };
+}
+function resolveProjectFile(projectRoot, relPath) {
+  if (isAbsolute(relPath) || /^[A-Za-z]:[\\/]/.test(relPath)) {
+    throw new Error(`Lessons file must be project-relative: ${relPath}`);
+  }
+  const root = resolve(projectRoot);
+  const filePath = resolve(root, relPath);
+  const backToRoot = relative(root, filePath);
+  if (backToRoot === "" || backToRoot.startsWith("..") || isAbsolute(backToRoot)) {
+    throw new Error(`Lessons file escapes the project root: ${relPath}`);
+  }
+  return filePath;
+}
+function normalizeToolEvent(projectRoot, event) {
+  if (event.kind !== "edit" && event.kind !== "write") return event;
+  return { ...event, filePath: normalizeEventPath(projectRoot, event.filePath) };
+}
+function normalizeEventPath(projectRoot, filePath) {
+  const normalized = filePath.replaceAll("\\", "/");
+  const root = resolve(projectRoot).replaceAll("\\", "/");
+  if (normalized === root) return ".";
+  if (normalized.startsWith(`${root}/`)) return normalized.slice(root.length + 1);
+  return normalized.replace(/^\.\//, "");
+}
+function compact(value) {
+  return value.replace(/\s+/g, " ").trim();
+}
+function sentence(value) {
+  const compacted = compact(value);
+  if (compacted.length === 0) throw new Error("Lesson sentence must not be empty.");
+  return /[.!?]$/.test(compacted) ? compacted : `${compacted}.`;
+}
+function nextLineNumber(current) {
+  if (current.length === 0) return 1;
+  const lineCount = current.split("\n").length;
+  return current.endsWith("\n") ? lineCount : lineCount + 1;
+}
+function scaffoldLessons(projectRoot) {
+  const paths = lessonsPaths(projectRoot);
+  const created = [];
+  const skipped = [];
+  mkdirSync(paths.topicsDir, { recursive: true });
+  for (const [path, template] of [
+    [paths.journal, LESSONS_JOURNAL_TEMPLATE],
+    [paths.index, LESSONS_INDEX_TEMPLATE]
+  ]) {
+    if (existsSync(path)) {
+      skipped.push(path);
+    } else {
+      mkdirSync(dirname(path), { recursive: true });
+      writeFileSync(path, template, "utf8");
+      created.push(path);
+    }
+  }
+  const rootRuleUpdated = appendProceduralRule(projectRoot);
+  return { created, skipped, rootRuleUpdated };
+}
+function appendProceduralRule(projectRoot) {
+  const rootRule = join(projectRoot, ".agentsmesh/rules/_root.md");
+  if (!existsSync(rootRule)) {
+    mkdirSync(dirname(rootRule), { recursive: true });
+    const seeded = `---
+root: true
+description: ""
+---
+
+# Operational Guidelines
+
+${LESSONS_PROCEDURAL_RULE}
+`;
+    writeFileSync(rootRule, seeded, "utf8");
+    return true;
+  }
+  const current = readFileSync(rootRule, "utf8");
+  if (/^## Lessons \(/m.test(current)) return false;
+  const next = current.endsWith("\n") ? current : `${current}
+`;
+  writeFileSync(rootRule, `${next}
+${LESSONS_PROCEDURAL_RULE}
+`, "utf8");
+  return true;
+}
 
-export { AgentsMeshError, ConfigNotFoundError, ConfigValidationError, FileSystemError, GenerationError, ImportError, LockAcquisitionError, RemoteFetchError, TargetNotFoundError, check, computeDiff2 as computeDiff, diff, formatDiffSummary, generate, getAllDescriptors, getDescriptor, getTargetCatalog, importFrom, lint, loadCanonical, loadCanonicalFiles, loadConfig2 as loadConfig, loadConfigFromDirectory, loadProjectContext, registerTargetDescriptor, resolveOutputCollisions };
+export { AgentsMeshError, ConfigNotFoundError, ConfigValidationError, FileSystemError, GenerationError, ImportError, LESSONS_INDEX_TEMPLATE, LESSONS_JOURNAL_TEMPLATE, LESSONS_PROCEDURAL_RULE, LessonsIndexSchema, LockAcquisitionError, RemoteFetchError, TargetNotFoundError, appendLessonToJournal, check, computeDiff2 as computeDiff, diff, formatDiffSummary, formatLessonBullet, generate, getAllDescriptors, getDescriptor, getTargetCatalog, hashBullet, importFrom, lessonsPaths, lint, loadCanonical, loadCanonicalFiles, loadConfig2 as loadConfig, loadConfigFromDirectory, loadLedger, loadLessonsIndex, loadProjectContext, matchTriggers, parseBullets, parseIndex, readTriggeredLessons, registerTargetDescriptor, resolveOutputCollisions, saveLedger, scaffoldLessons, scoreBullet, toRelPath };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map