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

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/session/codex-app-server.js

@@ -879,6 +879,21 @@ export class CodexAppServerSession {
             this.transport.respond(id, { currentTimeAt: Math.floor(Date.now() / 1_000) });
             return;
         }
+        if (method === 'mcpServer/elicitation/request') {
+            const schema = params.requestedSchema;
+            // The permission UI can answer a confirmation, but cannot collect form
+            // fields or perform URL-based verification on the user's behalf.
+            if (params.mode !== 'form' || !isObject(schema) || schema.type !== 'object'
+                || !isObject(schema.properties) || Object.keys(schema.properties).length
+                || (schema.required !== undefined
+                    && (!Array.isArray(schema.required) || schema.required.length))) {
+                this.options.log(`[${this.options.name}] codex app-server: unsupported MCP elicitation form`);
+                this.transport.respond(id, { action: 'decline', content: null, _meta: null });
+                return;
+            }
+            this.requestPermission(method, id, params);
+            return;
+        }
         if (method === 'item/tool/requestUserInput') {
             this.options.log(`[${this.options.name}] codex app-server: requestUserInput has no interactive Fleet mapping; returning no answers`);
             this.transport.respond(id, { answers: {} });
@@ -896,9 +911,11 @@ export class CodexAppServerSession {
             { optionId: 'allow_session', name: 'Allow for session', kind: 'allow_always', native: 'acceptForSession' },
             { optionId: 'deny_once', name: 'Deny', kind: 'reject_once', native: 'decline' },
             { optionId: 'cancel', name: 'Cancel', kind: 'reject_once', native: 'cancel' },
-        ].filter(option => method === 'item/fileChange/requestApproval'
-            || method === 'item/permissions/requestApproval'
-            || !available.length || available.includes(option.native))
+        ].filter(option => method === 'mcpServer/elicitation/request'
+            ? option.optionId !== 'allow_session'
+            : method === 'item/fileChange/requestApproval'
+                || method === 'item/permissions/requestApproval'
+                || !available.length || available.includes(option.native))
             .map(({ native: _native, ...option }) => option);
         const pending = {
             requestId, method, toolCallId, options,
@@ -909,7 +926,8 @@ export class CodexAppServerSession {
         // `approval=allow` covers native operations inside the declared boundary;
         // it must never silently widen filesystem or network authority.
         if (this.options.permissions.approval === 'allow'
-            && method !== 'item/permissions/requestApproval') {
+            && method !== 'item/permissions/requestApproval'
+            && method !== 'mcpServer/elicitation/request') {
             this.transport.respond(requestId, this.permissionResponse(pending, 'accept'));
             this.resolvePermission(permissionId, pending, 'allowed', 'automatic', 'allow_once', 'permissions.approval=allow', 'the native request is inside the configured Codex boundary');
             return;
@@ -925,7 +943,9 @@ export class CodexAppServerSession {
         this.readiness = 'awaiting_permission';
         const timeoutMs = this.options.permissionTimeoutMs ?? PERMISSION_TIMEOUT_MS;
         const expiresAt = new Date(Date.now() + timeoutMs).toISOString();
-        const title = string(params.command) ?? string(params.reason)
+        const title = (method === 'mcpServer/elicitation/request'
+            ? `${string(params.serverName) ?? 'MCP'}: ${string(params.message) ?? 'Confirmation requested'}`
+            : undefined) ?? string(params.command) ?? string(params.reason)
             ?? (method === 'item/fileChange/requestApproval' ? 'Apply file changes'
                 : method === 'item/permissions/requestApproval' ? 'Grant additional permissions'
                     : 'Run command');
@@ -993,6 +1013,12 @@ export class CodexAppServerSession {
         return !turnId || !this.activeTurn.nativeTurnId || turnId === this.activeTurn.nativeTurnId;
     }
     permissionResponse(pending, decision) {
+        if (pending.method === 'mcpServer/elicitation/request')
+            return {
+                action: decision === 'acceptForSession' ? 'accept' : decision,
+                content: decision.startsWith('accept') ? {} : null,
+                _meta: null,
+            };
         if (pending.method !== 'item/permissions/requestApproval')
             return { decision };
         const requested = pending.requestedPermissions ?? {};

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/dist/supervisor/launchd.js

@@ -14,8 +14,15 @@ const LAST_EXIT_RE = /^\s*last exit (?:code|status|reason)\s*=\s*(.+?)\s*$/mi;
 const STATE_RE = /^\s*state\s*=\s*(.+?)\s*$/m;
 const agentsDir = () => join(home(), 'Library', 'LaunchAgents');
 const plistPath = (name) => join(agentsDir(), `${labelFor(name)}.plist`);
+const xml = (value) => value
+    .replaceAll('&', '&')
+    .replaceAll('<', '&lt;')
+    .replaceAll('>', '&gt;')
+    .replaceAll('"', '&quot;')
+    .replaceAll("'", '&apos;');
 function plist(name, binPath) {
     const log = join(logsRoot(), `${name}.log`);
+    const config = process.env.OURS_CONFIG;
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -23,7 +30,7 @@ function plist(name, binPath) {
   <key>Label</key><string>${labelFor(name)}</string>
   <key>ProgramArguments</key>
   <array><string>${binPath}</string><string>_run</string><string>${name}</string></array>
-  <!-- The runner owns the child-session restart loop. launchd must only
+${config ? `  <key>EnvironmentVariables</key><dict><key>OURS_CONFIG</key><string>${xml(config)}</string></dict>\n` : ''}  <!-- The runner owns the child-session restart loop. launchd must only
        recover the runner PROCESS crashing: a bare KeepAlive would resume the
        uncounted relaunch loop and restart a deliberately held-down agent. -->
   <key>KeepAlive</key><dict><key>SuccessfulExit</key><false/></dict>

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.4",
+  "version": "1.2.0-nightly.1",
   "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",
@@ -34,14 +34,15 @@
     "test:e2e": "npm run build && playwright test",
     "dev:web": "vite",
     "prepack": "npm run build",
-    "prepublishOnly": "npm run build && npm test"
+    "prepublishOnly": "npm run build && npm test",
+    "test:v1-recovery": "node test/fleet-v1-recovery.integration.mjs retry && node test/fleet-v1-recovery.integration.mjs terminal-after-failure && node test/fleet-v1-recovery.integration.mjs terminal-release-failure"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@fastify/static": "^10.1.2",
     "@fastify/websocket": "^11.2.0",
-    "@ours.network/cli": "1.0.1",
-    "@ours.network/sdk": "3.7.0",
+    "@ours.network/cli": "2.8.1-nightly.1",
+    "@ours.network/sdk": "3.8.1-nightly.3",
     "commander": "^12.1.0",
     "fastify": "^5.4.0",
     "react": "^19.1.1",