Skip to content

Commit 6d2e28a

Browse files
fix(opencode): OpenCode 1 projects list their own models too
The OpenCode 1 workspace load for a project directory read only skills and commands, so providers defined in that project's opencode.jsonc never reached its picker. It now also reads that directory's provider catalog through the mapping the machine status check uses, and returns it as the project's models only when it differs from the machine catalog. A failed, slow, or empty read keeps the machine models, matching the OpenCode 2 path. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent d29b9e6 commit 6d2e28a

4 files changed

Lines changed: 142 additions & 43 deletions

File tree

‎packages/provider-opencode/src/server/OpenCodeRuntime.ts‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,36 @@ export const loadOpenCodeCommands = (client: OpencodeClient) =>
222222
),
223223
);
224224

225+
/** The providers and agents OpenCode resolves for the client's directory. */
226+
export const loadOpenCodeProviderCatalog = (client: OpencodeClient) =>
227+
Effect.all(
228+
{
229+
providerList: runOpenCodeSdk("provider.list", (signal) =>
230+
client.provider.list(undefined, { signal }),
231+
).pipe(
232+
Effect.filterMapOrFail(
233+
(list) =>
234+
list.data
235+
? Result.succeed(list.data)
236+
: Result.fail(
237+
new OpenCodeRuntimeError({
238+
operation: "provider.list",
239+
detail: "OpenCode provider list was empty.",
240+
}),
241+
),
242+
(result) => result,
243+
),
244+
),
245+
agents: runOpenCodeSdk("app.agents", (signal) =>
246+
client.app.agents(undefined, { signal }),
247+
).pipe(
248+
Effect.map((result) => result.data ?? []),
249+
Effect.orElseSucceed((): ReadonlyArray<Agent> => []),
250+
),
251+
},
252+
{ concurrency: "unbounded" },
253+
);
254+
225255
export interface ParsedOpenCodeModelSlug {
226256
readonly providerID: string;
227257
readonly modelID: string;
@@ -767,28 +797,6 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
767797
);
768798
};
769799

