@ours.network/fleet 1.1.0-nightly.1 → 1.1.0-nightly.2

package/dist/web/topology-promote.js

@@ -15,8 +15,9 @@ import { FleetError } from '../application/errors.js';
  */
 /** Loop interval when the sketch did not choose one (`resolveLoops` requires it). */
 const DEFAULT_LOOP_INTERVAL = '10m';
-/** Scalar draft fields that are valid keys of a role mapping. */
-const ROLE_FIELDS = ['mission', 'bio', 'persona', 'coordinator', 'harness', 'session', 'model', 'identity', 'cwd'];
+const ROLE_FIELDS = ['mission', 'bio', 'persona'];
+const BRAIN_FIELDS = ['harness', 'session', 'model'];
+const AGENT_OP_FIELDS = ['coordinator', 'identity', 'cwd'];
 /** Scalar draft fields that are valid keys of a watchdog mapping. */
 const WATCHDOG_FIELDS = ['coordinator', 'interval', 'enabled'];
 /** Scalar draft fields that are valid keys of a loop mapping. */
@@ -100,15 +101,22 @@ function resolve(merged, id) {
     return node;
 }
 function addNode(model, node, merged) {
-    const block = section(model, node.kind === 'agent' ? 'roles' : node.kind === 'watchdog' ? 'watchdogs' : 'loops');
+    const block = node.kind === 'agent' ? model.agents
+        : manifestSection(model, node.kind === 'watchdog' ? 'watchdogs' : 'loops');
     if (block[node.label] !== undefined)
         throw new FleetError('conflict', `${node.label} already exists in the configuration`);
     block[node.label] = node.kind === 'agent' ? agentEntry(node)
         : node.kind === 'watchdog' ? watchdogEntry(node, merged)
-            : loopEntry(node, merged, model);
+            : loopEntry(node, merged);
 }
 function agentEntry(node) {
-    return pick(node, ROLE_FIELDS);
+    const brain = pick(node, BRAIN_FIELDS);
+    brain.harness ??= 'claude-code';
+    return {
+        role: { inline: pick(node, ROLE_FIELDS) },
+        brain: { inline: brain },
+        ...pick(node, AGENT_OP_FIELDS),
+    };
 }
 /**
  * A watchdog drawn on its own carries
@@ -120,7 +128,7 @@ function watchdogEntry(node, merged) {
     const scoped = linked(merged, node.id, 'watches');
     return { ...pick(node, WATCHDOG_FIELDS), ...(scoped.length ? { watch: scoped } : {}) };
 }
-function loopEntry(node, merged, model) {
+function loopEntry(node, merged) {
     const roles = linked(merged, node.id, 'targets');
     const entry = {
         roles, ...pick(node, LOOP_FIELDS),
@@ -136,17 +144,12 @@ function linked(merged, id, kind) {
             .filter(edge => edge.kind === kind && edge.from === id && !edge.implicit && !edge.dangling)
             .map(edge => edge.to.slice('agent:'.length)))].sort();
 }
-function sessionOf(model, role) {
-    const roles = model.roles;
-    const defaults = model.defaults;
-    return String(roles?.[role]?.session ?? defaults?.session ?? 'acp');
-}
-function section(model, key) {
-    const existing = model[key];
+function manifestSection(model, key) {
+    const existing = model.manifest[key];
     if (existing && typeof existing === 'object' && !Array.isArray(existing))
         return existing;
     const created = {};
-    model[key] = created;
+    model.manifest[key] = created;
     return created;
 }
 /** Copy only the sketched fields that are real keys of the target mapping. */

package/dist/web/topology.js

@@ -11,8 +11,8 @@ export function deriveTopology(config, roles) {
     const add = (kind, from, to, label) => edges.push({ id: `${kind}:${from}:${to}`, kind, from, to, label });
     for (const role of config.roles)
         for (const entry of role.oversee ?? [])
-            if (agentIds.has(role.name) && agentIds.has(entry.role))
-                add('oversees', `agent:${role.name}`, `agent:${entry.role}`, `oversees · ${entry.interval}`);
+            if (agentIds.has(role.name) && agentIds.has(entry.agent))
+                add('oversees', `agent:${role.name}`, `agent:${entry.agent}`, `oversees · ${entry.interval}`);
     for (const watchdog of config.watchdogs) {
         const id = `watchdog:${watchdog.name}`;
         nodes.push({

package/dist/web/yaml-document-edit.js

@@ -85,6 +85,8 @@ export function redactSourceSecrets(source, marker) {
     redactEnvMap(['defaults', 'env']);
     for (const name of mapKeys(document, ['roles']))
         redactEnvMap(['roles', name, 'env']);
+    // A v2 Agent document is itself the role/ops mapping, so env is top-level.
+    redactEnvMap(['env']);
     const vars = document.getIn(['vars'], true);
     if (isMap(vars))
         for (const item of vars.items) {