agentsmesh 0.8.0 → 0.10.0

package/dist/targets.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
-import { readFile, readdir, stat, mkdir, lstat, writeFile, rename, rm, realpath, access } from 'fs/promises';
-import { basename, join, relative, normalize, dirname, extname, win32, isAbsolute, posix } from 'path';
+import { readFile, readdir, stat, mkdir, lstat, unlink, writeFile, rename, rm, realpath, access } from 'fs/promises';
+import { basename, join, win32, posix, relative, dirname, extname } from 'path';
 import { existsSync, realpathSync, constants, statSync } from 'fs';
 import { stringify, parse } from 'yaml';
 import { parse as parse$1 } from 'smol-toml';
@@ -11,35 +11,35 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __export = (target13, all) => {
+var __export = (target14, all) => {
   for (var name in all)
-    __defProp(target13, name, { get: all[name], enumerable: true });
+    __defProp(target14, name, { get: all[name], enumerable: true });
 };
 
 // src/config/core/conversions.ts
-function usesCommandSkillProjection(target13) {
-  return Object.prototype.hasOwnProperty.call(DEFAULT_COMMANDS_TO_SKILLS, target13);
+function usesCommandSkillProjection(target14) {
+  return Object.prototype.hasOwnProperty.call(DEFAULT_COMMANDS_TO_SKILLS, target14);
 }
-function usesAgentSkillProjection(target13) {
-  return Object.prototype.hasOwnProperty.call(DEFAULT_AGENTS_TO_SKILLS, target13);
+function usesAgentSkillProjection(target14) {
+  return Object.prototype.hasOwnProperty.call(DEFAULT_AGENTS_TO_SKILLS, target14);
 }
 function resolveConversionValue(value, scope) {
   if (value === void 0) return void 0;
   if (typeof value === "boolean") return value;
   return value[scope];
 }
-function shouldConvertCommandsToSkills(config, target13, defaultEnabled, scope = "project") {
-  const raw = config.conversions?.commands_to_skills?.[target13];
+function shouldConvertCommandsToSkills(config, target14, defaultEnabled, scope = "project") {
+  const raw = config.conversions?.commands_to_skills?.[target14];
   const configVal = resolveConversionValue(raw, scope);
   if (configVal !== void 0) return configVal;
-  if (usesCommandSkillProjection(target13)) return DEFAULT_COMMANDS_TO_SKILLS[target13];
+  if (usesCommandSkillProjection(target14)) return DEFAULT_COMMANDS_TO_SKILLS[target14];
   return defaultEnabled ?? false;
 }
-function shouldConvertAgentsToSkills(config, target13, defaultEnabled, scope = "project") {
-  const raw = config.conversions?.agents_to_skills?.[target13];
+function shouldConvertAgentsToSkills(config, target14, defaultEnabled, scope = "project") {
+  const raw = config.conversions?.agents_to_skills?.[target14];
   const configVal = resolveConversionValue(raw, scope);
   if (configVal !== void 0) return configVal;
-  if (usesAgentSkillProjection(target13)) return DEFAULT_AGENTS_TO_SKILLS[target13];
+  if (usesAgentSkillProjection(target14)) return DEFAULT_AGENTS_TO_SKILLS[target14];
   return defaultEnabled ?? false;
 }
 var DEFAULT_COMMANDS_TO_SKILLS, DEFAULT_AGENTS_TO_SKILLS;
@@ -92,12 +92,12 @@ function capabilityLevel(capability) {
 function canUseScopedSettings(feature) {
   return settingsBackedFeatures.includes(feature);
 }
-function validateCapabilityImplementations(descriptor13, capabilities, ctx, pathPrefix) {
+function validateCapabilityImplementations(descriptor14, capabilities2, ctx, pathPrefix) {
   for (const requirement of generatorRequirements) {
-    const level = capabilityLevel(capabilities[requirement.feature]);
+    const level = capabilityLevel(capabilities2[requirement.feature]);
     if (level === "none") continue;
-    const hasGenerator = typeof descriptor13.generators[requirement.generator] === "function";
-    const hasSettingsEmitter = canUseScopedSettings(requirement.feature) && typeof descriptor13.emitScopedSettings === "function";
+    const hasGenerator = typeof descriptor14.generators[requirement.generator] === "function";
+    const hasSettingsEmitter = canUseScopedSettings(requirement.feature) && typeof descriptor14.emitScopedSettings === "function";
     if (hasGenerator || hasSettingsEmitter) continue;
     ctx.addIssue({
       code: "custom",
@@ -212,8 +212,8 @@ function builtinDescriptors() {
   }
   return _builtinDescriptors;
 }
-function registerTargetDescriptor(descriptor13) {
-  const validated = validateDescriptor(descriptor13);
+function registerTargetDescriptor(descriptor14) {
+  const validated = validateDescriptor(descriptor14);
   descriptorRegistry.set(validated.id, validated);
 }
 function getDescriptor(name) {
@@ -234,11 +234,11 @@ var init_registry = __esm({
 // src/targets/catalog/shared-artifact-owner.ts
 function findSharedArtifactOwnershipConflicts(descriptors) {
   const owners = [];
-  for (const descriptor13 of descriptors) {
-    if (!descriptor13.sharedArtifacts) continue;
-    for (const [prefix, role] of Object.entries(descriptor13.sharedArtifacts)) {
+  for (const descriptor14 of descriptors) {
+    if (!descriptor14.sharedArtifacts) continue;
+    for (const [prefix, role] of Object.entries(descriptor14.sharedArtifacts)) {
       if (role !== "owner") continue;
-      owners.push({ targetId: descriptor13.id, prefix });
+      owners.push({ targetId: descriptor14.id, prefix });
     }
   }
   const conflicts = [];
@@ -289,6 +289,7 @@ var init_builtin_target_ids_generated = __esm({
       "cursor",
       "gemini-cli",
       "junie",
+      "kilo-code",
       "kiro",
       "roo-code",
       "windsurf"
@@ -364,6 +365,11 @@ async function writeFileAtomic(path, content) {
         { errnoCode: "EISDIR" }
       );
     }
+    if (info.isSymbolicLink()) {
+      await unlink(path).catch((e) => {
+        if (e.code !== "ENOENT") throw e;
+      });
+    }
   } catch (err) {
     if (err instanceof FileSystemError) throw err;
     const e = err;
@@ -372,7 +378,15 @@ async function writeFileAtomic(path, content) {
   const tmpPath = `${path}.tmp`;
   const payload = shouldNormalizeLineEndings(path) ? normalizeLineEndings(content) : content;
   try {
-    await writeFile(tmpPath, payload, "utf-8");
+    try {
+      const tmpInfo = await lstat(tmpPath);
+      if (tmpInfo.isSymbolicLink()) {
+        await unlink(tmpPath);
+      }
+    } catch (tmpErr) {
+      if (tmpErr.code !== "ENOENT") throw tmpErr;
+    }
+    await writeFile(tmpPath, payload, { encoding: "utf-8", flag: "w" });
     await rename(tmpPath, path);
   } catch (err) {
     await rm(tmpPath, { force: true }).catch(() => {
@@ -980,21 +994,6 @@ var init_generator = __esm({
     init_constants();
   }
 });
-
-// src/core/reference/import-map.ts
-async function buildImportReferenceMap(target13, projectRoot, scope = "project") {
-  const refs = /* @__PURE__ */ new Map();
-  const def = getDescriptor(target13);
-  if (def) {
-    await def.buildImportPaths(refs, projectRoot, scope);
-  }
-  return refs;
-}
-var init_import_map = __esm({
-  "src/core/reference/import-map.ts"() {
-    init_registry();
-  }
-});
 function pathApi(projectRoot) {
   return projectRoot.includes("\\") || WINDOWS_ABSOLUTE_PATH.test(projectRoot) ? win32 : posix;
 }
@@ -1033,13 +1032,28 @@ var init_path_helpers = __esm({
   }
 });
 
+// src/core/reference/import-map.ts
+async function buildImportReferenceMap(target14, projectRoot, scope = "project") {
+  const refs = /* @__PURE__ */ new Map();
+  const def = getDescriptor(target14);
+  if (def) {
+    await def.buildImportPaths(refs, projectRoot, scope);
+  }
+  return refs;
+}
+var init_import_map = __esm({
+  "src/core/reference/import-map.ts"() {
+    init_registry();
+  }
+});
+
 // src/core/reference/link-format-registry.ts
-function topLevelDotfilePrefixes(descriptor13) {
-  const layouts = [descriptor13.project, descriptor13.globalSupport?.layout].filter(
+function topLevelDotfilePrefixes(descriptor14) {
+  const layouts = [descriptor14.project, descriptor14.globalSupport?.layout].filter(
     (l) => l !== void 0
   );
   const candidates = [
-    ...descriptor13.detectionPaths,
+    ...descriptor14.detectionPaths,
     ...layouts.flatMap((l) => l.managedOutputs?.dirs ?? []),
     ...layouts.flatMap((l) => l.managedOutputs?.files ?? [])
   ];
@@ -1052,8 +1066,8 @@ function topLevelDotfilePrefixes(descriptor13) {
 }
 function buildDefaultRootRelativePrefixes() {
   const set = /* @__PURE__ */ new Set([".agentsmesh/"]);
-  for (const descriptor13 of BUILTIN_TARGETS) {
-    for (const prefix of topLevelDotfilePrefixes(descriptor13)) set.add(prefix);
+  for (const descriptor14 of BUILTIN_TARGETS) {
+    for (const prefix of topLevelDotfilePrefixes(descriptor14)) set.add(prefix);
   }
   return Array.from(set);
 }
@@ -1124,7 +1138,7 @@ function resolveProjectPath(token, projectRoot, sourceFile) {
     }
     return [windowsToken];
   }
-  if (isAbsolute(token)) {
+  if (api.isAbsolute(token)) {
     const absoluteToken = normalizeForProject(projectRoot, token);
     if (absoluteToken.startsWith(normalizedProjectRoot) || existsSync(token))
       return [absoluteToken];
@@ -1230,9 +1244,14 @@ var init_link_rebaser_helpers = __esm({
     LINE_NUMBER_SUFFIX = /(?::(\d+)){1,2}$/;
   }
 });
+
+// src/core/reference/link-rebaser-formatting.ts
 function isReadingContext(context) {
   return context === void 0 || context.role === "inline-code" || context.role === "bracketed" || context.role === "quoted" || context.role === "at-prefix" || context.role === "bracket-label" || context.role === "bare-prose";
 }
+function isReadingContextOptions(options) {
+  return isReadingContext(options.tokenContext);
+}
 function isUnderProjectRoot(projectRoot, absolutePath) {
   const api = pathApi(projectRoot);
   const root = normalizeForProject(projectRoot, projectRoot);
@@ -1272,11 +1291,6 @@ function toProjectRootRelative(projectRoot, absolutePath, keepSlash) {
   const rewritten = relPath.length > 0 ? relPath : ".";
   return keepSlash && !rewritten.endsWith("/") ? `${rewritten}/` : rewritten;
 }
-function shouldPreserveAgentsMeshAnchor(_projectRoot, _destinationFile, options) {
-  if (!isReadingContext(options.tokenContext)) return false;
-  if (options.originalToken === void 0) return false;
-  return normalizeSeparators(options.originalToken).startsWith(".agentsmesh/");
-}
 function toProjectRootReference(projectRoot, absolutePath, keepSlash) {
   const formatted = toProjectRootRelative(projectRoot, absolutePath, keepSlash);
   if (formatted === null) return null;
@@ -1286,21 +1300,21 @@ function formatLinkPathForDestinationLegacy(projectRoot, destinationFile, absolu
   const api = pathApi(projectRoot);
   const root = normalizeForProject(projectRoot, projectRoot);
   const destFile = normalizeForProject(projectRoot, destinationFile);
-  const target13 = normalizeForProject(projectRoot, absoluteTargetPath);
-  if (!isUnderProjectRoot(projectRoot, target13)) {
-    return toProjectRootReference(projectRoot, target13, keepSlash)?.text ?? null;
+  const target14 = normalizeForProject(projectRoot, absoluteTargetPath);
+  if (!isUnderProjectRoot(projectRoot, target14)) {
+    return toProjectRootReference(projectRoot, target14, keepSlash)?.text ?? null;
   }
-  const destDir = normalizeForProject(projectRoot, dirname(destFile));
+  const destDir = normalizeForProject(projectRoot, api.dirname(destFile));
   if (!isUnderProjectRoot(projectRoot, destDir) && destDir !== root) {
-    return toProjectRootReference(projectRoot, target13, keepSlash)?.text ?? null;
+    return toProjectRootReference(projectRoot, target14, keepSlash)?.text ?? null;
   }
-  let rel2 = api.relative(destDir, target13).replace(/\\/g, "/");
+  let rel2 = api.relative(destDir, target14).replace(/\\/g, "/");
   if (api.isAbsolute(rel2) || WINDOWS_ABSOLUTE_PATH.test(rel2)) {
-    return toProjectRootRelative(projectRoot, target13, keepSlash);
+    return toProjectRootRelative(projectRoot, target14, keepSlash);
   }
   const joined = normalizeForProject(projectRoot, api.join(destDir, rel2));
   if (!isUnderProjectRoot(projectRoot, joined)) {
-    return toProjectRootRelative(projectRoot, target13, keepSlash);
+    return toProjectRootRelative(projectRoot, target14, keepSlash);
   }
   if (rel2 === "" || rel2 === ".") {
     rel2 = ".";
@@ -1319,9 +1333,14 @@ var init_link_rebaser_formatting = __esm({
 // src/core/reference/link-rebaser-output.ts
 function formatLinkPathForDestination(projectRoot, destinationFile, absoluteTargetPath, keepSlash, options = {}) {
   const scope = options.scope ?? "project";
-  const target13 = normalizeForProject(projectRoot, absoluteTargetPath);
-  if (shouldPreserveAgentsMeshAnchor(projectRoot, destinationFile, options)) {
-    return normalizeSeparators(options.originalToken ?? "");
+  const target14 = normalizeForProject(projectRoot, absoluteTargetPath);
+  if (isReadingContextOptions(options) && isUnderAgentsMesh(projectRoot, destinationFile) && isUnderAgentsMesh(projectRoot, target14)) {
+    const api = pathApi(projectRoot);
+    const root = normalizeForProject(projectRoot, projectRoot);
+    const rel2 = api.relative(root, target14).replace(/\\/g, "/");
+    if (!rel2.startsWith("..") && rel2.length > 0) {
+      return keepSlash && !rel2.endsWith("/") ? `${rel2}/` : rel2;
+    }
   }
   if (options.forceRelative) {
     return formatLinkPathForDestinationLegacy(
@@ -1333,10 +1352,10 @@ function formatLinkPathForDestination(projectRoot, destinationFile, absoluteTarg
     );
   }
   if (scope === "global" && !isUnderAgentsMesh(projectRoot, destinationFile)) {
-    return toProjectRootReference(projectRoot, target13, keepSlash)?.text ?? null;
+    return toProjectRootReference(projectRoot, target14, keepSlash)?.text ?? null;
   }
   const meshCanonicalForShape = (() => {
-    if (isUnderAgentsMesh(projectRoot, target13)) return target13;
+    if (isUnderAgentsMesh(projectRoot, target14)) return target14;
     const logical = options.logicalMeshSourceAbsolute;
     if (logical && isUnderAgentsMesh(projectRoot, normalizeForProject(projectRoot, logical))) {
       return normalizeForProject(projectRoot, logical);
@@ -1344,9 +1363,9 @@ function formatLinkPathForDestination(projectRoot, destinationFile, absoluteTarg
     return null;
   })();
   if (!meshCanonicalForShape) {
-    return toProjectRootReference(projectRoot, target13, keepSlash)?.text ?? null;
+    return toProjectRootReference(projectRoot, target14, keepSlash)?.text ?? null;
   }
-  const treatAsDirectory = keepSlash || (options.pathIsDirectory?.(target13) ?? false);
+  const treatAsDirectory = keepSlash || (options.pathIsDirectory?.(target14) ?? false);
   if (treatAsDirectory) {
     const meshRelative = toAgentsMeshRootRelative(projectRoot, meshCanonicalForShape, keepSlash);
     if (meshRelative !== null) return meshRelative;
@@ -1370,7 +1389,7 @@ var init_link_rebaser_output = __esm({
 });
 
 // src/core/reference/link-rebaser-suffix-strip.ts
-function resolveByDestinationSuffixStrip(token, projectRoot, destinationFile, pathExists) {
+function resolveByDestinationSuffixStrip(token, projectRoot, destinationFile, pathExists2) {
   const api = pathApi(projectRoot);
   const normalizedToken = normalizeSeparators(token);
   if (!isRootRelativePathToken(normalizedToken)) return null;
@@ -1382,7 +1401,7 @@ function resolveByDestinationSuffixStrip(token, projectRoot, destinationFile, pa
     const suffix = segments.slice(i).join("/");
     const candidate = normalizeForProject(projectRoot, api.join(destDir, suffix));
     if (candidate === destFilePath) continue;
-    if (pathExists(candidate)) return candidate;
+    if (pathExists2(candidate)) return candidate;
   }
   return null;
 }
@@ -1699,22 +1718,23 @@ var init_link_rebaser = __esm({
     init_link_token_context();
   }
 });
-function pathVariants(path) {
-  const variants = [normalize(path)];
+function pathVariants(api, path) {
+  const variants = [api.normalize(path)];
   if (!existsSync(path)) return variants;
   try {
     const realPaths = [realpathSync(path), realpathSync.native(path)];
     for (const realPath of realPaths) {
-      const normalized = normalize(realPath);
+      const normalized = api.normalize(realPath);
       if (!variants.includes(normalized)) variants.push(normalized);
     }
   } catch {
   }
   return variants;
 }
-async function createImportReferenceNormalizer(target13, projectRoot, scope = "project") {
+async function createImportReferenceNormalizer(target14, projectRoot, scope = "project") {
+  const api = pathApi(projectRoot);
   const refs = /* @__PURE__ */ new Map();
-  const targets = Array.from(/* @__PURE__ */ new Set([target13, ...TARGET_IDS]));
+  const targets = Array.from(/* @__PURE__ */ new Set([target14, ...TARGET_IDS]));
   for (const candidate of targets) {
     const candidateRefs = await buildImportReferenceMap(candidate, projectRoot, scope);
     for (const [targetPath, canonicalPath] of candidateRefs.entries()) {
@@ -1723,17 +1743,17 @@ async function createImportReferenceNormalizer(target13, projectRoot, scope = "p
   }
   const artifactMap = /* @__PURE__ */ new Map();
   for (const [targetPath, canonicalPath] of refs.entries()) {
-    const canonicalAbsPath = normalize(join(projectRoot, canonicalPath));
-    for (const variant of pathVariants(join(projectRoot, targetPath))) {
+    const canonicalAbsPath = api.normalize(api.join(projectRoot, canonicalPath));
+    for (const variant of pathVariants(api, api.join(projectRoot, targetPath))) {
       artifactMap.set(variant, canonicalAbsPath);
     }
   }
   const canonicalDestAbs = /* @__PURE__ */ new Set();
   for (const canonicalPath of new Set(refs.values())) {
-    const abs = normalize(join(projectRoot, canonicalPath));
+    const abs = api.normalize(api.join(projectRoot, canonicalPath));
     canonicalDestAbs.add(abs);
-    for (const variant of pathVariants(abs)) {
-      canonicalDestAbs.add(normalize(variant));
+    for (const variant of pathVariants(api, abs)) {
+      canonicalDestAbs.add(api.normalize(variant));
     }
   }
   return (content, sourceFile, destinationFile) => rewriteFileLinks({
@@ -1743,7 +1763,7 @@ async function createImportReferenceNormalizer(target13, projectRoot, scope = "p
     destinationFile,
     translatePath: (absolutePath) => artifactMap.get(absolutePath) ?? absolutePath,
     pathExists: (absolutePath) => {
-      const normalized = normalize(absolutePath);
+      const normalized = api.normalize(absolutePath);
       return artifactMap.has(absolutePath) || artifactMap.has(normalized) || existsSync(absolutePath) || canonicalDestAbs.has(normalized);
     },
     explicitCurrentDirLinks: false,
@@ -1760,11 +1780,43 @@ async function createImportReferenceNormalizer(target13, projectRoot, scope = "p
 }
 var init_import_rewriter = __esm({
   "src/core/reference/import-rewriter.ts"() {
+    init_path_helpers();
     init_import_map();
     init_link_rebaser();
     init_target_ids();
   }
 });
+async function writeMcpWithMerge(projectRoot, canonicalPath, imported) {
+  const destPath = join(projectRoot, canonicalPath);
+  const existing = await readExistingServers(destPath);
+  const merged = { ...existing, ...imported };
+  await mkdirp(dirname(destPath));
+  await writeFileAtomic(destPath, JSON.stringify({ mcpServers: merged }, null, 2));
+}
+async function readExistingServers(path) {
+  const content = await readFileSafe(path);
+  if (content === null) return {};
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return {};
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+  const raw = parsed.mcpServers;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
+  const out = {};
+  for (const [name, value] of Object.entries(raw)) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) continue;
+    out[name] = value;
+  }
+  return out;
+}
+var init_mcp_merge = __esm({
+  "src/targets/import/mcp-merge.ts"() {
+    init_fs();
+  }
+});
 
 // src/targets/import/shared-import-helpers.ts
 function toGlobsArray(v) {
@@ -2010,18 +2062,24 @@ async function runDirectory(spec, sources, projectRoot, fromTool, normalize) {
   }
   return results;
 }
+function resolveCanonicalFilePath(spec) {
+  const filename = spec.canonicalFilename;
+  if (filename.includes("/") || filename.includes("\\")) return filename;
+  return posix.join(spec.canonicalDir, filename);
+}
 async function runFlatFile(spec, sources, projectRoot, fromTool) {
   if (!spec.canonicalFilename) {
     throw new Error(`flatFile spec for ${spec.feature} must set canonicalFilename`);
   }
+  const canonicalPath = resolveCanonicalFilePath(spec);
   for (const rel2 of sources) {
     const srcPath = join(projectRoot, rel2);
     const content = await readFileSafe(srcPath);
     if (content === null) continue;
-    const destPath = join(projectRoot, spec.canonicalFilename);
+    const destPath = join(projectRoot, canonicalPath);
     await mkdirp(dirname(destPath));
     await writeFileAtomic(destPath, content.trimEnd());
-    return [{ fromTool, fromPath: srcPath, toPath: spec.canonicalFilename, feature: spec.feature }];
+    return [{ fromTool, fromPath: srcPath, toPath: canonicalPath, feature: spec.feature }];
   }
   return [];
 }
@@ -2066,24 +2124,19 @@ async function runMcpJson(spec, sources, projectRoot, fromTool) {
   if (!spec.canonicalFilename) {
     throw new Error(`mcpJson spec for ${spec.feature} must set canonicalFilename`);
   }
+  const canonicalPath = resolveCanonicalFilePath(spec);
   for (const rel2 of sources) {
     const srcPath = join(projectRoot, rel2);
     const content = await readFileSafe(srcPath);
     if (content === null) continue;
-    const servers = parseMcpJson(content);
-    if (Object.keys(servers).length === 0) return [];
-    const destPath = join(projectRoot, spec.canonicalFilename);
-    await mkdirp(dirname(destPath));
-    await writeFileAtomic(destPath, JSON.stringify({ mcpServers: servers }, null, 2));
-    return [{ fromTool, fromPath: srcPath, toPath: spec.canonicalFilename, feature: spec.feature }];
+    const imported = parseMcpJson(content);
+    if (Object.keys(imported).length === 0) return [];
+    await writeMcpWithMerge(projectRoot, canonicalPath, imported);
+    return [{ fromTool, fromPath: srcPath, toPath: canonicalPath, feature: spec.feature }];
   }
   return [];
 }
-async function runSpec(spec, scope, projectRoot, fromTool, normalize) {
-  const primary = resolveScopedSources(spec.source, scope);
-  const fallback = resolveScopedSources(spec.fallbacks, scope);
-  const sources = primary.length > 0 ? primary : fallback;
-  if (sources.length === 0) return [];
+function dispatchSpec(spec, sources, projectRoot, fromTool, normalize) {
   switch (spec.mode) {
     case "singleFile":
       return runSingleFile(spec, sources, projectRoot, fromTool, normalize);
@@ -2095,20 +2148,33 @@ async function runSpec(spec, scope, projectRoot, fromTool, normalize) {
       return runMcpJson(spec, sources, projectRoot, fromTool);
   }
 }
+async function runSpec(spec, scope, projectRoot, fromTool, normalize) {
+  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);
+    if (results.length > 0) return results;
+  }
+  if (fallback.length > 0) {
+    return dispatchSpec(spec, fallback, projectRoot, fromTool, normalize);
+  }
+  return [];
+}
 function specsForFeature(importer, feature) {
   const value = importer[feature];
   if (!value) return [];
   if (Array.isArray(value)) return value;
   return [value];
 }
-async function runDescriptorImport(descriptor13, projectRoot, scope, options) {
-  const importer = descriptor13.importer;
+async function runDescriptorImport(descriptor14, projectRoot, scope, options) {
+  const importer = descriptor14.importer;
   if (!importer) return [];
-  const normalize = options?.normalize ?? await createImportReferenceNormalizer(descriptor13.id, projectRoot, scope);
+  const normalize = options?.normalize ?? await createImportReferenceNormalizer(descriptor14.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, descriptor13.id, normalize));
+      results.push(...await runSpec(spec, scope, projectRoot, descriptor14.id, normalize));
     }
   }
   return results;
@@ -2117,6 +2183,7 @@ var init_descriptor_import_runner = __esm({
   "src/targets/import/descriptor-import-runner.ts"() {
     init_import_rewriter();
     init_fs();
+    init_mcp_merge();
     init_markdown();
     init_shared_import_helpers();
     init_import_metadata();
@@ -2572,22 +2639,22 @@ var init_projected_agent_skill = __esm({
   }
 });
 function rel(projectRoot, absPath) {
-  return relative(projectRoot, absPath).replace(/\\/g, "/");
+  return pathApi(projectRoot).relative(projectRoot, absPath).replace(/\\/g, "/");
 }
 async function listFiles(projectRoot, dir) {
-  return readDirRecursive(join(projectRoot, dir)).catch(() => []);
+  return readDirRecursive(pathApi(projectRoot).join(projectRoot, dir)).catch(() => []);
 }
 function addDirectoryMapping(refs, from, to) {
   refs.set(from, to);
   refs.set(`${from}/`, `${to}/`);
 }
 function addAncestorMappings(refs, fromPath, toPath, stopDir) {
-  let fromDir = dirname(fromPath);
-  let toDir = dirname(toPath);
+  let fromDir = posix.dirname(fromPath);
+  let toDir = posix.dirname(toPath);
   while (fromDir !== stopDir && fromDir !== ".") {
     addDirectoryMapping(refs, fromDir, toDir);
-    fromDir = dirname(fromDir);
-    toDir = dirname(toDir);
+    fromDir = posix.dirname(fromDir);
+    toDir = posix.dirname(toDir);
   }
 }
 function addSimpleFileMapping(refs, fromPath, canonicalDir, extension) {
@@ -2631,18 +2698,18 @@ async function targetRootSegments() {
   if (targetRootSegmentsCache !== void 0) return targetRootSegmentsCache;
   const { BUILTIN_TARGETS: BUILTIN_TARGETS2 } = await Promise.resolve().then(() => (init_builtin_targets(), builtin_targets_exports));
   const roots = /* @__PURE__ */ new Set();
-  for (const descriptor13 of BUILTIN_TARGETS2) {
+  for (const descriptor14 of BUILTIN_TARGETS2) {
     for (const path of [
-      descriptor13.project.rootInstructionPath,
-      descriptor13.project.skillDir,
-      ...descriptor13.project.managedOutputs?.dirs ?? [],
-      ...descriptor13.project.managedOutputs?.files ?? [],
-      ...descriptor13.detectionPaths,
-      descriptor13.globalSupport?.layout.rootInstructionPath,
-      descriptor13.globalSupport?.layout.skillDir,
-      ...descriptor13.globalSupport?.layout.managedOutputs?.dirs ?? [],
-      ...descriptor13.globalSupport?.layout.managedOutputs?.files ?? [],
-      ...descriptor13.globalSupport?.detectionPaths ?? []
+      descriptor14.project.rootInstructionPath,
+      descriptor14.project.skillDir,
+      ...descriptor14.project.managedOutputs?.dirs ?? [],
+      ...descriptor14.project.managedOutputs?.files ?? [],
+      ...descriptor14.detectionPaths,
+      descriptor14.globalSupport?.layout.rootInstructionPath,
+      descriptor14.globalSupport?.layout.skillDir,
+      ...descriptor14.globalSupport?.layout.managedOutputs?.dirs ?? [],
+      ...descriptor14.globalSupport?.layout.managedOutputs?.files ?? [],
+      ...descriptor14.globalSupport?.detectionPaths ?? []
     ]) {
       if (path !== void 0) {
         const segment = firstPathSegment(path);
@@ -2659,8 +2726,9 @@ function hasHiddenSegment(relPath) {
 async function listScopedAgentsFiles(projectRoot) {
   const files = [];
   const targetRootSegmentsSet = await targetRootSegments();
+  const api = pathApi(projectRoot);
   async function walk(relDir) {
-    const absDir = join(projectRoot, relDir);
+    const absDir = api.join(projectRoot, relDir);
     const entries = await readdir(absDir, { withFileTypes: true }).catch(() => []);
     for (const entry of entries) {
       const relPath = relDir ? `${relDir}/${entry.name}` : entry.name;
@@ -2669,7 +2737,7 @@ async function listScopedAgentsFiles(projectRoot) {
         await walk(relPath);
         continue;
       }
-      if (entry.isSymbolicLink() && await stat(join(projectRoot, relPath)).then(
+      if (entry.isSymbolicLink() && await stat(api.join(projectRoot, relPath)).then(
         (info) => info.isDirectory(),
         () => false
       )) {
@@ -2678,7 +2746,7 @@ async function listScopedAgentsFiles(projectRoot) {
         continue;
       }
       if (entry.name === "AGENTS.md" || entry.name === "AGENTS.override.md") {
-        files.push(join(projectRoot, relPath));
+        files.push(api.join(projectRoot, relPath));
       }
     }
   }
@@ -2692,7 +2760,7 @@ async function addScopedAgentsMappings(refs, projectRoot) {
     const isNestedAgents = relPath.endsWith("/AGENTS.md") && relPath !== "AGENTS.md" && !relPath.endsWith("/AGENTS.override.md");
     const isNestedOverride = relPath.endsWith("/AGENTS.override.md") && relPath !== "AGENTS.override.md";
     if (!isNestedAgents && !isNestedOverride) continue;
-    const parentDir = dirname(relPath);
+    const parentDir = posix.dirname(relPath);
     if (hasHiddenSegment(parentDir)) continue;
     const ruleName = parentDir.replace(/\//g, "-");
     refs.set(relPath, `${AB_RULES}/${ruleName}.md`);
@@ -2701,6 +2769,7 @@ async function addScopedAgentsMappings(refs, projectRoot) {
 var AB_RULES, AB_COMMANDS, AB_AGENTS, AB_SKILLS2, targetRootSegmentsCache;
 var init_import_map_shared = __esm({
   "src/core/reference/import-map-shared.ts"() {
+    init_path_helpers();
     init_fs();
     init_command_skill();
     init_projected_agent_skill();
@@ -3155,9 +3224,100 @@ var init_junie = __esm({
   }
 });
 
+// src/targets/kilo-code/constants.ts
+var KILO_CODE_TARGET, KILO_CODE_DIR, KILO_CODE_ROOT_RULE, KILO_CODE_RULES_DIR, KILO_CODE_COMMANDS_DIR, KILO_CODE_AGENTS_DIR, KILO_CODE_SKILLS_DIR, KILO_CODE_MCP_FILE, KILO_CODE_IGNORE, KILO_CODE_LEGACY_DIR, KILO_CODE_LEGACY_RULES_DIR, KILO_CODE_LEGACY_WORKFLOWS_DIR, KILO_CODE_LEGACY_SKILLS_DIR, KILO_CODE_LEGACY_MCP_FILE, KILO_CODE_LEGACY_MODES_FILE, KILO_CODE_GLOBAL_DIR, KILO_CODE_GLOBAL_AGENTS_MD, KILO_CODE_GLOBAL_RULES_DIR, KILO_CODE_GLOBAL_COMMANDS_DIR, KILO_CODE_GLOBAL_AGENTS_DIR, KILO_CODE_GLOBAL_SKILLS_DIR, KILO_CODE_GLOBAL_MCP_FILE, KILO_CODE_GLOBAL_IGNORE, KILO_CODE_GLOBAL_AGENTS_SKILLS_DIR, KILO_CODE_CANONICAL_RULES_DIR, KILO_CODE_CANONICAL_COMMANDS_DIR, KILO_CODE_CANONICAL_AGENTS_DIR, KILO_CODE_CANONICAL_MCP, KILO_CODE_CANONICAL_IGNORE;
+var init_constants8 = __esm({
+  "src/targets/kilo-code/constants.ts"() {
+    KILO_CODE_TARGET = "kilo-code";
+    KILO_CODE_DIR = ".kilo";
+    KILO_CODE_ROOT_RULE = "AGENTS.md";
+    KILO_CODE_RULES_DIR = `${KILO_CODE_DIR}/rules`;
+    KILO_CODE_COMMANDS_DIR = `${KILO_CODE_DIR}/commands`;
+    KILO_CODE_AGENTS_DIR = `${KILO_CODE_DIR}/agents`;
+    KILO_CODE_SKILLS_DIR = `${KILO_CODE_DIR}/skills`;
+    KILO_CODE_MCP_FILE = `${KILO_CODE_DIR}/mcp.json`;
+    KILO_CODE_IGNORE = ".kilocodeignore";
+    KILO_CODE_LEGACY_DIR = ".kilocode";
+    KILO_CODE_LEGACY_RULES_DIR = `${KILO_CODE_LEGACY_DIR}/rules`;
+    KILO_CODE_LEGACY_WORKFLOWS_DIR = `${KILO_CODE_LEGACY_DIR}/workflows`;
+    KILO_CODE_LEGACY_SKILLS_DIR = `${KILO_CODE_LEGACY_DIR}/skills`;
+    KILO_CODE_LEGACY_MCP_FILE = `${KILO_CODE_LEGACY_DIR}/mcp.json`;
+    KILO_CODE_LEGACY_MODES_FILE = ".kilocodemodes";
+    KILO_CODE_GLOBAL_DIR = ".kilo";
+    KILO_CODE_GLOBAL_AGENTS_MD = `${KILO_CODE_GLOBAL_DIR}/AGENTS.md`;
+    KILO_CODE_GLOBAL_RULES_DIR = `${KILO_CODE_GLOBAL_DIR}/rules`;
+    KILO_CODE_GLOBAL_COMMANDS_DIR = `${KILO_CODE_GLOBAL_DIR}/commands`;
+    KILO_CODE_GLOBAL_AGENTS_DIR = `${KILO_CODE_GLOBAL_DIR}/agents`;
+    KILO_CODE_GLOBAL_SKILLS_DIR = `${KILO_CODE_GLOBAL_DIR}/skills`;
+    KILO_CODE_GLOBAL_MCP_FILE = `${KILO_CODE_GLOBAL_DIR}/mcp.json`;
+    KILO_CODE_GLOBAL_IGNORE = ".kilocodeignore";
+    KILO_CODE_GLOBAL_AGENTS_SKILLS_DIR = ".agents/skills";
+    KILO_CODE_CANONICAL_RULES_DIR = ".agentsmesh/rules";
+    KILO_CODE_CANONICAL_COMMANDS_DIR = ".agentsmesh/commands";
+    KILO_CODE_CANONICAL_AGENTS_DIR = ".agentsmesh/agents";
+    KILO_CODE_CANONICAL_MCP = ".agentsmesh/mcp.json";
+    KILO_CODE_CANONICAL_IGNORE = ".agentsmesh/ignore";
+  }
+});
+async function buildKiloCodeImportPaths(refs, projectRoot, scope = "project") {
+  if (scope === "global") {
+    refs.set(KILO_CODE_GLOBAL_AGENTS_MD, `${AB_RULES2}/_root.md`);
+    for (const absPath of await listFiles(projectRoot, KILO_CODE_GLOBAL_RULES_DIR)) {
+      addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_RULES2, ".md");
+    }
+    for (const absPath of await listFiles(projectRoot, KILO_CODE_GLOBAL_COMMANDS_DIR)) {
+      addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS2, ".md");
+    }
+    for (const absPath of await listFiles(projectRoot, KILO_CODE_GLOBAL_AGENTS_DIR)) {
+      addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_AGENTS2, ".md");
+    }
+    for (const absPath of await listFiles(projectRoot, KILO_CODE_GLOBAL_SKILLS_DIR)) {
+      addSkillLikeMapping(refs, rel(projectRoot, absPath), KILO_CODE_GLOBAL_SKILLS_DIR);
+    }
+    refs.set(KILO_CODE_GLOBAL_MCP_FILE, ".agentsmesh/mcp.json");
+    return;
+  }
+  refs.set(KILO_CODE_ROOT_RULE, `${AB_RULES2}/_root.md`);
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_RULES_DIR)) {
+    addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_RULES2, ".md");
+  }
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_COMMANDS_DIR)) {
+    addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS2, ".md");
+  }
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_AGENTS_DIR)) {
+    addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_AGENTS2, ".md");
+  }
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_SKILLS_DIR)) {
+    addSkillLikeMapping(refs, rel(projectRoot, absPath), KILO_CODE_SKILLS_DIR);
+  }
+  refs.set(KILO_CODE_MCP_FILE, ".agentsmesh/mcp.json");
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_LEGACY_RULES_DIR)) {
+    const relPath = rel(projectRoot, absPath);
+    if (basename(relPath) === "00-root.md") {
+      refs.set(relPath, `${AB_RULES2}/_root.md`);
+      continue;
+    }
+    addSimpleFileMapping(refs, relPath, AB_RULES2, ".md");
+  }
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_LEGACY_WORKFLOWS_DIR)) {
+    addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS2, ".md");
+  }
+  for (const absPath of await listFiles(projectRoot, KILO_CODE_LEGACY_SKILLS_DIR)) {
+    addSkillLikeMapping(refs, rel(projectRoot, absPath), KILO_CODE_LEGACY_SKILLS_DIR);
+  }
+  refs.set(KILO_CODE_LEGACY_MCP_FILE, ".agentsmesh/mcp.json");
+}
+var init_kilo_code = __esm({
+  "src/core/reference/import-maps/kilo-code.ts"() {
+    init_import_map_shared();
+    init_constants8();
+    init_constants2();
+  }
+});
+
 // src/targets/kiro/constants.ts
 var KIRO_TARGET, KIRO_AGENTS_MD, KIRO_DIR, KIRO_STEERING_DIR, KIRO_SKILLS_DIR, KIRO_AGENTS_DIR, KIRO_HOOKS_DIR, KIRO_SETTINGS_DIR, KIRO_MCP_FILE, KIRO_IGNORE, KIRO_GLOBAL_STEERING_DIR, KIRO_GLOBAL_STEERING_AGENTS_MD, KIRO_GLOBAL_SKILLS_DIR, KIRO_GLOBAL_AGENTS_DIR, KIRO_GLOBAL_MCP_FILE, KIRO_GLOBAL_IGNORE, KIRO_GLOBAL_AGENTS_SKILLS_DIR, KIRO_CANONICAL_ROOT_RULE, KIRO_CANONICAL_RULES_DIR, KIRO_CANONICAL_AGENTS_DIR, KIRO_CANONICAL_MCP, KIRO_CANONICAL_HOOKS, KIRO_CANONICAL_IGNORE;
-var init_constants8 = __esm({
+var init_constants9 = __esm({
   "src/targets/kiro/constants.ts"() {
     KIRO_TARGET = "kiro";
     KIRO_AGENTS_MD = "AGENTS.md";
@@ -3216,14 +3376,14 @@ async function buildKiroImportPaths(refs, projectRoot, scope = "project") {
 var init_kiro = __esm({
   "src/core/reference/import-maps/kiro.ts"() {
     init_import_map_shared();
-    init_constants8();
+    init_constants9();
     init_constants2();
   }
 });
 
 // src/targets/roo-code/constants.ts
 var ROO_CODE_TARGET, ROO_CODE_DIR, ROO_CODE_ROOT_RULE, ROO_CODE_ROOT_RULE_FALLBACK, ROO_CODE_RULES_DIR, ROO_CODE_COMMANDS_DIR, ROO_CODE_SKILLS_DIR, ROO_CODE_MCP_FILE, ROO_CODE_IGNORE, ROO_CODE_MODES_FILE, ROO_CODE_GLOBAL_MODES_FILE, ROO_CODE_GLOBAL_DIR, ROO_CODE_GLOBAL_RULES_DIR, ROO_CODE_GLOBAL_COMMANDS_DIR, ROO_CODE_GLOBAL_SKILLS_DIR, ROO_CODE_GLOBAL_MCP_FILE, ROO_CODE_GLOBAL_IGNORE, ROO_CODE_GLOBAL_AGENTS_MD, ROO_CODE_GLOBAL_AGENTS_SKILLS_DIR, ROO_CODE_CANONICAL_RULES_DIR, ROO_CODE_CANONICAL_COMMANDS_DIR, ROO_CODE_CANONICAL_MCP, ROO_CODE_CANONICAL_IGNORE;
-var init_constants9 = __esm({
+var init_constants10 = __esm({
   "src/targets/roo-code/constants.ts"() {
     ROO_CODE_TARGET = "roo-code";
     ROO_CODE_DIR = ".roo";
@@ -3290,7 +3450,7 @@ async function buildRooCodeImportPaths(refs, projectRoot, scope = "project") {
 var init_roo_code = __esm({
   "src/core/reference/import-maps/roo-code.ts"() {
     init_import_map_shared();
-    init_constants9();
+    init_constants10();
     init_constants2();
   }
 });
@@ -3329,6 +3489,7 @@ var init_import_maps = __esm({
     init_cursor();
     init_gemini_cli();
     init_junie();
+    init_kilo_code();
     init_kiro();
     init_roo_code();
     init_windsurf();
@@ -3820,10 +3981,8 @@ async function importSettings(projectRoot, results) {
   }
   const alreadyImportedMcp = results.some((r) => r.feature === "mcp");
   if (!alreadyImportedMcp && settings.mcpServers && typeof settings.mcpServers === "object") {
-    const mcpContent = JSON.stringify({ mcpServers: settings.mcpServers }, null, 2);
-    const destPath = join(projectRoot, CLAUDE_CANONICAL_MCP);
-    await mkdirp(dirname(destPath));
-    await writeFileAtomic(destPath, mcpContent);
+    const mcpServers = settings.mcpServers;
+    await writeMcpWithMerge(projectRoot, CLAUDE_CANONICAL_MCP, mcpServers);
     results.push({
       fromTool: "claude-code",
       fromPath: settingsPath,
@@ -3871,6 +4030,7 @@ var init_settings_helpers = __esm({
   "src/targets/claude-code/settings-helpers.ts"() {
     init_hook_command();
     init_fs();
+    init_mcp_merge();
     init_constants3();
   }
 });
@@ -4830,11 +4990,11 @@ var init_linter3 = __esm({
 });
 
 // src/core/lint/shared/helpers.ts
-function createWarning(file, target13, message) {
+function createWarning(file, target14, message) {
   return {
     level: "warning",
     file,
-    target: target13,
+    target: target14,
     message
   };
 }
@@ -4844,12 +5004,12 @@ function formatOxfordComma(items) {
   if (items.length === 2) return `${items[0]} and ${items[1]}`;
   return `${items.slice(0, -1).join(", ")}, and ${items[items.length - 1]}`;
 }
-function createUnsupportedHookWarning(event, target13, supportedEvents, options) {
-  const by = options?.unsupportedBy ?? target13;
+function createUnsupportedHookWarning(event, target14, supportedEvents, options) {
+  const by = options?.unsupportedBy ?? target14;
   const supported = formatOxfordComma(supportedEvents);
   return createWarning(
     ".agentsmesh/hooks.yaml",
-    target13,
+    target14,
     `${event} is not supported by ${by}; only ${supported} are projected.`
   );
 }
@@ -5033,7 +5193,7 @@ var init_cline2 = __esm({
 
 // src/targets/codex-cli/constants.ts
 var CODEX_TARGET, CODEX_MD, AGENTS_MD, CODEX_GLOBAL_AGENTS_MD, CODEX_GLOBAL_AGENTS_OVERRIDE_MD, CODEX_SKILLS_DIR, CODEX_SKILLS_FALLBACK_DIR, CODEX_CONFIG_TOML, CODEX_INSTRUCTIONS_DIR, CODEX_RULES_DIR, CODEX_AGENTS_DIR, CODEX_CANONICAL_RULES_DIR, CODEX_CANONICAL_COMMANDS_DIR, CODEX_CANONICAL_AGENTS_DIR, CODEX_CANONICAL_SKILLS_DIR, CODEX_CANONICAL_MCP, CODEX_RULE_EMBED_MARKER, CODEX_RULE_EMBED_JSON_PREFIX, CODEX_RULE_EMBED_B64_BEGIN, CODEX_RULE_EMBED_B64_END, CODEX_RULE_EMBED_B64_LINE, CODEX_RULE_INDEX_START, CODEX_RULE_INDEX_END;
-var init_constants10 = __esm({
+var init_constants11 = __esm({
   "src/targets/codex-cli/constants.ts"() {
     CODEX_TARGET = "codex-cli";
     CODEX_MD = "codex.md";
@@ -5096,7 +5256,7 @@ function summarizeRule(rule) {
     scopes.push(`Enforced in \`${CODEX_RULES_DIR}/${ruleSlug2(rule.source)}.rules\`.`);
   }
   if (rule.targets.length > 0) {
-    scopes.push(`Targeted to ${rule.targets.map((target13) => `\`${target13}\``).join(", ")}.`);
+    scopes.push(`Targeted to ${rule.targets.map((target14) => `\`${target14}\``).join(", ")}.`);
   }
   return scopes.join(" ");
 }
@@ -5126,7 +5286,7 @@ function stripCodexRuleIndex(content) {
 var init_instruction_mirror = __esm({
   "src/targets/codex-cli/instruction-mirror.ts"() {
     init_markdown();
-    init_constants10();
+    init_constants11();
   }
 });
 function looksLikeCodexRulesDsl(body) {
@@ -5192,7 +5352,7 @@ function renderCodexGlobalInstructions(canonical) {
 var init_rules = __esm({
   "src/targets/codex-cli/generator/rules.ts"() {
     init_managed_blocks();
-    init_constants10();
+    init_constants11();
     init_instruction_mirror();
   }
 });
@@ -5233,7 +5393,7 @@ function generateCommands4(canonical) {
 var init_skills = __esm({
   "src/targets/codex-cli/generator/skills.ts"() {
     init_markdown();
-    init_constants10();
+    init_constants11();
     init_command_skill();
   }
 });
@@ -5274,7 +5434,7 @@ ${body}
 }
 var init_agents = __esm({
   "src/targets/codex-cli/generator/agents.ts"() {
-    init_constants10();
+    init_constants11();
   }
 });
 
@@ -5326,7 +5486,7 @@ function needsTomlQuoting(key) {
 var init_mcp = __esm({
   "src/targets/codex-cli/generator/mcp.ts"() {
     init_mcp_servers();
-    init_constants10();
+    init_constants11();
   }
 });
 
@@ -5385,11 +5545,7 @@ async function importMcp(projectRoot, results) {
     if (server) mcpServers[name] = server;
   }
   if (Object.keys(mcpServers).length === 0) return;
-  await mkdirp(join(projectRoot, ".agentsmesh"));
-  await writeFileAtomic(
-    join(projectRoot, CODEX_CANONICAL_MCP),
-    JSON.stringify({ mcpServers }, null, 2)
-  );
+  await writeMcpWithMerge(projectRoot, CODEX_CANONICAL_MCP, mcpServers);
   results.push({
     fromTool: CODEX_TARGET,
     fromPath: configPath,
@@ -5400,7 +5556,8 @@ async function importMcp(projectRoot, results) {
 var init_mcp_helpers = __esm({
   "src/targets/codex-cli/mcp-helpers.ts"() {
     init_fs();
-    init_constants10();
+    init_mcp_merge();
+    init_constants11();
   }
 });
 function shouldImportScopedAgentsRule(relDir) {
@@ -5494,7 +5651,7 @@ var init_skills_adapter2 = __esm({
     init_projected_agent_skill();
     init_scoped_agents_import();
     init_skill_import_pipeline();
-    init_constants10();
+    init_constants11();
   }
 });
 async function importCodexAgentsFromToml(projectRoot, results, normalize) {
@@ -5547,7 +5704,7 @@ var init_importer_agents = __esm({
   "src/targets/codex-cli/importer-agents.ts"() {
     init_fs();
     init_projected_agent_skill();
-    init_constants10();
+    init_constants11();
   }
 });
 function tryParseEmbeddedCanonicalFromCodexRules(content) {
@@ -5590,7 +5747,7 @@ function tryParseEmbeddedCanonicalFromCodexRules(content) {
 }
 var init_codex_rules_embed = __esm({
   "src/targets/codex-cli/codex-rules-embed.ts"() {
-    init_constants10();
+    init_constants11();
   }
 });
 async function importCodexNonRootRuleFiles(projectRoot, destDir, normalize) {
@@ -5664,7 +5821,7 @@ var init_import_codex_non_root_rules = __esm({
     init_fs();
     init_markdown();
     init_import_metadata();
-    init_constants10();
+    init_constants11();
     init_codex_rules_embed();
   }
 });
@@ -5786,7 +5943,7 @@ var init_importer_rules2 = __esm({
     init_embedded_rules();
     init_import_orchestrator();
     init_scoped_agents_import();
-    init_constants10();
+    init_constants11();
     init_import_codex_non_root_rules();
     init_instruction_mirror();
   }
@@ -5811,7 +5968,7 @@ async function importFromCodex(projectRoot, options) {
 var init_importer4 = __esm({
   "src/targets/codex-cli/importer.ts"() {
     init_import_rewriter();
-    init_constants10();
+    init_constants11();
     init_mcp_helpers();
     init_skills_adapter2();
     init_importer_agents();
@@ -5836,7 +5993,7 @@ function lintRules4(canonical, projectRoot, _projectFiles) {
 }
 var init_linter4 = __esm({
   "src/targets/codex-cli/linter.ts"() {
-    init_constants10();
+    init_constants11();
   }
 });
 
@@ -5886,7 +6043,7 @@ var target4, project4, global3, globalCapabilities4, descriptor4;
 var init_codex_cli2 = __esm({
   "src/targets/codex-cli/index.ts"() {
     init_generator5();
-    init_constants10();
+    init_constants11();
     init_importer4();
     init_linter4();
     init_lint2();
@@ -6150,10 +6307,7 @@ async function importMcp2(projectRoot, results) {
     importedFrom.push(srcPath);
   }
   if (Object.keys(merged).length === 0) return;
-  await writeFileAtomic(
-    join(projectRoot, CONTINUE_CANONICAL_MCP),
-    JSON.stringify({ mcpServers: merged }, null, 2)
-  );
+  await writeMcpWithMerge(projectRoot, CONTINUE_CANONICAL_MCP, merged);
   for (const fromPath of importedFrom) {
     results.push({
       fromTool: CONTINUE_TARGET,
@@ -6177,6 +6331,7 @@ var init_importer5 = __esm({
     init_fs();
     init_embedded_skill();
     init_descriptor_import_runner();
+    init_mcp_merge();
     init_shared_import_helpers();
     init_constants5();
     init_continue2();
@@ -6507,7 +6662,7 @@ var init_continue2 = __esm({
 
 // src/targets/copilot/constants.ts
 var COPILOT_TARGET, COPILOT_INSTRUCTIONS, COPILOT_CONTEXT_DIR, COPILOT_INSTRUCTIONS_DIR, COPILOT_PROMPTS_DIR, COPILOT_HOOKS_DIR, COPILOT_SKILLS_DIR, COPILOT_AGENTS_DIR, COPILOT_CANONICAL_RULES_DIR, COPILOT_CANONICAL_COMMANDS_DIR, COPILOT_CANONICAL_AGENTS_DIR, COPILOT_CANONICAL_SKILLS_DIR, COPILOT_CANONICAL_HOOKS, COPILOT_LEGACY_HOOKS_DIR, COPILOT_GLOBAL_INSTRUCTIONS, COPILOT_GLOBAL_AGENTS_DIR, COPILOT_GLOBAL_SKILLS_DIR, COPILOT_GLOBAL_PROMPTS_DIR, COPILOT_GLOBAL_AGENTS_MD, COPILOT_GLOBAL_CLAUDE_SKILLS_DIR, COPILOT_GLOBAL_AGENTS_SKILLS_DIR;
-var init_constants11 = __esm({
+var init_constants12 = __esm({
   "src/targets/copilot/constants.ts"() {
     COPILOT_TARGET = "copilot";
     COPILOT_INSTRUCTIONS = ".github/copilot-instructions.md";
@@ -6572,7 +6727,7 @@ function parseCommandPromptFrontmatter(frontmatter, promptPath) {
 var init_command_prompt = __esm({
   "src/targets/copilot/command-prompt.ts"() {
     init_markdown();
-    init_constants11();
+    init_constants12();
   }
 });
 
@@ -6724,7 +6879,7 @@ function generateHooks3(canonical) {
 var init_generator7 = __esm({
   "src/targets/copilot/generator.ts"() {
     init_markdown();
-    init_constants11();
+    init_constants12();
     init_command_prompt();
     init_hook_entry();
   }
@@ -6818,7 +6973,7 @@ async function importHooks(projectRoot, results) {
 var init_hook_parser = __esm({
   "src/targets/copilot/hook-parser.ts"() {
     init_fs();
-    init_constants11();
+    init_constants12();
   }
 });
 async function importSkills2(projectRoot, results, normalize, skillsDirRel = COPILOT_SKILLS_DIR) {
@@ -6839,7 +6994,7 @@ async function importSkills2(projectRoot, results, normalize, skillsDirRel = COP
 var init_skills_adapter3 = __esm({
   "src/targets/copilot/skills-adapter.ts"() {
     init_skill_import_pipeline();
-    init_constants11();
+    init_constants12();
   }
 });
 
@@ -6862,7 +7017,7 @@ var init_importer6 = __esm({
   "src/targets/copilot/importer.ts"() {
     init_import_rewriter();
     init_descriptor_import_runner();
-    init_constants11();
+    init_constants12();
     init_hook_parser();
     init_skills_adapter3();
     init_copilot2();
@@ -6881,7 +7036,7 @@ var init_import_mappers4 = __esm({
     init_import_metadata();
     init_shared_import_helpers();
     init_command_prompt();
-    init_constants11();
+    init_constants12();
     copilotLegacyRuleMapper = async ({
       relativePath,
       normalizeTo,
@@ -6998,7 +7153,7 @@ function lintRules6(canonical, projectRoot, projectFiles, options) {
 var init_linter6 = __esm({
   "src/targets/copilot/linter.ts"() {
     init_validate_rules();
-    init_constants11();
+    init_constants12();
   }
 });
 
@@ -7115,7 +7270,7 @@ var SCRIPT_PREFIX_RE;
 var init_hook_assets = __esm({
   "src/targets/copilot/hook-assets.ts"() {
     init_fs();
-    init_constants11();
+    init_constants12();
     init_hook_entry();
     SCRIPT_PREFIX_RE = /^(?<prefix>\s*(?:(?:bash|sh|zsh)\s+)?)["']?(?<path>(?:\.\.\/|\.\/|[^/\s"'`]+\/)[^\s"'`]+)["']?(?<suffix>(?:\s.*)?)$/;
   }
@@ -7129,7 +7284,7 @@ var generateCopilotGlobalExtras;
 var init_scope_extras2 = __esm({
   "src/targets/copilot/scope-extras.ts"() {
     init_fs();
-    init_constants11();
+    init_constants12();
     generateCopilotGlobalExtras = async (canonical, projectRoot, scope, enabledFeatures) => {
       if (scope !== "global" || !enabledFeatures.has("rules")) return [];
       const root = canonical.rules.find((r) => r.root);
@@ -7152,7 +7307,7 @@ var target6, project6, global4, globalCapabilities6, descriptor6;
 var init_copilot2 = __esm({
   "src/targets/copilot/index.ts"() {
     init_generator7();
-    init_constants11();
+    init_constants12();
     init_importer6();
     init_import_mappers4();
     init_linter6();
@@ -7921,8 +8076,8 @@ async function hasGlobalCursorArtifacts(projectRoot) {
     join(projectRoot, CURSOR_COMMANDS_DIR)
   ];
   for (const p of candidates) {
-    const stat4 = await readFileSafe(p);
-    if (stat4 !== null && stat4.trim() !== "") return true;
+    const stat5 = await readFileSafe(p);
+    if (stat5 !== null && stat5.trim() !== "") return true;
   }
   const skillFiles = await readDirRecursive(join(projectRoot, CURSOR_GLOBAL_SKILLS_DIR));
   if (skillFiles.some((f) => f.endsWith(".md"))) return true;
@@ -8080,9 +8235,8 @@ async function importMcp3(projectRoot, results) {
     return;
   }
   if (!parsed || typeof parsed !== "object" || !("mcpServers" in parsed)) return;
-  const destPath = join(projectRoot, CURSOR_CANONICAL_MCP);
-  await mkdirp(dirname(destPath));
-  await writeFileAtomic(destPath, content);
+  const servers = parsed.mcpServers;
+  await writeMcpWithMerge(projectRoot, CURSOR_CANONICAL_MCP, servers);
   results.push({
     fromTool: "cursor",
     fromPath: mcpPath,
@@ -8109,6 +8263,7 @@ var init_importer7 = __esm({
     init_import_rewriter();
     init_fs();
     init_descriptor_import_runner();
+    init_mcp_merge();
     init_importer_rules3();
     init_settings_helpers2();
     init_skills_adapter4();
@@ -8410,7 +8565,7 @@ var init_cursor2 = __esm({
 
 // src/targets/gemini-cli/constants.ts
 var GEMINI_TARGET, GEMINI_ROOT, GEMINI_COMPAT_AGENTS, GEMINI_RULES_DIR, GEMINI_COMPAT_INNER_ROOT, GEMINI_COMMANDS_DIR, GEMINI_POLICIES_DIR, GEMINI_SETTINGS, GEMINI_IGNORE, GEMINI_SKILLS_DIR, GEMINI_AGENTS_DIR, GEMINI_SYSTEM, GEMINI_DEFAULT_POLICIES_FILE, GEMINI_CANONICAL_RULES_DIR, GEMINI_CANONICAL_COMMANDS_DIR, GEMINI_CANONICAL_AGENTS_DIR, GEMINI_CANONICAL_SKILLS_DIR, GEMINI_CANONICAL_MCP, GEMINI_CANONICAL_HOOKS, GEMINI_CANONICAL_IGNORE, GEMINI_CANONICAL_PERMISSIONS, GEMINI_GLOBAL_ROOT, GEMINI_GLOBAL_COMPAT_AGENTS, GEMINI_GLOBAL_SETTINGS, GEMINI_GLOBAL_COMMANDS_DIR, GEMINI_GLOBAL_SKILLS_DIR, GEMINI_GLOBAL_AGENTS_DIR;
-var init_constants12 = __esm({
+var init_constants13 = __esm({
   "src/targets/gemini-cli/constants.ts"() {
     GEMINI_TARGET = "gemini-cli";
     GEMINI_ROOT = "GEMINI.md";
@@ -8462,7 +8617,7 @@ function generateRules8(canonical) {
 var init_rules3 = __esm({
   "src/targets/gemini-cli/generator/rules.ts"() {
     init_managed_blocks();
-    init_constants12();
+    init_constants13();
   }
 });
 function canonicalCommandNameToGeminiTomlPath(cmdName, commandsDir) {
@@ -8502,7 +8657,7 @@ function generateCommands8(canonical) {
 }
 var init_commands2 = __esm({
   "src/targets/gemini-cli/generator/commands.ts"() {
-    init_constants12();
+    init_constants13();
     init_command_namespace();
   }
 });
@@ -8530,7 +8685,7 @@ function generateAgents6(canonical) {
 var init_agents3 = __esm({
   "src/targets/gemini-cli/generator/agents.ts"() {
     init_markdown();
-    init_constants12();
+    init_constants13();
   }
 });
 
@@ -8561,7 +8716,7 @@ function generateSkills8(canonical) {
 var init_skills3 = __esm({
   "src/targets/gemini-cli/generator/skills.ts"() {
     init_markdown();
-    init_constants12();
+    init_constants13();
   }
 });
 
@@ -8622,7 +8777,7 @@ function generateGeminiSettingsFiles(canonical) {
 var init_settings = __esm({
   "src/targets/gemini-cli/generator/settings.ts"() {
     init_hook_command();
-    init_constants12();
+    init_constants13();
   }
 });
 
@@ -8633,7 +8788,7 @@ function generateIgnore4(canonical) {
 }
 var init_ignore2 = __esm({
   "src/targets/gemini-cli/generator/ignore.ts"() {
-    init_constants12();
+    init_constants13();
   }
 });
 
@@ -8734,7 +8889,7 @@ function generateGeminiPermissionsPolicies(canonical) {
 }
 var init_policies_generator = __esm({
   "src/targets/gemini-cli/policies-generator.ts"() {
-    init_constants12();
+    init_constants13();
   }
 });
 function mapGeminiHookEvent(event) {
@@ -8862,7 +9017,7 @@ var init_format_helpers_settings = __esm({
   "src/targets/gemini-cli/format-helpers-settings.ts"() {
     init_hook_command();
     init_fs();
-    init_constants12();
+    init_constants13();
     init_format_helpers_shared();
   }
 });
@@ -8887,7 +9042,7 @@ async function importGeminiIgnore(projectRoot, results) {
 var init_format_helpers = __esm({
   "src/targets/gemini-cli/format-helpers.ts"() {
     init_fs();
-    init_constants12();
+    init_constants13();
     init_format_helpers_shared();
     init_format_helpers_settings();
   }
@@ -8995,7 +9150,7 @@ async function importGeminiPolicies(projectRoot) {
 var init_policies_importer = __esm({
   "src/targets/gemini-cli/policies-importer.ts"() {
     init_fs();
-    init_constants12();
+    init_constants13();
   }
 });
 function stripProjectRootCanonicalPrefix(content, projectRoot) {
@@ -9121,7 +9276,7 @@ var init_importer_skills_agents = __esm({
     init_markdown();
     init_import_metadata();
     init_projected_agent_skill();
-    init_constants12();
+    init_constants13();
   }
 });
 async function importRootRule2(projectRoot, results, normalize) {
@@ -9197,7 +9352,7 @@ var init_importer8 = __esm({
     init_import_metadata();
     init_embedded_rules();
     init_descriptor_import_runner();
-    init_constants12();
+    init_constants13();
     init_gemini_cli2();
     init_format_helpers();
     init_policies_importer();
@@ -9265,7 +9420,7 @@ var init_importer_mappers3 = __esm({
     init_import_metadata();
     init_shared_import_helpers();
     init_format_helpers();
-    init_constants12();
+    init_constants13();
   }
 });
 
@@ -9289,7 +9444,7 @@ function lintRules8(canonical, projectRoot, projectFiles, options) {
 var init_linter8 = __esm({
   "src/targets/gemini-cli/linter.ts"() {
     init_validate_rules();
-    init_constants12();
+    init_constants13();
   }
 });
 
@@ -9370,7 +9525,7 @@ var init_gemini_cli2 = __esm({
     init_generator11();
     init_capabilities();
     init_policies_generator();
-    init_constants12();
+    init_constants13();
     init_importer8();
     init_import_mappers6();
     init_linter8();
@@ -9944,47 +10099,591 @@ var init_junie2 = __esm({
     };
   }
 });
-function toKebab(value) {
-  return value.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/_/g, "-").toLowerCase();
-}
-function hookText(entry) {
-  return entry.type === "prompt" ? entry.prompt : entry.command;
-}
-function toWhen(event, matcher) {
-  const type = CANONICAL_TO_KIRO[event];
-  if (event === "PreToolUse" || event === "PostToolUse") {
-    return { type, tools: [matcher || "*"] };
-  }
-  return { type };
-}
-function generateKiroHooks(hooks) {
+function generateRules10(canonical) {
   const outputs = [];
-  for (const [event, entries] of Object.entries(hooks)) {
-    const mappedEvent = event;
-    if (!(mappedEvent in CANONICAL_TO_KIRO) || !Array.isArray(entries)) continue;
-    let index = 1;
-    for (const entry of entries) {
-      const text = hookText(entry);
-      if (!text) continue;
-      const file = {
-        name: `${toKebab(event)} ${index}`,
-        version: "1",
-        when: toWhen(mappedEvent, entry.matcher),
-        then: entry.type === "prompt" ? { type: "askAgent", prompt: text } : { type: "shellCommand", command: text }
-      };
-      outputs.push({
-        name: `${toKebab(event)}-${index}.kiro.hook`,
-        content: JSON.stringify(file, null, 2)
-      });
-      index += 1;
-    }
+  const root = canonical.rules.find((rule) => rule.root);
+  if (root) {
+    outputs.push({
+      path: KILO_CODE_ROOT_RULE,
+      content: root.body.trim() ? root.body : ""
+    });
+  }
+  for (const rule of canonical.rules) {
+    if (rule.root) continue;
+    if (rule.targets.length > 0 && !rule.targets.includes(KILO_CODE_TARGET)) continue;
+    const slug = basename(rule.source, ".md");
+    const frontmatter = {};
+    if (rule.description) frontmatter.description = rule.description;
+    if (rule.globs.length > 0) frontmatter.globs = rule.globs;
+    const content = Object.keys(frontmatter).length > 0 ? serializeFrontmatter(frontmatter, rule.body.trim() || "") : rule.body.trim() || "";
+    outputs.push({
+      path: `${KILO_CODE_RULES_DIR}/${slug}.md`,
+      content
+    });
   }
   return outputs;
 }
-function toCanonicalEntry(file) {
-  const canonicalEvent = KIRO_TO_CANONICAL.get(file.when.type);
-  if (!canonicalEvent) return null;
-  const matcher = file.when.tools?.[0] ?? file.when.patterns?.[0] ?? "*";
+function generateCommands10(canonical) {
+  return canonical.commands.map((command) => {
+    const frontmatter = {};
+    if (command.description) frontmatter.description = command.description;
+    return {
+      path: `${KILO_CODE_COMMANDS_DIR}/${command.name}.md`,
+      content: serializeFrontmatter(frontmatter, command.body.trim() || "")
+    };
+  });
+}
+function generateAgents8(canonical) {
+  return canonical.agents.map((agent) => {
+    const slug = basename(agent.source, ".md");
+    const frontmatter = { mode: "subagent" };
+    if (agent.description) frontmatter.description = agent.description;
+    if (agent.model) frontmatter.model = agent.model;
+    if (agent.tools.length > 0) frontmatter.tools = agent.tools;
+    if (agent.disallowedTools.length > 0) frontmatter.disallowedTools = agent.disallowedTools;
+    return {
+      path: `${KILO_CODE_AGENTS_DIR}/${slug}.md`,
+      content: serializeFrontmatter(frontmatter, agent.body.trim() || "")
+    };
+  });
+}
+function generateMcp8(canonical) {
+  if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
+  return [
+    {
+      path: KILO_CODE_MCP_FILE,
+      content: JSON.stringify({ mcpServers: canonical.mcp.mcpServers }, null, 2)
+    }
+  ];
+}
+function generateIgnore6(canonical) {
+  if (canonical.ignore.length === 0) return [];
+  return [{ path: KILO_CODE_IGNORE, content: canonical.ignore.join("\n") }];
+}
+function generateSkills10(canonical) {
+  return generateEmbeddedSkills(canonical, KILO_CODE_SKILLS_DIR);
+}
+var init_generator13 = __esm({
+  "src/targets/kilo-code/generator.ts"() {
+    init_embedded_skill();
+    init_markdown();
+    init_constants8();
+  }
+});
+var kiloNonRootRuleMapper, kiloCommandMapper, kiloAgentMapper;
+var init_import_mappers7 = __esm({
+  "src/targets/kilo-code/import-mappers.ts"() {
+    init_markdown();
+    init_import_metadata();
+    init_constants8();
+    kiloNonRootRuleMapper = async ({
+      relativePath,
+      normalizeTo,
+      destDir
+    }) => {
+      const destPath = join(destDir, relativePath);
+      const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
+      return {
+        destPath,
+        toPath: `${KILO_CODE_CANONICAL_RULES_DIR}/${relativePath}`,
+        content: await serializeImportedRuleWithFallback(
+          destPath,
+          {
+            root: false,
+            description: typeof frontmatter.description === "string" ? frontmatter.description : void 0,
+            globs: Array.isArray(frontmatter.globs) ? frontmatter.globs : void 0
+          },
+          body
+        )
+      };
+    };
+    kiloCommandMapper = async ({
+      relativePath,
+      normalizeTo,
+      destDir
+    }) => {
+      const destPath = join(destDir, relativePath);
+      const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
+      return {
+        destPath,
+        toPath: `${KILO_CODE_CANONICAL_COMMANDS_DIR}/${relativePath}`,
+        content: await serializeImportedCommandWithFallback(
+          destPath,
+          {
+            hasDescription: Object.prototype.hasOwnProperty.call(frontmatter, "description"),
+            description: typeof frontmatter.description === "string" ? frontmatter.description : void 0,
+            hasAllowedTools: false,
+            allowedTools: []
+          },
+          body
+        )
+      };
+    };
+    kiloAgentMapper = async ({
+      relativePath,
+      normalizeTo,
+      destDir
+    }) => {
+      const destPath = join(destDir, relativePath);
+      const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
+      return {
+        destPath,
+        toPath: `${KILO_CODE_CANONICAL_AGENTS_DIR}/${relativePath}`,
+        content: await serializeImportedAgentWithFallback(destPath, frontmatter, body)
+      };
+    };
+  }
+});
+async function pathExists(absolutePath) {
+  try {
+    await stat(absolutePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function importLegacyRules(projectRoot, results, normalize) {
+  const srcDir = join(projectRoot, KILO_CODE_LEGACY_RULES_DIR);
+  if (!await pathExists(srcDir)) return;
+  const destDir = join(projectRoot, KILO_CODE_CANONICAL_RULES_DIR);
+  const rootSourceFile = join(srcDir, LEGACY_ROOT_RULE_FILE);
+  const hasCurrentRoot = results.some((result) => result.toPath === CANONICAL_ROOT_RULE_PATH);
+  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 { body } = parseFrontmatter(normalized);
+    const serialized = await serializeImportedRuleWithFallback(destPath, { root: true }, body);
+    await writeFileAtomic(destPath, serialized);
+    results.push({
+      feature: "rules",
+      fromTool: KILO_CODE_TARGET,
+      fromPath: `${KILO_CODE_LEGACY_RULES_DIR}/${LEGACY_ROOT_RULE_FILE}`,
+      toPath: CANONICAL_ROOT_RULE_PATH
+    });
+  }
+  results.push(
+    ...await importFileDirectory({
+      srcDir,
+      destDir,
+      extensions: [".md"],
+      fromTool: KILO_CODE_TARGET,
+      normalize,
+      mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
+        const mapping = await kiloNonRootRuleMapper({
+          absolutePath: srcPath,
+          relativePath,
+          content,
+          destDir,
+          normalizeTo
+        });
+        if (relativePath === LEGACY_ROOT_RULE_FILE) return null;
+        if (!mapping) return null;
+        return { ...mapping, feature: "rules" };
+      }
+    })
+  );
+}
+async function importLegacyWorkflows(projectRoot, results, normalize) {
+  const srcDir = join(projectRoot, KILO_CODE_LEGACY_WORKFLOWS_DIR);
+  if (!await pathExists(srcDir)) return;
+  const destDir = join(projectRoot, KILO_CODE_CANONICAL_COMMANDS_DIR);
+  results.push(
+    ...await importFileDirectory({
+      srcDir,
+      destDir,
+      extensions: [".md"],
+      fromTool: KILO_CODE_TARGET,
+      normalize,
+      mapEntry: async ({ srcPath, relativePath, content, normalizeTo }) => {
+        const mapping = await kiloCommandMapper({
+          absolutePath: srcPath,
+          relativePath,
+          content,
+          destDir,
+          normalizeTo
+        });
+        if (!mapping) return null;
+        return { ...mapping, feature: "commands" };
+      }
+    })
+  );
+}
+async function importLegacyModes(projectRoot, results, normalize) {
+  const sourceFile = join(projectRoot, KILO_CODE_LEGACY_MODES_FILE);
+  const content = await readFileSafe(sourceFile);
+  if (content === null) return;
+  let parsed;
+  try {
+    parsed = parse(content);
+  } catch {
+    return;
+  }
+  if (!parsed || !Array.isArray(parsed.customModes)) return;
+  for (const raw of parsed.customModes) {
+    if (!raw || typeof raw !== "object") continue;
+    const mode = raw;
+    if (typeof mode.slug !== "string" || mode.slug.length === 0) continue;
+    const slug = mode.slug;
+    const destPath = join(projectRoot, KILO_CODE_CANONICAL_AGENTS_DIR, `${slug}.md`);
+    const description = typeof mode.description === "string" ? mode.description : "";
+    const role = typeof mode.roleDefinition === "string" ? mode.roleDefinition.trim() : "";
+    const whenToUse = typeof mode.whenToUse === "string" ? mode.whenToUse.trim() : "";
+    const body = whenToUse ? `${role}
+
+## When to use
+
+${whenToUse}` : role;
+    const frontmatter = {};
+    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);
+    await writeFileAtomic(destPath, normalized);
+    results.push({
+      feature: "agents",
+      fromTool: KILO_CODE_TARGET,
+      fromPath: sourceFile,
+      toPath: `${KILO_CODE_CANONICAL_AGENTS_DIR}/${slug}.md`
+    });
+  }
+}
+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(descriptor10, projectRoot, scope, { normalize }));
+  await importEmbeddedSkills(
+    projectRoot,
+    KILO_CODE_SKILLS_DIR,
+    KILO_CODE_TARGET,
+    results,
+    normalize
+  );
+  if (scope === "project") {
+    await importLegacyRules(projectRoot, results, normalize);
+    await importLegacyWorkflows(projectRoot, results, normalize);
+    await importLegacyModes(projectRoot, results, normalize);
+    await importEmbeddedSkills(
+      projectRoot,
+      KILO_CODE_LEGACY_SKILLS_DIR,
+      KILO_CODE_TARGET,
+      results,
+      normalize
+    );
+  }
+  return results;
+}
+var CANONICAL_ROOT_RULE_PATH, LEGACY_ROOT_RULE_FILE;
+var init_importer10 = __esm({
+  "src/targets/kilo-code/importer.ts"() {
+    init_import_rewriter();
+    init_embedded_skill();
+    init_import_orchestrator();
+    init_descriptor_import_runner();
+    init_fs();
+    init_import_metadata();
+    init_markdown();
+    init_import_mappers7();
+    init_constants8();
+    init_kilo_code2();
+    CANONICAL_ROOT_RULE_PATH = `${KILO_CODE_CANONICAL_RULES_DIR}/_root.md`;
+    LEGACY_ROOT_RULE_FILE = "00-root.md";
+  }
+});
+
+// src/targets/kilo-code/linter.ts
+function lintRules10(canonical, projectRoot, projectFiles, options) {
+  return validateRules(canonical, projectRoot, projectFiles, {
+    checkGlobMatches: options?.scope !== "global"
+  }).map((diagnostic) => ({
+    ...diagnostic,
+    target: KILO_CODE_TARGET
+  }));
+}
+var init_linter10 = __esm({
+  "src/targets/kilo-code/linter.ts"() {
+    init_validate_rules();
+    init_constants8();
+  }
+});
+
+// src/targets/kilo-code/lint.ts
+function lintHooks4(canonical) {
+  if (!canonical.hooks) return [];
+  const hasEntries = Object.values(canonical.hooks).some(
+    (entries) => Array.isArray(entries) && entries.length > 0
+  );
+  if (!hasEntries) return [];
+  return [
+    createWarning(
+      ".agentsmesh/hooks.yaml",
+      "kilo-code",
+      "kilo-code does not support user-defined lifecycle hooks; canonical hooks are not projected."
+    )
+  ];
+}
+function lintPermissions2(canonical) {
+  if (!canonical.permissions) return [];
+  const { allow, deny } = canonical.permissions;
+  const ask = canonical.permissions.ask ?? [];
+  if (allow.length === 0 && deny.length === 0 && ask.length === 0) return [];
+  return [
+    createWarning(
+      ".agentsmesh/permissions.yaml",
+      "kilo-code",
+      "kilo-code permissions live in kilo.jsonc, which agentsmesh does not generate in v1; canonical permissions are not projected."
+    )
+  ];
+}
+var init_lint8 = __esm({
+  "src/targets/kilo-code/lint.ts"() {
+    init_helpers();
+  }
+});
+
+// src/targets/kilo-code/index.ts
+var target10, project10, globalLayout3, capabilities, descriptor10;
+var init_kilo_code2 = __esm({
+  "src/targets/kilo-code/index.ts"() {
+    init_generator13();
+    init_constants8();
+    init_skill_mirror();
+    init_importer10();
+    init_import_mappers7();
+    init_linter10();
+    init_lint8();
+    init_import_map_builders();
+    target10 = {
+      name: KILO_CODE_TARGET,
+      primaryRootInstructionPath: KILO_CODE_ROOT_RULE,
+      generateRules: generateRules10,
+      generateCommands: generateCommands10,
+      generateAgents: generateAgents8,
+      generateSkills: generateSkills10,
+      generateMcp: generateMcp8,
+      generateIgnore: generateIgnore6,
+      importFrom: importFromKiloCode
+    };
+    project10 = {
+      rootInstructionPath: KILO_CODE_ROOT_RULE,
+      skillDir: KILO_CODE_SKILLS_DIR,
+      managedOutputs: {
+        dirs: [KILO_CODE_RULES_DIR, KILO_CODE_COMMANDS_DIR, KILO_CODE_AGENTS_DIR, KILO_CODE_SKILLS_DIR],
+        files: [KILO_CODE_ROOT_RULE, KILO_CODE_MCP_FILE, KILO_CODE_IGNORE]
+      },
+      paths: {
+        rulePath(slug, _rule) {
+          return `${KILO_CODE_RULES_DIR}/${slug}.md`;
+        },
+        commandPath(name, _config) {
+          return `${KILO_CODE_COMMANDS_DIR}/${name}.md`;
+        },
+        agentPath(name, _config) {
+          return `${KILO_CODE_AGENTS_DIR}/${name}.md`;
+        }
+      }
+    };
+    globalLayout3 = {
+      rootInstructionPath: KILO_CODE_GLOBAL_AGENTS_MD,
+      skillDir: KILO_CODE_GLOBAL_SKILLS_DIR,
+      managedOutputs: {
+        dirs: [
+          KILO_CODE_GLOBAL_RULES_DIR,
+          KILO_CODE_GLOBAL_COMMANDS_DIR,
+          KILO_CODE_GLOBAL_AGENTS_DIR,
+          KILO_CODE_GLOBAL_SKILLS_DIR,
+          KILO_CODE_GLOBAL_AGENTS_SKILLS_DIR
+        ],
+        files: [KILO_CODE_GLOBAL_AGENTS_MD, KILO_CODE_GLOBAL_MCP_FILE, KILO_CODE_GLOBAL_IGNORE]
+      },
+      rewriteGeneratedPath(path) {
+        if (path === KILO_CODE_ROOT_RULE) return KILO_CODE_GLOBAL_AGENTS_MD;
+        return path;
+      },
+      mirrorGlobalPath(path, activeTargets) {
+        return mirrorSkillsToAgents(path, KILO_CODE_GLOBAL_SKILLS_DIR, activeTargets);
+      },
+      paths: {
+        rulePath(slug, _rule) {
+          return `${KILO_CODE_GLOBAL_RULES_DIR}/${slug}.md`;
+        },
+        commandPath(name, _config) {
+          return `${KILO_CODE_GLOBAL_COMMANDS_DIR}/${name}.md`;
+        },
+        agentPath(name, _config) {
+          return `${KILO_CODE_GLOBAL_AGENTS_DIR}/${name}.md`;
+        }
+      }
+    };
+    capabilities = {
+      rules: "native",
+      additionalRules: "native",
+      commands: "native",
+      agents: "native",
+      skills: "native",
+      mcp: "native",
+      hooks: "none",
+      ignore: "native",
+      permissions: "none"
+    };
+    descriptor10 = {
+      id: KILO_CODE_TARGET,
+      generators: target10,
+      capabilities,
+      emptyImportMessage: "No Kilo Code config found (AGENTS.md, .kilo/rules, .kilo/commands, .kilo/agents, .kilo/skills, .kilo/mcp.json, .kilocodeignore, .kilocode/, or .kilocodemodes).",
+      lintRules: lintRules10,
+      lint: {
+        hooks: lintHooks4,
+        permissions: lintPermissions2
+      },
+      project: project10,
+      globalSupport: {
+        capabilities,
+        detectionPaths: [
+          KILO_CODE_GLOBAL_AGENTS_MD,
+          KILO_CODE_GLOBAL_RULES_DIR,
+          KILO_CODE_GLOBAL_COMMANDS_DIR,
+          KILO_CODE_GLOBAL_AGENTS_DIR,
+          KILO_CODE_GLOBAL_SKILLS_DIR,
+          KILO_CODE_GLOBAL_MCP_FILE,
+          KILO_CODE_GLOBAL_IGNORE
+        ],
+        layout: globalLayout3
+      },
+      importer: {
+        rules: [
+          {
+            // Root rule: prefer AGENTS.md (new) → in legacy projects users
+            // historically used .kilocode/rules/00-root.md, but those import
+            // through the descriptor's directory mapper as a regular rule with
+            // slug `00-root` (we don't promote them to root). The legacy global
+            // rules dir falls back to AGENTS.md only.
+            feature: "rules",
+            mode: "singleFile",
+            source: {
+              project: [KILO_CODE_ROOT_RULE],
+              global: [KILO_CODE_GLOBAL_AGENTS_MD]
+            },
+            canonicalDir: KILO_CODE_CANONICAL_RULES_DIR,
+            canonicalRootFilename: "_root.md",
+            markAsRoot: true
+          },
+          {
+            feature: "rules",
+            mode: "directory",
+            source: {
+              project: [KILO_CODE_RULES_DIR],
+              global: [KILO_CODE_GLOBAL_RULES_DIR]
+            },
+            canonicalDir: KILO_CODE_CANONICAL_RULES_DIR,
+            extensions: [".md"],
+            map: kiloNonRootRuleMapper
+          }
+        ],
+        commands: {
+          feature: "commands",
+          mode: "directory",
+          source: {
+            project: [KILO_CODE_COMMANDS_DIR],
+            global: [KILO_CODE_GLOBAL_COMMANDS_DIR]
+          },
+          canonicalDir: KILO_CODE_CANONICAL_COMMANDS_DIR,
+          extensions: [".md"],
+          map: kiloCommandMapper
+        },
+        agents: {
+          feature: "agents",
+          mode: "directory",
+          source: {
+            project: [KILO_CODE_AGENTS_DIR],
+            global: [KILO_CODE_GLOBAL_AGENTS_DIR]
+          },
+          canonicalDir: KILO_CODE_CANONICAL_AGENTS_DIR,
+          extensions: [".md"],
+          map: kiloAgentMapper
+        },
+        mcp: {
+          feature: "mcp",
+          mode: "mcpJson",
+          source: {
+            project: [KILO_CODE_MCP_FILE, KILO_CODE_LEGACY_MCP_FILE],
+            global: [KILO_CODE_GLOBAL_MCP_FILE]
+          },
+          canonicalDir: ".agentsmesh",
+          canonicalFilename: KILO_CODE_CANONICAL_MCP
+        },
+        ignore: {
+          feature: "ignore",
+          mode: "flatFile",
+          source: {
+            project: [KILO_CODE_IGNORE],
+            global: [KILO_CODE_GLOBAL_IGNORE]
+          },
+          canonicalDir: ".agentsmesh",
+          canonicalFilename: KILO_CODE_CANONICAL_IGNORE
+        }
+      },
+      buildImportPaths: buildKiloCodeImportPaths,
+      detectionPaths: [
+        KILO_CODE_RULES_DIR,
+        KILO_CODE_COMMANDS_DIR,
+        KILO_CODE_AGENTS_DIR,
+        KILO_CODE_SKILLS_DIR,
+        KILO_CODE_MCP_FILE,
+        KILO_CODE_LEGACY_RULES_DIR,
+        KILO_CODE_LEGACY_WORKFLOWS_DIR,
+        KILO_CODE_LEGACY_SKILLS_DIR,
+        KILO_CODE_LEGACY_MCP_FILE,
+        KILO_CODE_LEGACY_MODES_FILE,
+        KILO_CODE_IGNORE,
+        "kilo.jsonc",
+        "kilo.json"
+      ]
+    };
+  }
+});
+function toKebab(value) {
+  return value.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/_/g, "-").toLowerCase();
+}
+function hookText(entry) {
+  return entry.type === "prompt" ? entry.prompt : entry.command;
+}
+function toWhen(event, matcher) {
+  const type = CANONICAL_TO_KIRO[event];
+  if (event === "PreToolUse" || event === "PostToolUse") {
+    return { type, tools: [matcher || "*"] };
+  }
+  return { type };
+}
+function generateKiroHooks(hooks) {
+  const outputs = [];
+  for (const [event, entries] of Object.entries(hooks)) {
+    const mappedEvent = event;
+    if (!(mappedEvent in CANONICAL_TO_KIRO) || !Array.isArray(entries)) continue;
+    let index = 1;
+    for (const entry of entries) {
+      const text = hookText(entry);
+      if (!text) continue;
+      const file = {
+        name: `${toKebab(event)} ${index}`,
+        version: "1",
+        when: toWhen(mappedEvent, entry.matcher),
+        then: entry.type === "prompt" ? { type: "askAgent", prompt: text } : { type: "shellCommand", command: text }
+      };
+      outputs.push({
+        name: `${toKebab(event)}-${index}.kiro.hook`,
+        content: JSON.stringify(file, null, 2)
+      });
+      index += 1;
+    }
+  }
+  return outputs;
+}
+function toCanonicalEntry(file) {
+  const canonicalEvent = KIRO_TO_CANONICAL.get(file.when.type);
+  if (!canonicalEvent) return null;
+  const matcher = file.when.tools?.[0] ?? file.when.patterns?.[0] ?? "*";
   if (file.then.type === "askAgent" && typeof file.then.prompt === "string") {
     return {
       event: canonicalEvent,
@@ -10051,7 +10750,7 @@ function steeringFrontmatter(rule) {
   if (rule.description) frontmatter.description = rule.description;
   return frontmatter;
 }
-function generateRules10(canonical) {
+function generateRules11(canonical) {
   const outputs = [];
   const root = canonical.rules.find((rule) => rule.root);
   if (root) {
@@ -10068,10 +10767,10 @@ function generateRules10(canonical) {
   }
   return outputs;
 }
-function generateSkills10(canonical) {
+function generateSkills11(canonical) {
   return generateEmbeddedSkills(canonical, KIRO_SKILLS_DIR);
 }
-function generateMcp8(canonical) {
+function generateMcp9(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
   return [
     {
@@ -10087,7 +10786,7 @@ function generateHooks5(canonical) {
     content: hook.content
   }));
 }
-function generateAgents8(canonical) {
+function generateAgents9(canonical) {
   return canonical.agents.map((agent) => {
     const frontmatter = {
       name: agent.name,
@@ -10102,16 +10801,16 @@ function generateAgents8(canonical) {
     return { path: `${KIRO_AGENTS_DIR}/${agent.name}.md`, content };
   });
 }
-function generateIgnore6(canonical) {
+function generateIgnore7(canonical) {
   if (canonical.ignore.length === 0) return [];
   return [{ path: KIRO_IGNORE, content: canonical.ignore.join("\n") }];
 }
-var init_generator13 = __esm({
+var init_generator14 = __esm({
   "src/targets/kiro/generator.ts"() {
     init_embedded_skill();
     init_markdown();
     init_hook_format();
-    init_constants8();
+    init_constants9();
   }
 });
 function canonicalRuleMeta(frontmatter) {
@@ -10200,12 +10899,12 @@ async function importFromKiro(projectRoot, options = {}) {
   const normalize = await createImportReferenceNormalizer(KIRO_TARGET, projectRoot, scope);
   await importRoot(projectRoot, results, normalize, scope);
   await importNonRootRules(projectRoot, results, normalize);
-  results.push(...await runDescriptorImport(descriptor10, projectRoot, scope, { normalize }));
+  results.push(...await runDescriptorImport(descriptor11, projectRoot, scope, { normalize }));
   await importEmbeddedSkills(projectRoot, KIRO_SKILLS_DIR, KIRO_TARGET, results, normalize);
   if (scope === "project") await importHooks2(projectRoot, results);
   return results;
 }
-var init_importer10 = __esm({
+var init_importer11 = __esm({
   "src/targets/kiro/importer.ts"() {
     init_import_rewriter();
     init_embedded_skill();
@@ -10216,13 +10915,13 @@ var init_importer10 = __esm({
     init_fs();
     init_markdown();
     init_hook_format();
-    init_constants8();
+    init_constants9();
     init_kiro2();
   }
 });
 
 // src/targets/kiro/linter.ts
-function lintRules10(canonical, projectRoot, projectFiles, options) {
+function lintRules11(canonical, projectRoot, projectFiles, options) {
   return validateRules(canonical, projectRoot, projectFiles, {
     checkGlobMatches: options?.scope !== "global"
   }).map((diagnostic) => ({
@@ -10230,15 +10929,15 @@ function lintRules10(canonical, projectRoot, projectFiles, options) {
     target: KIRO_TARGET
   }));
 }
-var init_linter10 = __esm({
+var init_linter11 = __esm({
   "src/targets/kiro/linter.ts"() {
     init_validate_rules();
-    init_constants8();
+    init_constants9();
   }
 });
 
 // src/targets/kiro/lint.ts
-function lintHooks4(canonical) {
+function lintHooks5(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   const supported = ["PreToolUse", "PostToolUse", "UserPromptSubmit", "SubagentStop"];
   const supportedSet = new Set(supported);
@@ -10246,35 +10945,35 @@ function lintHooks4(canonical) {
     (event) => createUnsupportedHookWarning(event, "kiro", supported, { unsupportedBy: "Kiro hooks" })
   );
 }
-var init_lint8 = __esm({
+var init_lint9 = __esm({
   "src/targets/kiro/lint.ts"() {
     init_helpers();
   }
 });
 
 // src/targets/kiro/index.ts
-var target10, project10, global8, globalCapabilities10, descriptor10;
+var target11, project11, global8, globalCapabilities10, descriptor11;
 var init_kiro2 = __esm({
   "src/targets/kiro/index.ts"() {
-    init_generator13();
+    init_generator14();
     init_skill_mirror();
-    init_importer10();
-    init_linter10();
-    init_lint8();
+    init_importer11();
+    init_linter11();
+    init_lint9();
     init_import_map_builders();
-    init_constants8();
-    target10 = {
+    init_constants9();
+    target11 = {
       name: KIRO_TARGET,
       primaryRootInstructionPath: KIRO_AGENTS_MD,
-      generateRules: generateRules10,
-      generateAgents: generateAgents8,
-      generateSkills: generateSkills10,
-      generateMcp: generateMcp8,
+      generateRules: generateRules11,
+      generateAgents: generateAgents9,
+      generateSkills: generateSkills11,
+      generateMcp: generateMcp9,
       generateHooks: generateHooks5,
-      generateIgnore: generateIgnore6,
+      generateIgnore: generateIgnore7,
       importFrom: importFromKiro
     };
-    project10 = {
+    project11 = {
       rootInstructionPath: KIRO_AGENTS_MD,
       skillDir: KIRO_SKILLS_DIR,
       managedOutputs: {
@@ -10355,9 +11054,9 @@ var init_kiro2 = __esm({
       ignore: "native",
       permissions: "none"
     };
-    descriptor10 = {
+    descriptor11 = {
       id: KIRO_TARGET,
-      generators: target10,
+      generators: target11,
       capabilities: {
         rules: "native",
         additionalRules: "native",
@@ -10370,11 +11069,11 @@ var init_kiro2 = __esm({
         permissions: "none"
       },
       emptyImportMessage: "No Kiro config found (AGENTS.md, .kiro/steering, .kiro/skills, .kiro/agents, .kiro/hooks, .kiro/settings/mcp.json, or .kiroignore).",
-      lintRules: lintRules10,
+      lintRules: lintRules11,
       lint: {
-        hooks: lintHooks4
+        hooks: lintHooks5
       },
-      project: project10,
+      project: project11,
       globalSupport: {
         capabilities: globalCapabilities10,
         detectionPaths: [
@@ -10423,7 +11122,7 @@ var init_kiro2 = __esm({
     };
   }
 });
-function generateRules11(canonical) {
+function generateRules12(canonical) {
   const outputs = [];
   const root = canonical.rules.find((rule) => rule.root);
   if (root) {
@@ -10443,7 +11142,7 @@ function generateRules11(canonical) {
   }
   return outputs;
 }
-function generateCommands10(canonical) {
+function generateCommands11(canonical) {
   return canonical.commands.map((command) => {
     const frontmatter = {};
     if (command.description) frontmatter.description = command.description;
@@ -10453,7 +11152,7 @@ function generateCommands10(canonical) {
     };
   });
 }
-function generateMcp9(canonical) {
+function generateMcp10(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
   return [
     {
@@ -10462,14 +11161,14 @@ function generateMcp9(canonical) {
     }
   ];
 }
-function generateIgnore7(canonical) {
+function generateIgnore8(canonical) {
   if (canonical.ignore.length === 0) return [];
   return [{ path: ROO_CODE_IGNORE, content: canonical.ignore.join("\n") }];
 }
-function generateSkills11(canonical) {
+function generateSkills12(canonical) {
   return generateEmbeddedSkills(canonical, ROO_CODE_SKILLS_DIR);
 }
-function generateAgents9(canonical) {
+function generateAgents10(canonical) {
   if (canonical.agents.length === 0) return [];
   const customModes = canonical.agents.map((agent) => {
     const slug = basename(agent.source, ".md");
@@ -10480,19 +11179,19 @@ function generateAgents9(canonical) {
   });
   return [{ path: ROO_CODE_MODES_FILE, content: stringify({ customModes }) }];
 }
-var init_generator14 = __esm({
+var init_generator15 = __esm({
   "src/targets/roo-code/generator.ts"() {
     init_embedded_skill();
     init_markdown();
-    init_constants9();
+    init_constants10();
   }
 });
 var rooNonRootRuleMapper, rooCommandMapper;
-var init_import_mappers7 = __esm({
+var init_import_mappers8 = __esm({
   "src/targets/roo-code/import-mappers.ts"() {
     init_markdown();
     init_import_metadata();
-    init_constants9();
+    init_constants10();
     rooNonRootRuleMapper = async ({
       relativePath,
       normalizeTo,
@@ -10576,25 +11275,25 @@ 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(descriptor11, projectRoot, scope, { normalize }));
+  results.push(...await runDescriptorImport(descriptor12, projectRoot, scope, { normalize }));
   await importPerModeRules(projectRoot, results, normalize);
   await importEmbeddedSkills(projectRoot, ROO_CODE_SKILLS_DIR, ROO_CODE_TARGET, results, normalize);
   return results;
 }
-var init_importer11 = __esm({
+var init_importer12 = __esm({
   "src/targets/roo-code/importer.ts"() {
     init_import_rewriter();
     init_embedded_skill();
     init_import_orchestrator();
     init_descriptor_import_runner();
-    init_import_mappers7();
-    init_constants9();
+    init_import_mappers8();
+    init_constants10();
     init_roo_code2();
   }
 });
 
 // src/targets/roo-code/linter.ts
-function lintRules11(canonical, projectRoot, projectFiles, options) {
+function lintRules12(canonical, projectRoot, projectFiles, options) {
   return validateRules(canonical, projectRoot, projectFiles, {
     checkGlobMatches: options?.scope !== "global"
   }).map((diagnostic) => ({
@@ -10602,10 +11301,10 @@ function lintRules11(canonical, projectRoot, projectFiles, options) {
     target: ROO_CODE_TARGET
   }));
 }
-var init_linter11 = __esm({
+var init_linter12 = __esm({
   "src/targets/roo-code/linter.ts"() {
     init_validate_rules();
-    init_constants9();
+    init_constants10();
   }
 });
 function computeStatus5(existing, content) {
@@ -10613,29 +11312,29 @@ function computeStatus5(existing, content) {
   if (existing !== content) return "updated";
   return "unchanged";
 }
-var target11, project11, generateRooGlobalExtras, global9, globalCapabilities11, descriptor11;
+var target12, project12, generateRooGlobalExtras, global9, globalCapabilities11, descriptor12;
 var init_roo_code2 = __esm({
   "src/targets/roo-code/index.ts"() {
     init_fs();
-    init_generator14();
-    init_constants9();
+    init_generator15();
+    init_constants10();
     init_skill_mirror();
-    init_importer11();
-    init_import_mappers7();
-    init_linter11();
+    init_importer12();
+    init_import_mappers8();
+    init_linter12();
     init_import_map_builders();
-    target11 = {
+    target12 = {
       name: "roo-code",
       primaryRootInstructionPath: ROO_CODE_ROOT_RULE,
-      generateRules: generateRules11,
-      generateCommands: generateCommands10,
-      generateSkills: generateSkills11,
-      generateMcp: generateMcp9,
-      generateIgnore: generateIgnore7,
-      generateAgents: generateAgents9,
+      generateRules: generateRules12,
+      generateCommands: generateCommands11,
+      generateSkills: generateSkills12,
+      generateMcp: generateMcp10,
+      generateIgnore: generateIgnore8,
+      generateAgents: generateAgents10,
       importFrom: importFromRooCode
     };
-    project11 = {
+    project12 = {
       rootInstructionPath: ROO_CODE_ROOT_RULE,
       skillDir: ".roo/skills",
       managedOutputs: {
@@ -10743,9 +11442,9 @@ var init_roo_code2 = __esm({
       ignore: "native",
       permissions: "none"
     };
-    descriptor11 = {
+    descriptor12 = {
       id: "roo-code",
-      generators: target11,
+      generators: target12,
       capabilities: {
         rules: "native",
         additionalRules: "native",
@@ -10758,8 +11457,8 @@ var init_roo_code2 = __esm({
         permissions: "none"
       },
       emptyImportMessage: "No Roo Code config found (.roo/rules, .roo/commands, .roo/skills, .roo/mcp.json, .rooignore, or .roorules).",
-      lintRules: lintRules11,
-      project: project11,
+      lintRules: lintRules12,
+      project: project12,
       globalSupport: {
         capabilities: globalCapabilities11,
         detectionPaths: [
@@ -10842,7 +11541,7 @@ var init_roo_code2 = __esm({
 
 // src/targets/windsurf/constants.ts
 var WINDSURF_TARGET, WINDSURF_RULES_ROOT, WINDSURF_RULES_DIR, WINDSURF_IGNORE, CODEIUM_IGNORE, WINDSURF_AGENTS_MD, WINDSURF_HOOKS_FILE, WINDSURF_MCP_EXAMPLE_FILE, WINDSURF_MCP_CONFIG_FILE, WINDSURF_WORKFLOWS_DIR, WINDSURF_SKILLS_DIR, WINDSURF_CANONICAL_RULES_DIR, WINDSURF_CANONICAL_COMMANDS_DIR, WINDSURF_CANONICAL_AGENTS_DIR, WINDSURF_CANONICAL_SKILLS_DIR, WINDSURF_CANONICAL_IGNORE, WINDSURF_CANONICAL_HOOKS, WINDSURF_CANONICAL_MCP, WINDSURF_GLOBAL_RULES, WINDSURF_GLOBAL_SKILLS_DIR, WINDSURF_GLOBAL_WORKFLOWS_DIR, WINDSURF_GLOBAL_HOOKS_FILE, WINDSURF_GLOBAL_MCP_FILE, WINDSURF_GLOBAL_IGNORE, WINDSURF_GLOBAL_AGENTS_SKILLS_DIR;
-var init_constants13 = __esm({
+var init_constants14 = __esm({
   "src/targets/windsurf/constants.ts"() {
     WINDSURF_TARGET = "windsurf";
     WINDSURF_RULES_ROOT = ".windsurfrules";
@@ -10881,7 +11580,7 @@ function directoryScopedRuleDir(globs) {
   if (dirs.length !== globs.length) return null;
   return dirs.every((dir) => dir === dirs[0]) ? dirs[0] : null;
 }
-function generateRules12(canonical) {
+function generateRules13(canonical) {
   const outputs = [];
   const root = canonical.rules.find((r) => r.root);
   if (!root) return [];
@@ -10918,23 +11617,23 @@ function generateRules12(canonical) {
 var init_rules4 = __esm({
   "src/targets/windsurf/generator/rules.ts"() {
     init_markdown();
-    init_constants13();
+    init_constants14();
   }
 });
 
 // src/targets/windsurf/generator/ignore.ts
-function generateIgnore8(canonical) {
+function generateIgnore9(canonical) {
   if (!canonical.ignore || canonical.ignore.length === 0) return [];
   return [{ path: CODEIUM_IGNORE, content: canonical.ignore.join("\n") }];
 }
 var init_ignore3 = __esm({
   "src/targets/windsurf/generator/ignore.ts"() {
-    init_constants13();
+    init_constants14();
   }
 });
 
 // src/targets/windsurf/generator/workflows.ts
-function generateCommands11(canonical) {
+function generateCommands12(canonical) {
   return canonical.commands.map((cmd) => {
     const frontmatter = {
       description: cmd.description.trim() || void 0,
@@ -10953,12 +11652,12 @@ function generateCommands11(canonical) {
 var init_workflows = __esm({
   "src/targets/windsurf/generator/workflows.ts"() {
     init_markdown();
-    init_constants13();
+    init_constants14();
   }
 });
 
 // src/targets/windsurf/generator/agents.ts
-function generateAgents10(canonical) {
+function generateAgents11(canonical) {
   return canonical.agents.map((agent) => ({
     path: `${WINDSURF_SKILLS_DIR}/${projectedAgentSkillDirName(agent.name)}/SKILL.md`,
     content: serializeProjectedAgentSkill(agent)
@@ -10967,12 +11666,12 @@ function generateAgents10(canonical) {
 var init_agents4 = __esm({
   "src/targets/windsurf/generator/agents.ts"() {
     init_projected_agent_skill();
-    init_constants13();
+    init_constants14();
   }
 });
 
 // src/targets/windsurf/generator/mcp.ts
-function generateMcp10(canonical) {
+function generateMcp11(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
   return [
     {
@@ -10983,7 +11682,7 @@ function generateMcp10(canonical) {
 }
 var init_mcp3 = __esm({
   "src/targets/windsurf/generator/mcp.ts"() {
-    init_constants13();
+    init_constants14();
   }
 });
 
@@ -11026,12 +11725,12 @@ function generateHooks6(canonical) {
 var init_hooks2 = __esm({
   "src/targets/windsurf/generator/hooks.ts"() {
     init_hook_command();
-    init_constants13();
+    init_constants14();
   }
 });
 
 // src/targets/windsurf/generator/skills.ts
-function generateSkills12(canonical) {
+function generateSkills13(canonical) {
   const outputs = [];
   for (const skill of canonical.skills) {
     const frontmatter = {
@@ -11053,12 +11752,12 @@ function generateSkills12(canonical) {
 var init_skills4 = __esm({
   "src/targets/windsurf/generator/skills.ts"() {
     init_markdown();
-    init_constants13();
+    init_constants14();
   }
 });
 
 // src/targets/windsurf/generator/index.ts
-var init_generator15 = __esm({
+var init_generator16 = __esm({
   "src/targets/windsurf/generator/index.ts"() {
     init_rules4();
     init_ignore3();
@@ -11071,9 +11770,9 @@ var init_generator15 = __esm({
 });
 
 // src/targets/windsurf/generator.ts
-var init_generator16 = __esm({
+var init_generator17 = __esm({
   "src/targets/windsurf/generator.ts"() {
-    init_generator15();
+    init_generator16();
   }
 });
 function toStringArray8(value) {
@@ -11125,7 +11824,7 @@ var init_importer_workflows = __esm({
     init_fs();
     init_markdown();
     init_import_metadata();
-    init_constants13();
+    init_constants14();
   }
 });
 async function importSkills4(projectRoot, results, normalize, skillsRelDir = WINDSURF_SKILLS_DIR) {
@@ -11172,7 +11871,7 @@ var init_skills_adapter5 = __esm({
     init_projected_agent_skill();
     init_scoped_agents_import();
     init_skill_import_pipeline();
-    init_constants13();
+    init_constants14();
   }
 });
 async function importWindsurfHooks(projectRoot, results) {
@@ -11270,7 +11969,7 @@ async function importWindsurfMcp(projectRoot, results) {
 var init_importer_hooks_mcp = __esm({
   "src/targets/windsurf/importer-hooks-mcp.ts"() {
     init_fs();
-    init_constants13();
+    init_constants14();
   }
 });
 async function importFromWindsurf(projectRoot, options) {
@@ -11407,7 +12106,7 @@ async function importFromWindsurf(projectRoot, options) {
   await importWindsurfMcp(projectRoot, results);
   return results;
 }
-var init_importer12 = __esm({
+var init_importer13 = __esm({
   "src/targets/windsurf/importer.ts"() {
     init_import_rewriter();
     init_fs();
@@ -11415,13 +12114,13 @@ var init_importer12 = __esm({
     init_import_metadata();
     init_import_orchestrator();
     init_scoped_agents_import();
-    init_constants13();
+    init_constants14();
     init_importer_workflows();
     init_skills_adapter5();
     init_importer_hooks_mcp();
   }
 });
-function lintRules12(canonical, projectRoot, _projectFiles) {
+function lintRules13(canonical, projectRoot, _projectFiles) {
   const diags = [];
   const { rules } = canonical;
   if (rules.length > 0) {
@@ -11448,9 +12147,9 @@ function lintRules12(canonical, projectRoot, _projectFiles) {
   }
   return diags;
 }
-var init_linter12 = __esm({
+var init_linter13 = __esm({
   "src/targets/windsurf/linter.ts"() {
-    init_constants13();
+    init_constants14();
   }
 });
 
@@ -11474,7 +12173,7 @@ function lintMcp4(canonical) {
     )
   ];
 }
-var init_lint9 = __esm({
+var init_lint10 = __esm({
   "src/targets/windsurf/lint.ts"() {
     init_helpers();
   }
@@ -11487,32 +12186,32 @@ function directoryScopedRuleDir2(globs) {
   if (dirs.length !== globs.length) return null;
   return dirs.every((dir) => dir === dirs[0]) ? dirs[0] : null;
 }
-var target12, project12, global10, globalCapabilities12, descriptor12;
+var target13, project13, global10, globalCapabilities12, descriptor13;
 var init_windsurf2 = __esm({
   "src/targets/windsurf/index.ts"() {
-    init_generator16();
+    init_generator17();
     init_capabilities();
-    init_constants13();
+    init_constants14();
     init_skill_mirror();
-    init_importer12();
-    init_linter12();
-    init_lint9();
+    init_importer13();
+    init_linter13();
+    init_lint10();
     init_import_map_builders();
     init_conversions();
     init_projected_agent_skill();
-    target12 = {
+    target13 = {
       name: "windsurf",
       primaryRootInstructionPath: WINDSURF_AGENTS_MD,
-      generateRules: generateRules12,
-      generateCommands: generateCommands11,
-      generateAgents: generateAgents10,
-      generateSkills: generateSkills12,
-      generateMcp: generateMcp10,
+      generateRules: generateRules13,
+      generateCommands: generateCommands12,
+      generateAgents: generateAgents11,
+      generateSkills: generateSkills13,
+      generateMcp: generateMcp11,
       generateHooks: generateHooks6,
-      generateIgnore: generateIgnore8,
+      generateIgnore: generateIgnore9,
       importFrom: importFromWindsurf
     };
-    project12 = {
+    project13 = {
       rootInstructionPath: WINDSURF_AGENTS_MD,
       extraRuleOutputPaths(rule) {
         if (rule.root) return [WINDSURF_AGENTS_MD];
@@ -11607,9 +12306,9 @@ var init_windsurf2 = __esm({
       ignore: "native",
       permissions: "none"
     };
-    descriptor12 = {
+    descriptor13 = {
       id: "windsurf",
-      generators: target12,
+      generators: target13,
       capabilities: {
         rules: "native",
         additionalRules: "native",
@@ -11623,12 +12322,12 @@ var init_windsurf2 = __esm({
       },
       emptyImportMessage: "No Windsurf config found (.windsurfrules, .windsurf/rules, .windsurfignore, or .codeiumignore).",
       supportsConversion: { agents: true },
-      lintRules: lintRules12,
+      lintRules: lintRules13,
       lint: {
         commands: lintCommands6,
         mcp: lintMcp4
       },
-      project: project12,
+      project: project13,
       globalSupport: {
         capabilities: globalCapabilities12,
         detectionPaths: [
@@ -11671,67 +12370,67 @@ function builtinTargetsMap() {
   }
   return _builtinTargetsMap;
 }
-function getBuiltinTargetDefinition(target13) {
-  return builtinTargetsMap().get(target13);
+function getBuiltinTargetDefinition(target14) {
+  return builtinTargetsMap().get(target14);
 }
-function getTargetCapabilities(target13, scope = "project") {
-  const descriptor13 = getBuiltinTargetDefinition(target13) ?? getDescriptor(target13);
-  if (!descriptor13) return void 0;
-  const raw = scope === "global" ? descriptor13.globalSupport?.capabilities ?? descriptor13.capabilities : descriptor13.capabilities;
+function getTargetCapabilities(target14, scope = "project") {
+  const descriptor14 = getBuiltinTargetDefinition(target14) ?? getDescriptor(target14);
+  if (!descriptor14) return void 0;
+  const raw = scope === "global" ? descriptor14.globalSupport?.capabilities ?? descriptor14.capabilities : descriptor14.capabilities;
   return normalizeTargetCapabilities(raw);
 }
-function getTargetDetectionPaths(target13, scope = "project") {
-  const descriptor13 = getBuiltinTargetDefinition(target13) ?? getDescriptor(target13);
-  if (!descriptor13) return [];
+function getTargetDetectionPaths(target14, scope = "project") {
+  const descriptor14 = getBuiltinTargetDefinition(target14) ?? getDescriptor(target14);
+  if (!descriptor14) return [];
   if (scope === "global") {
-    return descriptor13.globalSupport?.detectionPaths ?? [];
+    return descriptor14.globalSupport?.detectionPaths ?? [];
   }
-  return descriptor13.detectionPaths;
+  return descriptor14.detectionPaths;
 }
-function getTargetLayout(target13, scope = "project") {
-  const descriptor13 = getBuiltinTargetDefinition(target13) ?? getDescriptor(target13);
-  if (!descriptor13) return void 0;
+function getTargetLayout(target14, scope = "project") {
+  const descriptor14 = getBuiltinTargetDefinition(target14) ?? getDescriptor(target14);
+  if (!descriptor14) return void 0;
   if (scope === "global") {
-    return descriptor13.globalSupport?.layout;
+    return descriptor14.globalSupport?.layout;
   }
-  return descriptor13.project;
+  return descriptor14.project;
 }
-function getTargetPrimaryRootInstructionPath(target13, scope = "project") {
-  return getTargetLayout(target13, scope)?.rootInstructionPath;
+function getTargetPrimaryRootInstructionPath(target14, scope = "project") {
+  return getTargetLayout(target14, scope)?.rootInstructionPath;
 }
-function getTargetSkillDir(target13, scope = "project") {
-  return getTargetLayout(target13, scope)?.skillDir;
+function getTargetSkillDir(target14, scope = "project") {
+  return getTargetLayout(target14, scope)?.skillDir;
 }
-function getTargetManagedOutputs(target13, scope = "project") {
-  return getTargetLayout(target13, scope)?.managedOutputs;
+function getTargetManagedOutputs(target14, scope = "project") {
+  return getTargetLayout(target14, scope)?.managedOutputs;
 }
-function rewriteGeneratedOutputPath(target13, path, scope = "project") {
-  const layout = getTargetLayout(target13, scope);
+function rewriteGeneratedOutputPath(target14, path, scope = "project") {
+  const layout = getTargetLayout(target14, scope);
   if (!layout) return null;
   return layout.rewriteGeneratedPath ? layout.rewriteGeneratedPath(path) : path;
 }
-function isFeatureSuppressedByConversion(descriptor13, feature, config, scope) {
-  if (!descriptor13 || !config) return false;
-  if (feature === "commands" && descriptor13.supportsConversion?.commands) {
-    return !shouldConvertCommandsToSkills(config, descriptor13.id, true, scope);
+function isFeatureSuppressedByConversion(descriptor14, feature, config, scope) {
+  if (!descriptor14 || !config) return false;
+  if (feature === "commands" && descriptor14.supportsConversion?.commands) {
+    return !shouldConvertCommandsToSkills(config, descriptor14.id, true, scope);
   }
-  if (feature === "agents" && descriptor13.supportsConversion?.agents) {
-    return !shouldConvertAgentsToSkills(config, descriptor13.id, true, scope);
+  if (feature === "agents" && descriptor14.supportsConversion?.agents) {
+    return !shouldConvertAgentsToSkills(config, descriptor14.id, true, scope);
   }
   return false;
 }
-function getEffectiveTargetSupportLevel(target13, feature, config, scope = "project") {
-  const baseLevel = getTargetCapabilities(target13, scope)?.[feature]?.level ?? "none";
+function getEffectiveTargetSupportLevel(target14, feature, config, scope = "project") {
+  const baseLevel = getTargetCapabilities(target14, scope)?.[feature]?.level ?? "none";
   if (baseLevel !== "embedded") return baseLevel;
-  const descriptor13 = getBuiltinTargetDefinition(target13) ?? getDescriptor(target13);
-  return isFeatureSuppressedByConversion(descriptor13, feature, config, scope) ? "none" : baseLevel;
+  const descriptor14 = getBuiltinTargetDefinition(target14) ?? getDescriptor(target14);
+  return isFeatureSuppressedByConversion(descriptor14, feature, config, scope) ? "none" : baseLevel;
 }
-function resolveTargetFeatureGenerator(target13, feature, config, scope = "project") {
-  const descriptor13 = getBuiltinTargetDefinition(target13) ?? getDescriptor(target13);
-  if (!descriptor13?.generators) return void 0;
-  if (isFeatureSuppressedByConversion(descriptor13, feature, config, scope)) return void 0;
+function resolveTargetFeatureGenerator(target14, feature, config, scope = "project") {
+  const descriptor14 = getBuiltinTargetDefinition(target14) ?? getDescriptor(target14);
+  if (!descriptor14?.generators) return void 0;
+  if (isFeatureSuppressedByConversion(descriptor14, feature, config, scope)) return void 0;
   const pick = PICK_FEATURE_GENERATOR[feature];
-  return pick === null ? void 0 : pick(descriptor13.generators);
+  return pick === null ? void 0 : pick(descriptor14.generators);
 }
 var BUILTIN_TARGETS, _builtinTargetsMap, PICK_FEATURE_GENERATOR;
 var init_builtin_targets = __esm({
@@ -11750,6 +12449,7 @@ var init_builtin_targets = __esm({
     init_cursor2();
     init_gemini_cli2();
     init_junie2();
+    init_kilo_code2();
     init_kiro2();
     init_roo_code2();
     init_windsurf2();
@@ -11765,7 +12465,8 @@ var init_builtin_targets = __esm({
       descriptor9,
       descriptor10,
       descriptor11,
-      descriptor12
+      descriptor12,
+      descriptor13
     ];
     PICK_FEATURE_GENERATOR = {
       rules: (g) => g.generateRules,
@@ -11784,8 +12485,9 @@ var init_builtin_targets = __esm({
 // src/public/targets.ts
 init_builtin_targets();
 init_registry();
-function copyCapabilities(capabilities) {
-  return Object.freeze({ ...capabilities });
+init_descriptor_import_runner();
+function copyCapabilities(capabilities2) {
+  return Object.freeze({ ...capabilities2 });
 }
 function copyGenerators(generators) {
   return Object.freeze({ ...generators });
@@ -11818,23 +12520,23 @@ function copyGlobalSupport(globalSupport) {
     layout: copyLayout(globalSupport.layout)
   });
 }
-function copyTargetDescriptor(descriptor13) {
+function copyTargetDescriptor(descriptor14) {
   return Object.freeze({
-    ...descriptor13,
-    generators: copyGenerators(descriptor13.generators),
-    capabilities: copyCapabilities(descriptor13.capabilities),
-    globalSupport: descriptor13.globalSupport === void 0 ? void 0 : copyGlobalSupport(descriptor13.globalSupport),
-    lint: descriptor13.lint === void 0 ? void 0 : Object.freeze({ ...descriptor13.lint }),
-    project: copyLayout(descriptor13.project),
-    supportsConversion: descriptor13.supportsConversion === void 0 ? void 0 : Object.freeze({ ...descriptor13.supportsConversion }),
-    detectionPaths: Object.freeze([...descriptor13.detectionPaths]),
-    sharedArtifacts: descriptor13.sharedArtifacts === void 0 ? void 0 : Object.freeze({ ...descriptor13.sharedArtifacts })
+    ...descriptor14,
+    generators: copyGenerators(descriptor14.generators),
+    capabilities: copyCapabilities(descriptor14.capabilities),
+    globalSupport: descriptor14.globalSupport === void 0 ? void 0 : copyGlobalSupport(descriptor14.globalSupport),
+    lint: descriptor14.lint === void 0 ? void 0 : Object.freeze({ ...descriptor14.lint }),
+    project: copyLayout(descriptor14.project),
+    supportsConversion: descriptor14.supportsConversion === void 0 ? void 0 : Object.freeze({ ...descriptor14.supportsConversion }),
+    detectionPaths: Object.freeze([...descriptor14.detectionPaths]),
+    sharedArtifacts: descriptor14.sharedArtifacts === void 0 ? void 0 : Object.freeze({ ...descriptor14.sharedArtifacts })
   });
 }
 function getTargetCatalog() {
   return Object.freeze(BUILTIN_TARGETS.map(copyTargetDescriptor));
 }
 
-export { getAllDescriptors, getDescriptor, getTargetCatalog, registerTargetDescriptor };
+export { getAllDescriptors, getDescriptor, getTargetCatalog, registerTargetDescriptor, runDescriptorImport };
 //# sourceMappingURL=targets.js.map
 //# sourceMappingURL=targets.js.map