Skip to content

Commit b88ff41

Browse files
committed
fix(opencode): retry empty legacy model catalogs
1 parent f41bf9b commit b88ff41

2 files changed

Lines changed: 39 additions & 8 deletions

File tree

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,33 @@ const checkProvider = Effect.fn("checkProvider")(function* (
462462
});
463463

464464
it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
465+
it.effect("keeps an empty legacy catalog retryable until connected providers list models", () =>
466+
Effect.gen(function* () {
467+
const upstream = { id: "openai", name: "OpenAI", models: {} };
468+
runtimeMock.state.inventory = {
469+
providerList: { connected: ["openai"], all: [upstream], default: {} },
470+
agents: [],
471+
skills: [],
472+
};
473+
const settings = makeOpenCodeSettings();
474+
const empty = yield* checkProvider(settings);
475+
NodeAssert.equal(empty.status, "warning");
476+
NodeAssert.equal(empty.auth.status, "unknown");
477+
NodeAssert.deepEqual(empty.models, []);
478+
479+
upstream.models = {
480+
"gpt-5.4": { id: "gpt-5.4", name: "GPT-5.4", variants: {} },
481+
};
482+
const ready = yield* checkProvider(settings);
483+
NodeAssert.equal(ready.status, "ready");
484+
NodeAssert.equal(ready.auth.status, "authenticated");
485+
NodeAssert.deepEqual(
486+
ready.models.map((model) => model.slug),
487+
["openai/gpt-5.4"],
488+
);
489+
}),
490+
);
491+
465492
it.effect("emits OpenCode variant defaults so trait picker can resolve a visible selection", () =>
466493
Effect.gen(function* () {
467494
runtimeMock.state.inventory = {

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -787,13 +787,15 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
787787
};
788788
}
789789

790+
const inventoryModels = flattenOpenCodeModels(inventoryExit.value);
790791
const models = providerModelsFromSettings(
791-
flattenOpenCodeModels(inventoryExit.value),
792+
inventoryModels,
792793
customModels,
793794
DEFAULT_OPENCODE_MODEL_CAPABILITIES,
794795
);
795796
const skills = openCodeSkillsToServerProviderSkills(inventoryExit.value.skills);
796797
const connectedCount = inventoryExit.value.providerList.connected.length;
798+
const catalogReady = connectedCount > 0 && inventoryModels.length > 0;
797799
return {
798800
...buildServerProvider({
799801
presentation: OPENCODE_PRESENTATION,
@@ -805,17 +807,19 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
805807
probe: {
806808
installed: true,
807809
version,
808-
status: connectedCount > 0 ? "ready" : "warning",
810+
status: catalogReady ? "ready" : "warning",
809811
auth: {
810-
status: connectedCount > 0 ? "authenticated" : "unknown",
812+
status: catalogReady ? "authenticated" : "unknown",
811813
type: "opencode",
812814
},
813815
message:
814-
connectedCount > 0
815-
? `${connectedCount} upstream provider${connectedCount === 1 ? "" : "s"} connected through ${isExternalServer ? "the configured OpenCode server" : "OpenCode"}.`
816-
: isExternalServer
817-
? "Connected to the configured OpenCode server, but it did not report any connected upstream providers."
818-
: "OpenCode is available, but it did not report any connected upstream providers.",
816+
connectedCount > 0 && !catalogReady
817+
? "OpenCode upstream providers are connected, but it did not list any models yet."
818+
: connectedCount > 0
819+
? `${connectedCount} upstream provider${connectedCount === 1 ? "" : "s"} connected through ${isExternalServer ? "the configured OpenCode server" : "OpenCode"}.`
820+
: isExternalServer
821+
? "Connected to the configured OpenCode server, but it did not report any connected upstream providers."
822+
: "OpenCode is available, but it did not report any connected upstream providers.",
819823
},
820824
}),
821825
...installedVersion,

0 commit comments

Comments
 (0)