@ours.network/fleet 1.2.0-nightly.1 → 1.2.0-nightly.11

package/dist/application/supervisor-ours-tools.d.ts

@@ -0,0 +1,159 @@
+export interface SupervisorToolRequest {
+    tool: string;
+    arguments?: Record<string, unknown>;
+}
+/** CLI and REST use the same fixed-identity MCP server as the agent harness. */
+export declare class SupervisorOursTools {
+    private withClient;
+    list(role: string): Promise<{
+        tools: {
+            inputSchema: {
+                [x: string]: unknown;
+                type: "object";
+                properties?: Record<string, object> | undefined;
+                required?: string[] | undefined;
+            };
+            name: string;
+            description?: string | undefined;
+            outputSchema?: {
+                [x: string]: unknown;
+                type: "object";
+                properties?: Record<string, object> | undefined;
+                required?: string[] | undefined;
+            } | undefined;
+            annotations?: {
+                title?: string | undefined;
+                readOnlyHint?: boolean | undefined;
+                destructiveHint?: boolean | undefined;
+                idempotentHint?: boolean | undefined;
+                openWorldHint?: boolean | undefined;
+            } | undefined;
+            execution?: {
+                taskSupport?: "optional" | "required" | "forbidden" | undefined;
+            } | undefined;
+            _meta?: Record<string, unknown> | undefined;
+            icons?: {
+                src: string;
+                mimeType?: string | undefined;
+                sizes?: string[] | undefined;
+                theme?: "light" | "dark" | undefined;
+            }[] | undefined;
+            title?: string | undefined;
+        }[];
+        _meta?: {
+            [x: string]: unknown;
+            progressToken?: string | number | undefined;
+            "io.modelcontextprotocol/related-task"?: {
+                taskId: string;
+            } | undefined;
+        } | undefined;
+        nextCursor?: string | undefined;
+        agent: string;
+        identity: {
+            name: string;
+            cid: string;
+            generation: number;
+        };
+    }>;
+    call(role: string, request: SupervisorToolRequest): Promise<{
+        agent: string;
+        identity: {
+            name: string;
+            cid: string;
+            generation: number;
+        };
+        result: {
+            [x: string]: unknown;
+            content: ({
+                type: "text";
+                text: string;
+                annotations?: {
+                    audience?: ("user" | "assistant")[] | undefined;
+                    priority?: number | undefined;
+                    lastModified?: string | undefined;
+                } | undefined;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "image";
+                data: string;
+                mimeType: string;
+                annotations?: {
+                    audience?: ("user" | "assistant")[] | undefined;
+                    priority?: number | undefined;
+                    lastModified?: string | undefined;
+                } | undefined;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "audio";
+                data: string;
+                mimeType: string;
+                annotations?: {
+                    audience?: ("user" | "assistant")[] | undefined;
+                    priority?: number | undefined;
+                    lastModified?: string | undefined;
+                } | undefined;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                type: "resource";
+                resource: {
+                    uri: string;
+                    text: string;
+                    mimeType?: string | undefined;
+                    _meta?: Record<string, unknown> | undefined;
+                } | {
+                    uri: string;
+                    blob: string;
+                    mimeType?: string | undefined;
+                    _meta?: Record<string, unknown> | undefined;
+                };
+                annotations?: {
+                    audience?: ("user" | "assistant")[] | undefined;
+                    priority?: number | undefined;
+                    lastModified?: string | undefined;
+                } | undefined;
+                _meta?: Record<string, unknown> | undefined;
+            } | {
+                uri: string;
+                name: string;
+                type: "resource_link";
+                description?: string | undefined;
+                mimeType?: string | undefined;
+                size?: number | undefined;
+                annotations?: {
+                    audience?: ("user" | "assistant")[] | undefined;
+                    priority?: number | undefined;
+                    lastModified?: string | undefined;
+                } | undefined;
+                _meta?: {
+                    [x: string]: unknown;
+                } | undefined;
+                icons?: {
+                    src: string;
+                    mimeType?: string | undefined;
+                    sizes?: string[] | undefined;
+                    theme?: "light" | "dark" | undefined;
+                }[] | undefined;
+                title?: string | undefined;
+            })[];
+            _meta?: {
+                [x: string]: unknown;
+                progressToken?: string | number | undefined;
+                "io.modelcontextprotocol/related-task"?: {
+                    taskId: string;
+                } | undefined;
+            } | undefined;
+            structuredContent?: Record<string, unknown> | undefined;
+            isError?: boolean | undefined;
+        } | {
+            [x: string]: unknown;
+            toolResult: unknown;
+            _meta?: {
+                [x: string]: unknown;
+                progressToken?: string | number | undefined;
+                "io.modelcontextprotocol/related-task"?: {
+                    taskId: string;
+                } | undefined;
+            } | undefined;
+        };
+    }>;
+}

