Skip to content

Commit b4fd4bb

Browse files
fix: add explicit fallback model and prevent direct opencode provider calls (#4653)
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
1 parent eb009d5 commit b4fd4bb

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

packages/opencode/src/provider/provider.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,14 @@ export namespace Provider {
685685
}
686686
}
687687
}
688-
return getModel("opencode", "gpt-5-nano")
688+
689+
// Check if opencode provider is available before using it
690+
const opencodeProvider = await state().then((state) => state.providers["opencode"])
691+
if (opencodeProvider && opencodeProvider.info.models["gpt-5-nano"]) {
692+
return getModel("opencode", "gpt-5-nano")
693+
}
694+
695+
return undefined
689696
}
690697

691698
const priority = ["gpt-5", "claude-sonnet-4", "big-pickle", "gemini-3-pro"]

packages/opencode/src/session/prompt.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,8 @@ export namespace SessionPrompt {
14081408
input.history.filter((m) => m.info.role === "user" && !m.parts.every((p) => "synthetic" in p && p.synthetic))
14091409
.length === 1
14101410
if (!isFirst) return
1411-
const small = await Provider.getSmallModel(input.providerID)
1411+
const small =
1412+
(await Provider.getSmallModel(input.providerID)) ?? (await Provider.getModel(input.providerID, input.modelID))
14121413
const options = pipe(
14131414
{},
14141415
mergeDeep(ProviderTransform.options(small.providerID, small.modelID, small.npm ?? "", input.session.id)),

packages/opencode/src/session/summary.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ export namespace SessionSummary {
7373
await Session.updateMessage(userMsg)
7474

7575
const assistantMsg = messages.find((m) => m.info.role === "assistant")!.info as MessageV2.Assistant
76-
const small = await Provider.getSmallModel(assistantMsg.providerID)
76+
const small =
77+
(await Provider.getSmallModel(assistantMsg.providerID)) ??
78+
(await Provider.getModel(assistantMsg.providerID, assistantMsg.modelID))
79+
7780
const options = pipe(
7881
{},
7982
mergeDeep(ProviderTransform.options(small.providerID, small.modelID, small.npm ?? "", assistantMsg.sessionID)),

0 commit comments

Comments
 (0)