Skip to content

Commit 079ad34

Browse files
committed
fix(server): OpenCode keeps its cached models when a cold probe lists none
1 parent 6807c3f commit 079ad34

2 files changed

Lines changed: 20 additions & 3 deletions

File tree

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ it.layer(
10501050
);
10511051
});
10521052

1053-
it("retains stale OpenCode models when a refresh fails", () => {
1053+
it("retains stale OpenCode models when a refresh fails or lists none", () => {
10541054
const previousProvider = {
10551055
instanceId: ProviderInstanceId.make("opencode"),
10561056
driver: ProviderDriverKind.make("opencode"),
@@ -1100,6 +1100,21 @@ it.layer(
11001100
ProviderRegistry.mergeProviderSnapshot(previousProvider, refreshedProvider).skills,
11011101
previousProvider.skills,
11021102
);
1103+
1104+
const emptyCatalogProvider = {
1105+
...refreshedProvider,
1106+
status: "warning",
1107+
message: "OpenCode 2 is running, but it did not list any models yet.",
1108+
slashCommands: [],
1109+
skills: [],
1110+
} satisfies ServerProvider;
1111+
const mergedEmptyCatalog = ProviderRegistry.mergeProviderSnapshot(
1112+
previousProvider,
1113+
emptyCatalogProvider,
1114+
);
1115+
assert.deepStrictEqual(mergedEmptyCatalog.models, [...previousProvider.models]);
1116+
assert.deepStrictEqual(mergedEmptyCatalog.slashCommands, previousProvider.slashCommands);
1117+
assert.deepStrictEqual(mergedEmptyCatalog.skills, previousProvider.skills);
11031118
});
11041119

11051120
describe("Pi model inventories", () => {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ const shouldRetainMissingProviderModels = (provider: ServerProvider): boolean =>
212212

213213
const isAntigravity = provider.driver === ProviderDriverKind.make("antigravity");
214214
const isCodex = provider.driver === ProviderDriverKind.make("codex");
215-
if (!isAntigravity && !isCodex && provider.driver !== ProviderDriverKind.make("opencode")) {
215+
const isOpenCode = provider.driver === ProviderDriverKind.make("opencode");
216+
if (!isAntigravity && !isCodex && !isOpenCode) {
216217
return true;
217218
}
218219

@@ -228,9 +229,10 @@ const shouldRetainMissingProviderModels = (provider: ServerProvider): boolean =>
228229
isAntigravity && provider.status === "warning" && provider.auth.status === "unknown";
229230
const isPendingInitialProbe =
230231
provider.enabled && !provider.installed && provider.status === "warning";
232+
// A cold OpenCode server can finish its probe as a warning before it lists any models.
231233
const isIncompleteInstalledProbe =
232234
provider.installed &&
233-
(provider.status === "error" || (isCodex && provider.status === "warning"));
235+
(provider.status === "error" || ((isCodex || isOpenCode) && provider.status === "warning"));
234236
return isPendingAntigravityAuthentication || isPendingInitialProbe || isIncompleteInstalledProbe;
235237
};
236238

0 commit comments

Comments
 (0)