Skip to content

Commit 0bab335

Browse files
committed
fix(web): preserve extension models for thread defaults
1 parent e292e3f commit 0bab335

4 files changed

Lines changed: 24 additions & 5 deletions

File tree

‎apps/web/src/components/settings/SettingsPanels.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,7 @@ export function ThreadsSettingsPanel() {
15291529
const textGenerationModelDisabledReason = useScopedModelDisabledReason(
15301530
settings,
15311531
textGenerationModelInstanceEntries,
1532+
true,
15321533
);
15331534
const mixedAddProjectBaseDirectory = useScopedSettingsMixed(["addProjectBaseDirectory"]);
15341535
const mixedTextGenerationModel = useScopedSettingsMixed(["textGenerationModelSelection"]);

‎apps/web/src/components/settings/SourceControlWritingSettings.browser.test.tsx‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,24 @@ it("rejects a scoped model when another environment requires extensions for it",
168168
],
169169
]);
170170
function Availability() {
171-
const reason = useScopedModelDisabledReason(
171+
const backgroundReason = useScopedModelDisabledReason(
172172
{ ...DEFAULT_UNIFIED_SETTINGS, providerInstances: state.providerInstances },
173173
deriveProviderInstanceEntries([provider]),
174+
true,
175+
);
176+
const threadReason = useScopedModelDisabledReason(
177+
{ ...DEFAULT_UNIFIED_SETTINGS, providerInstances: state.providerInstances },
178+
deriveProviderInstanceEntries([provider]),
179+
);
180+
return (
181+
<>
182+
<p>{backgroundReason(instanceId, "demo/model") ?? "Available"}</p>
183+
<p>{threadReason(instanceId, "demo/model") ?? "Available for threads"}</p>
184+
</>
174185
);
175-
return <p>{reason(instanceId, "demo/model") ?? "Available"}</p>;
176186
}
177187
await using screen = await render(<Availability />);
188+
await expect.element(screen.getByText("Available for threads")).toBeVisible();
178189
await expect
179190
.element(
180191
screen.getByText(

‎apps/web/src/components/settings/SourceControlWritingSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export function SourceControlWritingSettingsSection() {
145145
activeSelection.instanceId,
146146
activeSelection.model,
147147
);
148-
const writerModelDisabledReason = useScopedModelDisabledReason(settings, instanceEntries);
148+
const writerModelDisabledReason = useScopedModelDisabledReason(settings, instanceEntries, true);
149149
const writerInstanceEntry = instanceEntries.find(
150150
(entry) => entry.instanceId === activeSelection.instanceId,
151151
);

‎apps/web/src/components/settings/useScopedModelAvailability.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import type { ProviderInstanceId, UnifiedSettings } from "@t3tools/contracts";
22

33
import { mergeEnvironmentSettings } from "../../hooks/useSettings";
4-
import { getTextGenerationModelOptionsByInstance } from "../../modelSelection";
4+
import {
5+
getCustomModelOptionsByInstance,
6+
getTextGenerationModelOptionsByInstance,
7+
} from "../../modelSelection";
58
import {
69
applyProviderInstanceSettings,
710
deriveProviderInstanceEntries,
@@ -13,6 +16,7 @@ import { useSettingsScope } from "./SettingsScopeContext";
1316
export function useScopedModelDisabledReason(
1417
settings: UnifiedSettings,
1518
entries: readonly ProviderInstanceEntry[],
19+
textGeneration = false,
1620
) {
1721
const { targets } = useSettingsScope();
1822
const { environments } = useEnvironments();
@@ -30,7 +34,10 @@ export function useScopedModelDisabledReason(
3034
candidate.settings,
3135
candidate.projectId,
3236
).find((option) => option.instanceId === instanceId);
33-
const options = getTextGenerationModelOptionsByInstance(
37+
const optionsForInstance = textGeneration
38+
? getTextGenerationModelOptionsByInstance
39+
: getCustomModelOptionsByInstance;
40+
const options = optionsForInstance(
3441
mergeEnvironmentSettings(candidate.settings, settings),
3542
providers,
3643
).get(instanceId);

0 commit comments

Comments
 (0)