Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit 0ca3240

Browse files
fix(server): use CLI for OpenCode health check instead of spawning server (pingdotgg#4153)
1 parent f4da4f3 commit 0ca3240

6 files changed

Lines changed: 465 additions & 20 deletions

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,14 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
221221
cause: null,
222222
}),
223223
),
224+
loadInventoryFromCli: () =>
225+
Effect.fail(
226+
new OpenCodeRuntimeError({
227+
operation: "loadInventoryFromCli",
228+
detail: "OpenCodeRuntimeTestDouble.loadInventoryFromCli not used in this test",
229+
cause: null,
230+
}),
231+
),
224232
};
225233

226234
const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory, {

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
9595
}),
9696
)
9797
: Effect.succeed(runtimeMock.state.inventory as OpenCodeInventory),
98+
loadInventoryFromCli: () =>
99+
runtimeMock.state.inventoryError
100+
? Effect.succeed({
101+
providerList: { all: [], default: {}, connected: [] as string[] },
102+
agents: [],
103+
} as OpenCodeInventory)
104+
: Effect.succeed(runtimeMock.state.inventory as OpenCodeInventory),
98105
};
99106

100107
beforeEach(() => {
@@ -197,11 +204,22 @@ it.layer(testLayer)("checkOpenCodeProviderStatus", (it) => {
197204
}),
198205
);
199206

200-
it.effect("closes the local OpenCode server scope after provider refresh", () =>
207+
it.effect("does not spawn a local server for health check (uses CLI instead)", () =>
201208
Effect.gen(function* () {
202209
yield* checkOpenCodeProviderStatus(makeOpenCodeSettings(), process.cwd());
203210

204-
NodeAssert.equal(runtimeMock.state.closeCalls, 1);
211+
NodeAssert.equal(runtimeMock.state.closeCalls, 0);
212+
}),
213+
);
214+
215+
it.effect("degrades gracefully on CLI failure for local installs", () =>
216+
Effect.gen(function* () {
217+
runtimeMock.state.inventoryError = new Error("opencode models failed");
218+
const snapshot = yield* checkOpenCodeProviderStatus(makeOpenCodeSettings(), process.cwd());
219+
220+
NodeAssert.equal(snapshot.status, "warning");
221+
NodeAssert.equal(snapshot.installed, true);
222+
NodeAssert.equal(snapshot.models.length, 0);
205223
}),
206224
);
207225
});

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -409,26 +409,32 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
409409
}
410410

