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

package/dist/cli.js

@@ -1,17 +1,20 @@
 #!/usr/bin/env node
 import { spawn as spawnChild } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { existsSync, mkdirSync, readFileSync, statSync } from 'node:fs';
 import { realpathSync } from 'node:fs';
 import { join as joinPath, resolve as resolvePath } from 'node:path';
 import { createInterface } from 'node:readline';
 import { Command } from 'commander';
 import { VERSION } from './version.js';
 import { INIT_COMPLETION_GUIDANCE } from './init-guidance.js';
+import { migrateLegacyStarterPresets, migratePackagedRoleDefaults } from './preset-migration.js';
+import { executeInitWizard, isInteractiveTerminal, publishSetup, TerminalPrompter, } from './init-wizard.js';
 import { analyzeInstalls, buildInfo, buildLabel, discoverInstalls, runningLabel, } from './provenance.js';
-import { agentDir, agentsRoot, tmpRoot, logsRoot, deriveXdgRuntimeDir } from './paths.js';
-import { findRole, loadConfig } from './config.js';
+import { agentDir, agentsRoot, tmpRoot, logsRoot, deriveXdgRuntimeDir, defaultConfigPath } from './paths.js';
+import { findRole, loadConfig, ROLE_NAME_RE } from './config.js';
 import { formatDuration } from './duration.js';
-import { redactSensitive, resolvedPlan } from './resolved-plan.js';
+import { redactSensitive, resolvedPlan, resolvedRolePlan } from './resolved-plan.js';
 import { pickBackend } from './supervisor/index.js';
 import { up, down } from './ops.js';
 import { readRestartLedger, runSupervised, runTemp } from './runner.js';
