Skip to content
TypeScript

fix(opencode): fail stalled event subscriptions promptly (#30201)

Lakshmi Tanmay5ad00e9a0ab7
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts b/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
index cf99beeecb2..5ce763e024b 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
@@ -1,9 +1,13 @@
import { assert, it } from "@effect/vitest";
import { Session } from "@opencode/client/effect";
+import * as Cause from "effect/Cause";
+import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
import * as Layer from "effect/Layer";
import * as Redacted from "effect/Redacted";
import * as Schema from "effect/Schema";
+import * as TestClock from "effect/testing/TestClock";
import * as HttpClient from "effect/http/HttpClient";
import * as HttpClientResponse from "effect/http/HttpClientResponse";
import { describe } from "vite-plus/test";
@@ -48,6 +52,36 @@ describe("OpenCode2Client authorization", () => {
);
});
+describe("OpenCode2Client event subscription", () => {
+ it.effect("times out and cancels a subscription with no response headers", () =>
+ Effect.gen(function* () {
+ const cancelled = yield* Deferred.make<void>();
+ const transport = Layer.succeed(
+ HttpClient.HttpClient,
+ HttpClient.make((request) => {
+ assert.strictEqual(request.url, "http://127.0.0.1:4096/api/event");
+ return Effect.never.pipe(Effect.ensuring(Deferred.succeed(cancelled, undefined)));
+ }),
+ );
+ const opencode = yield* OpenCode2Client.OpenCode2Client.pipe(
+ Effect.provide(OpenCode2Client.layer.pipe(Layer.provide(transport))),
+ );
+ const { events } = yield* opencode.connect({
+ baseUrl: "http://127.0.0.1:4096",
+ password: "test-password",
+ });
+ const opening = yield* events.pipe(Effect.flip, Effect.forkScoped);
+
+ yield* TestClock.adjust("10 seconds");
+ assert.isTrue(yield* Deferred.isDone(cancelled));
+ const error = yield* Fiber.join(opening);
+ assert.strictEqual(error._tag, "HttpClientError");
+ assert.strictEqual(error.reason._tag, "TransportError");
+ assert.isTrue(Cause.isTimeoutError(error.cause));
+ }).pipe(Effect.scoped),
+ );
+});
+
const previous = {
id: "msg_repro088",
type: "synthetic",
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Client.ts b/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
index dc7de72ae13..71fb1d70ce7 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
@@ -74,6 +74,7 @@ export class OpenCode2Client extends Context.Service<
// Heartbeats arrive every 10-15 seconds; longer silence means stuck, not idle.
const SILENT_STREAM_TIMEOUT = "45 seconds";
+const SUBSCRIPTION_TIMEOUT = "10 seconds";
const decodeEvent = Schema.decodeUnknownResult(Schema.fromJsonString(OpenCodeEvent));
const decodeEnvelope = Schema.decodeUnknownOption(
@@ -214,7 +215,9 @@ export const make = Effect.gen(function* () {
events: readEvents.pipe(
Effect.provideService(
HttpClient.HttpClient,
- HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)),
+ HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)).pipe(
+ HttpClient.timeout(SUBSCRIPTION_TIMEOUT),
+ ),
),
),
})),