Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion apps/server/src/provider/ProviderRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ it.layer(
);
});

it("retains stale OpenCode models when a refresh fails", () => {
it("retains stale OpenCode models when a refresh fails or lists none", () => {
const previousProvider = {
instanceId: ProviderInstanceId.make("opencode"),
driver: ProviderDriverKind.make("opencode"),
Expand Down Expand Up @@ -1359,6 +1359,21 @@ it.layer(
ProviderRegistry.mergeProviderSnapshot(previousProvider, refreshedProvider).skills,
previousProvider.skills,
);

const emptyCatalogProvider = {
...refreshedProvider,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
status: "warning",
message: "OpenCode 2 is running, but it did not list any models yet.",
slashCommands: [],
skills: [],
} satisfies ServerProvider;
const mergedEmptyCatalog = ProviderRegistry.mergeProviderSnapshot(
previousProvider,
emptyCatalogProvider,
);
assert.deepStrictEqual(mergedEmptyCatalog.models, [...previousProvider.models]);
assert.deepStrictEqual(mergedEmptyCatalog.slashCommands, previousProvider.slashCommands);
assert.deepStrictEqual(mergedEmptyCatalog.skills, previousProvider.skills);
});

describe("Pi model inventories", () => {
Expand Down
6 changes: 4 additions & 2 deletions apps/server/src/provider/ProviderRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ const shouldRetainMissingProviderModels = (provider: ServerProvider): boolean =>

const isAntigravity = provider.driver === ProviderDriverKind.make("antigravity");
const isCodex = provider.driver === ProviderDriverKind.make("codex");
if (!isAntigravity && !isCodex && provider.driver !== ProviderDriverKind.make("opencode")) {
const isOpenCode = provider.driver === ProviderDriverKind.make("opencode");
if (!isAntigravity && !isCodex && !isOpenCode) {
return true;
}

Expand All @@ -236,9 +237,10 @@ const shouldRetainMissingProviderModels = (provider: ServerProvider): boolean =>
isAntigravity && provider.status === "warning" && provider.auth.status === "unknown";
const isPendingInitialProbe =
provider.enabled && !provider.installed && provider.status === "warning";
// A cold OpenCode server can finish its probe as a warning before it lists any models.
const isIncompleteInstalledProbe =
provider.installed &&
(provider.status === "error" || (isCodex && provider.status === "warning"));
(provider.status === "error" || ((isCodex || isOpenCode) && provider.status === "warning"));
return isPendingAntigravityAuthentication || isPendingInitialProbe || isIncompleteInstalledProbe;
};

Expand Down
Loading