gestalt-mobile 0.35.3 → 0.35.4

package/dist/server/server/composition.js

@@ -588,7 +588,7 @@ export async function composeRelayApp(options) {
             if (rawInteraction.kind === 'autopilotWaitLease') {
                 const lease = rawInteraction.payload;
                 const rootOwned = origin.kind === 'root' && origin.physicalTurnId === session.activeTurnId;
-                const accepted = rootOwned &&
+                const registration = rootOwned &&
                     (lease.version === 2
                         ? autopilot.registerProactiveWait(sessionId, {
                             id: lease.reportId,
@@ -602,10 +602,12 @@ export async function composeRelayApp(options) {
                             leaseId: lease.leaseId,
                             wakeConditions: lease.wakeConditions,
                         }));
-                if (!accepted) {
-                    if (rootOwned)
+                if (registration !== true) {
+                    if (rootOwned && registration === false)
                         autopilot.rejectProbe(sessionId);
-                    return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, autopilotWaitLeaseToolResponse(false)) === true);
+                    return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, autopilotWaitLeaseToolResponse(false, registration === 'wakeAlreadySatisfied'
+                        ? 'wakeAlreadySatisfied'
+                        : 'automaticContinuationUnavailable')) === true);
                 }
                 return (runtime?.resolveServerRequest(sessionId, rawInteraction.requestId, autopilotWaitLeaseToolResponse()) === true);
             }

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

@@ -162,6 +162,24 @@ export class AutopilotCoordinator {
             report.maxWaitMs > AUTOPILOT_WAIT_MAX_MS)
             return false;
         const now = this.deps.now();
+        if (this.executorWakeAlreadySatisfied(sessionId, state, report.wakeConditions)) {
+            // The executor edge is already visible. Fence every pending automatic
+            // callback before returning control to the still-active root; otherwise
+            // a scheduled executor resume could race same-turn supervision.
+            const cancelled = this.cancelScheduledControl(state, now);
+            this.persist({
+                ...state,
+                generation: state.generation + 1,
+                ...(cancelled ? { lastControlId: null } : {}),
+                nextEvaluationAt: null,
+                updatedAt: now,
+            }, cancelled);
+            this.timers.get(sessionId)?.();
+            this.timers.delete(sessionId);
+            this.completionTimers.get(sessionId)?.();
+            this.completionTimers.delete(sessionId);
+            return 'wakeAlreadySatisfied';
+        }
         const resumeAt = new Date(Date.parse(now) + report.maxWaitMs).toISOString();
         const protocol = state.supervision ?? startSupervisionProtocol(this.progressKey(sessionId));
         const nextProtocol = registerProtocolWait(protocol, { ...report, resumeAt });
@@ -185,6 +203,19 @@ export class AutopilotCoordinator {
         this.armWaitDeadline(sessionId, report.leaseId, resumeAt);
         return true;
     }
+    /** Prevents an edge-triggered executor lease from parking after its edge. */
+    executorWakeAlreadySatisfied(sessionId, state, wakeConditions) {
+        if (!wakeConditions.includes('executorChanged'))
+            return false;
+        if (this.completionTimers.has(sessionId))
+            return true;
+        const retained = this.deps.plan(sessionId);
+        const activity = this.deps.activity(sessionId);
+        if (!retained || activity?.confidence !== 'fresh')
+            return false;
+        const executor = this.currentExecutor(sessionId, retained.plan, state.consecutiveNoProgress, state.executor);
+        return Boolean(executor && !this.authoritativeExecutorActive(state, retained.plan, activity));
+    }
     /** Fails closed only for the currently active bounded probe. */
     rejectProbe(sessionId) {
         const state = this.deps.store.find(sessionId);
@@ -1074,6 +1105,10 @@ export class AutopilotCoordinator {
         this.completionTimers.delete(sessionId);
         this.executorTimers.get(sessionId)?.();
         this.executorTimers.delete(sessionId);
+        this.cancelScheduledExecutorCommands(sessionId);
+    }
+    /** Cancels executor authority while allowing a delivered stale callback to audit itself. */
+    cancelScheduledExecutorCommands(sessionId) {
         const state = this.deps.store.find(sessionId);
         const executor = state?.executor;
         if (state && executor?.commands?.some((command) => command.status === 'scheduled'))

package/dist/server/shared/contracts/autopilot-wait-lease.js

@@ -74,7 +74,7 @@ export function parseAutopilotWaitLease(value) {
         maxWaitMs: value.maxWaitMs,
     };
 }
-export function autopilotWaitLeaseToolResponse(accepted = true) {
+export function autopilotWaitLeaseToolResponse(accepted = true, reason = 'automaticContinuationUnavailable') {
     return {
         success: true,
         contentItems: [
@@ -82,7 +82,7 @@ export function autopilotWaitLeaseToolResponse(accepted = true) {
                 type: 'inputText',
                 text: accepted
                     ? '{"accepted":true}'
-                    : '{"accepted":false,"reason":"automaticContinuationUnavailable","next":"continueSameTurn"}',
+                    : JSON.stringify({ accepted: false, reason, next: 'continueSameTurn' }),
             },
         ],
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gestalt-mobile",
-  "version": "0.35.3",
+  "version": "0.35.4",
   "description": "Mobile-first web relay for durable Codex development sessions",
   "keywords": [
     "codex",