Skip to content

Commit 1ad7861

Browse files
fix(web): keep the default instance's draft model off custom instances (pingdotgg#25511)
Co-authored-by: maria-rcks <[email protected]>
1 parent 503bf77 commit 1ad7861

2 files changed

Lines changed: 32 additions & 1 deletion

File tree

‎apps/web/src/composerDraftStore.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,8 +1128,8 @@ export function deriveEffectiveComposerModelState(input: {
11281128
const instanceSelection = input.selectedInstanceId
11291129
? input.draft?.modelSelectionByProvider?.[input.selectedInstanceId]
11301130
: undefined;
1131+
// Legacy driver-keyed drafts belong to the default instance.
11311132
const legacySelection =
1132-
input.selectedProvider === "antigravity" &&
11331133
input.selectedInstanceId &&
11341134
input.selectedInstanceId !== defaultInstanceIdForDriver(input.selectedProvider)
11351135
? undefined

‎apps/web/src/modelSelection.test.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,37 @@ describe("instance-scoped model selection", () => {
609609
).toEqual(createModelSelection(instanceId, "openai/gpt-5.5"));
610610
});
611611

612+
it("keeps the default instance's draft model off a custom instance of the same driver", () => {
613+
const driver = ProviderDriverKind.make("opencode");
614+
const defaultInstanceId = ProviderInstanceId.make("opencode");
615+
const kimiInstanceId = ProviderInstanceId.make("kimi_api");
616+
const kimiModel = "kimi-code-plan-global/k3.1-pro";
617+
const providers = [
618+
provider({
619+
provider: driver,
620+
instanceId: defaultInstanceId,
621+
models: ["opencode-go/kimi-k3.1-pro"],
622+
}),
623+
provider({ provider: driver, instanceId: kimiInstanceId, models: [kimiModel] }),
624+
];
625+
const state = deriveEffectiveComposerModelState({
626+
draft: {
627+
activeProvider: kimiInstanceId,
628+
modelSelectionByProvider: {
629+
[defaultInstanceId]: createModelSelection(defaultInstanceId, "opencode-go/kimi-k3.1-pro"),
630+
},
631+
},
632+
providers,
633+
selectedProvider: driver,
634+
selectedInstanceId: kimiInstanceId,
635+
threadModelSelection: null,
636+
projectModelSelection: null,
637+
settings: DEFAULT_UNIFIED_SETTINGS,
638+
});
639+
640+
expect(state.selectedModel).toBe(kimiModel);
641+
});
642+
612643
it("self-heals a persisted selection pointing at a text-generation-incapable instance", () => {
613644
const providers = [
614645
provider({

0 commit comments

Comments
 (0)