@ours.network/fleet 1.1.0-nightly.9 → 1.1.1

package/dist/spawn.js

@@ -1,5 +1,5 @@
 import { spawn as spawnChild } from 'node:child_process';
-import { closeSync, existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { parse, stringify } from 'yaml';
 import { agentDir, defaultConfigPath } from './paths.js';
@@ -22,9 +22,12 @@ 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)
+            || o.unattended !== undefined || o.isolationFile !== undefined || o.monitorConfig !== undefined
+            || o.loopsFile !== undefined)
             throw new Error('canonical agentDefinition conflicts with separate Agent fields');
         const definition = structuredClone(o.agentDefinition);
+        if (o.noLoops === true && definition.loops !== undefined)
+            throw new Error('canonical agentDefinition loops conflict with explicit no-loops policy');
         if (o.identity)
             definition.identity = o.identity;
         return definition;
@@ -46,12 +49,21 @@ export function agentDefinitionFromSpawn(o) {
         ...(permissions ? { permissions } : {}),
         ...(o.isolationFile ? { isolation: readIsolationFile(o.isolationFile) } : {}),
         ...(o.monitorConfig ? { monitor: structuredClone(o.monitorConfig) } : {}),
+        ...(o.loopsFile ? { loops: readLoopsFile(o.loopsFile) } : {}),
     };
 }
 function resolvedSpawn(o) {
     const definition = agentDefinitionFromSpawn(o);
-    const cfg = loadConfig(o.configPath, { additionalAgent: { id: o.name, definition } });
-    return { definition, role: findRole(cfg, o.name) };
+    const cfg = loadConfig(o.configPath, {
+        additionalAgent: { id: o.name, definition, temporary: o.temp === true },
+    });
+    const role = findRole(cfg, o.name);
+    if (o.temp)
+        role.temporaryLoopSource = o.loopSource
+            ?? (role.temporaryLoops?.length ? 'agent-template' : 'omitted');
+    if (o.noLoops === true)
+        role.temporaryLoops = [];
+    return { definition, role };
 }
 /**
  * Read and validate an `--isolation-file`. The file is the existing
@@ -78,7 +90,37 @@ export function readIsolationFile(path) {
         throw new Error(`--isolation-file ${path}: ${problems.join('; ')}`);
     return cfg;
 }
+/** Read a private canonical temporary-loop override before any creation side effect. */
+export function readLoopsFile(path) {
+    const stat = lstatSync(path);
+    const uid = process.getuid?.();
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 1_000_000
+        || (uid !== undefined && stat.uid !== uid) || (stat.mode & 0o777) !== 0o600)
+        throw new Error(`${path}: loops file must be an owner-only regular file no larger than 1 MB`);
+    let raw;
+    try {
+        raw = parse(readFileSync(path, 'utf8'));
+    }
+    catch (error) {
+        throw new Error(`--loops-file ${path}: ${error.message}`);
+    }
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)
+        || !Object.hasOwn(raw, 'loops')
+        || Object.keys(raw).some(key => key !== 'loops'))
+        throw new Error(`${path}: expected exactly a top-level loops: mapping`);
+    const loops = raw.loops;
+    if (!loops || typeof loops !== 'object' || Array.isArray(loops)
+        || !Object.keys(loops).length)
+        throw new Error(`${path}: loops must be a non-empty mapping; use --no-loops to disable loops`);
+    return structuredClone(loops);
+}
 export function validateSpawnOpts(o) {
+    if (o.loopsFile && o.noLoops === true)
+        throw new Error('--loops-file and --no-loops are mutually exclusive');
+    if ((o.loopsFile || o.noLoops === true || o.agentDefinition?.loops !== undefined) && !o.temp)
+        throw new Error('temporary Agent loops require --temp');
+    if (o.loopsFile)
+        readLoopsFile(o.loopsFile);
     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))
