@openagentpack/sdk 0.7.2 → 0.8.0

package/dist/{chunk-HLZOSZ7B.js → chunk-ZOMPZ7R6.js}

@@ -816,7 +816,21 @@ var toolsSchema = z.object({
 });
 var multiagentSchema = z.object({
   type: z.literal("coordinator"),
-  agents: z.array(z.string())
+  agents: z.array(z.union([z.string().min(1), z.object({ agent_id: z.string().trim().min(1) })])).min(1)
+}).superRefine((multiagent, ctx) => {
+  const seen = /* @__PURE__ */ new Set();
+  for (const [index, member] of multiagent.agents.entries()) {
+    const key = typeof member === "string" ? `logical:${member}` : `external:${member.agent_id}`;
+    if (seen.has(key)) {
+      const label = typeof member === "string" ? member : member.agent_id;
+      ctx.addIssue({
+        code: "custom",
+        path: ["agents", index],
+        message: `duplicates member '${label}'`
+      });
+    }
+    seen.add(key);
+  }
 });
 var agentSkillRefSchema = z.object({
   type: z.enum(["official", "custom"]),
@@ -1344,6 +1358,86 @@ function extractCreatedEventId(res) {
   return void 0;
 }
 
+// src/internal/multiagent/reverse-index.ts
+function buildReverseIndex(agents, project) {
+  const index = /* @__PURE__ */ new Map();
+  for (const raw of agents) {
+    const id = raw.id;
+    if (typeof id !== "string") continue;
+    const metadata = raw.metadata;
+    const owned = metadata?.["agents.project"] === project;
+    const resource = metadata?.["agents.resource"];
+    const logicalName = owned && typeof resource === "string" && resource.trim() ? resource.trim() : void 0;
+    index.set(id, {
+      logical_name: logicalName,
+      archived: raw.archived_at != null,
+      owned
+    });
+  }
+  return index;
+}
+function memberDeclResolver(index) {
+  const claims = /* @__PURE__ */ new Map();
+  for (const entry of index.values()) {
+    if (!entry.logical_name) continue;
+    claims.set(entry.logical_name, (claims.get(entry.logical_name) ?? 0) + 1);
+  }
+  return (memberId) => {
+    const entry = index.get(memberId);
+    if (!entry) {
+      throw new UserError(
+        `sync.multiagent.member.unresolved: roster member '${memberId}' is missing from the /agents listing.`
+      );
+    }
+    if (!entry.owned) return { agent_id: memberId };
+    if (entry.archived) {
+      throw new UserError(
+        `sync.multiagent.member.archived: roster member '${memberId}' is archived; restore it before syncing.`
+      );
+    }
+    const name = entry.logical_name;
+    if (!name) {
+      throw new UserError(
+        `sync.multiagent.member.unresolved: roster member '${memberId}' carries no agents.resource metadata.`
+      );
+    }
+    if ((claims.get(name) ?? 0) > 1) {
+      throw new UserError(
+        `sync.multiagent.member.ambiguous: logical name '${name}' is claimed by multiple remote agents.`
+      );
+    }
+    return name;
+  };
+}
+function reverseMultiagentDecl(raw, resolveMember) {
+  if (raw === null || raw === void 0) return void 0;
+  if (typeof raw !== "object") return void 0;
+  const roster = raw;
+  if (roster.type !== void 0 && roster.type !== "coordinator") {
+    throw new UserError(
+      `sync.multiagent.member.unresolved: remote multi-agent type '${String(roster.type)}' cannot be represented (coordinator only).`
+    );
+  }
+  if (!Array.isArray(roster.agents) || roster.agents.length === 0) return void 0;
+  if (!resolveMember) {
+    throw new UserError(
+      "sync.multiagent.member.unresolved: reverse-mapping a multi-agent roster requires a member name resolver."
+    );
+  }
+  return {
+    type: "coordinator",
+    agents: roster.agents.map((member) => resolveMember(rosterMemberId(member)))
+  };
+}
+function rosterMemberId(member) {
+  if (typeof member === "string") return member;
+  if (typeof member === "object" && member !== null) {
+    const m = member;
+    if (m.type === "agent" && typeof m.id === "string") return m.id;
+  }
+  throw new UserError("sync.multiagent.member.unresolved: roster member is not a representable agent reference.");
+}
+
 // src/internal/providers/session-vault.ts
 function extractVaultIds(res) {
   const top = res.vault_ids;
@@ -1419,7 +1513,7 @@ function buildSessionInfo(res, memoryStoreIds) {
     attributes: res
   };
 }
-async function exportRemoteResources(client, type, mappers) {
+async function exportRemoteResources(client, type, mappers, projectName) {
   if (type === "environment") {
     const envs = await client.getAllPaged("/environments");
     return envs.map((env) => {
@@ -1458,9 +1552,11 @@ async function exportRemoteResources(client, type, mappers) {
   }
   if (type === "agent") {
     const agents = await client.getAllPaged("/agents");
+    const resolveMember = memberDeclResolver(buildReverseIndex(agents, projectName ?? ""));
     return agents.filter((agent) => !agent.archived_at).map((agent) => {
       const agentId = agent.id;
-      return { name: agentId, decl: mappers.agentToDecl(agent) };
+      const name = resourceNameFromMetadata(agent.metadata, agent.name ?? agentId, agentId);
+      return { name, decl: mappers.agentToDecl(agent, resolveMember) };
     });
   }
   return [];
@@ -1684,11 +1780,10 @@ function envToDecl(raw) {
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
-function agentToDecl(raw) {
+function agentToDecl(raw, resolveMember) {
   const tools = raw.tools;
   const mcpServers = raw.mcp_servers;
   const skills = raw.skills;
-  const multiagent = raw.multiagent;
   let builtinTools;
   let builtinPermissions;
   let allToolsEnabled = false;
@@ -1720,10 +1815,6 @@ function agentToDecl(raw) {
       skill_id: s.skill_id
     }));
   }
-  let multiagentDecl;
-  if (multiagent && multiagent.agents?.length) {
-    multiagentDecl = { type: "coordinator", agents: multiagent.agents };
-  }
   let toolsDecl;
   if (builtinTools?.length) {
     toolsDecl = { builtin: builtinTools, permissions: builtinPermissions };
@@ -1740,7 +1831,7 @@ function agentToDecl(raw) {
     tools: toolsDecl,
     mcp_servers: mcpServerDecls,
     skills: skillDecls,
-    multiagent: multiagentDecl,
+    multiagent: reverseMultiagentDecl(raw.multiagent, resolveMember),
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
@@ -1823,10 +1914,10 @@ function mapAgent(name, decl, refs, version, projectName) {
       skill_id: s.skill_id
     }));
   }
-  if (decl.multiagent && refs.multiagent_agent_ids?.length) {
+  if (decl.multiagent && refs.multiagent) {
     body.multiagent = {
       type: "coordinator",
-      agents: refs.multiagent_agent_ids
+      agents: refs.multiagent.members.map((member) => member.remote_id)
     };
   }
   return body;
@@ -2164,13 +2255,18 @@ var ClaudeAdapter = class _ClaudeAdapter {
     await this.client.delete(`/vaults/${id}`);
   }
   async exportResources(type) {
-    return exportRemoteResources(this.client, type, {
-      envToDecl,
-      vaultToDecl,
-      fileToDecl,
-      skillToDecl,
-      agentToDecl
-    });
+    return exportRemoteResources(
+      this.client,
+      type,
+      {
+        envToDecl,
+        vaultToDecl,
+        fileToDecl,
+        skillToDecl,
+        agentToDecl
+      },
+      this.projectName
+    );
   }
   async createSkill(name, _decl, files) {
     const formData = buildClaudeSkillFormData(name, files);
@@ -2539,6 +2635,31 @@ import { readFileSync as readFileSync2 } from "fs";
 import { basename as basename3, dirname as dirname5, resolve as resolve5 } from "path";
 import JSZip2 from "jszip";
 
+// src/internal/multiagent/comparable.ts
+function canonicalizeRemoteRoster(raw, materialization) {
+  if (raw === null || raw === void 0) return { supported: true };
+  if (typeof raw !== "object") return { supported: false };
+  const roster = raw;
+  if (roster.type !== "coordinator") return { supported: false };
+  if (!Array.isArray(roster.agents)) return { supported: false };
+  if (roster.agents.length === 0) return { supported: true };
+  const memberIds = [];
+  for (const entry of roster.agents) {
+    if (typeof entry !== "object" || entry === null) return { supported: false };
+    const member = entry;
+    if (member.type !== "agent") return { supported: false };
+    const id = materialization === "forward" ? member.template_id : member.id;
+    if (typeof id !== "string") return { supported: false };
+    memberIds.push(id);
+  }
+  return { supported: true, roster: { type: "coordinator", member_ids: [...new Set(memberIds)].sort() } };
+}
+function comparableMultiagentField(raw, materialization) {
+  const canonical = canonicalizeRemoteRoster(raw, materialization);
+  if (!canonical.supported) return { type: "unsupported" };
+  return canonical.roster;
+}
+
 // src/internal/providers/qoder/client.ts
 var QoderClient = class extends BaseApiClient {
   baseUrl;
@@ -2688,7 +2809,7 @@ function skillToDecl2(raw, name) {
     description: raw.description
   });
 }
-function agentToDecl2(raw) {
+function agentToDecl2(raw, resolveMember) {
   const tools = raw.tools;
   const mcpServers = raw.mcp_servers;
   const skills = raw.skills;
@@ -2727,6 +2848,7 @@ function agentToDecl2(raw) {
     tools: builtinTools?.length ? { builtin: builtinTools, permissions: builtinPermissions } : void 0,
     mcp_servers: mcpServerDecls,
     skills: skillDecls,
+    multiagent: reverseMultiagentDecl(raw.multiagent, resolveMember),
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
@@ -2835,7 +2957,7 @@ function mapDeploymentResources2(decl, refs, uploadedFiles) {
   }
   return resources;
 }
-function mapAgent2(name, decl, refs, version, projectName) {
+function mapAgent2(name, decl, refs, version, projectName, operation = "create") {
   let model;
   if (typeof decl.model === "string") {
     model = decl.model;
@@ -2894,15 +3016,21 @@ function mapAgent2(name, decl, refs, version, projectName) {
       }
     }
   }
-  if (refs.skill_ids.length) {
-    body.skills = refs.skill_ids.map((s) => ({
-      type: s.type === "official" ? "qoder" : s.type,
-      skill_id: s.skill_id
-    }));
+  body.skills = refs.skill_ids.map((s) => ({
+    type: s.type === "official" ? "qoder" : s.type,
+    skill_id: s.skill_id
+  }));
+  if (refs.multiagent) {
+    body.multiagent = {
+      type: "coordinator",
+      agents: refs.multiagent.members.map(({ remote_id }) => ({ type: "agent", id: remote_id }))
+    };
+  } else if (operation === "update") {
+    body.multiagent = null;
   }
   return body;
 }
-function mapForwardTemplate(name, decl, refs, projectName) {
+function mapForwardTemplate(name, decl, refs, projectName, operation = "create") {
   let model;
   if (typeof decl.model === "string") {
     model = decl.model;
@@ -2964,6 +3092,14 @@ function mapForwardTemplate(name, decl, refs, projectName) {
     ...skill.version ? { version: skill.version } : {},
     enabled: true
   }));
+  if (refs.multiagent) {
+    body.multiagent = {
+      type: "coordinator",
+      agents: refs.multiagent.members.map(({ remote_id }) => ({ type: "agent", template_id: remote_id }))
+    };
+  } else if (operation === "update") {
+    body.multiagent = null;
+  }
   return body;
 }
 function mapSendMessage2(text) {
@@ -3309,7 +3445,7 @@ var QoderAdapter = class _QoderAdapter {
     if (!metadata || typeof metadata !== "object") return false;
     return metadata["agents.project"] === this.projectName && metadata["agents.resource"] === displayName;
   }
-  normalizeDesiredResource(type, name, decl) {
+  normalizeDesiredResource(type, name, decl, refs) {
     if (type === "environment") {
       return this.normalizeRemote(
         type,
@@ -3319,10 +3455,16 @@ var QoderAdapter = class _QoderAdapter {
     if (type === "agent") {
       return this.normalizeRemote(
         type,
-        mapAgent2(name, decl, { skill_ids: [] }, void 0, this.projectName)
+        mapAgent2(name, decl, refs ?? { skill_ids: [] }, void 0, this.projectName)
+      );
+    }
+    if (type === "template") {
+      if (!refs) return null;
+      return this.normalizeRemote(
+        type,
+        mapForwardTemplate(name, decl, refs, this.projectName)
       );
     }
-    if (type === "template") return null;
     if (type === "identity") {
       const identity = decl;
       if (identity.identity_id) return null;
@@ -3350,10 +3492,10 @@ var QoderAdapter = class _QoderAdapter {
         description: raw.description,
         model: raw.model,
         system: raw.system,
-        tools: raw.tools,
-        mcp_servers: raw.mcp_servers,
+        tools: normalizeQoderTools(raw.tools),
+        mcp_servers: normalizeQoderMcpServers(raw.mcp_servers),
         skills: raw.skills,
-        multiagent: raw.multiagent,
+        multiagent: comparableMultiagentField(raw.multiagent, "forward"),
         environment_id: raw.environment_id,
         tunnel_id: raw.tunnel_id,
         vault_ids: Array.isArray(raw.vault_ids) ? raw.vault_ids : Object.keys(raw.vaults ?? {}),
@@ -3395,6 +3537,7 @@ var QoderAdapter = class _QoderAdapter {
       instructions: raw.system,
       tools: normalizeQoderTools(raw.tools),
       mcp_servers: normalizeQoderMcpServers(raw.mcp_servers),
+      multiagent: comparableMultiagentField(raw.multiagent, "managed"),
       metadata: stripAgentsMetadata(raw.metadata)
     });
   }
@@ -3473,13 +3616,18 @@ var QoderAdapter = class _QoderAdapter {
     await (mode === "forward" ? this.forwardClient : this.client).delete(`/vaults/${id}`);
   }
   async exportResources(type) {
-    return exportRemoteResources(this.client, type, {
-      envToDecl: envToDecl2,
-      vaultToDecl: vaultToDecl2,
-      fileToDecl: fileToDecl2,
-      skillToDecl: skillToDecl2,
-      agentToDecl: agentToDecl2
-    });
+    return exportRemoteResources(
+      this.client,
+      type,
+      {
+        envToDecl: envToDecl2,
+        vaultToDecl: vaultToDecl2,
+        fileToDecl: fileToDecl2,
+        skillToDecl: skillToDecl2,
+        agentToDecl: agentToDecl2
+      },
+      this.projectName
+    );
   }
   async createSkill(name, decl, files, mode = "managed") {
     const formData = await buildSkillFormData(name, decl, files);
@@ -3501,13 +3649,13 @@ var QoderAdapter = class _QoderAdapter {
     await (mode === "forward" ? this.forwardClient : this.client).delete(`/skills/${id}`);
   }
   async createAgent(name, decl, refs) {
-    const body = mapAgent2(name, decl, refs, void 0, this.projectName);
+    const body = mapAgent2(name, decl, refs, void 0, this.projectName, "create");
     const res = await this.client.post("/agents", body);
     return toRemoteResource(res);
   }
   async updateAgent(id, name, decl, refs) {
     const current = await this.client.get(`/agents/${id}`);
-    const body = mapAgent2(name, decl, refs, current.version, this.projectName);
+    const body = mapAgent2(name, decl, refs, current.version, this.projectName, "update");
     const res = await this.client.put(`/agents/${id}`, body);
     return toRemoteResource(res);
   }
@@ -3515,13 +3663,13 @@ var QoderAdapter = class _QoderAdapter {
     await this.client.delete(`/agents/${id}`);
   }
   async createTemplate(name, decl, refs) {
-    const body = mapForwardTemplate(name, decl, refs, this.projectName);
+    const body = mapForwardTemplate(name, decl, refs, this.projectName, "create");
     const res = await this.forwardClient.post("/templates", body);
     await this.reconcileForwardMemoryMounts(res.id, refs);
     return toRemoteResource(res);
   }
   async updateTemplate(id, name, decl, refs) {
-    const body = mapForwardTemplate(name, decl, refs, this.projectName);
+    const body = mapForwardTemplate(name, decl, refs, this.projectName, "update");
     if (!refs.tunnel_id) body.tunnel_id = null;
     const res = await this.forwardClient.post(`/templates/${id}`, body);
     await this.reconcileForwardMemoryMounts(id, refs);
@@ -4120,11 +4268,7 @@ var QODER_CAPABILITIES = {
   template: { tier: "native", reason: "Forward Templates API" },
   memory_store: { tier: "native", reason: "memory_stores API" },
   mcp_server: { tier: "native", reason: "mcp_servers field on agent" },
-  multiagent: {
-    tier: "unsupported",
-    reason: "no multiagent primitive on Qoder",
-    remediation: "deploy agents independently and orchestrate via MCP"
-  },
+  multiagent: { tier: "native", reason: "coordinator + roster topology" },
   deployment: {
     tier: "native",
     reason: "deployments API with scheduled and manual runs"
@@ -4299,7 +4443,7 @@ function envToDecl3(raw) {
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
-function agentToDecl3(raw) {
+function agentToDecl3(raw, resolveMember) {
   const tools = raw.tools;
   const mcpServers = raw.mcp_servers;
   const skills = raw.skills;
@@ -4336,10 +4480,11 @@ function agentToDecl3(raw) {
     tools: builtinTools?.length ? { builtin: builtinTools } : void 0,
     mcp_servers: mcpServerDecls,
     skills: skillDecls,
+    multiagent: reverseMultiagentDecl(raw.multiagent, resolveMember),
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
-function mapAgent3(name, decl, refs, version, projectName, skillVersions) {
+function mapAgent3(name, decl, refs, version, projectName, skillVersions, operation = "create") {
   let modelId;
   if (typeof decl.model === "string") {
     modelId = decl.model;
@@ -4360,7 +4505,17 @@ function mapAgent3(name, decl, refs, version, projectName, skillVersions) {
   } else if (decl.metadata) {
     body.metadata = decl.metadata;
   }
-  const BAILIAN_BUILTINS = /* @__PURE__ */ new Set(["bash", "read", "write", "edit", "glob", "grep", "download_file"]);
+  const BAILIAN_BUILTINS = /* @__PURE__ */ new Set([
+    "bash",
+    "read",
+    "write",
+    "edit",
+    "glob",
+    "grep",
+    "web_search",
+    "web_fetch",
+    "mark_artifacts"
+  ]);
   if (decl.tools) {
     const toolConfigs = resolveBuiltinTools(decl.tools, {
       supportedWireNames: BAILIAN_BUILTINS
@@ -4404,17 +4559,24 @@ function mapAgent3(name, decl, refs, version, projectName, skillVersions) {
       });
     }
   }
-  if (refs.skill_ids.length) {
-    body.skills = refs.skill_ids.map((s) => ({
-      // Bailian's SkillType enum is "customer" | "official"; map the
-      // resolver's generic "custom" sentinel to "customer".
-      type: s.type === "custom" ? "customer" : s.type,
-      skill_id: s.skill_id,
-      // Bailian composes `{skill_id}@{version}` internally and rejects
-      // entries without a version. Prefer explicit external references, then
-      // the latest active remote version, then the common initial version.
-      version: s.version ?? skillVersions?.[s.skill_id] ?? "1.0"
-    }));
+  body.skills = refs.skill_ids.map((s) => ({
+    // Bailian's SkillType enum is "customer" | "official"; map the
+    // resolver's generic "custom" sentinel to "customer".
+    type: s.type === "custom" ? "customer" : s.type,
+    skill_id: s.skill_id,
+    // Bailian composes `{skill_id}@{version}` internally and rejects
+    // entries without a version. Prefer explicit external references, then
+    // the latest active remote version, then the common initial version.
+    version: s.version ?? skillVersions?.[s.skill_id] ?? "1.0"
+  }));
+  if (refs.multiagent) {
+    body.multiagent = {
+      type: "coordinator",
+      // No version: Bailian resolves the child Thread on first creation.
+      agents: refs.multiagent.members.map(({ remote_id }) => ({ type: "agent", id: remote_id }))
+    };
+  } else if (operation === "update") {
+    body.multiagent = { type: "coordinator", agents: [] };
   }
   return body;
 }
@@ -4551,7 +4713,7 @@ var BailianAdapter = class _BailianAdapter {
       snapshot: comparable
     };
   }
-  normalizeDesiredResource(type, name, decl) {
+  normalizeDesiredResource(type, name, decl, refs) {
     if (type === "environment") {
       return this.normalizeRemote(
         type,
@@ -4561,7 +4723,7 @@ var BailianAdapter = class _BailianAdapter {
     if (type === "agent") {
       return this.normalizeRemote(
         type,
-        mapAgent3(name, decl, { skill_ids: [] }, void 0, this.projectName)
+        mapAgent3(name, decl, refs ?? { skill_ids: [] }, void 0, this.projectName)
       );
     }
     return null;
@@ -4586,17 +4748,23 @@ var BailianAdapter = class _BailianAdapter {
       instructions: raw.system,
       tools: normalizeBailianTools(raw.tools),
       mcp_servers: normalizeBailianMcpServers(raw.mcp_servers),
+      multiagent: comparableMultiagentField(raw.multiagent, "managed"),
       metadata: stripAgentsMetadata(raw.metadata)
     });
   }
   async exportResources(type) {
-    return exportRemoteResources(this.client, type, {
-      envToDecl: envToDecl3,
-      vaultToDecl: vaultToDecl3,
-      fileToDecl: fileToDecl3,
-      skillToDecl: skillToDecl3,
-      agentToDecl: agentToDecl3
-    });
+    return exportRemoteResources(
+      this.client,
+      type,
+      {
+        envToDecl: envToDecl3,
+        vaultToDecl: vaultToDecl3,
+        fileToDecl: fileToDecl3,
+        skillToDecl: skillToDecl3,
+        agentToDecl: agentToDecl3
+      },
+      this.projectName
+    );
   }
   // --- Environment ---
   async createEnvironment(name, decl) {
@@ -4627,14 +4795,14 @@ var BailianAdapter = class _BailianAdapter {
   // --- Agent ---
   async createAgent(name, decl, refs) {
     const skillVersions = await this.fetchSkillVersions(refs);
-    const body = mapAgent3(name, decl, refs, void 0, this.projectName, skillVersions);
+    const body = mapAgent3(name, decl, refs, void 0, this.projectName, skillVersions, "create");
     const res = await this.client.post("/agents", body);
     return toRemoteResource(res);
   }
   async updateAgent(id, name, decl, refs) {
     const current = await this.client.get(`/agents/${id}`);
     const skillVersions = await this.fetchSkillVersions(refs);
-    const body = mapAgent3(name, decl, refs, current.version, this.projectName, skillVersions);
+    const body = mapAgent3(name, decl, refs, current.version, this.projectName, skillVersions, "update");
     const res = await this.client.post(`/agents/${id}`, body);
     return toRemoteResource(res);
   }
@@ -5356,11 +5524,7 @@ var BAILIAN_CAPABILITIES = {
     reason: "no memory store primitive on Bailian"
   },
   mcp_server: { tier: "native", reason: "mcp_servers field on agent (official servers)" },
-  multiagent: {
-    tier: "unsupported",
-    reason: "no multiagent primitive on Bailian",
-    remediation: "deploy agents independently and orchestrate via MCP"
-  },
+  multiagent: { tier: "native", reason: "coordinator + roster topology" },
   deployment: {
     tier: "native",
     reason: "deployments API with cron schedules, manual runs, pause/unpause and archive"
@@ -5513,11 +5677,10 @@ function envToDecl4(raw) {
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
-function agentToDecl4(raw) {
+function agentToDecl4(raw, resolveMember) {
   const tools = raw.tools;
   const mcpServers = raw.mcp_servers;
   const skills = raw.skills;
-  const multiagent = raw.multiagent;
   let builtinTools;
   let builtinPermissions;
   let allToolsEnabled = false;
@@ -5549,14 +5712,6 @@ function agentToDecl4(raw) {
       skill_id: s.skill_id
     }));
   }
-  let multiagentDecl;
-  if (multiagent) {
-    const rawAgents = multiagent.agents;
-    if (rawAgents?.length) {
-      const ids = rawAgents.map((a) => typeof a === "string" ? a : a.id).filter(Boolean);
-      if (ids.length) multiagentDecl = { type: "coordinator", agents: ids };
-    }
-  }
   let toolsDecl;
   if (builtinTools?.length) {
     toolsDecl = { builtin: builtinTools, permissions: builtinPermissions };
@@ -5573,7 +5728,7 @@ function agentToDecl4(raw) {
     tools: toolsDecl,
     mcp_servers: mcpServerDecls,
     skills: skillDecls,
-    multiagent: multiagentDecl,
+    multiagent: reverseMultiagentDecl(raw.multiagent, resolveMember),
     metadata: stripAgentsMetadata(raw.metadata)
   });
 }
@@ -5657,10 +5812,10 @@ function mapAgent4(name, decl, refs, version, projectName) {
       skill_id: s.skill_id
     }));
   }
-  if (decl.multiagent && refs.multiagent_agent_ids?.length) {
+  if (decl.multiagent && refs.multiagent) {
     body.multiagent = {
       type: "coordinator",
-      agents: refs.multiagent_agent_ids.map((id) => ({ type: "agent", id }))
+      agents: refs.multiagent.members.map(({ remote_id }) => ({ type: "agent", id: remote_id }))
     };
   }
   return body;
@@ -5912,13 +6067,18 @@ var ArkAdapter = class _ArkAdapter {
   }
   async exportResources(type) {
     if (type === "skill") return [];
-    return exportRemoteResources(this.client, type, {
-      envToDecl: envToDecl4,
-      vaultToDecl: vaultToDecl4,
-      fileToDecl: fileToDecl4,
-      skillToDecl: skillToDecl4,
-      agentToDecl: agentToDecl4
-    });
+    return exportRemoteResources(
+      this.client,
+      type,
+      {
+        envToDecl: envToDecl4,
+        vaultToDecl: vaultToDecl4,
+        fileToDecl: fileToDecl4,
+        skillToDecl: skillToDecl4,
+        agentToDecl: agentToDecl4
+      },
+      this.projectName
+    );
   }
   // Ark skills support create + get + attach only. There is no list/update/delete endpoint
   // (GET /skills, PUT /skills/{id}, DELETE /skills/{id} all return 404 on real probe), so:
@@ -6233,6 +6393,50 @@ function severityIcon(s) {
   }
 }
 
+// src/internal/multiagent/topology.ts
+var MULTIAGENT_MEMBER_LIMIT = 20;
+function collectMultiagentTopologyDiagnostics(config, diagnostics) {
+  const agents = config.agents ?? {};
+  const names = Object.keys(agents).sort();
+  for (const name of names) {
+    const decl = agents[name];
+    if (!decl?.multiagent) continue;
+    for (const member of decl.multiagent.agents) {
+      if (typeof member !== "string") continue;
+      if (agents[member]?.multiagent) {
+        diagnostics.error(
+          "config.agent.multiagent.nested",
+          `agent.${name}: multiagent member '${member}' is itself a coordinator; nested coordinators are not supported`
+        );
+      }
+    }
+  }
+  const state = /* @__PURE__ */ new Map();
+  const path = [];
+  const visit2 = (name) => {
+    if (state.get(name) === "done") return;
+    state.set(name, "visiting");
+    path.push(name);
+    const members = agents[name]?.multiagent?.agents ?? [];
+    for (const member of members) {
+      if (typeof member !== "string") continue;
+      if (!agents[member]) continue;
+      if (state.get(member) === "visiting") {
+        const cycle = [...path.slice(path.indexOf(member)), member];
+        diagnostics.error(
+          "config.agent.multiagent.cycle",
+          `agent.${name}: multiagent cycle detected: ${cycle.join(" -> ")}`
+        );
+        continue;
+      }
+      visit2(member);
+    }
+    path.pop();
+    state.set(name, "done");
+  };
+  for (const name of names) visit2(name);
+}
+
 // src/internal/validation/bailian.ts
 function findMissingBailianMcpToolConfigs(config, providerName = "bailian") {
   if (providerName !== "bailian") return [];
@@ -6334,6 +6538,7 @@ function collectReferenceDiagnostics(config, diagnostics) {
     }
     if (agent.multiagent) {
       for (const subAgent of agent.multiagent.agents) {
+        if (typeof subAgent !== "string") continue;
         if (!agentNames.has(subAgent)) {
           diagnostics.error(
             "config.agent.multiagent.unknown",
@@ -6346,6 +6551,7 @@ function collectReferenceDiagnostics(config, diagnostics) {
       }
     }
   }
+  collectMultiagentTopologyDiagnostics(config, diagnostics);
   for (const [name, deployment] of Object.entries(config.deployments ?? {})) {
     if (deployment.tunnel && !tunnelNames.has(deployment.tunnel)) {
       diagnostics.error(
@@ -6667,15 +6873,44 @@ function collectProviderCapabilities(config, providers, diagnostics) {
             { type: "template", name, provider: providerName }
           );
         }
-        if (agent.multiagent) {
+      }
+      if (providerName === "qoder" && agent.multiagent) {
+        const coordinatorMode = resolveAgentMaterialization(providerName, agent).mode;
+        for (const memberName of agent.multiagent.agents) {
+          if (typeof memberName !== "string") {
+            if (coordinatorMode === "forward") {
+              diagnostics.error(
+                "qoder.template.multiagent.external_member",
+                `agent.${name}: Qoder Forward coordinator cannot reference external Managed Agent '${memberName.agent_id}'.`,
+                { type: "template", name, provider: providerName }
+              );
+            }
+            continue;
+          }
+          const memberDecl = config.agents?.[memberName];
+          if (!memberDecl) continue;
+          const memberMode = resolveAgentMaterialization(providerName, memberDecl).mode;
+          if (memberMode === coordinatorMode) continue;
           diagnostics.error(
-            "qoder.template.multiagent.unsupported",
-            `agent.${name}: multiagent is not yet supported by Qoder Forward Template delivery.`,
-            { type: "template", name, provider: providerName }
+            "qoder.template.multiagent.member_materialization",
+            `agent.${name}: multiagent member '${memberName}' uses ${memberMode} delivery but the coordinator uses ${coordinatorMode}; Qoder multiagent members must match the coordinator's delivery type.`,
+            { type: coordinatorMode === "forward" ? "template" : "agent", name, provider: providerName }
           );
         }
       }
     }
+    if (providerName === "qoder" || providerName === "bailian") {
+      for (const [name, agent] of Object.entries(config.agents ?? {})) {
+        if (agent.provider && agent.provider !== providerName) continue;
+        const size = agent.multiagent?.agents.length ?? 0;
+        if (size <= MULTIAGENT_MEMBER_LIMIT) continue;
+        diagnostics.error(
+          `${providerName}.agent.multiagent.member_limit`,
+          `agent.${name}: provider '${providerName}' supports at most ${MULTIAGENT_MEMBER_LIMIT} multiagent members; got ${size}.`,
+          { type: resolveAgentMaterialization(providerName, agent).resourceType, name, provider: providerName }
+        );
+      }
+    }
     if (providerName === "qoder") {
       for (const [name, deployment] of Object.entries(config.deployments ?? {})) {
         if (deployment.provider && deployment.provider !== providerName) continue;