@ours.network/fleet 1.2.0-nightly.2 → 1.2.0-nightly.4

package/dist/harness/agent-session.d.ts

@@ -1,3 +1,4 @@
+import type { ManagedHarnessOurs } from '../agent-ours/harness.js';
 import type { CommonPermissions, FleetPermissionMode, ResolvedRole } from '../config.js';
 import type { AgentSession } from '../session/types.js';
 import type { Launch, SessionPrep } from './types.js';
@@ -22,6 +23,7 @@ export interface AgentSessionConfigSelection {
     value: string;
 }
 export interface AgentSessionStartOptions {
+    managedOurs?: ManagedHarnessOurs;
     role: ResolvedRole;
     prep: SessionPrep;
     launch: PreparedAgentSessionLaunch;

package/dist/harness/claude-code-session.js

@@ -1,3 +1,4 @@
+import { managedClaudeMeta } from '../agent-ours/harness.js';
 import { AcpSession } from '../session/acp.js';
 import { acpAdapterState, } from './acp-session-transport.js';
 /** Explicit Claude Code implementation of Fleet's shared agent-session factory. */
@@ -25,8 +26,9 @@ export class ClaudeCodeAgentSessionAdapter {
             argv: launch.argv, cwd: options.cwd, env: launch.env,
             stateDir: options.stateDir, mode: options.mode, permissions: options.permissions,
             modeId: this.strategy.permissionModeId(role),
-            mcpServers: this.strategy.mcpServers(role),
-            sessionMeta: this.strategy.sessionMeta(role, prep),
+            mcpServers: options.managedOurs ? [...(this.strategy.mcpServers(role) ?? []).filter(s => s.name !== 'ours'), options.managedOurs.server] : this.strategy.mcpServers(role),
+            inheritEnvironment: options.managedOurs ? false : undefined,
+            sessionMeta: options.managedOurs ? managedClaudeMeta(this.strategy.sessionMeta(role, prep)) : this.strategy.sessionMeta(role, prep),
             configSelections: this.strategy.sessionConfigSelections(role),
             permissionMode: options.permissionMode,
             permissionMetadataSource: acpAdapterState(launch.adapterState).permissionMetadataSource,

package/dist/harness/codex-session.js

@@ -23,6 +23,12 @@ export class CodexAgentSessionAdapter {
     }
     start(options) {
         const { role, prep, launch } = options;
+        const original = this.strategy.nativeConfig(role) ?? {};
+        const managed = options.managedOurs?.native;
+        const config = managed ? { ...original, ...managed,
+            mcp_servers: { ...(original.mcp_servers ?? {}), ...(managed.mcp_servers ?? {}) },
+            plugins: { ...(original.plugins ?? {}), ...(managed.plugins ?? {}) },
+        } : original;
         if (role.session === 'codex-app-server')
             return this.nativeTransport({
                 name: role.name, argv: launch.argv, cwd: options.cwd, env: launch.env,
@@ -31,7 +37,7 @@ export class CodexAgentSessionAdapter {
                 model: role.model, effort: role.effort,
                 approvalPolicy: this.strategy.approvalPolicy(role),
                 sandbox: this.strategy.sandbox(role),
-                config: this.strategy.nativeConfig(role),
+                config,
                 addDirs: this.strategy.addDirs(role),
                 log: options.log,
             });
@@ -40,7 +46,8 @@ export class CodexAgentSessionAdapter {
             argv: launch.argv, cwd: options.cwd, env: launch.env,
             stateDir: options.stateDir, mode: options.mode, permissions: options.permissions,
             modeId: this.strategy.permissionModeId(role),
-            mcpServers: this.strategy.mcpServers(role),
+            mcpServers: options.managedOurs ? [...(this.strategy.mcpServers(role) ?? []).filter(s => s.name !== 'ours'), options.managedOurs.server] : this.strategy.mcpServers(role),
+            inheritEnvironment: options.managedOurs ? false : undefined,
             sessionMeta: this.strategy.sessionMeta(role, prep),
             configSelections: this.strategy.sessionConfigSelections(role),
             permissionMode: options.permissionMode,

package/dist/harness/hermes-session.js

@@ -53,6 +53,12 @@ export class HermesAgentSessionAdapter {
         // composition; no second ambient merge may reintroduce provider secrets.
         const env = hermesChildEnvironment(role, preparedHome(prep), launch.env, launch.env);
         delete env.OURS_AUTOSTART;
+        if (options.managedOurs) {
+            for (const key of Object.keys(env))
+                if (key.startsWith('OURS_') && !key.startsWith('OURS_FLEET_'))
+                    delete env[key];
+            Object.assign(env, { FLEET_OURS_MANAGED: '1' });
+        }
         await this.checks.preflight?.(options, env);
         const nativeProvider = await this.checks.expectedProvider(role, prep);
         if (typeof nativeProvider !== 'string' || !nativeProvider.trim())
@@ -68,7 +74,7 @@ export class HermesAgentSessionAdapter {
             permissions: options.permissions, modeId, requireMode: true,
             permissionMode: { fleetMode: options.permissionMode.fleetMode, nativeMode: modeId },
             permissionTimeoutMs: 50_000,
-            mcpServers: hermesMcpServers(role, env),
+            mcpServers: options.managedOurs ? [...hermesMcpServers(role, env).filter(s => s.name !== 'ours'), options.managedOurs.server] : hermesMcpServers(role, env),
             scrubObsoleteOursAutostart: true,
             validateStartupResponse: async (initialized, created) => {
                 await this.checks.validateArtifact(initialized);

package/dist/rooms-tasks/provision.js

@@ -1,3 +1,4 @@
+import { readRoomReadiness } from '../agent-ours/service.js';
 import { createHash, randomUUID } from 'node:crypto';
 import { existsSync, readFileSync, realpathSync } from 'node:fs';
 import { join } from 'node:path';
@@ -149,8 +150,7 @@ function launchMatches(dir, member, actionId, taskSha, roomId, roomIdentityCid,
             && (startup.anonymous ?? false) === anonymous
             && sha256Text(startup.task ?? '') === taskSha
             && (expectedInviteId === undefined || startup.invite_id === expectedInviteId)
-            && typeof startup.invite === 'string'
-            && startup.invite.length > 0;
+            && startup.invite === '';
     }
     catch {
         return false;
@@ -345,7 +345,14 @@ function reconcileMemberSeats(roomId, members, observed, ownerSeatCid) {
         && seat.seat_state === 'active');
     const seats = current.member_seats.map(seat => {
         const member = members.find(candidate => candidate.name === seat.role_name);
+        const readiness = readRoomReadiness(current.room_identity_cid, member.name);
+        if (!readiness || readiness.room !== roomId || readiness.invite !== seat.invite_id) {
+            complete = false;
+            return seat;
+        }
         const found = exactCoworkSeat(observed, member, seat.invite_id);
+        if (found && found.identity_cid !== readiness.cid)
+            throw new Error('Cowork seat CID does not match supervisor provisioned identity');
         if (!found || found.seat_state !== 'active') {
             complete = false;
             return seat;

package/dist/runner.d.ts

@@ -1,3 +1,4 @@
+import { prepareManagedAgent, releaseManagedAgent } from './agent-ours/service.js';
 import { type ResolvedRole } from './config.js';
 import { type MonitorHandle, type MonitorOpts, type FetchLike } from './monitor.js';
 import { type DaemonGenerationProbe } from './daemon-recovery.js';
@@ -9,6 +10,8 @@ import { type OwnerChannelHandle, type OwnerChannelOptions } from './owner-chann
 import { type OwnerBinderLease } from './owner-channel/binder.js';
 import { ScheduledLoopManager, type ScheduledLoopManagerHandle } from './loops/manager.js';
 export interface RunnerDeps {
+    prepareAgentOurs: typeof prepareManagedAgent;
+    releaseAgentOurs: typeof releaseManagedAgent;
     exec: Exec;
     cpuDelegated(): boolean;
     isAlive(pid: number): boolean;
@@ -168,6 +171,7 @@ export declare function runOnce(name: string, opts?: {
     temp?: boolean;
     configPath?: string;
     allowResumeRotation?: boolean;
+    identityLifetime?: 'permanent' | 'temporary';
 }, partialDeps?: Partial<RunnerDeps>): Promise<AttemptResult>;
 /**
  * The persistent supervisor for one permanent role: run child sessions in a