@openagentpack/sdk 0.7.2 → 0.8.0

package/dist/{chunk-7L73W3DL.js → chunk-KYGVVTV6.js}

@@ -1,7 +1,7 @@
 import {
   UserError,
   inspectProjectSource
-} from "./chunk-HLZOSZ7B.js";
+} from "./chunk-ZOMPZ7R6.js";
 
 // src/internal/project-versions/directory.ts
 import { createHash, randomUUID } from "crypto";

package/dist/{chunk-LJQMLMAT.js → chunk-LKLR56IB.js}

@@ -14,7 +14,7 @@ import {
   resolveFetch,
   resolveTargetProviders,
   skillNameFromFiles
-} from "./chunk-HLZOSZ7B.js";
+} from "./chunk-ZOMPZ7R6.js";
 
 // src/internal/core/project-runtime.ts
 function createProjectRuntime(input) {
@@ -138,6 +138,185 @@ function parseSkillManifestName(content) {
 // src/internal/executor/executor.ts
 import { basename as basename2, dirname as dirname3, resolve as resolve4 } from "path";
 
+// src/internal/executor/resolver.ts
+function resolveRef(state, address) {
+  return state.getResource(address)?.remote_id;
+}
+function requireRef(state, address) {
+  const id = resolveRef(state, address);
+  if (!id) {
+    throw new UserError(
+      `Resource ${address.provider}.${address.type}.${address.name} not found in state. Run \`agents apply\` first.`
+    );
+  }
+  return id;
+}
+function resolveSkillRefs(agent, provider, state) {
+  const skillIds = [];
+  for (const skill of agent.skills ?? []) {
+    if (typeof skill === "string") {
+      const id = requireRef(state, { type: "skill", name: skill, provider });
+      skillIds.push({ type: "custom", skill_id: id });
+    } else {
+      const resolvedId = skill.type === "custom" ? resolveRef(state, {
+        type: "skill",
+        name: skill.skill_id,
+        provider
+      }) ?? skill.skill_id : skill.skill_id;
+      skillIds.push({
+        type: skill.type,
+        skill_id: resolvedId,
+        version: skill.version
+      });
+    }
+  }
+  return skillIds;
+}
+function resolveMultiagentRoster(agent, provider, state, resourceType) {
+  return {
+    type: "coordinator",
+    members: (agent.multiagent?.agents ?? []).map((member) => {
+      if (typeof member !== "string") {
+        if (resourceType === "template") {
+          throw new UserError(
+            `qoder.template.multiagent.external_member: Forward coordinator cannot reference external Managed Agent '${member.agent_id}'.`
+          );
+        }
+        return { resource_type: "agent", remote_id: member.agent_id };
+      }
+      return {
+        logical_name: member,
+        resource_type: resourceType,
+        remote_id: requireRef(state, { type: resourceType, name: member, provider })
+      };
+    })
+  };
+}
+function resolveAgentRefs(agentName, config, provider, state) {
+  const agent = config.agents?.[agentName];
+  if (!agent) throw new UserError(`Agent '${agentName}' not found in config`);
+  const refs = {
+    skill_ids: resolveSkillRefs(agent, provider, state)
+  };
+  if (agent.multiagent && resolveAgentMaterialization(provider, agent).resourceType === "agent") {
+    refs.multiagent = resolveMultiagentRoster(agent, provider, state, "agent");
+  }
+  return refs;
+}
+function resolveTemplateRefs(agentName, config, provider, state) {
+  const agent = config.agents?.[agentName];
+  if (!agent) throw new UserError(`Agent '${agentName}' not found in config`);
+  if (!agent.environment) {
+    throw new UserError(`Forward template '${agentName}' must declare an environment.`);
+  }
+  const environment = config.environments?.[agent.environment];
+  if (!environment) throw new UserError(`Environment '${agent.environment}' is not defined in config.`);
+  const agentRefs = resolveAgentRefs(agentName, config, provider, state);
+  const memoryStoreIds = (agent.memory_stores ?? []).map(
+    (memoryStore) => requireRef(state, { type: "memory_store", name: memoryStore, provider })
+  );
+  const identityName = config.defaults?.identity;
+  return {
+    ...agentRefs,
+    ...agent.multiagent ? { multiagent: resolveMultiagentRoster(agent, provider, state, "template") } : {},
+    environment_id: environment.environment_id ?? requireRef(state, { type: "environment", name: agent.environment, provider }),
+    ...agent.tunnel ? { tunnel_id: resolveTunnelIdFromConfig(config, agent.tunnel, provider) } : {},
+    vault_ids: agent.vault ? [requireRef(state, { type: "vault", name: agent.vault, provider })] : [],
+    file_ids: (agent.files ?? []).filter((file) => typeof file === "string").map((file) => requireRef(state, { type: "file", name: file, provider })),
+    memory_store_ids: memoryStoreIds,
+    owned_memory_store_ids: state.listResources().filter(
+      (resource) => resource.address.provider === provider && resource.address.type === "memory_store" && resource.api_mode === "forward" && typeof resource.remote_id === "string"
+    ).map((resource) => resource.remote_id),
+    ...identityName ? { identity_id: requireRef(state, { type: "identity", name: identityName, provider }) } : {}
+  };
+}
+function resolveDeploymentRefs(deploymentName, config, provider, state) {
+  const dep = config.deployments?.[deploymentName];
+  if (!dep) throw new UserError(`Deployment '${deploymentName}' not found in config`);
+  const agent = config.agents?.[dep.agent];
+  if (!agent) {
+    throw new UserError(`Deployment '${deploymentName}' references unknown agent '${dep.agent}'`);
+  }
+  const agent_id = requireRef(state, {
+    type: "agent",
+    name: dep.agent,
+    provider
+  });
+  const envName = dep.environment ?? agent.environment;
+  if (!envName) {
+    throw new UserError(
+      `Deployment '${deploymentName}' has no environment and agent '${dep.agent}' does not declare one`
+    );
+  }
+  const envDecl = config.environments?.[envName];
+  if (!envDecl) {
+    throw new UserError(`Environment '${envName}' is not defined in config.`);
+  }
+  const environment_id = envDecl.environment_id ?? requireRef(state, {
+    type: "environment",
+    name: envName,
+    provider
+  });
+  const tunnelName = dep.tunnel ?? agent.tunnel;
+  const tunnel_id = tunnelName ? resolveTunnelIdFromConfig(config, tunnelName, provider) : void 0;
+  const vaultNames = dep.vaults ?? (agent.vault ? [agent.vault] : []);
+  const vault_ids = vaultNames.map((v) => requireRef(state, { type: "vault", name: v, provider }));
+  const msNames = /* @__PURE__ */ new Set();
+  for (const m of dep.memory_stores ?? []) msNames.add(m);
+  for (const r of dep.resources ?? []) {
+    if (r.type === "memory_store") msNames.add(r.memory_store);
+  }
+  if (msNames.size === 0) {
+    for (const m of agent.memory_stores ?? []) msNames.add(m);
+  }
+  const memory_store_ids = {};
+  for (const m of msNames) {
+    memory_store_ids[m] = requireRef(state, {
+      type: "memory_store",
+      name: m,
+      provider
+    });
+  }
+  return {
+    agent_id,
+    agent_version: dep.agent_version,
+    environment_id,
+    tunnel_id,
+    vault_ids,
+    memory_store_ids
+  };
+}
+function resolveChannelRefs(channelName, config, provider, state) {
+  const channel = config.channels?.[channelName];
+  if (!channel) throw new UserError(`Channel '${channelName}' not found in config`);
+  if (channel.mode === "pairing") {
+    return {};
+  }
+  if (!channel.agent) {
+    throw new UserError(`Channel '${channelName}' is fixed mode and must declare agent`);
+  }
+  const agent = config.agents?.[channel.agent];
+  if (!agent) throw new UserError(`Channel '${channelName}' references unknown agent '${channel.agent}'`);
+  const agentType = agent.delivery?.[provider]?.type === "forward" ? "template" : "agent";
+  const agent_id = requireRef(state, { type: agentType, name: channel.agent, provider });
+  const identityName = channel.identity ?? config.defaults?.identity;
+  if (!identityName) {
+    throw new UserError(`Channel '${channelName}' must declare identity or use defaults.identity.`);
+  }
+  const identity_id = requireRef(state, { type: "identity", name: identityName, provider });
+  return { identity_id, agent_id };
+}
+function resolveTunnelIdFromConfig(config, tunnelName, provider) {
+  if (provider !== "qoder") {
+    throw new UserError("Tunnels are supported only by Qoder BYOC sessions.");
+  }
+  const tunnel = config.tunnels?.[tunnelName];
+  if (!tunnel) {
+    throw new UserError(`Tunnel '${tunnelName}' is not defined in config. Declare it under the 'tunnels:' section.`);
+  }
+  return tunnel.tunnel_id;
+}
+
 // src/internal/utils/hash.ts
 import { createHash } from "crypto";
 function sha256(data) {
@@ -189,10 +368,17 @@ function getResourceDeclaration(address, config) {
 }
 
 // src/internal/planner/comparable.ts
-function computeComparableDesiredHash(address, config, provider) {
+function resolveComparableRefs(address, config, state) {
+  if (!state || !config) return void 0;
+  if (address.type === "agent") return resolveAgentRefs(address.name, config, address.provider, state);
+  if (address.type === "template") return resolveTemplateRefs(address.name, config, address.provider, state);
+  return void 0;
+}
+function computeComparableDesiredHash(address, config, provider, state) {
   const decl = getResourceDeclaration(address, config);
   if (!decl || !provider.normalizeDesiredResource) return void 0;
-  const comparable = provider.normalizeDesiredResource(address.type, address.name, decl);
+  const refs = resolveComparableRefs(address, config, state);
+  const comparable = provider.normalizeDesiredResource(address.type, address.name, decl, refs);
   return comparable === null ? void 0 : contentHash(comparable);
 }
 
@@ -423,166 +609,6 @@ function addressKey(addr) {
   return `${addr.provider}.${addr.type}.${addr.name}`;
 }
 
-// src/internal/executor/resolver.ts
-function resolveRef(state, address) {
-  return state.getResource(address)?.remote_id;
-}
-function requireRef(state, address) {
-  const id = resolveRef(state, address);
-  if (!id) {
-    throw new UserError(
-      `Resource ${address.provider}.${address.type}.${address.name} not found in state. Run \`agents apply\` first.`
-    );
-  }
-  return id;
-}
-function resolveAgentRefs(agentName, config, provider, state) {
-  const agent = config.agents?.[agentName];
-  if (!agent) throw new UserError(`Agent '${agentName}' not found in config`);
-  const refs = {
-    skill_ids: []
-  };
-  if (agent.skills) {
-    for (const skill of agent.skills) {
-      if (typeof skill === "string") {
-        const id = requireRef(state, { type: "skill", name: skill, provider });
-        refs.skill_ids.push({ type: "custom", skill_id: id });
-      } else {
-        const resolvedId = skill.type === "custom" ? resolveRef(state, {
-          type: "skill",
-          name: skill.skill_id,
-          provider
-        }) ?? skill.skill_id : skill.skill_id;
-        refs.skill_ids.push({
-          type: skill.type,
-          skill_id: resolvedId,
-          version: skill.version
-        });
-      }
-    }
-  }
-  if (agent.multiagent) {
-    refs.multiagent_agent_ids = [];
-    for (const subName of agent.multiagent.agents) {
-      const id = resolveRef(state, { type: "agent", name: subName, provider });
-      if (id) refs.multiagent_agent_ids.push(id);
-    }
-  }
-  return refs;
-}
-function resolveTemplateRefs(agentName, config, provider, state) {
-  const agent = config.agents?.[agentName];
-  if (!agent) throw new UserError(`Agent '${agentName}' not found in config`);
-  if (!agent.environment) {
-    throw new UserError(`Forward template '${agentName}' must declare an environment.`);
-  }
-  const environment = config.environments?.[agent.environment];
-  if (!environment) throw new UserError(`Environment '${agent.environment}' is not defined in config.`);
-  const agentRefs = resolveAgentRefs(agentName, config, provider, state);
-  const memoryStoreIds = (agent.memory_stores ?? []).map(
-    (memoryStore) => requireRef(state, { type: "memory_store", name: memoryStore, provider })
-  );
-  const identityName = config.defaults?.identity;
-  return {
-    ...agentRefs,
-    environment_id: environment.environment_id ?? requireRef(state, { type: "environment", name: agent.environment, provider }),
-    ...agent.tunnel ? { tunnel_id: resolveTunnelIdFromConfig(config, agent.tunnel, provider) } : {},
-    vault_ids: agent.vault ? [requireRef(state, { type: "vault", name: agent.vault, provider })] : [],
-    file_ids: (agent.files ?? []).filter((file) => typeof file === "string").map((file) => requireRef(state, { type: "file", name: file, provider })),
-    memory_store_ids: memoryStoreIds,
-    owned_memory_store_ids: state.listResources().filter(
-      (resource) => resource.address.provider === provider && resource.address.type === "memory_store" && resource.api_mode === "forward" && typeof resource.remote_id === "string"
-    ).map((resource) => resource.remote_id),
-    ...identityName ? { identity_id: requireRef(state, { type: "identity", name: identityName, provider }) } : {}
-  };
-}
-function resolveDeploymentRefs(deploymentName, config, provider, state) {
-  const dep = config.deployments?.[deploymentName];
-  if (!dep) throw new UserError(`Deployment '${deploymentName}' not found in config`);
-  const agent = config.agents?.[dep.agent];
-  if (!agent) {
-    throw new UserError(`Deployment '${deploymentName}' references unknown agent '${dep.agent}'`);
-  }
-  const agent_id = requireRef(state, {
-    type: "agent",
-    name: dep.agent,
-    provider
-  });
-  const envName = dep.environment ?? agent.environment;
-  if (!envName) {
-    throw new UserError(
-      `Deployment '${deploymentName}' has no environment and agent '${dep.agent}' does not declare one`
-    );
-  }
-  const envDecl = config.environments?.[envName];
-  if (!envDecl) {
-    throw new UserError(`Environment '${envName}' is not defined in config.`);
-  }
-  const environment_id = envDecl.environment_id ?? requireRef(state, {
-    type: "environment",
-    name: envName,
-    provider
-  });
-  const tunnelName = dep.tunnel ?? agent.tunnel;
-  const tunnel_id = tunnelName ? resolveTunnelIdFromConfig(config, tunnelName, provider) : void 0;
-  const vaultNames = dep.vaults ?? (agent.vault ? [agent.vault] : []);
-  const vault_ids = vaultNames.map((v) => requireRef(state, { type: "vault", name: v, provider }));
-  const msNames = /* @__PURE__ */ new Set();
-  for (const m of dep.memory_stores ?? []) msNames.add(m);
-  for (const r of dep.resources ?? []) {
-    if (r.type === "memory_store") msNames.add(r.memory_store);
-  }
-  if (msNames.size === 0) {
-    for (const m of agent.memory_stores ?? []) msNames.add(m);
-  }
-  const memory_store_ids = {};
-  for (const m of msNames) {
-    memory_store_ids[m] = requireRef(state, {
-      type: "memory_store",
-      name: m,
-      provider
-    });
-  }
-  return {
-    agent_id,
-    agent_version: dep.agent_version,
-    environment_id,
-    tunnel_id,
-    vault_ids,
-    memory_store_ids
-  };
-}
-function resolveChannelRefs(channelName, config, provider, state) {
-  const channel = config.channels?.[channelName];
-  if (!channel) throw new UserError(`Channel '${channelName}' not found in config`);
-  if (channel.mode === "pairing") {
-    return {};
-  }
-  if (!channel.agent) {
-    throw new UserError(`Channel '${channelName}' is fixed mode and must declare agent`);
-  }
-  const agent = config.agents?.[channel.agent];
-  if (!agent) throw new UserError(`Channel '${channelName}' references unknown agent '${channel.agent}'`);
-  const agentType = agent.delivery?.[provider]?.type === "forward" ? "template" : "agent";
-  const agent_id = requireRef(state, { type: agentType, name: channel.agent, provider });
-  const identityName = channel.identity ?? config.defaults?.identity;
-  if (!identityName) {
-    throw new UserError(`Channel '${channelName}' must declare identity or use defaults.identity.`);
-  }
-  const identity_id = requireRef(state, { type: "identity", name: identityName, provider });
-  return { identity_id, agent_id };
-}
-function resolveTunnelIdFromConfig(config, tunnelName, provider) {
-  if (provider !== "qoder") {
-    throw new UserError("Tunnels are supported only by Qoder BYOC sessions.");
-  }
-  const tunnel = config.tunnels?.[tunnelName];
-  if (!tunnel) {
-    throw new UserError(`Tunnel '${tunnelName}' is not defined in config. Declare it under the 'tunnels:' section.`);
-  }
-  return tunnel.tunnel_id;
-}
-
 // src/internal/executor/skill-resolver.ts
 import { dirname as dirname2 } from "path";
 async function resolveSkillFiles(decl, ctx) {
@@ -1229,7 +1255,7 @@ async function executeActionInner(action, provider, ctx) {
       throw new UserError(`Unknown resource type: ${type}`);
   }
   const hash = await computeResourceHash(address, ctx.config, ctx.configPath, ctx.state);
-  const comparableHash = computeComparableDesiredHash(address, ctx.config, provider);
+  const comparableHash = computeComparableDesiredHash(address, ctx.config, provider, ctx.state);
   let remoteHash = comparableHash;
   let remoteSnapshot;
   const remote = await readComparableIfSupported(
@@ -1464,6 +1490,7 @@ function buildDependencyGraph(config, targetProviders) {
         }
         if (decl.multiagent && isSupported(caps, "multiagent")) {
           for (const subName of decl.multiagent.agents) {
+            if (typeof subName !== "string") continue;
             const subDecl = config.agents[subName];
             const subType = subDecl ? resolveAgentMaterialization(provider, subDecl).resourceType : "agent";
             const subAddr = { type: subType, name: subName, provider };
@@ -1873,7 +1900,12 @@ async function refreshState(state, providers, options = {}) {
           continue;
         }
         const remoteHash = contentHash(remote2.comparable);
-        const desiredComparable = decl ? provider.normalizeDesiredResource(res.address.type, res.address.name, decl) : null;
+        const desiredComparable = decl ? provider.normalizeDesiredResource(
+          res.address.type,
+          res.address.name,
+          decl,
+          resolveComparableRefs(res.address, options.config, state)
+        ) : null;
         const desiredComparableHash = desiredComparable === null ? void 0 : contentHash(desiredComparable);
         const baselineHash = res.desired_comparable_hash ?? desiredComparableHash ?? remoteHash;
         const driftStatus = baselineHash && remoteHash !== baselineHash ? "drifted" : "in_sync";
@@ -2423,12 +2455,12 @@ export {
   readProjectRuntime,
   writeProjectRuntime,
   getRuntimeProvider,
+  requireRef,
+  resolveDeploymentRefs,
   contentHash,
   computeResourceHash,
   emitRuntimeFeedback,
   addressKey,
-  requireRef,
-  resolveDeploymentRefs,
   inspectSkillSource,
   collectDependencyClosure,
   buildDependencyGraph,