agentsmesh 0.26.0 → 0.27.0

package/dist/canonical.js

@@ -497,16 +497,21 @@ function canUseScopedSettings(feature) {
   return settingsBackedFeatures.includes(feature);
 }
 function validateCapabilityImplementations(descriptor31, capabilities17, ctx, pathPrefix) {
+  const isGlobalScope = pathPrefix[0] === "globalSupport";
+  const hasScopeExtras = isGlobalScope && typeof descriptor31.globalSupport?.scopeExtras === "function";
   for (const requirement of generatorRequirements) {
     const level = capabilityLevel(capabilities17[requirement.feature]);
     if (level === "none") continue;
+    const settingsBacked = canUseScopedSettings(requirement.feature);
     const hasGenerator = typeof descriptor31.generators[requirement.generator] === "function";
-    const hasSettingsEmitter = canUseScopedSettings(requirement.feature) && typeof descriptor31.emitScopedSettings === "function";
-    if (hasGenerator || hasSettingsEmitter) continue;
+    const hasSettingsEmitter = settingsBacked && typeof descriptor31.emitScopedSettings === "function";
+    const hasScopeExtrasEmitter = settingsBacked && hasScopeExtras;
+    if (hasGenerator || hasSettingsEmitter || hasScopeExtrasEmitter) continue;
+    const settingsHint = settingsBacked ? isGlobalScope ? " or emitScopedSettings or globalSupport.scopeExtras" : " or emitScopedSettings" : "";
     ctx.addIssue({
       code: "custom",
       path: [...pathPrefix, requirement.feature],
-      message: `Capability "${requirement.feature}" is "${level}" but generators.${requirement.generator}` + (canUseScopedSettings(requirement.feature) ? " or emitScopedSettings" : "") + " is missing."
+      message: `Capability "${requirement.feature}" is "${level}" but generators.${requirement.generator}${settingsHint} is missing.`
     });
   }
 }
@@ -1426,13 +1431,14 @@ var init_embedded_skill = __esm({
 });
 
 // src/targets/aider/constants.ts
