Skip to content

Commit cefd01e

Browse files
committed
fix(server): slow OpenCode wrappers no longer show as unavailable
1 parent 9503155 commit cefd01e

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

‎apps/server/src/provider/OpenCodeProvider.test.ts‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as NodeAssert from "node:assert/strict";
33
import * as NodeServices from "@effect/platform-node/NodeServices";
44
import { it } from "@effect/vitest";
55
import * as Deferred from "effect/Deferred";
6+
import * as Duration from "effect/Duration";
67
import * as Effect from "effect/Effect";
78
import * as Fiber from "effect/Fiber";
89
import * as FileSystem from "effect/FileSystem";
@@ -170,6 +171,7 @@ const runtimeMock = {
170171
state: {
171172
runVersionError: null as Error | null,
172173
runVersionPending: false,
174+
runVersionDelay: null as Duration.Input | null,
173175
versionStdout: DEFAULT_VERSION_STDOUT,
174176
inventoryError: null as Error | null,
175177
connectionError: null as Error | null,
@@ -189,6 +191,7 @@ const runtimeMock = {
189191
reset() {
190192
this.state.runVersionError = null;
191193
this.state.runVersionPending = false;
194+
this.state.runVersionDelay = null;
192195
this.state.versionStdout = DEFAULT_VERSION_STDOUT;
193196
this.state.inventoryError = null;
194197
this.state.connectionError = null;
@@ -261,7 +264,11 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntime.OpenCodeRuntimeShape = {
261264
cause: runtimeMock.state.runVersionError,
262265
}),
263266
)
264-
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
267+
: runtimeMock.state.runVersionDelay
268+
? Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }).pipe(
269+
Effect.delay(runtimeMock.state.runVersionDelay),
270+
)
271+
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
265272
createOpenCodeSdkClient: (input) => {
266273
runtimeMock.state.sdkClientInputs.push(input);
267274
return {} as unknown as ReturnType<
@@ -390,18 +397,33 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
390397
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
391398

392399
yield* Effect.yieldNow;
393-
yield* TestClock.adjust("4 seconds");
400+
yield* TestClock.adjust("10 seconds");
394401
const snapshot = yield* Fiber.join(probeFiber);
395402

396403
NodeAssert.equal(snapshot.status, "error");
397404
NodeAssert.equal(snapshot.installed, true);
398405
NodeAssert.equal(
399406
snapshot.message,
400-
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 4 seconds.",
407+
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 10 seconds.",
401408
);
402409
}).pipe(Effect.provide(TestClock.layer())),
403410
);
404411

412+
it.effect("waits for a slow but healthy local CLI version probe", () =>
413+
Effect.gen(function* () {
414+
runtimeMock.state.runVersionDelay = "6 seconds";
415+
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
416+
417+
yield* Effect.yieldNow;
418+
yield* TestClock.adjust("6 seconds");
419+
const snapshot = yield* Fiber.join(probeFiber);
420+
421+
NodeAssert.notEqual(snapshot.status, "error");
422+
NodeAssert.equal(snapshot.installed, true);
423+
NodeAssert.equal(snapshot.version, "1.14.19");
424+
}).pipe(Effect.provide(TestClock.layer())),
425+
);
426+
405427
it.effect("emits OpenCode variant defaults so trait picker can resolve a visible selection", () =>
406428
Effect.gen(function* () {
407429
runtimeMock.state.inventory = {

‎apps/server/src/provider/opencodeVersionProbe.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export interface ProbedOpenCode {
1616
readonly version: string;
1717
}
1818

19-
const OPENCODE_VERSION_PROBE_TIMEOUT = "4 seconds";
19+
// Meant to stop a hung `--version`; wrapped installs can take several seconds to start cold.
20+
const OPENCODE_VERSION_PROBE_TIMEOUT = "10 seconds";
2021
const OPENCODE_SERVER_PROBE_TIMEOUT = "5 seconds";
2122
// 2.x's own CLI decodes `{version, pid}` from `/api/info`; requiring both keeps unrelated JSON out.
2223
const decodeApiInfo = Schema.decodeUnknownOption(

0 commit comments

Comments
 (0)