gestalt-mobile 0.41.0 → 0.41.2

package/dist/server/server/composition.js

@@ -7,6 +7,7 @@ import { createHash, randomBytes, randomUUID } from 'node:crypto';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { basename, dirname, join, resolve } from 'node:path';
+import { debuglog } from 'node:util';
 import { buildApp } from './app.js';
 import { FilesystemWorkspaceCatalog } from './platform/catalog/filesystem-workspace-catalog.js';
 import { FilesystemWorkspaceFiles } from './platform/filesystem/filesystem-workspace-files.js';
@@ -48,7 +49,7 @@ import { toAgentActivityDto } from './features/agent-activity/activity-dto.js';
 import { decodeAgentActivityFacts } from './platform/codex/activity-facts.js';
 import { completedCommandId, compactOrgPlanCheckpointKind, isAgentCapacityRecoveryCall, isAutopilotWaitLeaseCall, resolvedServerRequestId, toPendingInteraction, } from './platform/codex/server-request.js';
 import { parseOrgPlanCheckpoint, toOrgPlanCheckpointToolResponse, } from '../shared/contracts/org-plan-checkpoint.js';
-import { resolveOrgPlanCheckpointSignal, validOrgPlanCheckpoint, } from './features/org-plan-checkpoint/application/validate.js';
+import { hasActiveL1Writer, resolveOrgPlanCheckpointSignal, validateOrgPlanCheckpoint, } from './features/org-plan-checkpoint/application/validate.js';
 import { isValidInteractionResponse, isValidQuizInteractionResponse, } from './features/sessions/interaction/response-validator.js';
 import { promoteRecentThread } from './features/sessions/promote-recent-thread/use-case.js';
 import { FilesystemSkillProfileStore } from './platform/skills/filesystem-skill-profile-store.js';
@@ -65,11 +66,13 @@ import { AutopilotCoordinator } from './features/autopilot/application/service.j
 import { deriveSessionStatus } from './features/sessions/session-status.js';
 import { AUTOPILOT_CONTINUATION_PROMPT, AUTOPILOT_EXECUTOR_CONTINUATION_PROMPT, autopilotExecutorLaunchPrompt, defaultAutopilotPolicy, } from './features/autopilot/application/policy.js';
 import { createRelyingPartyConfig } from './config.js';
-import { parseOrgPlanAttention } from '../shared/contracts/org-plan-attention.js';
+import { parseOrgPlanAttention, toOrgPlanAttentionAcknowledgement, } from '../shared/contracts/org-plan-attention.js';
 import { autopilotWaitLeaseToolResponse, } from '../shared/contracts/autopilot-wait-lease.js';
 import { agentCapacityRecoveryToolResponse } from '../shared/contracts/agent-capacity-recovery.js';
 import { pwaIconUrl } from './features/pwa/register-routes.js';
 const generatedProtocolVersion = 'codex-cli 0.144.3';