411411
const inventoryExit = yield* Effect.exit(
412-
Effect.scoped(
413-
Effect.gen(function* () {
414-
const server = yield* openCodeRuntime.connectToOpenCodeServer({
412+
(isExternalServer
413+
? Effect.scoped(
414+
Effect.gen(function* () {
415+
const server = yield* openCodeRuntime.connectToOpenCodeServer({
416+
binaryPath: openCodeSettings.binaryPath,
417+
serverUrl: openCodeSettings.serverUrl,
418+
environment: resolvedEnvironment,
419+
});
420+
return yield* openCodeRuntime.loadOpenCodeInventory(
421+
openCodeRuntime.createOpenCodeSdkClient({
422+
baseUrl: server.url,
423+
directory: cwd,
424+
...(openCodeSettings.serverPassword
425+
? { serverPassword: openCodeSettings.serverPassword }
426+
: {}),
427+
}),
428+
);
429+
}),
430+
)
431+
: openCodeRuntime.loadInventoryFromCli({
415432
binaryPath: openCodeSettings.binaryPath,
416-
serverUrl: openCodeSettings.serverUrl,
417433
environment: resolvedEnvironment,
418-
});
419-
return yield* openCodeRuntime.loadOpenCodeInventory(
420-
openCodeRuntime.createOpenCodeSdkClient({
421-
baseUrl: server.url,
422-
directory: cwd,
423-
...(isExternalServer && openCodeSettings.serverPassword
424-
? { serverPassword: openCodeSettings.serverPassword }
425-
: {}),
426-
}),
427-
);
428-
}).pipe(
429-
Effect.mapError(
430-
(cause) => new OpenCodeProbeError({ cause, detail: openCodeRuntimeErrorDetail(cause) }),
431-
),
434+
})
435+
).pipe(
436+
Effect.mapError(
437+
(cause) => new OpenCodeProbeError({ cause, detail: openCodeRuntimeErrorDetail(cause) }),
432438
),
433439
),
434440
);
Lines changed: 229 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
1+
import * as NodeAssert from "node:assert/strict";
2+
3+
import { describe, it } from "vite-plus/test";
4+
5+
import { parseModelsCliOutput, parseAgentListCliOutput } from "./opencodeRuntime.ts";
6+
7+
describe("parseModelsCliOutput", () => {
8+
it("parses a single model from a single provider", () => {
9+
const stdout = [
10+
"anthropic/claude-sonnet-4-5",
11+
JSON.stringify({
12+
id: "claude-sonnet-4-5",
13+
providerID: "anthropic",
14+
name: "Claude Sonnet 4.5",
15+
capabilities: { temperature: true, reasoning: true, toolcall: true },
16+
cost: { input: 3, output: 15 },
17+
limit: { context: 200000, output: 8192 },
18+
status: "active",
19+
options: {},
20+
headers: {},
21+
release_date: "2025-01-01",
22+
}),
23+
].join("\n");
24+
25+
const result = parseModelsCliOutput(stdout);
26+
NodeAssert.equal(result.providers.size, 1);
27+
NodeAssert.equal(result.connected.length, 1);
28+
NodeAssert.equal(result.connected[0], "anthropic");
29+
30+
const provider = result.providers.get("anthropic")!;
31+
NodeAssert.ok(provider);
32+
NodeAssert.equal(provider.id, "anthropic");
33+
NodeAssert.equal(provider.name, "anthropic");
34+
NodeAssert.equal(Object.keys(provider.models).length, 1);
35+
36+
const model = provider.models["claude-sonnet-4-5"]!;
37+
NodeAssert.ok(model);
38+
NodeAssert.equal(model.id, "claude-sonnet-4-5");
39+
NodeAssert.equal(model.providerID, "anthropic");
40+
NodeAssert.equal(model.name, "Claude Sonnet 4.5");
41+
});
42+
43+
it("parses multiple models from multiple providers", () => {
44+
const stdout = [
45+
"anthropic/claude-sonnet-4-5",
46+
JSON.stringify({ id: "claude-sonnet-4-5", providerID: "anthropic", name: "Sonnet 4.5" }),
47+
"anthropic/claude-haiku-4-5",
48+
JSON.stringify({ id: "claude-haiku-4-5", providerID: "anthropic", name: "Haiku 4.5" }),
49+
"openai/gpt-4o",
50+
JSON.stringify({ id: "gpt-4o", providerID: "openai", name: "GPT-4o" }),
51+
].join("\n");
52+
53+
const result = parseModelsCliOutput(stdout);
54+
NodeAssert.equal(result.providers.size, 2);
55+
NodeAssert.equal(result.connected.length, 2);
56+
NodeAssert.equal([...result.connected].sort().join(","), "anthropic,openai");
57+
NodeAssert.equal(Object.keys(result.providers.get("anthropic")!.models).length, 2);
58+
NodeAssert.equal(Object.keys(result.providers.get("openai")!.models).length, 1);
59+
});
60+
61+
it("handles empty input", () => {
62+
const result = parseModelsCliOutput("");
63+
NodeAssert.equal(result.providers.size, 0);
64+
NodeAssert.equal(result.connected.length, 0);
65+
});
66+
67+
it("skips unparseable JSON blocks", () => {
68+
const stdout = [
69+
"anthropic/claude-sonnet-4-5",
70+
"this is not valid json {{{",
71+
"anthropic/claude-haiku-4-5",
72+
JSON.stringify({ id: "claude-haiku-4-5", providerID: "anthropic", name: "Haiku 4.5" }),
73+
].join("\n");
74+
75+
const result = parseModelsCliOutput(stdout);
76+
NodeAssert.equal(result.providers.size, 1);
77+
const provider = result.providers.get("anthropic")!;
78+
NodeAssert.equal(Object.keys(provider.models).length, 1);
79+
NodeAssert.ok(provider.models["claude-haiku-4-5"]);
80+
});
81+
82+
it("handles Windows-style CRLF line endings", () => {
83+
const stdout =
84+
"anthropic/claude-sonnet-4-5\r\n" +
85+
JSON.stringify({ id: "claude-sonnet-4-5", providerID: "anthropic", name: "Sonnet" }) +
86+
"\r\n";
87+
88+
const result = parseModelsCliOutput(stdout);
89+
NodeAssert.equal(result.providers.size, 1);
90+
NodeAssert.ok(result.providers.get("anthropic")!.models["claude-sonnet-4-5"]);
91+
});
92+
93+
it("handles model JSON with variants and nested fields", () => {
94+
const stdout = [
95+
"opencode/gpt-5.4",
96+
JSON.stringify({
97+
id: "gpt-5.4",
98+
providerID: "opencode",
99+
name: "GPT-5.4",
100+
family: "gpt",
101+
capabilities: {
102+
temperature: true,
103+
reasoning: true,
104+
attachment: false,
105+
toolcall: true,
106+
input: { text: true, audio: false, image: false, video: false, pdf: false },
107+
output: { text: true, audio: false, image: false, video: false, pdf: false },
108+
interleaved: false,
109+
},
110+
cost: { input: 0, output: 0, cache: { read: 0, write: 0 } },
111+
limit: { context: 200000, input: 160000, output: 32000 },
112+
status: "active",
113+
options: {},
114+
headers: {},
115+
release_date: "2025-01-01",
116+
variants: { none: {}, low: {}, medium: {}, high: {} },
117+
}),
118+
].join("\n");
119+
120+
const result = parseModelsCliOutput(stdout);
121+
const model = result.providers.get("opencode")!.models["gpt-5.4"]!;
122+
NodeAssert.ok(model);
123+
NodeAssert.ok(model.capabilities);
124+
NodeAssert.equal(model.capabilities!.reasoning, true);
125+
NodeAssert.ok(model.variants);
126+
NodeAssert.equal(model.variants!["medium"] !== undefined, true);
127+
});
128+
});
129+
130+
describe("parseAgentListCliOutput", () => {
131+
it("parses a single agent", () => {
132+
const stdout = [
133+
"build (primary)",
134+
" " + JSON.stringify([{ permission: "*", action: "allow", pattern: "*" }]),
135+
].join("\n");
136+
137+
const result = parseAgentListCliOutput(stdout);
138+
NodeAssert.equal(result.length, 1);
139+
NodeAssert.equal(result[0]!.name, "build");
140+
NodeAssert.equal(result[0]!.mode, "primary");
141+
NodeAssert.equal(result[0]!.permission.length, 1);
142+
});
143+
144+
it("parses multiple agents", () => {
145+
const stdout = [
146+
"build (primary)",
147+
" " + JSON.stringify([{ permission: "*", action: "allow", pattern: "*" }]),
148+
"explore (subagent)",
149+
" " + JSON.stringify([{ permission: "read", action: "allow", pattern: "*" }]),
150+
"plan (primary)",
151+
" " + JSON.stringify([{ permission: "edit", action: "ask", pattern: "*.md" }]),
152+
].join("\n");
153+
154+
const result = parseAgentListCliOutput(stdout);
155+
NodeAssert.equal(result.length, 3);
156+
NodeAssert.equal(result[0]!.name, "build");
157+
NodeAssert.equal(result[0]!.mode, "primary");
158+
NodeAssert.equal(result[1]!.name, "explore");
159+
NodeAssert.equal(result[1]!.mode, "subagent");
160+
NodeAssert.equal(result[2]!.name, "plan");
161+
NodeAssert.equal(result[2]!.mode, "primary");
162+
});
163+
164+
it("handles empty input", () => {
165+
const result = parseAgentListCliOutput("");
166+
NodeAssert.equal(result.length, 0);
167+
});
168+
169+
it("skips agents with unparseable permission JSON", () => {
170+
const stdout = [
171+
"build (primary)",
172+
" not valid json {",
173+
"explore (subagent)",
174+
" " + JSON.stringify([{ permission: "read", action: "allow", pattern: "*" }]),
175+
].join("\n");
176+
177+
const result = parseAgentListCliOutput(stdout);
178+
NodeAssert.equal(result.length, 1);
179+
NodeAssert.equal(result[0]!.name, "explore");
180+
});
181+
182+
it("handles real-world permission blocks with nested paths", () => {
183+
const permissions = [
184+
{ permission: "*", action: "allow", pattern: "*" },
185+
{
186+
permission: "external_directory",
187+
pattern: "C:\\Users\\test\\.local\\*",
188+
action: "allow",
189+
},
190+
{ permission: "read", pattern: "*.env", action: "ask" },
191+
];
192+
const stdout = ["build (primary)", " " + JSON.stringify(permissions)].join("\n");
193+
194+
const result = parseAgentListCliOutput(stdout);
195+
NodeAssert.equal(result.length, 1);
196+
NodeAssert.equal(result[0]!.permission.length, 3);
197+
NodeAssert.equal(result[0]!.permission[0]!.action, "allow");
198+
NodeAssert.equal(result[0]!.permission[2]!.action, "ask");
199+
});
200+
201+
it("handles agent names with spaces", () => {
202+
const stdout = [
203+
"code reviewer (subagent)",
204+
" " + JSON.stringify([{ permission: "read", action: "allow", pattern: "*" }]),
205+
"my custom agent (primary)",
206+
" " + JSON.stringify([{ permission: "edit", action: "ask", pattern: "*.ts" }]),
207+
].join("\n");
208+
209+
const result = parseAgentListCliOutput(stdout);
210+
NodeAssert.equal(result.length, 2);
211+
NodeAssert.equal(result[0]!.name, "code reviewer");
212+
NodeAssert.equal(result[0]!.mode, "subagent");
213+
NodeAssert.equal(result[1]!.name, "my custom agent");
214+
NodeAssert.equal(result[1]!.mode, "primary");
215+
});
216+
217+
it("marks known hidden agents", () => {
218+
const stdout = [
219+
"compaction (primary)",
220+
" " + JSON.stringify([{ permission: "*", action: "allow", pattern: "*" }]),
221+
"build (primary)",
222+
" " + JSON.stringify([{ permission: "*", action: "allow", pattern: "*" }]),
223+
].join("\n");
224+
225+
const result = parseAgentListCliOutput(stdout);
226+
NodeAssert.equal(result[0]!.hidden, true);
227+
NodeAssert.equal(result[1]!.hidden, false);
228+
});
229+
});

0 commit comments

Comments
 (0)