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

package/dist/runner.js

@@ -908,9 +908,11 @@ export async function runOnce(name, opts = {}, partialDeps = {}) {
                 void recoveryController.recover(observation.generation).catch(error => deps.log(`[${name}] daemon recovery controller failed: ${error?.name ?? 'Error'}`));
             }
         }
-        if (temp && deps.shouldStop?.()) {
-            retirementReason = requestedTempStopReason(dir) ?? 'supervisor-signal';
-            deps.log(`[${name}] temporary supervisor retirement requested (${retirementReason})`);
+        if (deps.shouldStop?.()) {
+            if (temp) {
+                retirementReason = requestedTempStopReason(dir) ?? 'supervisor-signal';
+                deps.log(`[${name}] temporary supervisor retirement requested (${retirementReason})`);
+            }
             await sessionHandle.close();
             sessionClosed = true;
             break;
@@ -1002,7 +1004,9 @@ export async function runOnce(name, opts = {}, partialDeps = {}) {
         rotated = true;
         deps.log(`[${name}] ${why} -> rotated session-id; next start is FRESH`);
     };
-    if (exitRecord.detail.includes(ACP_CANCEL_DEADLINE_EXCEEDED)
+    if (!temp && deps.shouldStop?.())
+        deps.log(`[${name}] supervisor stop requested -> next start RESUMES context`);
+    else if (exitRecord.detail.includes(ACP_CANCEL_DEADLINE_EXCEEDED)
         || exitRecord.detail.includes(CODEX_APP_SERVER_CANCEL_DEADLINE_EXCEEDED))
         // This is a deliberate adapter reclamation, not evidence that resume state
         // is poisoned. Preserve the context even when the resumed generation hits
@@ -1049,7 +1053,10 @@ export async function runSupervised(name, opts = {}, partialDeps = {}, attempt =
     const deps = { ...defaultDeps(), ...partialDeps };
     const dir = agentDir(name);
     mkdirSync(dir, { recursive: true });
-    const shouldStop = deps.shouldStop ?? (() => false);
+    let stopping = false;
+    const requestStop = () => { stopping = true; };
+    const shouldStop = () => stopping || (partialDeps.shouldStop?.() ?? false);
+    deps.shouldStop = shouldStop;
     const stamp = () => new Date(deps.now()).toISOString();
     // Record how the PREVIOUS supervisor process ended before doing anything
     // else. An external kill writes nothing itself, and the next ledger write is
@@ -1071,6 +1078,9 @@ export async function runSupervised(name, opts = {}, partialDeps = {}, attempt =
             deps.log(`[${name}] previous supervisor run (started ${termination.runStartedAt}) `
                 + `ended abruptly: ${termination.detail}; abrupt terminations recorded: ${abrupt}`);
     }
+    // Service-manager stops must run the same cleanup as a completed session.
+    process.on('SIGTERM', requestStop);
+    process.on('SIGINT', requestStop);
     try {
         while (!shouldStop()) {
             let ledger = readRestartLedger(dir);
@@ -1125,6 +1135,8 @@ export async function runSupervised(name, opts = {}, partialDeps = {}, attempt =
                     mode: 'fresh',
                 };
             }
+            if (stopping)
+                break;
             // Re-read: the attempt itself may have taken minutes, and an operator may
             // have reset the ledger meanwhile.
             ledger = readRestartLedger(dir);
@@ -1189,8 +1201,10 @@ export async function runSupervised(name, opts = {}, partialDeps = {}, attempt =
         return readRestartLedger(dir);
     }
     finally {
-        // Only an orderly return through this loop clears the marker; a signal or
-        // an OOM-kill leaves it, which is exactly how the successor detects them.
+        process.off('SIGTERM', requestStop);
+        process.off('SIGINT', requestStop);
+        // An orderly shutdown clears the marker; an unhandled signal or OOM-kill
+        // leaves it so the successor can identify an abrupt termination.
         releaseSupervisorRun(dir);
     }
 }

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/fleet",
-  "version": "1.1.5",
+  "version": "1.2.0-nightly.2",
   "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.2",
+    "@ours.network/sdk": "3.8.1-nightly.4",
     "commander": "^12.1.0",
     "fastify": "^5.4.0",
     "react": "^19.1.1",