@@ -23,11 +26,11 @@ import { acquireRunLock, latestReport, listRuns, readReport, releaseRunLock, rep
 import { watchdogAddressable } from './watchdog/query.js';
 import { lastProvenance } from './spawn.js';
 import { stringify } from 'yaml';
-import { resolvedRolePlan } from './resolved-plan.js';
 import { creationBuildNote, formatProvenance, readProvenance } from './creation.js';
 import { doctor } from './doctor.js';
 import { allWarnings, analyzeFleetPermissions, effectivePermissionMode, formatNative, } from './permissions.js';
 import { AI_DOCS } from './docs.js';
+import { renderAgentConfiguration, selectionOrigin, summarizeResolvedLaunch } from './lifecycle-summary.js';
 import { classifyActivity, describeSessionState } from './session/activity.js';
 import { controlRequest, controlSocketPath, followControl, livenessNote, } from './session/control.js';
 import { SessionControlError } from './session/types.js';
@@ -37,6 +40,7 @@ import { requestWebControl } from './web/control.js';
 import { WebServiceManager } from './web/service.js';
 import { WebAccessStore, passwordAccess, validatePublicOrigin } from './web/access.js';
 import { FLEET_PROXY_CALLER_ENV, FLEET_PROXY_STATE_DIR_ENV, } from './fleet-proxy.js';
+import { beginFleetAuditCollection, consumeFleetAuditCollection, FleetCliExit, } from './fleet-command-audit.js';
 import './harness/claude-code.js'; // registers the claude-code adapter
 import './harness/codex.js'; // registers the codex adapter
 import { registerTemplateCommands, registerTaskCommands, registerRoomCommands } from './rooms-tasks/cli.js';
@@ -66,7 +70,10 @@ const roleLifecycle = (configPath, operationDeps) => {
     return new RoleLifecycleService({ repository, ops: operationDeps, configPath,
         status: async (roleId) => (await query.detail(roleId)).status });
 };
-const die = (e) => { console.error(String(e instanceof Error ? e.message : e)); process.exit(1); };
+const die = (e) => {
+    console.error(String(e instanceof Error ? e.message : e));
+    throw new FleetCliExit(1);
+};
 /** Exec a child with our stdio (logs/attach). */
 const passthrough = (cmd, args) => new Promise(resolve => {
     const c = spawnChild(cmd, args, { stdio: 'inherit' });
@@ -74,8 +81,9 @@ const passthrough = (cmd, args) => new Promise(resolve => {
 });
 const program = new Command()
     .name('ours-fleet')
-    .description('Fleet of persistent, identity-bound AI agents — selectable harnesses over ACP sessions.')
+    .description('Fleet of persistent, identity-bound AI agents over provider-neutral managed sessions.')
     .enablePositionalOptions()
+    .exitOverride()
     .version(VERSION);
 const cOpt = (cmd) => cmd.option('-c, --configuration <file>', 'manifest (default: ~/fleet.yaml; documents under ~/fleet/)');
 const collect = (value, previous) => [...previous, value];
@@ -144,8 +152,8 @@ const MAX_INVITE_BYTES = 48 * 1024;
 const MAX_OWNER_UPDATE_BYTES = 1_024;
 function ownerChannelStateDir(roleName, configuration) {
     const role = findRole(loadConfig(configuration), roleName);
-    if (role.session !== 'acp')
-        throw new Error(`role '${roleName}' uses session '${role.session}', but owner-channel management requires ACP`);
+    if (role.session !== 'acp' && role.session !== 'codex-app-server')
+        throw new Error(`role '${roleName}' uses session '${role.session}', but owner-channel management requires managed control`);
     if (!role.owner_channel)
         throw new Error(`role '${roleName}' has no owner_channel configured`);
     const stateDir = acpStateDir(roleName);
@@ -218,6 +226,24 @@ function parseCodexConfig(values) {
     }
     return out;
 }
+function parseAgentSelection(raw, kind) {
+    if (raw === undefined)
+        return undefined;
+    if (ROLE_NAME_RE.test(raw))
+        return { ref: raw };
+    if (!raw.startsWith('inline:'))
+        throw new Error(`invalid --${kind}; use a declared ID or inline:{...}`);
+    let value;
+    try {
+        value = JSON.parse(raw.slice('inline:'.length));
+    }
+    catch {
+        throw new Error(`invalid --${kind} inline mapping`);
+    }
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        throw new Error(`invalid --${kind} inline mapping`);
+    return { inline: value };
+}
 cOpt(program.command('config').description('validate + print the merged plan (no side effects)'))
     .option('--json', 'emit the stable, versioned, secret-safe resolved plan')
     .option('--yaml-mode <mode>', 'non-plain YAML policy: compat|strict', 'compat')
@@ -369,29 +395,26 @@ cOpt(program.command('force-restart [names...]').description('re-sync + bounce F
         die(e);
     }
 });
-program.command('ls').description('list running fleet sessions')
-    .action(async () => {
+cOpt(program.command('ls').description('list running declared persistent Agent sessions'))
+    .action(async (opts) => {
     const acp = [];
-    for (const root of [agentsRoot(), tmpRoot()]) {
-        if (!existsSync(root))
+    const cfg = loadConfig(opts.configuration);
+    for (const { name } of cfg.roles) {
+        const stateDir = agentDir(name);
+        if (!existsSync(controlSocketPath(stateDir)))
             continue;
-        for (const name of readdirSync(root)) {
-            const stateDir = joinPath(root, name);
-            if (!existsSync(controlSocketPath(stateDir)))
-                continue;
-            try {
-                const response = await controlRequest(stateDir, { command: 'status' }, 2_000);
-                const result = response.result;
-                if (response.ok && result?.alive) {
-                    // Activity, not readiness: an idle-readiness role may be running a
-                    // steered wake turn (FLEET-002), so `ls` reports what was observed.
-                    const observed = classifyActivity(result.activity);
-                    acp.push(`${name}: acp${observed.state === 'active' ? ' (working)'
-                        : observed.state === 'quiet' ? ' (no recent agent activity)' : ''}`);
-                }
+        try {
+            const response = await controlRequest(stateDir, { command: 'status' }, 2_000);
+            const result = response.result;
+            if (response.ok && result?.alive) {
+                // Activity, not readiness: an idle-readiness role may be running a
+                // steered wake turn (FLEET-002), so `ls` reports what was observed.
+                const observed = classifyActivity(result.activity);
+                acp.push(`${name}: acp${observed.state === 'active' ? ' (working)'
+                    : observed.state === 'quiet' ? ' (no recent agent activity)' : ''}`);
             }
-            catch { /* ignore stale sockets */ }
         }
+        catch { /* ignore stale sockets */ }
     }
     console.log(acp.join('\n') || '(none)');
 });
@@ -501,8 +524,9 @@ program.command('logs <name>').description('show the role log').option('-f, --fo
     const { cmd, args } = pickBackend().logsArgs(name, opts.follow === true);
     process.exit(await passthrough(cmd, args));
 });
-program.command('status <name>').description('unit/agent state')
-    .action(async (name) => {
+cOpt(program.command('status <name>').description('declared persistent Agent unit/session state'))
+    .action(async (name, opts) => {
+    findRole(loadConfig(opts.configuration), name);
     console.log(await pickBackend().status(name));
     // A role outlives the artifact that created it. If a different build is
     // reporting now, its settings may resolve differently than at creation.
@@ -556,7 +580,7 @@ program.command('status <name>').description('unit/agent state')
             }
         }
         catch {
-            console.log('session: acp control unavailable');
+            console.log('managed session control unavailable');
         }
     }
     // Loop health is asked of the live manager first: when its state writes are
@@ -712,13 +736,13 @@ cOpt(loopsCommand.command('status [role] [loop]').description('show live or stor
         loopFailure(error, opts.json === true);
     }
 });
-cOpt(loopsCommand.command('reload <role>').description('reload trusted scheduled-loop config in a live ACP role'))
+cOpt(loopsCommand.command('reload <role>').description('reload trusted scheduled-loop config in a live managed role'))
     .option('--json', 'emit stable JSON')
     .action(async (roleName, opts) => {
     try {
         const { role } = selectLoopConfig(opts.configuration, roleName);
-        if (role.session !== 'acp')
-            throw new Error(`role '${roleName}' is not ACP-compatible`);
+        if (role.session !== 'acp' && role.session !== 'codex-app-server')
+            throw new Error(`role '${roleName}' has no managed session control`);
         const stateDir = permanentLoopControlDir(roleName);
         if (!stateDir)
             throw new SessionControlError('control-unavailable', `role '${roleName}' has no live authenticated ACP control socket`);
@@ -743,8 +767,8 @@ for (const command of ['run-now', 'disable', 'enable']) {
         .action(async (roleName, loopName, opts) => {
         try {
             const { role, definitions } = selectLoopConfig(opts.configuration, roleName, loopName);
-            if (role.session !== 'acp')
-                throw new Error(`role '${roleName}' is not ACP-compatible`);
+            if (role.session !== 'acp' && role.session !== 'codex-app-server')
+                throw new Error(`role '${roleName}' has no managed session control`);
             const definition = definitions.find(loop => loop.name === loopName);
             if (command === 'enable' && !definition.enabled)
                 throw new Error(`loop '${loopName}' is disabled in YAML; edit the config before enabling it`);
@@ -1112,51 +1136,37 @@ cOpt(program.command('rm <name>').description('stop + remove a role (temporary e
     }
 });
 cOpt(program.command('spawn [name]').description('spawn a new agent (permanent by default)'))
-    .option('--role <name>', 'role name (alternative to the positional name)')
+    .option('--name <name>', 'agent name (alternative to the positional name)')
+    .option('--brain <selection>', 'Brain ID or inline:{...} definition')
+    .option('--role <selection>', 'Role ID or inline:{...} definition')
     .option('--temp', 'temporary: independent transient supervisor, archived on retirement, gone on reboot')
-    .option('--harness <id>', 'harness adapter (default: defaults.harness)')
-    .option('--session <backend>', 'session backend: acp (default: acp)')
-    .option('--mission <text>', 'one-line mission')
-    .option('--mission-file <path>', 'UTF-8 mission text (mutually exclusive with --mission)')
-    .option('--identity <name>', 'ours identity to bind (default: role name)')
+    .option('--identity <name>', 'ours identity to bind (default: Agent name)')
     .option('--cwd <dir>', 'working directory')
     .option('--coordinator <name>', 'announce target')
-    .option('--model <id>', 'model id to launch on (e.g. claude-fable-5); default: launcher default')
-    .option('--permission-mode <mode>', 'harness permission mode (Codex: untrusted|on-request|never; Claude: native values)')
     .option('--approval <mode>', 'fleet permission mode: ask|auto|allow (Codex ACP allow selects agent-full-access; deny is deprecated)')
     .option('--filesystem <mode>', 'common filesystem intent: read-only|workspace|unrestricted')
     .option('--unattended <mode>', 'permission behavior without a console: deny|wait')
-    .option('--sandbox <mode>', 'Codex sandbox: read-only|workspace-write|danger-full-access')
-    .option('--profile <name>', 'Codex profile file name ($CODEX_HOME/<name>.config.toml)')
-    .option('--launcher <mode>', 'Codex launcher: auto|ours-codex|codex (default: auto)')
-    .option('--search', 'enable Codex live web search')
-    .option('--codex-config <key=value>', 'Codex config override (repeatable)', collect, [])
-    .option('--add-dir <dir>', 'additional Codex writable directory (repeatable)', collect, [])
-    .option('--monitor', 'legacy: consent to arm Codex\'s native monitor (wake owner is monitor.mode in YAML)')
-    .option('--bio-file <file>', 'public bio (file)')
-    .option('--persona-file <file>', 'persona / operating contract (file)')
     .option('--isolation-file <path>', 'file holding an isolation: mapping (same schema as fleet.yaml)')
+    .option('--loops-file <path>', 'owner-only YAML containing exactly loops: for this temporary agent')
+    .option('--no-loops', 'explicitly disable temporary-agent loops')
     .option('--dry-run', 'validate and print without reserving or creating anything')
     .option('--json', 'with --dry-run, emit a stable secret-safe JSON result')
     .action(async (name, opts) => {
     try {
-        const roleName = String(name ?? opts.role ?? '');
+        const roleName = String(name ?? opts.name ?? '');
         if (!roleName)
-            throw new Error('role name is required (positional or --role)');
-        if (name && opts.role && name !== opts.role)
-            throw new Error(`positional role '${name}' conflicts with --role '${opts.role}'`);
+            throw new Error('agent name is required (positional or --name)');
+        if (name && opts.name && name !== opts.name)
+            throw new Error(`positional agent name conflicts with --name`);
         const o = {
-            name: roleName, temp: opts.temp, harness: opts.harness, session: opts.session, mission: opts.mission,
-            missionFile: opts.missionFile,
+            name: roleName, temp: opts.temp,
+            brain: parseAgentSelection(opts.brain, 'brain'), role: parseAgentSelection(opts.role, 'role'),
             identity: opts.identity, cwd: opts.cwd, coordinator: opts.coordinator,
-            model: opts.model,
-            permissionMode: opts.permissionMode, approval: opts.approval,
+            approval: opts.approval,
             filesystem: opts.filesystem, unattended: opts.unattended,
-            sandbox: opts.sandbox, profile: opts.profile,
-            launcher: opts.launcher, search: opts.search,
-            codexConfig: parseCodexConfig(opts.codexConfig), addDirs: opts.addDir, monitor: opts.monitor,
-            bioFile: opts.bioFile, personaFile: opts.personaFile,
             isolationFile: opts.isolationFile, configPath: opts.configuration,
+            loopsFile: opts.loopsFile, noLoops: opts.loops === false,
+            loopSource: opts.loopsFile || opts.loops === false ? 'cli' : 'omitted',
             dryRun: opts.dryRun, json: opts.json,
         };
         if (o.json && !o.dryRun)
@@ -1170,7 +1180,7 @@ cOpt(program.command('spawn [name]').description('spawn a new agent (permanent b
                 process.stdout.write(`${JSON.stringify({
                     schemaVersion: result.schemaVersion,
                     warning: result.warning,
-                    roleDocument: result.roleDocument,
+                    roleDocument: redactSensitive(result.roleDocument),
                     resolvedRole: resolvedRolePlan(result.resolvedRole),
                 }, null, 2)}\n`);
             }
@@ -1184,7 +1194,7 @@ cOpt(program.command('spawn [name]').description('spawn a new agent (permanent b
         if (proxyStateDir) {
             // Paths entered in the agent shell belong to that shell's cwd, not the
             // supervisor process. Normalize before crossing the control boundary.
-            for (const key of ['missionFile', 'bioFile', 'personaFile', 'isolationFile']) {
+            for (const key of ['isolationFile', 'loopsFile']) {
                 if (o[key])
                     o[key] = resolvePath(o[key]);
             }
@@ -1205,6 +1215,8 @@ cOpt(program.command('spawn [name]').description('spawn a new agent (permanent b
                 + `monitor=${result.monitor.mode} interrupt=${result.monitor.interrupt}`);
             if (result.inherited.length)
                 console.log(`  inherited omitted defaults from ${result.caller}: ${result.inherited.join(', ')}`);
+            if (result.configuration)
+                console.log(`  ${renderAgentConfiguration(result.configuration)}`);
             console.log(`→ watch it: ours-fleet peek ${result.role}   |   attach: ours-fleet attach ${result.role}`);
             return;
         }
@@ -1229,6 +1241,11 @@ cOpt(program.command('spawn [name]').description('spawn a new agent (permanent b
         }
         console.log(`  permission=${plannedPermissionMode.fleetMode} `
             + `native=${plannedPermissionMode.nativeMode}`);
+        console.log(`  ${renderAgentConfiguration(summarizeResolvedLaunch(created.plan.preview.resolvedRole, {
+            role: selectionOrigin(o.role ?? o.agentDefinition?.role),
+            brain: selectionOrigin(o.brain ?? o.agentDefinition?.brain),
+            permissionMode: plannedPermissionMode,
+        }))}`);
         console.log(`→ watch it: ours-fleet peek ${roleName}   |   attach: ours-fleet attach ${roleName}`);
     }
     catch (e) {
@@ -1248,15 +1265,83 @@ cOpt(program.command('doctor').description('prerequisite report'))
     });
     for (const c of rep.checks)
         console.log(`${c.ok ? 'ok  ' : 'MISS'} ${c.name.padEnd(22)} ${c.detail}`);
-    process.exit(rep.ok ? 0 : 1);
+    if (!rep.ok)
+        throw new FleetCliExit(1);
 });
-program.command('init').description('one-time host setup (units, dirs, linger)')
-    .action(async () => {
-    for (const d of [agentsRoot(), tmpRoot(), logsRoot()])
-        mkdirSync(d, { recursive: true });
-    for (const m of await pickBackend().init(binPath))
-        console.log(m);
-    console.log(INIT_COMPLETION_GUIDANCE);
+cOpt(program.command('init').description('interactively add missing Fleet defaults while preserving existing configuration'))
+    .action(async (opts) => {
+    const configuration = opts.configuration ?? defaultConfigPath();
+    if (!isInteractiveTerminal(process.stdin, process.stdout))
+        die('ours-fleet init requires an interactive terminal; no host setup ran and no configuration changed');
+    try {
+        const result = await executeInitWizard(new TerminalPrompter(process.stdin, process.stdout), configuration, {
+            async hostSetup() {
+                for (const d of [agentsRoot(), tmpRoot(), logsRoot()])
+                    mkdirSync(d, { recursive: true });
+                for (const message of await pickBackend().init(binPath))
+                    console.log(message);
+            },
+            publish: publishSetup,
+        });
+        if (!result) {
+            console.log('Fleet setup cancelled. No host setup ran and no configuration changed.');
+            return;
+        }
+        const prior = result.manifestExisted && result.rootExisted ? 'manifest and split configuration'
+            : result.manifestExisted ? 'manifest only'
+                : result.rootExisted ? 'split configuration only' : 'no previous targets';
+        console.log(`${result.replacedExisting ? 'Preserved existing files and added missing defaults to' : 'Created'} Fleet setup: ${result.configPath} and ${result.splitRoot}`);
+        console.log(`Previous targets: ${prior}.`);
+        console.log(`Private recovery record: ${result.recoveryPath}`);
+        console.log(INIT_COMPLETION_GUIDANCE);
+    }
+    catch (error) {
+        die(error);
+    }
+});
+cOpt(program.command('migrate-agent-templates')
+    .description('dry-run the exact legacy starter split; add --write to apply atomically')
+    .option('--write', 'apply the reviewed migration and retain a private recovery backup'))
+    .action((opts) => {
+    try {
+        const result = migrateLegacyStarterPresets(opts.configuration ?? defaultConfigPath(), { write: opts.write });
+        console.log(result.write ? 'Applied legacy starter migration.' : 'Dry run only; no files were changed.');
+        for (const move of result.moves)
+            console.log(`Move ${move.from} -> ${move.to}`);
+        for (const addition of result.additions)
+            console.log(`Add ${addition}`);
+        console.log(`Staging path: ${result.stagingPath}`);
+        console.log(`Recovery backup: ${result.backupPath}`);
+        if (!result.write)
+            console.log('Re-run with --write to apply this exact migration class.');
+    }
+    catch (error) {
+        die(error);
+    }
+});
+cOpt(program.command('migrate-role-defaults')
+    .description('dry-run adoption of exact revision-3 role defaults; add --write to apply atomically')
+    .option('--write', 'apply the reviewed migration and retain a private recovery backup'))
+    .action((opts) => {
+    try {
+        const result = migratePackagedRoleDefaults(opts.configuration ?? defaultConfigPath(), { write: opts.write });
+        console.log(result.write ? 'Applied packaged role-default migration.' : 'Dry run only; no files were changed.');
+        for (const path of result.removals)
+            console.log(`Remove ${path}`);
+        for (const path of result.replacements)
+            console.log(`Replace ${path}`);
+        for (const path of result.additions)
+            console.log(`Add ${path}`);
+        for (const path of result.preserved)
+            console.log(`Preserve customized ${path}`);
+        console.log(`Staging path: ${result.stagingPath}`);
+        console.log(`Recovery backup: ${result.backupPath}`);
+        if (!result.write)
+            console.log('Re-run with --write to adopt only these exact recognized defaults.');
+    }
+    catch (error) {
+        die(error);
+    }
 });
 const webCommand = cOpt(program.command('web').description('start or open the secure localhost fleet web console'))
     .enablePositionalOptions()
@@ -1497,4 +1582,84 @@ cOpt(program.command('_run-watchdogs', { hidden: true }))
         die(e);
     }
 });
-program.parseAsync(process.argv);
+async function parseFleetCli() {
+    const spawnIndex = process.argv.indexOf('spawn');
+    if (spawnIndex >= 0 && process.argv.slice(spawnIndex + 1).some(arg => arg === '--harness' || arg.startsWith('--harness=') || arg === '--model' || arg.startsWith('--model='))) {
+        console.error('error: --harness and --model were removed; select a Brain with --brain');
+        throw new FleetCliExit(1);
+    }
+    try {
+        await program.parseAsync(process.argv);
+    }
+    catch (error) {
+        const commander = error;
+        if (commander.exitCode === 0)
+            return;
+        if (typeof commander.exitCode === 'number')
+            throw new FleetCliExit(commander.exitCode, 'validation', 'not_started');
+        throw error;
+    }
+}
+async function runFleetCli() {
+    const stateDir = process.env[FLEET_PROXY_STATE_DIR_ENV];
+    const caller = process.env[FLEET_PROXY_CALLER_ENV];
+    if (!stateDir || !caller) {
+        await parseFleetCli();
+        return;
+    }
+    const requestId = randomUUID();
+    let attempt;
+    const begun = await controlRequest(stateDir, {
+        command: 'fleet_audit_begin', audit: { requestId, argv: process.argv.slice(2) },
+    });
+    if (!begun.ok)
+        throw new SessionControlError(begun.kind ?? 'rejected', begun.error ?? 'fleet command audit refused');
+    attempt = begun.result;
+    if (attempt.caller !== caller)
+        throw new SessionControlError('rejected', `fleet audit caller mismatch: expected '${caller}', got '${attempt.caller}'`);
+    let exitCode = 0;
+    let outcomeClass = 'success';
+    let effect = 'completed';
+    beginFleetAuditCollection();
+    if (attempt.classification.decision !== 'allow') {
+        exitCode = 1;
+        outcomeClass = 'denied';
+        effect = 'not_started';
+        console.error(`fleet supervisor proxy ${attempt.classification.decision}: ${attempt.classification.command}`);
+    }
+    else {
+        const originalExit = process.exit;
+        process.exit = ((code) => { throw new FleetCliExit(code ?? 0); });
+        try {
+            await parseFleetCli();
+        }
+        catch (error) {
+            exitCode = error instanceof FleetCliExit ? error.exitCode : 1;
+            outcomeClass = error instanceof FleetCliExit ? error.outcomeClass : 'runtime';
+            effect = error instanceof FleetCliExit ? error.effect : 'unknown';
+            if (!(error instanceof FleetCliExit))
+                console.error(error instanceof Error ? error.message : String(error));
+        }
+        finally {
+            process.exit = originalExit;
+        }
+    }
+    const metadata = consumeFleetAuditCollection();
+    if (metadata.failure) {
+        outcomeClass = metadata.failure.class;
+        effect = metadata.failure.effect;
+    }
+    const finished = await controlRequest(stateDir, { command: 'fleet_audit_finish', audit: {
+            correlationId: attempt.correlationId, class: outcomeClass, exitCode, effect,
+            ...(metadata.resourceIds ? { resourceIds: metadata.resourceIds } : {}),
+            ...(metadata.presentations ? { presentations: metadata.presentations } : {}),
+        } });
+    if (!finished.ok)
+        throw new SessionControlError(finished.kind ?? 'backend', finished.error ?? `audit delivery failed after execution; effect status=${effect}`);
+    process.exitCode = exitCode;
+}
+void runFleetCli().catch(error => {
+    if (!(error instanceof FleetCliExit))
+        console.error(error instanceof Error ? error.message : String(error));
+    process.exitCode = error instanceof FleetCliExit ? error.exitCode : 1;
+});

package/dist/config-yaml.d.ts

@@ -1,5 +1,5 @@
 export type YamlMode = 'compat' | 'strict';
-export type ConfigDiagnosticKind = 'anchor' | 'alias' | 'explicit-tag' | 'non-scalar-key' | 'multiple-documents';
+export type ConfigDiagnosticKind = 'anchor' | 'alias' | 'explicit-tag' | 'non-scalar-key' | 'multiple-documents' | 'deprecated-field';
 export interface ConfigDiagnostic {
     severity: 'warning';
     kind: ConfigDiagnosticKind;

package/dist/config.d.ts

@@ -1,7 +1,7 @@
 import { type ConfigDiagnostic, type YamlMode } from './config-yaml.js';
 import type { IsolationConfig, WrapContext } from './isolation/types.js';
 import type { ResolvedWatchdog } from './watchdog/config.js';
-import type { ResolvedLoop, ResolvedRoleLoop } from './loops/config.js';
+import type { AgentLoopsConfig, ResolvedLoop, ResolvedRoleLoop } from './loops/config.js';
 export interface OverseeEntry {
     agent: string;
     interval: string;
@@ -25,7 +25,8 @@ export declare const NOTIFY_EVENT_TYPES: readonly ["message_received", "file_rec
 export type NotifyEventType = (typeof NOTIFY_EVENT_TYPES)[number];
 export type InjectMode = 'notification' | 'full';
 export type MonitorMode = 'fleet' | 'native';
-export type SessionBackendId = 'acp';
+/** Concrete transport selected for a role. Keep provider-native transports explicit. */
+export type SessionBackendId = 'acp' | 'codex-app-server';
 /** Public, harness-neutral permission policy. */
 export type FleetPermissionMode = 'ask' | 'auto' | 'allow';
 /** `deny` is a deprecated, fail-closed compatibility alias retained for old fleet files. */
@@ -44,6 +45,10 @@ export interface SessionOptions {
         /** ACP agent command and arguments. Defaults are supplied by the harness adapter. */
         command?: string | string[];
     };
+    codex_app_server?: {
+        /** App-server command and arguments. Defaults to `codex app-server`. */
+        command?: string | string[];
+    };
 }
 /** Resolved per-role supervisor-monitor config. */
 export interface MonitorConfig {
@@ -137,6 +142,36 @@ export interface RoleConfig {
     worklog?: WorklogPolicyInput;
     auth_proxy?: Partial<AuthProxyConfig>;
 }
+export type AgentSelection<T extends Record<string, unknown> = Record<string, unknown>> = {
+    ref: string;
+} | {
+    inline: T;
+};
+/** Canonical authoring contract shared by configured, spawned, and room agents. */
+export interface AgentDefinition {
+    role: AgentSelection;
+    brain: AgentSelection;
+    permissions?: Partial<CommonPermissions>;
+    identity?: string;
+    cwd?: string;
+    coordinator?: string;
+    env?: Record<string, string>;
+    oversee?: OverseeEntry[];
+    isolation?: IsolationConfig;
+    monitor?: Partial<MonitorConfig>;
+    owner_channel?: OwnerChannelConfigInput;
+    worklog?: WorklogPolicyInput;
+    auth_proxy?: Partial<AuthProxyConfig>;
+    /** Scheduled turns scoped only to temporary launches; persistent Agents reject this field. */
+    loops?: AgentLoopsConfig;
+}
+/** Inert, reusable launch definition. It never owns an identity or runtime state. */
+export type AgentTemplateDefinition = Omit<AgentDefinition, 'identity'>;
+/** Explicit persistent instance reusing an inert template. */
+export interface AgentTemplateInstance {
+    template: string;
+    overrides?: Partial<AgentDefinition>;
+}
 /** Internal first-boot payload for a Fleet-provisioned Cowork room member. */
 export interface RoomMemberStartup {
     room_id: string;
@@ -147,6 +182,7 @@ export interface RoomMemberStartup {
     role: string;
     task: string;
     owner_seat_cid: string | null;
+    anonymous?: boolean;
 }
 export interface ResolvedRole extends Omit<RoleConfig, 'model' | 'owner_channel' | 'worklog'> {
     name: string;
@@ -168,9 +204,20 @@ export interface ResolvedRole extends Omit<RoleConfig, 'model' | 'owner_channel'
     worklog?: WorklogPolicy;
     auth_proxy?: AuthProxyConfig;
     loops?: ResolvedRoleLoop[];
+    /** Agent Template-local loops, kept separate from manifest loops until a temp launch. */
+    temporaryLoops?: ResolvedRoleLoop[];
+    /** Durable source of the temporary loop policy; internal and never user-authored. */
+    temporaryLoopSource?: 'agent-template' | 'cli' | 'omitted';
     provenance?: Record<string, FieldProvenance>;
     /** Internal/transient: never accepted as a user-authored RoleConfig key. */
     roomMemberStartup?: RoomMemberStartup;
+    /** Original unresolved selections only; denied operational fields never enter inheritance state. */
+    agentSelections?: Pick<AgentDefinition, 'role' | 'brain'>;
+    agentTemplate?: {
+        id: string;
+        sourceFile: string;
+        contentHash: string;
+    };
 }
 export interface FieldProvenance {
     sourceFile: string;
@@ -190,12 +237,20 @@ export interface FieldProvenance {
 }
 export interface FleetConfig {
     roles: ResolvedRole[];
+    /** Canonical, variable-resolved Agent authoring documents keyed by stable Agent ID. */
+    agentDefinitions?: Record<string, AgentDefinition>;
+    /** Canonical inert templates keyed by stable template ID. */
+    agentTemplates?: Record<string, AgentTemplateDefinition>;
+    rolePresets?: Record<string, Record<string, unknown>>;
+    brainPresets?: Record<string, Record<string, unknown>>;
+    /** Required launch-boundary resolver for effective temporary Agent definitions. */
+    resolveAgentDefinition?: (id: string, definition: AgentDefinition) => ResolvedRole;
     vars: Record<string, string>;
     defaults: Record<string, unknown>;
     files: string[];
     configMode?: 'split-v2';
     sourceDocuments?: Array<{
-        kind: 'Manifest' | 'Agent' | 'Role' | 'Brain';
+        kind: 'Manifest' | 'Agent' | 'AgentTemplate' | 'Role' | 'Brain' | 'RoomTemplate';
         id?: string;
         path: string;
     }>;
@@ -229,11 +284,28 @@ export declare function resolveRoleModel(model: string | null | undefined, harne
  */
 export declare function isolationContextFor(role: ResolvedRole): WrapContext;
 export declare const ROLE_NAME_RE: RegExp;
+export declare const ROLE_PRESET_KEYS: string[];
+export declare const BRAIN_PRESET_KEYS: string[];
+export declare const AGENT_KEYS: string[];
+type BarePreset = Record<string, unknown>;
+export declare function validateRoleValue(value: BarePreset, file: string, pointer: string): void;
+export declare function validateBrainValue(value: BarePreset, file: string, pointer: string): void;
+/** Pure launch-boundary validation for a fully resolved temporary Agent definition. */
+export declare function validateEffectiveAgentTemplate(definition: AgentTemplateDefinition, id?: string): AgentTemplateDefinition;
+export declare function assertBareKeys(value: unknown, allowed: string[], label: string): BarePreset;
 export declare function splitRootFor(base: string): string;
 /** Load a v2 manifest and bare Agent/Role/Brain documents from its stem directory. */
 export declare function loadConfig(configPath?: string, options?: {
     yamlMode?: YamlMode;
+    additionalAgent?: {
+        id: string;
+        definition: AgentDefinition;
+        temporary?: boolean;
+    };
+    skipWatchdogs?: boolean;
 }): FleetConfig;
+/** Full read-only Agent resolution used by launch dry-runs and room plan validation. */
+export declare function resolveAgentDefinitionDryRun(configPath: string, id: string, definition: AgentDefinition): ResolvedRole;
 /**
  * Canonical form of a 64-hex container ID for authorization decisions. Hex
  * case is not identity: two casings of one CID are the same peer, so every