macro-agent 0.1.0 → 0.1.2

package/dist/teams/index.js

@@ -1,4 +1,6 @@
 export { loadTeam } from "./team-loader.js";
 export { TeamRuntime } from "./team-runtime.js";
+export { TeamManager } from "./team-manager.js";
+export { seedDefaultTemplates } from "./seed-defaults.js";
 export { TeamLoadError, } from "./types.js";
 //# sourceMappingURL=index.js.map

package/dist/teams/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/teams/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAA+C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EACL,aAAa,GASd,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/teams/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAA+C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,WAAW,EAA8C,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,aAAa,GAyBd,MAAM,YAAY,CAAC"}

package/dist/teams/seed-defaults.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Seed Default Team Templates
+ *
+ * Copies bundled default team templates from the macro-agent package
+ * to the project's .multiagent/teams/ directory on first use.
+ * Idempotent — only copies templates that don't already exist.
+ *
+ * @module teams/seed-defaults
+ */
+/**
+ * Copy bundled default team templates to the project's .multiagent/teams/ directory.
+ *
+ * Only copies templates that don't already exist at the target path —
+ * user-customized templates are never overwritten. Safe to call on every startup.
+ *
+ * @param basePath - Project root directory (e.g., process.cwd())
+ * @returns Names of templates that were copied
+ */
+export declare function seedDefaultTemplates(basePath: string): Promise<string[]>;
+//# sourceMappingURL=seed-defaults.d.ts.map

package/dist/teams/seed-defaults.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"seed-defaults.d.ts","sourceRoot":"","sources":["../../src/teams/seed-defaults.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiC9E"}

package/dist/teams/seed-defaults.js

@@ -0,0 +1,71 @@
+/**
+ * Seed Default Team Templates
+ *
+ * Copies bundled default team templates from the macro-agent package
+ * to the project's .multiagent/teams/ directory on first use.
+ * Idempotent — only copies templates that don't already exist.
+ *
+ * @module teams/seed-defaults
+ */
+import * as fs from "fs";
+import * as path from "path";
+import { fileURLToPath } from "url";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// Package root: up from src/teams/ → src/ → package root
+const PACKAGE_ROOT = path.resolve(__dirname, "..", "..");
+const BUNDLED_TEAMS_DIR = path.join(PACKAGE_ROOT, ".multiagent", "teams");
+const TEAMS_DIR = ".multiagent/teams";
+/**
+ * Copy bundled default team templates to the project's .multiagent/teams/ directory.
+ *
+ * Only copies templates that don't already exist at the target path —
+ * user-customized templates are never overwritten. Safe to call on every startup.
+ *
+ * @param basePath - Project root directory (e.g., process.cwd())
+ * @returns Names of templates that were copied
+ */
+export async function seedDefaultTemplates(basePath) {
+    const targetDir = path.join(basePath, TEAMS_DIR);
+    const seeded = [];
+    // Check if bundled templates exist in the package
+    if (!fs.existsSync(BUNDLED_TEAMS_DIR))
+        return seeded;
+    let bundledTemplates;
+    try {
+        bundledTemplates = fs.readdirSync(BUNDLED_TEAMS_DIR, { withFileTypes: true })
+            .filter(d => d.isDirectory());
+    }
+    catch {
+        return seeded;
+    }
+    if (bundledTemplates.length === 0)
+        return seeded;
+    // Ensure target directory exists
+    fs.mkdirSync(targetDir, { recursive: true });
+    for (const templateDir of bundledTemplates) {
+        const targetTemplatePath = path.join(targetDir, templateDir.name);
+        if (fs.existsSync(targetTemplatePath))
+            continue; // Don't overwrite
+        // Recursive copy of the entire template directory
+        copyDirRecursive(path.join(BUNDLED_TEAMS_DIR, templateDir.name), targetTemplatePath);
+        seeded.push(templateDir.name);
+    }
+    return seeded;
+}
+/**
+ * Recursively copy a directory tree.
+ */
+function copyDirRecursive(src, dest) {
+    fs.mkdirSync(dest, { recursive: true });
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        const srcPath = path.join(src, entry.name);
+        const destPath = path.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            copyDirRecursive(srcPath, destPath);
+        }
+        else {
+            fs.copyFileSync(srcPath, destPath);
+        }
+    }
+}
+//# sourceMappingURL=seed-defaults.js.map

