Skip to content

Commit 0ce97f7

Browse files
committed
fix(web): composer keeps the effort when it falls back to another account
1 parent a68e6e9 commit 0ce97f7

4 files changed

Lines changed: 181 additions & 2 deletions

File tree

‎apps/web/src/components/ChatView.logic.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ export function resolveComposerProviderSelection(input: {
612612
: requestedInstanceId;
613613
return {
614614
selectedProviderEntry,
615+
requestedInstanceId,
615616
requestedDriverKind,
616617
lockedContinuationGroupKey,
617618
unavailableProviderInstanceId,

‎apps/web/src/components/chat/useComposerProviderModel.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export function useComposerProviderModel(
7474
providers: providerStatuses,
7575
selectedProvider,
7676
selectedInstanceId,
77+
requestedInstanceId: selection.requestedInstanceId,
7778
threadModelSelection,
7879
projectModelSelection,
7980
settings,

‎apps/web/src/composerDraftStore.ts‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,8 @@ export function deriveEffectiveComposerModelState(input: {
10971097
providers: ReadonlyArray<ServerProvider>;
10981098
selectedProvider: ProviderDriverKind;
10991099
selectedInstanceId?: ProviderInstanceId | null | undefined;
1100+
/** The instance the draft, thread or project asked for; differs from the selection on fallback. */
1101+
requestedInstanceId?: ProviderInstanceId | null | undefined;
11001102
threadModelSelection: ModelSelection | null | undefined;
11011103
projectModelSelection: ModelSelection | null | undefined;
11021104
settings: UnifiedSettings;
@@ -1164,10 +1166,55 @@ export function deriveEffectiveComposerModelState(input: {
11641166

11651167
return {
11661168
selectedModel,
1167-
modelOptions,
1169+
modelOptions: withFallbackInstanceOptions({ ...input, modelOptions, selectedModel }),
11681170
};
11691171
}
11701172

1173+
/**
1174+
* When the requested instance is disabled or unavailable, the composer shows another instance of
1175+
* the same driver with the same model. That instance has no options of its own, so it takes the
1176+
* requested instance's options instead of the model's defaults.
1177+
*/
1178+
function withFallbackInstanceOptions(input: {
1179+
readonly modelOptions: ProviderOptionSelectionsByProvider | null;
1180+
readonly selectedModel: string;
1181+
readonly providers: ReadonlyArray<ServerProvider>;
1182+
readonly selectedProvider: ProviderDriverKind;
1183+
readonly selectedInstanceId?: ProviderInstanceId | null | undefined;
1184+
readonly requestedInstanceId?: ProviderInstanceId | null | undefined;
1185+
readonly draft: Pick<ComposerThreadDraftState, "modelSelectionByProvider"> | null | undefined;
1186+
readonly threadModelSelection: ModelSelection | null | undefined;
1187+
readonly projectModelSelection: ModelSelection | null | undefined;
1188+
}): ProviderOptionSelectionsByProvider | null {
1189+
const { modelOptions, selectedInstanceId, requestedInstanceId } = input;
1190+
if (
1191+
!modelOptions ||
1192+
!selectedInstanceId ||
1193+
!requestedInstanceId ||
1194+
selectedInstanceId === requestedInstanceId ||
1195+
modelOptions[selectedInstanceId] !== undefined
1196+
) {
1197+
return modelOptions;
1198+
}
1199+
const requestedOptions = modelOptions[requestedInstanceId];
1200+
const requestedDriver = input.providers.find(
1201+
(provider) => provider.instanceId === requestedInstanceId,
1202+
)?.driver;
1203+
const requestedModel =
1204+
input.draft?.modelSelectionByProvider?.[requestedInstanceId]?.model ??
1205+
[input.threadModelSelection, input.projectModelSelection].find(
1206+
(selection) => selection?.instanceId === requestedInstanceId,
1207+
)?.model;
1208+
if (
1209+
!requestedOptions ||
1210+
requestedDriver !== input.selectedProvider ||
1211+
requestedModel !== input.selectedModel
1212+
) {
1213+
return modelOptions;
1214+
}
1215+
return { ...modelOptions, [selectedInstanceId]: requestedOptions };
1216+
}
1217+
11711218
function revokeObjectPreviewUrl(previewUrl: string): void {
11721219
if (typeof URL === "undefined") {
11731220
return;

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

Lines changed: 131 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ import { describe, expect, it } from "vite-plus/test";
1010
import { createModelSelection } from "@t3tools/shared/model";
1111
import { deriveEffectiveComposerModelState } from "./composerDraftStore";
1212
import { getComposerProviderState } from "./components/chat/composerProviderState";
13-
import { deriveProviderInstanceEntries, NO_PROVIDER_MODEL_SELECTION } from "./providerInstances";
13+
import { resolveComposerProviderSelection } from "./components/ChatView.logic";
14+
import {
15+
deriveProviderInstanceEntries,
16+
NO_PROVIDER_MODEL_SELECTION,
17+
sortProviderInstanceEntries,
18+
} from "./providerInstances";
1419
import {
1520
getAppModelOptionsForInstance,
1621
resolveAppModelSelectionForInstance,
@@ -780,3 +785,128 @@ describe("default model settings and new-thread composer parity", () => {
780785
},
781786
);
782787
});
788+
789+
describe("composer fallback to another instance of the same driver", () => {
790+
const claude = ProviderDriverKind.make("claudeAgent");
791+
const codex = ProviderDriverKind.make("codex");
792+
const disabled = ProviderInstanceId.make("claudeAgent");
793+
const fallback = ProviderInstanceId.make("claude_team");
794+
const effortModels: ServerProvider["models"] = [
795+
{
796+
slug: "claude-opus-5-5",
797+
name: "Claude Opus 5.5",
798+
isCustom: false,
799+
capabilities: {
800+
optionDescriptors: [
801+
{
802+
id: "effort",
803+
label: "Effort",
804+
type: "select",
805+
options: ["medium", "high", "xhigh"].map((id) => ({
806+
id,
807+
label: id,
808+
isDefault: id === "medium",
809+
})),
810+
},
811+
],
812+
},
813+
},
814+
];
815+
const providers: ReadonlyArray<ServerProvider> = [
816+
{
817+
...provider({ provider: claude, instanceId: disabled }),
818+
enabled: false,
819+
models: effortModels,
820+
},
821+
{ ...provider({ provider: claude, instanceId: fallback }), models: effortModels },
822+
];
823+
const picked = createModelSelection(disabled, "claude-opus-5-5", [
824+
{ id: "effort", value: "xhigh" },
825+
]);
826+
827+
// The same steps useComposerProviderModel takes, without the draft store.
828+
function composerFor(input: {
829+
readonly providers: ReadonlyArray<ServerProvider>;
830+
readonly draft?: Parameters<typeof deriveEffectiveComposerModelState>[0]["draft"];
831+
readonly threadModelSelection: ReturnType<typeof createModelSelection>;
832+
}) {
833+
const selection = resolveComposerProviderSelection({
834+
entries: sortProviderInstanceEntries(deriveProviderInstanceEntries(input.providers)),
835+
candidateInstanceIds: [input.threadModelSelection.instanceId],
836+
lockedProvider: null,
837+
lockedInstanceId: undefined,
838+
});
839+
const selectedInstanceId = selection.selectedProviderEntry!.instanceId;
840+
const selectedProvider = selection.selectedProviderEntry!.driverKind;
841+
const state = deriveEffectiveComposerModelState({
842+
draft: input.draft ?? null,
843+
providers: input.providers,
844+
selectedProvider,
845+
selectedInstanceId,
846+
requestedInstanceId: selection.requestedInstanceId,
847+
threadModelSelection: input.threadModelSelection,
848+
projectModelSelection: null,
849+
settings: DEFAULT_UNIFIED_SETTINGS,
850+
});
851+
const traits = getComposerProviderState({
852+
provider: selectedProvider,
853+
model: state.selectedModel,
854+
models: selection.selectedProviderEntry!.models,
855+
modelOptions: state.modelOptions?.[selectedInstanceId],
856+
planModeEnabled: false,
857+
});
858+
return { selectedInstanceId, state, traits };
859+
}
860+
861+
it("keeps the requested instance's effort on the fallback instance", () => {
862+
const { selectedInstanceId, state, traits } = composerFor({
863+
providers,
864+
threadModelSelection: picked,
865+
});
866+
867+
expect(selectedInstanceId).toBe(fallback);
868+
expect(state.selectedModel).toBe("claude-opus-5-5");
869+
expect(traits.promptEffort).toBe("xhigh");
870+
expect(
871+
createModelSelection(fallback, state.selectedModel, traits.modelOptionsForDispatch),
872+
).toEqual(
873+
createModelSelection(fallback, "claude-opus-5-5", [{ id: "effort", value: "xhigh" }]),
874+
);
875+
});
876+
877+
it("keeps options the fallback instance already has", () => {
878+
const { traits } = composerFor({
879+
providers,
880+
threadModelSelection: picked,
881+
draft: {
882+
activeProvider: disabled,
883+
modelSelectionByProvider: {
884+
[disabled]: picked,
885+
[fallback]: createModelSelection(fallback, "claude-opus-5-5", [
886+
{ id: "effort", value: "high" },
887+
]),
888+
},
889+
},
890+
});
891+
892+
expect(traits.promptEffort).toBe("high");
893+
});
894+
895+
it("does not carry options to another driver", () => {
896+
const codexOnly: ReadonlyArray<ServerProvider> = [
897+
{
898+
...provider({ provider: claude, instanceId: disabled }),
899+
enabled: false,
900+
models: effortModels,
901+
},
902+
provider({ provider: codex, instanceId: "codex", models: ["gpt-6-astra"] }),
903+
];
904+
const { selectedInstanceId, state } = composerFor({
905+
providers: codexOnly,
906+
threadModelSelection: picked,
907+
});
908+
909+
expect(selectedInstanceId).toBe(ProviderInstanceId.make("codex"));
910+
expect(state.modelOptions?.[selectedInstanceId]).toBeUndefined();
911+
});
912+
});

0 commit comments

Comments
 (0)