@domesystems/templates 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domesystems/templates",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Pull, publish, and run versioned Dome templates.",
   "repository": {
     "type": "git",

package/src/cli.mjs

@@ -61,10 +61,11 @@ function generate(options, output) {
   output(line("success", `Generated ${file}`, options));
 }
 function runtimeFor(directory, manifest, selectedAgent) {
-  const candidates = selectedAgent ? manifest.agents.filter((agent) => agent.name === selectedAgent) : manifest.agents.filter((agent) => agent.type === "external");
-  if (candidates.length !== 1) throw new Error(`templates up requires exactly one external agent; found ${candidates.length}. Pass --agent <name> to select one.`);
+  const external = manifest.agents.filter((agent) => agent.type === "external");
+  const candidates = selectedAgent ? manifest.agents.filter((agent) => agent.name === selectedAgent) : (external.length ? external : manifest.agents);
+  if (candidates.length !== 1) throw new Error(`templates up requires exactly one agent to run; found ${candidates.length}. Pass --agent <name> to select one.`);
   const agent = candidates[0];
-  if (agent.type !== "external") throw new Error(`templates up cannot start managed agent ${agent.name}; Dome runs its loop.`);
+  if (agent.type === "managed") return { ...agent, managed: true };
   const configPath = path.join("agents", agent.name);
   const configFile = path.join(directory, configPath, "agent.yaml");
   if (!fs.existsSync(configFile)) throw new Error(`External agent ${agent.name} needs ${configPath}/agent.yaml.`);
@@ -115,10 +116,10 @@ async function up(options, output) {
   const target = path.resolve(process.cwd(), options.directory ?? ".");
   const manifest = readManifest(target);
   const runtimeAgent = runtimeFor(target, manifest, options.agent);
-  const needsCredentials = !configured(target);
+  const needsCredentials = !runtimeAgent.managed && !configured(target);
   output(line("info", `Checking ${target}`, options));
-  fs.writeFileSync(path.join(target, ".dome-compose.yaml"), renderCompose(runtimeAgent.runtime, options.port, { debug: options.debug, configPath: runtimeAgent.configPath }));
-  if (options.importJob) await configureRuntime(target, options.importJob, runtimeAgent.name, runtimeAgent.localKey, options, output);
+  if (!runtimeAgent.managed) fs.writeFileSync(path.join(target, ".dome-compose.yaml"), renderCompose(runtimeAgent.runtime, options.port, { debug: options.debug, configPath: runtimeAgent.configPath }));
+  if (options.importJob && !runtimeAgent.managed) await configureRuntime(target, options.importJob, runtimeAgent.name, runtimeAgent.localKey, options, output);
   else if (options.provision && (needsCredentials || options.forceProvision)) {
     output(line("info", "Setting up Dome resources", options));
     let imported;
@@ -126,10 +127,11 @@ async function up(options, output) {
     catch (caught) { const dashboardURL = importDashboardURL(target); throw new Error(`${caught.message}${dashboardURL ? ` View the import details: ${dashboardURL}` : ""}`); }
     const job = imported?.data?.job;
     if (!job?.id) throw new Error("Dome import did not return a job ID.");
-    if (importCreatedResources(job) && importHasPendingOutputs(job)) await configureRuntime(target, job.id, runtimeAgent.name, runtimeAgent.localKey, options, output);
+    if (!runtimeAgent.managed && importCreatedResources(job) && importHasPendingOutputs(job)) await configureRuntime(target, job.id, runtimeAgent.name, runtimeAgent.localKey, options, output);
     else if (needsCredentials) throw new Error(`Dome matched existing resources and did not create a new runtime token. Recover a pending import with templates up --dir ${options.directory ?? "."} --import-job <job-id>, or rotate the local agent key and set DOME_TOKEN and DOME_GATEWAY_URL in .env.`);
   }
-  if (options.start) { const compose = composeCommands(options); run("docker", compose.pull, target); run("docker", compose.up, target); }
+  if (options.start && !runtimeAgent.managed) { const compose = composeCommands(options); run("docker", compose.pull, target); run("docker", compose.up, target); }
+  if (runtimeAgent.managed) output(line("success", `Managed agent ${runtimeAgent.name} is provisioned in Dome; Dome owns its loop and triggers.`, options));
 }
 async function publish(options, output, fetchImplementation) { const target = path.resolve(process.cwd(), options.directory ?? "."); const manifest = readPublishManifest(target); const source = publishSource(target); const name = manifest.metadata.name; const [scope, slug] = name.split("/"); const archive = options.dryRun ? null : createArchive(source); output(line("info", `Checking ${name}@${manifest.metadata.version}`, options)); const payload = { name, version: manifest.metadata.version, title: manifest.metadata.title, summary: manifest.metadata.summary ?? "", sha256: archive?.sha256, size_bytes: archive?.buffer.length, source: { repository: manifest.metadata.source.repository, path: manifest.metadata.source.path, commit: source.commit, remote: source.remote, files: source.files } };
   const remote = remoteTarget(options); let registry; let attempt;

package/src/generate.mjs

@@ -70,21 +70,22 @@ function managedModelReference(manifest, name) {
   throw new Error(`Managed agent default_model ${name} must name a pool or model.`);
 }
 
-function triggerBlocks(triggers) {
-  return triggers.map((trigger) => {
-    const kind = required(trigger, "kind", `Trigger ${trigger.name} needs kind.`);
-    if (!["schedule", "webhook"].includes(kind)) throw new Error(`Trigger ${trigger.name} has unsupported kind ${kind}.`);
-    if (kind === "schedule" && !trigger.cron) throw new Error(`Schedule trigger ${trigger.name} needs cron.`);
-    const lines = [attr("workspace_id", "var.workspace_id"), attr("name", q(required(trigger, "name", "Every trigger needs a name."))), ...(trigger.description ? [attr("description", q(trigger.description))] : []), attr("kind", q(kind))];
-    for (const key of ["enabled", "cron", "timezone", "input", "max_concurrent_runs", "catch_up", "catch_up_deadline_seconds", "max_retries"]) if (trigger[key] !== undefined) lines.push(attr(key, typeof trigger[key] === "string" ? q(trigger[key]) : String(trigger[key])));
-    const targets = trigger.targets ?? [];
-    if (!Array.isArray(targets) || !targets.length) throw new Error(`Trigger ${trigger.name} needs at least one target.`);
-    lines.push(`targets = [${targets.map((target) => {
-      if (target?.kind !== "managed_agent" || typeof target.name !== "string") throw new Error(`Trigger ${trigger.name} targets must name a managed_agent.`);
-      return `{ kind = "managed_agent", name = dome_managed_agent.${label(target.name)}.name${target.disabled === undefined ? "" : `, disabled = ${Boolean(target.disabled)}`} }`;
-    }).join(", ")}]`);
-    return block("dome_trigger", label(trigger.name), lines);
-  });
+function agentAttributes(agent) {
+  const lines = [];
+  if (agent.parent) lines.push(attr("parent", `dome_agent.${label(agent.parent)}.name`));
+  if (agent.metadata) lines.push(attr("metadata", `{ ${Object.entries(agent.metadata).map(([key, value]) => `${q(key)} = ${q(value)}`).join(", ")} }`));
+  for (const [key, resource] of [["allowed_pools", "dome_llm_pool"], ["allowed_models", "dome_llm_connection"], ["allowed_gateways", "dome_gateway"]]) {
+    if (agent[key] !== undefined) lines.push(attr(key, `[${agent[key].map((name) => `${resource}.${label(name)}.name`).join(", ")}]`));
+  }
+  if (agent.allowed_tools !== undefined) lines.push(attr("allowed_tools", `[${agent.allowed_tools.map(q).join(", ")}]`));
+  for (const key of ["suspended", "token_ttl", "interactive_access", "secrets_version"]) if (agent[key] !== undefined) lines.push(attr(key, typeof agent[key] === "string" ? q(agent[key]) : String(agent[key])));
+  if (agent.act_as) {
+    const values = Object.entries(agent.act_as).filter(([key]) => !["hmac_secret"].includes(key)).map(([key, value]) => `${key} = ${typeof value === "string" ? q(value) : String(value)}`);
+    lines.push(attr("act_as", `{ ${values.join(", ")} }`));
+    if (agent.act_as.hmac_secret) lines.push(attr("act_as_hmac_secret", expression(agent.act_as.hmac_secret)));
+  }
+  for (const key of ["actas_allowed_groups", "actas_allowed_emails", "actas_allowed_subjects"]) if (agent[key] !== undefined) lines.push(attr(key, `[${agent[key].map(q).join(", ")}]`));
+  return lines;
 }
 
 export function renderDomeTerraform(manifest) {
@@ -117,23 +118,16 @@ export function renderDomeTerraform(manifest) {
   }
   for (const agent of manifest.agents) {
     const agentLabel = label(agent.name); const managed = agent.type === "managed"; const resourceType = managed ? "dome_managed_agent" : "dome_agent";
-    const lines = [attr("workspace_id", "var.workspace_id"), attr("name", q(agent.name))];
-    if (!managed) lines.push(attr("allowed_gateways", `[${(agent.allowed_gateways ?? []).map((gateway) => `dome_gateway.${label(gateway)}.name`).join(", ")}]`));
-    if (!managed && agent.act_as) {
-      const { method, required: actAsRequired, hmac_secret: hmacSecret, allowed_subjects: allowedSubjects } = agent.act_as;
-      if (!method) throw new Error(`Agent ${agent.name} act_as needs method.`);
-      lines.push(attr("act_as", `{ method = ${q(method)}, required = ${Boolean(actAsRequired)} }`));
-      if (hmacSecret) lines.push(attr("act_as_hmac_secret", expression(hmacSecret)));
-      if (allowedSubjects) lines.push(attr("actas_allowed_subjects", `[${allowedSubjects.map(q).join(", ")}]`));
-    }
+    const lines = [attr("workspace_id", "var.workspace_id"), attr("name", q(agent.name)), ...agentAttributes(agent)];
     if (managed) {
       if (!agent.system_prompt?.content || !agent.default_model) throw new Error(`Managed agent ${agent.name} needs system_prompt and default_model.`);
-      lines.push(attr("system_prompt", "<<-PROMPT"), ...agent.system_prompt.content.split("\n").map((line) => line.trimEnd()), "PROMPT", attr("default_model", managedModelReference(manifest, agent.default_model)), attr("gateway", `dome_gateway.${label(agent.gateway)}.name`));
+      lines.push(attr("system_prompt", "<<-PROMPT"), ...agent.system_prompt.content.split("\n").map((line) => line.trimEnd()), "PROMPT", attr("default_model", managedModelReference(manifest, agent.default_model)));
+      if (agent.trigger_config !== undefined) lines.push(attr("trigger_config", `jsonencode(${JSON.stringify(agent.trigger_config)})`));
     }
     blocks.push(block(resourceType, agentLabel, lines), ...rulesBlock(agent, resourceType, agentLabel));
     if (!managed) for (const key of agent.keys ?? []) blocks.push(block("dome_agent_key", `${agentLabel}_${label(required(key, "name", `Agent ${agent.name} keys need a name.`))}`, [attr("workspace_id", "var.workspace_id"), attr("agent", `dome_agent.${agentLabel}.name`), attr("name", q(key.name))]));
   }
-  blocks.push(...filterBlocks(manifest.filters), ...quotaBlocks(manifest.quotas, new Map(manifest.agents.map((agent) => [agent.name, agent.type]))), ...triggerBlocks(manifest.triggers));
+  blocks.push(...filterBlocks(manifest.filters), ...quotaBlocks(manifest.quotas, new Map(manifest.agents.map((agent) => [agent.name, agent.type]))));
   const header = `# Generated by @domesystems/templates from template.yaml. Do not edit.\nterraform {\n  required_providers {\n    dome = { source = ${q("dome-systems/dome")}, version = ${q(">= 0.1.0")} }\n  }\n}\n\nvariable "workspace_id" { type = string }`;
   const outputs = manifest.agents.filter((agent) => agent.type === "external").flatMap((agent) => (agent.keys ?? []).map((key) => {
     const agentLabel = label(agent.name); const keyLabel = label(key.name);

package/src/manifest.mjs

@@ -19,10 +19,13 @@ function sourcePath(root, reference, label) {
 function expandAgent(root, entry, index) {
   if (!entry || typeof entry !== "object") throw new Error(`agents[${index}] must be an object or path.`);
   if (entry.path === undefined) return entry;
-  if (Object.keys(entry).length !== 1) throw new Error(`agents[${index}] cannot combine path with other fields.`);
-  const agent = parseYAML(sourcePath(root, entry.path, `agents[${index}]`), `agent fragment ${entry.path}`);
+  if (Object.keys(entry).some((key) => key !== "name" && key !== "path")) throw new Error(`agents[${index}] may contain only name and path when path-backed.`);
+  if (typeof entry.name !== "string" || !entry.name.trim()) throw new Error(`agents[${index}].name is required when path-backed.`);
+  const file = sourcePath(root, entry.path, `agents[${index}]`);
+  const agent = parseYAML(file, `agent fragment ${entry.path}`);
   if (!agent || typeof agent !== "object" || Array.isArray(agent)) throw new Error(`Agent fragment ${entry.path} must be an object.`);
-  return agent;
+  if (agent.name !== undefined) throw new Error(`Agent fragment ${entry.path} must not declare name; template.yaml owns the agent identity.`);
+  return { ...agent, name: entry.name, __source_directory: path.dirname(file) };
 }
 
 function expandFilters(root, filters) {
@@ -74,8 +77,6 @@ function normalizeManagedAgent(root, agent, index) {
   const hasPath = typeof prompt.path === "string";
   const hasInline = typeof prompt.inline === "string";
   if (hasPath === hasInline) throw new Error(`agents[${index}].system_prompt must declare exactly one of path or inline.`);
-  if (typeof agent.gateway !== "string" || !agent.gateway.trim()) throw new Error(`Managed agent ${agent.name} needs gateway.`);
-  if (agent.allowed_gateways !== undefined || agent.trigger !== undefined) throw new Error(`Managed agent ${agent.name} uses gateway and top-level triggers; allowed_gateways and trigger are not supported.`);
   return { ...agent, system_prompt: { content: hasPath ? fs.readFileSync(sourcePath(root, prompt.path, `agents[${index}].system_prompt`), "utf8") : prompt.inline, source: hasPath ? prompt.path : "inline" } };
 }
 
@@ -96,18 +97,25 @@ export function readManifest(templateDirectory) {
   if (manifest.apiVersion !== "templates.domesystems.ai/v1" || manifest.kind !== "Template") throw new Error("template.yaml must declare apiVersion templates.domesystems.ai/v1 and kind Template.");
   if (!Array.isArray(manifest.agents) || manifest.agents.length === 0) throw new Error("template.yaml must declare at least one agent.");
   const agents = manifest.agents.map((entry, index) => {
-    const agent = normalizeManagedAgent(root, normalizeRuleFiles(root, expandAgent(root, entry, index), index), index);
+    const expanded = expandAgent(root, entry, index);
+    const agentRoot = expanded.__source_directory ?? root;
+    const agent = normalizeManagedAgent(agentRoot, normalizeRuleFiles(agentRoot, expanded, index), index);
     if (typeof agent.name !== "string" || !agent.name.trim()) throw new Error(`agents[${index}].name is required.`);
     const type = agent.type;
     if (!type) throw new Error(`agents[${index}].type is required.`);
     if (!["external", "managed"].includes(type)) throw new Error(`agents[${index}].type must be external or managed.`);
     if (type === "managed" && agent.keys?.length) throw new Error(`agents[${index}] is managed and cannot declare keys.`);
-    return { ...agent, type };
+    const { __source_directory, ...cleanAgent } = agent;
+    return { ...cleanAgent, type };
   });
   const filters = normalizeFilterConfigs(root, expandFilters(root, manifest.filters));
-  const triggers = manifest.triggers ?? [];
-  named(agents, "agents"); named(manifest.gateways ?? [], "gateways"); named(manifest.tool_connections ?? [], "tool_connections"); named(manifest.models ?? [], "models"); named(manifest.pools ?? [], "pools"); named(filters, "filters"); named(triggers, "triggers");
-  return { ...manifest, variables: manifest.variables ?? {}, gateways: manifest.gateways ?? [], tool_connections: manifest.tool_connections ?? [], models: manifest.models ?? [], pools: manifest.pools ?? [], filters, quotas: manifest.quotas ?? [], triggers, agents };
+  if (manifest.triggers !== undefined) throw new Error("triggers is not a top-level template field; declare trigger_config on the managed agent it controls.");
+  for (const agent of agents) {
+    if (agent.type === "managed" && (!agent.system_prompt || !agent.default_model)) throw new Error(`Managed agent ${agent.name} needs system_prompt and default_model.`);
+    if (agent.type === "external" && (agent.system_prompt !== undefined || agent.default_model !== undefined || agent.trigger_config !== undefined)) throw new Error(`External agent ${agent.name} cannot declare managed-agent loop fields.`);
+  }
+  named(agents, "agents"); named(manifest.gateways ?? [], "gateways"); named(manifest.tool_connections ?? [], "tool_connections"); named(manifest.models ?? [], "models"); named(manifest.pools ?? [], "pools"); named(filters, "filters");
+  return { ...manifest, variables: manifest.variables ?? {}, gateways: manifest.gateways ?? [], tool_connections: manifest.tool_connections ?? [], models: manifest.models ?? [], pools: manifest.pools ?? [], filters, quotas: manifest.quotas ?? [], agents };
 }
 
 const PACKAGE_NAME = /^[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?\/[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?$/;