@ours.network/fleet 0.17.8 → 0.17.9

package/dist/owner-channel/channel.js

@@ -715,11 +715,7 @@ export class OwnerChannel {
                 origin: { kind: 'owner', requestId,
                     ...(group.caption ? { displayText: String(group.caption.text ?? '') } : {}) },
             });
-            const accepted = this.options.config.interrupt
-                ? ownerNotices.receivedInterrupting()
-                : queued.queuedBehind > 0
-                    ? ownerNotices.receivedQueued(queued.queuedBehind)
-                    : ownerNotices.receivedStarted();
+            const accepted = this.acceptanceNotice(queued);
             handledWireIds.forEach(wire => this.inFlight.add(wire));
             const receipt = this.send(sender.id, accepted, originWireId).then(() => undefined).catch(error => {
                 this.logError(`attachment request ${requestId.slice(0, 12)} acceptance notice failed`, error);
@@ -860,14 +856,7 @@ export class OwnerChannel {
             this.state.remember(wireId);
             return true;
         }
-        // Interrupting the live turn does not remove prompts which were already
-        // accepted into the ACP queue. Never claim this request is running while
-        // the session itself says earlier work remains ahead of it.
-        const accepted = queued.queuedBehind > 0
-            ? ownerNotices.receivedQueued(queued.queuedBehind)
-            : this.options.config.interrupt
-                ? ownerNotices.receivedInterrupting()
-                : ownerNotices.receivedStarted();
+        const accepted = this.acceptanceNotice(queued);
         this.inFlight.add(wireId);
         const receipt = this.send(sender.id, accepted, wireId).then(() => undefined).catch(error => {
             this.logError(`request ${requestId.slice(0, 12)} acceptance notice failed`, error);
@@ -1253,6 +1242,32 @@ export class OwnerChannel {
     authorizationIntegrity() {
         return this.options.config.agent ? { ok: true } : this.authorizations.integrity();
     }
+    /**
+     * Report what the session actually did with the prompt, not what the config
+     * asked for. `interrupt: true` used to be reported as "your request
+     * interrupted the previous task" unconditionally; the session now answers
+     * whether anything was cancelled, whether the request is queued behind
+     * earlier prompts, or whether it is held until the current task reaches a
+     * safe stopping point. Backends that report no delivery state keep the old
+     * queuedBehind-based wording.
+     */
+    acceptanceNotice(queued) {
+        switch (queued.delivery) {
+            case 'interrupted': return ownerNotices.receivedInterrupting();
+            case 'deferred': return ownerNotices.receivedDeferred();
+            case 'queued': return ownerNotices.receivedQueued(Math.max(1, queued.queuedBehind));
+            case 'started': return ownerNotices.receivedStarted();
+            default:
+                // Interrupting the live turn does not remove prompts which were already
+                // accepted into the ACP queue. Never claim this request is running while
+                // the session itself says earlier work remains ahead of it.
+                return queued.queuedBehind > 0
+                    ? ownerNotices.receivedQueued(queued.queuedBehind)
+                    : this.options.config.interrupt
+                        ? ownerNotices.receivedInterrupting()
+                        : ownerNotices.receivedStarted();
+        }
+    }
     async complete(active, outbox, queued, activityCursor) {
         const progressMs = this.options.config.progress_interval_ms;
         let lastSeq = activityCursor;

package/dist/owner-channel/notices.d.ts

@@ -22,6 +22,13 @@ export declare const ownerNotices: {
     receivedStarted: () => string;
     receivedQueued: (queuedBehind: number) => string;
     receivedInterrupting: () => string;
+    /**
+     * The honest answer when the agent is mid-task and pre-empting it would have
+     * corrupted the conversation. Says "not started yet" rather than borrowing
+     * `receivedInterrupting`'s claim that something was cancelled for this
+     * request.
+     */
+    receivedDeferred: () => string;
     status: (role: string, snapshot: SessionSnapshot) => string;
     interrupted: (role: string) => string;
     /** The turn IS cancelled — say how, without implying the owner must retry. */

package/dist/owner-channel/notices.js

@@ -26,6 +26,15 @@ export const ownerNotices = {
     receivedInterrupting: () => "ℹ️ Message received. The agent's previous task was interrupted to prioritize "
         + 'this request, and it is now working on a response. '
         + 'The response will arrive in this channel when ready.',
+    /**
+     * The honest answer when the agent is mid-task and pre-empting it would have
+     * corrupted the conversation. Says "not started yet" rather than borrowing
+     * `receivedInterrupting`'s claim that something was cancelled for this
+     * request.
+     */
+    receivedDeferred: () => 'ℹ️ Message received and held. The agent is in the middle of a task that '
+        + 'cannot be interrupted safely; this request starts as soon as that work '
+        + 'reaches a stopping point. The response will arrive in this channel when ready.',
     status: (role, snapshot) => `📊 ${role} status: ${snapshot.readiness}; session is ${snapshot.alive ? 'online' : 'offline'}.`,
     interrupted: (role) => `🛑 Interrupt sent to ${role}'s active turn.`,
     /** The turn IS cancelled — say how, without implying the owner must retry. */

package/dist/runner.d.ts

@@ -61,6 +61,23 @@ export declare function readExitRecord(path: string): ExitRecord | null;
 export declare const RESTART_LEDGER_FILE = ".restart-ledger.json";
 /** Consecutive immediate failures tolerated before the agent is held down. */
 export declare const RESTART_FAIL_THRESHOLD = 5;
+/**
+ * How the previous supervisor process ended.
+ *
+ * `abrupt` is the case the ledger used to miss entirely: an OOM-kill or any
+ * other external signal takes the supervisor down before it can write anything,
+ * the service manager restarts the unit, and every durable indicator still
+ * describes the run that died. A health check reading them reported "no
+ * restarts" for a role that had died and come back.
+ */
+export interface TerminationRecord {
+    class: 'clean' | 'abrupt' | 'unknown';
+    detail: string;
+    /** When the SURVIVING process observed it, not when it happened. */
+    observedAt: string;
+    /** Start time of the run that ended, when it was recorded. */
+    runStartedAt?: string;
+}
 export interface RestartLedger {
     version: 1;
     consecutiveImmediateFailures: number;
@@ -72,7 +89,29 @@ export interface RestartLedger {
     updatedAt: string;
     /** When the circuit opened, for the held-down status line. */
     openedAt?: string;
+    /** How the previous supervisor process ended, including abnormal exits. */
+    lastTermination?: TerminationRecord;
+    /** Supervisor processes that died without closing their run marker. */
+    abruptTerminations?: number;
+    /** Start of the supervisor run that owns this state directory now. */
+    supervisorStartedAt?: string;
 }
+/**
+ * Carried across a supervisor process's life so its successor can tell an
+ * orderly exit from a kill. Present on disk == "a supervisor believed it was
+ * running"; the next start finding one that is not its own is proof the
+ * previous process died without getting to write anything.
+ */
+export declare const RUN_MARKER_FILE = ".supervisor-run.json";
+/**
+ * Claim this state directory for the current supervisor process and report how
+ * the previous one ended. Runs BEFORE the first attempt, which is the whole
+ * point: after an abrupt kill nothing else writes until an attempt finishes,
+ * and an attempt can take minutes.
+ */
+export declare function claimSupervisorRun(dir: string, startedAt: string, pid?: number): TerminationRecord;
+/** Orderly exit: the successor must not read this run as a kill. */
+export declare function releaseSupervisorRun(dir: string): void;
 /** Bounded exponential backoff for the nth consecutive immediate failure. */
 export declare function backoffFor(consecutiveFailures: number): number;
 /** Read a role's restart ledger; a missing or corrupt one starts clean. */

package/dist/runner.js

@@ -230,6 +230,66 @@ const emptyLedger = () => ({
     circuit: 'closed',
     updatedAt: new Date(0).toISOString(),
 });
+/**
+ * Carried across a supervisor process's life so its successor can tell an
+ * orderly exit from a kill. Present on disk == "a supervisor believed it was
+ * running"; the next start finding one that is not its own is proof the
+ * previous process died without getting to write anything.
+ */
+export const RUN_MARKER_FILE = '.supervisor-run.json';
+function readRunMarker(dir) {
+    try {
+        const raw = JSON.parse(readFileSync(join(dir, RUN_MARKER_FILE), 'utf8'));
+        return raw.version === 1 && typeof raw.pid === 'number' && typeof raw.startedAt === 'string'
+            ? raw : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Claim this state directory for the current supervisor process and report how
+ * the previous one ended. Runs BEFORE the first attempt, which is the whole
+ * point: after an abrupt kill nothing else writes until an attempt finishes,
+ * and an attempt can take minutes.
+ */
+export function claimSupervisorRun(dir, startedAt, pid = process.pid) {
+    const previous = readRunMarker(dir);
+    const termination = previous && previous.pid !== pid
+        ? {
+            class: 'abrupt',
+            detail: `supervisor pid ${previous.pid} left an open run marker; `
+                + 'it was terminated without an orderly exit (signal, OOM-kill, or host reset)',
+            observedAt: startedAt,
+            runStartedAt: previous.startedAt,
+        }
+        : previous
+            ? { class: 'unknown', detail: 'run marker belongs to this process', observedAt: startedAt }
+            : { class: 'clean', detail: 'no previous run marker', observedAt: startedAt };
+    try {
+        mkdirSync(dir, { recursive: true });
+        writeFileSync(join(dir, RUN_MARKER_FILE), JSON.stringify({ version: 1, pid, startedAt }, null, 2) + '\n');
+    }
+    catch { /* diagnostics must never take the role down */ }
+    return termination;
+}
+/** Orderly exit: the successor must not read this run as a kill. */
+export function releaseSupervisorRun(dir) {
+    try {
+        rmSync(join(dir, RUN_MARKER_FILE), { force: true });
+    }
+    catch { /* best effort */ }
+}
+/**
+ * Fields that describe THIS process's history rather than the current failure
+ * streak. Clearing the streak (recovery, an operator `up`, an approved model
+ * transition) must not erase the record that the role died and came back.
+ */
+const carriedForward = (previous) => ({
+    ...(previous.lastTermination ? { lastTermination: previous.lastTermination } : {}),
+    ...(previous.abruptTerminations ? { abruptTerminations: previous.abruptTerminations } : {}),
+    ...(previous.supervisorStartedAt ? { supervisorStartedAt: previous.supervisorStartedAt } : {}),
+});
 /** Bounded exponential backoff for the nth consecutive immediate failure. */
 export function backoffFor(consecutiveFailures) {
     if (consecutiveFailures <= 0)
@@ -264,7 +324,10 @@ export function writeRestartLedger(dir, ledger) {
 export function resetRestartLedger(dir) {
     if (!existsSync(dir))
         return;
-    writeRestartLedger(dir, { ...emptyLedger(), updatedAt: new Date().toISOString() });
+    const previous = readRestartLedger(dir);
+    writeRestartLedger(dir, {
+        ...emptyLedger(), ...carriedForward(previous), updatedAt: new Date().toISOString(),
+    });
 }
 /** Filename spawnTemp writes into a temp agent dir to carry the fleet start-stagger. */
 export const START_STAGGER_FILE = '.start-stagger-ms';
@@ -414,8 +477,12 @@ export async function runOnce(name, opts = {}, partialDeps = {}) {
     const exitFile = join(dir, '.exit-status');
     const booted = existsSync(bootedFile);
     const mode = booted && adapter.supportsResume ? 'resume' : 'fresh';
-    if (mode === 'fresh')
-        writeFileSync(bootedFile, '');
+    // Stamp EVERY attempt, not just the first. `.booted` used to be written only
+    // on the fresh path, so after a restart — including one the supervisor never
+    // saw, like an OOM-kill — its mtime still read the original boot and any
+    // health check reading it reported "no restarts". The existence test above
+    // already ran, so rewriting cannot change the fresh/resume decision.
+    writeFileSync(bootedFile, `${new Date(deps.now()).toISOString()} ${mode}\n`);
     const runCwd = role.cwd && existsSync(role.cwd) ? role.cwd : dir;
     const prep = await adapter.prepareSession(role, { stateDir: dir, runCwd });
     const sessionBackend = role.session ?? 'tmux';
@@ -541,6 +608,13 @@ export async function runOnce(name, opts = {}, partialDeps = {}) {
             mode,
             permissions: perms,
             modeId: adapter.acpPermissionModeId?.(role),
+            // The role's declared MCP servers, and the bundled agent's `_meta`
+            // vocabulary for the options it takes no flag for. Both come from the
+            // ADAPTER and from `prep`: the ACP launch cannot carry `prep.argv`, so this
+            // is the route by which harness_options that used to be silently dropped
+            // for an ACP role actually reach the session.
+            mcpServers: adapter.acpMcpServers?.(role),
+            sessionMeta: adapter.acpSessionMeta?.(role, prep),
             permissionMode: effectivePermissionMode(role),
             // Provenance travels with the exact ACP launch. Keeping it out of a
             // role-only adapter hook prevents a PATH fallback or resolver skew from
@@ -943,99 +1017,129 @@ export async function runSupervised(name, opts = {}, partialDeps = {}, attempt =
     mkdirSync(dir, { recursive: true });
     const shouldStop = deps.shouldStop ?? (() => false);
     const stamp = () => new Date(deps.now()).toISOString();
-    while (!shouldStop()) {
-        let ledger = readRestartLedger(dir);
-        try {
-            const configPath = resolveConfigPath(dir, opts.configPath);
-            const role = findRole(loadConfig(configPath), name);
-            reconcileModelRecovery(dir, role, stamp());
-            if (modelRecoveryHeld(dir)) {
+    // Record how the PREVIOUS supervisor process ended before doing anything
+    // else. An external kill writes nothing itself, and the next ledger write is
+    // an attempt away — which is why an OOM-kill used to leave every durable
+    // indicator describing the run that died.
+    const startedAt = stamp();
+    const termination = claimSupervisorRun(dir, startedAt);
+    {
+        const previous = readRestartLedger(dir);
+        const abrupt = (previous.abruptTerminations ?? 0) + (termination.class === 'abrupt' ? 1 : 0);
+        writeRestartLedger(dir, {
+            ...previous,
+            lastTermination: termination,
+            abruptTerminations: abrupt,
+            supervisorStartedAt: startedAt,
+            updatedAt: startedAt,
+        });
+        if (termination.class === 'abrupt')
+            deps.log(`[${name}] previous supervisor run (started ${termination.runStartedAt}) `
+                + `ended abruptly: ${termination.detail}; abrupt terminations recorded: ${abrupt}`);
+    }
+    try {
+        while (!shouldStop()) {
+            let ledger = readRestartLedger(dir);
+            try {
+                const configPath = resolveConfigPath(dir, opts.configPath);
+                const role = findRole(loadConfig(configPath), name);
+                reconcileModelRecovery(dir, role, stamp());
+                if (modelRecoveryHeld(dir)) {
+                    await deps.sleep(HELD_DOWN_POLL_MS);
+                    continue;
+                }
+            }
+            catch {
+                // Normal attempt path reports config errors through the restart circuit.
+            }
+            if (ledger.circuit === 'open') {
+                // Held down. Stay alive — exiting would hand the role straight back to
+                // the service manager — and watch for an operator reset.
                 await deps.sleep(HELD_DOWN_POLL_MS);
                 continue;
             }
-        }
-        catch {
-            // Normal attempt path reports config errors through the restart circuit.
-        }
-        if (ledger.circuit === 'open') {
-            // Held down. Stay alive — exiting would hand the role straight back to
-            // the service manager — and watch for an operator reset.
-            await deps.sleep(HELD_DOWN_POLL_MS);
-            continue;
-        }
-        let result;
-        try {
-            result = await attempt(name, { configPath: opts.configPath, allowResumeRotation: !ledger.resumeDiscarded }, deps);
-        }
-        catch (e) {
-            // A session that could not even start is an immediate failure like any
-            // other; it must count, or an unstartable role loops forever.
-            result = {
-                elapsedSecs: 0,
-                exit: { version: 1, class: 'unknown', detail: e instanceof Error ? e.message : String(e) },
-                rotated: false,
-                mode: 'fresh',
-            };
-        }
-        // Re-read: the attempt itself may have taken minutes, and an operator may
-        // have reset the ledger meanwhile.
-        ledger = readRestartLedger(dir);
-        if (result.modelRecovery === 'advance') {
-            writeRestartLedger(dir, {
-                ...emptyLedger(),
-                lastReason: 'approved model-chain transition',
-                updatedAt: stamp(),
-            });
-            continue;
-        }
-        if (result.modelRecovery === 'hold') {
-            await deps.sleep(HELD_DOWN_POLL_MS);
-            continue;
-        }
-        const fastFailSecs = fastFailSecsFor(name, opts.configPath);
-        // The fast-fail boundary starts a recovery episode; it must not also be
-        // the boundary that declares recovery successful. Otherwise alternating
-        // 19s and 20s deaths erase one another forever. Require the configured
-        // number of fast-fail windows to survive before closing an active streak.
-        // This hysteresis stays adapter-relative (100s for the current 20s/5-attempt
-        // policy) and still lets a genuinely sustained session reset the breaker.
-        const stableRecoverySecs = fastFailSecs * RESTART_FAIL_THRESHOLD;
-        const recoveryFailed = result.elapsedSecs < fastFailSecs
-            || (ledger.consecutiveImmediateFailures > 0 && result.elapsedSecs < stableRecoverySecs);
-        if (!recoveryFailed) {
-            // A session that ran for a while is not a restart loop, whatever ended it.
-            writeRestartLedger(dir, {
-                ...emptyLedger(),
-                lastReason: result.exit.detail,
+            let result;
+            try {
+                result = await attempt(name, { configPath: opts.configPath, allowResumeRotation: !ledger.resumeDiscarded }, deps);
+            }
+            catch (e) {
+                // A session that could not even start is an immediate failure like any
+                // other; it must count, or an unstartable role loops forever.
+                result = {
+                    elapsedSecs: 0,
+                    exit: { version: 1, class: 'unknown', detail: e instanceof Error ? e.message : String(e) },
+                    rotated: false,
+                    mode: 'fresh',
+                };
+            }
+            // Re-read: the attempt itself may have taken minutes, and an operator may
+            // have reset the ledger meanwhile.
+            ledger = readRestartLedger(dir);
+            if (result.modelRecovery === 'advance') {
+                writeRestartLedger(dir, {
+                    ...emptyLedger(),
+                    ...carriedForward(ledger),
+                    lastReason: 'approved model-chain transition',
+                    updatedAt: stamp(),
+                });
+                continue;
+            }
+            if (result.modelRecovery === 'hold') {
+                await deps.sleep(HELD_DOWN_POLL_MS);
+                continue;
+            }
+            const fastFailSecs = fastFailSecsFor(name, opts.configPath);
+            // The fast-fail boundary starts a recovery episode; it must not also be
+            // the boundary that declares recovery successful. Otherwise alternating
+            // 19s and 20s deaths erase one another forever. Require the configured
+            // number of fast-fail windows to survive before closing an active streak.
+            // This hysteresis stays adapter-relative (100s for the current 20s/5-attempt
+            // policy) and still lets a genuinely sustained session reset the breaker.
+            const stableRecoverySecs = fastFailSecs * RESTART_FAIL_THRESHOLD;
+            const recoveryFailed = result.elapsedSecs < fastFailSecs
+                || (ledger.consecutiveImmediateFailures > 0 && result.elapsedSecs < stableRecoverySecs);
+            if (!recoveryFailed) {
+                // A session that ran for a while is not a restart loop, whatever ended it.
+                writeRestartLedger(dir, {
+                    ...emptyLedger(),
+                    ...carriedForward(ledger),
+                    lastReason: result.exit.detail,
+                    updatedAt: stamp(),
+                });
+                continue;
+            }
+            const failures = ledger.consecutiveImmediateFailures + 1;
+            const reason = `${result.exit.detail} after ${result.elapsedSecs.toFixed(1)}s`;
+            const next = {
+                version: 1,
+                ...carriedForward(ledger),
+                consecutiveImmediateFailures: failures,
+                lastReason: reason,
+                nextDelayMs: backoffFor(failures),
+                resumeDiscarded: ledger.resumeDiscarded || result.rotated,
+                circuit: failures >= RESTART_FAIL_THRESHOLD ? 'open' : 'closed',
                 updatedAt: stamp(),
-            });
-            continue;
-        }
-        const failures = ledger.consecutiveImmediateFailures + 1;
-        const reason = `${result.exit.detail} after ${result.elapsedSecs.toFixed(1)}s`;
-        const next = {
-            version: 1,
-            consecutiveImmediateFailures: failures,
-            lastReason: reason,
-            nextDelayMs: backoffFor(failures),
-            resumeDiscarded: ledger.resumeDiscarded || result.rotated,
-            circuit: failures >= RESTART_FAIL_THRESHOLD ? 'open' : 'closed',
-            updatedAt: stamp(),
-        };
-        if (next.circuit === 'open') {
-            next.openedAt = stamp();
-            next.nextDelayMs = 0;
+            };
+            if (next.circuit === 'open') {
+                next.openedAt = stamp();
+                next.nextDelayMs = 0;
+                writeRestartLedger(dir, next);
+                deps.log(`[${name}] HELD DOWN after ${failures} immediate failures at ${next.openedAt} — ` +
+                    `${reason}; the agent will not be restarted until: ours-fleet restart ${name}`);
+                continue;
+            }
             writeRestartLedger(dir, next);
-            deps.log(`[${name}] HELD DOWN after ${failures} immediate failures at ${next.openedAt} — ` +
-                `${reason}; the agent will not be restarted until: ours-fleet restart ${name}`);
-            continue;
+            deps.log(`[${name}] immediate failure ${failures}/${RESTART_FAIL_THRESHOLD} (${reason}) ` +
+                `-> backing off ${next.nextDelayMs}ms`);
+            await deps.sleep(next.nextDelayMs);
         }
-        writeRestartLedger(dir, next);
-        deps.log(`[${name}] immediate failure ${failures}/${RESTART_FAIL_THRESHOLD} (${reason}) ` +
-            `-> backing off ${next.nextDelayMs}ms`);
-        await deps.sleep(next.nextDelayMs);
+        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.
+        releaseSupervisorRun(dir);
     }
-    return readRestartLedger(dir);
 }
 /**
  * How short an attempt has to be to count as immediate. The role's harness

package/dist/session/acp.d.ts

@@ -1,5 +1,6 @@
 import * as acp from '@agentclientprotocol/sdk';
 import type { CommonPermissions } from '../config.js';
+import type { AcpMcpServer } from '../harness/types.js';
 import { ConversationEventStore } from './conversation-store.js';
 import type { ConversationSnapshot, PromptOrigin, PromptReceipt, SubmitPromptCommand } from './conversation-types.js';
 import type { ConversationHandlePage, ExitRecord, InterruptOutcome, QueuedPrompt, SessionEvent, RuntimeSelectorMetadata, SessionHandle, SessionSnapshot, SubmitPromptOptions, TurnCancellationSource, TurnOutcome, TurnResult } from './types.js';
@@ -37,6 +38,20 @@ export interface AcpSessionOptions {
     permissionMode?: NonNullable<SessionSnapshot['permissionMode']>;
     /** Adapter-authenticated request-metadata vocabulary; never inferred from ACP `_meta`. */
     permissionMetadataSource?: 'codex-acp';
+    /**
+     * 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.
+     */
+    mcpServers?: AcpMcpServer[];
+    /**
+     * Adapter-supplied `_meta` for session/new — the only route by which a
+     * capability the CLI takes as a flag reaches an agent that accepts none.
+     * Per-agent vocabulary, so the ADAPTER decides whether there is anything to
+     * send; this layer only forwards it. Never sent on resume or load: it carries
+     * session-creation options the agent has already applied.
+     */
+    sessionMeta?: Record<string, unknown>;
     log(line: string): void;
     /** Test seam for the cancel-escalation grace period; production uses the default. */
     cancelGraceMs?: number;
@@ -172,6 +187,28 @@ export declare class AcpSession implements SessionHandle {
      * for it is what turned a busy agent into a timeout and then into "dead".
      */
     queuePrompt(text: string, options?: SubmitPromptOptions): Promise<QueuedPrompt>;
+    /**
+     * Prepare the session for a prompt that asked to pre-empt current work.
+     *
+     * The old behaviour was one unconditional `session/cancel` notification
+     * followed immediately by `session/prompt`. That is what produced the owner's
+     * "request failed before completion":
+     *
+     *  - `cancelActive` only awaits settlement when `this.activeTurn` is set, and
+     *    a turn the ADAPTER started (steering's `startedNewTurn`) is never tracked
+     *    here. So the cancel raced the adapter's own transcript repair and the new
+     *    prompt landed while the last assistant message still held an unresolved
+     *    `tool_use` — rejected with `stop_reason=tool_use`.
+     *  - With nothing running at all, it still sent the cancel, and the prompt
+     *    landed on a bare interrupted user message — rejected with
+     *    `stop_reason=null`.
+     *
+     * So: never cancel across a tool boundary, and never cancel something whose
+     * settlement cannot be awaited. Everything else is queued, which the ACP queue
+     * already does correctly. The returned state is what the caller may claim to a
+     * human — `interrupted` only when a turn really was cancelled.
+     */
+    private prepareInterruptingDelivery;
     /**
      * Durably record a prompt admission BEFORE acceptance is returned. Browser
      * admissions are transactional — a prompt the ledger cannot hold is refused,
@@ -219,6 +256,15 @@ 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.
+     */
+    private declaredMcpServers;
     private initialize;
     private captureRuntimeMetadata;
     private runPrompt;