Skip to content

Commit 015f6ff

Browse files
oliver-meeclaude
andcommitted
fix(opencode-local): fall back to the running shared service when --standalone lists nothing
OpenCode 2.0.20's `models --standalone` exits 0 with no output (anomalyco/opencode#41071), so the Paperclip picker showed only the static fallback. For server-level listing only, when --standalone parses to zero models, read $XDG_STATE_HOME/opencode/service.json and, if its pid is alive, run `opencode models --server <url>` with OPENCODE_SERVER_PASSWORD. --server only connects, so discovery still never spawns the shared service (MAG-469). No live service means the empty list, as before. Run pre-flight checks never consult the service. Upstream paperclipai#13565 (global config models) and paperclipai#11169 (Orca-spawned hardening) do not cover this. MAG-483. Tests: packages/adapters/opencode-local/src/server/models.test.ts (HOME=$(mktemp -d)) Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 910fd38 commit 015f6ff

2 files changed

Lines changed: 139 additions & 4 deletions

File tree

‎packages/adapters/opencode-local/src/server/models.test.ts‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import { afterEach, describe, expect, it, vi } from "vitest";
2+
import fs from "node:fs/promises";
3+
import os from "node:os";
4+
import path from "node:path";
25
import * as serverUtils from "@paperclipai/adapter-utils/server-utils";
36
import {
47
discoverOpenCodeModels,
@@ -231,6 +234,76 @@ describe("openCode models", () => {
231234
expect(spy.mock.calls[0][2]).toEqual(["models", "--standalone"]);
232235
});
233236

237+
describe("v2 --standalone empty-output fallback (fork, MAG-483)", () => {
238+
const v2 = {
239+
raw: "opencode v2.0.20",
240+
major: 2,
241+
minor: 0,
242+
patch: 20,
243+
line: "v2",
244+
} as Awaited<ReturnType<typeof detectOpenCodeVersion>>;
245+
const ok = (stdout: string) => ({
246+
exitCode: 0,
247+
signal: null,
248+
timedOut: false,
249+
stdout,
250+
stderr: "",
251+
pid: 1,
252+
startedAt: new Date().toISOString(),
253+
});
254+
let stateHome = "";
255+
256+
afterEach(async () => {
257+
if (stateHome) await fs.rm(stateHome, { recursive: true, force: true });
258+
stateHome = "";
259+
});
260+
261+
async function writeService(service: Record<string, unknown>) {
262+
stateHome = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-state-"));
263+
await fs.mkdir(path.join(stateHome, "opencode"), { recursive: true });
264+
await fs.writeFile(path.join(stateHome, "opencode", "service.json"), JSON.stringify(service));
265+
}
266+
267+
it("asks the running shared service with --server when --standalone lists nothing", async () => {
268+
await writeService({ url: "http://127.0.0.1:49374", pid: process.pid, password: "pw" });
269+
vi.mocked(detectOpenCodeVersion).mockResolvedValueOnce(v2);
270+
const spy = vi
271+
.spyOn(serverUtils, "runChildProcess")
272+
.mockResolvedValueOnce(ok(""))
273+
.mockResolvedValueOnce(ok("alibaba-token-plan/qwen3.8-flash\nopenai/gpt-5.5\n"));
274+
275+
await expect(
276+
discoverOpenCodeModels({ env: { XDG_STATE_HOME: stateHome }, serviceFallback: true }),
277+
).resolves.toEqual([
278+
{ id: "alibaba-token-plan/qwen3.8-flash", label: "alibaba-token-plan/qwen3.8-flash" },
279+
{ id: "openai/gpt-5.5", label: "openai/gpt-5.5" },
280+
]);
281+
expect(spy.mock.calls[0][2]).toEqual(["models", "--standalone"]);
282+
expect(spy.mock.calls[1][2]).toEqual(["models", "--server", "http://127.0.0.1:49374"]);
283+
expect(spy.mock.calls[1][3].env.OPENCODE_SERVER_PASSWORD).toBe("pw");
284+
});
285+
286+
it("returns the empty list without spawning anything when no service is running", async () => {
287+
await writeService({ url: "http://127.0.0.1:49374", pid: 2 ** 22 + 12345, password: "pw" });
288+
vi.mocked(detectOpenCodeVersion).mockResolvedValueOnce(v2);
289+
const spy = vi.spyOn(serverUtils, "runChildProcess").mockResolvedValueOnce(ok(""));
290+
291+
await expect(
292+
discoverOpenCodeModels({ env: { XDG_STATE_HOME: stateHome }, serviceFallback: true }),
293+
).resolves.toEqual([]);
294+
expect(spy).toHaveBeenCalledTimes(1);
295+
});
296+
297+
it("never consults the shared service unless the caller opts in (run pre-flight)", async () => {
298+
await writeService({ url: "http://127.0.0.1:49374", pid: process.pid });
299+
vi.mocked(detectOpenCodeVersion).mockResolvedValueOnce(v2);
300+
const spy = vi.spyOn(serverUtils, "runChildProcess").mockResolvedValueOnce(ok(""));
301+
302+
await expect(discoverOpenCodeModels({ env: { XDG_STATE_HOME: stateHome } })).resolves.toEqual([]);
303+
expect(spy).toHaveBeenCalledTimes(1);
304+
});
305+
});
306+
234307
it("refreshes a stale non-empty catalog before rejecting the configured model", async () => {
235308
const spy = vi
236309
.spyOn(serverUtils, "runChildProcess")

‎packages/adapters/opencode-local/src/server/models.ts‎

Lines changed: 66 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { createHash } from "node:crypto";
2+
import fs from "node:fs/promises";
23
import os from "node:os";
4+
import path from "node:path";
35
import type { AdapterModel } from "@paperclipai/adapter-utils";
46
import {
57
asString,
@@ -178,12 +180,66 @@ function isRefreshRejectedByCli(result: {
178180
);
179181
}
180182

183+
// Fork (MAG-483): OpenCode 2.0.20's `models --standalone` exits 0 and prints
184+
// nothing (anomalyco/opencode#41071). When that happens, ask the user's already
185+
// running shared service instead. `--server <url>` only connects; it never
186+
// spawns a service, so MAG-469's guarantee holds. With no live service recorded
187+
// in `$XDG_STATE_HOME/opencode/service.json`, there is nothing to ask.
188+
async function readRunningOpenCodeService(
189+
env: Record<string, string>,
190+
): Promise<{ url: string; password: string | null } | null> {
191+
const home = env.HOME || os.homedir();
192+
const stateHome = env.XDG_STATE_HOME?.trim() || path.join(home, ".local", "state");
193+
try {
194+
const raw = await fs.readFile(path.join(stateHome, "opencode", "service.json"), "utf8");
195+
const parsed = JSON.parse(raw) as { url?: unknown; pid?: unknown; password?: unknown };
196+
if (typeof parsed.url !== "string" || !/^https?:\/\//.test(parsed.url)) return null;
197+
if (typeof parsed.pid !== "number" || !Number.isInteger(parsed.pid) || parsed.pid <= 0) return null;
198+
try {
199+
process.kill(parsed.pid, 0);
200+
} catch (err) {
201+
if ((err as NodeJS.ErrnoException).code !== "EPERM") return null;
202+
}
203+
return {
204+
url: parsed.url,
205+
password: typeof parsed.password === "string" && parsed.password ? parsed.password : null,
206+
};
207+
} catch {
208+
return null;
209+
}
210+
}
211+
212+
async function discoverFromRunningOpenCodeService(
213+
command: string,
214+
cwd: string,
215+
env: Record<string, string>,
216+
): Promise<AdapterModel[]> {
217+
const service = await readRunningOpenCodeService(env);
218+
if (!service) return [];
219+
const result = await runChildProcess(
220+
`opencode-models-server-${Date.now()}-${Math.random().toString(16).slice(2)}`,
221+
command,
222+
["models", "--server", service.url],
223+
{
224+
cwd,
225+
env: service.password ? { ...env, OPENCODE_SERVER_PASSWORD: service.password } : env,
226+
timeoutSec: MODELS_DISCOVERY_TIMEOUT_MS / 1000,
227+
graceSec: 3,
228+
onLog: async () => {},
229+
},
230+
);
231+
if (result.timedOut || (result.exitCode ?? 1) !== 0) return [];
232+
return sortModels(parseOpenCodeModelsOutput(result.stdout));
233+
}
234+
181235
export async function discoverOpenCodeModels(
182236
input: {
183237
command?: unknown;
184238
cwd?: unknown;
185239
env?: unknown;
186240
refresh?: boolean;
241+
/** Server-level listing only; run pre-flight checks never consult the shared service. */
242+
serviceFallback?: boolean;
187243
} = {},
188244
): Promise<AdapterModel[]> {
189245
const command = resolveOpenCodeCommand(input.command);
@@ -256,7 +312,11 @@ export async function discoverOpenCodeModels(
256312
: "`opencode models` failed.",
257313
);
258314
} else {
259-
return sortModels(parseOpenCodeModelsOutput(result.stdout));
315+
const models = sortModels(parseOpenCodeModelsOutput(result.stdout));
316+
if (models.length === 0 && serverArgs.length > 0 && input.serviceFallback && !input.refresh) {
317+
return discoverFromRunningOpenCodeService(command, cwd, runtimeEnv);
318+
}
319+
return models;
260320
}
261321

262322
const delayMs = MODELS_DISCOVERY_RETRY_DELAYS_MS[attempt - 1];
@@ -272,18 +332,20 @@ export async function discoverOpenCodeModelsCached(
272332
command?: unknown;
273333
cwd?: unknown;
274334
env?: unknown;
335+
serviceFallback?: boolean;
275336
} = {},
276337
): Promise<AdapterModel[]> {
277338
const command = resolveOpenCodeCommand(input.command);
278339
const cwd = asString(input.cwd, process.cwd());
279340
const env = normalizeEnv(input.env);
280-
const key = discoveryCacheKey(command, cwd, env);
341+
const serviceFallback = input.serviceFallback === true;
342+
const key = `${discoveryCacheKey(command, cwd, env)}${serviceFallback ? "\nservice-fallback" : ""}`;
281343
const now = Date.now();
282344
pruneExpiredDiscoveryCache(now);
283345
const cached = discoveryCache.get(key);
284346
if (cached && cached.expiresAt > now) return cached.models;
285347

286-
const models = await discoverOpenCodeModels({ command, cwd, env });
348+
const models = await discoverOpenCodeModels({ command, cwd, env, serviceFallback });
287349
discoveryCache.set(key, { expiresAt: now + MODELS_CACHE_TTL_MS, models });
288350
return models;
289351
}
@@ -427,7 +489,7 @@ export async function ensureOpenCodeModelConfiguredAndAvailable(input: {
427489

428490
export async function listOpenCodeModels(): Promise<AdapterModel[]> {
429491
try {
430-
return await discoverOpenCodeModelsCached();
492+
return await discoverOpenCodeModelsCached({ serviceFallback: true });
431493
} catch {
432494
return [];
433495
}

0 commit comments

Comments
 (0)