@@ -102,7 +144,15 @@ export function validateSpawnOpts(o) {
  * by the reservation rather than by this function.
  */
 function assertNameFree(o) {
-    const cfg = loadConfig(o.configPath);
+    let cfg;
+    try {
+        cfg = loadConfig(o.configPath);
+    }
+    catch (error) {
+        if (error instanceof Error && error.message.includes(`resolve to duplicate identity '${effectiveIdentity(o)}'`))
+            throw new Error(`ours identity '${effectiveIdentity(o)}' is already taken or being created right now`);
+        throw error;
+    }
     if (cfg.roles.some(r => r.name === o.name))
         throw new Error(`role '${o.name}' already exists (${cfg.roles.find(r => r.name === o.name).sourceFile})`);
     if (existsSync(agentDir(o.name)) || existsSync(agentDir(o.name, true)))
@@ -141,7 +191,7 @@ export function spawnDryRun(o) {
  * `env`, `bio`, `persona` and `harness_options` are deliberately absent: the
  * record exists to be read, and must not become a place credentials collect.
  */
-function provenanceSettings(o, defaults) {
+function provenanceSettings(o, defaults, resolvedLoops = []) {
     const perms = (defaults.permissions ?? {});
     const callerDefaults = new Set(o.inheritedFromCaller ?? []);
     const tagged = (key, entry) => callerDefaults.has(key) ? { ...entry, source: 'caller-role' } : entry;
@@ -161,6 +211,16 @@ function provenanceSettings(o, defaults) {
             ? { value: 'declared via --isolation-file', source: 'cli' }
             : { value: defaults.isolation ? 'from fleet defaults' : undefined, source: defaults.isolation ? 'fleet-default' : 'built-in' },
         monitor: tagged('monitorConfig', provenanceOf(o.monitorConfig, defaults.monitor, { mode: 'fleet' })),
+        loops: {
+            value: o.noLoops ? { enabled: false, loops: [] }
+                : resolvedLoops.length ? resolvedLoops.map(loop => ({
+                    name: loop.name, enabled: loop.enabled, intervalMs: loop.intervalMs,
+                    initialDelayMs: loop.initialDelayMs, jitterMs: loop.jitterMs,
+                    prompt: { bytes: loop.promptBytes, sha256: loop.promptHash },
+                })) : 'omitted (legacy no temporary loops)',
+            source: o.loopSource === 'agent-template' ? 'agent-template'
+                : o.loopsFile || o.noLoops || o.loopSource === 'cli' ? 'cli' : 'built-in',
+        },
     };
 }
 /** Permanent spawn: persist one bare Agent document under the selected v2 root. */
@@ -168,6 +228,9 @@ export async function spawnPermanent(o, deps, creation = {}) {
     validateSpawnOpts(o);
     if (o.isolationFile)
         readIsolationFile(o.isolationFile); // fail before reserving
+    // Preserve the detailed owner/source diagnostic for an existing identity.
+    // The check is repeated inside the reservation boundary to close races.
+    assertNameFree(o);
     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.
@@ -221,7 +284,7 @@ export async function spawnPermanent(o, deps, creation = {}) {
         // launch still records how it was asked for.
         const provenance = buildProvenance({
             role: o.name, lifetime: 'permanent', fleetVersion: VERSION,
-            settings: provenanceSettings(o, cfg.defaults),
+            settings: provenanceSettings(o, cfg.defaults, prepared.role.temporaryLoops),
             surface: o.surface, creationActionId: o.creationActionId, callerRole: o.callerRole,
         });
         mkdirSync(agentDir(o.name), { recursive: true });
@@ -282,14 +345,19 @@ export async function spawnTemp(o, binPath, launch = independentSupervisor, crea
 }
 async function spawnTempInner(o, preparedRole, binPath, launch, tx, onStage) {
     const cfg = loadConfig(o.configPath);
+    const { temporaryLoops, ...launchRole } = preparedRole;
     const role = {
-        ...preparedRole, sourceFile: '(temp)', loops: undefined, roomMemberStartup: o.roomMemberStartup,
+        ...launchRole, sourceFile: '(temp)',
+        ...(o.noLoops === true ? { loops: [] }
+            : temporaryLoops?.length ? { loops: temporaryLoops } : { loops: undefined }),
+        temporaryLoopSource: o.loopSource ?? (temporaryLoops?.length ? 'agent-template' : 'omitted'),
+        roomMemberStartup: o.roomMemberStartup,
     };
     onStage?.('writing_role');
     const dir = applyRole(role, { temp: true, identityGuarantee: 'unverified' });
     const provenance = buildProvenance({
         role: o.name, lifetime: 'temporary', fleetVersion: VERSION,
-        settings: provenanceSettings(o, cfg.defaults),
+        settings: provenanceSettings(o, cfg.defaults, preparedRole.temporaryLoops),
         surface: o.surface, creationActionId: o.creationActionId, callerRole: o.callerRole,
     });
     writeProvenance(dir, provenance);

package/dist/web/fleet-config-service.d.ts

@@ -3,6 +3,7 @@ export declare const REDACTED_ENV_VALUE = "__OURS_FLEET_SECRET_REDACTED__";
 export interface EditableFleetModel {
     manifest: Record<string, unknown>;
     agents: Record<string, Record<string, unknown>>;
+    agent_templates: Record<string, Record<string, unknown>>;
 }
 export interface ConfigReadResult {
     path: string;

package/dist/web/fleet-config-service.js

@@ -12,7 +12,7 @@ import { isSensitiveConfigKey } from '../sensitive-config.js';
 export const REDACTED_ENV_VALUE = '__OURS_FLEET_SECRET_REDACTED__';
 const MAX_CONFIG_BYTES = 256 * 1024;
 const DIFF_CONTEXT_LINES = 3;
-const KINDS = ['agents', 'roles', 'brains', 'room_templates'];
+const KINDS = ['agents', 'agent_templates', 'roles', 'brains', 'room_templates'];
 const emptyReport = () => ({ ok: true, checks: [] });
 export class FleetConfigService {
     path;
@@ -176,7 +176,7 @@ function readSources(manifest) {
         }
         trustedDirectory(dir);
         for (const name of readdirSync(dir).sort()) {
-            if ((kind === 'agents' || kind === 'room_templates')
+            if ((kind === 'agents' || kind === 'agent_templates' || kind === 'room_templates')
                 && !['.yaml', '.yml'].includes(extname(name).toLowerCase()))
                 continue;
             documents.set(join(kind, name), trustedFile(join(dir, name)));
@@ -188,20 +188,26 @@ function modelFrom(sources) {
     const manifestKey = basename(sources.manifest);
     const manifest = parseFleetDocument(sources.manifest, sources.documents.get(manifestKey), 'strict').value;
     const agents = {};
+    const agent_templates = {};
     for (const [rel, source] of sources.documents)
         if (rel.startsWith(`agents/`)) {
             const id = basename(rel, extname(rel));
             agents[id] = parseFleetDocument(absoluteFor(sources.manifest, rel), source, 'strict').value;
         }
-    return { manifest, agents };
+    for (const [rel, source] of sources.documents)
+        if (rel.startsWith(`agent_templates/`)) {
+            const id = basename(rel, extname(rel));
+            agent_templates[id] = parseFleetDocument(absoluteFor(sources.manifest, rel), source, 'strict').value;
+        }
+    return { manifest, agents, agent_templates };
 }
 function assertModel(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         throw new FleetError('invalid_request', 'model must be an object');
     const input = value;
-    if (Object.keys(input).sort().join(',') !== 'agents,manifest')
-        throw new FleetError('invalid_request', 'model allows exactly manifest and agents');
-    for (const key of ['manifest', 'agents'])
+    if (Object.keys(input).sort().join(',') !== 'agent_templates,agents,manifest')
+        throw new FleetError('invalid_request', 'model allows exactly manifest, agents, and agent_templates');
+    for (const key of ['manifest', 'agents', 'agent_templates'])
         if (!input[key] || typeof input[key] !== 'object' || Array.isArray(input[key]))
             throw new FleetError('invalid_request', `${key} must be an object`);
     for (const [id, doc] of Object.entries(input.agents)) {
@@ -210,6 +216,12 @@ function assertModel(value) {
         if (!doc || typeof doc !== 'object' || Array.isArray(doc))
             throw new FleetError('invalid_request', `Agent '${id}' must be an object`);
     }
+    for (const [id, doc] of Object.entries(input.agent_templates)) {
+        if (!ROLE_NAME_RE.test(id))
+            throw new FleetError('invalid_request', `invalid Agent Template ID '${id}'`);
+        if (!doc || typeof doc !== 'object' || Array.isArray(doc))
+            throw new FleetError('invalid_request', `Agent Template '${id}' must be an object`);
+    }
     return structuredClone(input);
 }
 function renderProposal(current, model) {
@@ -222,6 +234,12 @@ function renderProposal(current, model) {
         next.set(oldRel ?? join('agents', `${id}.yaml`), oldRel
             ? render(current.documents.get(oldRel), doc) : stringify(doc));
     }
+    for (const [id, doc] of Object.entries(model.agent_templates).sort(([a], [b]) => a.localeCompare(b))) {
+        const oldRel = [...current.documents.keys()].find(rel => rel.startsWith('agent_templates/')
+            && basename(rel, extname(rel)) === id);
+        next.set(oldRel ?? join('agent_templates', `${id}.yaml`), oldRel
+            ? render(current.documents.get(oldRel), doc) : stringify(doc));
+    }
     for (const [rel, source] of current.documents)
         if (rel.startsWith('roles/') || rel.startsWith('brains/') || rel.startsWith('room_templates/'))
             next.set(rel, source);
@@ -425,7 +443,7 @@ function sourceSensitiveValues(sources) {
             continue;
         try {
             const parsed = parse(source);
-            values.push(...sensitiveValues({ manifest: {}, agents: { source: parsed } }));
+            values.push(...sensitiveValues({ manifest: {}, agents: { source: parsed }, agent_templates: {} }));
         }
         catch { /* the authoritative parser reports malformed YAML */ }
     }

package/dist/web/runtime.js

@@ -4,7 +4,7 @@ import { resolve } from 'node:path';
 import { loadConfig } from '../config.js';
 import { RoleRepository } from '../application/role-repository.js';
 import { FleetQueryService } from '../application/fleet-query-service.js';
-import { AcpRoleSessionAdapter } from '../application/session-control.js';
+import { RoleSessionControlAdapter } from '../application/session-control.js';
 import { StructuredLogService } from '../application/log-service.js';
 import { RoleCommandService } from '../application/role-command-service.js';
 import { RoleCreationService } from '../application/role-creation-service.js';
@@ -64,18 +64,22 @@ export async function startWebConsole(options) {
     const repository = new RoleRepository({
         configPath: options.configPath,
         probeBackend: async (name) => {
-            let acp = false;
+            let backend;
             const permanent = resolve(home(), '.ours-fleet', 'agents', name);
             const temporary = resolve(home(), '.ours-fleet', 'tmp', name);
             for (const dir of [permanent, temporary]) {
                 if (!existsSync(controlSocketPath(dir)))
                     continue;
                 try {
-                    acp = (await controlRequest(dir, { command: 'snapshot' }, 500)).ok;
+                    const response = await controlRequest(dir, { command: 'snapshot' }, 500);
+                    const snapshot = response.result;
+                    if (response.ok && (snapshot?.backend === 'acp'
+                        || snapshot?.backend === 'codex-app-server'))
+                        backend = snapshot.backend;
                 }
                 catch { /* stale socket is evidence, not reachability */ }
             }
-            return { acp };
+            return { backend };
         },
     });
     const events = new FleetEventBus();
@@ -161,11 +165,12 @@ export async function startWebConsole(options) {
                 const role = await repository.get(roleId);
                 if (!role)
                     throw new FleetError('role_not_found', `no such role '${roleId}'`);
-                if (role.configuredBackend === 'acp') {
+                if (role.configuredBackend === 'acp'
+                    || role.configuredBackend === 'codex-app-server') {
                     const dir = repository.stateDir(role);
                     if (!dir)
                         throw new FleetError('control_unavailable', 'role state directory is unavailable');
-                    return new AcpRoleSessionAdapter(dir);
+                    return new RoleSessionControlAdapter(dir);
                 }
                 throw new FleetError('capability_unavailable', 'role session backend is unavailable');
             },

package/dist/web/server.js

@@ -183,12 +183,39 @@ export async function buildWebServer(services, boundary, options = {}) {
             throw new FleetError('invalid_request', 'invalid task state filter');
         if (query.groupByList !== undefined && !['true', 'false'].includes(query.groupByList))
             throw new FleetError('invalid_request', 'groupByList must be true or false');
+        if (query.includeDeleting !== undefined && !['true', 'false'].includes(query.includeDeleting))
+            throw new FleetError('invalid_request', 'includeDeleting must be true or false');
         const state = query.state && query.state !== 'all' ? query.state : undefined;
-        const filter = { ...(state ? { state } : {}), ...(query.list ? { list: query.list } : {}) };
+        const filter = { ...(state ? { state } : {}), ...(query.list ? { list: query.list } : {}),
+            ...(query.includeDeleting === 'true' ? { includeDeleting: true } : {}) };
         return taskApi(() => query.groupByList === 'true'
             ? { groups: requireTaskRooms().groupedTasks(filter) }
             : { tasks: requireTaskRooms().listTasks(filter) });
     });
+    app.delete('/api/v1/tasks/:id', async (request, reply) => {
+        auth.authenticate(request, true);
+        const taskId = request.params.id;
+        const confirm = request.query.confirm;
+        // Exact-ID-twice confirmation is validated before existence or idempotency.
+        if (confirm !== taskId)
+            throw new FleetError('invalid_request', 'confirm must exactly repeat the task id');
+        const accepted = await taskApi(() => requireTaskRooms().requestTaskDeletion({
+            actor: { kind: 'local_control', surface: 'web' }, taskId,
+        }));
+        if (accepted.status === 'already_absent')
+            return { task_id: taskId, deleted: false, already_absent: true };
+        // Cleanup runs in an external worker outside the request lifecycle; the
+        // request waits boundedly and reports pending — never fabricated success.
+        const outcome = await requireTaskRooms().launchTaskDeletionWorker({ taskId, waitMs: 5_000 });
+        if (outcome.deleted)
+            return { task_id: taskId, deleted: true };
+        reply.code(202);
+        return {
+            task_id: taskId, accepted: true, deletion: 'pending',
+            ...(outcome.error ? { error: outcome.error } : {}),
+            recovery: `Repeat DELETE /api/v1/tasks/${taskId}?confirm=${taskId}.`,
+        };
+    });
     app.post('/api/v1/tasks', async (request, reply) => {
         auth.authenticate(request, true);
         const body = request.body;