agentsmesh 0.18.0 → 0.19.0

package/dist/targets.js

@@ -15,86 +15,6 @@ var __export = (target31, all) => {
   for (var name in all)
     __defProp(target31, name, { get: all[name], enumerable: true });
 };
-
-// src/config/core/conversions.ts
-function usesCommandSkillProjection(target31) {
-  return Object.prototype.hasOwnProperty.call(DEFAULT_COMMANDS_TO_SKILLS, target31);
-}
-function usesAgentSkillProjection(target31) {
-  return Object.prototype.hasOwnProperty.call(DEFAULT_AGENTS_TO_SKILLS, target31);
-}
-function resolveConversionValue(value, scope) {
-  if (value === void 0) return void 0;
-  if (typeof value === "boolean") return value;
-  return value[scope];
-}
-function shouldConvertCommandsToSkills(config, target31, defaultEnabled, scope = "project") {
-  const raw = config.conversions?.commands_to_skills?.[target31];
-  const configVal = resolveConversionValue(raw, scope);
-  if (configVal !== void 0) return configVal;
-  if (usesCommandSkillProjection(target31)) return DEFAULT_COMMANDS_TO_SKILLS[target31];
-  return defaultEnabled ?? false;
-}
-function shouldConvertAgentsToSkills(config, target31, defaultEnabled, scope = "project") {
-  const raw = config.conversions?.agents_to_skills?.[target31];
-  const configVal = resolveConversionValue(raw, scope);
-  if (configVal !== void 0) return configVal;
-  if (usesAgentSkillProjection(target31)) return DEFAULT_AGENTS_TO_SKILLS[target31];
-  return defaultEnabled ?? false;
-}
-var DEFAULT_COMMANDS_TO_SKILLS, DEFAULT_AGENTS_TO_SKILLS;
-var init_conversions = __esm({
-  "src/config/core/conversions.ts"() {
-    DEFAULT_COMMANDS_TO_SKILLS = {
-      amp: true,
-      "codex-cli": true,
-      goose: true,
-      kiro: true,
-      warp: true
-    };
-    DEFAULT_AGENTS_TO_SKILLS = {
-      amp: true,
-      "gemini-cli": false,
-      // native .gemini/agents/*.md per agent-structures
-      cline: true,
-      "codex-cli": false,
-      // native .codex/agents/*.toml per agent-structures
-      windsurf: true,
-      goose: true,
-      antigravity: true,
-      continue: true,
-      warp: true
-    };
-  }
-});
-
-// src/targets/catalog/capabilities.ts
-function cap(level, flavor) {
-  return flavor !== void 0 ? { level, flavor } : { level };
-}
-function normalizeCapabilityValue(input) {
-  if (typeof input === "string") {
-    return { level: input };
-  }
-  return input;
-}
-function normalizeTargetCapabilities(caps) {
-  return {
-    rules: normalizeCapabilityValue(caps.rules),
-    additionalRules: normalizeCapabilityValue(caps.additionalRules),
-    commands: normalizeCapabilityValue(caps.commands),
-    agents: normalizeCapabilityValue(caps.agents),
-    skills: normalizeCapabilityValue(caps.skills),
-    mcp: normalizeCapabilityValue(caps.mcp),
-    hooks: normalizeCapabilityValue(caps.hooks),
-    ignore: normalizeCapabilityValue(caps.ignore),
-    permissions: normalizeCapabilityValue(caps.permissions)
-  };
-}
-var init_capabilities = __esm({
-  "src/targets/catalog/capabilities.ts"() {
-  }
-});
 function capabilityLevel(capability) {
   return typeof capability === "string" ? capability : capability.level;
 }
