Skip to content

Commit c59ab7d

Browse files
authored
fix(server): slow OpenCode wrappers no longer show as unavailable (pingdotgg#16544)
1 parent 145fba7 commit c59ab7d

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

‎packages/provider-opencode/src/server/status.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";
@@ -160,6 +161,7 @@ const runtimeMock = {
160161
state: {
161162
runVersionError: null as Error | null,
162163
runVersionPending: false,
164+
runVersionDelay: null as Duration.Input | null,
163165
versionStdout: DEFAULT_VERSION_STDOUT,
164166
inventoryError: null as Error | null,
165167
connectionError: null as Error | null,
@@ -179,6 +181,7 @@ const runtimeMock = {
179181
reset() {
180182
this.state.runVersionError = null;
181183
this.state.runVersionPending = false;
184+
this.state.runVersionDelay = null;
182185
this.state.versionStdout = DEFAULT_VERSION_STDOUT;
183186
this.state.inventoryError = null;
184187
this.state.connectionError = null;
@@ -251,7 +254,11 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntime.OpenCodeRuntime["Service"] = {
251254
cause: runtimeMock.state.runVersionError,
252255
}),
253256
)
254-
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
257+
: runtimeMock.state.runVersionDelay
258+
? Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }).pipe(
259+
Effect.delay(runtimeMock.state.runVersionDelay),
260+
)
261+
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
255262
createOpenCodeSdkClient: (input) => {
256263
runtimeMock.state.sdkClientInputs.push(input);
257264
return {} as unknown as ReturnType<
@@ -379,18 +386,33 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
379386
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
380387

381388
yield* Effect.yieldNow;
382-
yield* TestClock.adjust("4 seconds");
389+
yield* TestClock.adjust("10 seconds");
383390
const snapshot = yield* Fiber.join(probeFiber);
384391

385392
NodeAssert.equal(snapshot.status, "error");
386393
NodeAssert.equal(snapshot.installed, true);
387394
NodeAssert.equal(
388395
snapshot.message,
389-
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 4 seconds.",
396+
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 10 seconds.",
390397
);
391398
}).pipe(Effect.provide(TestClock.layer())),
392399
);
393400

401+
it.effect("waits for a slow but healthy local CLI version probe", () =>
402+
Effect.gen(function* () {
403+
runtimeMock.state.runVersionDelay = "6 seconds";
404+
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
405+
406+
yield* Effect.yieldNow;
407+
yield* TestClock.adjust("6 seconds");
408+
const snapshot = yield* Fiber.join(probeFiber);
409+
410+
NodeAssert.notEqual(snapshot.status, "error");
411+
NodeAssert.equal(snapshot.installed, true);
412+
NodeAssert.equal(snapshot.version, "1.14.19");
413+
}).pipe(Effect.provide(TestClock.layer())),
414+
);
415+
394416
it.effect("emits OpenCode variant defaults so trait picker can resolve a visible selection", () =>
395417
Effect.gen(function* () {
396418
runtimeMock.state.inventory = {

‎packages/provider-opencode/src/server/versionProbe.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)