Commit d0b9f8d40d7f269a4c77b7c0302b5889a31ba66a | the-knife

author	Wout Stiens <71498452+StiensWout@users.noreply.github.com> 2026-07-18 13:19:52+02:00
committer	GitHub <noreply@github.com> 2026-07-18 13:19:52+02:00
log	d0b9f8d40d7f269a4c77b7c0302b5889a31ba66a
tree	677f12794741942faa0e2ffd0f3560a8ab0d2ca0
parent	d8b12ae801f2123e9be73d2f4139f8994e4d1d19
signature	Signed by PGP key B5690EEEBB952194

[codex] Route OpenCode missing-session errors through Effect (#3608)

Co-authored-by: Codex <codex@openai.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>

2 files changed, 45 insertions(+), 16 deletions(-)

apps
- server
  - src
    provider
    Layers
    OpenCodeAdapter.test.ts
    OpenCodeAdapter.ts

apps/server/src/provider/Layers/OpenCodeAdapter.test.ts+32

...	@@ -248,6 +248,38 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {	...	@@ -248,6 +248,38 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
248	}),	248	}),
249	);	249	);
250		250
		251	it.effect("fails sendTurn for missing sessions through the typed error channel", () =>
		252	Effect.gen(function* () {
		253	const adapter = yield* OpenCodeAdapter;
		254	const result = yield* adapter
		255	.sendTurn({
		256	threadId: asThreadId("thread-opencode-missing-send"),
		257	input: "hello",
		258	attachments: [],
		259	})
		260	.pipe(Effect.result);
		261
		262	NodeAssert.equal(result._tag, "Failure");
		263	NodeAssert.equal(result.failure._tag, "ProviderAdapterSessionNotFoundError");
		264	NodeAssert.equal(result.failure.provider, "opencode");
		265	NodeAssert.equal(result.failure.threadId, "thread-opencode-missing-send");
		266	}),
		267	);
		268
		269	it.effect("fails stopSession for missing sessions through the typed error channel", () =>
		270	Effect.gen(function* () {
		271	const adapter = yield* OpenCodeAdapter;
		272	const result = yield* adapter
		273	.stopSession(asThreadId("thread-opencode-missing-stop"))
		274	.pipe(Effect.result);
		275
		276	NodeAssert.equal(result._tag, "Failure");
		277	NodeAssert.equal(result.failure._tag, "ProviderAdapterSessionNotFoundError");
		278	NodeAssert.equal(result.failure.provider, "opencode");
		279	NodeAssert.equal(result.failure.threadId, "thread-opencode-missing-stop");
		280	}),
		281	);
		282
