The best way to control Claude Code, Codex and more from any computer or phone
fix(opencode): fail stalled event subscriptions promptly (#30201)
Lakshmi Tanmay committed
Nov 4, 2026 at 05:17 UTC
5ad00e9a0ab7a9bb204ec56aab1d812a1ac9266e
2 files changed
+38
-1
packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
+34
@@ -1,9 +1,13 @@
1
import { assert, it } from "@effect/vitest";
2
import { Session } from "@opencode/client/effect";
3
+import * as Cause from "effect/Cause";
4
+import * as Deferred from "effect/Deferred";
5
import * as Effect from "effect/Effect";
6
+import * as Fiber from "effect/Fiber";
7
import * as Layer from "effect/Layer";
8
import * as Redacted from "effect/Redacted";
9
import * as Schema from "effect/Schema";
10
+import * as TestClock from "effect/testing/TestClock";
11
import * as HttpClient from "effect/http/HttpClient";
12
import * as HttpClientResponse from "effect/http/HttpClientResponse";
13
import { describe } from "vite-plus/test";
@@ -48,6 +52,36 @@ describe("OpenCode2Client authorization", () => {
52
);
53
});
54
55
+describe("OpenCode2Client event subscription", () => {
56
+ it.effect("times out and cancels a subscription with no response headers", () =>
57
+ Effect.gen(function* () {
58
+ const cancelled = yield* Deferred.make<void>();
59
+ const transport = Layer.succeed(
60
+ HttpClient.HttpClient,
61
+ HttpClient.make((request) => {
62
+ assert.strictEqual(request.url, "http://127.0.0.1:4096/api/event");
63
+ return Effect.never.pipe(Effect.ensuring(Deferred.succeed(cancelled, undefined)));
64
+ }),
65
+ );
66
+ const opencode = yield* OpenCode2Client.OpenCode2Client.pipe(
67
+ Effect.provide(OpenCode2Client.layer.pipe(Layer.provide(transport))),
68
+ );
69
+ const { events } = yield* opencode.connect({
70
+ baseUrl: "http://127.0.0.1:4096",
71
+ password: "test-password",
72
+ });
73
+ const opening = yield* events.pipe(Effect.flip, Effect.forkScoped);
74
+
75
+ yield* TestClock.adjust("10 seconds");
76
+ assert.isTrue(yield* Deferred.isDone(cancelled));
77
+ const error = yield* Fiber.join(opening);
78
+ assert.strictEqual(error._tag, "HttpClientError");
79
+ assert.strictEqual(error.reason._tag, "TransportError");
80
+ assert.isTrue(Cause.isTimeoutError(error.cause));
81
+ }).pipe(Effect.scoped),
82
+ );
83
+});
84
+
85
const previous = {
86
id: "msg_repro088",
87
type: "synthetic",
packages/provider-opencode/src/server/v2/OpenCode2Client.ts
+4
-1
@@ -74,6 +74,7 @@ export class OpenCode2Client extends Context.Service<
74
75
// Heartbeats arrive every 10-15 seconds; longer silence means stuck, not idle.
76
const SILENT_STREAM_TIMEOUT = "45 seconds";
77
+const SUBSCRIPTION_TIMEOUT = "10 seconds";
78
79
const decodeEvent = Schema.decodeUnknownResult(Schema.fromJsonString(OpenCodeEvent));
80
const decodeEnvelope = Schema.decodeUnknownOption(
@@ -214,7 +215,9 @@ export const make = Effect.gen(function* () {
215
events: readEvents.pipe(
216
Effect.provideService(
217
HttpClient.HttpClient,
217
- HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)),
218
+ HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)).pipe(
219
+ HttpClient.timeout(SUBSCRIPTION_TIMEOUT),
220
+ ),
221
),
222
),
223
})),