@@ -1560,6 +1560,54 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
     }),
   );
 
+  it.effect("bounds native admission recovery when timeout cleanup cannot abort the session", () =>
+    Effect.gen(function* () {
+      const adapter = yield* OpenCodeAdapter;
+      const threadId = asThreadId("thread-native-command-timeout-abort-failure");
+      const started = promiseWithResolvers<void>();
+      runtimeMock.state.commandImplementation = async () => {
+        started.resolve(undefined);
+        await new Promise<void>(() => {});
+      };
+      runtimeMock.state.abortImplementation = async () => {
+        throw new Error("abort failed");
+      };
+      runtimeMock.state.sessionStatus = "idle";
+      yield* adapter.startSession({
+        provider: ProviderDriverKind.make("opencode"),
+        threadId,
+        runtimeMode: "full-access",
+      });
+      const exitedFiber = yield* adapter.streamEvents.pipe(
+        Stream.filter((event) => event.threadId === threadId && event.type === "session.exited"),
+        Stream.runHead,
+        Effect.forkChild,
+      );
+      const sendFiber = yield* adapter
+        .sendTurn({
+          threadId,
+          input: "/review",
+          modelSelection: createModelSelection(ProviderInstanceId.make("opencode"), "openai/gpt-5"),
+        })
+        .pipe(Effect.exit, Effect.forkChild);
+      yield* Effect.promise(() => started.promise);
+      yield* advanceTestClock(10_000);
+      NodeAssert.equal(Exit.isFailure(yield* Fiber.join(sendFiber)), true);
+      yield* advanceTestClock(6_000);
+      const exited = Option.getOrThrow(yield* Fiber.join(exitedFiber));
+      NodeAssert.ok(exited.type === "session.exited");
+      NodeAssert.equal(exited.payload.exitKind, "error");
+      NodeAssert.ok(runtimeMock.state.sessionStatusCalls > 0);
+      NodeAssert.equal(
+        (yield* adapter.listSessions()).some((session) => session.threadId === threadId),
+        false,
+      );
+      const messageCalls = runtimeMock.state.messageCalls.length;
+      yield* advanceTestClock(5_000);
+      NodeAssert.equal(runtimeMock.state.messageCalls.length, messageCalls);
+    }),
+  );
+
   for (const nativeStartsTurn of [true, false]) {
     it.effect(
       `reports a late native command failure after another steer (starts turn: ${nativeStartsTurn})`,
 
@@ -216,7 +216,7 @@ interface OpenCodePromptAdmission {
   readonly generation: number;
   readonly turnId: TurnId;
   readonly messageId: string;
-  readonly requiresMessageReceipt: boolean;
+  requiresMessageReceipt: boolean;
   readonly priorAwaitingBusy: boolean;
   readonly priorIdle: { readonly turnId: TurnId; readonly raw: unknown } | undefined;
   idleDuringAdmission: { readonly turnId: TurnId; readonly raw: unknown } | undefined;
@@ -1490,9 +1490,7 @@ export function makeOpenCodeAdapter(
           const delayMs = Math.min(250 * 2 ** retryCount, 2_000);
           yield* Effect.sleep(`${delayMs} millis`);
         }
-        if (promptAdmission.accepted) {
-          yield* failPromptAdmissionRecovery(context, promptAdmission);
-        }
+        yield* failPromptAdmissionRecovery(context, promptAdmission);
       }).pipe(
         Effect.catchCause(() => Effect.void),
         Effect.ensuring(
@@ -3306,11 +3304,12 @@ export function makeOpenCodeAdapter(
                 );
               },
             }),
-            Effect.tapError(() =>
-              nativeCommand && promptAdmission.recoveryFiber
+            Effect.tapError(() => {
+              promptAdmission.requiresMessageReceipt = false;
+              return nativeCommand && promptAdmission.recoveryFiber
                 ? Fiber.interrupt(promptAdmission.recoveryFiber)
-                : Effect.void,
-            ),
+                : Effect.void;
+            }),
             Effect.tapError((requestError) => {
               if (
                 nativeCommand &&
 
@@ -1018,7 +1018,7 @@ export const make = (
                   yield* Deferred.succeed(promptOptions.dispatched, undefined);
                 }
                 return active;
-              }),
+              }).pipe(notificationSemaphore.withPermit),
             ),
             (activePrompt) =>
               Fiber.join(activePrompt.fiber).pipe(
Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ export const make = (`
`1018`	`1018`	`yield* Deferred.succeed(promptOptions.dispatched, undefined);`
`1019`	`1019`	`}`
`1020`	`1020`	`return active;`
`1021`		`- }),`
	`1021`	`+ }).pipe(notificationSemaphore.withPermit),`
`1022`	`1022`	`),`
`1023`	`1023`	`(activePrompt) =>`
`1024`	`1024`	`Fiber.join(activePrompt.fiber).pipe(`