-var AIDER_TARGET, AIDER_CONVENTIONS, AIDER_SKILLS_DIR, AIDER_IGNORE, AIDER_GLOBAL_CONVENTIONS, AIDER_GLOBAL_SKILLS_DIR, AIDER_GLOBAL_IGNORE, AIDER_CANONICAL_RULES_DIR, AIDER_CANONICAL_IGNORE;
+var AIDER_TARGET, AIDER_CONVENTIONS, AIDER_SKILLS_DIR, AIDER_IGNORE, AIDER_CONF_FILE, AIDER_GLOBAL_CONVENTIONS, AIDER_GLOBAL_SKILLS_DIR, AIDER_GLOBAL_IGNORE, AIDER_CANONICAL_RULES_DIR, AIDER_CANONICAL_IGNORE;
 var init_constants = __esm({
   "src/targets/aider/constants.ts"() {
     AIDER_TARGET = "aider";
     AIDER_CONVENTIONS = "CONVENTIONS.md";
     AIDER_SKILLS_DIR = ".aider/skills";
     AIDER_IGNORE = ".aiderignore";
+    AIDER_CONF_FILE = ".aider.conf.yml";
     AIDER_GLOBAL_CONVENTIONS = "CONVENTIONS.md";
     AIDER_GLOBAL_SKILLS_DIR = ".aider/skills";
     AIDER_GLOBAL_IGNORE = ".aiderignore";
@@ -1440,8 +1446,6 @@ var init_constants = __esm({
     AIDER_CANONICAL_IGNORE = ".agentsmesh/ignore";
   }
 });
-
-// src/targets/aider/generator.ts
 function generateRules(canonical) {
   const root = canonical.rules.find((rule) => rule.root);
   const nonRootRules = canonical.rules.filter((rule) => {
@@ -1451,7 +1455,10 @@ function generateRules(canonical) {
   const rootBody = root?.body.trim() ?? "";
   const content = appendEmbeddedRulesBlock(rootBody, nonRootRules);
   if (!content) return [];
-  return [{ path: AIDER_CONVENTIONS, content }];
+  return [
+    { path: AIDER_CONVENTIONS, content },
+    { path: AIDER_CONF_FILE, content: stringify({ read: [AIDER_CONVENTIONS] }) }
+  ];
 }
 function generateSkills(canonical) {
   return generateEmbeddedSkills(canonical, AIDER_SKILLS_DIR);
@@ -3246,7 +3253,7 @@ var init_antigravity = __esm({
 });
 
 // src/targets/augment-code/constants.ts
-var AUGMENT_CODE_TARGET, AUGMENT_CODE_DIR, AUGMENT_CODE_RULES_DIR, AUGMENT_CODE_COMMANDS_DIR, AUGMENT_CODE_AGENTS_DIR, AUGMENT_CODE_SKILLS_DIR, AUGMENT_CODE_SETTINGS_FILE, AUGMENT_CODE_IGNORE_FILE, AUGMENT_CODE_GLOBAL_DIR, AUGMENT_CODE_GLOBAL_RULES_DIR, AUGMENT_CODE_GLOBAL_COMMANDS_DIR, AUGMENT_CODE_GLOBAL_AGENTS_DIR, AUGMENT_CODE_GLOBAL_SKILLS_DIR, AUGMENT_CODE_GLOBAL_SETTINGS_FILE, AUGMENT_CODE_CANONICAL_RULES_DIR, AUGMENT_CODE_CANONICAL_AGENTS_DIR, AUGMENT_CODE_CANONICAL_MCP, AUGMENT_CODE_CANONICAL_HOOKS, AUGMENT_CODE_CANONICAL_IGNORE;
+var AUGMENT_CODE_TARGET, AUGMENT_CODE_DIR, AUGMENT_CODE_RULES_DIR, AUGMENT_CODE_COMMANDS_DIR, AUGMENT_CODE_AGENTS_DIR, AUGMENT_CODE_SKILLS_DIR, AUGMENT_CODE_SETTINGS_FILE, AUGMENT_CODE_IGNORE_FILE, AUGMENT_CODE_GLOBAL_DIR, AUGMENT_CODE_GLOBAL_RULES_DIR, AUGMENT_CODE_GLOBAL_COMMANDS_DIR, AUGMENT_CODE_GLOBAL_AGENTS_DIR, AUGMENT_CODE_GLOBAL_SKILLS_DIR, AUGMENT_CODE_GLOBAL_SETTINGS_FILE, AUGMENT_CODE_CANONICAL_RULES_DIR, AUGMENT_CODE_CANONICAL_AGENTS_DIR, AUGMENT_CODE_CANONICAL_MCP, AUGMENT_CODE_CANONICAL_HOOKS, AUGMENT_CODE_CANONICAL_IGNORE, AUGMENT_CODE_CANONICAL_PERMISSIONS;
 var init_constants6 = __esm({
   "src/targets/augment-code/constants.ts"() {
     AUGMENT_CODE_TARGET = "augment-code";
@@ -3268,6 +3275,7 @@ var init_constants6 = __esm({
     AUGMENT_CODE_CANONICAL_MCP = ".agentsmesh/mcp.json";
     AUGMENT_CODE_CANONICAL_HOOKS = ".agentsmesh/hooks.yaml";
     AUGMENT_CODE_CANONICAL_IGNORE = ".agentsmesh/ignore";
+    AUGMENT_CODE_CANONICAL_PERMISSIONS = ".agentsmesh/permissions.yaml";
   }
 });
 
@@ -3480,7 +3488,7 @@ var init_codex_cli = __esm({
 });
 
 // src/targets/continue/constants.ts
-var CONTINUE_TARGET, CONTINUE_RULES_DIR, CONTINUE_PROMPTS_DIR, CONTINUE_MCP_DIR, CONTINUE_MCP_FILE, CONTINUE_ROOT_RULE, CONTINUE_ROOT_RULE_LEGACY, CONTINUE_SKILLS_DIR, CONTINUE_GLOBAL_AGENTS_MD, CONTINUE_GLOBAL_CONFIG, CONTINUE_CANONICAL_RULES_DIR, CONTINUE_CANONICAL_COMMANDS_DIR, CONTINUE_CANONICAL_MCP;
+var CONTINUE_TARGET, CONTINUE_RULES_DIR, CONTINUE_PROMPTS_DIR, CONTINUE_MCP_DIR, CONTINUE_MCP_FILE, CONTINUE_ROOT_RULE, CONTINUE_ROOT_RULE_LEGACY, CONTINUE_SKILLS_DIR, CONTINUE_GLOBAL_AGENTS_MD, CONTINUE_GLOBAL_CONFIG, CONTINUE_GLOBAL_PERMISSIONS, CONTINUE_CANONICAL_RULES_DIR, CONTINUE_CANONICAL_COMMANDS_DIR, CONTINUE_CANONICAL_MCP, CONTINUE_CANONICAL_PERMISSIONS;
 var init_constants9 = __esm({
   "src/targets/continue/constants.ts"() {
     CONTINUE_TARGET = "continue";
@@ -3493,9 +3501,11 @@ var init_constants9 = __esm({
     CONTINUE_SKILLS_DIR = ".continue/skills";
     CONTINUE_GLOBAL_AGENTS_MD = ".continue/AGENTS.md";
     CONTINUE_GLOBAL_CONFIG = ".continue/config.yaml";
+    CONTINUE_GLOBAL_PERMISSIONS = ".continue/permissions.yaml";
     CONTINUE_CANONICAL_RULES_DIR = ".agentsmesh/rules";
     CONTINUE_CANONICAL_COMMANDS_DIR = ".agentsmesh/commands";
     CONTINUE_CANONICAL_MCP = ".agentsmesh/mcp.json";
+    CONTINUE_CANONICAL_PERMISSIONS = ".agentsmesh/permissions.yaml";
   }
 });
 async function buildContinueImportPaths(refs, projectRoot, scope = "project") {
@@ -3712,21 +3722,26 @@ var init_deepagents_cli = __esm({
 });
 
 // src/targets/factory-droid/constants.ts
-var FACTORY_DROID_TARGET, FACTORY_DROID_ROOT_FILE, FACTORY_DROID_SKILLS_DIR, FACTORY_DROID_DROIDS_DIR, FACTORY_DROID_MCP_FILE, FACTORY_DROID_GLOBAL_ROOT_FILE, FACTORY_DROID_GLOBAL_SKILLS_DIR, FACTORY_DROID_GLOBAL_DROIDS_DIR, FACTORY_DROID_GLOBAL_MCP_FILE, FACTORY_DROID_HOOKS_FILE, FACTORY_DROID_GLOBAL_HOOKS_FILE, FACTORY_DROID_CANONICAL_RULES_DIR;
+var FACTORY_DROID_TARGET, FACTORY_DROID_ROOT_FILE, FACTORY_DROID_SKILLS_DIR, FACTORY_DROID_COMMANDS_DIR, FACTORY_DROID_DROIDS_DIR, FACTORY_DROID_MCP_FILE, FACTORY_DROID_GLOBAL_ROOT_FILE, FACTORY_DROID_GLOBAL_SKILLS_DIR, FACTORY_DROID_GLOBAL_COMMANDS_DIR, FACTORY_DROID_GLOBAL_DROIDS_DIR, FACTORY_DROID_GLOBAL_MCP_FILE, FACTORY_DROID_HOOKS_FILE, FACTORY_DROID_GLOBAL_HOOKS_FILE, FACTORY_DROID_CANONICAL_RULES_DIR, FACTORY_DROID_CANONICAL_AGENTS_DIR, FACTORY_DROID_CANONICAL_COMMANDS_DIR, FACTORY_DROID_CANONICAL_HOOKS;
 var init_constants13 = __esm({
   "src/targets/factory-droid/constants.ts"() {
     FACTORY_DROID_TARGET = "factory-droid";
     FACTORY_DROID_ROOT_FILE = "AGENTS.md";
     FACTORY_DROID_SKILLS_DIR = ".factory/skills";
+    FACTORY_DROID_COMMANDS_DIR = ".factory/commands";
     FACTORY_DROID_DROIDS_DIR = ".factory/droids";
     FACTORY_DROID_MCP_FILE = ".factory/mcp.json";
     FACTORY_DROID_GLOBAL_ROOT_FILE = ".factory/AGENTS.md";
     FACTORY_DROID_GLOBAL_SKILLS_DIR = ".factory/skills";
+    FACTORY_DROID_GLOBAL_COMMANDS_DIR = ".factory/commands";
     FACTORY_DROID_GLOBAL_DROIDS_DIR = ".factory/droids";
     FACTORY_DROID_GLOBAL_MCP_FILE = ".factory/mcp.json";
     FACTORY_DROID_HOOKS_FILE = ".factory/hooks.json";
     FACTORY_DROID_GLOBAL_HOOKS_FILE = ".factory/hooks.json";
     FACTORY_DROID_CANONICAL_RULES_DIR = ".agentsmesh/rules";
+    FACTORY_DROID_CANONICAL_AGENTS_DIR = ".agentsmesh/agents";
+    FACTORY_DROID_CANONICAL_COMMANDS_DIR = ".agentsmesh/commands";
+    FACTORY_DROID_CANONICAL_HOOKS = ".agentsmesh/hooks.yaml";
   }
 });
 
@@ -3734,6 +3749,9 @@ var init_constants13 = __esm({
 async function buildFactoryDroidImportPaths(refs, projectRoot, scope = "project") {
   if (scope === "global") {
     refs.set(FACTORY_DROID_GLOBAL_ROOT_FILE, `${AB_RULES2}/_root.md`);
+    for (const absPath of await listFiles(projectRoot, FACTORY_DROID_GLOBAL_COMMANDS_DIR)) {
+      addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS3, ".md");
+    }
     for (const absPath of await listFiles(projectRoot, FACTORY_DROID_GLOBAL_DROIDS_DIR)) {
       addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_AGENTS3, ".md");
     }
@@ -3744,6 +3762,9 @@ async function buildFactoryDroidImportPaths(refs, projectRoot, scope = "project"
     return;
   }
   refs.set(FACTORY_DROID_ROOT_FILE, `${AB_RULES2}/_root.md`);
+  for (const absPath of await listFiles(projectRoot, FACTORY_DROID_COMMANDS_DIR)) {
+    addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS3, ".md");
+  }
   for (const absPath of await listFiles(projectRoot, FACTORY_DROID_DROIDS_DIR)) {
     addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_AGENTS3, ".md");
   }
@@ -3790,7 +3811,7 @@ var init_gemini_cli = __esm({
 });
 
 // src/targets/goose/constants.ts
-var GOOSE_TARGET, GOOSE_ROOT_FILE, GOOSE_SKILLS_DIR, GOOSE_IGNORE, GOOSE_GLOBAL_DIR, GOOSE_GLOBAL_ROOT_FILE, GOOSE_GLOBAL_IGNORE, GOOSE_GLOBAL_CONFIG, GOOSE_GLOBAL_SKILLS_DIR, GOOSE_CANONICAL_RULES_DIR, GOOSE_CANONICAL_IGNORE;
+var GOOSE_TARGET, GOOSE_ROOT_FILE, GOOSE_SKILLS_DIR, GOOSE_IGNORE, GOOSE_GLOBAL_DIR, GOOSE_GLOBAL_ROOT_FILE, GOOSE_GLOBAL_IGNORE, GOOSE_GLOBAL_CONFIG, GOOSE_GLOBAL_SKILLS_DIR, GOOSE_GLOBAL_PERMISSIONS, GOOSE_HOOKS_FILE, GOOSE_CANONICAL_RULES_DIR, GOOSE_CANONICAL_IGNORE, GOOSE_CANONICAL_HOOKS, GOOSE_CANONICAL_PERMISSIONS;
 var init_constants14 = __esm({
   "src/targets/goose/constants.ts"() {
     GOOSE_TARGET = "goose";
@@ -3802,8 +3823,12 @@ var init_constants14 = __esm({
     GOOSE_GLOBAL_IGNORE = `${GOOSE_GLOBAL_DIR}/.gooseignore`;
     GOOSE_GLOBAL_CONFIG = `${GOOSE_GLOBAL_DIR}/config.yaml`;
     GOOSE_GLOBAL_SKILLS_DIR = ".agents/skills";
+    GOOSE_GLOBAL_PERMISSIONS = `${GOOSE_GLOBAL_DIR}/permission.yaml`;
+    GOOSE_HOOKS_FILE = ".agents/plugins/agentsmesh/hooks/hooks.json";
     GOOSE_CANONICAL_RULES_DIR = ".agentsmesh/rules";
     GOOSE_CANONICAL_IGNORE = ".agentsmesh/ignore";
+    GOOSE_CANONICAL_HOOKS = ".agentsmesh/hooks.yaml";
+    GOOSE_CANONICAL_PERMISSIONS = ".agentsmesh/permissions.yaml";
   }
 });
 
@@ -4144,16 +4169,19 @@ var init_opencode = __esm({
 });
 
 // src/targets/pi-agent/constants.ts
-var PI_AGENT_TARGET, PI_AGENT_ROOT_FILE, PI_AGENT_SKILLS_DIR, PI_AGENT_GLOBAL_DIR, PI_AGENT_GLOBAL_ROOT_FILE, PI_AGENT_GLOBAL_SKILLS_DIR, PI_AGENT_CANONICAL_RULES_DIR;
+var PI_AGENT_TARGET, PI_AGENT_ROOT_FILE, PI_AGENT_SKILLS_DIR, PI_AGENT_COMMANDS_DIR, PI_AGENT_GLOBAL_DIR, PI_AGENT_GLOBAL_ROOT_FILE, PI_AGENT_GLOBAL_SKILLS_DIR, PI_AGENT_GLOBAL_COMMANDS_DIR, PI_AGENT_CANONICAL_RULES_DIR, PI_AGENT_CANONICAL_COMMANDS_DIR;
 var init_constants20 = __esm({
   "src/targets/pi-agent/constants.ts"() {
     PI_AGENT_TARGET = "pi-agent";
     PI_AGENT_ROOT_FILE = "AGENTS.md";
     PI_AGENT_SKILLS_DIR = ".pi/skills";
+    PI_AGENT_COMMANDS_DIR = ".pi/prompts";
     PI_AGENT_GLOBAL_DIR = ".pi/agent";
     PI_AGENT_GLOBAL_ROOT_FILE = `${PI_AGENT_GLOBAL_DIR}/AGENTS.md`;
     PI_AGENT_GLOBAL_SKILLS_DIR = `${PI_AGENT_GLOBAL_DIR}/skills`;
+    PI_AGENT_GLOBAL_COMMANDS_DIR = `${PI_AGENT_GLOBAL_DIR}/prompts`;
     PI_AGENT_CANONICAL_RULES_DIR = ".agentsmesh/rules";
+    PI_AGENT_CANONICAL_COMMANDS_DIR = ".agentsmesh/commands";
   }
 });
 
@@ -4161,12 +4189,18 @@ var init_constants20 = __esm({
 async function buildPiAgentImportPaths(refs, projectRoot, scope = "project") {
   if (scope === "global") {
     refs.set(PI_AGENT_GLOBAL_ROOT_FILE, `${AB_RULES2}/_root.md`);
+    for (const absPath of await listFiles(projectRoot, PI_AGENT_GLOBAL_COMMANDS_DIR)) {
+      addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS3, ".md");
+    }
     for (const absPath of await listFiles(projectRoot, PI_AGENT_GLOBAL_SKILLS_DIR)) {
       addSkillLikeMapping(refs, rel(projectRoot, absPath), PI_AGENT_GLOBAL_SKILLS_DIR);
     }
     return;
   }
   refs.set(PI_AGENT_ROOT_FILE, `${AB_RULES2}/_root.md`);
+  for (const absPath of await listFiles(projectRoot, PI_AGENT_COMMANDS_DIR)) {
+    addSimpleFileMapping(refs, rel(projectRoot, absPath), AB_COMMANDS3, ".md");
+  }
   for (const absPath of await listFiles(projectRoot, PI_AGENT_SKILLS_DIR)) {
     addSkillLikeMapping(refs, rel(projectRoot, absPath), PI_AGENT_SKILLS_DIR);
   }
@@ -4272,7 +4306,7 @@ var init_replit_agent = __esm({
 });
 
 // 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 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_AGENTS_DIR, ROO_CODE_CANONICAL_COMMANDS_DIR, ROO_CODE_CANONICAL_MCP, ROO_CODE_CANONICAL_IGNORE;
 var init_constants23 = __esm({
   "src/targets/roo-code/constants.ts"() {
     ROO_CODE_TARGET = "roo-code";
@@ -4295,6 +4329,7 @@ var init_constants23 = __esm({
     ROO_CODE_GLOBAL_AGENTS_MD = `${ROO_CODE_GLOBAL_DIR}/AGENTS.md`;
     ROO_CODE_GLOBAL_AGENTS_SKILLS_DIR = ".agents/skills";
     ROO_CODE_CANONICAL_RULES_DIR = ".agentsmesh/rules";
+    ROO_CODE_CANONICAL_AGENTS_DIR = ".agentsmesh/agents";
     ROO_CODE_CANONICAL_COMMANDS_DIR = ".agentsmesh/commands";
     ROO_CODE_CANONICAL_MCP = ".agentsmesh/mcp.json";
     ROO_CODE_CANONICAL_IGNORE = ".agentsmesh/ignore";
@@ -4584,8 +4619,26 @@ var init_import_map_builders = __esm({
     init_import_maps();
   }
 });
-
-// src/targets/aider/index.ts
+function mergeAiderConf(existing, newContent) {
+  if (existing === null) return newContent;
+  let parsed;
+  try {
+    parsed = parse(existing);
+  } catch {
+    return newContent;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return newContent;
+  const base = parsed;
+  const reads = /* @__PURE__ */ new Set();
+  const existingRead = base.read;
+  if (typeof existingRead === "string") reads.add(existingRead);
+  else if (Array.isArray(existingRead)) {
+    for (const entry of existingRead) if (typeof entry === "string") reads.add(entry);
+  }
+  reads.add(AIDER_CONVENTIONS);
+  base.read = [...reads];
+  return stringify(base);
+}
 var target, project, globalLayout, capabilities, descriptor;
 var init_aider2 = __esm({
   "src/targets/aider/index.ts"() {
@@ -4612,7 +4665,7 @@ var init_aider2 = __esm({
       skillDir: AIDER_SKILLS_DIR,
       managedOutputs: {
         dirs: [AIDER_SKILLS_DIR],
-        files: [AIDER_CONVENTIONS, AIDER_IGNORE]
+        files: [AIDER_CONVENTIONS, AIDER_CONF_FILE, AIDER_IGNORE]
       },
       paths: {
         rulePath(_slug) {
@@ -4636,6 +4689,7 @@ var init_aider2 = __esm({
       rewriteGeneratedPath(path) {
         if (path === AIDER_CONVENTIONS) return AIDER_GLOBAL_CONVENTIONS;
         if (path === AIDER_IGNORE) return AIDER_GLOBAL_IGNORE;
+        if (path === AIDER_CONF_FILE) return null;
         if (path.startsWith(`${AIDER_SKILLS_DIR}/`)) {
           return path.replace(`${AIDER_SKILLS_DIR}/`, `${AIDER_GLOBAL_SKILLS_DIR}/`);
         }
@@ -4711,6 +4765,10 @@ var init_aider2 = __esm({
           canonicalFilename: AIDER_CANONICAL_IGNORE
         }
       },
+      mergeGeneratedOutputContent(existing, _pending, newContent, resolvedPath) {
+        if (resolvedPath === AIDER_CONF_FILE) return mergeAiderConf(existing, newContent);
+        return null;
+      },
       buildImportPaths: buildAiderImportPaths,
       detectionPaths: [AIDER_CONVENTIONS, AIDER_IGNORE]
     };
@@ -4735,7 +4793,7 @@ function generateAgents2(canonical) {
       {
         name: agent.name,
         ...agent.description ? { description: agent.description } : {},
-        systemPrompt: agent.body.trim(),
+        prompt: agent.body.trim(),
         ...agent.tools.length > 0 ? { allowedTools: agent.tools } : {}
       },
       null,
@@ -4834,7 +4892,7 @@ async function amazonQAgentMapper(ctx) {
   const name = typeof raw.name === "string" ? raw.name : agentName;
   const description = typeof raw.description === "string" ? raw.description : "";
   const tools = Array.isArray(raw.allowedTools) ? raw.allowedTools.filter((t) => typeof t === "string") : [];
-  const body = typeof raw.systemPrompt === "string" ? raw.systemPrompt : "";
+  const body = typeof raw.prompt === "string" ? raw.prompt : typeof raw.systemPrompt === "string" ? raw.systemPrompt : "";
   const content = await serializeImportedAgentWithFallback(
     destPath,
     { name, description, tools },
@@ -4894,7 +4952,7 @@ var init_capabilities2 = __esm({
   "src/targets/amazon-q/capabilities.ts"() {
     projectCapabilities = {
       rules: "native",
-      additionalRules: "none",
+      additionalRules: "native",
       commands: "none",
       agents: "native",
       skills: "none",
@@ -5831,16 +5889,13 @@ var init_antigravity2 = __esm({
 });
 function ruleFrontmatter(rule) {
   const fm = {};
-  if (rule.description) {
-    fm.description = rule.description;
-  }
   if (rule.globs.length > 0 || rule.trigger === "manual" || rule.trigger === "model_decision") {
-    fm.agent_requested = true;
-    if (rule.globs.length > 0) {
-      fm.globs = rule.globs;
-    }
+    fm.type = "agent_requested";
+    if (rule.description) fm.description = rule.description;
+    if (rule.globs.length > 0) fm.globs = rule.globs;
   } else {
-    fm.always_apply = true;
+    fm.type = "always_apply";
+    if (rule.description) fm.description = rule.description;
   }
   return fm;
 }
@@ -5856,7 +5911,7 @@ function generateRules5(canonical) {
   for (const rule of canonical.rules) {
     if (rule.targets.length > 0 && !rule.targets.includes(AUGMENT_CODE_TARGET)) continue;
     if (rule.root) {
-      const fm = { always_apply: true };
+      const fm = { type: "always_apply" };
       if (rule.description) fm.description = rule.description;
       outputs.push({
         path: `${AUGMENT_CODE_RULES_DIR}/_root.md`,
@@ -5908,6 +5963,27 @@ var init_generator5 = __esm({
     init_constants6();
   }
 });
+function parseToolPermissions(raw) {
+  if (!Array.isArray(raw)) return null;
+  const allow = [];
+  const deny = [];
+  const ask = [];
+  for (const entry of raw) {
+    if (!entry || typeof entry !== "object") continue;
+    const e = entry;
+    const toolName = typeof e.toolName === "string" ? e.toolName : void 0;
+    const permission = e.permission;
+    if (!toolName || !permission || typeof permission !== "object") continue;
+    if (e.shellInputRegex !== void 0) continue;
+    if (permission.type === "allow") allow.push(toolName);
+    else if (permission.type === "deny") deny.push(toolName);
+    else if (permission.type === "ask-user") ask.push(toolName);
+  }
+  if (allow.length === 0 && deny.length === 0 && ask.length === 0) return null;
+  const permissions = { allow, deny };
+  if (ask.length > 0) permissions.ask = ask;
+  return permissions;
+}
 function augmentHooksToCanonical(hooks) {
   const result = {};
   for (const [event, entries] of Object.entries(hooks)) {
@@ -5930,7 +6006,7 @@ function augmentHooksToCanonical(hooks) {
   }
   return result;
 }
-async function importAugmentSettings(projectRoot, settingsPath, results) {
+async function importAugmentSettings(projectRoot, settingsPath, results, options = {}) {
   const content = await readFileSafe(join(projectRoot, settingsPath));
   if (content === null) return;
   let settings;
@@ -5964,6 +6040,20 @@ async function importAugmentSettings(projectRoot, settingsPath, results) {
       });
     }
   }
+  if (options.includePermissions) {
+    const permissions = parseToolPermissions(settings.toolPermissions);
+    if (permissions) {
+      const destPath = join(projectRoot, AUGMENT_CODE_CANONICAL_PERMISSIONS);
+      await mkdirp(dirname(destPath));
+      await writeFileAtomic(destPath, stringify(permissions));
+      results.push({
+        fromTool: AUGMENT_CODE_TARGET,
+        fromPath: join(projectRoot, settingsPath),
+        toPath: AUGMENT_CODE_CANONICAL_PERMISSIONS,
+        feature: "permissions"
+      });
+    }
+  }
 }
 async function importAugmentIgnore(projectRoot, ignorePath, results) {
   const content = await readFileSafe(join(projectRoot, ignorePath));
@@ -5993,7 +6083,7 @@ function canonicalRuleMeta(frontmatter, isRoot) {
     description: typeof frontmatter.description === "string" ? frontmatter.description : void 0,
     globs: Array.isArray(frontmatter.globs) ? frontmatter.globs : []
   };
-  if (frontmatter.agent_requested === true) {
+  if (frontmatter.type === "agent_requested" || frontmatter.agent_requested === true) {
     meta.trigger = "model_decision";
   }
   return meta;
@@ -6088,7 +6178,9 @@ async function importFromAugmentCode(projectRoot, options = {}) {
   const skillsDir = scope === "global" ? AUGMENT_CODE_GLOBAL_SKILLS_DIR : AUGMENT_CODE_SKILLS_DIR;
   await importEmbeddedSkills(projectRoot, skillsDir, AUGMENT_CODE_TARGET, results, normalize);
   const settingsFile = scope === "global" ? AUGMENT_CODE_GLOBAL_SETTINGS_FILE : AUGMENT_CODE_SETTINGS_FILE;
-  await importAugmentSettings(projectRoot, settingsFile, results);
+  await importAugmentSettings(projectRoot, settingsFile, results, {
+    includePermissions: scope === "global"
+  });
   if (scope === "project") {
     await importAugmentIgnore(projectRoot, AUGMENT_CODE_IGNORE_FILE, results);
   }
@@ -6146,12 +6238,12 @@ var init_lint5 = __esm({
   }
 });
 
-// src/targets/augment-code/index.ts
+// src/targets/augment-code/settings-build.ts
 function serializeHooksForSettings(hooks) {
   const result = {};
   for (const [event, entries] of Object.entries(hooks)) {
     if (!entries || entries.length === 0) continue;
-    const serialized = entries.map((entry) => ({
+    result[event] = entries.map((entry) => ({
       matcher: entry.matcher,
       hooks: [
         {
@@ -6161,10 +6253,38 @@ function serializeHooksForSettings(hooks) {
         }
       ]
     }));
-    result[event] = serialized;
   }
   return result;
 }
+function serializeToolPermissions(permissions) {
+  if (!permissions) return void 0;
+  const entries = [];
+  for (const toolName of permissions.allow ?? []) {
+    entries.push({ toolName, permission: { type: "allow" } });
+  }
+  for (const toolName of permissions.deny ?? []) {
+    entries.push({ toolName, permission: { type: "deny" } });
+  }
+  for (const toolName of permissions.ask ?? []) {
+    entries.push({ toolName, permission: { type: "ask-user" } });
+  }
+  return entries.length > 0 ? entries : void 0;
+}
+function buildSettingsContent(canonical, enabledFeatures, scope) {
+  const settings = {};
+  if (enabledFeatures.has("mcp") && canonical.mcp && Object.keys(canonical.mcp.mcpServers).length > 0) {
+    settings.mcpServers = canonical.mcp.mcpServers;
+  }
+  if (enabledFeatures.has("hooks") && canonical.hooks && Object.keys(canonical.hooks).length > 0) {
+    settings.hooks = serializeHooksForSettings(canonical.hooks);
+  }
+  if (scope === "global" && enabledFeatures.has("permissions")) {
+    const toolPermissions = serializeToolPermissions(canonical.permissions);
+    if (toolPermissions) settings.toolPermissions = toolPermissions;
+  }
+  if (Object.keys(settings).length === 0) return null;
+  return JSON.stringify(settings, null, 2);
+}
 function mergeAugmentSettings(existing, newContent) {
   if (existing === null) return newContent;
   let base;
@@ -6179,19 +6299,15 @@ function mergeAugmentSettings(existing, newContent) {
   const overlay = incoming;
   if (overlay.mcpServers !== void 0) base.mcpServers = overlay.mcpServers;
   if (overlay.hooks !== void 0) base.hooks = overlay.hooks;
+  if (overlay.toolPermissions !== void 0) base.toolPermissions = overlay.toolPermissions;
   return JSON.stringify(base, null, 2);
 }
-function buildSettingsContent(canonical, enabledFeatures) {
-  const settings = {};
-  if (enabledFeatures.has("mcp") && canonical.mcp && Object.keys(canonical.mcp.mcpServers).length > 0) {
-    settings.mcpServers = canonical.mcp.mcpServers;
+var init_settings_build = __esm({
+  "src/targets/augment-code/settings-build.ts"() {
   }
-  if (enabledFeatures.has("hooks") && canonical.hooks && Object.keys(canonical.hooks).length > 0) {
-    settings.hooks = serializeHooksForSettings(canonical.hooks);
-  }
-  if (Object.keys(settings).length === 0) return null;
-  return JSON.stringify(settings, null, 2);
-}
+});
+
+// src/targets/augment-code/index.ts
 var target5, project5, globalLayout5, capabilities3, globalCapabilities3, descriptor5;
 var init_augment_code2 = __esm({
   "src/targets/augment-code/index.ts"() {
@@ -6200,6 +6316,7 @@ var init_augment_code2 = __esm({
     init_linter5();
     init_lint5();
     init_import_map_builders();
+    init_settings_build();
     init_constants6();
     target5 = {
       name: AUGMENT_CODE_TARGET,
@@ -6213,7 +6330,12 @@ var init_augment_code2 = __esm({
     project5 = {
       skillDir: AUGMENT_CODE_SKILLS_DIR,
       managedOutputs: {
-        dirs: [AUGMENT_CODE_RULES_DIR, AUGMENT_CODE_COMMANDS_DIR, AUGMENT_CODE_AGENTS_DIR, AUGMENT_CODE_SKILLS_DIR],
+        dirs: [
+          AUGMENT_CODE_RULES_DIR,
+          AUGMENT_CODE_COMMANDS_DIR,
+          AUGMENT_CODE_AGENTS_DIR,
+          AUGMENT_CODE_SKILLS_DIR
+        ],
         files: [AUGMENT_CODE_SETTINGS_FILE, AUGMENT_CODE_IGNORE_FILE]
       },
       paths: {
@@ -6289,7 +6411,7 @@ var init_augment_code2 = __esm({
       mcp: "native",
       hooks: "none",
       ignore: "none",
-      permissions: "none"
+      permissions: "native"
     };
     descriptor5 = {
       id: AUGMENT_CODE_TARGET,
@@ -6317,8 +6439,8 @@ var init_augment_code2 = __esm({
         ],
         layout: globalLayout5
       },
-      emitScopedSettings(canonical, _scope, enabledFeatures) {
-        const content = buildSettingsContent(canonical, enabledFeatures);
+      emitScopedSettings(canonical, scope, enabledFeatures) {
+        const content = buildSettingsContent(canonical, enabledFeatures, scope);
         if (content === null) return [];
         return [{ path: AUGMENT_CODE_SETTINGS_FILE, content }];
       },
@@ -8277,30 +8399,79 @@ var init_mcp = __esm({
     init_constants28();
   }
 });
-
-// src/targets/codex-cli/generator/hooks.ts
-function generateHooks4(canonical) {
+function buildWrappedCommandHooks(canonical, hooksFilePath) {
   if (!canonical.hooks) return [];
   const hooks = {};
   for (const [event, entries] of Object.entries(canonical.hooks)) {
     if (!Array.isArray(entries)) continue;
     const mapped = entries.flatMap((entry) => {
       if (!hasHookCommand(entry) || entry.type === "prompt") return [];
-      const hook = {
-        type: "command",
-        command: getHookCommand(entry)
-      };
+      const hook = { type: "command", command: getHookCommand(entry) };
       if (entry.timeout !== void 0) hook.timeout = entry.timeout;
       return [{ matcher: entry.matcher, hooks: [hook] }];
     });
     if (mapped.length > 0) hooks[event] = mapped;
   }
   if (Object.keys(hooks).length === 0) return [];
-  return [{ path: CODEX_HOOKS_FILE, content: JSON.stringify({ hooks }, null, 2) }];
+  return [{ path: hooksFilePath, content: JSON.stringify({ hooks }, null, 2) }];
+}
+async function importWrappedCommandHooks(options) {
+  const { projectRoot, hooksFile, canonicalHooksPath, targetName, results } = options;
+  const srcPath = join(projectRoot, hooksFile);
+  const content = await readFileSafe(srcPath);
+  if (content === null) return;
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return;
+  }
+  if (!parsed || typeof parsed !== "object") return;
+  const rawHooks = parsed.hooks;
+  if (!rawHooks || typeof rawHooks !== "object" || Array.isArray(rawHooks)) return;
+  const hooks = {};
+  for (const [event, groups] of Object.entries(rawHooks)) {
+    if (!Array.isArray(groups)) continue;
+    for (const group of groups) {
+      if (!group || typeof group !== "object") continue;
+      const record = group;
+      const matcher = typeof record.matcher === "string" ? record.matcher : "*";
+      if (!Array.isArray(record.hooks)) continue;
+      for (const raw of record.hooks) {
+        if (!raw || typeof raw !== "object") continue;
+        const hook = raw;
+        if (hook.type !== "command" || typeof hook.command !== "string") continue;
+        const imported = { matcher, command: hook.command, type: "command" };
+        if (typeof hook.timeout === "number") imported.timeout = hook.timeout;
+        (hooks[event] ??= []).push(imported);
+      }
+    }
+  }
+  if (Object.keys(hooks).length === 0) return;
+  const destPath = join(projectRoot, canonicalHooksPath);
+  await mkdirp(dirname(destPath));
+  await writeFileAtomic(destPath, stringify(hooks));
+  results.push({
+    fromTool: targetName,
+    fromPath: srcPath,
+    toPath: canonicalHooksPath,
+    feature: "hooks"
+  });
+}
+var init_wrapped_command_hooks = __esm({
+  "src/targets/import/wrapped-command-hooks.ts"() {
+    init_hook_command();
+    init_fs();
+  }
+});
+
+// src/targets/codex-cli/generator/hooks.ts
+function generateHooks4(canonical) {
+  return buildWrappedCommandHooks(canonical, CODEX_HOOKS_FILE);
 }
 var init_hooks = __esm({
   "src/targets/codex-cli/generator/hooks.ts"() {
-    init_hook_command();
+    init_wrapped_command_hooks();
     init_constants28();
   }
 });
@@ -8691,51 +8862,20 @@ var init_importer_rules2 = __esm({
     init_instruction_mirror();
   }
 });
+
+// src/targets/codex-cli/importer-hooks.ts
 async function importCodexHooks(projectRoot, results) {
-  const srcPath = join(projectRoot, CODEX_HOOKS_FILE);
-  const content = await readFileSafe(srcPath);
-  if (content === null) return;
-  let parsed;
-  try {
-    parsed = JSON.parse(content);
-  } catch {
-    return;
-  }
-  if (!parsed || typeof parsed !== "object") return;
-  const rawHooks = parsed.hooks;
-  if (!rawHooks || typeof rawHooks !== "object" || Array.isArray(rawHooks)) return;
-  const hooks = {};
-  for (const [event, groups] of Object.entries(rawHooks)) {
-    if (!Array.isArray(groups)) continue;
-    for (const group of groups) {
-      if (!group || typeof group !== "object") continue;
-      const record = group;
-      const matcher = typeof record.matcher === "string" ? record.matcher : "*";
-      if (!Array.isArray(record.hooks)) continue;
-      for (const raw of record.hooks) {
-        if (!raw || typeof raw !== "object") continue;
-        const hook = raw;
-        if (hook.type !== "command" || typeof hook.command !== "string") continue;
-        const imported = { matcher, command: hook.command, type: "command" };
-        if (typeof hook.timeout === "number") imported.timeout = hook.timeout;
-        (hooks[event] ??= []).push(imported);
-      }
-    }
-  }
-  if (Object.keys(hooks).length === 0) return;
-  const destPath = join(projectRoot, CODEX_CANONICAL_HOOKS);
-  await mkdirp(dirname(destPath));
-  await writeFileAtomic(destPath, stringify(hooks));
-  results.push({
-    fromTool: CODEX_TARGET,
-    fromPath: srcPath,
-    toPath: CODEX_CANONICAL_HOOKS,
-    feature: "hooks"
+  await importWrappedCommandHooks({
+    projectRoot,
+    hooksFile: CODEX_HOOKS_FILE,
+    canonicalHooksPath: CODEX_CANONICAL_HOOKS,
+    targetName: CODEX_TARGET,
+    results
   });
 }
 var init_importer_hooks = __esm({
   "src/targets/codex-cli/importer-hooks.ts"() {
-    init_fs();
+    init_wrapped_command_hooks();
     init_constants28();
   }
 });
@@ -8916,7 +9056,7 @@ var init_codex_cli2 = __esm({
       agents: "native",
       skills: "native",
       mcp: "native",
-      hooks: "partial",
+      hooks: "native",
       ignore: "none",
       permissions: "none"
     };
@@ -8936,7 +9076,7 @@ var init_codex_cli2 = __esm({
         agents: "native",
         skills: "native",
         mcp: "native",
-        hooks: "partial",
+        hooks: "native",
         ignore: "none",
         permissions: "none"
       },
@@ -9092,6 +9232,40 @@ var init_generator10 = __esm({
     init_constants9();
   }
 });
+function serializeContinuePermissions(permissions) {
+  if (!permissions) return null;
+  const allow = permissions.allow ?? [];
+  const ask = permissions.ask ?? [];
+  const exclude = permissions.deny ?? [];
+  if (allow.length === 0 && ask.length === 0 && exclude.length === 0) return null;
+  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;
+  try {
+    parsed = parse(content);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  const record = parsed;
+  const allow = toStringArray5(record.allow);
+  const ask = toStringArray5(record.ask);
+  const deny = toStringArray5(record.exclude);
+  if (allow.length === 0 && ask.length === 0 && deny.length === 0) return null;
+  const permissions = { allow, deny };
+  if (ask.length > 0) permissions.ask = ask;
+  return permissions;
+}
+var init_permissions = __esm({
+  "src/targets/continue/permissions.ts"() {
+    init_shared_import_helpers();
+  }
+});
 function readMcpServers(content, extension) {
   const parsed = extension === ".json" ? JSON.parse(content) : parse(content) ?? {};
   const rawServers = parsed.mcpServers;
@@ -9146,12 +9320,29 @@ async function importMcp2(projectRoot, results) {
     });
   }
 }
-async function importFromContinue(projectRoot) {
+async function importPermissions(projectRoot, results) {
+  const srcPath = join(projectRoot, CONTINUE_GLOBAL_PERMISSIONS);
+  const content = await readFileSafe(srcPath);
+  if (content === null) return;
+  const permissions = parseContinuePermissions(content);
+  if (!permissions) return;
+  const destPath = join(projectRoot, CONTINUE_CANONICAL_PERMISSIONS);
+  await mkdirp(dirname(destPath));
+  await writeFileAtomic(destPath, stringify(permissions).trimEnd() + "\n");
+  results.push({
+    fromTool: CONTINUE_TARGET,
+    fromPath: srcPath,
+    toPath: CONTINUE_CANONICAL_PERMISSIONS,
+    feature: "permissions"
+  });
+}
+async function importFromContinue(projectRoot, options = {}) {
   const results = [];
   const normalize = await createImportReferenceNormalizer(CONTINUE_TARGET, projectRoot);
   results.push(...await runDescriptorImport(descriptor9, projectRoot, "project", { normalize }));
   await importEmbeddedSkills(projectRoot, CONTINUE_SKILLS_DIR, CONTINUE_TARGET, results, normalize);
   await importMcp2(projectRoot, results);
+  if (options.scope === "global") await importPermissions(projectRoot, results);
   return results;
 }
 var init_importer9 = __esm({
@@ -9163,6 +9354,7 @@ var init_importer9 = __esm({
     init_mcp_merge();
     init_shared_import_helpers();
     init_constants9();
+    init_permissions();
     init_continue2();
   }
 });
@@ -9328,6 +9520,7 @@ var init_scope_extras = __esm({
     init_fs();
     init_constants9();
     init_global_config();
+    init_permissions();
     generateContinueScopeExtras = async (canonical, projectRoot, scope, enabledFeatures) => {
       const configResults = await generateContinueGlobalConfig(
         canonical,
@@ -9335,21 +9528,36 @@ var init_scope_extras = __esm({
         scope,
         enabledFeatures
       );
-      if (scope !== "global" || !enabledFeatures.has("rules")) return configResults;
-      const root = canonical.rules.find((r) => r.root);
-      if (!root) return configResults;
-      const content = root.body.trim();
-      const existing = await readFileSafe(join(projectRoot, CONTINUE_GLOBAL_AGENTS_MD));
-      return [
-        ...configResults,
-        {
-          target: "continue",
-          path: CONTINUE_GLOBAL_AGENTS_MD,
-          content,
-          currentContent: existing ?? void 0,
-          status: computeStatus3(existing, content)
+      if (scope !== "global") return configResults;
+      const results = [...configResults];
+      if (enabledFeatures.has("permissions")) {
+        const content = serializeContinuePermissions(canonical.permissions);
+        if (content) {
+          const existing = await readFileSafe(join(projectRoot, CONTINUE_GLOBAL_PERMISSIONS));
+          results.push({
+            target: "continue",
+            path: CONTINUE_GLOBAL_PERMISSIONS,
+            content,
+            currentContent: existing ?? void 0,
+            status: computeStatus3(existing, content)
+          });
         }
-      ];
+      }
+      if (enabledFeatures.has("rules")) {
+        const root = canonical.rules.find((r) => r.root);
+        if (root) {
+          const content = root.body.trim();
+          const existing = await readFileSafe(join(projectRoot, CONTINUE_GLOBAL_AGENTS_MD));
+          results.push({
+            target: "continue",
+            path: CONTINUE_GLOBAL_AGENTS_MD,
+            content,
+            currentContent: existing ?? void 0,
+            status: computeStatus3(existing, content)
+          });
+        }
+      }
+      return results;
     };
   }
 });
@@ -9405,7 +9613,12 @@ var init_continue2 = __esm({
       skillDir: CONTINUE_SKILLS_DIR,
       managedOutputs: {
         dirs: [CONTINUE_RULES_DIR, CONTINUE_PROMPTS_DIR, CONTINUE_SKILLS_DIR, ".agents/skills"],
-        files: [CONTINUE_MCP_FILE, CONTINUE_GLOBAL_AGENTS_MD, CONTINUE_GLOBAL_CONFIG]
+        files: [
+          CONTINUE_MCP_FILE,
+          CONTINUE_GLOBAL_AGENTS_MD,
+          CONTINUE_GLOBAL_CONFIG,
+          CONTINUE_GLOBAL_PERMISSIONS
+        ]
       },
       mirrorGlobalPath(path, _activeTargets) {
         if (path.startsWith(`${CONTINUE_SKILLS_DIR}/`)) {
@@ -9434,7 +9647,7 @@ var init_continue2 = __esm({
       mcp: "native",
       hooks: "none",
       ignore: "none",
-      permissions: "none"
+      permissions: "native"
     };
     descriptor9 = {
       id: "continue",
@@ -10331,7 +10544,7 @@ var init_capabilities4 = __esm({
       agents: "native",
       skills: "native",
       mcp: "native",
-      hooks: "partial",
+      hooks: "native",
       ignore: "none",
       permissions: "none"
     };
@@ -10613,11 +10826,12 @@ async function importFromCrush(projectRoot, options = {}) {
   results.push(...await runDescriptorImport(descriptor11, projectRoot, scope, { normalize }));
   const skillsDir = scope === "global" ? CRUSH_GLOBAL_SKILLS_DIR : CRUSH_SKILLS_DIR;
   await importEmbeddedSkills(projectRoot, skillsDir, CRUSH_TARGET, results, normalize);
-  await importCrushConfigJson(projectRoot, results);
+  await importCrushConfigJson(projectRoot, scope, results);
   return results;
 }
-async function importCrushConfigJson(projectRoot, results) {
-  const configPath = join(projectRoot, CRUSH_CONFIG_FILE);
+async function importCrushConfigJson(projectRoot, scope, results) {
+  const configRel = scope === "global" ? CRUSH_GLOBAL_CONFIG_FILE : CRUSH_CONFIG_FILE;
+  const configPath = join(projectRoot, configRel);
   const content = await readFileSafe(configPath);
   if (content === null) return;
   let parsed;
@@ -11119,33 +11333,81 @@ var init_agents2 = __esm({
 function generatePermissions4(_canonical) {
   return [];
 }
-var init_permissions = __esm({
+var init_permissions2 = __esm({
   "src/targets/cursor/generator/permissions.ts"() {
   }
 });
 
-// src/targets/cursor/generator/hooks.ts
+// src/targets/cursor/hook-format.ts
+function unmappedCursorHookEvents(hooks) {
+  return Object.keys(hooks).filter(
+    (event) => Array.isArray(hooks[event]) && hooks[event].length > 0 && !(event in CANONICAL_TO_CURSOR)
+  );
+}
 function toCursorHooks(hooks) {
   const result = {};
   for (const [event, entries] of Object.entries(hooks)) {
-    if (!Array.isArray(entries)) continue;
-    const translated = [];
-    for (const e of entries) {
-      if (!hasHookText(e)) continue;
-      const command = getHookCommand(e);
-      const prompt = getHookPrompt(e);
-      const value = e.type === "prompt" ? prompt || command : command || prompt;
-      const hookItem = {
-        type: e.type === "prompt" ? "prompt" : "command",
-        [e.type === "prompt" ? "prompt" : "command"]: value
+    const cursorEvent = CANONICAL_TO_CURSOR[event];
+    if (!cursorEvent || !Array.isArray(entries)) continue;
+    const flat = [];
+    for (const entry of entries) {
+      if (!hasHookText(entry)) continue;
+      const value = getHookText(entry);
+      const hook = entry.type === "prompt" ? { type: "prompt", prompt: value } : { type: "command", command: value };
+      if (entry.matcher) hook.matcher = entry.matcher;
+      if (entry.timeout !== void 0) hook.timeout = entry.timeout;
+      flat.push(hook);
+    }
+    if (flat.length > 0) result[cursorEvent] = flat;
+  }
+  return result;
+}
+function cursorHooksToCanonical(hooks) {
+  const result = {};
+  for (const [cursorEvent, entries] of Object.entries(hooks)) {
+    const canonicalEvent = CURSOR_TO_CANONICAL.get(cursorEvent);
+    if (!canonicalEvent || !Array.isArray(entries)) continue;
+    const list = [];
+    for (const entry of entries) {
+      if (!entry || typeof entry !== "object") continue;
+      const e = entry;
+      const type = e.type === "prompt" ? "prompt" : "command";
+      if (!hasHookText({ ...e, type })) continue;
+      const value = getHookText({ ...e, type });
+      const item = {
+        matcher: typeof e.matcher === "string" ? e.matcher : "",
+        type,
+        command: value
       };
-      if (e.timeout !== void 0) hookItem.timeout = e.timeout;
-      translated.push({ matcher: e.matcher, hooks: [hookItem] });
+      if (typeof e.timeout === "number") item.timeout = e.timeout;
+      list.push(item);
     }
-    if (translated.length > 0) result[event] = translated;
+    if (list.length > 0) result[canonicalEvent] = [...result[canonicalEvent] ?? [], ...list];
   }
   return result;
 }
+var CANONICAL_TO_CURSOR, CURSOR_TO_CANONICAL;
+var init_hook_format = __esm({
+  "src/targets/cursor/hook-format.ts"() {
+    init_hook_command();
+    CANONICAL_TO_CURSOR = {
+      PreToolUse: "preToolUse",
+      PostToolUse: "postToolUse",
+      UserPromptSubmit: "beforeSubmitPrompt",
+      SubagentStart: "subagentStart",
+      SubagentStop: "subagentStop",
+      Stop: "stop",
+      SessionStart: "sessionStart",
+      SessionEnd: "sessionEnd",
+      PreCompact: "preCompact"
+    };
+    CURSOR_TO_CANONICAL = new Map(
+      Object.entries(CANONICAL_TO_CURSOR).map(([canonical, cursor]) => [cursor, canonical])
+    );
+  }
+});
+
+// src/targets/cursor/generator/hooks.ts
 function generateHooks7(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   const cursorHooks = toCursorHooks(canonical.hooks);
@@ -11155,8 +11417,8 @@ function generateHooks7(canonical) {
 }
 var init_hooks2 = __esm({
   "src/targets/cursor/generator/hooks.ts"() {
-    init_hook_command();
     init_constants11();
+    init_hook_format();
   }
 });
 
@@ -11180,7 +11442,7 @@ var init_generator13 = __esm({
     init_mcp2();
     init_skills2();
     init_agents2();
-    init_permissions();
+    init_permissions2();
     init_hooks2();
     init_ignore();
   }
@@ -11358,30 +11620,6 @@ var init_importer_rules3 = __esm({
     init_constants11();
   }
 });
-function cursorHooksToCanonical(hooks) {
-  const result = {};
-  for (const [event, entries] of Object.entries(hooks)) {
-    if (!Array.isArray(entries)) continue;
-    const canonical = [];
-    for (const entry of entries) {
-      if (!entry || typeof entry !== "object") continue;
-      const e = entry;
-      const matcher = typeof e.matcher === "string" ? e.matcher : "";
-      if (!matcher) continue;
-      const hookList = Array.isArray(e.hooks) ? e.hooks : [];
-      for (const hook of hookList) {
-        const type = hook.type === "prompt" ? "prompt" : "command";
-        if (!hasHookText({ ...hook, type })) continue;
-        const value = type === "prompt" ? getHookPrompt(hook) || getHookCommand(hook) : getHookCommand(hook) || getHookPrompt(hook);
-        const item = { matcher, type, command: value };
-        if (typeof hook.timeout === "number") item.timeout = hook.timeout;
-        canonical.push(item);
-      }
-    }
-    if (canonical.length > 0) result[event] = canonical;
-  }
-  return result;
-}
 async function importSettings2(projectRoot, results) {
   let hooksImportedFromHooksJson = false;
   const hooksJsonPath = join(projectRoot, CURSOR_HOOKS);
@@ -11483,7 +11721,7 @@ async function importIgnore(projectRoot, results) {
 }
 var init_settings_helpers3 = __esm({
   "src/targets/cursor/settings-helpers.ts"() {
-    init_hook_command();
+    init_hook_format();
     init_fs();
     init_constants11();
   }
@@ -11794,6 +12032,18 @@ var init_linter12 = __esm({
 });
 
 // src/targets/cursor/lint.ts
+function lintHooks6(canonical) {
+  if (!canonical.hooks) return [];
+  const unmapped = unmappedCursorHookEvents(canonical.hooks);
+  if (unmapped.length === 0) return [];
+  return [
+    createWarning(
+      ".agentsmesh/hooks.yaml",
+      "cursor",
+      `Cursor has no equivalent for hook event(s) ${unmapped.join(", ")}; they are not projected to .cursor/hooks.json.`
+    )
+  ];
+}
 function lintCommands5(canonical) {
   return canonical.commands.filter((command) => command.description.length > 0 || command.allowedTools.length > 0).map(
     (command) => createWarning(
@@ -11838,6 +12088,7 @@ function lintPermissions4(canonical) {
 var init_lint11 = __esm({
   "src/targets/cursor/lint.ts"() {
     init_helpers();
+    init_hook_format();
   }
 });
 
@@ -11942,7 +12193,7 @@ var init_cursor2 = __esm({
     };
     globalCapabilities10 = {
       rules: "native",
-      additionalRules: "embedded",
+      additionalRules: "native",
       commands: "native",
       agents: "native",
       skills: "native",
@@ -11962,7 +12213,7 @@ var init_cursor2 = __esm({
       generators: target12,
       capabilities: {
         rules: "native",
-        additionalRules: "embedded",
+        additionalRules: "native",
         commands: "native",
         agents: "native",
         skills: "native",
@@ -11976,7 +12227,8 @@ var init_cursor2 = __esm({
       lint: {
         commands: lintCommands5,
         mcp: lintMcp3,
-        permissions: lintPermissions4
+        permissions: lintPermissions4,
+        hooks: lintHooks6
       },
       project: project12,
       globalSupport: {
@@ -12347,10 +12599,18 @@ function generateSkills13(canonical) {
   return generateEmbeddedSkills(canonical, FACTORY_DROID_SKILLS_DIR);
 }
 function generateCommands13(canonical) {
-  return canonical.commands.map((command) => ({
-    path: `${FACTORY_DROID_SKILLS_DIR}/${commandSkillDirName(command.name)}/SKILL.md`,
-    content: serializeCommandSkill(command)
-  }));
+  return canonical.commands.map((command) => {
+    const frontmatter = {
+      description: command.description || void 0,
+      "allowed-tools": command.allowedTools.length > 0 ? command.allowedTools : void 0
+    };
+    if (frontmatter.description === void 0) delete frontmatter.description;
+    if (frontmatter["allowed-tools"] === void 0) delete frontmatter["allowed-tools"];
+    return {
+      path: `${FACTORY_DROID_COMMANDS_DIR}/${command.name}.md`,
+      content: serializeFrontmatter(frontmatter, command.body.trim() || "")
+    };
+  });
 }
 function generateAgents14(canonical) {
   return canonical.agents.map((agent) => ({
@@ -12359,10 +12619,7 @@ function generateAgents14(canonical) {
   }));
 }
 function generateHooks9(canonical) {
-  if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
-  const hooks = buildClaudeHooksObjectFromCanonical(canonical);
-  if (Object.keys(hooks).length === 0) return [];
-  return [{ path: FACTORY_DROID_HOOKS_FILE, content: JSON.stringify(hooks, null, 2) }];
+  return buildWrappedCommandHooks(canonical, FACTORY_DROID_HOOKS_FILE);
 }
 function generateMcp11(canonical) {
   if (!canonical.mcp || Object.keys(canonical.mcp.mcpServers).length === 0) return [];
@@ -12377,8 +12634,8 @@ var init_generator16 = __esm({
   "src/targets/factory-droid/generator.ts"() {
     init_embedded_skill();
     init_managed_blocks();
-    init_command_skill();
-    init_hooks_format();
+    init_markdown();
+    init_wrapped_command_hooks();
     init_droid_serializer();
     init_constants13();
   }
@@ -12431,6 +12688,13 @@ async function importFromFactoryDroid(projectRoot, options = {}) {
   await importEmbeddedSkills(projectRoot, skillsDir, FACTORY_DROID_TARGET, results, normalize);
   const mcpFile = scope === "global" ? FACTORY_DROID_GLOBAL_MCP_FILE : FACTORY_DROID_MCP_FILE;
   await importFactoryDroidMcp(projectRoot, mcpFile, results);
+  await importWrappedCommandHooks({
+    projectRoot,
+    hooksFile: FACTORY_DROID_HOOKS_FILE,
+    canonicalHooksPath: FACTORY_DROID_CANONICAL_HOOKS,
+    targetName: FACTORY_DROID_TARGET,
+    results
+  });
   return results;
 }
 var init_importer14 = __esm({
@@ -12438,6 +12702,7 @@ var init_importer14 = __esm({
     init_import_rewriter();
     init_embedded_skill();
     init_descriptor_import_runner();
+    init_wrapped_command_hooks();
     init_mcp_import2();
     init_constants13();
     init_factory_droid2();
@@ -12500,7 +12765,6 @@ var init_factory_droid2 = __esm({
     init_linter14();
     init_lint13();
     init_import_map_builders();
-    init_command_skill();
     target14 = {
       name: FACTORY_DROID_TARGET,
       primaryRootInstructionPath: FACTORY_DROID_ROOT_FILE,
@@ -12516,7 +12780,7 @@ var init_factory_droid2 = __esm({
       rootInstructionPath: FACTORY_DROID_ROOT_FILE,
       skillDir: FACTORY_DROID_SKILLS_DIR,
       managedOutputs: {
-        dirs: [FACTORY_DROID_SKILLS_DIR, FACTORY_DROID_DROIDS_DIR],
+        dirs: [FACTORY_DROID_SKILLS_DIR, FACTORY_DROID_COMMANDS_DIR, FACTORY_DROID_DROIDS_DIR],
         files: [FACTORY_DROID_ROOT_FILE, FACTORY_DROID_HOOKS_FILE, FACTORY_DROID_MCP_FILE]
       },
       paths: {
@@ -12524,7 +12788,7 @@ var init_factory_droid2 = __esm({
           return FACTORY_DROID_ROOT_FILE;
         },
         commandPath(name) {
-          return `${FACTORY_DROID_SKILLS_DIR}/${commandSkillDirName(name)}/SKILL.md`;
+          return `${FACTORY_DROID_COMMANDS_DIR}/${name}.md`;
         },
         agentPath(name) {
           return `${FACTORY_DROID_DROIDS_DIR}/${name}.md`;
@@ -12535,8 +12799,16 @@ var init_factory_droid2 = __esm({
       rootInstructionPath: FACTORY_DROID_GLOBAL_ROOT_FILE,
       skillDir: FACTORY_DROID_GLOBAL_SKILLS_DIR,
       managedOutputs: {
-        dirs: [FACTORY_DROID_GLOBAL_SKILLS_DIR, FACTORY_DROID_GLOBAL_DROIDS_DIR],
-        files: [FACTORY_DROID_GLOBAL_ROOT_FILE, FACTORY_DROID_GLOBAL_HOOKS_FILE, FACTORY_DROID_GLOBAL_MCP_FILE]
+        dirs: [
+          FACTORY_DROID_GLOBAL_SKILLS_DIR,
+          FACTORY_DROID_GLOBAL_COMMANDS_DIR,
+          FACTORY_DROID_GLOBAL_DROIDS_DIR
+        ],
+        files: [
+          FACTORY_DROID_GLOBAL_ROOT_FILE,
+          FACTORY_DROID_GLOBAL_HOOKS_FILE,
+          FACTORY_DROID_GLOBAL_MCP_FILE
+        ]
       },
       rewriteGeneratedPath(path) {
         if (path === FACTORY_DROID_ROOT_FILE) return FACTORY_DROID_GLOBAL_ROOT_FILE;
@@ -12554,7 +12826,7 @@ var init_factory_droid2 = __esm({
           return FACTORY_DROID_GLOBAL_ROOT_FILE;
         },
         commandPath(name) {
-          return `${FACTORY_DROID_GLOBAL_SKILLS_DIR}/${commandSkillDirName(name)}/SKILL.md`;
+          return `${FACTORY_DROID_GLOBAL_COMMANDS_DIR}/${name}.md`;
         },
         agentPath(name) {
           return `${FACTORY_DROID_GLOBAL_DROIDS_DIR}/${name}.md`;
@@ -12564,7 +12836,7 @@ var init_factory_droid2 = __esm({
     capabilities6 = {
       rules: "native",
       additionalRules: "embedded",
-      commands: "none",
+      commands: "native",
       agents: "native",
       skills: "native",
       mcp: "native",
@@ -12588,7 +12860,6 @@ var init_factory_droid2 = __esm({
         permissions: lintPermissions6,
         ignore: lintIgnore3
       },
-      supportsConversion: { commands: true },
       project: project14,
       globalSupport: {
         capabilities: capabilities6,
@@ -12610,6 +12881,28 @@ var init_factory_droid2 = __esm({
           canonicalDir: FACTORY_DROID_CANONICAL_RULES_DIR,
           canonicalRootFilename: "_root.md",
           markAsRoot: true
+        },
+        commands: {
+          feature: "commands",
+          mode: "directory",
+          source: {
+            project: [FACTORY_DROID_COMMANDS_DIR],
+            global: [FACTORY_DROID_GLOBAL_COMMANDS_DIR]
+          },
+          canonicalDir: FACTORY_DROID_CANONICAL_COMMANDS_DIR,
+          extensions: [".md"],
+          preset: "command"
+        },
+        agents: {
+          feature: "agents",
+          mode: "directory",
+          source: {
+            project: [FACTORY_DROID_DROIDS_DIR],
+            global: [FACTORY_DROID_GLOBAL_DROIDS_DIR]
+          },
+          canonicalDir: FACTORY_DROID_CANONICAL_AGENTS_DIR,
+          extensions: [".md"],
+          preset: "agent"
         }
       },
       buildImportPaths: buildFactoryDroidImportPaths,
@@ -12619,7 +12912,7 @@ var init_factory_droid2 = __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 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, GEMINI_GLOBAL_POLICIES_FILE;
 var init_constants30 = __esm({
   "src/targets/gemini-cli/constants.ts"() {
     GEMINI_TARGET = "gemini-cli";
@@ -12649,6 +12942,7 @@ var init_constants30 = __esm({
     GEMINI_GLOBAL_COMMANDS_DIR = ".gemini/commands";
     GEMINI_GLOBAL_SKILLS_DIR = ".gemini/skills";
     GEMINI_GLOBAL_AGENTS_DIR = ".gemini/agents";
+    GEMINI_GLOBAL_POLICIES_FILE = ".gemini/policies/permissions.toml";
   }
 });
 
@@ -13542,7 +13836,7 @@ function lintCommands6(canonical) {
     )
   );
 }
-function lintHooks6(canonical) {
+function lintHooks7(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   const supported = ["PreToolUse", "PostToolUse", "Notification"];
   const supportedSet = new Set(supported);
@@ -13652,7 +13946,12 @@ var init_gemini_cli2 = __esm({
       skillDir: GEMINI_GLOBAL_SKILLS_DIR,
       managedOutputs: {
         dirs: [GEMINI_GLOBAL_COMMANDS_DIR, GEMINI_GLOBAL_SKILLS_DIR, GEMINI_GLOBAL_AGENTS_DIR],
-        files: [GEMINI_GLOBAL_ROOT, GEMINI_GLOBAL_COMPAT_AGENTS, GEMINI_GLOBAL_SETTINGS]
+        files: [
+          GEMINI_GLOBAL_ROOT,
+          GEMINI_GLOBAL_COMPAT_AGENTS,
+          GEMINI_GLOBAL_SETTINGS,
+          GEMINI_GLOBAL_POLICIES_FILE
+        ]
       },
       rewriteGeneratedPath(path) {
         if (path === GEMINI_ROOT) {
@@ -13673,7 +13972,7 @@ var init_gemini_cli2 = __esm({
         if (path.startsWith(`${GEMINI_AGENTS_DIR}/`)) {
           return path.replace(`${GEMINI_AGENTS_DIR}/`, `${GEMINI_GLOBAL_AGENTS_DIR}/`);
         }
-        if (path.startsWith(".gemini/policies/") || path === ".geminiignore") {
+        if (path === ".geminiignore") {
           return null;
         }
         return path;
@@ -13708,7 +14007,7 @@ var init_gemini_cli2 = __esm({
       mcp: "native",
       hooks: "partial",
       ignore: "none",
-      permissions: "none"
+      permissions: "native"
     };
     descriptor15 = {
       id: "gemini-cli",
@@ -13734,7 +14033,7 @@ var init_gemini_cli2 = __esm({
       lintRules: lintRules15,
       lint: {
         commands: lintCommands6,
-        hooks: lintHooks6
+        hooks: lintHooks7
       },
       emitScopedSettings: emitScopedGeminiSettings,
       mergeGeneratedOutputContent(existing, pending, newContent, resolvedPath) {
@@ -13809,6 +14108,9 @@ function generateIgnore8(canonical) {
   if (canonical.ignore.length === 0) return [];
   return [{ path: GOOSE_IGNORE, content: canonical.ignore.join("\n") }];
 }
+function generateHooks10(canonical) {
+  return buildWrappedCommandHooks(canonical, GOOSE_HOOKS_FILE);
+}
 function mcpServerToExtension(name, server) {
   const base = {
     bundled: null,
@@ -13842,11 +14144,52 @@ var init_generator19 = __esm({
     init_managed_blocks();
     init_projected_agent_skill();
     init_command_skill();
+    init_wrapped_command_hooks();
     init_constants14();
   }
 });
-
-// src/targets/goose/importer.ts
+function parseYamlObject(content) {
+  if (content === null) return {};
+  try {
+    const parsed = parse(content);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed;
+    }
+  } catch {
+  }
+  return {};
+}
+function serializeGoosePermissions(permissions, existingContent) {
+  const allow = permissions?.allow ?? [];
+  const ask = permissions?.ask ?? [];
+  const deny = permissions?.deny ?? [];
+  if (allow.length === 0 && ask.length === 0 && deny.length === 0) return null;
+  const user = {};
+  if (allow.length > 0) user.always_allow = allow;
+  if (ask.length > 0) user.ask_before = ask;
+  if (deny.length > 0) user.never_allow = deny;
+  const root = parseYamlObject(existingContent);
+  root.user = user;
+  return stringify(root).trimEnd() + "\n";
+}
+function parseGoosePermissions(content) {
+  const root = parseYamlObject(content);
+  const user = root.user;
+  if (!user || typeof user !== "object" || Array.isArray(user)) return null;
+  const block = user;
+  const allow = toStringArray5(block.always_allow);
+  const ask = toStringArray5(block.ask_before);
+  const deny = toStringArray5(block.never_allow);
+  if (allow.length === 0 && ask.length === 0 && deny.length === 0) return null;
+  const permissions = { allow, deny };
+  if (ask.length > 0) permissions.ask = ask;
+  return permissions;
+}
+var init_permissions3 = __esm({
+  "src/targets/goose/permissions.ts"() {
+    init_shared_import_helpers();
+  }
+});
 async function importFromGoose(projectRoot, options = {}) {
   const scope = options.scope ?? "project";
   const results = [];
@@ -13854,14 +14197,41 @@ async function importFromGoose(projectRoot, options = {}) {
   results.push(...await runDescriptorImport(descriptor16, projectRoot, scope, { normalize }));
   const skillsDir = scope === "global" ? GOOSE_GLOBAL_SKILLS_DIR : GOOSE_SKILLS_DIR;
   await importEmbeddedSkills(projectRoot, skillsDir, GOOSE_TARGET, results, normalize);
+  await importWrappedCommandHooks({
+    projectRoot,
+    hooksFile: GOOSE_HOOKS_FILE,
+    canonicalHooksPath: GOOSE_CANONICAL_HOOKS,
+    targetName: GOOSE_TARGET,
+    results
+  });
+  if (scope === "global") await importPermissions2(projectRoot, results);
   return results;
 }
+async function importPermissions2(projectRoot, results) {
+  const srcPath = join(projectRoot, GOOSE_GLOBAL_PERMISSIONS);
+  const content = await readFileSafe(srcPath);
+  if (content === null) return;
+  const permissions = parseGoosePermissions(content);
+  if (!permissions) return;
+  const destPath = join(projectRoot, GOOSE_CANONICAL_PERMISSIONS);
+  await mkdirp(dirname(destPath));
+  await writeFileAtomic(destPath, stringify(permissions).trimEnd() + "\n");
+  results.push({
+    fromTool: GOOSE_TARGET,
+    fromPath: srcPath,
+    toPath: GOOSE_CANONICAL_PERMISSIONS,
+    feature: "permissions"
+  });
+}
 var init_importer16 = __esm({
   "src/targets/goose/importer.ts"() {
     init_import_rewriter();
+    init_fs();
     init_embedded_skill();
     init_descriptor_import_runner();
+    init_wrapped_command_hooks();
     init_constants14();
+    init_permissions3();
     init_goose2();
   }
 });
@@ -13987,6 +14357,34 @@ var init_importer_spec3 = __esm({
     };
   }
 });
+function computeStatus5(existing, content) {
+  if (existing === null) return "created";
+  if (existing !== content) return "updated";
+  return "unchanged";
+}
+var generateGooseScopeExtras;
+var init_scope_extras3 = __esm({
+  "src/targets/goose/scope-extras.ts"() {
+    init_fs();
+    init_constants14();
+    init_permissions3();
+    generateGooseScopeExtras = async (canonical, projectRoot, scope, enabledFeatures) => {
+      if (scope !== "global" || !enabledFeatures.has("permissions")) return [];
+      const existing = await readFileSafe(join(projectRoot, GOOSE_GLOBAL_PERMISSIONS));
+      const content = serializeGoosePermissions(canonical.permissions, existing);
+      if (!content) return [];
+      return [
+        {
+          target: "goose",
+          path: GOOSE_GLOBAL_PERMISSIONS,
+          content,
+          currentContent: existing ?? void 0,
+          status: computeStatus5(existing, content)
+        }
+      ];
+    };
+  }
+});
 
 // src/targets/goose/linter.ts
 function lintRules16(canonical, projectRoot, projectFiles, options) {
@@ -14005,21 +14403,9 @@ var init_linter16 = __esm({
 });
 
 // src/targets/goose/lint.ts
-function lintHooks7(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",
-      "goose",
-      "Goose has no lifecycle hook system; canonical hooks are not projected."
-    )
-  ];
-}
-function lintPermissions7(canonical) {
+function lintPermissions7(canonical, options) {
+  const scope = options?.scope;
+  if (scope === "global") return [];
   if (!canonical.permissions) return [];
   const { allow, deny } = canonical.permissions;
   const ask = canonical.permissions.ask ?? [];
@@ -14028,7 +14414,7 @@ function lintPermissions7(canonical) {
     createWarning(
       ".agentsmesh/permissions.yaml",
       "goose",
-      "Goose permissions are managed at runtime via permission.yaml in ~/.config/goose/; canonical permissions are not projected."
+      "Goose applies tool permissions only at global scope (~/.config/goose/permission.yaml); project-scope permissions are not projected."
     )
   ];
 }
@@ -14058,6 +14444,7 @@ var init_goose2 = __esm({
     init_skill_mirror();
     init_importer16();
     init_importer_spec3();
+    init_scope_extras3();
     init_linter16();
     init_lint15();
     init_import_map_builders();
@@ -14071,6 +14458,7 @@ var init_goose2 = __esm({
       generateSkills: generateSkills15,
       generateIgnore: generateIgnore8,
       generateMcp: generateMcp12,
+      generateHooks: generateHooks10,
       importFrom: importFromGoose
     };
     project16 = {
@@ -14078,7 +14466,7 @@ var init_goose2 = __esm({
       skillDir: GOOSE_SKILLS_DIR,
       managedOutputs: {
         dirs: [GOOSE_SKILLS_DIR],
-        files: [GOOSE_ROOT_FILE, GOOSE_IGNORE]
+        files: [GOOSE_ROOT_FILE, GOOSE_IGNORE, GOOSE_HOOKS_FILE]
       },
       paths: {
         rulePath(_slug) {
@@ -14097,7 +14485,13 @@ var init_goose2 = __esm({
       skillDir: GOOSE_GLOBAL_SKILLS_DIR,
       managedOutputs: {
         dirs: [GOOSE_GLOBAL_SKILLS_DIR],
-        files: [GOOSE_GLOBAL_ROOT_FILE, GOOSE_GLOBAL_IGNORE, GOOSE_GLOBAL_CONFIG]
+        files: [
+          GOOSE_GLOBAL_ROOT_FILE,
+          GOOSE_GLOBAL_IGNORE,
+          GOOSE_GLOBAL_CONFIG,
+          GOOSE_HOOKS_FILE,
+          GOOSE_GLOBAL_PERMISSIONS
+        ]
       },
       rewriteGeneratedPath(path) {
         if (path === GOOSE_ROOT_FILE) return GOOSE_GLOBAL_ROOT_FILE;
@@ -14126,7 +14520,7 @@ var init_goose2 = __esm({
       agents: "none",
       skills: "native",
       mcp: "none",
-      hooks: "none",
+      hooks: "native",
       ignore: "native",
       permissions: "none"
     };
@@ -14137,9 +14531,9 @@ var init_goose2 = __esm({
       agents: "none",
       skills: "native",
       mcp: "native",
-      hooks: "none",
+      hooks: "native",
       ignore: "native",
-      permissions: "none"
+      permissions: "native"
     };
     descriptor16 = {
       id: GOOSE_TARGET,
@@ -14154,7 +14548,6 @@ var init_goose2 = __esm({
       emptyImportMessage: "No Goose config found (.goosehints, .agents/skills, or .gooseignore).",
       lintRules: lintRules16,
       lint: {
-        hooks: lintHooks7,
         permissions: lintPermissions7,
         mcp: lintMcp4
       },
@@ -14168,7 +14561,8 @@ var init_goose2 = __esm({
           GOOSE_GLOBAL_SKILLS_DIR,
           GOOSE_GLOBAL_CONFIG
         ],
-        layout: globalLayout16
+        layout: globalLayout16,
+        scopeExtras: generateGooseScopeExtras
       },
       importer: gooseImporter,
       sharedArtifacts: {
@@ -15470,7 +15864,7 @@ function serializeCanonicalHooks(hooks) {
   return stringify(hooks).trimEnd();
 }
 var CANONICAL_TO_KIRO, KIRO_TO_CANONICAL;
-var init_hook_format = __esm({
+var init_hook_format2 = __esm({
   "src/targets/kiro/hook-format.ts"() {
     CANONICAL_TO_KIRO = {
       UserPromptSubmit: "promptSubmit",
@@ -15536,7 +15930,7 @@ function generateMcp15(canonical) {
     }
   ];
 }
-function generateHooks10(canonical) {
+function generateHooks11(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   return generateKiroHooks(canonical.hooks).map((hook) => ({
     path: `${KIRO_HOOKS_DIR}/${hook.name}`,
@@ -15567,7 +15961,7 @@ var init_generator23 = __esm({
     init_embedded_skill();
     init_command_skill();
     init_markdown();
-    init_hook_format();
+    init_hook_format2();
     init_constants18();
   }
 });
@@ -15672,7 +16066,7 @@ var init_importer20 = __esm({
     init_shared_import_helpers();
     init_fs();
     init_markdown();
-    init_hook_format();
+    init_hook_format2();
     init_constants18();
     init_kiro2();
   }
@@ -15729,7 +16123,7 @@ var init_kiro2 = __esm({
       generateAgents: generateAgents19,
       generateSkills: generateSkills18,
       generateMcp: generateMcp15,
-      generateHooks: generateHooks10,
+      generateHooks: generateHooks11,
       generateIgnore: generateIgnore11,
       importFrom: importFromKiro
     };
@@ -16048,7 +16442,7 @@ async function importMcp4(projectRoot, scope, results) {
     toPath: OPENCODE_CANONICAL_MCP
   });
 }
-async function importPermissions(projectRoot, scope, results) {
+async function importPermissions3(projectRoot, scope, results) {
   const configFile = scope === "global" ? OPENCODE_GLOBAL_CONFIG_FILE : OPENCODE_CONFIG_FILE;
   const srcPath = join(projectRoot, configFile);
   const content = await readFileSafe(srcPath);
@@ -16086,7 +16480,7 @@ async function importFromOpenCode(projectRoot, options = {}) {
   results.push(...await runDescriptorImport(descriptor21, projectRoot, scope, { normalize }));
   await importEmbeddedSkills(projectRoot, OPENCODE_SKILLS_DIR, OPENCODE_TARGET, results, normalize);
   await importMcp4(projectRoot, scope, results);
-  await importPermissions(projectRoot, scope, results);
+  await importPermissions3(projectRoot, scope, results);
   return results;
 }
 var init_importer21 = __esm({
@@ -16434,10 +16828,14 @@ function generateSkills20(canonical) {
   return generateEmbeddedSkills(canonical, PI_AGENT_SKILLS_DIR);
 }
 function generateCommands20(canonical) {
-  return canonical.commands.map((command) => ({
-    path: `${PI_AGENT_SKILLS_DIR}/${commandSkillDirName(command.name)}/SKILL.md`,
-    content: serializeCommandSkill(command)
-  }));
+  return canonical.commands.map((command) => {
+    const frontmatter = {};
+    if (command.description) frontmatter.description = command.description;
+    return {
+      path: `${PI_AGENT_COMMANDS_DIR}/${command.name}.md`,
+      content: serializeFrontmatter(frontmatter, command.body.trim() || "")
+    };
+  });
 }
 function generateAgents21(canonical) {
   return canonical.agents.map((agent) => ({
@@ -16449,8 +16847,8 @@ var init_generator25 = __esm({
   "src/targets/pi-agent/generator.ts"() {
     init_embedded_skill();
     init_managed_blocks();
+    init_markdown();
     init_projected_agent_skill();
-    init_command_skill();
     init_constants20();
   }
 });
@@ -16549,7 +16947,6 @@ var init_lint21 = __esm({
 var target22, project22, globalLayout21, capabilities11, descriptor22;
 var init_pi_agent2 = __esm({
   "src/targets/pi-agent/index.ts"() {
-    init_command_skill();
     init_projected_agent_skill();
     init_generator25();
     init_skill_mirror();
@@ -16571,7 +16968,7 @@ var init_pi_agent2 = __esm({
       rootInstructionPath: PI_AGENT_ROOT_FILE,
       skillDir: PI_AGENT_SKILLS_DIR,
       managedOutputs: {
-        dirs: [PI_AGENT_SKILLS_DIR],
+        dirs: [PI_AGENT_SKILLS_DIR, PI_AGENT_COMMANDS_DIR],
         files: [PI_AGENT_ROOT_FILE]
       },
       paths: {
@@ -16579,7 +16976,7 @@ var init_pi_agent2 = __esm({
           return PI_AGENT_ROOT_FILE;
         },
         commandPath(name) {
-          return `${PI_AGENT_SKILLS_DIR}/${commandSkillDirName(name)}/SKILL.md`;
+          return `${PI_AGENT_COMMANDS_DIR}/${name}.md`;
         },
         agentPath(name) {
           return `${PI_AGENT_SKILLS_DIR}/${projectedAgentSkillDirName(name)}/SKILL.md`;
@@ -16590,11 +16987,14 @@ var init_pi_agent2 = __esm({
       rootInstructionPath: PI_AGENT_GLOBAL_ROOT_FILE,
       skillDir: PI_AGENT_GLOBAL_SKILLS_DIR,
       managedOutputs: {
-        dirs: [PI_AGENT_GLOBAL_SKILLS_DIR],
+        dirs: [PI_AGENT_GLOBAL_SKILLS_DIR, PI_AGENT_GLOBAL_COMMANDS_DIR],
         files: [PI_AGENT_GLOBAL_ROOT_FILE]
       },
       rewriteGeneratedPath(path) {
         if (path === PI_AGENT_ROOT_FILE) return PI_AGENT_GLOBAL_ROOT_FILE;
+        if (path.startsWith(`${PI_AGENT_COMMANDS_DIR}/`)) {
+          return path.replace(`${PI_AGENT_COMMANDS_DIR}/`, `${PI_AGENT_GLOBAL_COMMANDS_DIR}/`);
+        }
         if (path.startsWith(`${PI_AGENT_SKILLS_DIR}/`)) {
           return path.replace(`${PI_AGENT_SKILLS_DIR}/`, `${PI_AGENT_GLOBAL_SKILLS_DIR}/`);
         }
@@ -16608,7 +17008,7 @@ var init_pi_agent2 = __esm({
           return PI_AGENT_GLOBAL_ROOT_FILE;
         },
         commandPath(name) {
-          return `${PI_AGENT_GLOBAL_SKILLS_DIR}/${commandSkillDirName(name)}/SKILL.md`;
+          return `${PI_AGENT_GLOBAL_COMMANDS_DIR}/${name}.md`;
         },
         agentPath(name) {
           return `${PI_AGENT_GLOBAL_SKILLS_DIR}/${projectedAgentSkillDirName(name)}/SKILL.md`;
@@ -16618,7 +17018,7 @@ var init_pi_agent2 = __esm({
     capabilities11 = {
       rules: "native",
       additionalRules: "embedded",
-      commands: "none",
+      commands: "native",
       agents: "none",
       skills: "native",
       mcp: "none",
@@ -16631,7 +17031,7 @@ var init_pi_agent2 = __esm({
       metadata: {
         displayName: "Pi Agent",
         category: "cli",
-        officialUrl: "https://github.com/pi-labs/pi-agent",
+        officialUrl: "https://github.com/earendil-works/pi",
         shortDescription: "Pi coding agent"
       },
       generators: target22,
@@ -16644,7 +17044,7 @@ var init_pi_agent2 = __esm({
         ignore: lintIgnore6,
         mcp: lintMcp7
       },
-      supportsConversion: { commands: true, agents: true },
+      supportsConversion: { agents: true },
       project: project22,
       globalSupport: {
         capabilities: capabilities11,
@@ -16662,6 +17062,17 @@ var init_pi_agent2 = __esm({
           canonicalDir: PI_AGENT_CANONICAL_RULES_DIR,
           canonicalRootFilename: "_root.md",
           markAsRoot: true
+        },
+        commands: {
+          feature: "commands",
+          mode: "directory",
+          source: {
+            project: [PI_AGENT_COMMANDS_DIR],
+            global: [PI_AGENT_GLOBAL_COMMANDS_DIR]
+          },
+          canonicalDir: PI_AGENT_CANONICAL_COMMANDS_DIR,
+          extensions: [".md"],
+          preset: "command"
         }
       },
       sharedArtifacts: {
@@ -16751,7 +17162,7 @@ function generateIgnore12(canonical) {
   if (!canonical.ignore || canonical.ignore.length === 0) return [];
   return [{ path: QWEN_IGNORE, content: canonical.ignore.join("\n") }];
 }
-function generateHooks11(canonical) {
+function generateHooks12(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   const hooks = buildClaudeHooksObjectFromCanonical(canonical);
   if (Object.keys(hooks).length === 0) return [];
@@ -16925,7 +17336,7 @@ var init_qwen_code2 = __esm({
       generateSkills: generateSkills21,
       generateMcp: generateMcp17,
       generateIgnore: generateIgnore12,
-      generateHooks: generateHooks11,
+      generateHooks: generateHooks12,
       generatePermissions: generatePermissions8,
       importFrom: importFromQwenCode
     };
@@ -17396,6 +17807,43 @@ var init_import_mappers9 = __esm({
     };
   }
 });
+async function importRooModes(projectRoot, results, normalize) {
+  const srcPath = join(projectRoot, ROO_CODE_MODES_FILE);
+  const content = await readFileSafe(srcPath);
+  if (content === null) return;
+  let parsed;
+  try {
+    parsed = parse(content);
+  } catch {
+    return;
+  }
+  const modes = parsed?.customModes;
+  if (!Array.isArray(modes)) return;
+  const destDir = join(projectRoot, ROO_CODE_CANONICAL_AGENTS_DIR);
+  for (const mode of modes) {
+    if (!mode || typeof mode !== "object") continue;
+    const m = mode;
+    const slug = typeof m.slug === "string" && m.slug ? m.slug : typeof m.name === "string" && m.name ? m.name : null;
+    if (!slug) continue;
+    const name = typeof m.name === "string" ? m.name : slug;
+    const description = typeof m.description === "string" ? m.description : "";
+    const body = typeof m.roleDefinition === "string" ? m.roleDefinition : "";
+    const destPath = join(destDir, `${slug}.md`);
+    const fileContent = await serializeImportedAgentWithFallback(
+      destPath,
+      { name, description, tools: [] },
+      normalize(body, srcPath, destPath)
+    );
+    await mkdirp(dirname(destPath));
+    await writeFileAtomic(destPath, fileContent);
+    results.push({
+      fromTool: ROO_CODE_TARGET,
+      fromPath: srcPath,
+      toPath: `${ROO_CODE_CANONICAL_AGENTS_DIR}/${slug}.md`,
+      feature: "agents"
+    });
+  }
+}
 async function importPerModeRules(projectRoot, results, normalize) {
   const rooDir = join(projectRoot, ROO_CODE_DIR);
   let entries;
@@ -17435,15 +17883,18 @@ async function importFromRooCode(projectRoot, options = {}) {
   const normalize = await createImportReferenceNormalizer(ROO_CODE_TARGET, projectRoot, scope);
   results.push(...await runDescriptorImport(descriptor25, projectRoot, scope, { normalize }));
   await importPerModeRules(projectRoot, results, normalize);
+  if (scope === "project") await importRooModes(projectRoot, results, normalize);
   await importEmbeddedSkills(projectRoot, ROO_CODE_SKILLS_DIR, ROO_CODE_TARGET, results, normalize);
   return results;
 }
 var init_importer25 = __esm({
   "src/targets/roo-code/importer.ts"() {
     init_import_rewriter();
+    init_fs();
     init_embedded_skill();
     init_import_orchestrator();
     init_descriptor_import_runner();
+    init_import_metadata();
     init_import_mappers9();
     init_constants23();
     init_roo_code2();
@@ -17485,7 +17936,7 @@ var init_lint23 = __esm({
     init_helpers();
   }
 });
-function computeStatus5(existing, content) {
+function computeStatus6(existing, content) {
   if (existing === null) return "created";
   if (existing !== content) return "updated";
   return "unchanged";
@@ -17551,7 +18002,7 @@ var init_roo_code2 = __esm({
           path: ROO_CODE_GLOBAL_MODES_FILE,
           content,
           currentContent: existing ?? void 0,
-          status: computeStatus5(existing, content)
+          status: computeStatus6(existing, content)
         }
       ];
     };
@@ -17635,7 +18086,7 @@ var init_roo_code2 = __esm({
         rules: "native",
         additionalRules: "native",
         commands: "native",
-        agents: "partial",
+        agents: "native",
         skills: "native",
         mcp: "native",
         hooks: "none",
@@ -18778,7 +19229,7 @@ function toWindsurfHooks(hooks) {
   }
   return result;
 }
-function generateHooks12(canonical) {
+function generateHooks13(canonical) {
   if (!canonical.hooks || Object.keys(canonical.hooks).length === 0) return [];
   const hooks = toWindsurfHooks(canonical.hooks);
   if (Object.keys(hooks).length === 0) return [];
@@ -19242,7 +19693,7 @@ var init_windsurf2 = __esm({
       generateAgents: generateAgents27,
       generateSkills: generateSkills27,
       generateMcp: generateMcp22,
-      generateHooks: generateHooks12,
+      generateHooks: generateHooks13,
       generateIgnore: generateIgnore15,
       importFrom: importFromWindsurf
     };