@@ -118,7 +38,7 @@ function validateCapabilityImplementations(descriptor31, capabilities17, ctx, pa
 function validateDescriptor(value) {
   return targetDescriptorSchema.parse(value);
 }
-var capabilityLevelSchema, capabilitiesSchema, generatorsSchema, pathResolversSchema, layoutSchema, globalSupportSchema, legacyGlobalKeys, generatorRequirements, settingsBackedFeatures, targetDescriptorSchemaBase, targetDescriptorSchema;
+var capabilityLevelSchema, capabilitiesSchema, generatorsSchema, pathResolversSchema, layoutSchema, globalSupportSchema, legacyGlobalKeys, generatorRequirements, settingsBackedFeatures, conversionDefaultsSchema, metadataSchema, targetDescriptorSchemaBase, targetDescriptorSchema;
 var init_target_descriptor_schema = __esm({
   "src/targets/catalog/target-descriptor.schema.ts"() {
     capabilityLevelSchema = z.union([
@@ -182,8 +102,19 @@ var init_target_descriptor_schema = __esm({
       { feature: "permissions", generator: "generatePermissions" }
     ];
     settingsBackedFeatures = ["mcp", "hooks", "ignore", "permissions"];
+    conversionDefaultsSchema = z.object({
+      commandsToSkills: z.boolean().optional(),
+      agentsToSkills: z.boolean().optional()
+    }).strict();
+    metadataSchema = z.object({
+      displayName: z.string().min(1),
+      category: z.enum(["cli", "ide", "agent-platform"]),
+      officialUrl: z.string().min(1),
+      shortDescription: z.string().min(1)
+    }).passthrough();
     targetDescriptorSchemaBase = z.object({
       id: z.string().regex(/^[a-z][a-z0-9-]*$/, "Target id must be lowercase with hyphens"),
+      metadata: metadataSchema,
       generators: generatorsSchema,
       capabilities: capabilitiesSchema,
       emptyImportMessage: z.string(),
@@ -191,7 +122,13 @@ var init_target_descriptor_schema = __esm({
       project: layoutSchema,
       globalSupport: globalSupportSchema.optional(),
       buildImportPaths: z.function(),
-      detectionPaths: z.array(z.string())
+      detectionPaths: z.array(z.string()),
+      excludeFromStarterInit: z.boolean().optional(),
+      conversionDefaults: conversionDefaultsSchema.optional(),
+      emitScopedSettings: z.function().optional(),
+      mergeGeneratedOutputContent: z.function().optional(),
+      postProcessHookOutputs: z.function().optional(),
+      preservesManualActivation: z.boolean().optional()
     }).passthrough();
     targetDescriptorSchema = targetDescriptorSchemaBase.superRefine((value, ctx) => {
       for (const key of legacyGlobalKeys) {
@@ -216,10 +153,15 @@ var init_target_descriptor_schema = __esm({
 
 // src/targets/catalog/registry.ts
 function builtinDescriptors() {
-  if (!_builtinDescriptors) {
-    _builtinDescriptors = new Map(BUILTIN_TARGETS.map((d) => [d.id, d]));
+  if (_builtinDescriptors) return _builtinDescriptors;
+  const defined = BUILTIN_TARGETS.filter(
+    (d) => d !== void 0 && typeof d.id === "string"
+  );
+  const map = new Map(defined.map((d) => [d.id, d]));
+  if (defined.length === BUILTIN_TARGETS.length) {
+    _builtinDescriptors = map;
   }
-  return _builtinDescriptors;
+  return map;
 }
 function registerTargetDescriptor(descriptor31) {
   const validated = validateDescriptor(descriptor31);
@@ -240,6 +182,65 @@ var init_registry = __esm({
   }
 });
 
+// src/config/core/conversions.ts
+function builtinDefault(target31, key) {
+  return getDescriptor(target31)?.conversionDefaults?.[key];
+}
+function resolveConversionValue(value, scope) {
+  if (value === void 0) return void 0;
+  if (typeof value === "boolean") return value;
+  return value[scope];
+}
+function shouldConvertCommandsToSkills(config, target31, defaultEnabled, scope = "project") {
+  const raw = config.conversions?.commands_to_skills?.[target31];
+  const configVal = resolveConversionValue(raw, scope);
+  if (configVal !== void 0) return configVal;
+  const builtin = builtinDefault(target31, "commandsToSkills");
+  if (builtin !== void 0) return builtin;
+  return defaultEnabled ?? false;
+}
+function shouldConvertAgentsToSkills(config, target31, defaultEnabled, scope = "project") {
+  const raw = config.conversions?.agents_to_skills?.[target31];
+  const configVal = resolveConversionValue(raw, scope);
+  if (configVal !== void 0) return configVal;
+  const builtin = builtinDefault(target31, "agentsToSkills");
+  if (builtin !== void 0) return builtin;
+  return defaultEnabled ?? false;
+}
+var init_conversions = __esm({
+  "src/config/core/conversions.ts"() {
+    init_registry();
+  }
+});
+
+// src/targets/catalog/capabilities.ts
+function cap(level, flavor) {
+  return flavor !== void 0 ? { level, flavor } : { level };
+}
+function normalizeCapabilityValue(input) {
+  if (typeof input === "string") {
+    return { level: input };
+  }
+  return input;
+}
+function normalizeTargetCapabilities(caps) {
+  return {
+    rules: normalizeCapabilityValue(caps.rules),
+    additionalRules: normalizeCapabilityValue(caps.additionalRules),
+    commands: normalizeCapabilityValue(caps.commands),
+    agents: normalizeCapabilityValue(caps.agents),
+    skills: normalizeCapabilityValue(caps.skills),
+    mcp: normalizeCapabilityValue(caps.mcp),
+    hooks: normalizeCapabilityValue(caps.hooks),
+    ignore: normalizeCapabilityValue(caps.ignore),
+    permissions: normalizeCapabilityValue(caps.permissions)
+  };
+}
+var init_capabilities = __esm({
+  "src/targets/catalog/capabilities.ts"() {
+  }
+});
+
 // src/targets/catalog/shared-artifact-owner.ts
 function findSharedArtifactOwnershipConflicts(descriptors) {
   const owners = [];
@@ -345,6 +346,23 @@ function parseFrontmatter(content) {
   const frontmatter = yamlStr === "" ? {} : parse(yamlStr) ?? {};
   return { frontmatter, body };
 }
+function extractBody(content) {
+  if (content.indexOf("---") !== 0) return content.trim();
+  const close = content.indexOf("---", 3);
+  if (close === -1) return content.trim();
+  return content.slice(close + 3).trim();
+}
+function tryParseFrontmatter(content, filePath) {
+  try {
+    return { ok: true, value: parseFrontmatter(content) };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const wrapped = new Error(`Failed to parse frontmatter in ${filePath}: ${message}`, {
+      cause: err
+    });
+    return { ok: false, error: wrapped, bodyFallback: extractBody(content) };
+  }
+}
 function serializeFrontmatter(frontmatter, body) {
   const keys = Object.keys(frontmatter);
   if (keys.length === 0) return body;
@@ -594,7 +612,18 @@ var init_fs_text_encoding = __esm({
     EXECUTABLE_SCRIPT_EXTENSIONS = /* @__PURE__ */ new Set([".sh", ".bash", ".zsh"]);
   }
 });
-async function readDirRecursive(dir, visited) {
+function shouldSkipRecursiveBranch(segments) {
+  if (segments.length > MAX_RECURSIVE_DEPTH) return true;
+  const counts = /* @__PURE__ */ new Map();
+  for (const segment of segments) {
+    const count = (counts.get(segment) ?? 0) + 1;
+    if (count >= MAX_SEGMENT_REPETITIONS) return true;
+    counts.set(segment, count);
+  }
+  return false;
+}
+async function readDirRecursive(dir, visited, branchSegments) {
+  const currentBranchSegments = branchSegments ?? [basename(dir)];
   let canonicalDir;
   try {
     canonicalDir = await realpath(dir);
@@ -620,7 +649,9 @@ async function readDirRecursive(dir, visited) {
         () => false
       );
       if (walkChild) {
-        files.push(...await readDirRecursive(full, seen));
+        const nextSegments = [...currentBranchSegments, ent.name];
+        if (shouldSkipRecursiveBranch(nextSegments)) continue;
+        files.push(...await readDirRecursive(full, seen, nextSegments));
       } else {
         files.push(full);
       }
@@ -636,9 +667,12 @@ async function readDirRecursive(dir, visited) {
     );
   }
 }
+var MAX_RECURSIVE_DEPTH, MAX_SEGMENT_REPETITIONS;
 var init_fs_traverse = __esm({
   "src/utils/filesystem/fs-traverse.ts"() {
     init_errors();
+    MAX_RECURSIVE_DEPTH = 32;
+    MAX_SEGMENT_REPETITIONS = 3;
   }
 });
 async function readFileSafe(path) {
@@ -1808,7 +1842,9 @@ function shouldRewritePathToken(fullContent, start, end, matchText, rewriteBareP
   }
   if (before === "@") return true;
   if (before === "(") {
-    return after === ")" || after === "#" || after === "?" || after === " " || after === "	";
+    if (fullContent[start - 2] === "]") {
+      return after === ")" || after === "#" || after === "?" || after === " " || after === "	";
+    }
   }
   if (!rewriteBarePathTokens) return false;
   if (isRootRelativePathToken(normalizedCandidate)) return true;
@@ -2202,6 +2238,55 @@ var init_descriptor_default_mappers = __esm({
   }
 });
 
+// src/install/importers/boilerplate-filter.ts
+function boilerplateKind(filename) {
+  const lower = filename.toLowerCase();
+  const dotIdx = lower.lastIndexOf(".");
+  const stem = dotIdx > 0 ? lower.slice(0, dotIdx) : lower;
+  return BOILERPLATE_STEMS.get(stem);
+}
+function isPreservedBoilerplate(filename) {
+  return boilerplateKind(filename) === "preserved";
+}
+var BOILERPLATE_STEMS;
+var init_boilerplate_filter = __esm({
+  "src/install/importers/boilerplate-filter.ts"() {
+    BOILERPLATE_STEMS = /* @__PURE__ */ new Map([
+      // Noise — upstream-repo housekeeping with no downstream value.
+      ["contributing", "noise"],
+      ["changelog", "noise"],
+      ["changes", "noise"],
+      ["history", "noise"],
+      ["code_of_conduct", "noise"],
+      ["security", "noise"],
+      ["support", "noise"],
+      ["maintainers", "noise"],
+      ["governance", "noise"],
+      ["authors", "noise"],
+      ["contributors", "noise"],
+      ["codeowners", "noise"],
+      ["citation", "noise"],
+      ["acknowledgments", "noise"],
+      ["acknowledgements", "noise"],
+      // Preserved — installed alongside content but never treated as an entity.
+      // LICENSE family: legal attribution required by MIT/Apache/BSD/GPL.
+      ["license", "preserved"],
+      ["license-mit", "preserved"],
+      ["license-apache", "preserved"],
+      ["license-bsd", "preserved"],
+      ["license-gpl", "preserved"],
+      ["notice", "preserved"],
+      ["copying", "preserved"],
+      ["copyright", "preserved"],
+      // README: skill-specific context (overview, usage, prerequisites) that
+      // explains the skill to the downstream consumer. Filtered from entity
+      // discovery so it can never become a phantom rule/command/agent named
+      // "README", but kept as a supporting file so the docs travel with the install.
+      ["readme", "preserved"]
+    ]);
+  }
+});
+
 // src/targets/catalog/import-descriptor.ts
 function resolveScopedSources(paths, scope) {
   if (!paths) return [];
@@ -2235,18 +2320,32 @@ async function runSingleFile(spec, sources, projectRoot, fromTool, normalize) {
     const destPath = join(destDir, spec.canonicalRootFilename);
     const normalizeTo = (destinationFile) => normalize(content, srcPath, destinationFile);
     if (spec.map) {
-      const mapping = await spec.map({
-        absolutePath: srcPath,
-        relativePath: rel2,
-        content,
-        destDir,
-        normalizeTo
-      });
+      let mapping;
+      try {
+        mapping = await spec.map({
+          absolutePath: srcPath,
+          relativePath: rel2,
+          content,
+          destDir,
+          normalizeTo
+        });
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`\u26A0 skipping ${srcPath}: ${msg}
+`);
+        continue;
+      }
       if (!mapping) continue;
       await writeFileAtomic(mapping.destPath, mapping.content);
       return [{ fromTool, fromPath: srcPath, toPath: mapping.toPath, feature: spec.feature }];
     }
-    const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
+    const result = tryParseFrontmatter(normalizeTo(destPath), srcPath);
+    if (!result.ok) {
+      process.stderr.write(`\u26A0 skipping ${srcPath}: ${result.error.message}
+`);
+      continue;
+    }
+    const { frontmatter, body } = result.value;
     const remapped = spec.frontmatterRemap ? spec.frontmatterRemap(frontmatter) : frontmatter;
     const outFm = spec.markAsRoot ? { ...remapped, root: true } : remapped;
     const outContent = await serializeImportedRuleWithFallback(destPath, outFm, body);
@@ -2275,13 +2374,22 @@ async function runDirectory(spec, sources, projectRoot, fromTool, normalize) {
       fromTool,
       normalize,
       mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
-        const mapping = await mapper({
-          absolutePath: srcPath,
-          relativePath,
-          content,
-          destDir,
-          normalizeTo: (destinationFile) => normalizeTo(destinationFile)
-        });
+        if (isPreservedBoilerplate(basename(srcPath))) return null;
+        let mapping;
+        try {
+          mapping = await mapper({
+            absolutePath: srcPath,
+            relativePath,
+            content,
+            destDir,
+            normalizeTo: (destinationFile) => normalizeTo(destinationFile)
+          });
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          process.stderr.write(`\u26A0 skipping ${srcPath}: ${msg}
+`);
+          return null;
+        }
         if (!mapping) return null;
         return {
           destPath: mapping.destPath,
@@ -2422,6 +2530,7 @@ var init_descriptor_import_runner = __esm({
     init_import_metadata();
     init_import_orchestrator();
     init_descriptor_default_mappers();
+    init_boilerplate_filter();
     init_import_descriptor();
   }
 });
@@ -3299,7 +3408,7 @@ var init_crush = __esm({
 });
 
 // src/targets/cursor/constants.ts
-var CURSOR_TARGET, CURSOR_COMPAT_AGENTS, CURSOR_LEGACY_RULES, CURSOR_RULES_DIR, CURSOR_GENERAL_RULE, CURSOR_COMMANDS_DIR, CURSOR_AGENTS_DIR, CURSOR_SKILLS_DIR, CURSOR_MCP, CURSOR_HOOKS, CURSOR_SETTINGS, CURSOR_IGNORE, CURSOR_INDEXING_IGNORE, CURSOR_GLOBAL_EXPORT_DIR, CURSOR_GLOBAL_USER_RULES, CURSOR_DOT_CURSOR_AGENTS, CURSOR_GLOBAL_MCP_EXPORT, CURSOR_GLOBAL_SKILLS_DIR, CURSOR_GLOBAL_AGENTS_DIR, CURSOR_CANONICAL_RULES_DIR, CURSOR_CANONICAL_COMMANDS_DIR, CURSOR_CANONICAL_AGENTS_DIR, CURSOR_CANONICAL_SKILLS_DIR, CURSOR_CANONICAL_MCP, CURSOR_CANONICAL_PERMISSIONS, CURSOR_CANONICAL_HOOKS, CURSOR_CANONICAL_IGNORE;
+var CURSOR_TARGET, CURSOR_COMPAT_AGENTS, CURSOR_LEGACY_RULES, CURSOR_RULES_DIR, CURSOR_GENERAL_RULE, CURSOR_COMMANDS_DIR, CURSOR_AGENTS_DIR, CURSOR_SKILLS_DIR, CURSOR_MCP, CURSOR_HOOKS, CURSOR_SETTINGS, CURSOR_IGNORE, CURSOR_INDEXING_IGNORE, CURSOR_GLOBAL_EXPORT_DIR, CURSOR_GLOBAL_USER_RULES, CURSOR_DOT_CURSOR_AGENTS, CURSOR_CANONICAL_RULES_DIR, CURSOR_CANONICAL_COMMANDS_DIR, CURSOR_CANONICAL_AGENTS_DIR, CURSOR_CANONICAL_SKILLS_DIR, CURSOR_CANONICAL_MCP, CURSOR_CANONICAL_PERMISSIONS, CURSOR_CANONICAL_HOOKS, CURSOR_CANONICAL_IGNORE;
 var init_constants11 = __esm({
   "src/targets/cursor/constants.ts"() {
     CURSOR_TARGET = "cursor";
@@ -3318,9 +3427,6 @@ var init_constants11 = __esm({
     CURSOR_GLOBAL_EXPORT_DIR = ".agentsmesh-exports/cursor";
     CURSOR_GLOBAL_USER_RULES = `${CURSOR_GLOBAL_EXPORT_DIR}/user-rules.md`;
     CURSOR_DOT_CURSOR_AGENTS = ".cursor/AGENTS.md";
-    CURSOR_GLOBAL_MCP_EXPORT = CURSOR_MCP;
-    CURSOR_GLOBAL_SKILLS_DIR = CURSOR_SKILLS_DIR;
-    CURSOR_GLOBAL_AGENTS_DIR = CURSOR_AGENTS_DIR;
     CURSOR_CANONICAL_RULES_DIR = ".agentsmesh/rules";
     CURSOR_CANONICAL_COMMANDS_DIR = ".agentsmesh/commands";
     CURSOR_CANONICAL_AGENTS_DIR = ".agentsmesh/agents";
@@ -4451,7 +4557,7 @@ var init_linter2 = __esm({
 });
 
 // src/targets/amazon-q/index.ts
-var target2, project2, global, globalCapabilities, descriptor2;
+var target2, project2, globalLayout2, globalCapabilities, descriptor2;
 var init_amazon_q2 = __esm({
   "src/targets/amazon-q/index.ts"() {
     init_generator2();
@@ -4482,7 +4588,7 @@ var init_amazon_q2 = __esm({
         }
       }
     };
-    global = {
+    globalLayout2 = {
       managedOutputs: {
         dirs: [AMAZON_Q_GLOBAL_RULES_DIR],
         files: [AMAZON_Q_GLOBAL_MCP_FILE]
@@ -4545,7 +4651,7 @@ var init_amazon_q2 = __esm({
       globalSupport: {
         capabilities: globalCapabilities,
         detectionPaths: [AMAZON_Q_GLOBAL_RULES_DIR, AMAZON_Q_GLOBAL_MCP_FILE],
-        layout: global
+        layout: globalLayout2
       },
       importer: {
         rules: {
@@ -4615,13 +4721,22 @@ var init_generator3 = __esm({
 
 // src/targets/catalog/skill-mirror.ts
 function mirrorSkillsToAgents(path, skillsDir, activeTargets) {
-  if (path.startsWith(`${skillsDir}/`) && !activeTargets.includes("codex-cli")) {
+  const hasNativeWriter = activeTargets.some((id) => NATIVE_AGENTS_SKILL_WRITERS.includes(id));
+  if (path.startsWith(`${skillsDir}/`) && !hasNativeWriter) {
     return `.agents/skills/${path.slice(skillsDir.length + 1)}`;
   }
   return null;
 }
+var NATIVE_AGENTS_SKILL_WRITERS;
 var init_skill_mirror = __esm({
   "src/targets/catalog/skill-mirror.ts"() {
+    NATIVE_AGENTS_SKILL_WRITERS = [
+      "amp",
+      "antigravity",
+      "codex-cli",
+      "goose",
+      "replit-agent"
+    ];
   }
 });
 async function importAmpMcp(projectRoot, settingsPath, results) {
@@ -4763,7 +4878,7 @@ function mergeAmpSettings(existing, newContent) {
   }
   return JSON.stringify(base, null, 2);
 }
-var target3, project3, globalLayout2, capabilities2, descriptor3;
+var target3, project3, globalLayout3, capabilities2, descriptor3;
 var init_amp2 = __esm({
   "src/targets/amp/index.ts"() {
     init_command_skill();
@@ -4803,7 +4918,7 @@ var init_amp2 = __esm({
         }
       }
     };
-    globalLayout2 = {
+    globalLayout3 = {
       rootInstructionPath: AMP_GLOBAL_ROOT_FILE,
       skillDir: AMP_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -4866,7 +4981,7 @@ var init_amp2 = __esm({
       globalSupport: {
         capabilities: capabilities2,
         detectionPaths: [AMP_GLOBAL_ROOT_FILE, AMP_GLOBAL_MCP_FILE],
-        layout: globalLayout2
+        layout: globalLayout3
       },
       importer: {
         rules: {
@@ -4900,7 +5015,8 @@ var init_amp2 = __esm({
         ".agents/skills/": "consumer"
       },
       buildImportPaths: buildAmpImportPaths,
-      detectionPaths: [AMP_ROOT_FILE, AMP_MCP_FILE]
+      detectionPaths: [AMP_ROOT_FILE, AMP_MCP_FILE],
+      conversionDefaults: { commandsToSkills: true, agentsToSkills: true }
     };
   }
 });
@@ -5140,7 +5256,7 @@ var init_linter4 = __esm({
 });
 
 // src/targets/antigravity/index.ts
-var target4, project4, global2, globalCapabilities2, descriptor4;
+var target4, project4, globalLayout4, globalCapabilities2, descriptor4;
 var init_antigravity2 = __esm({
   "src/targets/antigravity/index.ts"() {
     init_capabilities();
@@ -5164,6 +5280,20 @@ var init_antigravity2 = __esm({
     project4 = {
       rootInstructionPath: ANTIGRAVITY_RULES_ROOT,
       skillDir: ".agents/skills",
+      // managedOutputs is the sole signal `cleanupStaleGeneratedOutputs` uses to
+      // decide which dirs/files to scan when reconciling post-uninstall state.
+      // Antigravity emits across three dirs:
+      //   - `.agents/rules`     (rules)
+      //   - `.agents/workflows` (commands → workflows projection)
+      //   - `.agents/skills`    (agents → skills projection + native skills)
+      // Without all three here, projected outputs from an uninstalled pack would
+      // linger in the user's project. The root rule file and (suppressed) MCP
+      // config are listed under `files` so a flip from one root style to another
+      // doesn't leave both behind.
+      managedOutputs: {
+        dirs: [ANTIGRAVITY_RULES_DIR, ANTIGRAVITY_WORKFLOWS_DIR, ANTIGRAVITY_SKILLS_DIR],
+        files: [ANTIGRAVITY_RULES_ROOT]
+      },
       rewriteGeneratedPath(path) {
         if (path === ANTIGRAVITY_MCP_CONFIG) return null;
         return path;
@@ -5180,7 +5310,7 @@ var init_antigravity2 = __esm({
         }
       }
     };
-    global2 = {
+    globalLayout4 = {
       rootInstructionPath: ANTIGRAVITY_GLOBAL_ROOT,
       renderPrimaryRootInstruction: renderAntigravityGlobalInstructions,
       skillDir: ANTIGRAVITY_GLOBAL_SKILLS_DIR,
@@ -5208,7 +5338,7 @@ var init_antigravity2 = __esm({
           return `${ANTIGRAVITY_GLOBAL_WORKFLOWS_DIR}/${name}.md`;
         },
         agentPath(name) {
-          return `${ANTIGRAVITY_SKILLS_DIR}/${projectedAgentSkillDirName(name)}/SKILL.md`;
+          return `${ANTIGRAVITY_GLOBAL_SKILLS_DIR}/${projectedAgentSkillDirName(name)}/SKILL.md`;
         }
       }
     };
@@ -5255,7 +5385,7 @@ var init_antigravity2 = __esm({
           ".gemini/antigravity/workflows",
           ".gemini/antigravity/mcp_config.json"
         ],
-        layout: global2
+        layout: globalLayout4
       },
       importer: {
         rules: {
@@ -5296,7 +5426,8 @@ var init_antigravity2 = __esm({
         ".agents/rules/",
         ".agents/skills/",
         ".agents/workflows/"
-      ]
+      ],
+      conversionDefaults: { agentsToSkills: true }
     };
   }
 });
@@ -5628,7 +5759,7 @@ function buildSettingsContent(canonical) {
   if (Object.keys(settings).length === 0) return null;
   return JSON.stringify(settings, null, 2);
 }
-var target5, project5, globalLayout3, capabilities3, globalCapabilities3, descriptor5;
+var target5, project5, globalLayout5, capabilities3, globalCapabilities3, descriptor5;
 var init_augment_code2 = __esm({
   "src/targets/augment-code/index.ts"() {
     init_generator5();
@@ -5663,7 +5794,7 @@ var init_augment_code2 = __esm({
         }
       }
     };
-    globalLayout3 = {
+    globalLayout5 = {
       skillDir: AUGMENT_CODE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
         dirs: [
@@ -5749,7 +5880,7 @@ var init_augment_code2 = __esm({
           AUGMENT_CODE_GLOBAL_SKILLS_DIR,
           AUGMENT_CODE_GLOBAL_SETTINGS_FILE
         ],
-        layout: globalLayout3
+        layout: globalLayout5
       },
       emitScopedSettings(canonical) {
         const content = buildSettingsContent(canonical);
@@ -6149,6 +6280,19 @@ async function importClaudeSkills(projectRoot, results, normalize) {
     const skillDir = dirname(skillMdPath);
     const skillName = basename(skillDir);
     const destSkillDir = join(destBase, skillName);
+    const skillMdContent = await readFileSafe(skillMdPath);
+    if (skillMdContent === null) continue;
+    const normalizedSkillMd = normalize(
+      skillMdContent,
+      skillMdPath,
+      join(destSkillDir, "SKILL.md")
+    );
+    const skillMdParsed = tryParseFrontmatter(normalizedSkillMd, skillMdPath);
+    if (!skillMdParsed.ok) {
+      process.stderr.write(`\u26A0 skipping ${skillMdPath}: ${skillMdParsed.error.message}
+`);
+      continue;
+    }
     const skillFiles = await readDirRecursive(skillDir);
     for (const filePath of skillFiles) {
       const fileContent = await readFileSafe(filePath);
@@ -6157,13 +6301,12 @@ async function importClaudeSkills(projectRoot, results, normalize) {
       const destPath = join(destSkillDir, relPath);
       await mkdirp(dirname(destPath));
       const normalized = normalize(fileContent, filePath, destPath);
-      const parsed = relPath === "SKILL.md" ? parseFrontmatter(normalized) : null;
       await writeFileAtomic(
         destPath,
         relPath === "SKILL.md" ? await serializeImportedSkillWithFallback(
           destPath,
-          parsed?.frontmatter ?? {},
-          parsed?.body ?? ""
+          skillMdParsed.value.frontmatter,
+          skillMdParsed.value.body
         ) : normalized
       );
       const toPath = `${CLAUDE_CANONICAL_SKILLS_DIR}/${skillName}/${relPath}`;
@@ -6284,7 +6427,7 @@ var init_linter6 = __esm({
 });
 
 // src/targets/claude-code/index.ts
-var target6, project6, global3, globalCapabilities4, descriptor6;
+var target6, project6, globalLayout6, globalCapabilities4, descriptor6;
 var init_claude_code2 = __esm({
   "src/targets/claude-code/index.ts"() {
     init_generator6();
@@ -6328,7 +6471,7 @@ var init_claude_code2 = __esm({
         }
       }
     };
-    global3 = {
+    globalLayout6 = {
       rootInstructionPath: CLAUDE_ROOT,
       skillDir: ".claude/skills",
       renderPrimaryRootInstruction: renderClaudeGlobalPrimaryInstructions,
@@ -6407,7 +6550,7 @@ var init_claude_code2 = __esm({
           ".claude.json",
           ".agents/skills"
         ],
-        layout: global3,
+        layout: globalLayout6,
         scopeExtras: generateClaudeGlobalExtras
       },
       importer: {
@@ -6941,55 +7084,117 @@ async function findDirectorySkills(skillsDir) {
   }
   return skills;
 }
+async function importSkillsDirectory(sourceSkillsDirs, options, recognizers = []) {
+  for (const sourceDir of sourceSkillsDirs) {
+    const absSkillsDir = join(options.projectRoot, sourceDir);
+    const directorySkills = await findDirectorySkills(absSkillsDir);
+    if (directorySkills.size === 0) continue;
+    let importedAny = false;
+    for (const [skillName, skillDir] of directorySkills) {
+      const skillMdPath = join(skillDir, "SKILL.md");
+      const rawContent = await readFileSafe(skillMdPath);
+      if (rawContent === null) continue;
+      importedAny = true;
+      const { frontmatter, body: rawBody } = parseFrontmatter(rawContent);
+      const ctx = {
+        skillName,
+        skillDir,
+        skillMdPath,
+        rawContent,
+        frontmatter,
+        rawBody,
+        options
+      };
+      let handled = false;
+      for (const recognizer of recognizers) {
+        const claimed = await recognizer.recognize(ctx);
+        if (claimed) {
+          handled = true;
+          break;
+        }
+      }
+      if (!handled) {
+        await importDirectorySkill(skillName, skillDir, options);
+      }
+    }
+    if (importedAny) return;
+  }
+}
+function projectedAgentRecognizer(config) {
+  return {
+    async recognize(ctx) {
+      const projectedAgent = parseProjectedAgentSkillFrontmatter(ctx.frontmatter, ctx.skillName);
+      if (!projectedAgent) return false;
+      const { options } = ctx;
+      await removePathIfExists(
+        join(options.projectRoot, options.destCanonicalSkillsDir, ctx.skillName)
+      );
+      const destAgentsDir = join(options.projectRoot, config.canonicalAgentsDir);
+      await mkdirp(destAgentsDir);
+      const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
+      const normalizedBody = options.normalize(ctx.rawBody, ctx.skillMdPath, agentPath);
+      await writeFileAtomic(agentPath, serializeImportedAgent(projectedAgent, normalizedBody));
+      options.results.push({
+        fromTool: options.targetName,
+        fromPath: ctx.skillMdPath,
+        toPath: `${config.canonicalAgentsDir}/${projectedAgent.name}.md`,
+        feature: "agents"
+      });
+      return true;
+    }
+  };
+}
+function commandSkillRecognizer(config) {
+  return {
+    async recognize(ctx) {
+      const command = parseCommandSkillFrontmatter(ctx.frontmatter, ctx.skillName);
+      if (!command) return false;
+      const { options } = ctx;
+      await removePathIfExists(
+        join(options.projectRoot, options.destCanonicalSkillsDir, ctx.skillName)
+      );
+      const destCommandsDir = join(options.projectRoot, config.canonicalCommandsDir);
+      await mkdirp(destCommandsDir);
+      const commandPath = join(destCommandsDir, `${command.name}.md`);
+      const normalizedBody = options.normalize(ctx.rawBody, ctx.skillMdPath, commandPath);
+      await writeFileAtomic(commandPath, serializeImportedCommand(command, normalizedBody));
+      options.results.push({
+        fromTool: options.targetName,
+        fromPath: ctx.skillMdPath,
+        toPath: `${config.canonicalCommandsDir}/${command.name}.md`,
+        feature: "commands"
+      });
+      return true;
+    }
+  };
+}
 var init_skill_import_pipeline = __esm({
   "src/targets/import/shared/skill-import-pipeline.ts"() {
     init_fs();
     init_markdown();
     init_import_metadata();
     init_reserved();
+    init_projected_agent_skill();
+    init_command_skill();
+    init_scoped_agents_import();
   }
 });
+
+// src/targets/cline/skills-adapter.ts
 async function importClineSkills(projectRoot, results, normalize, skillsRelDir = CLINE_SKILLS_DIR) {
-  const skillsDir = join(projectRoot, skillsRelDir);
-  const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsRelDir,
     destCanonicalSkillsDir: CLINE_CANONICAL_SKILLS_DIR,
     targetName: "cline",
     normalize,
     results
   };
-  for (const [skillName, skillDir] of directorySkills) {
-    const skillMdPath = join(skillDir, "SKILL.md");
-    const content = await readFileSafe(skillMdPath);
-    if (!content) continue;
-    const rawParsed = parseFrontmatter(content);
-    const projectedAgent = parseProjectedAgentSkillFrontmatter(rawParsed.frontmatter, skillName);
-    if (projectedAgent) {
-      const destAgentsDir = join(projectRoot, CLINE_CANONICAL_AGENTS_DIR);
-      await mkdirp(destAgentsDir);
-      const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
-      await writeFileAtomic(
-        agentPath,
-        serializeImportedAgent(projectedAgent, normalize(rawParsed.body, skillMdPath, agentPath))
-      );
-      results.push({
-        fromTool: "cline",
-        fromPath: skillMdPath,
-        toPath: `${CLINE_CANONICAL_AGENTS_DIR}/${projectedAgent.name}.md`,
-        feature: "agents"
-      });
-      continue;
-    }
-    await importDirectorySkill(skillName, skillDir, options);
-  }
+  await importSkillsDirectory([skillsRelDir], options, [
+    projectedAgentRecognizer({ canonicalAgentsDir: CLINE_CANONICAL_AGENTS_DIR })
+  ]);
 }
 var init_skills_adapter = __esm({
   "src/targets/cline/skills-adapter.ts"() {
-    init_fs();
-    init_markdown();
-    init_projected_agent_skill();
     init_skill_import_pipeline();
     init_constants8();
   }
@@ -7135,7 +7340,7 @@ var init_lint4 = __esm({
 });
 
 // src/targets/cline/index.ts
-var target7, project7, globalLayout4, globalCapabilities5, descriptor7;
+var target7, project7, globalLayout7, globalCapabilities5, descriptor7;
 var init_cline2 = __esm({
   "src/targets/cline/index.ts"() {
     init_generator7();
@@ -7183,7 +7388,7 @@ var init_cline2 = __esm({
         }
       }
     };
-    globalLayout4 = {
+    globalLayout7 = {
       skillDir: CLINE_SKILLS_DIR,
       managedOutputs: {
         dirs: [
@@ -7275,10 +7480,11 @@ var init_cline2 = __esm({
           CLINE_MCP_SETTINGS,
           CLINE_IGNORE
         ],
-        layout: globalLayout4
+        layout: globalLayout7
       },
       buildImportPaths: buildClineImportPaths,
-      detectionPaths: [".clinerules", ".cline"]
+      detectionPaths: [".clinerules", ".cline"],
+      conversionDefaults: { agentsToSkills: true }
     };
   }
 });
@@ -7652,82 +7858,23 @@ var init_mcp_helpers = __esm({
     init_constants28();
   }
 });
+
+// src/targets/codex-cli/skills-adapter.ts
 async function importSkills(projectRoot, results, normalize) {
   const options = {
     projectRoot,
-    sourceSkillsDir: CODEX_SKILLS_DIR,
     destCanonicalSkillsDir: CODEX_CANONICAL_SKILLS_DIR,
     targetName: CODEX_TARGET,
     normalize,
     results
   };
-  for (const skillsRoot of [CODEX_SKILLS_DIR, CODEX_SKILLS_FALLBACK_DIR]) {
-    const skillsDir = join(projectRoot, skillsRoot);
-    const entries = await readdir(skillsDir, {
-      encoding: "utf8",
-      withFileTypes: true
-    }).catch(() => null);
-    if (entries === null) continue;
-    let importedAny = false;
-    for (const ent of entries) {
-      if (!ent.isDirectory() && !ent.isSymbolicLink()) continue;
-      const skillPath = join(skillsDir, ent.name);
-      const skillMdPath = join(skillPath, "SKILL.md");
-      const skillMdContent = await readFileSafe(skillMdPath);
-      if (!skillMdContent) continue;
-      importedAny = true;
-      const skillName = ent.name;
-      const destSkillPath = join(projectRoot, CODEX_CANONICAL_SKILLS_DIR, skillName, "SKILL.md");
-      const normalized = normalize(skillMdContent, skillMdPath, destSkillPath);
-      const { frontmatter, body } = parseFrontmatter(normalized);
-      const command = parseCommandSkillFrontmatter(frontmatter, ent.name);
-      if (command) {
-        await removePathIfExists(join(projectRoot, CODEX_CANONICAL_SKILLS_DIR, skillName));
-        const destCommandsDir = join(projectRoot, CODEX_CANONICAL_COMMANDS_DIR);
-        await mkdirp(destCommandsDir);
-        const commandPath = join(destCommandsDir, `${command.name}.md`);
-        await writeFileAtomic(
-          commandPath,
-          serializeImportedCommand(command, normalize(body, skillMdPath, commandPath))
-        );
-        results.push({
-          fromTool: CODEX_TARGET,
-          fromPath: skillMdPath,
-          toPath: `${CODEX_CANONICAL_COMMANDS_DIR}/${command.name}.md`,
-          feature: "commands"
-        });
-        continue;
-      }
-      const projectedAgent = parseProjectedAgentSkillFrontmatter(frontmatter, ent.name);
-      if (projectedAgent) {
-        await removePathIfExists(join(projectRoot, CODEX_CANONICAL_SKILLS_DIR, skillName));
-        const destAgentsDir = join(projectRoot, CODEX_CANONICAL_AGENTS_DIR);
-        await mkdirp(destAgentsDir);
-        const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
-        await writeFileAtomic(
-          agentPath,
-          serializeImportedAgent(projectedAgent, normalize(body, skillMdPath, agentPath))
-        );
-        results.push({
-          fromTool: CODEX_TARGET,
-          fromPath: skillMdPath,
-          toPath: `${CODEX_CANONICAL_AGENTS_DIR}/${projectedAgent.name}.md`,
-          feature: "agents"
-        });
-        continue;
-      }
-      await importDirectorySkill(skillName, skillPath, options);
-    }
-    if (importedAny) return;
-  }
+  await importSkillsDirectory([CODEX_SKILLS_DIR, CODEX_SKILLS_FALLBACK_DIR], options, [
+    commandSkillRecognizer({ canonicalCommandsDir: CODEX_CANONICAL_COMMANDS_DIR }),
+    projectedAgentRecognizer({ canonicalAgentsDir: CODEX_CANONICAL_AGENTS_DIR })
+  ]);
 }
 var init_skills_adapter2 = __esm({
   "src/targets/codex-cli/skills-adapter.ts"() {
-    init_fs();
-    init_markdown();
-    init_command_skill();
-    init_projected_agent_skill();
-    init_scoped_agents_import();
     init_skill_import_pipeline();
     init_constants28();
   }
@@ -8117,7 +8264,7 @@ var init_codex_rule_paths = __esm({
     init_instruction_mirror();
   }
 });
-var target8, project8, global4, globalCapabilities6, descriptor8;
+var target8, project8, globalLayout8, globalCapabilities6, descriptor8;
 var init_codex_cli2 = __esm({
   "src/targets/codex-cli/index.ts"() {
     init_generator9();
@@ -8163,7 +8310,7 @@ var init_codex_cli2 = __esm({
         }
       }
     };
-    global4 = {
+    globalLayout8 = {
       rootInstructionPath: CODEX_GLOBAL_AGENTS_MD,
       renderPrimaryRootInstruction: renderCodexGlobalInstructions,
       extraRuleOutputPaths(rule) {
@@ -8241,7 +8388,7 @@ var init_codex_cli2 = __esm({
           ".codex/rules",
           ".agents/skills"
         ],
-        layout: global4
+        layout: globalLayout8
       },
       buildImportPaths: buildCodexCliImportPaths,
       sharedArtifacts: {
@@ -8254,7 +8401,9 @@ var init_codex_cli2 = __esm({
         ".codex/config.toml",
         ".codex/agents",
         ".codex/rules"
-      ]
+      ],
+      excludeFromStarterInit: true,
+      conversionDefaults: { commandsToSkills: true, agentsToSkills: false }
     };
   }
 });
@@ -8617,7 +8766,7 @@ var init_scope_extras = __esm({
 });
 
 // src/targets/continue/index.ts
-var target9, project9, globalLayout5, globalCapabilities7, descriptor9;
+var target9, project9, globalLayout9, globalCapabilities7, descriptor9;
 var init_continue2 = __esm({
   "src/targets/continue/index.ts"() {
     init_projected_agent_skill();
@@ -8659,7 +8808,7 @@ var init_continue2 = __esm({
         }
       }
     };
-    globalLayout5 = {
+    globalLayout9 = {
       rootInstructionPath: CONTINUE_ROOT_RULE,
       outputFamilies: [
         { id: "compat-agents", kind: "additional", explicitPaths: [CONTINUE_GLOBAL_AGENTS_MD] }
@@ -8733,7 +8882,7 @@ var init_continue2 = __esm({
           ".continue/mcpServers",
           CONTINUE_SKILLS_DIR
         ],
-        layout: globalLayout5,
+        layout: globalLayout9,
         scopeExtras: generateContinueScopeExtras
       },
       importer: {
@@ -8755,7 +8904,8 @@ var init_continue2 = __esm({
         }
       },
       buildImportPaths: buildContinueImportPaths,
-      detectionPaths: [".continue/rules", ".continue/skills", ".continue/mcpServers"]
+      detectionPaths: [".continue/rules", ".continue/skills", ".continue/mcpServers"],
+      conversionDefaults: { agentsToSkills: true }
     };
   }
 });
@@ -9081,7 +9231,6 @@ async function importSkills2(projectRoot, results, normalize, skillsDirRel = COP
   const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsDirRel,
     destCanonicalSkillsDir: COPILOT_CANONICAL_SKILLS_DIR,
     targetName: COPILOT_TARGET,
     normalize,
@@ -9406,7 +9555,7 @@ var init_scope_extras2 = __esm({
     };
   }
 });
-var target10, project10, global5, globalCapabilities8, descriptor10;
+var target10, project10, globalLayout10, globalCapabilities8, descriptor10;
 var init_copilot2 = __esm({
   "src/targets/copilot/index.ts"() {
     init_generator11();
@@ -9460,7 +9609,7 @@ var init_copilot2 = __esm({
         }
       }
     };
-    global5 = {
+    globalLayout10 = {
       rootInstructionPath: COPILOT_GLOBAL_INSTRUCTIONS,
       renderPrimaryRootInstruction: renderCopilotGlobalInstructions,
       outputFamilies: [
@@ -9566,7 +9715,7 @@ var init_copilot2 = __esm({
           COPILOT_GLOBAL_PROMPTS_DIR,
           COPILOT_GLOBAL_AGENTS_SKILLS_DIR
         ],
-        layout: global5,
+        layout: globalLayout10,
         scopeExtras: generateCopilotGlobalExtras
       },
       importer: {
@@ -9935,7 +10084,7 @@ var init_settings = __esm({
 });
 
 // src/targets/crush/index.ts
-var target11, project11, globalLayout6, capabilities4, globalCapabilities9, descriptor11;
+var target11, project11, globalLayout11, capabilities4, globalCapabilities9, descriptor11;
 var init_crush2 = __esm({
   "src/targets/crush/index.ts"() {
     init_command_skill();
@@ -9980,7 +10129,7 @@ var init_crush2 = __esm({
         }
       }
     };
-    globalLayout6 = {
+    globalLayout11 = {
       rootInstructionPath: CRUSH_GLOBAL_ROOT_FILE,
       skillDir: CRUSH_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -10053,7 +10202,7 @@ var init_crush2 = __esm({
       globalSupport: {
         capabilities: globalCapabilities9,
         detectionPaths: [CRUSH_GLOBAL_ROOT_FILE, CRUSH_GLOBAL_CONFIG_FILE, CRUSH_GLOBAL_SKILLS_DIR],
-        layout: globalLayout6
+        layout: globalLayout11
       },
       mergeGeneratedOutputContent(existing, pending, newContent, resolvedPath) {
         const base = pending?.content ?? existing;
@@ -10600,7 +10749,6 @@ async function importSkills3(projectRoot, results, normalize, skillsRelDir = CUR
   const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsRelDir,
     destCanonicalSkillsDir: CURSOR_CANONICAL_SKILLS_DIR,
     targetName: "cursor",
     normalize,
@@ -10636,20 +10784,20 @@ async function hasGlobalCursorArtifacts(projectRoot) {
   const candidates = [
     join(projectRoot, CURSOR_DOT_CURSOR_AGENTS),
     join(projectRoot, CURSOR_GLOBAL_USER_RULES),
-    join(projectRoot, CURSOR_GLOBAL_MCP_EXPORT),
+    join(projectRoot, CURSOR_MCP),
     join(projectRoot, CURSOR_HOOKS),
     join(projectRoot, CURSOR_IGNORE),
-    join(projectRoot, CURSOR_GLOBAL_SKILLS_DIR),
-    join(projectRoot, CURSOR_GLOBAL_AGENTS_DIR),
+    join(projectRoot, CURSOR_SKILLS_DIR),
+    join(projectRoot, CURSOR_AGENTS_DIR),
     join(projectRoot, CURSOR_COMMANDS_DIR)
   ];
   for (const p of candidates) {
     const stat5 = await readFileSafe(p);
     if (stat5 !== null && stat5.trim() !== "") return true;
   }
-  const skillFiles = await readDirRecursive(join(projectRoot, CURSOR_GLOBAL_SKILLS_DIR));
+  const skillFiles = await readDirRecursive(join(projectRoot, CURSOR_SKILLS_DIR));
   if (skillFiles.some((f) => f.endsWith(".md"))) return true;
-  const agentFiles = await readDirRecursive(join(projectRoot, CURSOR_GLOBAL_AGENTS_DIR));
+  const agentFiles = await readDirRecursive(join(projectRoot, CURSOR_AGENTS_DIR));
   if (agentFiles.some((f) => f.endsWith(".md"))) return true;
   const commandFiles = await readDirRecursive(join(projectRoot, CURSOR_COMMANDS_DIR));
   if (commandFiles.some((f) => f.endsWith(".md"))) return true;
@@ -10706,7 +10854,7 @@ async function importGlobalDotCursorAgents(projectRoot, results, normalize) {
   });
 }
 async function importGlobalMcp(projectRoot, results) {
-  const mcpPath = join(projectRoot, CURSOR_GLOBAL_MCP_EXPORT);
+  const mcpPath = join(projectRoot, CURSOR_MCP);
   const content = await readFileSafe(mcpPath);
   if (content === null || content.trim() === "") return;
   let parsed;
@@ -10727,7 +10875,7 @@ async function importGlobalMcp(projectRoot, results) {
   });
 }
 async function importGlobalAgents(projectRoot, results, normalize) {
-  const agentsDir = join(projectRoot, CURSOR_GLOBAL_AGENTS_DIR);
+  const agentsDir = join(projectRoot, CURSOR_AGENTS_DIR);
   const destDir = join(projectRoot, CURSOR_CANONICAL_AGENTS_DIR);
   results.push(
     ...await importFileDirectory({
@@ -10776,7 +10924,7 @@ async function importFromCursorGlobalExports(projectRoot) {
   if (!rootWritten) rootWritten = await importGlobalUserRules(projectRoot, results, normalize);
   if (!rootWritten) await importGlobalDotCursorAgents(projectRoot, results, normalize);
   await importGlobalMcp(projectRoot, results);
-  await importSkills3(projectRoot, results, normalize, CURSOR_GLOBAL_SKILLS_DIR);
+  await importSkills3(projectRoot, results, normalize, CURSOR_SKILLS_DIR);
   await importGlobalAgents(projectRoot, results, normalize);
   await importGlobalCommands(projectRoot, results, normalize);
   await importSettings2(projectRoot, results);
@@ -10950,7 +11098,7 @@ var init_lint9 = __esm({
 });
 
 // src/targets/cursor/index.ts
-var target12, project12, global6, globalCapabilities10, descriptor12;
+var target12, project12, globalLayout12, globalCapabilities10, descriptor12;
 var init_cursor2 = __esm({
   "src/targets/cursor/index.ts"() {
     init_generator14();
@@ -11000,7 +11148,7 @@ var init_cursor2 = __esm({
         }
       }
     };
-    global6 = {
+    globalLayout12 = {
       rootInstructionPath: CURSOR_GENERAL_RULE,
       outputFamilies: [
         {
@@ -11009,18 +11157,13 @@ var init_cursor2 = __esm({
           explicitPaths: [CURSOR_COMPAT_AGENTS, CURSOR_DOT_CURSOR_AGENTS]
         }
       ],
-      skillDir: CURSOR_GLOBAL_SKILLS_DIR,
+      skillDir: CURSOR_SKILLS_DIR,
       managedOutputs: {
-        dirs: [
-          CURSOR_RULES_DIR,
-          CURSOR_COMMANDS_DIR,
-          CURSOR_GLOBAL_AGENTS_DIR,
-          CURSOR_GLOBAL_SKILLS_DIR
-        ],
+        dirs: [CURSOR_RULES_DIR, CURSOR_COMMANDS_DIR, CURSOR_AGENTS_DIR, CURSOR_SKILLS_DIR],
         files: [
           CURSOR_GENERAL_RULE,
           CURSOR_DOT_CURSOR_AGENTS,
-          CURSOR_GLOBAL_MCP_EXPORT,
+          CURSOR_MCP,
           CURSOR_HOOKS,
           CURSOR_IGNORE,
           CURSOR_GLOBAL_USER_RULES
@@ -11049,7 +11192,7 @@ var init_cursor2 = __esm({
           return `${CURSOR_COMMANDS_DIR}/${name}.md`;
         },
         agentPath(name, _config) {
-          return `${CURSOR_GLOBAL_AGENTS_DIR}/${name}.md`;
+          return `${CURSOR_AGENTS_DIR}/${name}.md`;
         }
       }
     };
@@ -11101,11 +11244,11 @@ var init_cursor2 = __esm({
           CURSOR_HOOKS,
           CURSOR_IGNORE,
           CURSOR_SKILLS_DIR,
-          CURSOR_GLOBAL_AGENTS_DIR,
+          CURSOR_AGENTS_DIR,
           CURSOR_COMMANDS_DIR,
           CURSOR_GLOBAL_USER_RULES
         ],
-        layout: global6
+        layout: globalLayout12
       },
       importer: {
         // Project-only declarable features. Rules/mcp/skills/settings/ignore stay
@@ -11264,7 +11407,7 @@ var init_lint10 = __esm({
 });
 
 // src/targets/deepagents-cli/index.ts
-var target13, project13, globalLayout7, capabilities5, globalCapabilities11, descriptor13;
+var target13, project13, globalLayout13, capabilities5, globalCapabilities11, descriptor13;
 var init_deepagents_cli2 = __esm({
   "src/targets/deepagents-cli/index.ts"() {
     init_command_skill();
@@ -11304,7 +11447,7 @@ var init_deepagents_cli2 = __esm({
         }
       }
     };
-    globalLayout7 = {
+    globalLayout13 = {
       rootInstructionPath: DEEPAGENTS_CLI_GLOBAL_ROOT_FILE,
       skillDir: DEEPAGENTS_CLI_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -11375,7 +11518,7 @@ var init_deepagents_cli2 = __esm({
       globalSupport: {
         capabilities: globalCapabilities11,
         detectionPaths: [DEEPAGENTS_CLI_GLOBAL_ROOT_FILE, DEEPAGENTS_CLI_GLOBAL_MCP_FILE],
-        layout: globalLayout7
+        layout: globalLayout13
       },
       importer: {
         rules: {
@@ -11597,7 +11740,7 @@ var init_lint11 = __esm({
 });
 
 // src/targets/factory-droid/index.ts
-var target14, project14, globalLayout8, capabilities6, descriptor14;
+var target14, project14, globalLayout14, capabilities6, descriptor14;
 var init_factory_droid2 = __esm({
   "src/targets/factory-droid/index.ts"() {
     init_generator16();
@@ -11636,7 +11779,7 @@ var init_factory_droid2 = __esm({
         }
       }
     };
-    globalLayout8 = {
+    globalLayout14 = {
       rootInstructionPath: FACTORY_DROID_GLOBAL_ROOT_FILE,
       skillDir: FACTORY_DROID_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -11703,7 +11846,7 @@ var init_factory_droid2 = __esm({
           FACTORY_DROID_GLOBAL_MCP_FILE,
           FACTORY_DROID_GLOBAL_DROIDS_DIR
         ],
-        layout: globalLayout8
+        layout: globalLayout14
       },
       importer: {
         rules: {
@@ -12646,7 +12789,7 @@ var init_scoped_settings_emit = __esm({
 });
 
 // src/targets/gemini-cli/index.ts
-var target15, project15, global7, globalCapabilities12, descriptor15;
+var target15, project15, globalLayout15, globalCapabilities12, descriptor15;
 var init_gemini_cli2 = __esm({
   "src/targets/gemini-cli/index.ts"() {
     init_generator18();
@@ -12716,7 +12859,7 @@ var init_gemini_cli2 = __esm({
         }
       }
     };
-    global7 = {
+    globalLayout15 = {
       rootInstructionPath: GEMINI_GLOBAL_ROOT,
       outputFamilies: [
         { id: "compat-agents", kind: "additional", explicitPaths: [GEMINI_GLOBAL_COMPAT_AGENTS] }
@@ -12827,7 +12970,7 @@ var init_gemini_cli2 = __esm({
           GEMINI_GLOBAL_SKILLS_DIR,
           GEMINI_GLOBAL_AGENTS_DIR
         ],
-        layout: global7
+        layout: globalLayout15
       },
       importer: {
         rules: {
@@ -12848,7 +12991,8 @@ var init_gemini_cli2 = __esm({
         }
       },
       buildImportPaths: buildGeminiCliImportPaths,
-      detectionPaths: ["GEMINI.md", ".gemini"]
+      detectionPaths: ["GEMINI.md", ".gemini"],
+      conversionDefaults: { agentsToSkills: false }
     };
   }
 });
@@ -12975,7 +13119,7 @@ var init_lint13 = __esm({
 });
 
 // src/targets/goose/index.ts
-var target16, project16, globalLayout9, capabilities7, descriptor16;
+var target16, project16, globalLayout16, capabilities7, descriptor16;
 var init_goose2 = __esm({
   "src/targets/goose/index.ts"() {
     init_command_skill();
@@ -13016,7 +13160,7 @@ var init_goose2 = __esm({
         }
       }
     };
-    globalLayout9 = {
+    globalLayout16 = {
       rootInstructionPath: GOOSE_GLOBAL_ROOT_FILE,
       skillDir: GOOSE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -13026,9 +13170,6 @@ var init_goose2 = __esm({
       rewriteGeneratedPath(path) {
         if (path === GOOSE_ROOT_FILE) return GOOSE_GLOBAL_ROOT_FILE;
         if (path === GOOSE_IGNORE) return GOOSE_GLOBAL_IGNORE;
-        if (path.startsWith(`${GOOSE_SKILLS_DIR}/`)) {
-          return path;
-        }
         return path;
       },
       mirrorGlobalPath(path, activeTargets) {
@@ -13079,7 +13220,7 @@ var init_goose2 = __esm({
       globalSupport: {
         capabilities: capabilities7,
         detectionPaths: [GOOSE_GLOBAL_ROOT_FILE, GOOSE_GLOBAL_IGNORE, GOOSE_GLOBAL_SKILLS_DIR],
-        layout: globalLayout9
+        layout: globalLayout16
       },
       importer: {
         rules: {
@@ -13108,7 +13249,8 @@ var init_goose2 = __esm({
         ".agents/skills/": "consumer"
       },
       buildImportPaths: buildGooseImportPaths,
-      detectionPaths: [GOOSE_ROOT_FILE, GOOSE_IGNORE]
+      detectionPaths: [GOOSE_ROOT_FILE, GOOSE_IGNORE],
+      conversionDefaults: { commandsToSkills: true, agentsToSkills: true }
     };
   }
 });
@@ -13504,7 +13646,7 @@ var init_lint15 = __esm({
 });
 
 // src/targets/junie/index.ts
-var target18, project18, global8, globalCapabilities13, descriptor18;
+var target18, project18, globalLayout17, globalCapabilities13, descriptor18;
 var init_junie2 = __esm({
   "src/targets/junie/index.ts"() {
     init_generator21();
@@ -13544,7 +13686,7 @@ var init_junie2 = __esm({
         }
       }
     };
-    global8 = {
+    globalLayout17 = {
       rootInstructionPath: JUNIE_GLOBAL_AGENTS_MD,
       renderPrimaryRootInstruction: renderJunieGlobalInstructions,
       skillDir: JUNIE_GLOBAL_SKILLS_DIR,
@@ -13642,7 +13784,7 @@ var init_junie2 = __esm({
           JUNIE_GLOBAL_COMMANDS_DIR,
           JUNIE_GLOBAL_MCP_FILE
         ],
-        layout: global8
+        layout: globalLayout17
       },
       importer: {
         rules: {
@@ -14039,7 +14181,7 @@ var init_lint16 = __esm({
 });
 
 // src/targets/kilo-code/index.ts
-var target19, project19, globalLayout10, capabilities9, descriptor19;
+var target19, project19, globalLayout18, capabilities9, descriptor19;
 var init_kilo_code2 = __esm({
   "src/targets/kilo-code/index.ts"() {
     init_generator22();
@@ -14080,7 +14222,7 @@ var init_kilo_code2 = __esm({
         }
       }
     };
-    globalLayout10 = {
+    globalLayout18 = {
       rootInstructionPath: KILO_CODE_GLOBAL_AGENTS_MD,
       skillDir: KILO_CODE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -14151,7 +14293,7 @@ var init_kilo_code2 = __esm({
           KILO_CODE_GLOBAL_MCP_FILE,
           KILO_CODE_GLOBAL_IGNORE
         ],
-        layout: globalLayout10
+        layout: globalLayout18
       },
       importer: {
         rules: [
@@ -14561,7 +14703,7 @@ var init_lint17 = __esm({
 });
 
 // src/targets/kiro/index.ts
-var target20, project20, global9, globalCapabilities14, descriptor20;
+var target20, project20, globalLayout19, globalCapabilities14, descriptor20;
 var init_kiro2 = __esm({
   "src/targets/kiro/index.ts"() {
     init_command_skill();
@@ -14603,7 +14745,7 @@ var init_kiro2 = __esm({
         }
       }
     };
-    global9 = {
+    globalLayout19 = {
       rootInstructionPath: KIRO_GLOBAL_STEERING_AGENTS_MD,
       skillDir: KIRO_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -14702,7 +14844,7 @@ var init_kiro2 = __esm({
           KIRO_GLOBAL_MCP_FILE,
           KIRO_GLOBAL_IGNORE
         ],
-        layout: global9
+        layout: globalLayout19
       },
       importer: {
         agents: {
@@ -14736,7 +14878,8 @@ var init_kiro2 = __esm({
         KIRO_HOOKS_DIR,
         KIRO_MCP_FILE,
         KIRO_IGNORE
-      ]
+      ],
+      conversionDefaults: { commandsToSkills: true }
     };
   }
 });
@@ -15035,7 +15178,7 @@ var init_lint18 = __esm({
 });
 
 // src/targets/opencode/index.ts
-var target21, project21, globalLayout11, capabilities10, descriptor21;
+var target21, project21, globalLayout20, capabilities10, descriptor21;
 var init_opencode2 = __esm({
   "src/targets/opencode/index.ts"() {
     init_generator24();
@@ -15075,7 +15218,7 @@ var init_opencode2 = __esm({
         }
       }
     };
-    globalLayout11 = {
+    globalLayout20 = {
       rootInstructionPath: OPENCODE_GLOBAL_AGENTS_MD,
       skillDir: OPENCODE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -15147,7 +15290,7 @@ var init_opencode2 = __esm({
           OPENCODE_GLOBAL_SKILLS_DIR,
           OPENCODE_GLOBAL_CONFIG_FILE
         ],
-        layout: globalLayout11
+        layout: globalLayout20
       },
       importer: {
         rules: [
@@ -15340,7 +15483,7 @@ var init_lint19 = __esm({
 });
 
 // src/targets/pi-agent/index.ts
-var target22, project22, globalLayout12, capabilities11, descriptor22;
+var target22, project22, globalLayout21, capabilities11, descriptor22;
 var init_pi_agent2 = __esm({
   "src/targets/pi-agent/index.ts"() {
     init_command_skill();
@@ -15380,7 +15523,7 @@ var init_pi_agent2 = __esm({
         }
       }
     };
-    globalLayout12 = {
+    globalLayout21 = {
       rootInstructionPath: PI_AGENT_GLOBAL_ROOT_FILE,
       skillDir: PI_AGENT_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -15443,7 +15586,7 @@ var init_pi_agent2 = __esm({
       globalSupport: {
         capabilities: capabilities11,
         detectionPaths: [PI_AGENT_GLOBAL_ROOT_FILE],
-        layout: globalLayout12
+        layout: globalLayout21
       },
       importer: {
         rules: {
@@ -15589,7 +15732,7 @@ var init_linter23 = __esm({
 });
 
 // src/targets/qwen-code/index.ts
-var target23, project23, globalLayout13, capabilities12, globalCapabilities15, descriptor23;
+var target23, project23, globalLayout22, capabilities12, globalCapabilities15, descriptor23;
 var init_qwen_code2 = __esm({
   "src/targets/qwen-code/index.ts"() {
     init_generator26();
@@ -15628,7 +15771,7 @@ var init_qwen_code2 = __esm({
         }
       }
     };
-    globalLayout13 = {
+    globalLayout22 = {
       rootInstructionPath: QWEN_GLOBAL_ROOT,
       skillDir: QWEN_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -15709,7 +15852,7 @@ var init_qwen_code2 = __esm({
           QWEN_GLOBAL_AGENTS_DIR,
           QWEN_GLOBAL_SKILLS_DIR
         ],
-        layout: globalLayout13
+        layout: globalLayout22
       },
       importer: {
         rules: [
@@ -16198,7 +16341,7 @@ function computeStatus5(existing, content) {
   if (existing !== content) return "updated";
   return "unchanged";
 }
-var target25, project25, generateRooGlobalExtras, global10, globalCapabilities16, descriptor25;
+var target25, project25, generateRooGlobalExtras, globalLayout23, globalCapabilities16, descriptor25;
 var init_roo_code2 = __esm({
   "src/targets/roo-code/index.ts"() {
     init_fs();
@@ -16261,7 +16404,7 @@ var init_roo_code2 = __esm({
         }
       ];
     };
-    global10 = {
+    globalLayout23 = {
       rootInstructionPath: ROO_CODE_GLOBAL_AGENTS_MD,
       skillDir: ROO_CODE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -16362,7 +16505,7 @@ var init_roo_code2 = __esm({
           ROO_CODE_GLOBAL_AGENTS_MD,
           ROO_CODE_GLOBAL_MODES_FILE
         ],
-        layout: global10,
+        layout: globalLayout23,
         scopeExtras: generateRooGlobalExtras
       },
       importer: {
@@ -16554,7 +16697,7 @@ var init_lint21 = __esm({
 });
 
 // src/targets/rovodev/index.ts
-var target26, project26, globalLayout14, capabilities14, globalCapabilities17, descriptor26;
+var target26, project26, globalLayout24, capabilities14, globalCapabilities17, descriptor26;
 var init_rovodev2 = __esm({
   "src/targets/rovodev/index.ts"() {
     init_command_skill();
@@ -16595,7 +16738,7 @@ var init_rovodev2 = __esm({
         }
       }
     };
-    globalLayout14 = {
+    globalLayout24 = {
       rootInstructionPath: ROVODEV_GLOBAL_ROOT_FILE,
       skillDir: ROVODEV_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -16669,7 +16812,7 @@ var init_rovodev2 = __esm({
       globalSupport: {
         capabilities: globalCapabilities17,
         detectionPaths: [ROVODEV_GLOBAL_DIR, ROVODEV_GLOBAL_ROOT_FILE, ROVODEV_GLOBAL_SKILLS_DIR],
-        layout: globalLayout14
+        layout: globalLayout24
       },
       importer: {
         rules: {
@@ -16838,7 +16981,7 @@ var init_linter27 = __esm({
 });
 
 // src/targets/trae/index.ts
-var target27, project27, global11, globalCapabilities18, descriptor27;
+var target27, project27, globalLayout25, globalCapabilities18, descriptor27;
 var init_trae2 = __esm({
   "src/targets/trae/index.ts"() {
     init_generator30();
@@ -16875,7 +17018,7 @@ var init_trae2 = __esm({
         }
       }
     };
-    global11 = {
+    globalLayout25 = {
       rootInstructionPath: TRAE_GLOBAL_ROOT_RULE,
       skillDir: TRAE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -16958,7 +17101,7 @@ var init_trae2 = __esm({
           TRAE_GLOBAL_SKILLS_DIR,
           TRAE_GLOBAL_MCP_FILE
         ],
-        layout: global11
+        layout: globalLayout25
       },
       importer: {
         mcp: {
@@ -17105,7 +17248,7 @@ var init_lint22 = __esm({
 });
 
 // src/targets/warp/index.ts
-var target28, project28, globalLayout15, capabilities15, globalCapabilities19, descriptor28;
+var target28, project28, globalLayout26, capabilities15, globalCapabilities19, descriptor28;
 var init_warp2 = __esm({
   "src/targets/warp/index.ts"() {
     init_command_skill();
@@ -17146,7 +17289,7 @@ var init_warp2 = __esm({
         }
       }
     };
-    globalLayout15 = {
+    globalLayout26 = {
       rootInstructionPath: void 0,
       skillDir: WARP_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -17164,7 +17307,7 @@ var init_warp2 = __esm({
       },
       paths: {
         rulePath() {
-          return WARP_GLOBAL_SKILLS_DIR;
+          return null;
         },
         commandPath(name) {
           return `${WARP_GLOBAL_SKILLS_DIR}/${commandSkillDirName(name)}/SKILL.md`;
@@ -17218,7 +17361,7 @@ var init_warp2 = __esm({
       globalSupport: {
         capabilities: globalCapabilities19,
         detectionPaths: [WARP_GLOBAL_SKILLS_DIR],
-        layout: globalLayout15
+        layout: globalLayout26
       },
       importer: {
         rules: {
@@ -17242,7 +17385,8 @@ var init_warp2 = __esm({
         }
       },
       buildImportPaths: buildWarpImportPaths,
-      detectionPaths: [WARP_ROOT_FILE, WARP_LEGACY_ROOT_FILE, WARP_MCP_FILE]
+      detectionPaths: [WARP_ROOT_FILE, WARP_LEGACY_ROOT_FILE, WARP_MCP_FILE],
+      conversionDefaults: { commandsToSkills: true, agentsToSkills: true }
     };
   }
 });
@@ -17535,49 +17679,22 @@ var init_importer_workflows = __esm({
     init_constants31();
   }
 });
+
+// src/targets/windsurf/skills-adapter.ts
 async function importSkills4(projectRoot, results, normalize, skillsRelDir = WINDSURF_SKILLS_DIR) {
-  const skillsDir = join(projectRoot, skillsRelDir);
-  const directorySkills = await findDirectorySkills(skillsDir);
   const options = {
     projectRoot,
-    sourceSkillsDir: skillsRelDir,
     destCanonicalSkillsDir: WINDSURF_CANONICAL_SKILLS_DIR,
     targetName: "windsurf",
     normalize,
     results
   };
-  for (const [skillName, skillDir] of directorySkills) {
-    const skillMdPath = join(skillDir, "SKILL.md");
-    const content = await readFileSafe(skillMdPath);
-    if (!content) continue;
-    const rawParsed = parseFrontmatter(content);
-    const projectedAgent = parseProjectedAgentSkillFrontmatter(rawParsed.frontmatter, skillName);
-    if (projectedAgent) {
-      await removePathIfExists(join(projectRoot, WINDSURF_CANONICAL_SKILLS_DIR, skillName));
-      const destAgentsDir = join(projectRoot, WINDSURF_CANONICAL_AGENTS_DIR);
-      await mkdirp(destAgentsDir);
-      const agentPath = join(destAgentsDir, `${projectedAgent.name}.md`);
-      await writeFileAtomic(
-        agentPath,
-        serializeImportedAgent(projectedAgent, normalize(rawParsed.body, skillMdPath, agentPath))
-      );
-      results.push({
-        fromTool: "windsurf",
-        fromPath: skillMdPath,
-        toPath: `${WINDSURF_CANONICAL_AGENTS_DIR}/${projectedAgent.name}.md`,
-        feature: "agents"
-      });
-      continue;
-    }
-    await importDirectorySkill(skillName, skillDir, options);
-  }
+  await importSkillsDirectory([skillsRelDir], options, [
+    projectedAgentRecognizer({ canonicalAgentsDir: WINDSURF_CANONICAL_AGENTS_DIR })
+  ]);
 }
 var init_skills_adapter5 = __esm({
   "src/targets/windsurf/skills-adapter.ts"() {
-    init_fs();
-    init_markdown();
-    init_projected_agent_skill();
-    init_scoped_agents_import();
     init_skill_import_pipeline();
     init_constants31();
   }
@@ -17894,7 +18011,7 @@ function directoryScopedRuleDir2(globs) {
   if (dirs.length !== globs.length) return null;
   return dirs.every((dir) => dir === dirs[0]) ? dirs[0] : null;
 }
-var target29, project29, global12, globalCapabilities20, descriptor29;
+var target29, project29, globalLayout27, globalCapabilities20, descriptor29;
 var init_windsurf2 = __esm({
   "src/targets/windsurf/index.ts"() {
     init_generator33();
@@ -17948,7 +18065,7 @@ var init_windsurf2 = __esm({
         }
       }
     };
-    global12 = {
+    globalLayout27 = {
       rootInstructionPath: WINDSURF_GLOBAL_RULES,
       skillDir: WINDSURF_GLOBAL_SKILLS_DIR,
       managedOutputs: {
@@ -18052,10 +18169,11 @@ var init_windsurf2 = __esm({
           WINDSURF_GLOBAL_MCP_FILE,
           WINDSURF_GLOBAL_IGNORE
         ],
-        layout: global12
+        layout: globalLayout27
       },
       buildImportPaths: buildWindsurfImportPaths,
-      detectionPaths: [".windsurfrules", ".windsurf"]
+      detectionPaths: [".windsurfrules", ".windsurf"],
+      conversionDefaults: { agentsToSkills: true }
     };
   }
 });
@@ -18216,7 +18334,7 @@ function mergeZedSettings(existing, newContent) {
   }
   return JSON.stringify(base, null, 2);
 }
-var target30, project30, globalLayout16, capabilities16, globalCapabilities21, descriptor30;
+var target30, project30, globalLayout28, capabilities16, globalCapabilities21, descriptor30;
 var init_zed2 = __esm({
   "src/targets/zed/index.ts"() {
     init_generator34();
@@ -18249,7 +18367,7 @@ var init_zed2 = __esm({
         }
       }
     };
-    globalLayout16 = {
+    globalLayout28 = {
       rootInstructionPath: void 0,
       managedOutputs: {
         dirs: [],
@@ -18314,7 +18432,7 @@ var init_zed2 = __esm({
       globalSupport: {
         capabilities: globalCapabilities21,
         detectionPaths: [ZED_GLOBAL_SETTINGS_FILE],
-        layout: globalLayout16
+        layout: globalLayout28
       },
       importer: {
         rules: {