package/dist/application/supervisor-ours-tools.js

@@ -0,0 +1,121 @@
+import { createHash } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { agentDir } from '../paths.js';
+import { ROLE_NAME_RE } from '../config.js';
+import { legacySupervisorIdentity } from './legacy-supervisor-identity.js';
+import { FleetError } from './errors.js';
+/** CLI and REST use the same fixed-identity MCP server as the agent harness. */
+export class SupervisorOursTools {
+    async withClient(role, work) {
+        if (!ROLE_NAME_RE.test(role))
+            throw new FleetError('invalid_request', 'invalid agent name');
+        const findCandidates = () => [false, true].map(temporary => ({ temporary, dir: agentDir(role, temporary) }))
+            .map(row => ({ ...row, path: join(row.dir, '.ours-bridge', 'descriptor.json') }))
+            .filter(row => existsSync(row.path));
+        const candidates = findCandidates();
+        if (candidates.length !== 1)
+            throw new FleetError('capability_unavailable', 'agent supervisor endpoint is missing or ambiguous');
+        const selected = candidates[0];
+        let descriptor;
+        let identityName;
+        try {
+            descriptor = JSON.parse(readFileSync(selected.path, 'utf8'));
+            identityName = readFileSync(join(selected.dir, '.identity'), 'utf8').trim();
+            if (!descriptor || typeof descriptor !== 'object')
+                throw new Error();
+        }
+        catch {
+            throw new FleetError('capability_unavailable', 'supervisor identity metadata cannot be read');
+        }
+        const legacy = ['role', 'identity', 'cid'].every(key => descriptor[key] === undefined);
+        const identity = legacy
+            ? legacySupervisorIdentity(role, identityName, selected.temporary, descriptor.generation)
+            : { name: identityName, cid: descriptor.cid, generation: descriptor.generation };
+        if (legacy && descriptor.socket !== join(selected.dir, '.ours-bridge', `g${descriptor.generation}.sock`))
+            throw new FleetError('capability_unavailable', 'legacy supervisor socket does not match the selected agent');
+        if ((!legacy && (descriptor.role !== role || descriptor.identity !== identityName))
+            || !/^[a-f0-9]{64}$/i.test(identity.cid ?? '') || !Number.isSafeInteger(descriptor.generation) || descriptor.generation < 1)
+            throw new FleetError('capability_unavailable', 'supervisor identity metadata is unavailable or mismatched');
+        const verifySelection = () => {
+            try {
+                const current = findCandidates();
+                const freshDescriptor = JSON.parse(readFileSync(selected.path, 'utf8'));
+                if (current.length !== 1 || current[0].path !== selected.path
+                    || readFileSync(join(selected.dir, '.identity'), 'utf8').trim() !== identityName
+                    || ['role', 'identity', 'cid', 'socket', 'capability', 'generation']
+                        .some(key => freshDescriptor[key] !== descriptor[key]))
+                    throw new Error();
+            }
+            catch {
+                throw new FleetError('capability_unavailable', 'selected supervisor assignment changed');
+            }
+        };
+        const client = new Client({ name: 'ours-fleet-supervisor-tools', version: '1' });
+        const transport = new StdioClientTransport({
+            command: process.execPath,
+            args: [fileURLToPath(new URL('../agent-ours/bridge.js', import.meta.url))],
+            env: { ...Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] !== undefined)),
+                FLEET_OURS_BRIDGE_DESCRIPTOR: selected.path,
+                FLEET_OURS_BRIDGE_EXPECTED: JSON.stringify({ role: descriptor.role, identity: descriptor.identity, cid: descriptor.cid, generation: descriptor.generation,
+                    transportDigest: createHash('sha256').update(JSON.stringify([descriptor.socket, descriptor.capability, descriptor.generation])).digest('hex') }) },
+            stderr: 'pipe',
+        });
+        try {
+            await client.connect(transport);
+            const verify = async () => {
+                if (!legacy) {
+                    verifySelection();
+                    return;
+                }
+                const actual = await client.callTool({ name: 'current_identity', arguments: {} });
+                const blocks = actual.content;
+                const lines = blocks?.length === 1 && blocks[0].type === 'text' ? blocks[0].text?.split('\n') : undefined;
+                const prefix = `Bound to "${identity.name}" (${identity.cid})`;
+                const suffix = lines?.[0].startsWith(prefix) ? lines[0].slice(prefix.length) : undefined;
+                const roleSuffix = typeof suffix === 'string' && /^ — role "[^"\r\n]+" under root "[^"\r\n]+"\.$/.test(suffix);
+                const temporaryLine = 'TEMPORARY identity owned by the Fleet supervisor for this logical agent instance. Bridge or harness disconnect retains it; terminal supervisor release deletes local state with best-effort peer notices.';
+                if (actual.isError || !(roleSuffix || (selected.temporary && suffix === '.'))
+                    || (selected.temporary ? lines?.[1] !== temporaryLine : lines?.[1]?.startsWith('TEMPORARY')))
+                    throw new FleetError('capability_unavailable', 'connected supervisor identity does not match legacy ownership proof');
+                const fresh = legacySupervisorIdentity(role, identityName, selected.temporary, descriptor.generation);
+                if (!('proof' in identity) || fresh.proof !== identity.proof)
+                    throw new FleetError('capability_unavailable', 'legacy supervisor identity changed');
+                verifySelection();
+            };
+            await verify();
+            return await work(client, { name: identity.name, cid: identity.cid, generation: identity.generation }, verify);
+        }
+        catch (error) {
+            if (error instanceof FleetError)
+                throw error;
+            // Do not leak arguments, invites, capabilities, or raw transport errors.
+            throw new FleetError('control_unavailable', 'supervisor tool request failed; its outcome may be unknown, do not retry a mutation automatically', { retryable: false });
+        }
+        finally {
+            await client.close().catch(() => { });
+            await transport.close().catch(() => { });
+        }
+    }
+    list(role) {
+        return this.withClient(role, async (client, identity) => ({
+            agent: role, identity, ...(await client.listTools()),
+        }));
+    }
+    call(role, request) {
+        if (!request || typeof request.tool !== 'string'
+            || (request.arguments !== undefined && (!request.arguments || typeof request.arguments !== 'object' || Array.isArray(request.arguments))))
+            throw new FleetError('invalid_request', 'tool and object arguments are required');
+        return this.withClient(role, async (client, identity, verify) => {
+            const { tools } = await client.listTools();
+            if (!tools.some(tool => tool.name === request.tool))
+                throw new FleetError('forbidden', 'tool is not exposed by the fixed-identity supervisor');
+            await verify();
+            const result = await client.callTool({ name: request.tool, arguments: request.arguments ?? {} });
+            return { agent: role, identity, result };
+        });
+    }
+}