package/dist/teams/seed-defaults.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"seed-defaults.js","sourceRoot":"","sources":["../../src/teams/seed-defaults.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,yDAAyD;AACzD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACzD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AAC1E,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAEtC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,QAAgB;IACzD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,kDAAkD;IAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAAE,OAAO,MAAM,CAAC;IAErD,IAAI,gBAA6B,CAAC;IAClC,IAAI,CAAC;QACH,gBAAgB,GAAG,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aAC1E,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAEjD,iCAAiC;IACjC,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7C,KAAK,MAAM,WAAW,IAAI,gBAAgB,EAAE,CAAC;QAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;YAAE,SAAS,CAAC,kBAAkB;QAEnE,kDAAkD;QAClD,gBAAgB,CACd,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,IAAI,CAAC,EAC9C,kBAAkB,CACnB,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,GAAW,EAAE,IAAY;IACjD,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/teams/team-loader.d.ts

@@ -1,8 +1,8 @@
 /**
  * Team Template Loader
  *
- * Reads .macro-agent/teams/<name>/ directories, parses team.yaml,
- * resolves role inheritance, loads prompts, and validates communication.
+ * Thin wrapper around openteams TemplateLoader that maps the result
+ * into macro-agent's TeamManifest format with enforcement-enriched roles.
  *
  * @module teams/team-loader
  */
@@ -11,7 +11,11 @@ import { type TeamManifest } from "./types.js";
 /**
  * Load a team template from disk and resolve all references.
  *
- * @param teamName - Team name (directory name under .macro-agent/teams/)
+ * Delegates to openteams TemplateLoader for YAML parsing, role resolution,
+ * prompt loading, and MCP server config. Enriches the result with macro-agent
+ * specific enforcement (workspace, lifecycle, spawn rules).
+ *
+ * @param teamName - Team name (directory name under .multiagent/teams/)
  * @param roleRegistry - Role registry for resolving extends chains
  * @param basePath - Project root (default: process.cwd())
  * @returns Fully resolved TeamManifest

package/dist/teams/team-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"team-loader.d.ts","sourceRoot":"","sources":["../../src/teams/team-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,YAAY,EAA8B,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAEL,KAAK,YAAY,EAOlB,MAAM,YAAY,CAAC;AAiBpB;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA4FvB"}
+{"version":3,"file":"team-loader.d.ts","sourceRoot":"","sources":["../../src/teams/team-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,OAAO,KAAK,EAAE,YAAY,EAA8B,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAEL,KAAK,YAAY,EAKlB,MAAM,YAAY,CAAC;AAYpB;;;;;;;;;;;GAWG;AACH,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,CAAC,CA+EvB"}

package/dist/teams/team-loader.js

@@ -1,31 +1,29 @@
 /**
  * Team Template Loader
  *
- * Reads .macro-agent/teams/<name>/ directories, parses team.yaml,
- * resolves role inheritance, loads prompts, and validates communication.
+ * Thin wrapper around openteams TemplateLoader that maps the result
+ * into macro-agent's TeamManifest format with enforcement-enriched roles.
  *
  * @module teams/team-loader
  */
-import * as fs from "fs";
 import * as path from "path";
-import yaml from "js-yaml";
+import { TemplateLoader } from "openteams";
 import { TeamLoadError, } from "./types.js";
 // =============================================================================
 // Constants
 // =============================================================================
-const TEAMS_DIR = ".macro-agent/teams";
-const MANIFEST_FILE = "team.yaml";
-const ROLES_DIR = "roles";
-const PROMPTS_DIR = "prompts";
-const TOOLS_DIR = "tools";
-const MCP_SERVERS_FILE = "mcp-servers.json";
+const TEAMS_DIR = ".multiagent/teams";
 // =============================================================================
 // TeamLoader
 // =============================================================================
 /**
  * Load a team template from disk and resolve all references.
  *
- * @param teamName - Team name (directory name under .macro-agent/teams/)
+ * Delegates to openteams TemplateLoader for YAML parsing, role resolution,
+ * prompt loading, and MCP server config. Enriches the result with macro-agent
+ * specific enforcement (workspace, lifecycle, spawn rules).
+ *
+ * @param teamName - Team name (directory name under .multiagent/teams/)
  * @param roleRegistry - Role registry for resolving extends chains
  * @param basePath - Project root (default: process.cwd())
  * @returns Fully resolved TeamManifest
@@ -33,225 +31,219 @@ const MCP_SERVERS_FILE = "mcp-servers.json";
 export async function loadTeam(teamName, roleRegistry, basePath) {
     const root = basePath ?? process.cwd();
     const teamDir = path.join(root, TEAMS_DIR, teamName);
-    // 1. Check team directory exists
-    if (!fs.existsSync(teamDir)) {
-        throw new TeamLoadError(`Team directory not found: ${teamDir}`, "MANIFEST_NOT_FOUND", teamName);
-    }
-    // 2. Read and parse team.yaml
-    const manifestPath = path.join(teamDir, MANIFEST_FILE);
-    if (!fs.existsSync(manifestPath)) {
-        throw new TeamLoadError(`Team manifest not found: ${manifestPath}`, "MANIFEST_NOT_FOUND", teamName);
-    }
-    const raw = fs.readFileSync(manifestPath, "utf-8");
-    let parsed;
+    // 1. Load via openteams TemplateLoader with hooks
+    let template;
     try {
-        parsed = yaml.load(raw);
+        template = await TemplateLoader.loadAsync(teamDir, {
+            resolveExternalRole: (name) => mapRegistryRole(roleRegistry, name),
+            postProcessRole: (role, manifest) => enrichRoleWithSpawnRules(role, manifest),
+        });
     }
     catch (err) {
-        throw new TeamLoadError(`Failed to parse ${manifestPath}: ${err instanceof Error ? err.message : String(err)}`, "INVALID_MANIFEST", teamName);
+        throw mapToTeamLoadError(err, teamName, teamDir);
     }
-    // 3. Validate required fields
-    validateManifest(parsed, teamName);
-    const topology = parsed.topology;
-    const communication = (parsed.communication ?? {});
-    const macroAgent = (parsed.macro_agent ?? {});
-    const roleNames = parsed.roles;
-    // 4. Resolve roles
+    const manifest = template.manifest;
+    const communication = (manifest.communication ?? {});
+    const macroAgent = parseMacroAgentExtensions(manifest.macro_agent);
+    // 2. Build enforcement-enriched roles
     const resolvedRoles = new Map();
-    const spawnRules = topology.spawn_rules ?? {};
-    for (const roleName of roleNames) {
-        const resolved = resolveTeamRole(roleName, teamDir, roleRegistry, spawnRules);
-        resolvedRoles.set(roleName, resolved);
+    for (const [roleName, openteamsRole] of template.roles) {
+        resolvedRoles.set(roleName, buildResolvedTeamRole(roleName, openteamsRole, roleRegistry));
     }
-    // 5. Load prompts
+    // 3. Build loaded prompts map (backward compat: path → assembled content)
+    //    Assembles multi-file prompts (primary + additional sections) into a single
+    //    string so the runtime can use it transparently.
     const loadedPrompts = new Map();
-    // Load prompts from topology nodes
-    const promptRefs = collectPromptRefs(topology, resolvedRoles);
-    for (const promptPath of promptRefs) {
-        const fullPath = path.join(teamDir, promptPath);
-        if (!fs.existsSync(fullPath)) {
-            throw new TeamLoadError(`Prompt file not found: ${fullPath}`, "PROMPT_NOT_FOUND", teamName);
+    for (const [roleName, resolvedPrompts] of template.prompts) {
+        if (!resolvedPrompts.primary)
+            continue;
+        const role = template.roles.get(roleName);
+        // Assemble full prompt: primary + additional sections
+        let fullPrompt = resolvedPrompts.primary;
+        for (const section of resolvedPrompts.additional) {
+            fullPrompt += `\n\n## ${section.name}\n\n${section.content}`;
+        }
+        // Store under role's promptFile key (used by getPromptForRole)
+        if (role?.promptFile) {
+            loadedPrompts.set(role.promptFile, fullPrompt);
+        }
+        // Store under topology node prompt keys (used by getPromptForTopologyNode)
+        if (manifest.topology.root.role === roleName && manifest.topology.root.prompt) {
+            loadedPrompts.set(manifest.topology.root.prompt, fullPrompt);
+        }
+        for (const comp of manifest.topology.companions ?? []) {
+            if (comp.role === roleName && comp.prompt) {
+                loadedPrompts.set(comp.prompt, fullPrompt);
+            }
+        }
+        // Convention fallback key
+        if (!role?.promptFile) {
+            loadedPrompts.set(`prompts/${roleName}.md`, fullPrompt);
         }
-        loadedPrompts.set(promptPath, fs.readFileSync(fullPath, "utf-8"));
     }
-    // 6. Load MCP server configs
-    const mcpServers = loadMcpServers(teamDir);
-    // 7. Validate communication topology
-    validateCommunication(communication, roleNames, teamName);
+    // 4. Validate communication topology
+    validateCommunication(communication, manifest.roles, teamName);
     return {
-        name: parsed.name,
-        description: parsed.description ?? "",
-        version: parsed.version ?? 1,
-        roles: roleNames,
-        topology,
+        name: manifest.name,
+        description: manifest.description ?? "",
+        version: manifest.version ?? 1,
+        roles: manifest.roles,
+        topology: manifest.topology,
         communication,
         macro_agent: macroAgent,
         _resolvedRoles: resolvedRoles,
         _loadedPrompts: loadedPrompts,
-        _mcpServers: mcpServers,
+        _mcpServers: template.mcpServers,
     };
 }
 // =============================================================================
-// Manifest Validation
+// Hook: Map RoleRegistry → openteams ResolvedRole
 // =============================================================================
-function validateManifest(parsed, teamName) {
-    if (!parsed || typeof parsed !== "object") {
-        throw new TeamLoadError("Team manifest must be a YAML object", "INVALID_MANIFEST", teamName);
-    }
-    if (!parsed.name || typeof parsed.name !== "string") {
-        throw new TeamLoadError("Team manifest requires a 'name' string field", "INVALID_MANIFEST", teamName);
-    }
-    if (!Array.isArray(parsed.roles) || parsed.roles.length === 0) {
-        throw new TeamLoadError("Team manifest requires a non-empty 'roles' array", "INVALID_MANIFEST", teamName);
-    }
-    if (!parsed.topology || typeof parsed.topology !== "object") {
-        throw new TeamLoadError("Team manifest requires a 'topology' object", "INVALID_MANIFEST", teamName);
+/**
+ * Convert a macro-agent RoleRegistry entry to an openteams ResolvedRole.
+ * Used as the resolveExternalRole hook for TemplateLoader.
+ */
+function mapRegistryRole(roleRegistry, name) {
+    try {
+        const rd = roleRegistry.resolveRole(name);
+        return {
+            name: rd.name,
+            displayName: rd.displayName ?? rd.name,
+            description: rd.description ?? `Role: ${rd.name}`,
+            capabilities: [...rd.capabilities],
+            raw: { name: rd.name, capabilities: [...rd.capabilities] },
+        };
     }
-    const topology = parsed.topology;
-    if (!topology.root || typeof topology.root !== "object") {
-        throw new TeamLoadError("Team topology requires a 'root' object", "INVALID_MANIFEST", teamName);
+    catch {
+        return null;
     }
 }
 // =============================================================================
-// Role Resolution
+// Hook: Enrich roles with spawn_rules capabilities
 // =============================================================================
 /**
- * Resolve a single team role: load YAML if present, resolve extends,
- * compute capabilities, translate spawn rules.
+ * Translate team topology spawn_rules into agent.spawn.* capabilities.
+ * Used as the postProcessRole hook for TemplateLoader.
  */
-function resolveTeamRole(roleName, teamDir, roleRegistry, spawnRules) {
-    // Try to load role YAML from team directory
-    const roleFilePath = path.join(teamDir, ROLES_DIR, `${roleName}.yaml`);
-    let teamRoleDef = null;
-    if (fs.existsSync(roleFilePath)) {
-        const raw = fs.readFileSync(roleFilePath, "utf-8");
-        try {
-            teamRoleDef = yaml.load(raw);
-        }
-        catch (err) {
-            throw new TeamLoadError(`Failed to parse role file ${roleFilePath}: ${err instanceof Error ? err.message : String(err)}`, "INVALID_ROLE", roleName);
+function enrichRoleWithSpawnRules(role, manifest) {
+    const spawnRules = manifest.topology.spawn_rules;
+    if (!spawnRules)
+        return role;
+    const allowedSpawns = spawnRules[role.name];
+    if (!allowedSpawns || allowedSpawns.length === 0)
+        return role;
+    const capabilities = [...role.capabilities];
+    for (const target of allowedSpawns) {
+        const cap = `agent.spawn.${target}`;
+        if (!capabilities.includes(cap)) {
+            capabilities.push(cap);
         }
     }
-    // Determine base role
-    const baseRoleName = teamRoleDef?.extends ?? roleName;
+    return { ...role, capabilities };
+}
+// =============================================================================
+// Build ResolvedTeamRole
+// =============================================================================
+/**
+ * Build a macro-agent ResolvedTeamRole from an openteams ResolvedRole.
+ * Enriches with enforcement-specific fields (workspace, lifecycle, tools, etc.)
+ * from the parent RoleDefinition and macro_agent overrides from role YAML.
+ */
+function buildResolvedTeamRole(roleName, openteamsRole, roleRegistry) {
+    const baseRoleName = openteamsRole.extends ?? roleName;
     let parentRole;
     try {
         parentRole = roleRegistry.resolveRole(baseRoleName);
     }
     catch {
-        throw new TeamLoadError(`Base role '${baseRoleName}' not found for team role '${roleName}'`, "ROLE_NOT_FOUND", roleName);
-    }
-    // Compute capabilities
-    let capabilities;
-    if (teamRoleDef?.capabilities) {
-        // Full replacement
-        capabilities = teamRoleDef.capabilities;
-    }
-    else if (teamRoleDef?.capabilities_add || teamRoleDef?.capabilities_remove) {
-        // Additive/subtractive
-        const base = new Set(parentRole.capabilities);
-        for (const cap of teamRoleDef.capabilities_add ?? []) {
-            base.add(cap);
-        }
-        for (const cap of teamRoleDef.capabilities_remove ?? []) {
-            base.delete(cap);
-        }
-        capabilities = Array.from(base);
+        // Fallback for roles without a registry parent
+        parentRole = {
+            name: baseRoleName,
+            displayName: baseRoleName,
+            description: `Role: ${baseRoleName}`,
+            capabilities: [],
+        };
     }
-    else {
-        // Inherit parent capabilities
-        capabilities = [...parentRole.capabilities];
+    const macroAgent = openteamsRole.raw.macro_agent;
+    let capabilities = openteamsRole.capabilities;
+    // If the role YAML had no capability specification (no capabilities,
+    // capabilities_add, or capabilities_remove), openteams leaves capabilities
+    // empty. In that case, inherit all parent capabilities. Spawn-rule enrichment
+    // may have already added some caps, so merge with parent.
+    const hasExplicitCapabilitySpec = openteamsRole.raw.capabilities !== undefined;
+    if (!hasExplicitCapabilitySpec && parentRole.capabilities.length > 0) {
+        const merged = new Set([...parentRole.capabilities, ...capabilities]);
+        capabilities = [...merged];
     }
-    // Translate spawn_rules into capability additions (RD3)
-    const allowedSpawns = spawnRules[roleName];
-    if (allowedSpawns) {
-        for (const targetRole of allowedSpawns) {
-            const spawnCap = `agent.spawn.${targetRole}`;
-            if (!capabilities.includes(spawnCap)) {
-                capabilities.push(spawnCap);
-            }
-        }
-    }
-    // Build the resolved RoleDefinition for registry
     const roleDefinition = {
         name: roleName,
-        displayName: teamRoleDef?.display_name ?? parentRole.displayName,
-        description: teamRoleDef?.description ?? parentRole.description,
+        displayName: openteamsRole.displayName,
+        description: openteamsRole.description,
         capabilities,
-        workspace: teamRoleDef?.macro_agent?.workspace
+        workspace: macroAgent?.workspace
             ? {
-                type: (teamRoleDef.macro_agent.workspace.type ?? "own"),
-                branchPattern: teamRoleDef.macro_agent.workspace.branch_pattern,
-                cleanupOnTerminate: teamRoleDef.macro_agent.workspace.cleanup_on_terminate,
+                type: (macroAgent.workspace.type ?? "own"),
+                branchPattern: macroAgent.workspace.branch_pattern,
+                cleanupOnTerminate: macroAgent.workspace.cleanup_on_terminate,
             }
             : parentRole.workspace,
-        lifecycle: teamRoleDef?.macro_agent?.lifecycle
+        lifecycle: macroAgent?.lifecycle
             ? {
-                type: (teamRoleDef.macro_agent.lifecycle.type ?? "ephemeral"),
-                cascadeTerminate: teamRoleDef.macro_agent.lifecycle.cascade_terminate,
-                selfCleanup: teamRoleDef.macro_agent.lifecycle.self_cleanup,
-                taskBound: teamRoleDef.macro_agent.lifecycle.task_bound,
-                parentBound: teamRoleDef.macro_agent.lifecycle.parent_bound,
-                maxDurationMs: teamRoleDef.macro_agent.lifecycle.max_duration_ms,
+                type: (macroAgent.lifecycle.type ?? "ephemeral"),
+                cascadeTerminate: macroAgent.lifecycle.cascade_terminate,
+                selfCleanup: macroAgent.lifecycle.self_cleanup,
+                taskBound: macroAgent.lifecycle.task_bound,
+                parentBound: macroAgent.lifecycle.parent_bound,
+                maxDurationMs: macroAgent.lifecycle.max_duration_ms,
             }
             : parentRole.lifecycle,
         tools: parentRole.tools,
         protocol: parentRole.protocol,
         permissions: parentRole.permissions,
-        extends: teamRoleDef?.extends,
+        extends: openteamsRole.extends,
         systemPrompt: parentRole.systemPrompt,
     };
     return {
         name: roleName,
         baseRole: baseRoleName,
         capabilities,
-        prompt: teamRoleDef?.prompt,
+        prompt: openteamsRole.promptFile,
         roleDefinition,
     };
 }
 // =============================================================================
-// Prompt Collection
+// Parse macro_agent extensions
 // =============================================================================
 /**
- * Collect all prompt file paths referenced by topology and roles.
+ * Parse the opaque macro_agent field from the manifest into typed extensions.
  */
-function collectPromptRefs(topology, resolvedRoles) {
-    const refs = new Set();
-    // From topology nodes
-    if (topology.root.prompt)
-        refs.add(topology.root.prompt);
-    for (const companion of topology.companions ?? []) {
-        if (companion.prompt)
-            refs.add(companion.prompt);
-    }
-    // From role definitions
-    for (const resolved of resolvedRoles.values()) {
-        if (resolved.prompt)
-            refs.add(resolved.prompt);
-    }
-    return refs;
+function parseMacroAgentExtensions(raw) {
+    if (!raw)
+        return {};
+    return raw;
 }
 // =============================================================================
-// MCP Server Loading
+// Error Mapping
 // =============================================================================
 /**
- * Load tools/mcp-servers.json if it exists.
- * Returns a map of role name → MCP server entries.
+ * Map openteams loader errors to macro-agent TeamLoadError for backward compat.
  */
-function loadMcpServers(teamDir) {
-    const result = new Map();
-    const mcpPath = path.join(teamDir, TOOLS_DIR, MCP_SERVERS_FILE);
-    if (!fs.existsSync(mcpPath)) {
-        return result;
+function mapToTeamLoadError(err, teamName, teamDir) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (message.includes("not found") || message.includes("not exist")) {
+        return new TeamLoadError(`Team directory or manifest not found: ${teamDir}`, "MANIFEST_NOT_FOUND", teamName);
     }
-    const raw = fs.readFileSync(mcpPath, "utf-8");
-    const parsed = JSON.parse(raw);
-    for (const [roleName, config] of Object.entries(parsed)) {
-        if (config.servers && Array.isArray(config.servers)) {
-            result.set(roleName, config.servers);
-        }
+    if (message.includes("parse") || message.includes("YAML")) {
+        return new TeamLoadError(`Failed to parse team manifest: ${message}`, "INVALID_MANIFEST", teamName);
+    }
+    if (message.includes("role") && message.includes("not in")) {
+        return new TeamLoadError(message, "INVALID_MANIFEST", teamName);
+    }
+    if (message.includes("Circular")) {
+        return new TeamLoadError(message, "INVALID_ROLE", teamName);
     }
-    return result;
+    // Default: treat as invalid manifest
+    return new TeamLoadError(`Failed to load team '${teamName}': ${message}`, "INVALID_MANIFEST", teamName);
 }
 // =============================================================================
 // Communication Validation