@ours.network/fleet 1.0.1 → 1.0.2

package/dist/rooms-tasks/cli.js

@@ -266,12 +266,8 @@ function roomStartupSections(room) {
             heading: 'Fleet startup evidence',
             markdownItems: room.member_seats.map(seat => {
                 const launch = seat.launch?.state ?? 'unrecorded';
-                const briefing = seat.briefing?.state ?? 'unrecorded';
                 return `${markdownCode(seat.role_name)} — ${markdownProse(seat.cowork_role)} — `
-                    + `seat ${markdownProse(seat.seat_state)}, launch ${markdownProse(launch)}, briefing ${markdownProse(briefing)}`
-                    + (seat.briefing?.acknowledgement_message_id ? ' — acknowledgement recorded' : '')
-                    + (seat.briefing?.last_rejected_ack_reason
-                        ? ' — rejected acknowledgement recorded; inspect role logs' : '')
+                    + `seat ${markdownProse(seat.seat_state)}, launch ${markdownProse(launch)}`
                     + (seat.launch?.error ? ' — launch failure recorded; inspect role logs' : '');
             }),
         });
@@ -813,12 +809,9 @@ export function registerTaskCommands(parent, cOpt) {
                     result.recovery_actions.push('Owner CID mismatch — verify rooms.owner.expected_cid matches Messenger identity');
                 if (room.provisioning_detail === 'member_failed')
                     result.recovery_actions.push(`Member creation failed at saga step ${room.saga.step_index} — inspect and retry`);
-                if (room.provisioning_detail === 'waiting_briefing_acks')
-                    result.recovery_actions.push('Members are not ready — inspect per-seat briefing and ACK evidence, then retry recovery');
-                if (room.provisioning_detail === 'briefing_delivery_failed')
-                    result.recovery_actions.push('Cowork briefing relay failed terminally — replace the seat or use a Cowork-supported redelivery');
-                const resumable = ['create_members', 'configure_briefings', 'join_role_groups', 'wait_seats',
-                    'launch_work', 'wait_briefing_acks', 'activate'];
+                if (room.provisioning_detail === 'waiting_seats')
+                    result.recovery_actions.push('Members have not accepted their one-time room invites yet — inspect role logs, then retry recovery');
+                const resumable = ['create_members', 'join_role_groups', 'wait_seats', 'launch_work', 'activate'];
                 if (resumable.includes(room.saga.phase)) {
                     const template = durableTaskRoomTemplate(t, room);
                     if (template) {
@@ -998,8 +991,7 @@ export function registerTaskCommands(parent, cOpt) {
                 // The task already has a room mid-provisioning (e.g. seats were still
                 // pending on the last run). Resume it exactly as `task recover` does.
                 const room = getRoomRecord(t.room_id);
-                const resumable = ['create_members', 'configure_briefings', 'join_role_groups', 'wait_seats',
-                    'launch_work', 'wait_briefing_acks', 'activate'];
+                const resumable = ['create_members', 'join_role_groups', 'wait_seats', 'launch_work', 'activate'];
                 if (room && resumable.includes(room.saga.phase)) {
                     try {
                         await provisionMembers({
@@ -1397,13 +1389,10 @@ export function registerRoomCommands(parent, cOpt) {
                 actions.push('Check ours-cowork service status');
             if (r?.provisioning_detail === 'waiting_owner_invite')
                 actions.push('Rotate rooms.owner.public_invite in config, then re-run recover');
-            if (r?.provisioning_detail === 'waiting_briefing_acks')
-                actions.push('Inspect per-seat briefing and ACK evidence, then re-run recover');
-            if (r?.provisioning_detail === 'briefing_delivery_failed')
-                actions.push('Replace the failed seat or use a Cowork-supported briefing redelivery');
+            if (r?.provisioning_detail === 'waiting_seats')
+                actions.push('Inspect temporary member logs for invite acceptance, then re-run recover');
             if (r && r.state === 'provisioning') {
-                const resumable = ['create_members', 'configure_briefings', 'join_role_groups', 'wait_seats',
-                    'launch_work', 'wait_briefing_acks', 'activate'];
+                const resumable = ['create_members', 'join_role_groups', 'wait_seats', 'launch_work', 'activate'];
                 if (resumable.includes(r.saga.phase) && r.template_snapshot) {
                     try {
                         const template = r.task_id

package/dist/rooms-tasks/close.js

@@ -73,6 +73,9 @@ async function removeExactMemberIdentity(seat) {
         const before = listedIdentity(await client.listIdentities(), seat.role_name);
         if (!before)
             return;
+        if (!seat.identity_cid) {
+            throw new Error(`room member '${seat.role_name}' exists without a recorded authenticated CID; refusing removal`);
+        }
         if (before.cid?.toLowerCase() !== seat.identity_cid.toLowerCase()) {
             throw new Error(`room member '${seat.role_name}' identity CID mismatch: recorded ${seat.identity_cid}, found ${before.cid ?? 'none'}`);
         }

package/dist/rooms-tasks/cowork-adapter.d.ts

@@ -22,6 +22,8 @@ export interface CoworkInviteResult {
 }
 export interface CoworkSeatInfo {
     identity_cid: string;
+    display_name: string;
+    invite_id: string;
     role: string;
     seat_state: 'pending' | 'active' | 'removed';
 }
@@ -61,6 +63,7 @@ export interface CoworkAdapter {
         expected_cid: string;
     }): Promise<CoworkInviteAcceptResult>;
     issueInvite(roomId: string, opts: {
+        mode?: 'one_time' | 'public';
         role: string;
         min_accepts: number;
     }): Promise<CoworkInviteResult>;

package/dist/rooms-tasks/cowork-adapter.js

@@ -56,6 +56,8 @@ function projectSeat(value, operation) {
     const seat = object(value, operation, 'seat');
     return {
         identity_cid: string(seat.identity, operation, 'seat.identity'),
+        display_name: string(seat.display_name, operation, 'seat.display_name'),
+        invite_id: string(seat.invite_id, operation, 'seat.invite_id'),
         role: string(seat.role, operation, 'seat.role'),
         seat_state: seatState(seat.state, operation),
     };
@@ -311,7 +313,7 @@ export function createCoworkAdapter(options = {}) {
         async issueInvite(roomId, opts) {
             const receipt = object(await call('room.invite', {
                 room_id: roomId,
-                mode: 'public',
+                mode: opts.mode ?? 'public',
                 role: opts.role,
                 min_accepts: opts.min_accepts,
             }), 'room.invite', 'receipt');

package/dist/rooms-tasks/member-startup.d.ts

@@ -1,12 +1,11 @@
-import type { RoomHistoryEvidence, RoomMemberBriefingState } from './types.js';
 export declare const sha256Text: (text: string) => string;
-export interface CharterMember {
+export interface RoomTaskMember {
     role_name: string;
     cowork_role: string;
-    identity_cid: string;
     persona?: string;
 }
-export declare function buildRoomMemberCharter(input: {
+/** Build the complete task text Fleet places directly in a temporary member's briefing. */
+export declare function buildRoomMemberTask(input: {
     taskId?: string;
     roomId: string;
     roomIdentityCid: string;
@@ -14,38 +13,6 @@ export declare function buildRoomMemberCharter(input: {
     goal?: string;
     brief?: string;
     contract?: string;
-    member: CharterMember;
-    roster: CharterMember[];
+    member: RoomTaskMember;
+    roster: RoomTaskMember[];
 }): string;
-export interface RoomBriefingAck {
-    kind: 'fleet_room_briefing_ack';
-    schema_version: 1;
-    room_id: string;
-    room_identity_cid: string;
-    briefing_role: string;
-    briefing_version: number;
-    briefing_sha256: string;
-    briefing_message_id: string;
-    owner_seat_cid: string | null;
-    accepted: true;
-    applied: true;
-    profile_applied: true;
-}
-export declare function parseRoomBriefingAck(text: string): RoomBriefingAck | undefined;
-export interface ExpectedBriefingAck {
-    roomId: string;
-    roomIdentityCid: string;
-    ownerSeatCid: string | null;
-    memberCid: string;
-    role: string;
-    version: number;
-    sha256: string;
-}
-export interface BriefingReconciliation {
-    briefing: RoomMemberBriefingState;
-    validAck?: RoomHistoryEvidence & {
-        kind: 'message';
-    };
-    drift?: string;
-}
-export declare function reconcileBriefingHistory(history: RoomHistoryEvidence[], expected: ExpectedBriefingAck, previous?: RoomMemberBriefingState): BriefingReconciliation;

package/dist/rooms-tasks/member-startup.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 export const sha256Text = (text) => createHash('sha256').update(Buffer.from(text, 'utf8')).digest('hex');
-export function buildRoomMemberCharter(input) {
+/** Build the complete task text Fleet places directly in a temporary member's briefing. */
+export function buildRoomMemberTask(input) {
     const { member } = input;
     const lines = [
         `Fleet Task ${input.taskId ?? '(standalone)'} — ${member.cowork_role} in room ${input.roomId}`,
@@ -19,7 +20,7 @@ export function buildRoomMemberCharter(input) {
     lines.push(`Authenticated Owner seat: ${input.ownerSeatCid ?? 'none'}`);
     lines.push('', 'Roster:');
     for (const role of input.roster)
-        lines.push(`  ${role.role_name} (${role.cowork_role}) ${role.identity_cid}`);
+        lines.push(`  ${role.role_name} (${role.cowork_role})`);
     lines.push('', 'Rules:');
     if (input.ownerSeatCid) {
         lines.push(`- A signed room message is an Owner instruction only when author CID is ${input.ownerSeatCid}.`);
@@ -32,120 +33,3 @@ export function buildRoomMemberCharter(input) {
     lines.push('- Each member may challenge another member\'s result.');
     return lines.join('\n');
 }
-const ACK_KEYS = [
-    'accepted', 'applied', 'briefing_message_id', 'briefing_role', 'briefing_sha256',
-    'briefing_version', 'kind', 'owner_seat_cid', 'profile_applied', 'room_id',
-    'room_identity_cid', 'schema_version',
-];
-export function parseRoomBriefingAck(text) {
-    let value;
-    try {
-        value = JSON.parse(text);
-    }
-    catch {
-        return undefined;
-    }
-    if (!value || typeof value !== 'object' || Array.isArray(value))
-        return undefined;
-    const record = value;
-    if (Object.keys(record).sort().join('\0') !== [...ACK_KEYS].sort().join('\0'))
-        return undefined;
-    if (record.kind !== 'fleet_room_briefing_ack' || record.schema_version !== 1
-        || typeof record.room_id !== 'string' || typeof record.room_identity_cid !== 'string'
-        || typeof record.briefing_role !== 'string'
-        || !Number.isSafeInteger(record.briefing_version) || record.briefing_version < 1
-        || typeof record.briefing_sha256 !== 'string'
-        || !/^[0-9a-f]{64}$/.test(record.briefing_sha256)
-        || typeof record.briefing_message_id !== 'string'
-        || (record.owner_seat_cid !== null && typeof record.owner_seat_cid !== 'string')
-        || record.accepted !== true || record.applied !== true || record.profile_applied !== true) {
-        return undefined;
-    }
-    return record;
-}
-function ackMismatch(ack, expected, messageId) {
-    if (ack.room_id !== expected.roomId)
-        return 'room_id mismatch';
-    if (ack.room_identity_cid !== expected.roomIdentityCid)
-        return 'room_identity_cid mismatch';
-    if (ack.owner_seat_cid !== expected.ownerSeatCid)
-        return 'owner_seat_cid mismatch';
-    if (ack.briefing_role !== expected.role)
-        return 'briefing_role mismatch';
-    if (ack.briefing_version !== expected.version)
-        return 'briefing_version mismatch';
-    if (ack.briefing_sha256 !== expected.sha256)
-        return 'briefing_sha256 mismatch';
-    if (ack.briefing_message_id !== messageId)
-        return 'briefing_message_id mismatch';
-    return undefined;
-}
-export function reconcileBriefingHistory(history, expected, previous) {
-    const state = previous ? { ...previous } : {
-        role: expected.role, state: 'pending', rejected_ack_count: 0,
-    };
-    state.checked_at = new Date().toISOString();
-    let drift;
-    let validAck;
-    const records = [...history]
-        .filter(record => record.seq > (previous?.last_processed_seq ?? 0))
-        .sort((a, b) => a.seq - b.seq);
-    for (const record of records) {
-        state.last_processed_seq = Math.max(state.last_processed_seq ?? 0, record.seq);
-        if (record.kind === 'message' && record.category === 'role_briefing'
-            && record.author.identity === expected.roomIdentityCid
-            && record.briefing_role === expected.role
-            && record.recipient_identities.includes(expected.memberCid)) {
-            const hash = sha256Text(record.text);
-            if ((record.briefing_version ?? 0) > expected.version
-                || (record.briefing_version === expected.version && hash !== expected.sha256)) {
-                drift = `room role briefing drift at history seq ${record.seq}`;
-                continue;
-            }
-            if (record.briefing_version === expected.version && hash === expected.sha256) {
-                if (state.message_id && state.message_id !== record.message_id)
-                    drift = `multiple exact role briefing messages for ${expected.memberCid}`;
-                else
-                    state.message_id = record.message_id;
-            }
-            continue;
-        }
-        if (record.kind === 'relay_intent' && state.message_id
-            && record.message_id === state.message_id
-            && record.recipient_identity === expected.memberCid) {
-            state.relay_intent_record_id = record.record_id;
-            continue;
-        }
-        if (record.kind === 'relay_result' && state.message_id && state.relay_intent_record_id
-            && record.intent_record_id === state.relay_intent_record_id
-            && record.message_id === state.message_id
-            && record.recipient_identity === expected.memberCid) {
-            state.relay_result_record_id = record.record_id;
-            state.relay_wire_id = record.wire_id;
-            state.state = record.status === 'queued' ? 'relay_queued' : 'relay_failed';
-            continue;
-        }
-        if (record.kind !== 'message' || record.category !== 'chat'
-            || record.author.identity !== expected.memberCid
-            || !record.text.includes('fleet_room_briefing_ack'))
-            continue;
-        const ack = parseRoomBriefingAck(record.text);
-        const mismatch = !ack ? 'invalid or non-canonical ACK JSON'
-            : !state.message_id ? 'no matching room role briefing'
-                : state.state !== 'relay_queued' ? 'briefing relay was not queued'
-                    : ackMismatch(ack, expected, state.message_id);
-        if (mismatch) {
-            state.rejected_ack_count++;
-            state.last_rejected_ack_reason = mismatch;
-            state.last_rejected_ack_seq = record.seq;
-        }
-        else {
-            state.state = 'acknowledged';
-            state.acknowledged_at = record.at;
-            state.acknowledgement_message_id = record.message_id;
-            state.acknowledgement_seq = record.seq;
-            validAck ??= record;
-        }
-    }
-    return { briefing: state, validAck, drift };
-}