agentsmesh 0.41.0 → 0.42.0

package/dist/targets.js

@@ -1282,12 +1282,6 @@ var init_no_outputs = __esm({
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function managedBlockPattern(start, end) {
-  return new RegExp(`${escapeRegExp(start)}[\\s\\S]*?${escapeRegExp(end)}`, "g");
-}
-function stripManagedBlock(content, start, end) {
-  return content.replace(managedBlockPattern(start, end), "").trim();
-}
 function ruleSource(source) {
   const normalized = source.replace(/\\/g, "/");
   const meshIndex = normalized.lastIndexOf(".agentsmesh/");
@@ -1295,36 +1289,22 @@ function ruleSource(source) {
   if (normalized.startsWith("rules/")) return normalized;
   return join("rules", basename(normalized)).replace(/\\/g, "/");
 }
-function markerForRule(rule) {
-  return {
+function renderEmbeddedRule(rule) {
+  const marker = {
     source: ruleSource(rule.source),
     description: rule.description,
     globs: rule.globs,
     targets: rule.targets
   };
-}
-function embeddedRuleStart(rule) {
-  return `${EMBEDDED_RULE_START_PREFIX}${JSON.stringify(markerForRule(rule))}${EMBEDDED_RULE_START_SUFFIX}`;
-}
-function renderRule(rule) {
-  const parts = [embeddedRuleStart(rule)];
+  const parts = [`${START_PREFIX}${JSON.stringify(marker)}${START_SUFFIX}`];
   if (rule.description.trim()) {
     parts.push(`## ${rule.description.trim()}`, "");
   }
   parts.push(rule.body.trim(), EMBEDDED_RULE_END);
   return parts.filter((part) => part.length > 0).join("\n");
 }
-function renderEmbeddedRulesBlock(rules) {
-  if (rules.length === 0) return "";
-  return [EMBEDDED_RULES_START, ...rules.map(renderRule), EMBEDDED_RULES_END].join("\n");
-}
-function appendEmbeddedRulesBlock(content, rules) {
-  const block = renderEmbeddedRulesBlock(rules);
-  const withoutExisting = stripManagedBlock(content, EMBEDDED_RULES_START, EMBEDDED_RULES_END);
-  if (!block) return withoutExisting;
-  return withoutExisting ? `${withoutExisting}
-
-${block}` : block;
+function renderEmbeddedRuleEntries(rules) {
+  return rules.map(renderEmbeddedRule).join("\n\n");
 }
 function toStringArray2(value) {
   return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
@@ -1351,26 +1331,54 @@ function stripGeneratedHeading(body, description) {
   const heading = `## ${description.trim()}`;
   return trimmed.startsWith(heading) ? trimmed.slice(heading.length).trim() : trimmed;
 }
+function takeEmbeddedRuleEntries(text) {
+  const rules = [];
+  const entry = new RegExp(
+    `${escapeRegExp(START_PREFIX)}([\\s\\S]*?)${escapeRegExp(START_SUFFIX)}([\\s\\S]*?)${escapeRegExp(EMBEDDED_RULE_END)}`,
+    "g"
+  );
+  const rest = text.replace(entry, (whole, markerText, body) => {
+    const marker = parseMarker(markerText);
+    if (!marker) return whole;
+    rules.push({ ...marker, body: stripGeneratedHeading(body, marker.description) });
+    return "";
+  });
+  return { rest: rest.trim(), rules };
+}
+var EMBEDDED_RULE_END, START_PREFIX, START_SUFFIX;
+var init_embedded_rule_entries = __esm({
+  "src/targets/projection/embedded-rule-entries.ts"() {
+    EMBEDDED_RULE_END = "<!-- agentsmesh:embedded-rule:end -->";
+    START_PREFIX = "<!-- agentsmesh:embedded-rule:start ";
+    START_SUFFIX = " -->";
+  }
+});
+
+// src/targets/projection/managed-blocks.ts
+function managedBlockPattern(start, end) {
+  return new RegExp(`${escapeRegExp(start)}[\\s\\S]*?${escapeRegExp(end)}`, "g");
+}
+function stripManagedBlock(content, start, end) {
+  return content.replace(managedBlockPattern(start, end), "").trim();
+}
+function renderEmbeddedRulesBlock(rules) {
+  if (rules.length === 0) return "";
+  return [EMBEDDED_RULES_START, ...rules.map(renderEmbeddedRule), EMBEDDED_RULES_END].join("\n");
+}
+function appendEmbeddedRulesBlock(content, rules) {
+  const block = renderEmbeddedRulesBlock(rules);
+  const withoutExisting = stripManagedBlock(content, EMBEDDED_RULES_START, EMBEDDED_RULES_END);
+  if (!block) return withoutExisting;
+  return withoutExisting ? `${withoutExisting}
+
+${block}` : block;
+}
 function extractEmbeddedRules(content) {
   const rules = [];
   const outerPattern = managedBlockPattern(EMBEDDED_RULES_START, EMBEDDED_RULES_END);
   const rootContent = content.replace(outerPattern, (block) => {
-    const inner = block.replace(EMBEDDED_RULES_START, "").replace(EMBEDDED_RULES_END, "").trim();
-    const entryPattern = new RegExp(
-      `${escapeRegExp(EMBEDDED_RULE_START_PREFIX)}([\\s\\S]*?)${escapeRegExp(EMBEDDED_RULE_START_SUFFIX)}([\\s\\S]*?)${escapeRegExp(EMBEDDED_RULE_END)}`,
-      "g"
-    );
-    for (const match of inner.matchAll(entryPattern)) {
-      const markerText = match[1];
-      const body = match[2];
-      if (markerText === void 0 || body === void 0) continue;
-      const marker = parseMarker(markerText);
-      if (!marker) continue;
-      rules.push({
-        ...marker,
-        body: stripGeneratedHeading(body, marker.description)
-      });
-    }
+    const inner = block.replace(EMBEDDED_RULES_START, "").replace(EMBEDDED_RULES_END, "");
+    rules.push(...takeEmbeddedRuleEntries(inner).rules);
     return "";
   });
   return { rootContent: rootContent.trim(), rules };
@@ -1383,17 +1391,16 @@ function embeddedRootRule(canonical, target34, rootFile) {
   const content = appendEmbeddedRulesBlock(rootBody, nonRootRules);
   return content ? [{ path: rootFile, content }] : [];
 }
-var ROOT_CONTRACT_START, ROOT_CONTRACT_END, EMBEDDED_RULES_START, EMBEDDED_RULES_END, EMBEDDED_RULE_END, EMBEDDED_RULE_START_PREFIX, EMBEDDED_RULE_START_SUFFIX;
+var ROOT_CONTRACT_START, ROOT_CONTRACT_END, EMBEDDED_RULES_START, EMBEDDED_RULES_END;
 var init_managed_blocks = __esm({
   "src/targets/projection/managed-blocks.ts"() {
     init_markdown();
+    init_embedded_rule_entries();
+    init_embedded_rule_entries();
     ROOT_CONTRACT_START = "<!-- agentsmesh:root-generation-contract:start -->";
     ROOT_CONTRACT_END = "<!-- agentsmesh:root-generation-contract:end -->";
     EMBEDDED_RULES_START = "<!-- agentsmesh:embedded-rules:start -->";
     EMBEDDED_RULES_END = "<!-- agentsmesh:embedded-rules:end -->";
-    EMBEDDED_RULE_END = "<!-- agentsmesh:embedded-rule:end -->";
-    EMBEDDED_RULE_START_PREFIX = "<!-- agentsmesh:embedded-rule:start ";
-    EMBEDDED_RULE_START_SUFFIX = " -->";
   }
 });
 
@@ -2059,12 +2066,12 @@ function topLevelDotfilePrefixes(descriptor34) {
     ...descriptor34.detectionPaths,
     ...layouts.flatMap((layout) => managedOutputPaths(layout))
   ];
-  const out = /* @__PURE__ */ new Set();
+  const out2 = /* @__PURE__ */ new Set();
   for (const candidate of candidates) {
     const top = candidate.split("/")[0];
-    if (top && top.startsWith(".") && top.length > 1) out.add(`${top}/`);
+    if (top && top.startsWith(".") && top.length > 1) out2.add(`${top}/`);
   }
-  return out;
+  return out2;
 }
 function buildDefaultRootRelativePrefixes() {
   const set = /* @__PURE__ */ new Set([".agentsmesh/"]);
@@ -2563,9 +2570,9 @@ function markdownBracketLabelDuplicatesDestination(fullContent, labelPathStart,
   let j = closeBracket + 2;
   let dest = "";
   while (j < fullContent.length) {
-    const c = fullContent[j];
-    if (c === ")" || c === "#" || c === "?" || c === " " || c === "	" || c === "\n") break;
-    dest += c;
+    const c2 = fullContent[j];
+    if (c2 === ")" || c2 === "#" || c2 === "?" || c2 === " " || c2 === "	" || c2 === "\n") break;
+    dest += c2;
     j++;
   }
   return dest === labelPathText;
@@ -2661,6 +2668,8 @@ function rewriteFileLinks(input) {
     const lineNumSuffix = lineNumMatch ? lineNumMatch[0] : "";
     if (!rawCandidate) return match;
     const tokenContext = getTokenContext(fullContent, offset, offset + rawCandidate.length);
+    if (input.markdownLinksOnly === true && tokenContext.role !== "markdown-link-dest")
+      return match;
     const candidate = decodeLinkPath(rawCandidate, tokenContext.role);
     if (tokenContext.role !== "markdown-link-dest" && WINDOWS_ABSOLUTE_PATH.test(candidate)) {
       return match;
@@ -2835,13 +2844,12 @@ var init_import_rewriter = __esm({
 });
 async function writeMcpWithMerge(projectRoot, canonicalPath, imported) {
   const destPath = join(projectRoot, canonicalPath);
-  const existing = await readExistingServers(destPath);
+  const existing = parseMcpServers(await readFileSafe(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);
+function parseMcpServers(content) {
   if (content === null) return {};
   let parsed;
   try {
@@ -2852,12 +2860,12 @@ async function readExistingServers(path) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const raw = parsed.mcpServers;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
-    out[name] = value;
+    out2[name] = value;
   }
-  return out;
+  return out2;
 }
 var init_mcp_merge = __esm({
   "src/targets/import/mcp-merge.ts"() {
@@ -3176,13 +3184,13 @@ function parseMcpJson(content, serversKey = "mcpServers") {
   if (!parsed || typeof parsed !== "object") return {};
   const raw = parsed[serversKey];
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const server = value;
     const description = typeof server.description === "string" ? server.description : void 0;
     if (typeof server.command === "string") {
-      out[name] = {
+      out2[name] = {
         type: typeof server.type === "string" ? server.type : "stdio",
         command: server.command,
         args: toStringArray(server.args),
@@ -3192,7 +3200,7 @@ function parseMcpJson(content, serversKey = "mcpServers") {
       continue;
     }
     if (typeof server.url === "string") {
-      out[name] = {
+      out2[name] = {
         type: typeof server.type === "string" ? server.type : "http",
         url: server.url,
         headers: toStringRecord(server.headers),
@@ -3201,7 +3209,7 @@ function parseMcpJson(content, serversKey = "mcpServers") {
       };
     }
   }
-  return out;
+  return out2;
 }
 async function runMcpJson(spec, sources, projectRoot, fromTool) {
   if (!spec.canonicalFilename) {
@@ -3540,14 +3548,14 @@ var init_capability_gap = __esm({
       permissions: AB_PERMISSIONS
     };
     HAS_CONTENT = {
-      commands: (c) => c.commands.length > 0,
-      ignore: (c) => c.ignore.length > 0,
-      mcp: (c) => Object.keys(c.mcp?.mcpServers ?? {}).length > 0,
-      hooks: (c) => Object.values(c.hooks ?? {}).some((entries) => Array.isArray(entries) && entries.length > 0),
-      permissions: (c) => {
-        if (!c.permissions) return false;
-        const { allow, deny } = c.permissions;
-        const ask = c.permissions.ask ?? [];
+      commands: (c2) => c2.commands.length > 0,
+      ignore: (c2) => c2.ignore.length > 0,
+      mcp: (c2) => Object.keys(c2.mcp?.mcpServers ?? {}).length > 0,
+      hooks: (c2) => Object.values(c2.hooks ?? {}).some((entries) => Array.isArray(entries) && entries.length > 0),
+      permissions: (c2) => {
+        if (!c2.permissions) return false;
+        const { allow, deny } = c2.permissions;
+        const ask = c2.permissions.ask ?? [];
         return allow.length > 0 || deny.length > 0 || ask.length > 0;
       }
     };
@@ -5879,12 +5887,12 @@ function parseJson(content) {
 function serverObjects(root) {
   const raw = asObject2(root?.mcpServers);
   if (!raw) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     const entry = asObject2(value);
-    if (entry) out[name] = entry;
+    if (entry) out2[name] = entry;
   }
-  return out;
+  return out2;
 }
 function mergeMcpServersJson(base, newContent, ownedServerKeys) {
   if (base !== null) {
@@ -6849,12 +6857,14 @@ function canonicalRulePath(source) {
 }
 async function splitEmbeddedRulesToCanonical(input) {
   const extracted = extractEmbeddedRules(input.content);
+  const results = await writeEmbeddedRules(extracted.rules, input);
+  return { rootContent: extracted.rootContent, results };
+}
+async function writeEmbeddedRules(rules, input) {
   const results = [];
-  if (extracted.rules.length === 0) {
-    return { rootContent: extracted.rootContent, results };
-  }
+  if (rules.length === 0) return results;
   await mkdirp(join(input.projectRoot, input.rulesDir));
-  for (const rule of extracted.rules) {
+  for (const rule of rules) {
     const canonicalSource = canonicalRulePath(rule.source);
     if (canonicalSource === null || canonicalSource === "rules/_root.md") continue;
     const destPath = join(input.projectRoot, ".agentsmesh", canonicalSource);
@@ -6864,6 +6874,7 @@ async function splitEmbeddedRulesToCanonical(input) {
       destPath,
       {
         ...frontmatter,
+        ...input.frontmatter,
         root: false,
         description: rule.description || void 0,
         globs: rule.globs.length > 0 ? rule.globs : void 0,
@@ -6879,13 +6890,19 @@ async function splitEmbeddedRulesToCanonical(input) {
       feature: "rules"
     });
   }
-  return { rootContent: extracted.rootContent, results };
+  return results;
+}
+async function splitNestedAgentsFile(input, into) {
+  const { rest, rules } = takeEmbeddedRuleEntries(input.content);
+  into.push(...await writeEmbeddedRules(rules, input));
+  return rest.length > 0 ? rest : null;
 }
 var init_embedded_rules = __esm({
   "src/targets/import/embedded-rules.ts"() {
     init_fs();
     init_markdown();
     init_managed_blocks();
+    init_embedded_rule_entries();
     init_import_metadata();
   }
 });
@@ -7076,12 +7093,12 @@ function parseAntigravityMcpServers(content) {
   if (!parsed || typeof parsed !== "object") return {};
   const raw = parsed.mcpServers;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     const server = parseServer2(value);
-    if (server) out[name] = server;
+    if (server) out2[name] = server;
   }
-  return out;
+  return out2;
 }
 var ANTIGRAVITY_OWNED_SERVER_KEYS;
 var init_mcp_format = __esm({
@@ -8309,7 +8326,7 @@ function generateRules6(canonical) {
     const slug = basename(rule.source, ".md");
     const frontmatter = {};
     if (rule.description) frontmatter.description = rule.description;
-    if (rule.globs.length > 0) frontmatter.globs = rule.globs;
+    if (rule.globs.length > 0) frontmatter.paths = rule.globs;
     const content = serializeFrontmatter(frontmatter, rule.body.trim() || "");
     outputs.push({ path: `${CLAUDE_RULES_DIR}/${slug}.md`, content });
   }
@@ -8691,12 +8708,14 @@ var init_import_mappers2 = __esm({
     }) => {
       const destPath = join(destDir, relativePath);
       const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
+      const { paths: paths2, ...rest } = frontmatter;
+      const scoped = paths2 === void 0 ? {} : { globs: toToolsArray(paths2) };
       return {
         destPath,
         toPath: `${AB_RULES}/${relativePath}`,
         content: await serializeImportedRuleWithFallback(
           destPath,
-          { ...frontmatter, root: false },
+          { ...rest, ...scoped, root: false },
           body
         )
       };
@@ -10201,7 +10220,7 @@ function generateRules8(canonical) {
   const rootBody = canonical.rules.find((rule) => rule.root)?.body.trim() ?? "";
   if (rootBody) outputs.push({ path: CODEBUFF_ROOT_FILE, content: rootBody });
   for (const [path, rules] of groupByNestedPath(eligibleRules(canonical))) {
-    const content = rules.map((rule) => rule.body.trim()).filter((body) => body.length > 0).join("\n\n");
+    const content = renderEmbeddedRuleEntries(rules.filter((rule) => rule.body.trim().length > 0));
     if (content) outputs.push({ path, content });
   }
   return outputs;
@@ -10229,6 +10248,7 @@ var init_generator8 = __esm({
     init_no_outputs();
     init_embedded_skill();
     init_managed_blocks();
+    init_embedded_rule_entries();
     init_command_skill();
     init_nested_rules();
     init_mcp_format2();
@@ -10278,33 +10298,47 @@ function isVendored(relDir) {
 }
 async function importNestedRules(projectRoot, normalize) {
   const destDir = join(projectRoot, AB_RULES);
-  return importFileDirectory({
+  const embedded = [];
+  const results = await importFileDirectory({
     srcDir: projectRoot,
     destDir,
     extensions: [CODEBUFF_ROOT_FILE],
     fromTool: CODEBUFF_TARGET,
     normalize,
-    mapEntry: ({ srcPath, normalizeTo }) => {
+    mapEntry: async ({ srcPath, content, normalizeTo }) => {
       if (basename(srcPath) !== CODEBUFF_ROOT_FILE) return null;
       const relDir = relative(projectRoot, dirname(srcPath)).replace(/\\/g, "/");
       if (!relDir || relDir === ".") return null;
       if (!shouldImportScopedAgentsRule(relDir)) return null;
       if (isVendored(relDir)) return null;
+      const ownText = await splitNestedAgentsFile(
+        {
+          content,
+          projectRoot,
+          rulesDir: AB_RULES,
+          sourcePath: srcPath,
+          fromTool: CODEBUFF_TARGET,
+          normalize
+        },
+        embedded
+      );
+      if (ownText === null) return null;
       const ruleName2 = relDir.replace(/\//g, "-");
       const destPath = join(destDir, `${ruleName2}.md`);
-      const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
-      return serializeImportedRuleWithFallback(
-        destPath,
-        { ...frontmatter, root: false, globs: [`${relDir}/**`] },
-        body
-      ).then((content) => ({
+      const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath, ownText));
+      return {
         destPath,
         toPath: `${AB_RULES}/${ruleName2}.md`,
         feature: "rules",
-        content
-      }));
+        content: await serializeImportedRuleWithFallback(
+          destPath,
+          { ...frontmatter, root: false, globs: [`${relDir}/**`] },
+          body
+        )
+      };
     }
   });
+  return [...results, ...embedded];
 }
 async function importCodebuffRules(projectRoot, scope, normalize) {
   const results = await importRootRule2(projectRoot, scope, normalize);
@@ -10737,7 +10771,7 @@ function generateRules9(canonical) {
   }
   const nested = advisory.filter((rule) => !isRootEmbedded(rule));
   for (const [path, rules] of groupByNestedPath2(nested)) {
-    const content = rules.map((rule) => rule.body.trim()).filter((body) => body.length > 0).join("\n\n");
+    const content = renderEmbeddedRuleEntries(rules.filter((rule) => rule.body.trim().length > 0));
     outputs.push({ path, content });
   }
   return outputs;
@@ -10750,6 +10784,7 @@ function renderCodexGlobalInstructions(canonical) {
 var init_rules = __esm({
   "src/targets/codex-cli/generator/rules.ts"() {
     init_managed_blocks();
+    init_embedded_rule_entries();
     init_constants10();
     init_codex_rule_paths();
   }
@@ -11379,6 +11414,7 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
   await importInstructionMirrors(projectRoot, destDir, results, normalize);
   results.push(...await importCodexNonRootRuleFiles(projectRoot, destDir, normalize));
   if (layoutScope !== "global") {
+    const embedded = [];
     results.push(
       ...await importFileDirectory({
         srcDir: projectRoot,
@@ -11386,7 +11422,7 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
         extensions: ["AGENTS.md", "AGENTS.override.md"],
         fromTool: "codex-cli",
         normalize,
-        mapEntry: async ({ srcPath, normalizeTo }) => {
+        mapEntry: async ({ srcPath, content: content2, normalizeTo }) => {
           const relDir = relative(projectRoot, dirname(srcPath)).replace(/\\/g, "/");
           const fileName = basename(srcPath);
           const isOverride = fileName === "AGENTS.override.md";
@@ -11397,26 +11433,36 @@ async function importCodexRules(projectRoot, results, normalize, normalizeWindsu
             await removePathIfExists(join(destDir, `${ruleName2}.md`));
             return null;
           }
+          const variant = isOverride ? { codex_instruction: "override" } : {};
+          const ownText = await splitNestedAgentsFile(
+            {
+              content: content2,
+              projectRoot,
+              rulesDir: AB_RULES,
+              sourcePath: srcPath,
+              fromTool: "codex-cli",
+              normalize,
+              frontmatter: variant
+            },
+            embedded
+          );
+          if (ownText === null) return null;
           const destPath = join(destDir, `${ruleName2}.md`);
-          const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
+          const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath, ownText));
           return {
             destPath,
             toPath: `${AB_RULES}/${ruleName2}.md`,
             feature: "rules",
             content: await serializeImportedRuleWithFallback(
               destPath,
-              {
-                ...frontmatter,
-                root: false,
-                globs: [`${relDir}/**`],
-                ...isOverride ? { codex_instruction: "override" } : {}
-              },
+              { ...frontmatter, root: false, globs: [`${relDir}/**`], ...variant },
               body
             )
           };
         }
       })
     );
+    results.push(...embedded);
   }
 }
 async function importInstructionMirrors(projectRoot, destDir, results, normalize) {
@@ -12162,11 +12208,11 @@ function serializeContinuePermissions(permissions) {
   const ask = permissions.ask ?? [];
   const exclude = permissions.deny ?? [];
   if (allow.length === 0 && ask.length === 0 && exclude.length === 0) return null;
-  const out = {};
-  if (allow.length > 0) out.allow = allow;
-  if (ask.length > 0) out.ask = ask;
-  if (exclude.length > 0) out.exclude = exclude;
-  return stringify(out).trimEnd() + "\n";
+  const out2 = {};
+  if (allow.length > 0) out2.allow = allow;
+  if (ask.length > 0) out2.ask = ask;
+  if (exclude.length > 0) out2.exclude = exclude;
+  return stringify(out2).trimEnd() + "\n";
 }
 function parseContinuePermissions(content) {
   let parsed;
@@ -13365,14 +13411,14 @@ async function generateCopilotGlobalHooks(canonical, projectRoot) {
     COPILOT_GLOBAL_HOOKS_DIR
   );
   const results = [];
-  for (const out of outputs) {
-    const existing = await readFileSafe(join(projectRoot, out.path));
+  for (const out2 of outputs) {
+    const existing = await readFileSafe(join(projectRoot, out2.path));
     results.push({
       target: COPILOT_TARGET,
-      path: out.path,
-      content: out.content,
+      path: out2.path,
+      content: out2.content,
       currentContent: existing ?? void 0,
-      status: computeStatus6(existing, out.content)
+      status: computeStatus6(existing, out2.content)
     });
   }
   return results;
@@ -13979,13 +14025,13 @@ function parseCrushPermissions(rawPermissions, rawOptions) {
 }
 function parseCrushMcpServers(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const server = value;
     const description = typeof server["description"] === "string" ? server["description"] : void 0;
     if (typeof server["command"] === "string") {
-      out[name] = {
+      out2[name] = {
         type: typeof server["type"] === "string" ? server["type"] : "stdio",
         command: server["command"],
         args: toStringArray(server["args"]),
@@ -13995,7 +14041,7 @@ function parseCrushMcpServers(raw) {
       continue;
     }
     if (typeof server["url"] === "string") {
-      out[name] = {
+      out2[name] = {
         type: typeof server["type"] === "string" ? server["type"] : "http",
         url: server["url"],
         headers: toStringRecord(server["headers"]),
@@ -14004,11 +14050,11 @@ function parseCrushMcpServers(raw) {
       };
     }
   }
-  return out;
+  return out2;
 }
 function parseCrushHooks(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
-  const out = {};
+  const out2 = {};
   for (const [event, entries] of Object.entries(raw)) {
     if (!Array.isArray(entries)) continue;
     const items = [];
@@ -14022,9 +14068,9 @@ function parseCrushHooks(raw) {
       if (typeof e["timeout"] === "number") item.timeout = e["timeout"];
       items.push(item);
     }
-    if (items.length > 0) out[event] = items;
+    if (items.length > 0) out2[event] = items;
   }
-  return Object.keys(out).length > 0 ? out : null;
+  return Object.keys(out2).length > 0 ? out2 : null;
 }
 function serializeHooksYaml(hooks) {
   const lines = [];
@@ -15488,7 +15534,7 @@ function deepagentsHooksToCanonical(hooksArray) {
   for (const raw of hooksArray) {
     if (!raw || typeof raw !== "object") continue;
     const hook = raw;
-    const commandArr = Array.isArray(hook.command) ? hook.command.filter((c) => typeof c === "string") : [];
+    const commandArr = Array.isArray(hook.command) ? hook.command.filter((c2) => typeof c2 === "string") : [];
     if (commandArr.length === 0) continue;
     const command = commandArr.length === 3 && commandArr[0] === "bash" && commandArr[1] === "-c" ? commandArr[2] : commandArr.join(" ");
     const events = Array.isArray(hook.events) ? hook.events.filter((e) => typeof e === "string") : [];
@@ -18014,13 +18060,13 @@ function parsePluginMcpJson(content) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const servers = parsed.mcpServers;
   if (!servers || typeof servers !== "object" || Array.isArray(servers)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(servers)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const server = pluginEntryToMcpServer(value);
-    if (server) out[name] = server;
+    if (server) out2[name] = server;
   }
-  return out;
+  return out2;
 }
 function parseExtensions(content) {
   let parsed;
@@ -18032,15 +18078,15 @@ function parseExtensions(content) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const extensions = parsed.extensions;
   if (!extensions || typeof extensions !== "object" || Array.isArray(extensions)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(extensions)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const server = extensionToMcpServer(value);
-    if (server) out[name] = server;
+    if (server) out2[name] = server;
   }
-  return out;
+  return out2;
 }
-async function readExistingServers2(destPath) {
+async function readExistingServers(destPath) {
   const content = await readFileSafe(destPath);
   if (content === null) return {};
   let parsed;
@@ -18052,18 +18098,18 @@ async function readExistingServers2(destPath) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const raw = parsed.mcpServers;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
-    out[name] = value;
+    out2[name] = value;
   }
-  return out;
+  return out2;
 }
 async function gooseMcpMap(ctx) {
   const imported = ctx.relativePath.endsWith(".mcp.json") ? parsePluginMcpJson(ctx.content) : parseExtensions(ctx.content);
   if (Object.keys(imported).length === 0) return null;
   const destPath = join(ctx.destDir, "mcp.json");
-  const existing = await readExistingServers2(destPath);
+  const existing = await readExistingServers(destPath);
   const merged = { ...existing, ...imported };
   return {
     destPath,
@@ -18145,19 +18191,19 @@ function asObject3(value) {
 function unownedExtensions(existing) {
   const block = asObject3(existing);
   if (!block) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(block)) {
     const entry = asObject3(value);
-    if (entry && extensionToMcpServer(entry) === null) out[name] = entry;
+    if (entry && extensionToMcpServer(entry) === null) out2[name] = entry;
   }
-  return out;
+  return out2;
 }
 function buildExtensions(servers) {
-  const out = {};
+  const out2 = {};
   for (const [name, server] of Object.entries(servers)) {
-    out[name] = mcpServerToExtension(name, server);
+    out2[name] = mcpServerToExtension(name, server);
   }
-  return out;
+  return out2;
 }
 function result(content, existing) {
   return {
@@ -18673,18 +18719,18 @@ function generateRules19(canonical) {
   return outputs;
 }
 function toJunieMcpServer(server) {
-  const out = {};
-  if (server.description) out.description = server.description;
-  if (server.type !== "stdio") out.type = server.type;
+  const out2 = {};
+  if (server.description) out2.description = server.description;
+  if (server.type !== "stdio") out2.type = server.type;
   if (isStdioMcpServer(server)) {
-    out.command = server.command;
-    out.args = server.args;
+    out2.command = server.command;
+    out2.args = server.args;
   } else {
-    out.url = server.url;
-    if (Object.keys(server.headers).length > 0) out.headers = server.headers;
+    out2.url = server.url;
+    if (Object.keys(server.headers).length > 0) out2.headers = server.headers;
   }
-  if (Object.keys(server.env).length > 0) out.env = server.env;
-  return out;
+  if (Object.keys(server.env).length > 0) out2.env = server.env;
+  return out2;
 }
 function generateMcp14(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
@@ -19251,11 +19297,11 @@ var init_import_mappers7 = __esm({
 });
 function toStringRecord3(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-  const out = {};
+  const out2 = {};
   for (const [key, v] of Object.entries(value)) {
-    if (typeof v === "string") out[key] = v;
+    if (typeof v === "string") out2[key] = v;
   }
-  return out;
+  return out2;
 }
 function parseKiloGlobalMcp(content) {
   let parsed;
@@ -19267,13 +19313,13 @@ function parseKiloGlobalMcp(content) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const raw = parsed.mcp;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const entry = value;
     const description = typeof entry.description === "string" ? entry.description : void 0;
     if (typeof entry.url === "string") {
-      out[name] = {
+      out2[name] = {
         type: "url",
         url: entry.url,
         headers: toStringRecord3(entry.headers),
@@ -19285,7 +19331,7 @@ function parseKiloGlobalMcp(content) {
     if (Array.isArray(entry.command) && entry.command.length > 0) {
       const [command, ...args] = entry.command;
       if (typeof command !== "string") continue;
-      out[name] = {
+      out2[name] = {
         type: "stdio",
         command,
         args: args.filter((a) => typeof a === "string"),
@@ -19294,7 +19340,7 @@ function parseKiloGlobalMcp(content) {
       };
     }
   }
-  return out;
+  return out2;
 }
 async function importGlobalKiloMcp(projectRoot, results) {
   const srcPath = join(projectRoot, KILO_GLOBAL_CONFIG_FILE);
@@ -21162,16 +21208,16 @@ function mergeImportedEntries(existing, imported, effect) {
     const key = kiroRuleKey(rule);
     byKey.set(key, [...byKey.get(key) ?? [], entry]);
   }
-  const out = [];
+  const out2 = [];
   const push2 = (entry) => {
-    if (!out.includes(entry)) out.push(entry);
+    if (!out2.includes(entry)) out2.push(entry);
   };
   for (const rule of imported) {
     if (rule.effect !== effect) continue;
     for (const entry of byKey.get(kiroRuleKey(rule)) ?? ruleToCanonicalEntries(rule)) push2(entry);
   }
   for (const entry of unrepresentable) push2(entry);
-  return out;
+  return out2;
 }
 var OWNED_RULE_KEYS;
 var init_permissions_lists = __esm({
@@ -21867,11 +21913,11 @@ var init_generator26 = __esm({
 });
 function toStringRecord4(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return {};
-  const out = {};
+  const out2 = {};
   for (const [k, v] of Object.entries(value)) {
-    if (typeof v === "string") out[k] = v;
+    if (typeof v === "string") out2[k] = v;
   }
-  return out;
+  return out2;
 }
 function parseOpenCodeMcp(content) {
   let parsed;
@@ -21883,12 +21929,12 @@ function parseOpenCodeMcp(content) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
   const raw = parsed.mcp;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const out = {};
+  const out2 = {};
   for (const [name, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) continue;
     const entry = value;
     if (typeof entry.url === "string") {
-      out[name] = {
+      out2[name] = {
         type: "url",
         url: entry.url,
         headers: toStringRecord4(entry.headers),
@@ -21902,7 +21948,7 @@ function parseOpenCodeMcp(content) {
       const command = cmdArr[0];
       if (command === void 0) continue;
       const args = cmdArr.slice(1);
-      out[name] = {
+      out2[name] = {
         type: "stdio",
         command,
         args,
@@ -21911,7 +21957,7 @@ function parseOpenCodeMcp(content) {
       };
     }
   }
-  return out;
+  return out2;
 }
 async function importMcp5(projectRoot, scope, results) {
   const configFile = scope === "global" ? OPENCODE_GLOBAL_CONFIG_FILE : OPENCODE_CONFIG_FILE;
@@ -23093,12 +23139,12 @@ function unmappedPermissionEntries3(permissions) {
   };
 }
 function defaultToolsToCanonicalAllow(tools) {
-  const out = [];
+  const out2 = [];
   for (const tool of tools) {
     const name = CANONICAL_BY_PI_TOOL.get(tool);
-    if (name !== void 0 && !out.includes(name)) out.push(name);
+    if (name !== void 0 && !out2.includes(name)) out2.push(name);
   }
-  return out;
+  return out2;
 }
 function parseObject(content) {
   try {
@@ -23134,11 +23180,11 @@ function withDefaultTools(settings, tools, keepEmptyKey) {
   return JSON.stringify(settings, null, 2) + "\n";
 }
 function mergeImportedAllow(existing, tools) {
-  const out = defaultToolsToCanonicalAllow(tools);
+  const out2 = defaultToolsToCanonicalAllow(tools);
   for (const entry of existing) {
-    if (piToolFor(entry) === null && !out.includes(entry)) out.push(entry);
+    if (piToolFor(entry) === null && !out2.includes(entry)) out2.push(entry);
   }
-  return out;
+  return out2;
 }
 var PI_BUILTIN_TOOLS, PI_TOOL_BY_CANONICAL, CANONICAL_BY_PI_TOOL, OWNED_PI_TOOLS;
 var init_permissions_format4 = __esm({
@@ -25390,18 +25436,18 @@ function approvalOf(value) {
   const approval = value.approval;
   return approval === "allow" || approval === "ask" || approval === "deny" ? approval : null;
 }
-function collectRules(bucket, suffix, out) {
+function collectRules(bucket, suffix, out2) {
   if (!isRecord(bucket)) return;
   for (const [command, rule] of Object.entries(bucket)) {
     const approval = approvalOf(rule);
     if (approval === null || command.trim() === "") continue;
-    out[approval].push(`Bash(${command}${suffix})`);
+    out2[approval].push(`Bash(${command}${suffix})`);
   }
 }
-function collectPaths(value, tool, out) {
+function collectPaths(value, tool, out2) {
   if (!Array.isArray(value)) return;
   for (const path of value) {
-    if (typeof path === "string" && path.trim() !== "") out.push(`${tool}(${path})`);
+    if (typeof path === "string" && path.trim() !== "") out2.push(`${tool}(${path})`);
   }
 }
 function traeToPermissions(root) {
@@ -25448,11 +25494,11 @@ function branch(parent, key) {
   return isRecord6(value) ? { ...value } : {};
 }
 function unionPaths(existing, projected) {
-  const out = stringList(existing);
+  const out2 = stringList(existing);
   for (const path of projected) {
-    if (!out.includes(path)) out.push(path);
+    if (!out2.includes(path)) out2.push(path);
   }
-  return out;
+  return out2;
 }
 function applyBucket(rules, bucket, projected) {
   if (Object.keys(projected).length === 0) return;
@@ -26178,12 +26224,12 @@ function mapsToWarpKey(pattern, list) {
   return pattern.trim() === "Read" || readTarget(pattern) !== null;
 }
 function uniqueRegexes(patterns, list) {
-  const out = [];
+  const out2 = [];
   for (const pattern of patterns) {
     const regex = commandRegex(pattern, list);
-    if (regex !== null && !out.includes(regex)) out.push(regex);
+    if (regex !== null && !out2.includes(regex)) out2.push(regex);
   }
-  return out;
+  return out2;
 }
 function filterLists(permissions, keep) {
   return {
@@ -26223,10 +26269,10 @@ function stringEntries(value) {
   if (!Array.isArray(value)) return [];
   return value.filter((entry) => typeof entry === "string");
 }
-function collectCommands(value, list, out) {
+function collectCommands(value, list, out2) {
   for (const regex of stringEntries(value)) {
     const pattern = commandPattern(regex, list);
-    if (pattern !== null && !out.includes(pattern)) out.push(pattern);
+    if (pattern !== null && !out2.includes(pattern)) out2.push(pattern);
   }
 }
 function profileToPermissions(profiles) {
@@ -26618,12 +26664,6 @@ function ruleSlug3(source) {
   const name = basename(source, ".md");
   return name === "_root" ? "root" : name;
 }
-function directoryScopedRuleDir(globs) {
-  if (globs.length === 0) return null;
-  const dirs = globs.map((glob) => glob.split("/")[0] ?? "").filter((segment) => /^[A-Za-z0-9._-]+$/.test(segment));
-  if (dirs.length !== globs.length) return null;
-  return dirs.every((dir) => dir === dirs[0]) ? dirs[0] : null;
-}
 function generateRules32(canonical) {
   const outputs = [];
   const root = canonical.rules.find((r) => r.root);
@@ -26640,21 +26680,14 @@ function generateRules32(canonical) {
     const frontmatter = {
       description: rule.description || void 0,
       trigger: normalizedTrigger,
-      glob: rule.globs.length === 1 ? rule.globs[0] : void 0,
-      globs: rule.globs.length > 1 ? rule.globs : void 0
+      // Windsurf reads `globs` as one comma-joined string; it ignores `glob`.
+      globs: rule.globs.length > 0 ? rule.globs.join(",") : void 0
     };
     Object.keys(frontmatter).forEach((k) => {
       if (frontmatter[k] === void 0) delete frontmatter[k];
     });
     const content = Object.keys(frontmatter).length > 0 ? serializeFrontmatter(frontmatter, rule.body.trim() || "") : rule.body.trim() || "";
     outputs.push({ path: `${WINDSURF_RULES_DIR}/${slug}.md`, content });
-    const dir = directoryScopedRuleDir(rule.globs);
-    if (dir) {
-      if (dir !== slug) {
-        outputs.push({ path: `${WINDSURF_RULES_DIR}/${dir}.md`, content });
-      }
-      outputs.push({ path: `${dir}/AGENTS.md`, content: rule.body.trim() || "" });
-    }
   }
   return outputs;
 }
@@ -26854,6 +26887,185 @@ var init_generator36 = __esm({
     init_generator35();
   }
 });
+
+// src/utils/output/color.ts
+function noColorRequested() {
+  const value = process.env.NO_COLOR;
+  return value !== void 0 && value !== "";
+}
+function forceColorRequested() {
+  const value = process.env.FORCE_COLOR;
+  if (value === void 0) return void 0;
+  return value !== "0" && value !== "false";
+}
+function colorEnabled(stream = process.stdout) {
+  const forced = forceColorRequested();
+  if (forced !== void 0) return forced;
+  if (noColorRequested()) return false;
+  return stream.isTTY === true;
+}
+var init_color = __esm({
+  "src/utils/output/color.ts"() {
+  }
+});
+
+// src/utils/output/logger.ts
+function outStream() {
+  return stdoutRedirectedToStderr ? process.stderr : process.stdout;
+}
+function out(text) {
+  outStream().write(text);
+}
+function c(code, text, stream) {
+  return colorEnabled(stream) ? `${code}${text}${C.reset}` : text;
+}
+var C, muted, stdoutRedirectedToStderr, logger;
+var init_logger = __esm({
+  "src/utils/output/logger.ts"() {
+    init_color();
+    C = {
+      green: "\x1B[32m",
+      red: "\x1B[31m",
+      yellow: "\x1B[33m",
+      cyan: "\x1B[36m",
+      reset: "\x1B[0m"
+    };
+    muted = false;
+    stdoutRedirectedToStderr = false;
+    logger = {
+      info(msg) {
+        if (muted) return;
+        out(c(C.cyan, msg, outStream()) + "\n");
+      },
+      warn(msg) {
+        if (muted) return;
+        process.stderr.write(c(C.yellow, "\u26A0 ", process.stderr) + msg + "\n");
+      },
+      error(msg) {
+        if (muted) return;
+        process.stderr.write(c(C.red, "\u2717 ", process.stderr) + msg + "\n");
+      },
+      success(msg) {
+        if (muted) return;
+        out(c(C.green, "\u2713 ", outStream()) + msg + "\n");
+      },
+      debug(msg) {
+        if (muted) return;
+        if (process.env.AGENTSMESH_DEBUG === "1") {
+          out(c(C.cyan, "[debug] ", outStream()) + msg + "\n");
+        }
+      }
+    };
+  }
+});
+
+// src/targets/windsurf/rule-globs.ts
+function splitTopLevelCommas(value) {
+  const parts = [];
+  let depth = 0;
+  let current = "";
+  for (const char of value) {
+    if (char === "{") depth++;
+    else if (char === "}") depth = Math.max(0, depth - 1);
+    if (char === "," && depth === 0) {
+      parts.push(current);
+      current = "";
+    } else {
+      current += char;
+    }
+  }
+  parts.push(current);
+  return parts.map((part) => part.trim()).filter(Boolean);
+}
+function parseWindsurfGlobs(value) {
+  if (typeof value === "string") return splitTopLevelCommas(value);
+  return Array.isArray(value) ? toToolsArray(value) : [];
+}
+function quoteWindsurfGlobValues(content) {
+  const lines = content.split("\n");
+  if (lines[0]?.trim() !== "---") return content;
+  for (let i = 1; i < lines.length; i++) {
+    if (lines[i].trim() === "---") break;
+    const match = UNQUOTED_GLOBS_LINE.exec(lines[i]);
+    if (match !== null) lines[i] = `${match[1]}${JSON.stringify(match[2])}${match[3]}`;
+  }
+  return lines.join("\n");
+}
+var UNQUOTED_GLOBS_LINE;
+var init_rule_globs = __esm({
+  "src/targets/windsurf/rule-globs.ts"() {
+    init_shared_import_helpers();
+    UNQUOTED_GLOBS_LINE = /^(\s*globs?\s*:[ \t]*)([^\s"'[{|>#][^\r\n]*?)[ \t]*(\r?)$/;
+  }
+});
+async function windsurfRuleBodies(projectRoot) {
+  const files = await readDirRecursiveNoSymlinks(join(projectRoot, WINDSURF_RULES_DIR));
+  const bodies = /* @__PURE__ */ new Set();
+  for (const file of files.filter((path) => path.endsWith(".md"))) {
+    const content = await readFileSafe(file);
+    if (content !== null) bodies.add(bodyKey(splitFrontmatter(content)?.body ?? content));
+  }
+  return bodies;
+}
+async function importWindsurfNestedAgents(projectRoot, normalize) {
+  const destRulesDir = join(projectRoot, AB_RULES);
+  const embedded = [];
+  const ruleBodies = await windsurfRuleBodies(projectRoot);
+  const results = await importFileDirectory({
+    srcDir: projectRoot,
+    destDir: destRulesDir,
+    extensions: ["AGENTS.md"],
+    fromTool: "windsurf",
+    normalize,
+    mapEntry: async ({ srcPath, content, normalizeTo }) => {
+      const relDir = relative(projectRoot, dirname(srcPath)).replace(/\\/g, "/");
+      if (!relDir || relDir === "." || basename(srcPath) !== "AGENTS.md") return null;
+      const ruleName2 = relDir.replace(/\//g, "-");
+      if (!shouldImportScopedAgentsRule(relDir)) {
+        await removePathIfExists(join(destRulesDir, `${ruleName2}.md`));
+        return null;
+      }
+      const ownText = await splitNestedAgentsFile(
+        {
+          content,
+          projectRoot,
+          rulesDir: AB_RULES,
+          sourcePath: srcPath,
+          fromTool: "windsurf",
+          normalize
+        },
+        embedded
+      );
+      if (ownText === null || ruleBodies.has(bodyKey(ownText))) return null;
+      const destPath = join(destRulesDir, `${ruleName2}.md`);
+      return {
+        destPath,
+        toPath: `${AB_RULES}/${ruleName2}.md`,
+        feature: "rules",
+        content: await serializeImportedRuleWithFallback(
+          destPath,
+          { root: false, globs: [`${relDir}/**`] },
+          normalizeTo(destPath, ownText)
+        )
+      };
+    }
+  });
+  return [...results, ...embedded];
+}
+var bodyKey;
+var init_import_nested_agents = __esm({
+  "src/targets/windsurf/import-nested-agents.ts"() {
+    init_canonical_paths();
+    init_embedded_rules();
+    init_import_metadata();
+    init_import_orchestrator();
+    init_scoped_agents_import();
+    init_fs();
+    init_markdown();
+    init_constants34();
+    bodyKey = (text) => text.replace(/\r\n?/g, "\n").trim();
+  }
+});
 function toStringArray3(value) {
   if (Array.isArray(value)) {
     return value.filter((entry) => typeof entry === "string").map((entry) => entry.trim()).filter(Boolean);
@@ -26998,7 +27210,7 @@ function preservedMatcher(existing, event, command) {
 function legacyEntries(entry) {
   const matcher = typeof entry.matcher === "string" && entry.matcher.trim() ? entry.matcher : WILDCARD_MATCHER;
   const hooksList = Array.isArray(entry.hooks) ? entry.hooks : [];
-  const out = [];
+  const out2 = [];
   for (const item of hooksList) {
     if (!item || typeof item !== "object") continue;
     const hook = item;
@@ -27010,9 +27222,9 @@ function legacyEntries(entry) {
       command
     };
     if (typeof hook.timeout === "number") canonical.timeout = hook.timeout;
-    out.push(canonical);
+    out2.push(canonical);
   }
-  return out;
+  return out2;
 }
 function windsurfHooksToCanonical(hooks, existing) {
   const result2 = {};
@@ -27122,35 +27334,7 @@ async function importFromWindsurf(projectRoot, options) {
     }
   }
   if (layoutScope !== "global") {
-    results.push(
-      ...await importFileDirectory({
-        srcDir: projectRoot,
-        destDir: destRulesDir,
-        extensions: ["AGENTS.md"],
-        fromTool: "windsurf",
-        normalize,
-        mapEntry: async ({ srcPath, normalizeTo }) => {
-          const relDir = relative(projectRoot, dirname(srcPath)).replace(/\\/g, "/");
-          if (!relDir || relDir === "." || basename(srcPath) !== "AGENTS.md") return null;
-          const ruleName2 = relDir.replace(/\//g, "-");
-          if (!shouldImportScopedAgentsRule(relDir)) {
-            await removePathIfExists(join(destRulesDir, `${ruleName2}.md`));
-            return null;
-          }
-          const destPath = join(destRulesDir, `${ruleName2}.md`);
-          return {
-            destPath,
-            toPath: `${AB_RULES}/${ruleName2}.md`,
-            feature: "rules",
-            content: await serializeImportedRuleWithFallback(
-              destPath,
-              { root: false, globs: [`${relDir}/**`] },
-              normalizeTo(destPath)
-            )
-          };
-        }
-      })
-    );
+    results.push(...await importWindsurfNestedAgents(projectRoot, normalize));
   }
   const rulesDir = join(projectRoot, WINDSURF_RULES_DIR);
   results.push(
@@ -27160,15 +27344,22 @@ async function importFromWindsurf(projectRoot, options) {
       extensions: [".md"],
       fromTool: "windsurf",
       normalize,
-      mapEntry: async ({ relativePath, normalizeTo }) => {
+      mapEntry: async ({ relativePath, content, normalizeTo }) => {
         if (relativePath === "_root.md" && rootContent !== null) return null;
         const destPath = join(destRulesDir, relativePath);
-        const { frontmatter, body } = parseFrontmatter(normalizeTo(destPath));
-        const normalizedFrontmatter = { ...frontmatter };
-        if (typeof normalizedFrontmatter.glob === "string" && normalizedFrontmatter.glob.trim()) {
-          normalizedFrontmatter.globs = [normalizedFrontmatter.glob];
-          delete normalizedFrontmatter.glob;
+        const sourceLabel = `${WINDSURF_RULES_DIR}/${relativePath}`;
+        const parsed = tryParseFrontmatter(
+          normalizeTo(destPath, quoteWindsurfGlobValues(content)),
+          sourceLabel
+        );
+        if (!parsed.ok) {
+          logger.warn(`Skipping ${sourceLabel}: ${parsed.error.message}`);
+          return null;
         }
+        const { frontmatter, body } = parsed.value;
+        const { glob, ...normalizedFrontmatter } = frontmatter;
+        const globs = parseWindsurfGlobs(frontmatter.globs ?? glob);
+        if (globs.length > 0) normalizedFrontmatter.globs = globs;
         return {
           destPath,
           toPath: `${AB_RULES}/${relativePath}`,
@@ -27219,9 +27410,11 @@ var init_importer32 = __esm({
     init_import_rewriter();
     init_fs();
     init_markdown();
+    init_logger();
+    init_rule_globs();
     init_import_metadata();
     init_import_orchestrator();
-    init_scoped_agents_import();
+    init_import_nested_agents();
     init_constants34();
     init_importer_workflows();
     init_skills_adapter5();
@@ -27326,12 +27519,6 @@ var init_lint31 = __esm({
 });
 
 // src/targets/windsurf/index.ts
-function directoryScopedRuleDir2(globs) {
-  if (globs.length === 0) return null;
-  const dirs = globs.map((glob) => glob.split("/")[0] ?? "").filter((segment) => /^[A-Za-z0-9._-]+$/.test(segment));
-  if (dirs.length !== globs.length) return null;
-  return dirs.every((dir) => dir === dirs[0]) ? dirs[0] : null;
-}
 var target32, project24, globalLayout30, globalCapabilities25, descriptor32;
 var init_windsurf2 = __esm({
   "src/targets/windsurf/index.ts"() {
@@ -27363,9 +27550,7 @@ var init_windsurf2 = __esm({
     project24 = {
       rootInstructionPath: WINDSURF_AGENTS_MD,
       extraRuleOutputPaths(rule) {
-        if (rule.root) return [WINDSURF_AGENTS_MD];
-        const dir = directoryScopedRuleDir2(rule.globs);
-        return dir !== null ? [`${dir}/AGENTS.md`] : [];
+        return rule.root ? [WINDSURF_AGENTS_MD] : [];
       },
       skillDir: WINDSURF_SKILLS_DIR,
       managedOutputs: {
@@ -28042,23 +28227,23 @@ function buildZedOwnedOverlay(canonical, scope, enabledFeatures) {
   if (enabledFeatures.has("permissions") && scope === "global") addPermissions(canonical, overlay);
   return overlay;
 }
-function applyZedOwnedSettingsKey(out, key, desired) {
+function applyZedOwnedSettingsKey(out2, key, desired) {
   if (key === ZED_AGENT_KEY) {
-    const merged = mergeZedAgent(out[ZED_AGENT_KEY], desired ?? {});
-    if (merged === void 0) delete out[ZED_AGENT_KEY];
-    else out[ZED_AGENT_KEY] = merged;
+    const merged = mergeZedAgent(out2[ZED_AGENT_KEY], desired ?? {});
+    if (merged === void 0) delete out2[ZED_AGENT_KEY];
+    else out2[ZED_AGENT_KEY] = merged;
     return;
   }
   if (key === ZED_FILE_SCAN_EXCLUSIONS_KEY || key === ZED_PRIVATE_FILES_KEY) {
     const merged = mergeZedIgnoreList(
-      out[key],
+      out2[key],
       Array.isArray(desired) ? desired : []
     );
-    if (merged !== null) out[key] = merged;
+    if (merged !== null) out2[key] = merged;
     return;
   }
-  if (desired !== void 0) out[key] = desired;
-  else delete out[key];
+  if (desired !== void 0) out2[key] = desired;
+  else delete out2[key];
 }
 function parseZedSettings(raw) {
   if (raw === null) return null;