@ours.network/fleet 1.0.1 → 1.0.3

package/dist/rooms-tasks/room-state.d.ts

@@ -1,4 +1,4 @@
-import type { RoomOrchestrationRecord, RoomOrchestrationState, SagaPhase, RoomMemberSeat, ProvisioningDetail, MemberRetirementPhase, RoomClosePhase, RoomRoleBriefingDefinition, RoomMemberLaunchState, RoomMemberBriefingState } from './types.js';
+import type { RoomOrchestrationRecord, RoomOrchestrationState, SagaPhase, RoomMemberSeat, ProvisioningDetail, MemberRetirementPhase, RoomClosePhase, RoomRoleBriefingDefinition, RoomMemberLaunchState } from './types.js';
 export declare const roomsDir: () => string;
 export declare class RoomStateError extends Error {
 }
@@ -26,7 +26,6 @@ export declare function updateRoomRoleBriefing(id: string, role: string, definit
 export declare function updateRoomHistoryCursor(id: string, cursor: number): RoomOrchestrationRecord;
 export declare function updateMemberStartup(id: string, roleName: string, update: {
     launch?: RoomMemberLaunchState;
-    briefing?: RoomMemberBriefingState;
 }): RoomOrchestrationRecord;
 export declare function activateRoom(id: string): RoomOrchestrationRecord;
 export declare function closeRoom(id: string): RoomOrchestrationRecord;

package/dist/rooms-tasks/room-state.js

@@ -122,9 +122,6 @@ export function updateRoomHistoryCursor(id, cursor) {
 const LAUNCH_ORDER = [
     'pending', 'intent', 'launched', 'stopped', 'failed',
 ];
-const BRIEFING_ORDER = [
-    'pending', 'relay_queued', 'relay_failed', 'acknowledged',
-];
 export function updateMemberStartup(id, roleName, update) {
     const r = readRoom(id);
     const seat = r.member_seats.find(candidate => candidate.role_name === roleName);
@@ -136,14 +133,8 @@ export function updateMemberStartup(id, roleName, update) {
         && !(seat.launch.state === 'failed' && update.launch.state === 'intent')) {
         throw new RoomStateError(`room ${id} member ${roleName} launch cannot move backward to ${update.launch.state}`);
     }
-    if (update.briefing && seat.briefing
-        && BRIEFING_ORDER.indexOf(update.briefing.state) < BRIEFING_ORDER.indexOf(seat.briefing.state)) {
-        throw new RoomStateError(`room ${id} member ${roleName} briefing cannot move backward to ${update.briefing.state}`);
-    }
     if (update.launch)
         seat.launch = update.launch;
-    if (update.briefing)
-        seat.briefing = update.briefing;
     writeRoom(r);
     return r;
 }

package/dist/rooms-tasks/types.d.ts

@@ -65,14 +65,14 @@ export interface TaskRecord {
     terminal_intent?: TaskTerminalIntent;
 }
 export type RoomOrchestrationState = 'provisioning' | 'active' | 'closing' | 'closed';
-export type SagaPhase = 'persist_intent' | 'create_room' | 'attach_owner' | 'create_members' | 'configure_briefings' | 'join_role_groups' | 'wait_seats' | 'launch_work' | 'wait_briefing_acks' | 'activate' | 'completed' | 'failed';
+export type SagaPhase = 'persist_intent' | 'create_room' | 'attach_owner' | 'create_members' | 'join_role_groups' | 'wait_seats' | 'launch_work' | 'activate' | 'completed' | 'failed';
 export interface SagaCursor {
     phase: SagaPhase;
     step_index: number;
     error?: string;
     recovery_hint?: string;
 }
-export type ProvisioningDetail = 'waiting_cowork' | 'waiting_owner_invite' | 'owner_cid_mismatch' | 'member_failed' | 'waiting_seats' | 'waiting_briefing_delivery' | 'waiting_briefing_acks' | 'briefing_delivery_failed' | 'uncertain';
+export type ProvisioningDetail = 'waiting_cowork' | 'waiting_owner_invite' | 'owner_cid_mismatch' | 'member_failed' | 'waiting_seats' | 'uncertain';
 export interface RoomRoleBriefingDefinition {
     role: string;
     text: string;
@@ -87,27 +87,13 @@ export interface RoomMemberLaunchState {
     state: 'pending' | 'intent' | 'launched' | 'stopped' | 'failed';
     attempt: number;
     action_id?: string;
+    /** Expected authenticated proxy caller while adopting a post-spawn crash. */
+    caller_role?: string;
     mission_sha256?: string;
     launch_id?: string;
     updated_at: string;
     error?: string;
 }
-export interface RoomMemberBriefingState {
-    role: string;
-    state: 'pending' | 'relay_queued' | 'relay_failed' | 'acknowledged';
-    message_id?: string;
-    relay_intent_record_id?: string;
-    relay_result_record_id?: string;
-    relay_wire_id?: string;
-    checked_at?: string;
-    acknowledged_at?: string;
-    acknowledgement_message_id?: string;
-    acknowledgement_seq?: number;
-    rejected_ack_count: number;
-    last_rejected_ack_reason?: string;
-    last_rejected_ack_seq?: number;
-    last_processed_seq?: number;
-}
 export type RoomHistoryEvidence = {
     kind: 'message';
     seq: number;
@@ -161,12 +147,12 @@ export interface RoomCloseCursor {
 }
 export interface RoomMemberSeat {
     role_name: string;
-    identity_cid: string;
+    identity_cid?: string;
+    invite_id?: string;
     slot: string;
     cowork_role: string;
     seat_state: 'pending' | 'active' | 'removed';
     launch?: RoomMemberLaunchState;
-    briefing?: RoomMemberBriefingState;
     retirement?: MemberRetirement;
 }
 export interface RoomOrchestrationRecord {

package/dist/runner.js

@@ -61,15 +61,15 @@ const defaultDeps = () => ({
     },
 });
 const MONITOR_OWNER_FILE = '.monitor-owner';
-/** Fleet roles consume the operator-owned daemon; a role session never starts it. */
-const FLEET_OURS_AUTOSTART = '0';
+const OBSOLETE_OURS_AUTOSTART_ENV = 'OURS_AUTOSTART';
 /** Environment injected only into the managed harness process. */
 export function managedFleetProxyEnv(role, stateDir) {
+    const roleEnv = { ...(role.env ?? {}) };
+    // ours-mcp 1.0 treats presence (even "0") as a fatal legacy lifecycle mode.
+    // Managed children are daemon clients; the proxy itself never starts one.
+    delete roleEnv[OBSOLETE_OURS_AUTOSTART_ENV];
     return {
-        ...(role.env ?? {}),
-        // This must win over both inherited/configured auto-start. ACP agents run
-        // directly rather than through ours-codex, so the runner owns this fence.
-        OURS_AUTOSTART: FLEET_OURS_AUTOSTART,
+        ...roleEnv,
         [FLEET_PROXY_STATE_DIR_ENV]: stateDir,
         [FLEET_PROXY_CALLER_ENV]: role.name,
     };
@@ -166,17 +166,14 @@ export function recordMonitorOwner(dir, owner) {
 export function buildPaneCommand(launch, roleEnv, exitStatusPath, paneArgv = launch.argv) {
     const env = {
         PATH: process.env.PATH ?? '', COLORTERM: 'truecolor', ...launch.env, ...(roleEnv ?? {}),
-        // Tmux roles have the same daemon-client boundary as ACP roles. Keep this
-        // last so neither harness preparation nor a role env block can take over
-        // the shared daemon lifecycle.
-        OURS_AUTOSTART: FLEET_OURS_AUTOSTART,
     };
+    delete env[OBSOLETE_OURS_AUTOSTART_ENV];
     // Interactive panes should advertise colour even when the supervisor itself
     // was launched with NO_COLOR. A role may still deliberately opt back in to
     // NO_COLOR (or replace COLORTERM) through its explicit env block.
     const unsetNoColor = Object.prototype.hasOwnProperty.call(roleEnv ?? {}, 'NO_COLOR')
         ? '' : '-u NO_COLOR ';
-    const envPfx = 'env ' + unsetNoColor
+    const envPfx = 'env -u OURS_AUTOSTART ' + unsetNoColor
         + Object.entries(env).map(([k, v]) => `${k}=${shq(v)}`).join(' ');
     const cmd = paneArgv.map(shq).join(' ');
     // Write a structured record, not a bare number: the wait status alone cannot
@@ -645,6 +642,7 @@ export async function runOnce(name, opts = {}, partialDeps = {}) {
             // role-only adapter hook prevents a PATH fallback or resolver skew from
             // claiming metadata trust for an argv it did not authenticate.
             permissionMetadataSource: launch.permissionMetadataSource,
+            scrubObsoleteOursAutostart: true,
             log: deps.log,
         });
         pid = acpSession.pid;

package/dist/session/acp.d.ts

@@ -21,6 +21,8 @@ export declare const AFTER_TOOL_BOUNDARY_TIMEOUT_MS = 120000;
  * live role.
  */
 export declare const STEERING_OCCUPANCY_IDLE_MS = 150000;
+/** Consumed only by Fleet's authenticated bundled-Codex app-server proxy. */
+export declare const CODEX_DISABLE_INHERITED_MCP_ENV = "OURS_FLEET_CODEX_DISABLE_INHERITED_MCP";
 /** Server-generated typed provenance followed by the exact human-authored body. */
 export declare function promptContentBlocks(text: string, origin?: PromptOrigin): acp.ContentBlock[];
 export declare function runtimeSelector(options: acp.SessionConfigOption[] | null | undefined, category: string): RuntimeSelectorMetadata | undefined;
@@ -38,10 +40,13 @@ export interface AcpSessionOptions {
     permissionMode?: NonNullable<SessionSnapshot['permissionMode']>;
     /** Adapter-authenticated request-metadata vocabulary; never inferred from ACP `_meta`. */
     permissionMetadataSource?: 'codex-acp';
+    /** Fleet-managed ours proxies must never receive the obsolete presence-sensitive flag. */
+    scrubObsoleteOursAutostart?: boolean;
     /**
-     * MCP servers the ROLE declares, for every session/new, resume and load. Empty
-     * or omitted sends `[]`, which is what fleet has always sent and leaves the
-     * agent's own configuration untouched.
+     * MCP servers the ROLE declares, for every session/new, resume and load.
+     * Omitted preserves inherited configuration (encoded as ACP's required `[]`);
+     * an explicit empty array disables every inherited server through the
+     * authenticated bundled-adapter compatibility path.
      */
     mcpServers?: AcpMcpServer[];
     /**
@@ -258,14 +263,7 @@ export declare class AcpSession implements SessionHandle {
     private settlePendingAutomatically;
     exitResult(): ExitRecord | null;
     close(): Promise<void>;
-    /**
-     * The role's declared MCP servers, or `[]`.
-     *
-     * Sent on resume and load as well as on new: the agent builds its server set
-     * once per session, so a resumed session that omitted them would come back
-     * without the tools the role's config declares — which is exactly the shape of
-     * silent drop this plumbing exists to end.
-     */
+    /** ACP requires the field. Bundled agents treat [] as no client-added servers. */
     private declaredMcpServers;
     private initialize;
     private captureRuntimeMetadata;

package/dist/session/acp.js

@@ -32,6 +32,8 @@ export const AFTER_TOOL_BOUNDARY_TIMEOUT_MS = 120_000;
  */
 export const STEERING_OCCUPANCY_IDLE_MS = 150_000;
 const TERMINAL_TOOL_STATUSES = new Set(['completed', 'failed']);
+/** Consumed only by Fleet's authenticated bundled-Codex app-server proxy. */
+export const CODEX_DISABLE_INHERITED_MCP_ENV = 'OURS_FLEET_CODEX_DISABLE_INHERITED_MCP';
 const SCHEDULED_LOOP_REDACTION = '[scheduled-loop content redacted]';
 const OWNER_COMMENTARY_REDACTION = '[assistant commentary redacted]';
 const MAX_CANONICAL_SYMLINK_DEPTH = 40;
@@ -304,9 +306,25 @@ export class AcpSession {
     static async start(options) {
         if (!options.argv.length)
             throw new Error('ACP agent command is empty');
+        const disableInheritedCodexMcp = options.permissionMetadataSource === 'codex-acp'
+            && options.mcpServers !== undefined && options.mcpServers.length === 0;
+        // Obsolete ours-mcp lifecycle flags are presence-sensitive. The shared
+        // daemon remains operator-owned; managed ACP children are clients only.
+        const childEnv = {
+            ...process.env,
+            ...options.env,
+        };
+        if (options.scrubObsoleteOursAutostart)
+            delete childEnv.OURS_AUTOSTART;
+        Object.assign(childEnv, 
+        // Write both states for the authenticated proxy: a stale ambient `1`
+        // must never leak explicit-empty semantics into a later inherited role.
+        options.permissionMetadataSource === 'codex-acp'
+            ? { [CODEX_DISABLE_INHERITED_MCP_ENV]: disableInheritedCodexMcp ? '1' : '0' }
+            : {});
         const child = spawn(options.argv[0], options.argv.slice(1), {
             cwd: options.cwd,
-            env: { ...process.env, ...options.env },
+            env: childEnv,
             stdio: ['pipe', 'pipe', 'pipe'],
         });
         await new Promise((resolve, reject) => {
@@ -991,14 +1009,7 @@ export class AcpSession {
         });
         this.conversation.close();
     }
-    /**
-     * The role's declared MCP servers, or `[]`.
-     *
-     * Sent on resume and load as well as on new: the agent builds its server set
-     * once per session, so a resumed session that omitted them would come back
-     * without the tools the role's config declares — which is exactly the shape of
-     * silent drop this plumbing exists to end.
-     */
+    /** ACP requires the field. Bundled agents treat [] as no client-added servers. */
     declaredMcpServers() {
         return this.options.mcpServers ?? [];
     }

package/dist/spawn.d.ts

@@ -1,5 +1,5 @@
 import type { IsolationConfig } from './isolation/types.js';
-import { type ApprovalMode, type FilesystemMode, type ResolvedRole, type RoleConfig, type MonitorConfig, type SessionBackendId, type UnattendedMode, type RoomStartupGate } from './config.js';
+import { type ApprovalMode, type FilesystemMode, type ResolvedRole, type RoleConfig, type MonitorConfig, type SessionBackendId, type UnattendedMode, type RoomMemberStartup } from './config.js';
 import { type OpsDeps } from './ops.js';
 import { type CreationDeps, type CreationProvenance } from './creation.js';
 import './harness/claude-code.js';
@@ -46,8 +46,8 @@ export interface SpawnOpts {
     creationActionId?: string;
     /** Set only by a live role supervisor after a role-scoped proxy request. */
     callerRole?: string;
-    /** Trusted Fleet-internal gate for a Cowork room member; not a CLI/config surface. */
-    roomStartupGate?: RoomStartupGate;
+    /** Trusted Fleet-internal first-boot payload for a Cowork room member. */
+    roomMemberStartup?: RoomMemberStartup;
     /** Internal provenance labels for values filled by the caller's supervisor. */
     inheritedFromCaller?: string[];
     /**

package/dist/spawn.js

@@ -8,7 +8,7 @@ import { loadConfig, resolveAuthProxy, resolveModelChain, resolveMonitorConfig,
 import { resolveRoleModelEnv } from './model-env.js';
 import { applyRole, up } from './ops.js';
 import { START_STAGGER_FILE } from './runner.js';
-import { buildProvenance, daemonIdentityInventoryProvisioner, daemonIdentityProvisioner, ensureIdentity, provenanceOf, withCreationTransaction, writeProvenance, writeRoleFile, } from './creation.js';
+import { buildProvenance, daemonIdentityProvisioner, ensureIdentity, provenanceOf, withCreationTransaction, writeProvenance, writeRoleFile, } from './creation.js';
 import { VERSION } from './version.js';
 import './harness/claude-code.js';
 import './harness/codex.js';
@@ -389,21 +389,13 @@ export async function spawnTemp(o, binPath, launch = independentSupervisor, crea
     return withCreationTransaction({ role: o.name, identity: effectiveIdentity(o) }, async (tx) => {
         creation.onStage?.('checking_identity');
         assertNameFree(o);
-        const guarantee = await ensureIdentity(effectiveIdentity(o), profileValues(o), creation.identityProvisioner ?? daemonIdentityInventoryProvisioner(), creation.log);
         creation.onStage?.('checking_identity', {
-            result: guarantee.evidence, guarantee: guarantee.state,
+            result: 'unknown', guarantee: 'unverified',
         });
-        if (guarantee.state === 'created')
-            tx.record({
-                stage: `ours identity ${effectiveIdentity(o)}`,
-                undo: async () => {
-                    await creation.identityProvisioner?.remove?.(effectiveIdentity(o));
-                },
-            });
-        return spawnTempInner(o, binPath, launch, tx, guarantee, creation.onStage);
+        return spawnTempInner(o, binPath, launch, tx, creation.onStage);
     }, creation);
 }
-async function spawnTempInner(o, binPath, launch, tx, guarantee, onStage) {
+async function spawnTempInner(o, binPath, launch, tx, onStage) {
     const cfg = loadConfig(o.configPath);
     const defaultHarness = cfg.defaults.harness;
     const fromOpts = buildRoleConfig(o, defaultHarness);
@@ -445,13 +437,13 @@ async function spawnTempInner(o, binPath, launch, tx, guarantee, onStage) {
         worklog: resolveWorklogPolicy(cfg.defaults.worklog, fromOpts.worklog),
         auth_proxy: tempAuthProxy,
         sourceFile: '(temp)',
-        roomStartupGate: o.roomStartupGate,
+        roomMemberStartup: o.roomMemberStartup,
     };
     role.env = modelEnv.env;
     if (role.auth_proxy && role.harness !== 'claude-code')
         throw new Error('auth_proxy is supported only by claude-code');
     onStage?.('writing_role');
-    const dir = applyRole(role, { temp: true, identityGuarantee: guarantee.state });
+    const dir = applyRole(role, { temp: true, identityGuarantee: 'unverified' });
     const provenance = buildProvenance({
         role: o.name, lifetime: 'temporary', fleetVersion: VERSION,
         settings: provenanceSettings(o, cfg.defaults),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/fleet",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Harness-agnostic fleet of persistent, identity-bound AI agents. Declarative fleet.yaml, tmux or ACP sessions, supervision, and ours.network messaging.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",