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

package/dist/rooms-tasks/types.d.ts

@@ -100,6 +100,9 @@ export interface RoomMemberLaunchState {
     /** Expected authenticated proxy caller while adopting a post-spawn crash. */
     caller_role?: string;
     mission_sha256?: string;
+    /** Redacted, deterministic effective Agent launch definition retained for retry inspection. */
+    agent_definition?: Record<string, unknown>;
+    agent_fingerprint?: string;
     launch_id?: string;
     updated_at: string;
     error?: string;
@@ -189,19 +192,10 @@ export interface TemplateMemberSlot {
     slot: string;
     role: string;
     count: number;
-    role_ref: string;
-    overrides?: TemplateRoleOverrides;
-}
-export interface TemplateRoleOverrides {
-    harness?: string;
-    model?: string;
-    model_chain?: string[];
-    permissions?: Record<string, unknown>;
-    isolation?: Record<string, unknown>;
-    cwd?: string;
-    env?: Record<string, string>;
-    persona?: string;
-    mission?: string;
+    /** Canonical Agent definition, or stable reference to a declared Agent. */
+    agent: import('../config.js').AgentDefinition | {
+        ref: string;
+    };
 }
 export interface TemplateRoomConfig {
     quiet_membership?: boolean;
@@ -252,5 +246,4 @@ export declare const ROOMS_COWORK_KEYS: readonly ["config"];
 export declare const ROOMS_DEFAULTS_KEYS: readonly ["template", "attach_owner", "close_when_task_done"];
 export declare const TASKS_KEYS: readonly ["default_room_template", "create_mode", "close_room_on_done", "retain_completed_for"];
 export declare const TEMPLATE_KEYS: readonly ["version", "description", "room", "contract", "members", "override_builtin"];
-export declare const TEMPLATE_MEMBER_KEYS: readonly ["slot", "role", "count", "role_ref", "overrides"];
-export declare const TEMPLATE_OVERRIDE_KEYS: readonly ["harness", "model", "model_chain", "permissions", "isolation", "cwd", "env", "persona", "mission"];
+export declare const TEMPLATE_MEMBER_KEYS: readonly ["slot", "role", "count", "agent"];

package/dist/rooms-tasks/types.js

@@ -14,7 +14,4 @@ export const ROOMS_COWORK_KEYS = ['config'];
 export const ROOMS_DEFAULTS_KEYS = ['template', 'attach_owner', 'close_when_task_done'];
 export const TASKS_KEYS = ['default_room_template', 'create_mode', 'close_room_on_done', 'retain_completed_for'];
 export const TEMPLATE_KEYS = ['version', 'description', 'room', 'contract', 'members', 'override_builtin'];
-export const TEMPLATE_MEMBER_KEYS = ['slot', 'role', 'count', 'role_ref', 'overrides'];
-export const TEMPLATE_OVERRIDE_KEYS = [
-    'harness', 'model', 'model_chain', 'permissions', 'isolation', 'cwd', 'env', 'persona', 'mission',
-];
+export const TEMPLATE_MEMBER_KEYS = ['slot', 'role', 'count', 'agent'];

package/dist/sensitive-config.d.ts

@@ -0,0 +1,2 @@
+/** Shared recursive configuration redaction boundary for operator-facing models. */
+export declare function isSensitiveConfigKey(key: string): boolean;

package/dist/sensitive-config.js

@@ -0,0 +1,4 @@
+/** Shared recursive configuration redaction boundary for operator-facing models. */
+export function isSensitiveConfigKey(key) {
+    return /(?:secret|token|password|credential|private[_-]?key|auth|invite|api[_-]?key)/i.test(key);
+}

package/dist/spawn.d.ts

@@ -1,5 +1,5 @@
 import type { IsolationConfig } from './isolation/types.js';
-import { type ApprovalMode, type FilesystemMode, type ResolvedRole, type RoleConfig, type MonitorConfig, type SessionBackendId, type UnattendedMode, type RoomMemberStartup } from './config.js';
+import { type ApprovalMode, type FilesystemMode, type ResolvedRole, type MonitorConfig, type UnattendedMode, type RoomMemberStartup, type AgentDefinition, type AgentSelection } from './config.js';
 import { type OpsDeps } from './ops.js';
 import { type CreationDeps, type CreationProvenance } from './creation.js';
 import './harness/claude-code.js';
@@ -13,34 +13,18 @@ export declare let lastProvenance: CreationProvenance | undefined;
 export interface SpawnOpts {
     name: string;
     temp?: boolean;
-    harness?: string;
-    session?: SessionBackendId;
-    mission?: string;
-    missionFile?: string;
+    brain?: AgentSelection;
+    role?: AgentSelection;
+    /** Trusted canonical definition used by room provisioning; never a second schema. */
+    agentDefinition?: AgentDefinition;
     identity?: string;
     cwd?: string;
     coordinator?: string;
-    /** null explicitly selects the harness default; undefined retains normal fleet inheritance. */
-    model?: string | null;
-    permissionMode?: string;
     approval?: ApprovalMode;
     filesystem?: FilesystemMode;
     unattended?: UnattendedMode;
-    sandbox?: string;
-    profile?: string;
-    launcher?: string;
-    search?: boolean;
-    codexConfig?: Record<string, string | number | boolean>;
-    reasoningEffort?: string | null;
-    addDirs?: string[];
-    monitor?: boolean;
     /** Typed external monitor configuration used by trusted creation surfaces. */
     monitorConfig?: Partial<MonitorConfig>;
-    bioFile?: string;
-    personaFile?: string;
-    /** Inline profile values for trusted typed callers such as the local web service. */
-    bio?: string;
-    persona?: string;
     /** Internal, non-sensitive provenance correlation for typed presentation layers. */
     surface?: 'cli' | 'web' | 'agent';
     creationActionId?: string;
@@ -61,12 +45,7 @@ export interface SpawnOpts {
     dryRun?: boolean;
     json?: boolean;
 }
-export declare function profileValues(o: SpawnOpts): {
-    bio?: string;
-    persona?: string;
-};
-/** Pure option-to-role mapping shared by CLI and application services. */
-export declare function buildRoleConfig(o: SpawnOpts, defaultHarness?: string): RoleConfig;
+export declare function agentDefinitionFromSpawn(o: SpawnOpts): AgentDefinition;
 /**
  * Read and validate an `--isolation-file`. The file is the existing
  * `isolation:` mapping and nothing else — the same schema, the same validator
@@ -78,16 +57,12 @@ export declare function buildRoleConfig(o: SpawnOpts, defaultHarness?: string):
  */
 export declare function readIsolationFile(path: string): IsolationConfig;
 export declare function validateSpawnOpts(o: SpawnOpts): void;
-/** Read mission text without trimming or newline rewriting. */
-export declare function readMissionFile(path: string): string;
 /** The ours identity a spawn will bind: explicit, else the role name. */
 export declare const effectiveIdentity: (o: SpawnOpts) => string;
 export interface SpawnDryRun {
     schemaVersion: 1;
     warning: string;
-    roleDocument: {
-        roles: Record<string, RoleConfig>;
-    };
+    roleDocument: Record<string, unknown>;
     resolvedRole: ResolvedRole;
 }
 /**
@@ -95,7 +70,7 @@ export interface SpawnDryRun {
  * or writing state. Collision checks are necessarily a point-in-time snapshot.
  */
 export declare function spawnDryRun(o: SpawnOpts): SpawnDryRun;
-/** Permanent spawn: persist to ~/fleet.d/<Name>.yaml, then bring it up. */
+/** Permanent spawn: persist one bare Agent document under the selected v2 root. */
 export declare function spawnPermanent(o: SpawnOpts, deps: OpsDeps, creation?: CreationDeps): Promise<string>;
 export type { SupervisorLauncher } from './temp-lifecycle.js';
 /** Temp spawn: live state under ~/.ours-fleet/tmp, independent transient supervision. */

package/dist/spawn.js

@@ -2,98 +2,56 @@ import { spawn as spawnChild } from 'node:child_process';
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { parse, stringify } from 'yaml';
-import { agentDir, fleetDDir } from './paths.js';
+import { agentDir, defaultConfigPath } from './paths.js';
 import { validateIsolationConfig } from './isolation/policy.js';
-import { loadConfig, resolveAuthProxy, resolveModelChain, resolveMonitorConfig, resolveOwnerChannelConfig, resolvePermissions, resolveRoleModel, resolveWorklogPolicy, validateMonitorConfig, } from './config.js';
-import { resolveRoleModelEnv } from './model-env.js';
+import { loadConfig, findRole, splitRootFor, validateMonitorConfig, } from './config.js';
 import { applyRole, up } from './ops.js';
 import { START_STAGGER_FILE } from './runner.js';
 import { buildProvenance, daemonIdentityProvisioner, ensureIdentity, provenanceOf, withCreationTransaction, writeProvenance, writeRoleFile, } from './creation.js';
 import { VERSION } from './version.js';
+import { recordGeneratedAgentSource } from './generated-agent-source.js';
 import './harness/claude-code.js';
 import './harness/codex.js';
-import { getAdapter } from './harness/registry.js';
 import { archiveTempState, makeTempSupervisorLauncher, prepareTempSupervisor, reclaimStaleTempState, } from './temp-lifecycle.js';
 /**
  * The provenance record written by the most recent spawn in this process, so
  * the CLI can print the same summary it persisted rather than rebuilding it.
  */
 export let lastProvenance;
-export function profileValues(o) {
-    if (o.bio !== undefined && o.bioFile)
-        throw new Error('bio and bioFile are mutually exclusive');
-    if (o.persona !== undefined && o.personaFile)
-        throw new Error('persona and personaFile are mutually exclusive');
+export function agentDefinitionFromSpawn(o) {
+    if (o.agentDefinition) {
+        if (o.brain !== undefined || o.role !== undefined || o.cwd !== undefined
+            || o.coordinator !== undefined || o.approval !== undefined || o.filesystem !== undefined
+            || o.unattended !== undefined || o.isolationFile !== undefined || o.monitorConfig !== undefined)
+            throw new Error('canonical agentDefinition conflicts with separate Agent fields');
+        const definition = structuredClone(o.agentDefinition);
+        if (o.identity)
+            definition.identity = o.identity;
+        return definition;
+    }
+    if (!o.role)
+        throw new Error('--role is required (declared ID or inline mapping)');
+    if (!o.brain)
+        throw new Error('--brain is required (declared ID or inline mapping)');
+    const permissions = o.approval || o.filesystem || o.unattended ? {
+        ...(o.approval ? { approval: o.approval } : {}),
+        ...(o.filesystem ? { filesystem: o.filesystem } : {}),
+        ...(o.unattended ? { unattended: o.unattended } : {}),
+    } : undefined;
     return {
-        bio: o.bio !== undefined ? o.bio.trim()
-            : o.bioFile ? readFileSync(o.bioFile, 'utf8').trim() : undefined,
-        persona: o.persona !== undefined ? o.persona.trim()
-            : o.personaFile ? readFileSync(o.personaFile, 'utf8').trim() : undefined,
+        role: structuredClone(o.role), brain: structuredClone(o.brain),
+        ...(o.identity ? { identity: o.identity } : {}),
+        ...(o.cwd ? { cwd: o.cwd } : {}),
+        ...(o.coordinator ? { coordinator: o.coordinator } : {}),
+        ...(permissions ? { permissions } : {}),
+        ...(o.isolationFile ? { isolation: readIsolationFile(o.isolationFile) } : {}),
+        ...(o.monitorConfig ? { monitor: structuredClone(o.monitorConfig) } : {}),
     };
 }
-/** Pure option-to-role mapping shared by CLI and application services. */
-export function buildRoleConfig(o, defaultHarness) {
-    const r = {};
-    if (o.harness)
-        r.harness = o.harness;
-    if (o.session)
-        r.session = o.session;
-    if (o.identity)
-        r.identity = o.identity;
-    if (o.cwd)
-        r.cwd = o.cwd;
-    if (o.coordinator)
-        r.coordinator = o.coordinator;
-    if (o.missionFile)
-        r.mission = readMissionFile(o.missionFile);
-    else if (o.mission !== undefined)
-        r.mission = o.mission;
-    if (o.model === null)
-        r.model = null;
-    else if (o.model?.trim())
-        r.model = o.model.trim();
-    const harness = o.harness ?? defaultHarness;
-    const harnessOptions = {};
-    if (o.permissionMode)
-        harnessOptions[harness === 'claude-code' ? 'permission_mode' : 'approval'] = o.permissionMode;
-    if (o.sandbox)
-        harnessOptions.sandbox = o.sandbox;
-    if (o.profile)
-        harnessOptions.profile = o.profile;
-    if (o.launcher)
-        harnessOptions.launcher = o.launcher;
-    if (o.search === true)
-        harnessOptions.search = true;
-    const codexConfig = { ...(o.codexConfig ?? {}) };
-    if (o.reasoningEffort && harness === 'codex')
-        codexConfig.model_reasoning_effort = o.reasoningEffort;
-    if (Object.keys(codexConfig).length)
-        harnessOptions.config = codexConfig;
-    if (o.reasoningEffort && harness === 'claude-code')
-        harnessOptions.effort = o.reasoningEffort;
-    if (o.addDirs?.length)
-        harnessOptions.add_dirs = o.addDirs;
-    if (o.monitor === true)
-        harnessOptions.monitor = true;
-    if (Object.keys(harnessOptions).length)
-        r.harness_options = harnessOptions;
-    if (o.approval || o.filesystem || o.unattended) {
-        r.permissions = {
-            ...(o.approval ? { approval: o.approval } : {}),
-            ...(o.filesystem ? { filesystem: o.filesystem } : {}),
-            ...(o.unattended ? { unattended: o.unattended } : {}),
-        };
-    }
-    const profile = profileValues(o);
-    if (profile.bio)
-        r.bio = profile.bio;
-    if (profile.persona)
-        r.persona = profile.persona;
-    if (o.isolationFile)
-        r.isolation = readIsolationFile(o.isolationFile);
-    if (o.monitorConfig)
-        r.monitor = { ...o.monitorConfig };
-    return r;
+function resolvedSpawn(o) {
+    const definition = agentDefinitionFromSpawn(o);
+    const cfg = loadConfig(o.configPath, { additionalAgent: { id: o.name, definition } });
+    return { definition, role: findRole(cfg, o.name) };
 }
 /**
  * Read and validate an `--isolation-file`. The file is the existing
@@ -121,12 +79,6 @@ export function readIsolationFile(path) {
     return cfg;
 }
 export function validateSpawnOpts(o) {
-    if (o.mission !== undefined && o.missionFile)
-        throw new Error('--mission and --mission-file are mutually exclusive');
-    if (o.session === 'tmux')
-        throw new Error("invalid --session 'tmux'; tmux is no longer supported; use --session acp");
-    if (o.session && o.session !== 'acp')
-        throw new Error(`invalid --session '${o.session}'; allowed: acp`);
     if (o.approval && !['ask', 'auto', 'allow', 'deny'].includes(o.approval))
         throw new Error(`invalid --approval '${o.approval}'; allowed: ask, auto, allow (deprecated alias: deny)`);
     if (o.filesystem && !['read-only', 'workspace', 'unrestricted'].includes(o.filesystem))
@@ -137,23 +89,12 @@ export function validateSpawnOpts(o) {
         throw new Error(`invalid role name '${o.name}'`);
     if (o.identity && !/^[A-Za-z0-9_-]+$/.test(o.identity))
         throw new Error(`invalid identity name '${o.identity}'`);
-    if (o.model && (o.model.length > 128 || /[\0-\x1f\x7f]/.test(o.model)))
-        throw new Error('model must be printable and at most 128 characters');
     if (o.monitorConfig) {
         const problems = validateMonitorConfig(o.monitorConfig);
         if (problems.length)
             throw new Error(problems.join('; '));
     }
 }
-/** Read mission text without trimming or newline rewriting. */
-export function readMissionFile(path) {
-    try {
-        return readFileSync(path, 'utf8');
-    }
-    catch (e) {
-        throw new Error(`--mission-file ${path}: ${e.message}`);
-    }
-}
 /**
  * Reject names that are already USED. This is a precondition, not a claim: it
  * runs INSIDE the creation transaction, after both names are reserved, so the
@@ -182,62 +123,13 @@ export function spawnDryRun(o) {
     validateSpawnOpts(o);
     if (o.isolationFile)
         readIsolationFile(o.isolationFile);
-    if (o.missionFile)
-        readMissionFile(o.missionFile);
     assertNameFree(o);
-    const cfg = loadConfig(o.configPath);
-    const raw = buildRoleConfig(o, cfg.defaults.harness);
-    const harnessOptions = {
-        ...(cfg.defaults.harness_options ?? {}),
-        ...(raw.harness_options ?? {}),
-    };
-    const harness = raw.harness ?? cfg.defaults.harness ?? 'claude-code';
-    const defaultHarness = cfg.defaults.harness ?? 'claude-code';
-    const inheritsModelDefaults = harness === defaultHarness && raw.model !== null;
-    const authProxy = resolveAuthProxy(cfg.defaults.auth_proxy, raw.auth_proxy);
-    // One resolution for the environment and the model it pins (src/model-env.ts).
-    const modelEnv = resolveRoleModelEnv({
-        harness,
-        model: resolveRoleModel(raw.model, raw.harness, cfg.defaults),
-        modelWasExplicit: raw.model !== undefined,
-        defaultsEnv: (cfg.defaults.env ?? {}),
-        roleEnv: raw.env,
-        ...(authProxy ? { authProxyBaseUrl: authProxy.base_url } : {}),
-    });
-    const model = modelEnv.model;
-    const session = raw.session ?? cfg.defaults.session ?? 'acp';
-    const resolvedRole = {
-        ...raw,
-        name: o.name,
-        sourceFile: o.temp ? '(temp dry-run)' : join(fleetDDir(), `${o.name}.yaml`),
-        harness,
-        session,
-        session_options: raw.session_options,
-        permissions: resolvePermissions(cfg.defaults.permissions, raw.permissions),
-        permissionsDeclared: raw.permissions !== undefined || cfg.defaults.permissions !== undefined,
-        identity: effectiveIdentity(o),
-        model,
-        model_chain: resolveModelChain(model, raw.model_chain ?? (inheritsModelDefaults
-            ? cfg.defaults.model_chain
-            : undefined)),
-        harness_options: Object.keys(harnessOptions).length ? harnessOptions : undefined,
-        isolation: raw.isolation ?? cfg.defaults.isolation,
-        monitor: resolveMonitorConfig(cfg.defaults.monitor, raw.monitor),
-        owner_channel: resolveOwnerChannelConfig(cfg.defaults.owner_channel, raw.owner_channel, session),
-        worklog: resolveWorklogPolicy(cfg.defaults.worklog, raw.worklog),
-        auth_proxy: authProxy,
-    };
-    resolvedRole.env = modelEnv.env;
-    const adapter = getAdapter(resolvedRole.harness);
-    if (resolvedRole.auth_proxy && resolvedRole.harness !== 'claude-code')
-        throw new Error('auth_proxy is supported only by claude-code');
-    const optionProblems = adapter.validateOptions(resolvedRole.harness_options, resolvedRole);
-    if (optionProblems.length)
-        throw new Error(optionProblems.map(problem => `${problem.path}: ${problem.message}`).join('; '));
+    const resolved = resolvedSpawn(o);
+    const resolvedRole = resolved.role;
     return {
         schemaVersion: 1,
         warning: 'collision checks are a snapshot; a real spawn reserves names atomically',
-        roleDocument: { roles: { [o.name]: raw } },
+        roleDocument: structuredClone(resolved.definition),
         resolvedRole,
     };
 }
@@ -253,22 +145,15 @@ function provenanceSettings(o, defaults) {
     const perms = (defaults.permissions ?? {});
     const callerDefaults = new Set(o.inheritedFromCaller ?? []);
     const tagged = (key, entry) => callerDefaults.has(key) ? { ...entry, source: 'caller-role' } : entry;
-    const explicitModel = typeof o.model === 'string' ? o.model.trim() : undefined;
-    const inheritedModel = resolveRoleModel(undefined, o.harness, defaults);
+    const selection = (value) => value && 'ref' in value ? `ref:${value.ref}` : value ? 'inline' : undefined;
     return {
-        harness: tagged('harness', provenanceOf(o.harness, defaults.harness, 'claude-code')),
-        session: tagged('session', provenanceOf(o.session, defaults.session, 'acp')),
+        brain: tagged('brain', provenanceOf(selection(o.brain), undefined, undefined)),
+        role: tagged('role', provenanceOf(selection(o.role), undefined, undefined)),
         identity: o.identity
             ? { value: o.identity, source: 'cli' }
             : { value: o.name, source: 'built-in' }, // defaults to the role name
         cwd: tagged('cwd', provenanceOf(o.cwd, undefined, undefined)),
-        model: tagged('model', o.model === null
-            ? { value: undefined, source: 'cli' }
-            : explicitModel
-                ? { value: explicitModel, source: 'cli' }
-                : { value: inheritedModel, source: inheritedModel ? 'fleet-default' : 'built-in' }),
         coordinator: tagged('coordinator', provenanceOf(o.coordinator, undefined, undefined)),
-        permission_mode: provenanceOf(o.permissionMode, undefined, undefined),
         approval: tagged('approval', provenanceOf(o.approval, perms.approval, 'ask')),
         filesystem: tagged('filesystem', provenanceOf(o.filesystem, perms.filesystem, 'workspace')),
         unattended: tagged('unattended', provenanceOf(o.unattended, perms.unattended, 'deny')),
@@ -278,13 +163,12 @@ function provenanceSettings(o, defaults) {
         monitor: tagged('monitorConfig', provenanceOf(o.monitorConfig, defaults.monitor, { mode: 'fleet' })),
     };
 }
-/** Permanent spawn: persist to ~/fleet.d/<Name>.yaml, then bring it up. */
+/** Permanent spawn: persist one bare Agent document under the selected v2 root. */
 export async function spawnPermanent(o, deps, creation = {}) {
     validateSpawnOpts(o);
     if (o.isolationFile)
         readIsolationFile(o.isolationFile); // fail before reserving
-    if (o.missionFile)
-        readMissionFile(o.missionFile); // fail before reserving
+    const prepared = resolvedSpawn(o); // canonical validation before mutation
     // Reserve name and identity together before anything is written or started.
     // A loser of the race creates no config, state, or service.
     creation.onStage?.('reserving');
@@ -294,7 +178,7 @@ export async function spawnPermanent(o, deps, creation = {}) {
         // Establish the identity BEFORE the service is enabled, and record
         // what was actually guaranteed so the briefing can say something true.
         creation.onStage?.('checking_identity');
-        const guarantee = await ensureIdentity(effectiveIdentity(o), profileValues(o), creation.identityProvisioner ?? deps.identityProvisioner ?? daemonIdentityProvisioner(), deps.log);
+        const guarantee = await ensureIdentity(effectiveIdentity(o), { bio: prepared.role.bio, persona: prepared.role.persona }, creation.identityProvisioner ?? deps.identityProvisioner ?? daemonIdentityProvisioner(), deps.log);
         creation.onStage?.('checking_identity', {
             result: guarantee.evidence, guarantee: guarantee.state,
         });
@@ -307,12 +191,11 @@ export async function spawnPermanent(o, deps, creation = {}) {
                     await creation.identityProvisioner?.remove?.(effectiveIdentity(o));
                 },
             });
-        mkdirSync(fleetDDir(), { recursive: true });
+        const agentRoot = join(splitRootFor(o.configPath ?? defaultConfigPath()), 'agents');
+        mkdirSync(agentRoot, { recursive: true });
         creation.onStage?.('writing_role');
-        const file = join(fleetDDir(), `${o.name}.yaml`);
-        writeRoleFile(tx, file, stringify({
-            roles: { [o.name]: buildRoleConfig(o, cfg.defaults.harness) },
-        }));
+        const file = join(agentRoot, `${o.name}.yaml`);
+        writeRoleFile(tx, file, stringify(agentDefinitionFromSpawn(o)));
         // `up` materialises the state dir and registers the service. Journal the
         // dir before it exists so a failure leaves the name genuinely reusable
         // rather than blocked by a half-built directory.
@@ -343,6 +226,7 @@ export async function spawnPermanent(o, deps, creation = {}) {
         });
         mkdirSync(agentDir(o.name), { recursive: true });
         writeProvenance(agentDir(o.name), provenance);
+        recordGeneratedAgentSource(agentDir(o.name), o.configPath ?? defaultConfigPath(), file);
         creation.onStage?.('registering_supervisor');
         await up(loadConfig(o.configPath), [o.name], {
             ...deps,
@@ -380,8 +264,7 @@ export async function spawnTemp(o, binPath, launch = independentSupervisor, crea
     validateSpawnOpts(o);
     if (o.isolationFile)
         readIsolationFile(o.isolationFile); // fail before reserving
-    if (o.missionFile)
-        readMissionFile(o.missionFile); // fail before reserving
+    const prepared = resolvedSpawn(o); // canonical validation before mutation
     // Retire only supervisors whose recorded owner is definitively stopped. This
     // bounded pass keeps the active roster clean without deleting old evidence.
     await reclaimStaleTempState();
@@ -394,56 +277,14 @@ export async function spawnTemp(o, binPath, launch = independentSupervisor, crea
         creation.onStage?.('checking_identity', {
             result: 'unknown', guarantee: 'unverified',
         });
-        return spawnTempInner(o, binPath, launch, tx, creation.onStage);
+        return spawnTempInner(o, prepared.role, binPath, launch, tx, creation.onStage);
     }, creation);
 }
-async function spawnTempInner(o, binPath, launch, tx, onStage) {
+async function spawnTempInner(o, preparedRole, binPath, launch, tx, onStage) {
     const cfg = loadConfig(o.configPath);
-    const defaultHarness = cfg.defaults.harness;
-    const fromOpts = buildRoleConfig(o, defaultHarness);
-    const mergedHarnessOptions = {
-        ...(cfg.defaults.harness_options ?? {}),
-        ...(fromOpts.harness_options ?? {}),
-    };
-    const harness = o.harness ?? defaultHarness ?? 'claude-code';
-    const inheritsModelDefaults = harness === (defaultHarness ?? 'claude-code') && o.model !== null;
-    const tempAuthProxy = resolveAuthProxy(cfg.defaults.auth_proxy, fromOpts.auth_proxy);
-    // An explicitly requested --model must reach the child, not just the banner
-    // (src/model-env.ts).
-    const modelEnv = resolveRoleModelEnv({
-        harness,
-        model: resolveRoleModel(o.model, o.harness, cfg.defaults),
-        modelWasExplicit: o.model !== undefined,
-        defaultsEnv: (cfg.defaults.env ?? {}),
-        roleEnv: fromOpts.env,
-        ...(tempAuthProxy ? { authProxyBaseUrl: tempAuthProxy.base_url } : {}),
-    });
-    const model = modelEnv.model;
-    const session = o.session ?? cfg.defaults.session ?? 'acp';
     const role = {
-        ...fromOpts, // includes `isolation` when --isolation-file was given
-        name: o.name,
-        harness,
-        session,
-        identity: o.identity ?? o.name,
-        model,
-        model_chain: resolveModelChain(model, fromOpts.model_chain ?? (inheritsModelDefaults
-            ? cfg.defaults.model_chain
-            : undefined)),
-        harness_options: Object.keys(mergedHarnessOptions).length ? mergedHarnessOptions : undefined,
-        permissions: resolvePermissions(cfg.defaults.permissions, fromOpts.permissions),
-        permissionsDeclared: fromOpts.permissions !== undefined || cfg.defaults.permissions !== undefined,
-        // Temp agents inherit the fleet-wide monitor defaults via the snapshot.
-        monitor: resolveMonitorConfig(cfg.defaults.monitor, fromOpts.monitor),
-        owner_channel: resolveOwnerChannelConfig(cfg.defaults.owner_channel, fromOpts.owner_channel, session),
-        worklog: resolveWorklogPolicy(cfg.defaults.worklog, fromOpts.worklog),
-        auth_proxy: tempAuthProxy,
-        sourceFile: '(temp)',
-        roomMemberStartup: o.roomMemberStartup,
+        ...preparedRole, sourceFile: '(temp)', loops: undefined, roomMemberStartup: o.roomMemberStartup,
     };
-    role.env = modelEnv.env;
-    if (role.auth_proxy && role.harness !== 'claude-code')
-        throw new Error('auth_proxy is supported only by claude-code');
     onStage?.('writing_role');
     const dir = applyRole(role, { temp: true, identityGuarantee: 'unverified' });
     const provenance = buildProvenance({

package/dist/watchdog/config.d.ts

@@ -1,19 +1,19 @@
-import type { FleetConfig, ResolvedRole, SessionBackendId } from '../config.js';
+import type { AgentDefinition, FleetConfig, ResolvedRole } from '../config.js';
+import type { SessionBackendId } from '../config.js';
 import type { IsolationConfig } from '../isolation/types.js';
 export interface WatchdogConfig {
     coordinator?: string;
     enabled?: boolean;
     interval?: string;
     watch?: string[];
-    harness?: string;
-    model?: string | null;
-    session?: string;
+    agent?: {
+        ref: string;
+    } | AgentDefinition;
     identity?: string;
     timeout?: string;
     keep_reports?: number;
     alert_cooldown?: string;
     prompt_file?: string;
-    isolation?: IsolationConfig;
 }
 export interface ResolvedWatchdog {
     name: string;
@@ -22,15 +22,18 @@ export interface ResolvedWatchdog {
     intervalMs: number;
     watch: string[];
     watchExplicit: boolean;
+    agentDefinition: AgentDefinition;
+    resolvedAgent: ResolvedRole;
+    /** Resolved/read-only runtime facts; never independent authoring fields. */
     harness: string;
     session: SessionBackendId;
     model?: string;
+    isolation?: IsolationConfig;
     identity: string;
     timeoutMs: number;
     keepReports: number;
     alertCooldownMs: number;
     promptFile?: string;
-    isolation?: IsolationConfig;
     sourceFile: string;
 }
 export declare const WATCHDOG_DEFAULT_INTERVAL_MS = 600000;
@@ -38,7 +41,7 @@ export declare const WATCHDOG_MIN_INTERVAL_MS = 60000;
 export declare const WATCHDOG_DEFAULT_TIMEOUT_MS = 300000;
 export declare const WATCHDOG_DEFAULT_KEEP_REPORTS = 50;
 export declare const WATCHDOG_DEFAULT_COOLDOWN_MS = 3600000;
-export declare function resolveWatchdogs(baseDoc: Record<string, unknown>, baseFile: string, roles: ResolvedRole[], vars: Record<string, string>, defaults: Record<string, unknown>): ResolvedWatchdog[];
+export declare function resolveWatchdogs(baseDoc: Record<string, unknown>, baseFile: string, roles: ResolvedRole[], vars: Record<string, string>, agentDefinitions: Record<string, AgentDefinition>, resolveInline: (name: string, definition: AgentDefinition) => ResolvedRole): ResolvedWatchdog[];
 /**
  * Split `restart`'s argument names into watchdogs (a release, handled
  * directly) and roles (handed to restartRoles). Watchdog names can't collide