Skip to content

Commit a135972

Browse files
maria-rcksZherueljuliusmarminge
authored
fix(opencode): preserve owned turns during server recovery (pingdotgg#25596)
Co-authored-by: Tin Zeljar <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent d9bed93 commit a135972

8 files changed

Lines changed: 859 additions & 147 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts‎

Lines changed: 543 additions & 1 deletion
Large diffs are not rendered by default.

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ const replayHttpClient = (
152152
controller: OpenCodeReplayController,
153153
replayGate: ProviderReplayGate | undefined,
154154
onPrompt: ((input: unknown) => void) | undefined,
155+
beforeResponse: ((path: string) => Effect.Effect<void>) | undefined,
155156
) =>
156157
HttpClient.make((request, url) =>
157158
Effect.tryPromise({
@@ -210,13 +211,18 @@ const replayHttpClient = (
210211
new HttpClientError.HttpClientError({
211212
reason: new HttpClientError.TransportError({ request, cause }),
212213
}),
213-
}).pipe(Effect.map((response) => HttpClientResponse.fromWeb(request, response))),
214+
}).pipe(
215+
Effect.map((response) => HttpClientResponse.fromWeb(request, response)),
216+
Effect.tap(() => beforeResponse?.(url.pathname) ?? Effect.void),
217+
),
214218
);
215219

