@ours.network/fleet 1.1.3 → 1.1.5

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

@@ -75,7 +75,7 @@ export interface CoworkAdapter {
     }): Promise<CoworkRoleBriefingInfo>;
     setRoleCommands(roomId: string, opts: {
         role: string;
-        commands: Array<'list-members' | 'remove-member'>;
+        commands: Array<'*' | 'list-members' | 'remove-member'>;
     }): Promise<void>;
     getHistory(roomId: string, opts?: {
         after?: number;

package/dist/session/acp.d.ts

@@ -26,6 +26,12 @@ export declare const CODEX_DISABLE_INHERITED_MCP_ENV = "OURS_FLEET_CODEX_DISABLE
 /** 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;
+/** Fresh ACP response including the legacy model report still used by some adapters. */
+export type AcpStartupSessionResponse = acp.NewSessionResponse & {
+    models?: {
+        currentModelId?: string;
+    };
+};
 export interface AcpSessionOptions {
     /** Opt-in Fleet watchdog, owned by this ACP session, never a process restart. */
     stallRecovery?: {
@@ -39,11 +45,20 @@ export interface AcpSessionOptions {
     argv: string[];
     cwd: string;
     env: Record<string, string>;
+    /** Merge the parent environment before env; false uses only the supplied env. Defaults to true. */
+    inheritEnvironment?: boolean;
     stateDir: string;
     mode: 'fresh' | 'resume';
     permissions: CommonPermissions;
     /** Native permission-mode id to request via session/set_mode; undefined keeps the agent default. */
     modeId?: string;
+    /** Require modeId to be advertised and session/set_mode to succeed before readiness. */
+    requireMode?: boolean;
+    /**
+     * Validate initialize and session/new reports before persistence or readiness.
+     * Throw/reject to fail startup. Not called for session/load or session/resume.
+     */
+    validateStartupResponse?: (initialized: acp.InitializeResponse, created: AcpStartupSessionResponse) => void | Promise<void>;
     /** Ordered explicit Brain choices that must be applied before readiness. */
     configSelections?: Array<{
         configId: string;

package/dist/session/acp.js

@@ -332,7 +332,7 @@ export class AcpSession {
         // 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.inheritEnvironment === false ? {} : process.env),
             ...options.env,
         };
         if (options.scrubObsoleteOursAutostart)
@@ -1067,6 +1067,7 @@ export class AcpSession {
             ? readFileSync(this.sessionFile, 'utf8').trim()
             : '';
         let advertisedConfigOptions;
+        let advertisedModes;
         let advertisedModelId;
         if (persisted && this.agentCapabilities?.sessionCapabilities?.resume != null) {
             const resumed = await this.connection.agent.request(acp.methods.agent.session.resume, {
@@ -1075,6 +1076,7 @@ export class AcpSession {
                 mcpServers: this.declaredMcpServers(),
             });
             advertisedConfigOptions = resumed.configOptions;
+            advertisedModes = resumed.modes;
             advertisedModelId = resumed.models?.currentModelId;
             this.captureRuntimeMetadata(advertisedConfigOptions, advertisedModelId);
             this.sessionId = persisted;
@@ -1090,6 +1092,7 @@ export class AcpSession {
                     mcpServers: this.declaredMcpServers(),
                 });
                 advertisedConfigOptions = loaded.configOptions;
+                advertisedModes = loaded.modes;
                 advertisedModelId = loaded.models?.currentModelId;
                 this.captureRuntimeMetadata(advertisedConfigOptions, advertisedModelId);
             }
@@ -1105,6 +1108,8 @@ export class AcpSession {
                 ...(this.options.sessionMeta ? { _meta: this.options.sessionMeta } : {}),
             });
             this.sessionId = created.sessionId;
+            await this.options.validateStartupResponse?.(initialized, created);
+            advertisedModes = created.modes;
             advertisedConfigOptions = created.configOptions;
             advertisedModelId = created.models?.currentModelId;
             this.captureRuntimeMetadata(advertisedConfigOptions, advertisedModelId);
@@ -1130,14 +1135,18 @@ export class AcpSession {
             if (applied?.currentValue !== selection.value)
                 throw new Error(`ACP agent did not apply required session config option '${selection.configId}' value '${selection.value}'`);
         }
-        // Do not persist a session until every required Brain choice is live. A
-        // failed startup closes the ACP session; persisting its id first would make
-        // a later resume repeatedly target that invalid session.
-        writeFileSync(this.sessionFile, this.sessionId + '\n', { mode: 0o600 });
+        if (this.options.requireMode) {
+            if (!this.options.modeId?.trim())
+                throw new Error('ACP required session mode requires a non-empty modeId');
+            if (!advertisedModes?.availableModes.some(mode => mode.id === this.options.modeId))
+                throw new Error(`ACP agent did not advertise required session mode '${this.options.modeId}'`);
+        }
+        // Preserve existing persistence timing for optional permission modes.
+        if (!this.options.requireMode)
+            writeFileSync(this.sessionFile, this.sessionId + '\n', { mode: 0o600 });
         // Deliver the configured permission mode whichever way the session came up
         // (new, resume or load) — the launch flag never reaches an ACP agent. A
-        // refusal is loud but never fatal: the session then simply runs at the
-        // agent's own default.
+        // refusal is fatal only when the adapter explicitly requires this mode.
         if (this.options.modeId) {
             try {
                 await this.connection.agent.request(acp.methods.agent.session.setMode, {
@@ -1146,10 +1155,16 @@ export class AcpSession {
                 });
             }
             catch (e) {
+                if (this.options.requireMode)
+                    throw new Error(`ACP agent refused required session mode '${this.options.modeId}': `
+                        + (e instanceof Error ? e.message : String(e)));
                 this.options.log(`[${this.options.name}] acp: session/set_mode "${this.options.modeId}" failed ` +
                     `(${e instanceof Error ? e.message : String(e)}) — session runs at the agent default permission mode`);
             }
         }
+        // A required mode must succeed before its session becomes resumable.
+        if (this.options.requireMode)
+            writeFileSync(this.sessionFile, this.sessionId + '\n', { mode: 0o600 });
         this.readiness = 'idle';
         this.events.emit('state', { status: 'idle', text: `ACP session ${this.sessionId}` });
         this.conversation.appendSafe({

package/dist/spawn.d.ts

@@ -5,6 +5,7 @@ import { type OpsDeps } from './ops.js';
 import { type CreationDeps, type CreationProvenance } from './creation.js';
 import './harness/claude-code.js';
 import './harness/codex.js';
+import './harness/hermes.js';
 import { type SupervisorLauncher } from './temp-lifecycle.js';
 /**
  * The provenance record written by the most recent spawn in this process, so

package/dist/spawn.js

@@ -12,6 +12,7 @@ import { VERSION } from './version.js';
 import { recordGeneratedAgentSource } from './generated-agent-source.js';
 import './harness/claude-code.js';
 import './harness/codex.js';
+import './harness/hermes.js';
 import { archiveTempState, makeTempSupervisorLauncher, prepareTempSupervisor, reclaimStaleTempState, } from './temp-lifecycle.js';
 /**
  * The provenance record written by the most recent spawn in this process, so

package/examples/fleet/brains/hermes.yaml

@@ -0,0 +1,5 @@
+# Illustrative model ID: choose one supported by the provider provisioned in
+# the stopped role's Hermes home. This is not a Fleet default model.
+harness: hermes
+session: acp
+model: gpt-5.6-sol

package/package.json

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