Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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 Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";
import * as UrlParams from "effect/http/UrlParams";
import * as HttpClient from "effect/http/HttpClient";
Expand Down Expand Up @@ -53,6 +54,37 @@ describe("OpenCode2Client authorization", () => {
);
});

// Frames captured from OpenCode 2.1.4, which no longer sends `data.recent`.
const COMPACTION_FRAMES = [
{
id: "evt_17fbf08bf0027kXxWvCuGCkaol",
created: 1793144588479,
type: "session.compaction.started",
location: { directory: "/tmp/proj" },
data: {
sessionID: "ses_e80415922ffetjml4RUW7tRPQL",
reason: "manual",
inputID: "msg_17fbf08b10019CxokkaEaAaZ8f",
},
durable: { aggregateID: "ses_e80415922ffetjml4RUW7tRPQL", seq: 16, version: 1 },
},
{
id: "evt_17fbf1179001YzrfiloDXDkGMV",
created: 1793144590713,
type: "session.compaction.ended",
location: { directory: "/tmp/proj" },
data: {
sessionID: "ses_e80415922ffetjml4RUW7tRPQL",
reason: "manual",
model: { id: "claude-haiku-5-5", providerID: "anthropic", variant: "default" },
text: "## Objective\n- (none)",
tokens: { input: 4, output: 140, reasoning: 0, cache: { read: 5113, write: 10821 } },
cost: 0.001474155,
},
durable: { aggregateID: "ses_e80415922ffetjml4RUW7tRPQL", seq: 18, version: 1 },
},
];

describe("OpenCode2Client event subscription", () => {
it.effect("times out and cancels a subscription with no response headers", () =>
Effect.gen(function* () {
Expand Down Expand Up @@ -81,6 +113,37 @@ describe("OpenCode2Client event subscription", () => {
assert.isTrue(Cause.isTimeoutError(error.cause));
}).pipe(Effect.scoped),
);

it.effect("delivers compaction events from OpenCode 2.1", () =>
Effect.gen(function* () {
const transport = Layer.succeed(
HttpClient.HttpClient,
HttpClient.make((request) =>
Effect.succeed(
HttpClientResponse.fromWeb(
request,
new Response(
COMPACTION_FRAMES.map((frame) => `data: ${JSON.stringify(frame)}\n\n`).join(""),
{ headers: { "content-type": "text/event-stream" } },
),
),
),
),
);
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 received = yield* Stream.runCollect(yield* events);
assert.deepStrictEqual(
received.map((event) => event.type),
["session.compaction.started", "session.compaction.ended"],
);
}),
);
});

const previous = {
Expand Down
26 changes: 24 additions & 2 deletions packages/provider-opencode/src/server/v2/OpenCode2Client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Predicate from "effect/Predicate";
import * as Redacted from "effect/Redacted";
import * as Result from "effect/Result";
import * as Schema from "effect/Schema";
Expand Down Expand Up @@ -113,6 +114,23 @@ const SILENT_STREAM_TIMEOUT = "45 seconds";
const SUBSCRIPTION_TIMEOUT = "10 seconds";

const decodeEvent = Schema.decodeUnknownResult(Schema.fromJsonString(OpenCodeEvent));
const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown));
const decodeEventValue = Schema.decodeUnknownResult(OpenCodeEvent);

// OpenCode 2.1+ omits data.recent on compaction events; the bundled 2.0 schema still requires it.
const decodeCompactionWithoutRecent = (data: string) => {
const frame = Option.getOrUndefined(decodeJson(data));
if (
!Predicate.isObject(frame) ||
(frame.type !== "session.compaction.started" && frame.type !== "session.compaction.ended") ||
!Predicate.isObject(frame.data) ||
"recent" in frame.data
) {
return Option.none();
}
return Result.getSuccess(decodeEventValue({ ...frame, data: { ...frame.data, recent: "" } }));
};

const decodeEnvelope = Schema.decodeUnknownOption(
Schema.fromJsonString(
Schema.Struct({
Expand Down Expand Up @@ -165,8 +183,12 @@ const readEvents = HttpClient.get("/api/event", {
Stream.pipeThroughChannel(Sse.decode()),
Stream.filterMapEffect((frame) => {
const decoded = decodeEvent(frame.data);
return Result.isSuccess(decoded)
? Effect.succeed(Result.succeed<OpenCode2StreamEvent>(decoded.success))
if (Result.isSuccess(decoded)) {
return Effect.succeed(Result.succeed<OpenCode2StreamEvent>(decoded.success));
}
const compaction = decodeCompactionWithoutRecent(frame.data);
return Option.isSome(compaction)
? Effect.succeed(Result.succeed<OpenCode2StreamEvent>(compaction.value))
: undecodable(frame.data);
}),
),
Expand Down
Loading