Skip to content

Commit 4f6663b

Browse files
committed
fix(server): tolerate slow OpenCode version probes
Cold wrappers and loaded hosts can take more than 4s for `opencode --version`, which flipped a working provider to Unavailable. Raise the probe budget to 10s and keep the last ready version/status through a single timeout. Hung probes are still process-group killed at the cap. Fixes #11080
1 parent 7445aa7 commit 4f6663b

4 files changed

Lines changed: 148 additions & 4 deletions

File tree

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ const runtimeMock = {
157157
state: {
158158
runVersionError: null as Error | null,
159159
runVersionPending: false,
160+
runVersionDelayMs: null as number | null,
160161
versionStdout: DEFAULT_VERSION_STDOUT,
161162
inventoryError: null as Error | null,
162163
connectionError: null as Error | null,
@@ -176,6 +177,7 @@ const runtimeMock = {
176177
reset() {
177178
this.state.runVersionError = null;
178179
this.state.runVersionPending = false;
180+
this.state.runVersionDelayMs = null;
179181
this.state.versionStdout = DEFAULT_VERSION_STDOUT;
180182
this.state.inventoryError = null;
181183
this.state.connectionError = null;
@@ -248,7 +250,11 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
248250
cause: runtimeMock.state.runVersionError,
249251
}),
250252
)
251-
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
253+
: runtimeMock.state.runVersionDelayMs
254+
? Effect.sleep(runtimeMock.state.runVersionDelayMs).pipe(
255+
Effect.as({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
256+
)
257+
: Effect.succeed({ stdout: runtimeMock.state.versionStdout, stderr: "", code: 0 }),
252258
createOpenCodeSdkClient: (input) => {
253259
runtimeMock.state.sdkClientInputs.push(input);
254260
return {} as unknown as ReturnType<OpenCodeRuntimeShape["createOpenCodeSdkClient"]>;
@@ -366,18 +372,33 @@ it.layer(testLayer)("checkOpenCodeProviderStatus", (it) => {
366372
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
367373

368374
yield* Effect.yieldNow;
369-
yield* TestClock.adjust("4 seconds");
375+
yield* TestClock.adjust("10 seconds");
370376
const snapshot = yield* Fiber.join(probeFiber);
371377

372378
NodeAssert.equal(snapshot.status, "error");
373379
NodeAssert.equal(snapshot.installed, true);
374380
NodeAssert.equal(
375381
snapshot.message,
376-
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 4 seconds.",
382+
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 10 seconds.",
377383
);
378384
}).pipe(Effect.provide(TestClock.layer())),
379385
);
380386

387+
it.effect("waits past the legacy four-second budget for a slow local CLI version probe", () =>
388+
Effect.gen(function* () {
389+
runtimeMock.state.runVersionDelayMs = 5_000;
390+
const probeFiber = yield* checkProvider(makeOpenCodeSettings()).pipe(Effect.forkChild);
391+
392+
yield* Effect.yieldNow;
393+
yield* TestClock.adjust("5 seconds");
394+
const snapshot = yield* Fiber.join(probeFiber);
395+
396+
NodeAssert.equal(snapshot.status, "warning");
397+
NodeAssert.equal(snapshot.installed, true);
398+
NodeAssert.equal(snapshot.version, "1.14.19");
399+
}).pipe(Effect.provide(TestClock.layer())),
400+
);
401+
381402
it.effect("emits OpenCode variant defaults so trait picker can resolve a visible selection", () =>
382403
Effect.gen(function* () {
383404
runtimeMock.state.inventory = {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ const OPENCODE_PRESENTATION = {
3333
displayName: "OpenCode",
3434
showInteractionModeToggle: false,
3535
} as const;
36-
const OPENCODE_VERSION_PROBE_TIMEOUT = "4 seconds";
36+
// `--version` can exceed 4s on cold wrappers or loaded ARM hosts. The cap
37+
// still interrupts the scoped spawn so the process group is killed (#8750).
38+
const OPENCODE_VERSION_PROBE_TIMEOUT = "10 seconds";
3739

3840
class OpenCodeProbeError extends Data.TaggedError("OpenCodeProbeError")<{
3941
readonly cause?: unknown;

‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,89 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
901901
assert.deepStrictEqual(afterFailure.models, [authoritativeProvider.models[0]!]);
902902
});
903903

904+
it("keeps a ready OpenCode snapshot through a single version-probe timeout", () => {
905+
const previousProvider = {
906+
instanceId: ProviderInstanceId.make("opencode"),
907+
driver: ProviderDriverKind.make("opencode"),
908+
status: "ready",
909+
enabled: true,
910+
installed: true,
911+
auth: { status: "authenticated", type: "opencode" },
912+
checkedAt: "2026-07-17T00:00:00.000Z",
913+
version: "1.18.19",
914+
models: [
915+
{
916+
slug: "github/gpt-5",
917+
name: "GPT-5",
918+
subProvider: "GitHub",
919+
isCustom: false,
920+
capabilities: null,
921+
},
922+
],
923+
slashCommands: [{ name: "review", description: "Review changes" }],
924+
skills: [
925+
{
926+
name: "typescript",
927+
description: "TypeScript help",
928+
path: "/skills/typescript/SKILL.md",
929+
enabled: true,
930+
},
931+
],
932+
} as const satisfies ServerProvider;
933+
const timedOutProvider = {
934+
...previousProvider,
935+
status: "error",
936+
auth: { status: "unknown" },
937+
checkedAt: "2026-07-17T00:01:00.000Z",
938+
version: null,
939+
models: [],
940+
slashCommands: [],
941+
skills: [],
942+
message:
943+
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 10 seconds.",
944+
} satisfies ServerProvider;
945+
946+
const merged = mergeProviderSnapshot(previousProvider, timedOutProvider);
947+
assert.equal(merged.status, "ready");
948+
assert.equal(merged.version, previousProvider.version);
949+
assert.deepStrictEqual(merged.auth, previousProvider.auth);
950+
assert.deepStrictEqual(merged.models, [...previousProvider.models]);
951+
assert.deepStrictEqual(merged.slashCommands, previousProvider.slashCommands);
952+
assert.deepStrictEqual(merged.skills, previousProvider.skills);
953+
assert.equal(merged.message, timedOutProvider.message);
954+
assert.equal(merged.checkedAt, timedOutProvider.checkedAt);
955+
});
956+
957+
it("does not keep last-known-good OpenCode state without a ready versioned snapshot", () => {
958+
const pendingProvider = {
959+
instanceId: ProviderInstanceId.make("opencode"),
960+
driver: ProviderDriverKind.make("opencode"),
961+
status: "warning",
962+
enabled: true,
963+
installed: false,
964+
auth: { status: "unknown" },
965+
checkedAt: "2026-07-17T00:00:00.000Z",
966+
version: null,
967+
models: [],
968+
slashCommands: [],
969+
skills: [],
970+
message: "OpenCode provider status has not been checked in this session yet.",
971+
} as const satisfies ServerProvider;
972+
const timedOutProvider = {
973+
...pendingProvider,
974+
status: "error",
975+
installed: true,
976+
checkedAt: "2026-07-17T00:01:00.000Z",
977+
message:
978+
"Failed to execute OpenCode CLI health check: OpenCode CLI version probe timed out after 10 seconds.",
979+
} satisfies ServerProvider;
980+
981+
const merged = mergeProviderSnapshot(pendingProvider, timedOutProvider);
982+
assert.equal(merged.status, "error");
983+
assert.equal(merged.version, null);
984+
assert.equal(merged.message, timedOutProvider.message);
985+
});
986+
904987
describe("Codex model inventories", () => {
905988
const cachedProvider = {
906989
instanceId: ProviderInstanceId.make("codex-personal"),

‎apps/server/src/provider/Layers/ProviderRegistry.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,39 @@ const mergeProviderModels = (
162162
: mergedModels;
163163
};
164164

165+
const isOpenCodeVersionProbeTimeout = (provider: ServerProvider): boolean =>
166+
provider.driver === ProviderDriverKind.make("opencode") &&
167+
provider.installed &&
168+
provider.status === "error" &&
169+
provider.version == null &&
170+
(provider.message?.includes("version probe timed out") ?? false);
171+
172+
/**
173+
* A single slow OpenCode `--version` must not wipe a ready, versioned
174+
* snapshot. The probe still dies at its cap; only status, version, and
175+
* auth stay last-known-good until a later probe succeeds or fails for
176+
* another reason.
177+
*/
178+
const carryLastKnownOpenCodeOnVersionProbeTimeout = (
179+
previousProvider: ServerProvider,
180+
nextProvider: ServerProvider,
181+
): Pick<ServerProvider, "auth" | "status" | "version"> | undefined => {
182+
if (
183+
!isOpenCodeVersionProbeTimeout(nextProvider) ||
184+
previousProvider.driver !== ProviderDriverKind.make("opencode") ||
185+
previousProvider.status !== "ready" ||
186+
previousProvider.version == null
187+
) {
188+
return undefined;
189+
}
190+
191+
return {
192+
auth: previousProvider.auth,
193+
status: previousProvider.status,
194+
version: previousProvider.version,
195+
};
196+
};
197+
165198
/**
166199
* Antigravity's health check only initializes the agent, so after a server
167200
* restart it reports the account as unchecked. The saved Google login still
@@ -202,12 +235,17 @@ export const mergeProviderSnapshot = (
202235
return nextProvider;
203236
}
204237
const savedAccount = carrySavedAntigravityAccount(previousProvider, nextProvider);
238+
const lastKnownOpenCode = carryLastKnownOpenCodeOnVersionProbeTimeout(
239+
previousProvider,
240+
nextProvider,
241+
);
205242
// "Google account access is not checked yet" describes the probe, not the
206243
// account; it must not outlive the state it explained.
207244
const { message: _uncheckedMessage, ...nextWithoutMessage } = nextProvider;
208245
return {
209246
...(savedAccount?.status === "ready" ? nextWithoutMessage : nextProvider),
210247
...savedAccount,
248+
...lastKnownOpenCode,
211249
models: mergeProviderModels(nextProvider, previousProvider.models, nextProvider.models),
212250
...(nextProvider.workspaceSnapshots !== undefined
213251
? { workspaceSnapshots: nextProvider.workspaceSnapshots }

0 commit comments

Comments
 (0)