251	it.effect("stops a configured-server session without trying to own server lifecycle", () =>	283	it.effect("stops a configured-server session without trying to own server lifecycle", () =>
252	Effect.gen(function* () {	284	Effect.gen(function* () {
253	const adapter = yield* OpenCodeAdapter;	285	const adapter = yield* OpenCodeAdapter;

apps/server/src/provider/Layers/OpenCodeAdapter.ts+13-16

 @@ -228,28 +228,25 @@ function appendTurnItem(
   resolveTurnSnapshot(context, turnId).items.push(item);
 }
-function ensureSessionContext(
+const ensureSessionContext = Effect.fn("ensureSessionContext")(function* (
   sessions: ReadonlyMap<ThreadId, OpenCodeSessionContext>,
   threadId: ThreadId,
-): OpenCodeSessionContext {
+) {
   const session = sessions.get(threadId);
   if (!session) {
-    throw new ProviderAdapterSessionNotFoundError({
+    return yield* new ProviderAdapterSessionNotFoundError({
       provider: PROVIDER,
       threadId,
     });
   }
-  // `ensureSessionContext` is a sync gate used from both sync helpers and
+  if (yield* Ref.get(session.stopped)) {
-  // Effect bodies. `Ref.getUnsafe` is an atomic read of the backing cell —
+    return yield* new ProviderAdapterSessionClosedError({
-  // no fiber suspension required, which keeps this callable everywhere.
-  if (Ref.getUnsafe(session.stopped)) {
-    throw new ProviderAdapterSessionClosedError({
       provider: PROVIDER,
       threadId,
     });
   }
   return session;
-}
+});
 function normalizeQuestionRequest(request: QuestionRequest): ReadonlyArray<UserInputQuestion> {
   return request.questions.map((question, index) => ({
 @@ -1167,7 +1164,7 @@ export function makeOpenCodeAdapter(
     );
     const sendTurn: OpenCodeAdapterShape["sendTurn"] = Effect.fn("sendTurn")(function* (input) {
-      const context = ensureSessionContext(sessions, input.threadId);
+      const context = yield* ensureSessionContext(sessions, input.threadId);
       // A sendTurn while a turn is active is a steer: OpenCode queues the
       // prompt into the busy session and the work continues as one turn, so
       // the active turn id is reused instead of opening a new turn.
 @@ -1291,7 +1288,7 @@ export function makeOpenCodeAdapter(
     const interruptTurn: OpenCodeAdapterShape["interruptTurn"] = Effect.fn("interruptTurn")(
       function* (threadId, turnId) {
-        const context = ensureSessionContext(sessions, threadId);
+        const context = yield* ensureSessionContext(sessions, threadId);
         yield* runOpenCodeSdk("session.abort", () =>
           context.client.session.abort({ sessionID: context.openCodeSessionId }),
         ).pipe(Effect.mapError(toRequestError));
 @@ -1313,7 +1310,7 @@ export function makeOpenCodeAdapter(
     const respondToRequest: OpenCodeAdapterShape["respondToRequest"] = Effect.fn(
       "respondToRequest",
     )(function* (threadId, requestId, decision) {
-      const context = ensureSessionContext(sessions, threadId);
+      const context = yield* ensureSessionContext(sessions, threadId);
       if (!context.pendingPermissions.has(requestId)) {
         return yield* new ProviderAdapterRequestError({
           provider: PROVIDER,
 @@ -1333,7 +1330,7 @@ export function makeOpenCodeAdapter(
     const respondToUserInput: OpenCodeAdapterShape["respondToUserInput"] = Effect.fn(
       "respondToUserInput",
     )(function* (threadId, requestId, answers) {
-      const context = ensureSessionContext(sessions, threadId);
+      const context = yield* ensureSessionContext(sessions, threadId);
       const request = context.pendingQuestions.get(requestId);
       if (!request) {
         return yield* new ProviderAdapterRequestError({
 @@ -1355,7 +1352,7 @@ export function makeOpenCodeAdapter(
       function* (threadId) {
         const context = sessions.get(threadId);
         if (!context) {
-          throw new ProviderAdapterSessionNotFoundError({
+          return yield* new ProviderAdapterSessionNotFoundError({
             provider: PROVIDER,
             threadId,
           });
 @@ -1385,7 +1382,7 @@ export function makeOpenCodeAdapter(
     const readThread: OpenCodeAdapterShape["readThread"] = Effect.fn("readThread")(
       function* (threadId) {
-        const context = ensureSessionContext(sessions, threadId);
+        const context = yield* ensureSessionContext(sessions, threadId);
         const messages = yield* runOpenCodeSdk("session.messages", () =>
           context.client.session.messages({
             sessionID: context.openCodeSessionId,
 @@ -1411,7 +1408,7 @@ export function makeOpenCodeAdapter(
     const rollbackThread: OpenCodeAdapterShape["rollbackThread"] = Effect.fn("rollbackThread")(
       function* (threadId, numTurns) {
-        const context = ensureSessionContext(sessions, threadId);
+        const context = yield* ensureSessionContext(sessions, threadId);
         const messages = yield* runOpenCodeSdk("session.messages", () =>
           context.client.session.messages({
             sessionID: context.openCodeSessionId,