+const checkpointDiagnostic = debuglog('gestalt-mobile:checkpoint');
+const attentionDiagnostic = debuglog('gestalt-mobile:attention');
 export async function composeRelayApp(options) {
     const passkeyAuthEnabled = options.passkeyAuthEnabled ?? true;
     const relyingParty = createRelyingPartyConfig(options.relyingParty.publicOrigin);
@@ -104,6 +107,7 @@ export async function composeRelayApp(options) {
     const autopilotStore = new SqliteAutopilotStore(database);
     const attentionResolutionOperations = new Map();
     const checkpointHandoffTimers = new Map();
+    const attentionAcknowledgementTimers = new Map();
     const checkpointHandoffRecoveries = new Set();
     const supervisedPlans = new SupervisedPlanRegistry();
     const planStatusSource = new FilesystemPlanStatusSource(join(dirname(databasePath), 'plans'));
@@ -471,6 +475,9 @@ export async function composeRelayApp(options) {
             // request: the client can deliver them as a follow-up prompt instead.
             if (interaction.kind === 'quiz')
                 continue;
+            if (interaction.kind === 'orgPlanAttention' &&
+                interactions.resolutionState(sessionId, interaction.requestId) === 'acknowledged')
+                continue;
             if (interactions.resolve(sessionId, interaction.requestId, occurredAt, outcome))
                 publishInteractionResolved(sessionId, interaction.requestId, occurredAt, outcome);
         }
@@ -551,6 +558,36 @@ export async function composeRelayApp(options) {
         handle.unref?.();
         checkpointHandoffTimers.set(key, { handle, token });
     };
+    const cancelAttentionAcknowledgementTimer = (sessionId, requestId) => {
+        const key = checkpointTimerKey(sessionId, requestId);
+        const timer = attentionAcknowledgementTimers.get(key);
+        if (!timer)
+            return;
+        clearTimeout(timer.handle);
+        attentionAcknowledgementTimers.delete(key);
+    };
+    const armAttentionAcknowledgementDeadline = (sessionId, requestId) => {
+        cancelAttentionAcknowledgementTimer(sessionId, requestId);
+        const key = checkpointTimerKey(sessionId, requestId);
+        const token = Symbol(key);
+        const handle = setTimeout(() => {
+            if (attentionAcknowledgementTimers.get(key)?.token !== token)
+                return;
+            attentionAcknowledgementTimers.delete(key);
+            const ownedRuntime = runtime;
+            const session = sessions.find(sessionId);
+            if (!ownedRuntime || !session || !ownedRuntime.abandonServerRequest(sessionId, requestId))
+                return;
+            void ownedRuntime
+                .recycle(session, new Date().toISOString())
+                .then((recovered) => saveSession(recovered))
+                .catch(() => {
+                // The durable attention survives; normal session recovery can reacquire the writer.
+            });
+        }, options.attentionAcknowledgementDeadlineMs ?? 5_000);
+        handle.unref?.();
+        attentionAcknowledgementTimers.set(key, { handle, token });
+    };
     const failPendingCheckpointHandoffs = (sessionId, recoverBoundary) => {
         for (const interaction of interactions.list(sessionId)) {
             if (interaction.kind !== 'orgPlanCheckpoint')
@@ -568,28 +605,38 @@ export async function composeRelayApp(options) {
      * enters the durable store, requests human attention, and notifies autopilot.
      * Both the codex JSON-RPC handler and the kimi polling handler land here.
      */
-    const acceptPendingInteraction = (sessionId, rawInteraction, session) => {
+    const acceptPendingInteraction = (sessionId, rawInteraction, session, acknowledgeAttention = false) => {
         const interaction = {
             ...rawInteraction,
             turnId: session.activeTurnId,
             requestedAt: new Date().toISOString(),
         };
-        interactions.add(sessionId, interaction);
-        activity.observe({
-            sessionId,
-            occurredAt: interaction.requestedAt,
-            kind: 'interactionPending',
-            ...(interaction.kind === 'orgPlanAttention'
-                ? { attentionReason: interaction.payload.reason }
-                : {}),
-        });
-        autopilot.semanticEvent(sessionId, 'interactionChanged');
-        const updated = RelaySession.rehydrate(session).requestInteraction(interaction, new Date().toISOString()).snapshot;
-        sessions.save(updated);
-        events.publish(journal.append(sessionId, 'interaction.requested', interaction, updated.updatedAt));
-        if (interaction.kind === 'orgPlanAttention')
-            events.publish(journal.append(sessionId, 'org-plan.attention-required', interaction, updated.updatedAt));
-        autopilot.evaluate(sessionId);
+        interactions.add(sessionId, interaction, acknowledgeAttention && interaction.kind === 'orgPlanAttention' ? 'acknowledged' : 'active');
+        try {
+            activity.observe({
+                sessionId,
+                occurredAt: interaction.requestedAt,
+                kind: 'interactionPending',
+                ...(interaction.kind === 'orgPlanAttention'
+                    ? { attentionReason: interaction.payload.reason }
+                    : {}),
+            });
+            autopilot.semanticEvent(sessionId, 'interactionChanged');
+            const updated = RelaySession.rehydrate(session).requestInteraction(interaction, new Date().toISOString()).snapshot;
+            sessions.save(updated);
+            events.publish(journal.append(sessionId, 'interaction.requested', interaction, updated.updatedAt));
+            if (interaction.kind === 'orgPlanAttention')
+                events.publish(journal.append(sessionId, 'org-plan.attention-required', interaction, updated.updatedAt));
+            autopilot.evaluate(sessionId);
+        }
+        catch (error) {
+            if (!acknowledgeAttention || interaction.kind !== 'orgPlanAttention')
+                throw error;
+            attentionDiagnostic('%o', {
+                requestId: interaction.requestId,
+                reasonCode: 'postPersistenceProjectionFailed',
+            });
+        }
         return true;
     };
     const acceptPlanUpdate = (sessionId, update) => {
@@ -625,7 +672,9 @@ export async function composeRelayApp(options) {
             if (resolvedRequestId) {
                 const interaction = interactions.find(sessionId, resolvedRequestId);
                 const outcome = interaction?.kind === 'orgPlanAttention' ? 'failed' : 'dismissed';
-                if (interaction?.kind !== 'quiz' &&
+                if (!(interaction?.kind === 'orgPlanAttention' &&
+                    interactions.resolutionState(sessionId, resolvedRequestId) === 'acknowledged') &&
+                    interaction?.kind !== 'quiz' &&
                     interactions.resolve(sessionId, resolvedRequestId, occurredAt, outcome)) {
                     if (outcome === 'failed')
                         publishAttentionSettlement(sessionId, resolvedRequestId, occurredAt, outcome);
@@ -683,7 +732,7 @@ export async function composeRelayApp(options) {
                 const retained = supervisedPlans.find(sessionId);
                 const identity = supervisedPlans.identity(sessionId);
                 const checkpoint = retained && identity
-                    ? resolveOrgPlanCheckpointSignal(compactCheckpointKind, retained, identity)
+                    ? resolveOrgPlanCheckpointSignal(compactCheckpointKind, retained, identity, supervisedPlans.publicationReason(sessionId))
                     : null;
                 if (checkpoint)
                     rawInteraction = {
@@ -741,25 +790,38 @@ export async function composeRelayApp(options) {
                     !identity ||
                     checkpoint.planIdentity !== identity ||
                     !rootOwned)
-                    return false;
-                const valid = validOrgPlanCheckpoint({
+                    return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, checkpointFailureResponse(!checkpoint
+                        ? compactCheckpointKind === 'l1Accepted'
+                            ? 'acceptedL1NotResolved'
+                            : 'checkpointPayloadInvalid'
+                        : !retained
+                            ? 'planProjectionUnavailable'
+                            : !identity || checkpoint.planIdentity !== identity
+                                ? 'planIdentityMismatch'
+                                : 'rootNotOwner')) === true);
+                const validation = validateOrgPlanCheckpoint({
                     checkpoint,
                     plan: retained,
                     planIdentity: identity,
                     rootOwned,
                     hasActiveL1Writer: (position) => hasActiveL1Writer(activity.snapshot(sessionId, new Date().toISOString()), position),
                 });
-                if (!valid)
-                    return false;
-                if (!session.activeTurnId)
-                    return false;
-                let accepted = false;
+                if (!validation.valid || !session.activeTurnId)
+                    return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, checkpointFailureResponse(validation.valid ? 'rootTurnNotActive' : validation.reasonCode, {
+                        ...(!validation.valid && validation.expected
+                            ? { expected: validation.expected }
+                            : {}),
+                        ...(!validation.valid && validation.observed
+                            ? { observed: validation.observed }
+                            : {}),
+                    })) === true);
+                let recordStatus = 'failed';
                 try {
-                    accepted = autopilot.checkpointAccepted(sessionId, checkpoint, session.activeTurnId, new Date().toISOString());
+                    recordStatus = autopilot.checkpointAccepted(sessionId, checkpoint, session.activeTurnId, new Date().toISOString());
                 }
                 catch {
                     if (!autopilot.checkpointHandoffFailed(sessionId, session.activeTurnId))
-                        return false;
+                        return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, checkpointFailureResponse('checkpointPersistenceFailed')) === true);
                     const interaction = {
                         ...rawInteraction,
                         turnId: session.activeTurnId,
@@ -769,8 +831,10 @@ export async function composeRelayApp(options) {
                     failCheckpointHandoff(sessionId, rawInteraction.requestId, session.activeTurnId);
                     return true;
                 }
-                if (!accepted)
-                    return false;
+                if (recordStatus === 'failed')
+                    return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, checkpointFailureResponse('checkpointStateConflict')) === true);
+                if (recordStatus === 'alreadyRecorded')
+                    return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanCheckpointToolResponse('alreadyRecorded')) === true);
                 const interaction = {
                     ...rawInteraction,
                     turnId: session.activeTurnId,
@@ -779,7 +843,7 @@ export async function composeRelayApp(options) {
                 interactions.add(sessionId, interaction);
                 armCheckpointHandoffDeadline(sessionId, rawInteraction.requestId, session.activeTurnId);
                 try {
-                    runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanCheckpointToolResponse());
+                    runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanCheckpointToolResponse('recorded'));
                 }
                 catch {
                     // The accepted hold remains owned by the bounded deadline.
@@ -788,6 +852,24 @@ export async function composeRelayApp(options) {
                 // is cancelled solely by the JSON-RPC write-settlement callback.
                 return true;
             }
+            if (rawInteraction.kind === 'orgPlanAttention') {
+                try {
+                    acceptPendingInteraction(sessionId, rawInteraction, session, true);
+                    const acknowledged = runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanAttentionAcknowledgement()) === true;
+                    if (acknowledged)
+                        armAttentionAcknowledgementDeadline(sessionId, rawInteraction.requestId);
+                    return acknowledged;
+                }
+                catch {
+                    const rejected = runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanAttentionAcknowledgement({
+                        accepted: false,
+                        reason: 'persistenceFailed',
+                    })) === true;
+                    if (rejected)
+                        armAttentionAcknowledgementDeadline(sessionId, rawInteraction.requestId);
+                    return rejected;
+                }
+            }
             return acceptPendingInteraction(sessionId, rawInteraction, session);
         }, (sessionId) => {
             activity.disconnected(sessionId, new Date().toISOString());
@@ -827,7 +909,18 @@ export async function composeRelayApp(options) {
     const handleKimiServerRequest = (sessionId, request) => {
         const rawInteraction = toPendingInteraction(request);
         const session = withPendingInteractions(sessions.find(sessionId));
-        return Boolean(rawInteraction && session && acceptPendingInteraction(sessionId, rawInteraction, session));
+        if (!rawInteraction || !session)
+            return false;
+        if (rawInteraction.kind !== 'orgPlanAttention')
+            return acceptPendingInteraction(sessionId, rawInteraction, session);
+        try {
+            acceptPendingInteraction(sessionId, rawInteraction, session, true);
+            void kimiRuntime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanAttentionAcknowledgement());
+        }
+        catch {
+            void kimiRuntime?.resolveServerRequest(sessionId, rawInteraction.requestId, toOrgPlanAttentionAcknowledgement({ accepted: false, reason: 'persistenceFailed' }));
+        }
+        return true;
     };
     kimiRuntime = kimiManager
         ? new KimiSessionRuntime({
@@ -850,6 +943,10 @@ export async function composeRelayApp(options) {
         })
         : null;
     runtime?.onServerResponseSettled((sessionId, requestId, outcome) => {
+        if (attentionAcknowledgementTimers.has(checkpointTimerKey(sessionId, requestId))) {
+            cancelAttentionAcknowledgementTimer(sessionId, requestId);
+            return;
+        }
         const interaction = interactions.find(sessionId, requestId);
         if (interaction?.kind !== 'orgPlanCheckpoint')
             return;
@@ -1347,6 +1444,18 @@ export async function composeRelayApp(options) {
                                 return { kind: 'staleOperation' };
                             if (claim === 'missing')
                                 return { kind: 'noActive' };
+                            const acknowledged = interactions.resolutionState(sessionId, requestId) === 'acknowledged';
+                            if (acknowledged) {
+                                if (!interactions.beginDelivery(sessionId, requestId, operationKey))
+                                    return { kind: 'staleOperation' };
+                                const resolvedAt = new Date().toISOString();
+                                if (!interactions.settleOperation(sessionId, requestId, operationKey, resolvedAt, 'answered'))
+                                    return { kind: 'staleOperation' };
+                                const accepted = { kind: 'accepted', resolvedAt };
+                                idempotency.put(scope, operationKey, 202, JSON.stringify({ kind: 'replayed', resolvedAt }));
+                                publishAttentionSettlement(sessionId, requestId, resolvedAt, 'answered');
+                                return accepted;
+                            }
                             // A durable capability belongs to the session/thread, not the
                             // relay process.  A supported stopped writer is retryable;
                             // missing capability identifies a pre-rollout legacy thread.
@@ -1468,6 +1577,14 @@ export async function composeRelayApp(options) {
                     checkpointHandoffTimers.delete(key);
                 }
             }
+            for (const key of [...attentionAcknowledgementTimers.keys()]) {
+                if (key.startsWith(`${session.id}:`)) {
+                    const timer = attentionAcknowledgementTimers.get(key);
+                    if (timer)
+                        clearTimeout(timer.handle);
+                    attentionAcknowledgementTimers.delete(key);
+                }
+            }
             // Relay shutdown only releases this process's writer.  A typed attention
             // request remains a durable human-visible blocker for the next relay
             // instance; only an app-server-cleared request is a failed audit outcome.
@@ -1497,7 +1614,8 @@ function resolveStateDatabasePath(root, stateHome) {
     const legacyPath = legacyRelayStatePath(root, stateHome);
     return existsSync(legacyPath) ? legacyPath : currentPath;
 }
-function hasActiveL1Writer(snapshot, position) {
-    return snapshot.subagents.some((child) => child.canonicalPosition === position &&
-        ['working', 'awaitingAgent', 'awaitingHuman'].includes(child.state));
+function checkpointFailureResponse(reasonCode, details = {}) {
+    const correlationId = randomUUID();
+    checkpointDiagnostic('%o', { correlationId, reasonCode, ...details });
+    return toOrgPlanCheckpointToolResponse('failed', { reasonCode, correlationId, ...details });
 }

package/dist/server/server/features/agent-activity/model.js

@@ -201,7 +201,10 @@ function childOutcome(status, action, previous) {
 function childState(status, action, previous = 'working') {
     if (status === 'error' || status === 'failed' || status === 'systemError' || status === 'errored')
         return 'blocked';
-    if (status === 'completed' || status === 'idle' || action === 'close_agent')
+    if (status === 'completed' ||
+        status === 'idle' ||
+        status === 'interrupted' ||
+        action === 'close_agent')
         return 'idle';
     // `wait` belongs to the caller/root; it does not rewrite the child which may
     // still be working.  A child can explicitly report its own waiting status.
@@ -229,7 +232,10 @@ function childReason(status, action) {
         return 'processExited';
     if (action === 'wait')
         return 'collaborationWait';
-    if (status === 'completed' || status === 'idle' || action === 'close_agent')
+    if (status === 'completed' ||
+        status === 'idle' ||
+        status === 'interrupted' ||
+        action === 'close_agent')
         return 'turnCompleted';
     return 'turnActive';
 }

package/dist/server/server/features/autopilot/application/policy.js

@@ -3,7 +3,7 @@
  * Designed by Denis Roio <jaromil@dyne.org>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-export const AUTOPILOT_PROMPT_VERSION = 'v10';
+export const AUTOPILOT_PROMPT_VERSION = 'v11';
 export const AUTOPILOT_CONTINUATION_PROMPT = 'Inspect the active supervised Org Plan. Refer to every L1 as L<a> and each nested L2 as L<a>.<b>, using one-based positions. Spawn exactly one executor per L1 and pass the exact literal task_name l<a>: l1 for L1, l2 for L2, and so on. Never create an L2-specific task name or append a title, role, nickname, plan name, or generated label. A validated DONE L2 and an accepted L1 are mandatory answer boundaries. The corresponding gestalt_org_plan_checkpoint call must be the last tool call of that root turn: immediately emit exactly one boundary final and end the turn, without followup_task, review, executor launch, or later milestone work. Roll up commentary, files, verification, and commands since the previous boundary into that one answer; all later milestone activity belongs to a new root turn. On this later Autopilot turn, resume the same executor after an L2 boundary or launch the next executor after an accepted-L1 boundary. Treat a status question as an interruption: answer briefly, then perform the applicable continuation in the same turn. Before sending any blocker response or yielding because progress cannot continue safely, call gestalt_org_plan_attention for the matching decision-table blocker; never rely on blocker prose as the signal. Do not call it for routine progress or a recoverable failure. Before yielding for known long work, call gestalt_autopilot_wait_lease version 2 with relevant observable wake conditions and a bounded maxWaitMs; it is one episode, so reassess before registering another in a later turn. Yield only when its response contains accepted:true; accepted:false means no continuation was registered and requires same-turn supervision. For GitHub PR CI, start an owned gh pr checks --watch process and lease processExited plus processResultAvailable while it runs. When the Autopilot probe is active, register the compatible wait lease, declare genuine attention, or immediately do actionable work; never acknowledge waiting in prose. Do not send a status-only response.';
 export const AUTOPILOT_EXECUTOR_CONTINUATION_PROMPT = 'Continue the same assigned Org L1 from its durable state. A prior turn ending did not complete the objective. Consume any supplied process result and take the next legal L2 action. Whenever an L2 reaches DONE, return its concise structured evidence and end the executor turn so the root can publish that mandatory answer boundary. Also report at the L1 review boundary or through structured attention.';
 /** Builds a physical launch instruction while keeping durable L1 identity canonical. */
@@ -11,7 +11,7 @@ export function autopilotExecutorLaunchPrompt(identity) {
     const launch = `Launch task_name ${identity.taskName} for canonical ${identity.canonicalPosition}; retain the canonical label in status and review output.`;
     if (identity.generation === 1)
         return `${AUTOPILOT_CONTINUATION_PROMPT} ${launch}`;
-    return `${AUTOPILOT_CONTINUATION_PROMPT} ${launch} This is replacement generation ${identity.generation}: the durable ${identity.canonicalTaskName} slot may remain reserved. Do not reuse that task_name or attempt to change an existing agent's model in place. Interrupt the previous physical executor if it is still running, then spawn ${identity.taskName} with agent_type worker and an explicit model selected by the supervisor. Transfer sole ${identity.canonicalPosition} ownership and continue from its durable Org Plan and worktree state.`;
+    return `${AUTOPILOT_CONTINUATION_PROMPT} ${launch} This exact replacement generation ${identity.generation} is durably authorized by Mobile; do not infer another generation from this prompt or the roster; the durable ${identity.canonicalTaskName} slot may remain reserved. Do not reuse that task_name or attempt to change an existing agent's model in place. Interrupt the previous physical executor if it is still running, then spawn ${identity.taskName} with agent_type worker and an explicit model selected by the supervisor. Transfer sole ${identity.canonicalPosition} ownership and continue from its durable Org Plan and worktree state.`;
 }
 export const defaultAutopilotPolicy = Object.freeze({
     quiescenceMs: 1_000,

package/dist/server/server/features/autopilot/application/service.js

@@ -7,7 +7,7 @@ import { deriveSessionStatus } from '../../sessions/session-status.js';
 import { createHash } from 'node:crypto';
 import { AUTOPILOT_WAIT_MAX_MS, AUTOPILOT_WAIT_MIN_MS, } from '../../../../shared/contracts/autopilot-wait-lease.js';
 import { autopilotSnapshot, disabledAutopilot, } from '../domain/autopilot-session.js';
-import { classifyExecutorOutcome, decideSupervisedLifecycle, executorIdentity, validStructuredBlock, checkpointTarget, } from '../domain/supervised-lifecycle.js';
+import { classifyExecutorOutcome, decideSupervisedLifecycle, executorIdentity, validStructuredBlock, checkpointTarget, executorAssignment, } from '../domain/supervised-lifecycle.js';
 import { classifyAgentActivity, decideAutopilot, executionComplete, } from './policy.js';
 import { consumeCheckpointBoundary, consumeObsoleteWait, consumeObservableWake, consumeWaitDeadline, recordAutomaticContinuation, recoverSafetyPause, registerProactiveWait as registerProtocolWait, reportProbe, semanticProgressKey, startSupervisionProtocol, } from '../domain/supervision-protocol.js';
 export class AutopilotCoordinator {
@@ -213,7 +213,7 @@ export class AutopilotCoordinator {
         const activity = this.deps.activity(sessionId);
         if (!retained || activity?.confidence !== 'fresh')
             return false;
-        const executor = this.currentExecutor(sessionId, retained.plan, state.consecutiveNoProgress, state.executor);
+        const executor = this.currentExecutor(sessionId, retained.plan, state.consecutiveNoProgress, state.executor, activity);
         return Boolean(executor && !this.authoritativeExecutorActive(state, retained.plan, activity));
     }
     /** Fails closed only for the currently active bounded probe. */
@@ -612,10 +612,10 @@ export class AutopilotCoordinator {
         const prior = this.deps.store.find(sessionId);
         const retained = this.deps.plan(sessionId);
         if (!prior || !retained || !turnId || checkpoint.planIdentity !== retained.identity)
-            return false;
+            return 'failed';
         const previous = prior.checkpoints;
         if (previous && previous.planIdentity !== retained.identity)
-            return false;
+            return 'failed';
         const reportedL1Ids = previous?.reportedL1Ids ?? [];
         const reportedL2Ids = previous?.reportedL2Ids ?? [];
         const canonicalPosition = checkpoint.kind === 'terminalReviewAccepted' ? 'terminal' : checkpoint.position;
@@ -631,12 +631,12 @@ export class AutopilotCoordinator {
             .digest('hex');
         const acceptedKeys = previous?.acceptedKeys ?? [];
         if (acceptedKeys.includes(key))
-            return previous?.pendingTurnId === turnId && previous.pendingKind === checkpoint.kind;
+            return 'alreadyRecorded';
         const l2Key = checkpoint.kind === 'l2Completed' ? JSON.stringify([checkpoint.l1Id, checkpoint.l2Id]) : null;
         if (checkpoint.kind === 'terminalReviewAccepted' && previous?.terminalReviewAccepted)
-            return false;
+            return 'alreadyRecorded';
         if (completionEpoch?.completed && !completionEpoch.reopened)
-            return false;
+            return 'alreadyRecorded';
         const completionEpochs = [
             ...(previous?.completionEpochs ?? []).filter((entry) => entry.target !== target),
             { target, epoch, reopened: false, completed: true },
@@ -655,7 +655,19 @@ export class AutopilotCoordinator {
             checkpointHandoffFailed: false,
             terminalReviewAccepted: checkpoint.kind === 'terminalReviewAccepted' || previous?.terminalReviewAccepted === true,
         };
-        const checkpointed = { ...prior, checkpoints, updatedAt: occurredAt };
+        const checkpointed = {
+            ...prior,
+            ...(checkpoint.kind === 'l1Accepted' && prior.executor?.assignment
+                ? {
+                    executor: {
+                        ...prior.executor,
+                        assignment: { ...prior.executor.assignment, state: 'closed' },
+                    },
+                }
+                : {}),
+            checkpoints,
+            updatedAt: occurredAt,
+        };
         this.persist({
             ...checkpointed,
             supervision: checkpointed.supervision
@@ -688,7 +700,7 @@ export class AutopilotCoordinator {
         this.cancelWaitTimer(sessionId);
         this.parkedSubscriptions.delete(sessionId);
         this.cancelTimer(sessionId);
-        return true;
+        return 'recorded';
     }
     /**
      * Records a failed checkpoint transport handoff without releasing its root
@@ -852,6 +864,12 @@ export class AutopilotCoordinator {
         this.activityEventKeys.set(sessionId, eventKey);
         if (this.semanticEvent(sessionId, 'agentActivityChanged'))
             return;
+        // `executorChanged` is an edge subscription, not a request to wait for a
+        // later generic reconciliation pass. Consume it from the same fresh
+        // activity snapshot that exposed the settled canonical executor.
+        if (this.executorWakeAlreadySatisfied(sessionId, prior, ['executorChanged']) &&
+            this.semanticEvent(sessionId, 'executorChanged'))
+            return;
         const disposition = classifyAgentActivity(activity);
         if (disposition === 'attention') {
             this.evaluate(sessionId);
@@ -1283,23 +1301,36 @@ export class AutopilotCoordinator {
                 l1.reviewStatus === 'REVIEWED' &&
                 (!reportedL1.has(l1.id) || epochNeedsReport(checkpointTarget('l1', l1.id)))));
     }
-    currentExecutor(sessionId, plan, continuationCount, persisted) {
+    currentExecutor(sessionId, plan, continuationCount, persisted, activity = this.deps.activity(sessionId)) {
         const stepIndex = plan.steps.findIndex((step) => step.id === plan.currentStepId || step.state === 'WIP');
         const index = stepIndex >= 0 ? stepIndex : plan.steps.findIndex((step) => step.state !== 'DONE');
         if (index < 0)
             return undefined;
         const step = plan.steps[index];
         const canonicalPosition = `L${index + 1}`;
-        const child = this.deps
-            .activity(sessionId)
-            ?.subagents.filter((candidate) => candidate.canonicalPosition === canonicalPosition)
-            .sort((left, right) => (right.continuationGeneration ?? 1) - (left.continuationGeneration ?? 1) ||
-            Date.parse(right.lastActivityAt) - Date.parse(left.lastActivityAt) ||
-            (left.threadId ?? left.id).localeCompare(right.threadId ?? right.id))[0];
+        const candidates = activity?.subagents.filter((candidate) => candidate.canonicalPosition === canonicalPosition) ?? [];
+        const assigned = persisted?.assignment?.canonicalPosition === canonicalPosition
+            ? persisted.assignment
+            : undefined;
+        const replacementChild = persisted?.replacement
+            ? candidates.find((candidate) => candidate.canonicalTaskName === persisted.replacement.canonicalTaskName &&
+                (candidate.continuationGeneration ?? 1) === persisted.replacement.generation &&
+                candidate.taskPath?.split('/').filter(Boolean).at(-1) ===
+                    persisted.replacement.taskName)
+            : undefined;
+        const child = replacementChild ??
+            (assigned
+                ? candidates.find((candidate) => candidate.canonicalTaskName === assigned.canonicalTaskName &&
+                    candidate.taskPath === assigned.taskPath &&
+                    (candidate.threadId ?? candidate.id) === assigned.threadId &&
+                    (candidate.continuationGeneration ?? 1) === assigned.generation)
+                : candidates
+                    .filter((candidate) => candidate.canonicalPosition === canonicalPosition)
+                    .sort((left, right) => (right.continuationGeneration ?? 1) - (left.continuationGeneration ?? 1) ||
+                    Date.parse(right.lastActivityAt) - Date.parse(left.lastActivityAt) ||
+                    (left.threadId ?? left.id).localeCompare(right.threadId ?? right.id))[0]);
         if (!child) {
-            if (persisted?.canonicalPosition !== canonicalPosition ||
-                persisted.outcome === 'cancelled' ||
-                persisted.outcome === 'failed')
+            if (persisted?.canonicalPosition !== canonicalPosition || persisted.outcome === 'cancelled')
                 return undefined;
             return {
                 ...persisted,
@@ -1308,16 +1339,20 @@ export class AutopilotCoordinator {
                 ownedProcesses: refreshPersistedProcesses(persisted.ownedProcesses, [], this.deps.now()),
             };
         }
-        // A roster entry for a newer generation is authoritative even when that
-        // generation is disconnected. Never fall back to an older persisted
-        // writer; incomplete owner metadata instead fences all continuation.
+        // Once adopted, a persisted assignment outranks every unrelated roster
+        // entry.  A new physical writer can enter only through the exact durable
+        // replacement authorization above.
         if (!child.taskPath || !child.canonicalTaskName)
             return undefined;
-        if (child.outcome === 'cancelled' || child.outcome === 'failed')
+        if (child.outcome === 'cancelled')
             return undefined;
         const activeL2 = step.children.find((candidate) => candidate.state === 'WIP');
+        const active = child.state === 'working' ||
+            child.state === 'awaitingAgent' ||
+            Boolean(child.ownedProcesses?.some((process) => process.state === 'running' || process.state === 'detached-active'));
         const outcome = classifyExecutorOutcome({
             objectiveComplete: step.state === 'DONE',
+            active,
             reportedOutcome: child.outcome,
         });
         return {
@@ -1346,6 +1381,15 @@ export class AutopilotCoordinator {
                     ? { resumeFailures: persisted.resumeFailures }
                     : {}),
             ...(persisted?.commands ? { commands: persisted.commands } : {}),
+            assignment: replacementChild || !assigned
+                ? executorAssignment({
+                    canonicalPosition,
+                    canonicalTaskName: child.canonicalTaskName,
+                    taskPath: child.taskPath,
+                    threadId: child.threadId ?? child.id,
+                    continuationGeneration: child.continuationGeneration ?? 1,
+                })
+                : assigned,
         };
     }
     /** A fresh roster may expose two physical writers for one canonical L1. */
@@ -1661,7 +1705,8 @@ export class AutopilotCoordinator {
         return conditions.some((condition) => this.semanticEvent(sessionId, condition));
     }
     freshExecutorIdentity(sessionId) {
-        const replacement = this.deps.store.find(sessionId)?.executor?.replacement;
+        const state = this.deps.store.find(sessionId);
+        const replacement = state?.executor?.replacement;
         if (replacement && this.validReplacement(sessionId, replacement))
             return replacement;
         const plan = this.deps.plan(sessionId)?.plan;
@@ -1672,11 +1717,22 @@ export class AutopilotCoordinator {
         if (index < 0)
             return undefined;
         const canonicalTaskName = `l${index + 1}`;
-        const generations = this.deps
+        // A root boundary starts a root turn, not a replacement executor.  The
+        // existing physical owner remains resumable through ordinary L2, review,
+        // and completion boundaries, regardless of its most recently observed
+        // continuation generation.  Only a durable replacement handoff above may
+        // authorize a generated physical task name.
+        if (state?.executor?.canonicalTaskName === canonicalTaskName &&
+            state.executor.outcome !== 'cancelled')
+            return undefined;
+        // Legacy roster observations establish a resumable owner but never
+        // authorize a generated name.  Only scheduleExecutorReplacement creates
+        // the exact durable replacement record consumed above.
+        if (this.deps
             .activity(sessionId)
-            ?.subagents.filter((child) => child.canonicalTaskName === canonicalTaskName)
-            .map((child) => child.continuationGeneration ?? 1) ?? [];
-        return executorIdentity(canonicalTaskName, Math.max(0, ...generations) + 1);
+            ?.subagents.some((child) => child.canonicalTaskName === canonicalTaskName))
+            return undefined;
+        return executorIdentity(canonicalTaskName, 1);
     }
     validReplacement(sessionId, replacement) {
         const retained = this.deps.plan(sessionId);
@@ -1693,16 +1749,24 @@ export class AutopilotCoordinator {
         const retained = this.deps.plan(sessionId);
         if (!current?.requestedEnabled || !retained || current.executor?.replacement)
             return;
-        const identity = executorIdentity(executor.canonicalTaskName, executor.continuationGeneration + 1);
+        const identity = executorIdentity(executor.canonicalTaskName, (executor.assignment?.generation ?? executor.continuationGeneration) + 1);
         const now = this.deps.now();
         const controlId = this.deps.nextControlId(sessionId, current.generation);
         const replacement = {
             ...executor,
             outcome: 'failed',
+            ...(executor.assignment
+                ? { assignment: { ...executor.assignment, state: 'unavailable' } }
+                : {}),
             replacement: {
                 ...identity,
                 planIdentity: retained.identity,
                 planFingerprint: fingerprint(retained.plan),
+                previous: executor.assignment
+                    ? { ...executor.assignment, state: 'unavailable' }
+                    : executorAssignment(executor, 'unavailable'),
+                reason: 'explicitExecutorRejection',
+                evidence: 'retry-limit-exhausted',
             },
             commands: executor.commands?.map((command) => ['scheduled', 'issued'].includes(command.status)
                 ? { ...command, status: 'superseded', updatedAt: now }