@ours.network/fleet 1.2.0-nightly.5 → 1.2.0-nightly.51

package/dist/web/server.js

@@ -1,8 +1,14 @@
-import { existsSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { WorkspaceDeviceAuthError } from './workspace-devices.js';
+import { readFileSync } from 'node:fs';
+import { packagedPresetRoot } from '../preset-bootstrap.js';
+import { validateCatalog } from '../init-wizard.js';
+import { getAdapter } from '../harness/registry.js';
+import { storeAgentAttachment, attachmentPrompt, MAX_ATTACHMENT_BODY, readAgentAttachment, prepareAttachmentPresentation, presentAttachmentEvent } from './agent-attachments.js';
+import { readChatIdle } from '../temp-idle.js';
+import { agentDir } from '../paths.js';
+import { SupervisorOursTools } from '../application/supervisor-ours-tools.js';
+import { join } from 'node:path';
 import Fastify from 'fastify';
-import fastifyStatic from '@fastify/static';
 import fastifyWebsocket from '@fastify/websocket';
 import { createHmac, randomBytes } from 'node:crypto';
 import { FleetError, normalizeError } from '../application/errors.js';
@@ -13,6 +19,8 @@ import { FleetEventBus } from './events.js';
 import { ROLE_NAME_RE } from '../config.js';
 import { TaskListError } from '../rooms-tasks/task-lists.js';
 import { TaskStateError } from '../rooms-tasks/task-state.js';
+import { isProvider } from '../subscriptions/store.js';
+const ONBOARDING_WORK = ['coordination', 'development', 'review'];
 const statusFor = (code) => ({
     role_not_found: 404, resource_not_found: 404, unauthorized: 401, forbidden: 403, conflict: 409,
     idempotency_conflict: 409, stale_state: 409, rate_limited: 429,
@@ -33,29 +41,49 @@ export async function buildWebServer(services, boundary, options = {}) {
     app.addHook('onRequest', async (request, reply) => {
         reply.header('X-Content-Type-Options', 'nosniff');
         reply.header('Referrer-Policy', 'no-referrer');
-        reply.header('Permissions-Policy', 'camera=(), microphone=(), geolocation=(), payment=()');
-        reply.header('X-Frame-Options', 'DENY');
-        reply.header('Content-Security-Policy', `default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; ` +
-            `connect-src 'self' ${auth.secureCookies ? 'wss' : 'ws'}://${auth.host}; object-src 'none'; base-uri 'none'; ` +
-            `frame-ancestors 'none'; form-action 'self'; manifest-src 'self'; worker-src 'self'`);
+        reply.header('Permissions-Policy', 'camera=(), microphone=(self), geolocation=(), payment=()');
+        // Fleet serves an API only: nothing it returns may run, load or be framed as a page.
+        reply.header('Content-Security-Policy', "default-src 'none'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'");
         if (request.url.startsWith('/api/'))
             reply.header('Cache-Control', 'no-store');
-        try {
-            auth.validateBoundary(request, false);
-        }
-        catch (error) {
-            if (request.url.startsWith('/api/'))
-                throw error;
-            const message = normalizeError(error).message;
-            return reply.code(421).type('text/html').send(`<!doctype html><html><head><title>Fleet console address</title></head><body><main><h1>This fleet-console address is not configured</h1><p>${escapeHtml(message)}</p><p>For nginx or VPS access, configure an explicit public origin. The console does not guess proxy hosts.</p></main></body></html>`);
+        if (request.headers.origin === auth.appOrigin && request.url.startsWith('/api/')) {
+            reply.header('Access-Control-Allow-Origin', auth.appOrigin).header('Vary', 'Origin');
+            reply.header('Access-Control-Allow-Methods', 'GET,POST,PUT,PATCH,DELETE,OPTIONS');
+            reply.header('Access-Control-Expose-Headers', 'X-Ours-Workspace-Auth, X-Ours-Request-Id');
+            reply.header('Access-Control-Allow-Headers', 'Authorization,Content-Type,X-CSRF-Token,Idempotency-Key');
+            if (request.method === 'OPTIONS') {
+                auth.validateBoundary(request, false);
+                return reply.code(204).send();
+            }
         }
+        auth.validateBoundary(request, false);
+    });
+    app.post('/api/v1/layout-bindings/:id/control', async (request) => {
+        // Initial support is direct same-host Fleet-to-Fleet transport.
+        const forwarded = Object.keys(request.headers).some(name => name === 'forwarded' || name.startsWith('x-forwarded-') || name === 'x-real-ip' || name === 'via');
+        if (!['127.0.0.1', '::1', '::ffff:127.0.0.1'].includes(request.ip) || forwarded)
+            throw new FleetError('forbidden', 'layout bindings require direct loopback access');
+        // Machine credentials cannot authenticate browser or lifecycle routes.
+        if (request.headers.origin)
+            auth.validateBoundary(request, true);
+        if (!services.layoutBindings)
+            throw new FleetError('capability_unavailable', 'layout bindings unavailable');
+        return services.layoutBindings.control(request.params.id, request.headers.authorization, request.body);
     });
     app.setErrorHandler(async (error, request, reply) => {
-        const fleetError = normalizeError(error, request.id);
+        const privateToolParseError = ['/api/v1/roles/:id/ours/call', '/api/v1/layout-bindings/:id/control'].includes(request.routeOptions.url ?? '')
+            && error instanceof Error && 'code' in error
+            && typeof error.code === 'string' && error.code.startsWith('FST_ERR_CTP_');
+        const fleetError = normalizeError(privateToolParseError
+            ? new FleetError('invalid_request', 'expected a valid JSON tool request') : error, request.id);
         await audit.record({
             requestId: request.id, action: `${request.method} ${request.routeOptions.url ?? request.url}`,
             result: 'rejected', errorCode: fleetError.code,
         });
+        if (error instanceof WorkspaceDeviceAuthError)
+            reply.header('X-Ours-Workspace-Auth', 'rejected');
+        if (fleetError.code === 'unauthorized')
+            reply.header('X-Ours-Request-Id', request.id);
         reply.code(statusFor(fleetError.code)).send({ error: fleetError.toJSON() });
     });
     app.post('/api/v1/auth/exchange', async (request, reply) => {
@@ -96,6 +124,20 @@ export async function buildWebServer(services, boundary, options = {}) {
         const session = auth.authenticate(request);
         return { csrfToken: session.csrf, expiresAt: new Date(session.absoluteExpiresAt).toISOString() };
     });
+    app.get('/api/v1/workspace/identity', async () => auth.workspaceIdentity());
+    app.post('/api/v1/devices/enroll', async (request, reply) => {
+        reply.header('Cache-Control', 'no-store');
+        const input = request.body;
+        if (!input)
+            throw new FleetError('invalid_request', 'device enrollment body required');
+        return auth.enrollWorkspace(request, input);
+    });
+    app.post('/api/v1/devices/link', async (request) => {
+        const session = auth.authenticate(request, true);
+        return { version: 1, origin: auth.origin, ...auth.workspaceEnrollment(session.id) };
+    });
+    app.get('/api/v1/devices', async (request) => { auth.authenticate(request); return { devices: auth.listWorkspaceDevices() }; });
+    app.delete('/api/v1/devices/:id', async (request) => { auth.authenticate(request, true); auth.revokeWorkspaceDevice(request.params.id); return { revoked: true }; });
     app.get('/api/v1/meta', async (request) => {
         auth.authenticate(request);
         return {
@@ -106,6 +148,83 @@ export async function buildWebServer(services, boundary, options = {}) {
             auditDegraded: audit.degraded,
         };
     });
+    app.get('/api/v1/onboarding', async (request) => {
+        auth.authenticate(request);
+        // Opening an existing workspace needs configuration state, not CLI/account discovery.
+        // Keep the full report for the setup screens and older App clients.
+        if (request.query.view === 'state')
+            return { configured: onboardingConfigured() };
+        const harnesses = await Promise.all(['codex', 'claude-code'].map(async (harness) => {
+            try {
+                return { harness, ...await getAdapter(harness).checkPrereqs() };
+            }
+            catch {
+                return { harness, ok: false, checks: [{ name: 'availability', ok: false, detail: 'Harness checks unavailable' }] };
+            }
+        }));
+        const catalog = validateCatalog(JSON.parse(readFileSync(join(packagedPresetRoot(), 'brain-catalog.json'), 'utf8')));
+        // Codex models are offered only when the runtime itself listed them for the active account.
+        // When it could not be asked, none is offered and the reason is reported.
+        const codexModels = services.codexModels ? await services.codexModels() : undefined;
+        const offered = (model) => model.harness !== 'codex' || !codexModels || (codexModels.state === 'known' && codexModels.models.includes(model.model));
+        return { harnesses, catalog: catalog.models.filter(offered), ...(codexModels ? { codexModels: codexModels.state === 'known' ? { state: 'known' } : codexModels } : {}), providers: services.subscriptions ? await services.subscriptions.list() : [], coordinator: 'FleetCoordinator', configured: onboardingConfigured() };
+    });
+    // First-time setup is what creates the persistent coordinator. A configuration that loads and
+    // has it is set up, whatever its brains are called; its models are then changed by editing it.
+    const onboardingConfigured = () => {
+        if (!services.configuration)
+            return false;
+        try {
+            return Boolean(services.configuration.read(false).model.agents.FleetCoordinator);
+        }
+        catch {
+            return false;
+        }
+    };
+    let onboardingSetupQueue = Promise.resolve();
+    app.post('/api/v1/onboarding/setup', async (request) => {
+        auth.authenticate(request, true);
+        if (!services.configuration || !services.onboardingSetup)
+            throw new FleetError('capability_unavailable', 'first-time Fleet setup is unavailable');
+        const requested = request.body?.models;
+        const codexModels = services.codexModels ? await services.codexModels() : undefined;
+        const supported = validateCatalog(JSON.parse(readFileSync(join(packagedPresetRoot(), 'brain-catalog.json'), 'utf8'))).models
+            .filter(model => model.harness !== 'codex' || !codexModels || (codexModels.state === 'known' && codexModels.models.includes(model.model)));
+        const models = {};
+        for (const work of ONBOARDING_WORK) {
+            const matches = supported.filter(model => model.harness === requested?.[work]?.harness && model.model === requested?.[work]?.model);
+            if (matches.length !== 1)
+                throw new FleetError('invalid_request', `choose a supported model for ${work}`);
+            models[work] = matches[0];
+        }
+        const chosen = Object.values(models);
+        const subscriptions = [...new Set(chosen.map(model => model.harness === 'codex' ? 'codex' : 'claude'))];
+        const oneModel = new Set(chosen.map(model => `${model.harness}\0${model.model}`)).size === 1;
+        const configuration = services.configuration, setup = services.onboardingSetup;
+        // One setup at a time: the first-time check and the publication it guards must not interleave.
+        const run = onboardingSetupQueue.then(async () => {
+            if (onboardingConfigured())
+                throw new FleetError('conflict', 'Fleet is already set up; change its models in the configuration');
+            try {
+                await setup({ subscriptions, assignmentStrategy: oneModel ? 'one-model' : 'per-job', models, reasoning: 'balanced' });
+            }
+            catch (error) {
+                throw new FleetError('backend_failure', `Fleet setup did not complete: ${error.message}`);
+            }
+            // Setup preserves files it finds, so confirm the published models are the ones this request chose.
+            // The prepared agents reference packaged Brain presets, so resolve what each of them now points at:
+            // a preserved file of a packaged name may hold another model, session or reasoning than its name says.
+            const published = configuration.read(true).model, brains = published.brains ?? {};
+            const brainOf = (holder) => brains[String(holder?.brain?.ref ?? '')];
+            const assigned = { coordination: brainOf(published.agents.FleetCoordinator), development: brainOf(published.agent_templates?.Developer), review: brainOf(published.agent_templates?.Critic) };
+            for (const work of ONBOARDING_WORK)
+                if (assigned[work]?.harness !== models[work].harness || assigned[work]?.model !== models[work].model || assigned[work]?.session !== models[work].session || assigned[work]?.effort !== 'medium')
+                    throw new FleetError('conflict', 'Fleet was set up with different models; review its configuration');
+            return { configured: true };
+        });
+        onboardingSetupQueue = run.catch(() => { });
+        return run;
+    });
     app.get('/api/v1/creation-capabilities', async (request) => {
         auth.authenticate(request);
         return services.creation.capabilities();
@@ -128,7 +247,8 @@ export async function buildWebServer(services, boundary, options = {}) {
     });
     app.get('/api/v1/roles', async (request) => {
         auth.authenticate(request);
-        return { roles: await services.query.list() };
+        const query = request.query;
+        return { roles: await services.query.list(query.includeTemporary === 'true') };
     });
     const taskApi = async (fn) => {
         try {
@@ -141,6 +261,8 @@ export async function buildWebServer(services, boundary, options = {}) {
                         ? 'conflict' : 'invalid_request';
                 throw new FleetError(code, error.message);
             }
+            if (error instanceof TaskStateError && 'accepted' in error && error.accepted === false)
+                return Promise.reject(Object.assign(new FleetError('invalid_request', error.message), { memberNotAccepted: true }));
             if (error instanceof TaskStateError) {
                 throw new FleetError(error.message.startsWith('task not found:') ? 'resource_not_found' : 'conflict', error.message);
             }
@@ -188,9 +310,10 @@ export async function buildWebServer(services, boundary, options = {}) {
         const state = query.state && query.state !== 'all' ? query.state : undefined;
         const filter = { ...(state ? { state } : {}), ...(query.list ? { list: query.list } : {}),
             ...(query.includeDeleting === 'true' ? { includeDeleting: true } : {}) };
+        const api = requireTaskRooms();
         return taskApi(() => query.groupByList === 'true'
-            ? { groups: requireTaskRooms().groupedTasks(filter) }
-            : { tasks: requireTaskRooms().listTasks(filter) });
+            ? { groups: api.groupedTasks(filter).map(group => ({ ...group, tasks: group.tasks.map(task => api.withLayoutRooms(task)) })) }
+            : { tasks: api.listTasks(filter).map(task => api.withLayoutRooms(task)) });
     });
     app.delete('/api/v1/tasks/:id', async (request, reply) => {
         auth.authenticate(request, true);
@@ -221,12 +344,17 @@ export async function buildWebServer(services, boundary, options = {}) {
         const body = request.body;
         if (typeof body?.title !== 'string' || !body.title)
             throw new FleetError('invalid_request', 'title is required');
+        // Every task runs a saved Room Layout; rooms are never defined inline or from room templates here.
+        if (typeof body.layout !== 'string' || !body.layout)
+            throw new FleetError('invalid_request', 'layout is required: choose a room layout from Settings › Room layouts');
+        if (body.template !== undefined || body.noRoom !== undefined)
+            throw new FleetError('invalid_request', 'tasks use room layouts; template and noRoom are not accepted');
         const task = await taskApi(() => requireTaskRooms().createTask({
             actor: { kind: 'local_control', surface: 'web' }, title: body.title,
             brief: typeof body.brief === 'string' ? body.brief : undefined,
-            template: typeof body.template === 'string' ? body.template : undefined,
-            backlog: body.backlog === true, noRoom: body.noRoom === true,
+            backlog: body.backlog === true,
             list: typeof body.list === 'string' ? body.list : undefined,
+            layout: body.layout,
             idempotencyKey: typeof request.headers['idempotency-key'] === 'string'
                 ? request.headers['idempotency-key'] : undefined,
             origin: { type: 'web' },
@@ -240,11 +368,162 @@ export async function buildWebServer(services, boundary, options = {}) {
         const list = String(request.body?.list ?? '');
         return { task: await taskApi(() => requireTaskRooms().moveTask({ actor: { kind: 'local_control', surface: 'web' }, taskId, list })) };
     });
+    app.patch('/api/v1/tasks/:id/description', async (request) => {
+        auth.authenticate(request, true);
+        const body = request.body;
+        if (typeof body?.brief !== 'string' || typeof body.expectedBrief !== 'string' || body.brief.length > 100_000)
+            throw new FleetError('invalid_request', 'brief and expectedBrief must be strings; brief maximum is 100000 characters');
+        return { task: await taskApi(() => requireTaskRooms().editTaskDescription({
+                actor: { kind: 'local_control', surface: 'web' }, taskId: request.params.id,
+                brief: body.brief, expectedBrief: body.expectedBrief,
+            })) };
+    });
+    app.get('/api/v1/tasks/:id', async (request) => {
+        auth.authenticate(request);
+        return taskApi(() => requireTaskRooms().getTask(request.params.id));
+    });
+    app.post('/api/v1/tasks/:id/members', async (request, reply) => {
+        auth.authenticate(request, true);
+        const body = request.body;
+        try {
+            const result = await taskApi(() => requireTaskRooms().addMember(request.params.id, body));
+            reply.code(result.state === 'running' ? 202 : 200);
+            return result;
+        }
+        catch (error) {
+            if (error instanceof Error && 'memberNotAccepted' in error)
+                return reply.code(409).send({ error: { code: 'member_not_accepted', message: error.message }, accepted: false });
+            throw error;
+        }
+    });
+    app.get('/api/v1/tasks/:id/member-additions/:requestId', async (request) => {
+        auth.authenticate(request);
+        const { id, requestId } = request.params;
+        return taskApi(() => requireTaskRooms().memberAddition(id, requestId));
+    });
+    app.patch('/api/v1/tasks/:id/layout', async (request) => {
+        const session = auth.authenticate(request, true);
+        const body = request.body;
+        const name = (v) => typeof v === 'string' && v.length > 0;
+        if (!name(body?.layout) || !(body.expectedLayout === null || name(body.expectedLayout)))
+            throw new FleetError('invalid_request', 'layout must be a layout name; expectedLayout a layout name or null');
+        const task = await taskApi(() => requireTaskRooms().setTaskLayout({ actor: { kind: 'local_control', surface: 'web' },
+            taskId: request.params.id, layout: body.layout, expectedLayout: body.expectedLayout }));
+        await audit.record({ requestId: request.id, browser: session.id, action: 'task.layout.set', result: 'succeeded' });
+        return { task: requireTaskRooms().withLayoutRooms(task) };
+    });
+    app.get('/api/v1/tasks/:id/layout', async (request) => {
+        auth.authenticate(request);
+        return { layout: await taskApi(async () => requireTaskRooms().taskLayout(request.params.id)) };
+    });
+    for (const operation of ['open', 'close']) {
+        app.post(`/api/v1/tasks/:id/layout/rooms/:room/${operation}`, async (request, reply) => {
+            const session = auth.authenticate(request, true);
+            const { id, room } = request.params;
+            const accepted = await taskApi(() => requireTaskRooms().launchTaskLayoutOperation({
+                actor: { kind: 'local_control', surface: 'web' }, taskId: id, room,
+                operation: operation === 'open' ? 'open' : 'close-room',
+            }));
+            await audit.record({ requestId: request.id, browser: session.id, action: `task.layout.${operation}`, result: 'succeeded' });
+            reply.code(202);
+            return { operation: accepted };
+        });
+    }
+    app.post('/api/v1/tasks/:id/layout/cleanup', async (request, reply) => {
+        auth.authenticate(request, true);
+        const accepted = await taskApi(() => requireTaskRooms().retryTaskLayoutCleanup({
+            actor: { kind: 'local_control', surface: 'web' }, taskId: request.params.id,
+        }));
+        reply.code(202);
+        return { operation: accepted };
+    });
+    app.get('/api/v1/task-templates', async (request) => {
+        auth.authenticate(request);
+        return { templates: requireTaskRooms().listTemplates() };
+    });
+    const layouts = () => {
+        if (!services.roomLayouts)
+            throw new FleetError('capability_unavailable', 'room layout editing is unavailable');
+        return services.roomLayouts;
+    };
+    app.get('/api/v1/room-layouts', async (request) => {
+        auth.authenticate(request);
+        const list = layouts().list(), defaultLayout = layouts().defaultLayout(list);
+        return { layouts: list, ...(defaultLayout ? { default_layout: defaultLayout } : {}) };
+    });
+    app.post('/api/v1/room-layouts/validate', async (request) => {
+        auth.authenticate(request, true);
+        return layouts().validate(request.body?.definition);
+    });
+    app.put('/api/v1/room-layouts/:name', async (request) => {
+        const session = auth.authenticate(request, true);
+        const body = request.body;
+        if (typeof body?.revision !== 'string')
+            throw new FleetError('invalid_request', 'revision is required');
+        const result = await layouts().save(request.params.name, body.revision, body.definition);
+        events.publish('room_layouts.changed', { name: result.name, revision: result.revision });
+        await audit.record({ requestId: request.id, browser: session.id, action: 'room_layout.save', result: 'succeeded' });
+        return result;
+    });
+    app.delete('/api/v1/room-layouts/:name', async (request) => {
+        const session = auth.authenticate(request, true);
+        const revision = request.query.revision;
+        if (typeof revision !== 'string' || !revision)
+            throw new FleetError('invalid_request', 'revision is required');
+        const result = await layouts().remove(request.params.name, revision);
+        events.publish('room_layouts.changed', { name: result.name });
+        await audit.record({ requestId: request.id, browser: session.id, action: 'room_layout.delete', result: 'succeeded' });
+        return result;
+    });
+    for (const action of ['start', 'block', 'unblock', 'review', 'finish', 'cancel']) {
+        app.post(`/api/v1/tasks/:id/${action}`, async (request, reply) => {
+            auth.authenticate(request, true);
+            const taskId = request.params.id;
+            const body = (request.body ?? {});
+            const input = { actor: { kind: 'local_control', surface: 'web' }, taskId };
+            const api = requireTaskRooms();
+            return taskApi(async () => {
+                switch (action) {
+                    case 'start': {
+                        // A task's layout can be chosen or changed but never removed, so this check cannot go stale.
+                        if (!api.getTask(taskId).task.layout)
+                            throw new FleetError('conflict', 'choose a room layout for this task before starting it');
+                        const task = await api.startTask(input);
+                        const provisioning = await api.launchTaskProvisioning(taskId);
+                        if (provisioning.kind !== 'ready')
+                            reply.code(202);
+                        return { task, provisioning };
+                    }
+                    case 'block':
+                        if (typeof body.reason !== 'string' || !body.reason.trim())
+                            throw new FleetError('invalid_request', 'reason is required');
+                        return { task: api.blockTask({ ...input, reason: body.reason }) };
+                    case 'unblock': return { task: api.unblockTask(input) };
+                    case 'review': return { task: api.reviewTask(input) };
+                    case 'finish':
+                    case 'cancel': {
+                        const plan = action === 'finish' ? await api.finishTask(input) : await api.cancelTask(input);
+                        const task = plan.settlementRequired ? await api.launchTaskSettlement(taskId) : plan.task;
+                        const pending = task.terminal_intent?.status === 'pending';
+                        if (pending)
+                            reply.code(202);
+                        return { task, pending };
+                    }
+                }
+            });
+        });
+    }
+    app.get('/api/v1/configuration/provenance', async (request) => {
+        auth.authenticate(request);
+        if (!services.presetProvenance)
+            throw new FleetError('capability_unavailable', 'preset provenance is unavailable');
+        return { provenance: services.presetProvenance.read() };
+    });
     app.get('/api/v1/configuration', async (request) => {
         auth.authenticate(request);
         if (!services.configuration)
             throw new FleetError('capability_unavailable', 'fleet configuration editing is unavailable');
-        return services.configuration.read();
+        return services.configuration.read(request.query.includeDefinitions === 'true');
     });
     app.post('/api/v1/configuration/preview', async (request) => {
         auth.authenticate(request, true);
@@ -265,6 +544,86 @@ export async function buildWebServer(services, boundary, options = {}) {
         });
         return result;
     });
+    // Claude Code / Codex subscription profiles. Responses carry account metadata
+    // only; token values never leave the CLI-owned credential files.
+    const subscriptions = () => {
+        if (!services.subscriptions)
+            throw new FleetError('capability_unavailable', 'subscription management is unavailable');
+        return services.subscriptions;
+    };
+    const provider = (raw) => {
+        if (!isProvider(raw))
+            throw new FleetError('invalid_request', 'unknown subscription provider');
+        return raw;
+    };
+    const subscriptionsChanged = () => events.publish('subscription.changed', {});
+    app.get('/api/v1/subscriptions', async (request) => {
+        auth.authenticate(request);
+        return { providers: await subscriptions().list() };
+    });
+    app.post('/api/v1/subscriptions/:provider/logins', async (request, reply) => {
+        const session = auth.authenticate(request, true);
+        const login = await subscriptions().startLogin(provider(request.params.provider), session.id);
+        await audit.record({ requestId: request.id, browser: session.id, action: `subscription.login.${request.params.provider}`, result: login.state });
+        reply.code(201);
+        return login;
+    });
+    app.get('/api/v1/subscriptions/:provider/logins/:loginId', async (request) => {
+        const session = auth.authenticate(request);
+        return subscriptions().login(request.params.loginId, session.id).view();
+    });
+    app.post('/api/v1/subscriptions/:provider/logins/:loginId/code', async (request) => {
+        const session = auth.authenticate(request, true);
+        const code = request.body?.code;
+        if (typeof code !== 'string')
+            throw new FleetError('invalid_request', 'code is required');
+        const login = subscriptions().login(request.params.loginId, session.id);
+        login.submitCode(code.trim());
+        await audit.record({ requestId: request.id, browser: session.id, action: `subscription.login.code.${request.params.provider}`, result: 'submitted' });
+        return login.view();
+    });
+    app.delete('/api/v1/subscriptions/:provider/logins/:loginId', async (request) => {
+        const session = auth.authenticate(request, true);
+        const login = subscriptions().login(request.params.loginId, session.id);
+        login.cancel();
+        return login.view();
+    });
+    app.post('/api/v1/subscriptions/:provider/active', async (request) => {
+        const session = auth.authenticate(request, true);
+        const profileId = request.body?.profileId;
+        if (typeof profileId !== 'string')
+            throw new FleetError('invalid_request', 'profileId is required');
+        const view = await subscriptions().setActive(provider(request.params.provider), profileId);
+        subscriptionsChanged();
+        await audit.record({ requestId: request.id, browser: session.id, action: `subscription.activate.${request.params.provider}`, result: 'succeeded' });
+        return view;
+    });
+    app.post('/api/v1/subscriptions/:provider/profiles/:profileId/check', async (request) => {
+        auth.authenticate(request, true);
+        return subscriptions().check(provider(request.params.provider), request.params.profileId);
+    });
+    app.post('/api/v1/subscriptions/claude/profiles/:profileId/probe', async (request) => {
+        const session = auth.authenticate(request, true);
+        const usage = await subscriptions().probeClaudeUsage(request.params.profileId);
+        await audit.record({ requestId: request.id, browser: session.id, action: 'subscription.usage.probe.claude', result: usage.source });
+        return { usage };
+    });
+    app.patch('/api/v1/subscriptions/:provider/profiles/:profileId', async (request) => {
+        auth.authenticate(request, true);
+        const label = request.body?.label;
+        if (typeof label !== 'string')
+            throw new FleetError('invalid_request', 'label is required');
+        await subscriptions().rename(provider(request.params.provider), request.params.profileId, label);
+        subscriptionsChanged();
+        return { ok: true };
+    });
+    app.delete('/api/v1/subscriptions/:provider/profiles/:profileId', async (request) => {
+        const session = auth.authenticate(request, true);
+        await subscriptions().remove(provider(request.params.provider), request.params.profileId);
+        subscriptionsChanged();
+        await audit.record({ requestId: request.id, browser: session.id, action: `subscription.remove.${request.params.provider}`, result: 'succeeded' });
+        return { ok: true };
+    });
     app.get('/api/v1/topology', async (request) => {
         auth.authenticate(request);
         if (!services.topology)
@@ -311,9 +670,41 @@ export async function buildWebServer(services, boundary, options = {}) {
         });
         return result;
     });
+    const oursTools = services.oursTools ?? new SupervisorOursTools();
+    app.get('/api/v1/roles/:id/contacts', async (request) => {
+        auth.authenticate(request);
+        const control = await services.session(request.params.id);
+        if (!control.agentContacts)
+            throw new FleetError('capability_unavailable', 'Supervisor contacts API is unavailable');
+        return control.agentContacts();
+    });
+    app.get('/api/v1/roles/:id/messages', async (request) => {
+        auth.authenticate(request);
+        const control = await services.session(request.params.id);
+        if (!control.agentHistory)
+            throw new FleetError('capability_unavailable', 'Supervisor history API is unavailable');
+        return control.agentHistory({ peer_cid: request.query.peer_cid, ...(request.query.limit !== undefined ? { limit: Number(request.query.limit) } : {}), ...(request.query.before_seq !== undefined ? { before_seq: Number(request.query.before_seq) } : {}) });
+    });
+    app.get('/api/v1/roles/:id/ours/tools', async (request) => {
+        auth.authenticate(request);
+        return oursTools.list(request.params.id);
+    });
+    app.post('/api/v1/roles/:id/ours/call', async (request) => {
+        const session = auth.authenticate(request, true);
+        const result = await oursTools.call(request.params.id, request.body);
+        await audit.record({ requestId: request.id, browser: session.id,
+            action: 'ours.call', result: result.result.isError === true ? 'tool_error' : 'succeeded' });
+        return result;
+    });
     app.get('/api/v1/roles/:id', async (request) => {
         auth.authenticate(request);
-        return services.query.detail(request.params.id);
+        const detail = await services.query.detail(request.params.id);
+        return { ...detail, chatIdle: detail.role.lifetime === 'temporary' ? readChatIdle(agentDir(request.params.id, true)) ?? null : null };
+    });
+    app.get('/api/v1/roles/:id/voice-capabilities', async (request) => {
+        auth.authenticate(request);
+        const descriptor = await (await services.session(request.params.id)).describe();
+        return { supported: ['generation_bound_prompts', 'idle_bound_prompts', 'targeted_voice_interrupt'].every(f => descriptor.features.includes(f)) };
     });
     app.get('/api/v1/roles/:id/removal-preview', async (request) => {
         auth.authenticate(request);
@@ -348,15 +739,81 @@ export async function buildWebServer(services, boundary, options = {}) {
         const control = await services.session(request.params.id);
         if (!control.conversationPage)
             throw new FleetError('capability_unavailable', 'this role has no conversation ledger');
-        return control.conversationPage({
-            after: request.query.after,
-            limit: request.query.limit ? Number(request.query.limit) : undefined,
-        });
+        const limit = request.query.limit ? Number(request.query.limit) : undefined;
+        // `latest` / `before` page backwards from the newest event; `after` pages forward for live updates.
+        const backward = request.query.latest === '1' || request.query.before !== undefined;
+        if (backward && request.query.after !== undefined)
+            throw new FleetError('invalid_request', 'after cannot be combined with latest or before');
+        if (backward && !control.conversationTail)
+            throw new FleetError('capability_unavailable', 'this role cannot page its conversation backwards');
+        const role = await services.repository.get(request.params.id);
+        const stateDir = role ? services.repository.stateDir(role) : undefined;
+        const present = (event) => presentAttachmentEvent(stateDir, request.params.id, event);
+        if (backward) {
+            const page = await control.conversationTail({ before: request.query.before, limit });
+            return { ...page, events: page.events.map(present), context: page.context.map(present) };
+        }
+        const page = await control.conversationPage({ after: request.query.after, limit });
+        return { ...page, events: page.events.map(present) };
+    });
+    app.get('/api/v1/roles/:id/attachments/:attachmentId', async (request, reply) => {
+        auth.authenticate(request);
+        const role = await services.repository.get(request.params.id);
+        if (!role)
+            throw new FleetError('role_not_found', 'Agent not found');
+        const stateDir = services.repository.stateDir(role);
+        if (!stateDir)
+            throw new FleetError('capability_unavailable', 'Agent file storage is unavailable');
+        const { record, bytes } = readAgentAttachment(stateDir, request.params.attachmentId);
+        const image = /^image\/(png|jpeg|gif|webp|avif)$/.test(record.mimeType);
+        reply.header('Cache-Control', 'private, no-store');
+        reply.header('X-Content-Type-Options', 'nosniff');
+        reply.header('Content-Security-Policy', "default-src 'none'; sandbox");
+        reply.header('Content-Disposition', `${image ? 'inline' : 'attachment'}; filename*=UTF-8''${encodeURIComponent(record.name).replace(/'/g, '%27')}`);
+        return reply.type(image ? record.mimeType : 'application/octet-stream').send(bytes);
+    });
+    app.post('/api/v1/roles/:id/attachments', { bodyLimit: MAX_ATTACHMENT_BODY }, async (request) => {
+        auth.authenticate(request, true);
+        const role = await services.repository.get(request.params.id);
+        if (!role)
+            throw new FleetError('role_not_found', 'Agent not found');
+        const stateDir = services.repository.stateDir(role);
+        if (!stateDir)
+            throw new FleetError('capability_unavailable', 'Agent file storage is unavailable');
+        const body = request.body;
+        if (typeof body?.expectedSessionGeneration !== 'string' || !body.expectedSessionGeneration.trim())
+            throw new FleetError('invalid_request', 'expectedSessionGeneration is required for attachments');
+        const control = await services.session(request.params.id);
+        if (!control.conversationPage || !control.submitPromptV2)
+            throw new FleetError('capability_unavailable', 'Session-bound attachments are unavailable');
+        const page = await control.conversationPage({ limit: 1 });
+        if (page.snapshot.sessionGeneration !== body.expectedSessionGeneration)
+            throw new FleetError('stale_state', 'Agent session changed. Select the files again.');
+        return storeAgentAttachment(stateDir, body.expectedSessionGeneration, request.body);
     });
     app.post('/api/v1/roles/:id/input', async (request, reply) => {
         const session = auth.authenticate(request, true);
         const body = request.body;
-        const text = String(body?.text ?? '');
+        if (body?.expectedSessionGeneration !== undefined && (typeof body.expectedSessionGeneration !== 'string' || !body.expectedSessionGeneration.trim()))
+            throw new FleetError('invalid_request', 'expectedSessionGeneration must be a nonempty string');
+        if (body?.requireIdle !== undefined && typeof body.requireIdle !== 'boolean')
+            throw new FleetError('invalid_request', 'requireIdle must be boolean');
+        let text = String(body?.text ?? '');
+        if (body?.attachments !== undefined) {
+            if (typeof body.commandId !== 'string' || !body.commandId.trim())
+                throw new FleetError('invalid_request', 'commandId is required for attachments');
+            if (typeof body.expectedSessionGeneration !== 'string' || !body.expectedSessionGeneration.trim())
+                throw new FleetError('invalid_request', 'expectedSessionGeneration is required for attachments');
+            const role = await services.repository.get(request.params.id);
+            if (!role)
+                throw new FleetError('role_not_found', 'Agent not found');
+            const stateDir = services.repository.stateDir(role);
+            if (!stateDir)
+                throw new FleetError('capability_unavailable', 'Agent file storage is unavailable');
+            const originalText = text;
+            text = attachmentPrompt(stateDir, body.expectedSessionGeneration, body.attachments, text);
+            prepareAttachmentPresentation(stateDir, body.expectedSessionGeneration, body.commandId, body.attachments, originalText, text);
+        }
         const commandId = typeof body?.commandId === 'string' && body.commandId.trim()
             ? body.commandId : undefined;
         const control = await services.session(request.params.id);
@@ -367,6 +824,7 @@ export async function buildWebServer(services, boundary, options = {}) {
             const admittedCommandId = commandId ?? randomBytes(16).toString('hex');
             const receipt = await control.submitPromptV2({
                 commandId: admittedCommandId, text, source: 'owner_admin_console',
+                expectedSessionGeneration: body.expectedSessionGeneration, requireIdle: body.requireIdle === true,
                 actorBrowserSession: createHmac('sha256', digestKey).update(session.id).digest('hex').slice(0, 24),
             });
             await audit.record({
@@ -378,6 +836,8 @@ export async function buildWebServer(services, boundary, options = {}) {
             reply.code(202);
             return receipt;
         }
+        if (body.expectedSessionGeneration !== undefined || body.requireIdle)
+            throw new FleetError('capability_unavailable', 'session-bound voice input is unavailable for this role');
         const receipt = await control.sendText(text);
         await audit.record({
             requestId: request.id, browser: session.id, roleId: request.params.id,
@@ -393,6 +853,16 @@ export async function buildWebServer(services, boundary, options = {}) {
         const commandId = typeof body?.commandId === 'string' && body.commandId.trim()
             ? body.commandId : undefined;
         const control = await services.session(request.params.id);
+        if (body?.expectedSessionGeneration !== undefined || body?.promptId !== undefined) {
+            if (!commandId || typeof body.expectedSessionGeneration !== 'string' || !body.expectedSessionGeneration.trim() || typeof body.promptId !== 'string' || !body.promptId.trim())
+                throw new FleetError('invalid_request', 'Targeted interrupt requires commandId, expectedSessionGeneration and promptId');
+            if (!control.interruptPromptV2)
+                throw new FleetError('capability_unavailable', 'Targeted voice interrupt is unavailable');
+            const receipt = await control.interruptPromptV2({ commandId, expectedSessionGeneration: body.expectedSessionGeneration, promptId: body.promptId });
+            await audit.record({ requestId: request.id, browser: session.id, roleId: request.params.id, action: 'session.interrupt_voice', result: 'accepted' });
+            reply.code(202);
+            return receipt;
+        }
         if (commandId && control.interruptV2) {
             const receipt = await control.interruptV2(commandId);
             await audit.record({
@@ -443,10 +913,22 @@ export async function buildWebServer(services, boundary, options = {}) {
         const body = request.body;
         if (!body.action || !['start', 'stop', 'restart_resume', 'restart_fresh'].includes(body.action))
             throw new FleetError('invalid_request', 'invalid lifecycle action');
-        const receipt = await services.commands.execute({
-            roleId: request.params.id, action: body.action,
-            actionId: body.actionId, confirmation: body.confirmation,
-        });
+        let receipt;
+        try {
+            receipt = await services.commands.execute({
+                roleId: request.params.id, action: body.action,
+                actionId: body.actionId, confirmation: body.confirmation,
+            });
+        }
+        catch (error) {
+            // An existing receipt always wins: a conflicting/repeated action is not a
+            // proof that the original operation was never admitted.
+            if (typeof body.actionId === 'string' && !services.commands.get(body.actionId)) {
+                const normalized = normalizeError(error);
+                return reply.code(409).send({ error: { code: 'action_not_accepted', message: normalized.message }, accepted: false });
+            }
+            throw error;
+        }
         events.publish('action.changed', receipt, request.params.id);
         reply.code(202);
         return receipt;
@@ -465,6 +947,70 @@ export async function buildWebServer(services, boundary, options = {}) {
             throw new FleetError('role_not_found', 'creation action not found');
         return action;
     });
+    // A fetch stream works through the same authenticated workspace transport as
+    // ordinary requests, and owns one ACP controller until its browser disconnects.
+    app.post('/api/v1/roles/:id/live-presence', async (request, reply) => {
+        const browser = auth.authenticate(request, true);
+        const generation = request.body?.expectedSessionGeneration;
+        if (typeof generation !== 'string' || !generation.trim())
+            throw new FleetError('invalid_request', 'expectedSessionGeneration is required');
+        const control = await services.session(request.params.id);
+        if (!control.followConversation || !control.conversationPage)
+            throw new FleetError('capability_unavailable', 'Live voice requires a conversation controller');
+        const page = await control.conversationPage({ limit: 1 });
+        if (page.snapshot.sessionGeneration !== generation)
+            throw new FleetError('stale_state', 'Agent session changed. Start live voice again.');
+        // Session/page discovery can await I/O; recheck revocation before attaching.
+        auth.authenticate(request, true);
+        if (reply.raw.destroyed)
+            return;
+        reply.hijack();
+        for (const [name, value] of Object.entries(reply.getHeaders()))
+            if (value !== undefined)
+                reply.raw.setHeader(name, Array.isArray(value) ? value : String(value));
+        reply.raw.writeHead(200, { 'Content-Type': 'application/x-ndjson', 'Cache-Control': 'no-store', 'X-Accel-Buffering': 'no' });
+        let ended = false;
+        let follow;
+        let heartbeat;
+        let unbind;
+        const close = () => { if (ended)
+            return; ended = true; unbind?.(); if (heartbeat)
+            clearInterval(heartbeat); follow?.close(); reply.raw.end(); };
+        const write = (value) => { if (!ended && !reply.raw.write(JSON.stringify(value) + '\n'))
+            close(); };
+        reply.raw.once('close', close);
+        unbind = auth.bindTransport(browser.id, close);
+        try {
+            follow = await control.followConversation({
+                after: page.nextCursor,
+                onPage: current => { if (current.snapshot.sessionGeneration !== generation) {
+                    write({ error: 'Agent session changed. Start live voice again.' });
+                    close();
+                }
+                else
+                    write({ ready: true }); },
+                onEvent: event => { if (event.sessionGeneration !== generation) {
+                    write({ error: 'Agent session changed. Start live voice again.' });
+                    close();
+                } },
+                onClose: () => close(),
+            });
+            if (ended)
+                follow.close();
+            else
+                heartbeat = setInterval(() => { try {
+                    auth.authenticate(request);
+                    write({ heartbeat: true });
+                }
+                catch {
+                    close();
+                } }, 10_000);
+        }
+        catch {
+            write({ error: 'Agent controller connection failed.' });
+            close();
+        }
+    });
     app.post('/api/v1/ws-tickets', async (request) => {
         const body = request.body;
         if (!body?.purpose || !['events', 'conversation'].includes(body.purpose))
@@ -534,6 +1080,9 @@ export async function buildWebServer(services, boundary, options = {}) {
                 }
                 socket.send(JSON.stringify(payload));
             };
+            const role = await services.repository.get(request.params.id);
+            const stateDir = role ? services.repository.stateDir(role) : undefined;
+            const present = (event) => presentAttachmentEvent(stateDir, request.params.id, event);
             const follow = await control.followConversation({
                 after,
                 onPage: page => {
@@ -544,11 +1093,11 @@ export async function buildWebServer(services, boundary, options = {}) {
                         lastCursor: page.nextCursor ?? after,
                     });
                     if (page.events.length)
-                        guardedSend({ type: 'events', events: page.events });
+                        guardedSend({ type: 'events', events: page.events.map(present) });
                     if (page.hasMore)
                         guardedSend({ type: 'resync.required' });
                 },
-                onEvent: event => guardedSend({ type: 'events', events: [event] }),
+                onEvent: event => guardedSend({ type: 'events', events: [present(event)] }),
                 onClose: reason => {
                     if (socket.readyState === socket.OPEN)
                         socket.close(4409, (reason ?? 'conversation stream ended').slice(0, 120));
@@ -561,15 +1110,8 @@ export async function buildWebServer(services, boundary, options = {}) {
             socket.on('close', () => { clearInterval(heartbeat); follow.close(); });
         });
     });
-    const staticRoot = join(dirname(fileURLToPath(import.meta.url)), '..', 'web-app');
-    if (existsSync(staticRoot)) {
-        await app.register(fastifyStatic, { root: staticRoot, prefix: '/' });
-        app.setNotFoundHandler((request, reply) => {
-            if (request.url.startsWith('/api/'))
-                return reply.code(404).send({ error: 'not found' });
-            return reply.sendFile('index.html');
-        });
-    }
+    // Fleet has no pages of its own; every screen belongs to the App.
+    app.setNotFoundHandler((_request, reply) => reply.code(404).send({ error: 'not found' }));
     return {
         app, auth, audit, events,
         async close() {
@@ -582,17 +1124,17 @@ export async function buildWebServer(services, boundary, options = {}) {
 function setAuthCookies(reply, session, device, secure = false) {
     const suffix = secure ? '; Secure' : '';
     reply.header('Set-Cookie', [
-        `ofs_session=${encodeURIComponent(session)}; HttpOnly; SameSite=Strict; Path=/api; Max-Age=28800${suffix}`,
-        `ofs_device=${encodeURIComponent(device)}; HttpOnly; SameSite=Strict; Path=/api; Max-Age=2592000${suffix}`,
+        `ofs_session=${encodeURIComponent(session)}; HttpOnly; SameSite=Strict; Path=/; Max-Age=28800${suffix}`,
+        `ofs_device=${encodeURIComponent(device)}; HttpOnly; SameSite=Strict; Path=/; Max-Age=2592000${suffix}`,
     ]);
 }
 function setSessionCookie(reply, session, secure = false) {
-    reply.header('Set-Cookie', `ofs_session=${encodeURIComponent(session)}; HttpOnly; SameSite=Strict; Path=/api; Max-Age=28800${secure ? '; Secure' : ''}`);
+    reply.header('Set-Cookie', `ofs_session=${encodeURIComponent(session)}; HttpOnly; SameSite=Strict; Path=/; Max-Age=28800${secure ? '; Secure' : ''}`);
 }
 function clearAuthCookies(reply) {
     reply.header('Set-Cookie', [
-        'ofs_session=; HttpOnly; SameSite=Strict; Path=/api; Max-Age=0',
-        'ofs_device=; HttpOnly; SameSite=Strict; Path=/api; Max-Age=0',
+        'ofs_session=; HttpOnly; SameSite=Strict; Path=/; Max-Age=0',
+        'ofs_device=; HttpOnly; SameSite=Strict; Path=/; Max-Age=0',
     ]);
 }
 function promoteRequest(body) {
@@ -606,9 +1148,6 @@ function promoteRequest(body) {
     };
 }
 function cryptoRandomId() { return randomBytes(12).toString('hex'); }
-function escapeHtml(value) {
-    return value.replace(/[&<>"']/g, char => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[char]));
-}
 function requireSubprotocol(request, expected) {
     const protocols = String(request.headers['sec-websocket-protocol'] ?? '')
         .split(',').map(value => value.trim());