Skip to content

Commit 69d95d0

Browse files
committed
fix(server): slow OpenCode wrappers no longer show as unavailable
1 parent b707eeb commit 69d95d0

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";
@@ -169,6 +170,7 @@ const runtimeMock = {
169170
state: {
170171
runVersionError: null as Error | null,
171172
runVersionPending: false,
173+
runVersionDelay: null as Duration.Input | null,
172174
versionStdout: DEFAULT_VERSION_STDOUT,
173175
inventoryError: null as Error | null,
174176
connectionError: null as Error | null,
@@ -188,6 +190,7 @@ const runtimeMock = {
188190
reset() {
189191
this.state.runVersionError = null;
190192
this.state.runVersionPending = false;
193+
this.state.runVersionDelay = null;
191194
this.state.versionStdout = DEFAULT_VERSION_STDOUT;
192195
this.state.inventoryError = null;
193196
this.state.connectionError = null;
@@ -260,7 +263,11 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntime.OpenCodeRuntimeShape = {
260263
cause: runtimeMock.state.runVersionError,
261264
}),
262265
)
263-
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
266+
: runtimeMock.state.runVersionDelay
267+
? Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }).pipe(
268+
Effect.delay(runtimeMock.state.runVersionDelay),
269+
)
270+
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
264271
createOpenCodeSdkClient: (input) => {
265272
runtimeMock.state.sdkClientInputs.push(input);
266273
return {} as unknown as ReturnType<
@@ -388,18 +395,33 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
388395
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
389396

390397
yield* Effect.yieldNow;
391-
yield* TestClock.adjust("4 seconds");
398+
yield* TestClock.adjust("10 seconds");
392399
const snapshot = yield* Fiber.join(probeFiber);
393400

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

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