216220
export const replayServer = (
217221
transcript: ProviderReplayTranscript,
218222
options?: {
219223
readonly external?: boolean;
224+
readonly processExit?: Effect.Effect<void>;
225+
readonly beforeResponse?: (path: string) => Effect.Effect<void>;
220226
readonly onPrompt?: (input: unknown) => void;
221227
readonly replayGate?: ProviderReplayGate;
222228
readonly borrowers?: { current: number };
@@ -233,14 +239,20 @@ export const replayServer = (
233239
const opencode = yield* OpenCode2Client.make.pipe(
234240
Effect.provideService(
235241
HttpClient.HttpClient,
236-
replayHttpClient(controller, options?.replayGate, options?.onPrompt),
242+
replayHttpClient(
243+
controller,
244+
options?.replayGate,
245+
options?.onPrompt,
246+
options?.beforeResponse,
247+
),
237248
),
238249
);
239250
const connection = {
240251
...(yield* opencode.connect({ baseUrl: BASE_URL, password: "replay" })),
241252
url: BASE_URL,
242253
version: transcript.version,
243254
external: options?.external ?? false,
255+
...(options?.external ? {} : { processExit: options?.processExit ?? Effect.never }),
244256
};
245257
const borrowers = options?.borrowers;
246258
return OpenCode2Server.OpenCode2Server.of({
@@ -265,6 +277,8 @@ const makeReplayAdapter = (
265277
transcript: ProviderReplayTranscript,
266278
options?: {
267279
readonly external?: boolean;
280+
readonly processExit?: Effect.Effect<void>;
281+
readonly beforeResponse?: (path: string) => Effect.Effect<void>;
268282
readonly onPrompt?: (input: unknown) => void;
269283
readonly replayGate?: ProviderReplayGate;
270284
readonly borrowers?: { current: number };
@@ -318,6 +332,8 @@ export const openCode2ReplayRuntime = (
318332
entries: ReadonlyArray<ProviderReplayEntry>,
319333
options?: {
320334
readonly external?: boolean;
335+
readonly processExit?: Effect.Effect<void>;
336+
readonly beforeResponse?: (path: string) => Effect.Effect<void>;
321337
readonly version?: string;
322338
readonly onPrompt?: (input: unknown) => void;
323339
readonly borrowers?: { current: number };

‎docs/user/providers-opencode.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ reached through `localhost`. That server can still report the previous version
5555
until you restart it. For a loopback URL, T3 Code shows that restart requirement
5656
instead of treating the CLI update as a failure.
5757

58-
After a lost connection, send another prompt to reconnect to the same OpenCode
58+
T3 Code waits for a local server it started to recover after a lost connection.
59+
You can stop the turn while it reconnects. If the server exits or an external
60+
connection cannot be restored, send another prompt to resume the same OpenCode
5961
session.
6062

6163
## Approvals

‎packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import * as Cause from "effect/Cause";
44
import * as Deferred from "effect/Deferred";
55
import * as Effect from "effect/Effect";
66
import * as Fiber from "effect/Fiber";
7+
import * as Exit from "effect/Exit";
8+
import * as Scope from "effect/Scope";
79
import * as Layer from "effect/Layer";
810
import * as Redacted from "effect/Redacted";
911
import * as Schema from "effect/Schema";
@@ -168,6 +170,36 @@ describe("OpenCode2Client message history", () => {
168170
}),
169171
);
170172
});
173+
it.effect("closes an event subscription that recovery has not started reading", () =>
174+
Effect.gen(function* () {
175+
const signals: Array<AbortSignal> = [];
176+
const http = HttpClient.make((request, _url, signal) =>
177+
Effect.sync(() => {
178+
signals.push(signal);
179+
return HttpClientResponse.fromWeb(
180+
request,
181+
new Response(": connected\n\n", {
182+
headers: { "content-type": "text/event-stream" },
183+
}),
184+
);
185+
}),
186+
);
187+
const opencode = yield* OpenCode2Client.make.pipe(
188+
Effect.provideService(HttpClient.HttpClient, http),
189+
);
190+
const connection = yield* opencode.connect({
191+
baseUrl: "http://127.0.0.1:4096",
192+
password: "test",
193+
});
194+
const scope = yield* Effect.acquireRelease(Scope.make(), (scope) =>
195+
Scope.close(scope, Exit.void),
196+
);
197+
yield* connection.events.pipe(Effect.provideService(Scope.Scope, scope), Effect.asVoid);
198+
assert.isFalse(signals[0]!.aborted);
199+
yield* Scope.close(scope, Exit.void);
200+
assert.isTrue(signals[0]!.aborted);
201+
}).pipe(Effect.scoped),
202+
);
171203

172204
describe("OpenCode2Client native image jobs", () => {
173205
it.effect.each([

‎packages/provider-opencode/src/server/v2/OpenCode2Client.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import * as Option from "effect/Option";
99
import * as Redacted from "effect/Redacted";
1010
import * as Result from "effect/Result";
1111
import * as Schema from "effect/Schema";
12+
import type * as Scope from "effect/Scope";
1213
import * as Stream from "effect/Stream";
1314
import * as Sse from "effect/encoding/Sse";
1415
import * as HttpClient from "effect/http/HttpClient";
@@ -113,7 +114,8 @@ export interface OpenCode2Api {
113114
OpenCode2StreamEvent,
114115
HttpClientError.HttpClientError | Sse.Retry | Sse.SseError | OpenCode2SilentStreamError
115116
>,
116-
HttpClientError.HttpClientError
117+
HttpClientError.HttpClientError,
118+
Scope.Scope
117119
>;
118120
}
119121

@@ -170,9 +172,13 @@ const undecodable = Effect.fnUntraced(function* (data: string) {
170172
return Result.failVoid;
171173
});
172174

173-
const readEvents = HttpClient.get("/api/event", {
174-
headers: { accept: "text/event-stream" },
175-
}).pipe(
175+
const readEvents = HttpClient.HttpClient.pipe(
176+
// Recovery subscribes before reading history, so its stream may never be consumed.
177+
Effect.flatMap((client) =>
178+
HttpClient.withScope(client).get("/api/event", {
179+
headers: { accept: "text/event-stream" },
180+
}),
181+
),
176182
Effect.flatMap(HttpClientResponse.filterStatusOk),
177183
Effect.map((response) =>
178184
response.stream.pipe(

‎packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,12 @@ describe("OpenCode2Server spawned server", () => {
253253
assert.strictEqual(first.version, "2.0.18");
254254
assert.strictEqual(first.external, false);
255255
assert.strictEqual(second.client, first.client);
256+
if (first.processExit === undefined)
257+
return yield* Effect.die("Missing owned process lifetime");
258+
return first.processExit;
256259
}).pipe(
257260
Effect.scoped,
261+
Effect.flatten,
258262
Effect.provide(
259263
Layer.mergeAll(
260264
OpenCode2Client.layer,

‎packages/provider-opencode/src/server/v2/OpenCode2Server.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export interface OpenCode2Connection extends OpenCode2Client.OpenCode2Api {
1818
readonly url: string;
1919
readonly version: string;
2020
readonly external: boolean;
21+
/** Only owned processes have an authoritative lifetime signal. */
22+
readonly processExit?: Effect.Effect<void>;
2123
}
2224

2325
export class OpenCode2Server extends Context.Service<
@@ -50,7 +52,7 @@ export const serverEnvironment = (
5052
return { ...rest, OPENCODE_PASSWORD: Redacted.value(password) };
5153
};
5254

53-
const httpFailureOf = (cause: unknown): HttpClientError.HttpClientError | undefined => {
55+
export const httpFailureOf = (cause: unknown): HttpClientError.HttpClientError | undefined => {
5456
if (HttpClientError.isHttpClientError(cause)) return cause;
5557
if (
5658
P.isTagged(cause, "ClientError") &&
@@ -163,7 +165,7 @@ export const make = Effect.fn("OpenCode2Server.make")(function* (input: {
163165
withConnection: Effect.fn("OpenCode2Server.withConnection")(function (use) {
164166
return owner.withServer((server) =>
165167
latest?.url === server.url
166-
? use(latest)
168+
? use({ ...latest, processExit: server.exitCode.pipe(Effect.asVoid) })
167169
: Effect.die(new Error("OpenCode 2 server was lent before verification.")),
168170
);
169171
}),

0 commit comments

Comments
 (0)