package/dist/application/task-room-service.d.ts

@@ -1,3 +1,4 @@
+import { type LiveReadinessDeps } from '../rooms-tasks/live-readiness.js';
 import { type FleetConfig } from '../config.js';
 import { type CoworkAdapter } from '../rooms-tasks/cowork-adapter.js';
 import { provisionMembers } from '../rooms-tasks/provision.js';
@@ -57,9 +58,9 @@ export interface TaskProvisioningOutcome {
 /** Repairable terminal observation derived entirely from durable Task/Room state. */
 export declare function recordTaskProvisioningOutcome(outcome: TaskProvisioningOutcome): void;
 export declare class TaskRoomApplicationError extends Error {
-    readonly code: 'template_not_found' | 'task_template_drift' | 'template_mismatch' | 'task_terminal' | 'task_terminal_already' | 'task_non_resumable' | 'task_deleting' | 'room_not_found' | 'room_record_not_found';
+    readonly code: 'template_not_found' | 'task_template_drift' | 'template_mismatch' | 'task_terminal' | 'task_terminal_already' | 'task_non_resumable' | 'task_deleting' | 'room_not_found' | 'room_record_not_found' | 'task_not_ready';
     readonly fields: Readonly<Record<string, string>>;
-    constructor(code: 'template_not_found' | 'task_template_drift' | 'template_mismatch' | 'task_terminal' | 'task_terminal_already' | 'task_non_resumable' | 'task_deleting' | 'room_not_found' | 'room_record_not_found', message: string, fields?: Readonly<Record<string, string>>);
+    constructor(code: 'template_not_found' | 'task_template_drift' | 'template_mismatch' | 'task_terminal' | 'task_terminal_already' | 'task_non_resumable' | 'task_deleting' | 'room_not_found' | 'room_record_not_found' | 'task_not_ready', message: string, fields?: Readonly<Record<string, string>>);
 }
 export interface CreateTaskRequest {
     actor: TaskRoomActor;
@@ -87,6 +88,7 @@ export interface CreateRoomRequest {
 }
 export declare function resolveRoomLaunchPolicy(template: TemplateSnapshot | undefined, override: boolean | undefined): RoomLaunchPolicy;
 export interface TaskRoomServiceDeps {
+    liveReadiness?: LiveReadinessDeps;
     loadConfiguration?(path?: string): FleetConfig;
     cowork?(config: FleetConfig): CoworkAdapter;
     binPath?(): string;
@@ -151,6 +153,7 @@ export declare class TaskRoomApplicationService {
         task: TaskRecord;
         orchestration: RoomOrchestrationRecord | undefined;
     };
+    /** Durable provisioning progress only; use active task start/work for a live readiness check. */
     taskProvisioningOutcome(taskId: string): TaskProvisioningOutcome;
     awaitTaskProvisioning(input: {
         actor: TaskRoomActor;
@@ -300,6 +303,7 @@ export declare class TaskRoomApplicationService {
         taskId: string;
         outcome?: TaskOutcome;
     }): Promise<TaskSettlementPlan>;
+    private assertTaskLiveReadiness;
     ensureTaskWork(input: {
         actor: TaskRoomActor;
         taskId: string;

package/dist/application/task-room-service.js

@@ -1,4 +1,5 @@
 import { readFileSync } from 'node:fs';
+import { taskLiveReadiness } from '../rooms-tasks/live-readiness.js';
 import { ConfigError, loadConfig } from '../config.js';
 import { CoworkProtocolError, CoworkUnavailableError, createCoworkAdapter, } from '../rooms-tasks/cowork-adapter.js';
 import { getBinPath, provisionMembers } from '../rooms-tasks/provision.js';
@@ -136,7 +137,7 @@ export class TaskRoomApplicationService {
             }
             catch (error) {
                 if (error instanceof CoworkUnavailableError)
-                    persistBlockTask(task.task_id, 'Cowork management socket is unavailable');
+                    persistBlockTask(task.task_id, 'Cowork management is unavailable');
                 // Once the durable Room exists, provisioning errors are resumable
                 // saga state. Return that explicit state so the command can launch a
                 // continuation and report the durable in-progress outcome.
@@ -223,6 +224,7 @@ export class TaskRoomApplicationService {
         const task = readTask(taskId);
         return { task, orchestration: task.room_id ? getRoomRecord(task.room_id) : undefined };
     }
+    /** Durable provisioning progress only; use active task start/work for a live readiness check. */
     taskProvisioningOutcome(taskId) {
         const task = readTask(taskId);
         const room = task.room_id ? getRoomRecord(task.room_id) : undefined;
@@ -234,17 +236,23 @@ export class TaskRoomApplicationService {
         const ready = task.state === 'active' && room?.state === 'active'
             && active === expected && launched === expected;
         const blocker = task.outcome?.summary ?? task.blocked?.reason ?? room?.saga.error;
-        const nextAction = room?.provisioning_detail === 'waiting_owner_authorization'
-            ? `Ensure ours-cowork 1.3.0 or newer is running and available, then run ours-fleet task start ${task.task_id}.`
-            : room?.provisioning_detail === 'waiting_owner_invite'
-                ? `Rotate rooms.owner.public_invite, then run ours-fleet task start ${task.task_id}.`
-                : room?.provisioning_detail === 'owner_cid_mismatch'
-                    ? `Verify rooms.owner.expected_cid, rotate the Owner invite, then run ours-fleet task start ${task.task_id}.`
-                    : room?.provisioning_detail === 'waiting_cowork'
-                        ? `Restore ours-cowork, then run ours-fleet task start ${task.task_id}.`
-                        : failed
-                            ? `Correct the blocker, then run ours-fleet task start ${task.task_id}.`
-                            : undefined;
+        const nextAction = task.terminal_intent
+            ? `Complete the accepted ${task.terminal_intent.kind} operation; do not restart provisioning.`
+            : room?.state === 'closing' || room?.state === 'closed'
+                ? `Complete room cleanup; do not restart provisioning.`
+                : room?.provisioning_detail === 'member_failed'
+                    ? `Inspect the failed launch, then run ours-fleet task start ${task.task_id}.`
+                    : room?.provisioning_detail === 'waiting_owner_authorization'
+                        ? `Ensure ours-cowork 1.3.0 or newer is running and available, then run ours-fleet task start ${task.task_id}.`
+                        : room?.provisioning_detail === 'waiting_owner_invite'
+                            ? `Rotate rooms.owner.public_invite, then run ours-fleet task start ${task.task_id}.`
+                            : room?.provisioning_detail === 'owner_cid_mismatch'
+                                ? `Verify rooms.owner.expected_cid, rotate the Owner invite, then run ours-fleet task start ${task.task_id}.`
+                                : room?.provisioning_detail === 'waiting_cowork'
+                                    ? `Restore ours-cowork, then run ours-fleet task start ${task.task_id}.`
+                                    : failed
+                                        ? `Correct the blocker, then run ours-fleet task start ${task.task_id}.`
+                                        : undefined;
         return {
             kind: failed ? 'failed' : ready ? 'ready' : 'in_progress', task, room,
             launch: {
@@ -265,6 +273,10 @@ export class TaskRoomApplicationService {
         const deadline = now() + (input.waitMs ?? 60_000);
         for (;;) {
             const outcome = this.taskProvisioningOutcome(input.taskId);
+            if (outcome.kind === 'ready') {
+                const cfg = (this.deps.loadConfiguration ?? loadConfig)(this.configurationPath);
+                await this.assertTaskLiveReadiness(outcome.task, outcome.room, cfg);
+            }
             if (outcome.kind !== 'in_progress' || now() >= deadline) {
                 recordTaskProvisioningOutcome(outcome);
                 return outcome;
@@ -410,7 +422,9 @@ export class TaskRoomApplicationService {
         let task = readTask(input.taskId);
         let room = task.room_id ? getRoomRecord(task.room_id) : undefined;
         const issues = [];
-        if (task.state !== 'provisioning')
+        if (task.state !== 'provisioning' || task.terminal_intent
+            || room?.state === 'closing' || room?.state === 'closed'
+            || room?.provisioning_detail === 'member_failed')
             return {
                 kind: 'no_op', task, room, issues,
             };
@@ -649,6 +663,14 @@ export class TaskRoomApplicationService {
             (this.deps.loadConfiguration ?? loadConfig)(this.configurationPath);
         return this.acceptTerminal(task.task_id, 'done', task.room_id, input.outcome);
     }
+    async assertTaskLiveReadiness(task, room, cfg) {
+        const cowork = this.deps.cowork ? this.deps.cowork(cfg)
+            : createCoworkAdapter({ configPath: cfg.rooms?.cowork?.config });
+        const issue = await taskLiveReadiness(task, room, cowork, this.deps.liveReadiness);
+        if (issue)
+            throw new TaskRoomApplicationError('task_not_ready', `Task readiness is ${issue.state}: ${issue.reason}. Ask Fleet Coordinator to inspect the room and member status and choose supported recovery; do not blindly relaunch or reuse invites.`, { task: task.task_id, room: task.room_id ?? 'missing', readiness: issue.state,
+                reason: issue.reason, ...(issue.member ? { member: issue.member } : {}) });
+    }
     async ensureTaskWork(input) {
         const cfg = (this.deps.loadConfiguration ?? loadConfig)(this.configurationPath);
         let task = readTask(input.taskId);
@@ -673,8 +695,10 @@ export class TaskRoomApplicationService {
                 const pinned = durableTemplate;
                 if (!pinned)
                     throw new TaskRoomApplicationError('template_mismatch', 'active task has no durable execution plan', { room: task.room_id });
-                if (durableRequestMatches)
+                if (durableRequestMatches) {
+                    await this.assertTaskLiveReadiness(task, recordedRoom, cfg);
                     return { task, status: 'already_active' };
+                }
                 const templateName = input.template ?? pinned.name;
                 const definition = resolveTemplate(templateName, cfg.roomTemplates ?? {});
                 if (!definition)
@@ -687,6 +711,7 @@ export class TaskRoomApplicationService {
                         provisioned: `${pinned.name}@${pinned.version}`
                     });
             }
+            await this.assertTaskLiveReadiness(task, recordedRoom, cfg);
             return { task, status: 'already_active' };
         }
         let room = task.room_id ? getRoomRecord(task.room_id) : undefined;
@@ -784,7 +809,7 @@ export class TaskRoomApplicationService {
             }
             catch (error) {
                 if (error instanceof CoworkUnavailableError)
-                    persistBlockTask(task.task_id, 'Cowork management socket is unavailable');
+                    persistBlockTask(task.task_id, 'Cowork management is unavailable');
                 const current = readTask(task.task_id);
                 if (!current.room_id || !getRoomRecord(current.room_id))
                     throw error;
@@ -802,7 +827,7 @@ export class TaskRoomApplicationService {
                 }
                 catch (error) {
                     if (error instanceof CoworkUnavailableError)
-                        persistBlockTask(task.task_id, 'Cowork management socket is unavailable');
+                        persistBlockTask(task.task_id, 'Cowork management is unavailable');
                     task = readTask(task.task_id);
                     return { task, status: 'in_progress' };
                 }
@@ -820,12 +845,16 @@ export class TaskRoomApplicationService {
             }
             catch (error) {
                 if (error instanceof CoworkUnavailableError)
-                    persistBlockTask(task.task_id, 'Cowork management socket is unavailable');
+                    persistBlockTask(task.task_id, 'Cowork management is unavailable');
                 task = readTask(task.task_id);
             }
         }
         const resultingRoom = getRoomRecord(task.room_id);
-        return { task, status: task.state === 'active' && resultingRoom?.state === 'active' ? 'ready' : 'in_progress' };
+        if (task.state === 'active' && resultingRoom?.state === 'active') {
+            await this.assertTaskLiveReadiness(task, resultingRoom, cfg);
+            return { task, status: 'ready' };
+        }
+        return { task, status: 'in_progress' };
     }
     createTemplate(cfg, requested, noRoom) {
         if (noRoom)
@@ -864,6 +893,7 @@ export class TaskRoomApplicationService {
         const unlockSnapshot = template ? acquireLaunchSnapshotLock() : undefined;
         let launchTemplate;
         let room;
+        let reusedRoom = false;
         try {
             launchTemplate = template ? (template.launch_snapshot_hash ? template
                 : sealTemplateSnapshot(template, cfg.agentTemplates ?? {}, launchDefinitions)) : undefined;
@@ -877,19 +907,45 @@ export class TaskRoomApplicationService {
                     const fresh = readTask(task.task_id);
                     if (fresh.deletion?.status === 'pending')
                         throw new TaskRoomApplicationError('task_deleting', `task ${task.task_id} is pending deletion`, { task: task.task_id });
+                    // A concurrent caller or a restart after local Room publication must
+                    // reuse the task's one durable room, never create a second workspace/room.
+                    const candidates = listRoomRecords().filter(record => record.task_id === task.task_id);
+                    if (candidates.length > 1)
+                        throw new Error('ambiguous task room ownership');
+                    const existing = fresh.room_id ? getRoomRecord(fresh.room_id) : candidates[0];
+                    if (fresh.room_id && !existing)
+                        throw new Error('recorded task room is missing; refusing duplicate creation');
+                    if (existing) {
+                        reusedRoom = true;
+                        // Heal a crash between durable room publication and task linkage.
+                        // Return a resumable phase, leaving owner admission/member launch to
+                        // the existing continuation rather than racing the original creator.
+                        const resumable = ['persist_intent', 'create_room'].includes(existing.saga.phase)
+                            ? advanceSaga(existing.room_id, attachOwner ? 'attach_owner' : 'create_members', attachOwner ? 2 : 3)
+                            : existing;
+                        onCreated(resumable);
+                        return resumable;
+                    }
                 }
+                const requiredRoles = new Map();
+                if (attachOwner)
+                    requiredRoles.set(rooms.owner.role, 1);
+                for (const member of launchTemplate?.members ?? [])
+                    requiredRoles.set(member.role, (requiredRoles.get(member.role) ?? 0) + member.count);
                 const created = await cowork.createRoom({
                     room_name: roomName, goal: task.goal?.trim() || task.title,
                     briefing: task.brief?.trim() || launchTemplate?.contract?.trim() || task.goal?.trim() || task.title,
                     quiet_membership: launchTemplate?.room?.quiet_membership,
                     anonymous: policy.anonymous,
+                    activation_requirements: [...requiredRoles].map(([role, count]) => ({ role, count })),
                 });
                 const record = createRoomRecord({
                     room_id: created.room_id, room_name: roomName, room_identity_cid: created.identity_cid,
                     task_id: task.task_id, template_snapshot: launchTemplate, room_policy: policy,
                 });
-                onCreated(record);
-                return record;
+                const resumable = advanceSaga(record.room_id, attachOwner ? 'attach_owner' : 'create_members', attachOwner ? 2 : 3);
+                onCreated(resumable);
+                return resumable;
             };
             room = task.task_id
                 ? await withFileLock(taskOperationLockPath(task.task_id), publishRoom, {}, TASK_OPERATION_LOCK_STALE_MS)
@@ -902,7 +958,8 @@ export class TaskRoomApplicationService {
             throw error;
         }
         unlockSnapshot?.();
-        room = advanceSaga(room.room_id, 'create_room', 1);
+        if (reusedRoom)
+            return room;
         if (attachOwner) {
             room = advanceSaga(room.room_id, 'attach_owner', 2);
             await this.setOwnerRoomCommands(cowork, room.room_id, rooms.owner.role);