770-
const loadProviders = (client: OpencodeClient) =>
771-
runOpenCodeSdk("provider.list", (signal) => client.provider.list(undefined, { signal })).pipe(
772-
Effect.filterMapOrFail(
773-
(list) =>
774-
list.data
775-
? Result.succeed(list.data)
776-
: Result.fail(
777-
new OpenCodeRuntimeError({
778-
operation: "provider.list",
779-
detail: "OpenCode provider list was empty.",
780-
}),
781-
),
782-
(result) => result,
783-
),
784-
);
785-
786-
const loadAgents = (client: OpencodeClient) =>
787-
runOpenCodeSdk("app.agents", (signal) => client.app.agents(undefined, { signal })).pipe(
788-
Effect.map((result) => result.data ?? []),
789-
Effect.orElseSucceed((): ReadonlyArray<Agent> => []),
790-
);
791-
792800
const loadOpenCodeSkills: OpenCodeRuntime["Service"]["loadOpenCodeSkills"] = (client) =>
793801
runOpenCodeSdk("app.skills", (signal) => client.app.skills(undefined, { signal })).pipe(
794802
Effect.map((result) =>
@@ -805,18 +813,16 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
805813
const loadOpenCodeInventory: OpenCodeRuntime["Service"]["loadOpenCodeInventory"] = (client) =>
806814
Effect.all(
807815
[
808-
loadProviders(client),
809-
loadAgents(client),
816+
loadOpenCodeProviderCatalog(client),
810817
loadSkills(client),
811818
loadOpenCodeCommands(client).pipe(Effect.orElseSucceed(() => [])),
812819
],
813820
{
814821
concurrency: "unbounded",
815822
},
816823
).pipe(
817-
Effect.map(([providerList, agents, skills, commands]) => ({
818-
providerList,
819-
agents,
824+
Effect.map(([catalog, skills, commands]) => ({
825+
...catalog,
820826
skills,
821827
commands,
822828
})),

‎packages/provider-opencode/src/server/driver.test.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,68 @@ const layerUpdate = Layer.mergeAll(
443443
Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, changingRuntime),
444444
).pipe(Layer.provideMerge(NodeServices.layer));
445445

446+
const openCode1Provider = (id: string, models: ReadonlyArray<string>) => ({
447+
id,
448+
name: id,
449+
models: Object.fromEntries(
450+
models.map((model) => [model, { id: model, name: model, release_date: "2026-01-01" }]),
451+
),
452+
});
453+
const openCode1Project = "/work/project-with-config";
454+
const openCode1Providers = (directory: string) => {
455+
const all = [
456+
openCode1Provider("opencode", ["big-pickle"]),
457+
...(directory === openCode1Project ? [openCode1Provider("uni", ["medium-gpt"])] : []),
458+
];
459+
return { all, connected: all.map((provider) => provider.id), default: {} };
460+
};
461+
const openCode1Runtime = {
462+
runOpenCodeCommand: () => Effect.succeed({ stdout: "1.18.18\n", stderr: "", code: 0 }),
463+
startOpenCodeServerProcess: () =>
464+
Effect.succeed({
465+
url: "http://127.0.0.1:4096",
466+
version: "1.18.18",
467+
isRunning: Effect.succeed(true),
468+
exitCode: Effect.never,
469+
}),
470+
createOpenCodeSdkClient: ({ directory }: { readonly directory: string }) => ({
471+
provider: { list: () => Promise.resolve({ data: openCode1Providers(directory) }) },
472+
app: { agents: () => Promise.resolve({ data: [] }) },
473+
command: { list: () => Promise.resolve({ data: [] }) },
474+
}),
475+
loadOpenCodeInventory: () =>
476+
Effect.succeed({ providerList: openCode1Providers("/machine"), agents: [], skills: [] }),
477+
loadOpenCodeSkills: () => Effect.succeed([]),
478+
} as unknown as OpenCodeRuntime.OpenCodeRuntime["Service"];
479+
480+
it.layer(Layer.mergeAll(layer, Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, openCode1Runtime)))(
481+
"OpenCodeDriver on OpenCode 1",
482+
(it) => {
483+
it.effect("lists a project's own opencode.jsonc models in that project's snapshot", () =>
484+
Effect.gen(function* () {
485+
const instance = yield* create({}, noHttp);
486+
const ready = yield* instance.snapshot.streamChanges.pipe(
487+
Stream.filter((snapshot) => snapshot.status === "ready"),
488+
Stream.take(1),
489+
Stream.runCollect,
490+
Effect.forkChild,
491+
);
492+
yield* Fiber.join(ready);
493+
const slugsFor = (cwd: string) =>
494+
instance.snapshotForCwd!(cwd).pipe(
495+
Effect.map((snapshot) => snapshot.models.map((model) => model.slug).toSorted()),
496+
);
497+
498+
assert.deepStrictEqual(yield* slugsFor(openCode1Project), [
499+
"opencode/big-pickle",
500+
"uni/medium-gpt",
501+
]);
502+
assert.deepStrictEqual(yield* slugsFor("/work/other-project"), ["opencode/big-pickle"]);
503+
}).pipe(Effect.scoped),
504+
);
505+
},
506+
);
507+
446508
it.layer(layerUpdate)("OpenCodeDriver updates", (it) => {
447509
it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
448510
"offers no package update for an unknown version and follows a changed one on a fresh read",

‎packages/provider-opencode/src/server/driver.ts‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
openCode2SkillsToServerProviderSkills,
3535
openCodeSkillsToServerProviderSkills,
3636
openCodeCommandsToServerProviderSlashCommands,
37+
openCodeProviderModels,
3738
} from "./status.ts";
3839
import { makeManagedServerProvider } from "@t3tools/provider-core/server/managedProvider";
3940
import * as OpenCodeRuntime from "./OpenCodeRuntime.ts";
@@ -387,11 +388,23 @@ export const OpenCodeDriver: ProviderDriver<
387388
slashCommandsPending: undefined,
388389
})),
389390
),
391+
// A project's opencode.jsonc can define its own providers. A failed
392+
// read keeps the machine catalog.
393+
models: OpenCodeRuntime.loadOpenCodeProviderCatalog(client).pipe(
394+
Effect.timeoutOption("10 seconds"),
395+
Effect.map((catalog) =>
396+
Option.isSome(catalog)
397+
? openCodeProviderModels(effectiveConfig, catalog.value)
398+
: undefined,
399+
),
400+
Effect.orElseSucceed(() => undefined),
401+
),
390402
},
391403
{ concurrency: "unbounded" },
392404
).pipe(
393-
Effect.map(({ skills, commandInventory }) => ({
405+
Effect.map(({ skills, commandInventory, models }) => ({
394406
skills,
407+
models,
395408
...commandInventory,
396409
})),
397410
);
@@ -530,12 +543,17 @@ export const OpenCodeDriver: ProviderDriver<
530543
snapshot.getSnapshot,
531544
loadWorkspaceForCwd(cwd).pipe(Effect.timeout("20 seconds")),
532545
]).pipe(
533-
Effect.map(([machineSnapshot, { skills, commands, slashCommandsPending }]) => ({
534-
...machineSnapshot,
535-
skills: openCodeSkillsToServerProviderSkills(skills),
536-
slashCommands: openCodeCommandsToServerProviderSlashCommands(commands),
537-
slashCommandsPending,
538-
})),
546+
Effect.map(
547+
([machineSnapshot, { skills, models, commands, slashCommandsPending }]) => ({
548+
...machineSnapshot,
549+
...(models === undefined || Equal.equals(models, machineSnapshot.models)
550+
? {}
551+
: { models, workspaceModels: models }),
552+
skills: openCodeSkillsToServerProviderSkills(skills),
553+
slashCommands: openCodeCommandsToServerProviderSlashCommands(commands),
554+
slashCommandsPending,
555+
}),
556+
),
539557
Effect.mapError(
540558
(cause) =>
541559
new ProviderDriverError({

‎packages/provider-opencode/src/server/status.ts‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ function markOpenCodeLegacy(
313313
}
314314

315315
function flattenOpenCodeModels(
316-
input: OpenCodeRuntime.OpenCodeInventory,
316+
input: Pick<OpenCodeRuntime.OpenCodeInventory, "providerList" | "agents">,
317317
): ReadonlyArray<ServerProviderModel> {
318318
const connected = new Set(input.providerList.connected);
319319
const entries: Array<{ model: ServerProviderModel; release: OpenCodeRelease }> = [];
@@ -356,6 +356,21 @@ function flattenOpenCodeModels(
356356
return markOpenCodeLegacy(entries).toSorted((left, right) => left.name.localeCompare(right.name));
357357
}
358358

359+
/** Undefined when OpenCode lists no models, so callers can keep the catalog they have. */
360+
export function openCodeProviderModels(
361+
settings: Pick<OpenCodeSettings, "customModels">,
362+
catalog: Pick<OpenCodeRuntime.OpenCodeInventory, "providerList" | "agents">,
363+
): ReadonlyArray<ServerProviderModel> | undefined {
364+
const models = flattenOpenCodeModels(catalog);
365+
return models.length === 0
366+
? undefined
367+
: providerModelsFromSettings(
368+
models,
369+
settings.customModels,
370+
DEFAULT_OPENCODE_MODEL_CAPABILITIES,
371+
);
372+
}
373+
359374
function trimOptional(value: string | null | undefined): string | undefined {
360375
const trimmed = value?.trim();
361376
return trimmed && trimmed.length > 0 ? trimmed : undefined;
@@ -835,16 +850,14 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
835850
};
836851
}
837852

838-
const inventoryModels = flattenOpenCodeModels(inventoryExit.value);
839-
const models = providerModelsFromSettings(
840-
inventoryModels,
841-
customModels,
842-
DEFAULT_OPENCODE_MODEL_CAPABILITIES,
843-
);
853+
const catalogModels = openCodeProviderModels(openCodeSettings, inventoryExit.value);
854+
const models =
855+
catalogModels ??
856+
providerModelsFromSettings([], customModels, DEFAULT_OPENCODE_MODEL_CAPABILITIES);
844857
const skills = openCodeSkillsToServerProviderSkills(inventoryExit.value.skills);
845858
const connectedCount = inventoryExit.value.providerList.connected.length;
846-
const catalogReady = connectedCount > 0 && inventoryModels.length > 0;
847-
if (connectedCount > 0 && inventoryModels.length === 0) {
859+
const catalogReady = connectedCount > 0 && catalogModels !== undefined;
860+
if (connectedCount > 0 && catalogModels === undefined) {
848861
yield* logDiscoveryFailure({ phase: "inventory", isExternalServer, version });
849862
}
850863
return {

0 commit comments

Comments
 (0)