Skip to content

Commit de6830f

Browse files
only21milclaude
andauthored
fix(opencode): OpenCode 1.x text generation gives up after 3 minutes like every other runner (pingdotgg#28372)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent cfe2e97 commit de6830f

2 files changed

Lines changed: 56 additions & 1 deletion

File tree

‎packages/provider-opencode/src/server/textGeneration.test.ts‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,24 @@ const advanceIdleClock = Effect.gen(function* () {
248248
});
249249

250250
it.layer(layerOpenCodeTextGenerationTest)("OpenCodeTextGeneration", (it) => {
251-
it.effect("cancels an in-flight session creation before prompting", () =>
251+
it.effect("cancels or times out an in-flight session creation before prompting", () =>
252252
withOpenCodeTextGeneration(EXISTING_SERVER_OPENCODE_SETTINGS, (textGeneration) =>
253253
Effect.gen(function* () {
254+
const timedOut = yield* Deferred.make<AbortSignal | undefined>();
255+
runtimeMock.state.onSessionCreate = (signal) => {
256+
Deferred.doneUnsafe(timedOut, Effect.succeed(signal));
257+
return new Promise<never>(() => {});
258+
};
259+
const timedOutFiber = yield* textGeneration
260+
.generateCommitMessage(DEFAULT_COMMIT_MESSAGE_INPUT)
261+
.pipe(Effect.forkChild);
262+
const timedOutSignal = yield* Deferred.await(timedOut);
263+
yield* TestClock.adjust(Duration.minutes(3));
264+
const timeoutError = yield* Fiber.join(timedOutFiber).pipe(Effect.flip);
265+
expect(timeoutError).toBeInstanceOf(TextGenerationError);
266+
expect(timeoutError.detail).toBe("OpenCode did not finish generating in time.");
267+
expect(timedOutSignal?.aborted).toBe(true);
268+
254269
const started = yield* Deferred.make<AbortSignal | undefined>();
255270
runtimeMock.state.onSessionCreate = (signal) => {
256271
Deferred.doneUnsafe(started, Effect.succeed(signal));
@@ -368,6 +383,34 @@ it.layer(layerOpenCodeTextGenerationTest)("OpenCodeTextGeneration", (it) => {
368383
),
369384
);
370385

386+
it.effect("gives up and aborts the session when a prompt never settles", () =>
387+
withOpenCodeTextGeneration(DEFAULT_OPENCODE_SETTINGS, (textGeneration) =>
388+
Effect.gen(function* () {
389+
const started = yield* Deferred.make<AbortSignal | undefined>();
390+
let sessionAborts = 0;
391+
runtimeMock.state.onPrompt = (signal) => {
392+
Deferred.doneUnsafe(started, Effect.succeed(signal));
393+
return new Promise<never>(() => {});
394+
};
395+
runtimeMock.state.onAbort = () => {
396+
sessionAborts += 1;
397+
return Promise.reject(new Error("abort observed"));
398+
};
399+
const fiber = yield* textGeneration
400+
.generateCommitMessage(DEFAULT_COMMIT_MESSAGE_INPUT)
401+
.pipe(Effect.forkChild);
402+
const signal = yield* Deferred.await(started);
403+
yield* TestClock.adjust(Duration.minutes(3));
404+
405+
const error = yield* Fiber.join(fiber).pipe(Effect.flip);
406+
expect(error).toBeInstanceOf(TextGenerationError);
407+
expect(error.detail).toBe("OpenCode did not finish generating in time.");
408+
expect(signal?.aborted).toBe(true);
409+
expect(sessionAborts).toBe(1);
410+
}),
411+
),
412+
);
413+
371414
it.effect("uses an environment-only password for a locally spawned server", () =>
372415
withOpenCodeTextGeneration(
373416
DEFAULT_OPENCODE_SETTINGS,

‎packages/provider-opencode/src/server/textGeneration.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import * as TextGenerationOperations from "@t3tools/provider-core/server/textGen
1010
import * as OpenCodeRuntime from "./OpenCodeRuntime.ts";
1111
import * as OpenCodeServerOwner from "./OpenCodeServerOwner.ts";
1212

13+
const GENERATION_TIMEOUT = "3 minutes";
14+
1315
const OpenCodeTextGenerationOperation = Schema.Literals([
1416
"generateCommitMessage",
1517
"generatePrContent",
@@ -339,6 +341,16 @@ export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration"
339341
.pipe(Effect.flatMap(runAgainstServer), Effect.scoped)
340342
: serverOwner.withServer(runAgainstServer);
341343
const rawOutput = yield* serverOutput.pipe(
344+
Effect.timeoutOrElse({
345+
duration: GENERATION_TIMEOUT,
346+
orElse: () =>
347+
Effect.fail(
348+
new TextGenerationError({
349+
operation: input.operation,
350+
detail: "OpenCode did not finish generating in time.",
351+
}),
352+
),
353+
}),
342354
Effect.catchTags({
343355
OpenCodeRuntimeError: (cause) =>
344356
Effect.fail(

0 commit comments

Comments
 (0)