Skip to content

Commit f766508

Browse files
committed
fix(web): resolve text-generation selections against one provider filter
The ACP exclusion was hand-rolled in two panels and applied to reads only; the update handlers and the clear-on-disable check still resolved against the unfiltered list, so an unavailable pick could fall back to a hidden ACP instance and persist a selection the server cannot serve. One exported filterTextGenerationProviders now owns the rule at every call site.
1 parent 49377c6 commit f766508

4 files changed

Lines changed: 52 additions & 6 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { isElectron } from "../../env";
4040
import { usePrimarySessionState } from "../../environments/primary";
4141
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
4242
import { cn } from "../../lib/utils";
43-
import { resolveAppModelSelectionState } from "../../modelSelection";
43+
import { filterTextGenerationProviders, resolveAppModelSelectionState } from "../../modelSelection";
4444
import {
4545
useEnvironments,
4646
usePrimaryEnvironmentId,
@@ -490,7 +490,10 @@ export function EnvironmentProviderSettings({
490490
provider.instanceId === defaultInstanceIdForDriver(ProviderDriverKind.make("cursor")),
491491
),
492492
);
493-
const textGenerationModelSelection = resolveAppModelSelectionState(settings, serverProviders);
493+
const textGenerationModelSelection = resolveAppModelSelectionState(
494+
settings,
495+
filterTextGenerationProviders(serverProviders),
496+
);
494497
const textGenInstanceId = textGenerationModelSelection.instanceId;
495498
const resolvedBackgroundActivity = resolveServerBackgroundActivitySettings(settings);
496499
const providerHealthPreset = getBackgroundActivityPresetSettings(

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useAtomValue } from "@effect/atom-react";
22
import { useRef } from "react";
3-
import { ProviderDriverKind, type SourceControlWritingStyleMode } from "@t3tools/contracts";
3+
import type { SourceControlWritingStyleMode } from "@t3tools/contracts";
44
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
55
import { createModelSelection } from "@t3tools/shared/model";
66
import { resolveSourceControlWriterModelSelection } from "@t3tools/shared/serverSettings";
@@ -12,6 +12,7 @@ import {
1212
sortProviderInstanceEntries,
1313
} from "../../providerInstances";
1414
import {
15+
filterTextGenerationProviders,
1516
getCustomModelOptionsByInstance,
1617
resolveAppModelSelectionState,
1718
} from "../../modelSelection";
@@ -44,9 +45,7 @@ const MODE_OPTIONS: Record<SourceControlWritingStyleMode, { label: string; descr
4445
export function SourceControlWritingSettingsSection() {
4546
const settings = usePrimarySettings();
4647
const updateSettings = useUpdatePrimarySettings();
47-
const serverProviders = useAtomValue(primaryServerProvidersAtom).filter(
48-
(provider) => provider.driver !== ProviderDriverKind.make("acp"),
49-
);
48+
const serverProviders = filterTextGenerationProviders(useAtomValue(primaryServerProvidersAtom));
5049
const customInstructionsRef = useRef<HTMLTextAreaElement>(null);
5150
const style = settings.sourceControlWritingStyle;
5251
const defaults = DEFAULT_UNIFIED_SETTINGS.sourceControlWritingStyle;

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { deriveEffectiveComposerModelState } from "./composerDraftStore";
66
import { getComposerProviderState } from "./components/chat/composerProviderState";
77
import { deriveProviderInstanceEntries } from "./providerInstances";
88
import {
9+
filterTextGenerationProviders,
910
getCustomModelOptionsByInstance,
1011
getAppModelOptionsForInstance,
1112
resolveAppModelSelectionForInstance,
@@ -60,6 +61,36 @@ function settingsWithProviderInstances(): UnifiedSettings {
6061
};
6162
}
6263

64+
describe("text generation provider filter", () => {
65+
it("never falls back to an ACP instance when the selected instance is unavailable", () => {
66+
const acpProvider = provider({
67+
provider: ProviderDriverKind.make("acp"),
68+
instanceId: "acp_copilot",
69+
models: ["__acp_agent_default__", "gpt-5"],
70+
});
71+
const unavailableCodex = {
72+
...provider({ instanceId: "codex", models: ["gpt-5.4"] }),
73+
installed: false,
74+
status: "error" as const,
75+
availability: "unavailable" as const,
76+
};
77+
const claude = provider({ instanceId: "claudeAgent", models: ["claude-opus-4-8"] });
78+
const providers = [acpProvider, unavailableCodex, claude];
79+
const settings: UnifiedSettings = {
80+
...DEFAULT_UNIFIED_SETTINGS,
81+
textGenerationModelSelection: createModelSelection(
82+
ProviderInstanceId.make("codex"),
83+
"gpt-5.4",
84+
),
85+
};
86+
87+
expect(resolveAppModelSelectionState(settings, providers).instanceId).toBe("acp_copilot");
88+
expect(
89+
resolveAppModelSelectionState(settings, filterTextGenerationProviders(providers)).instanceId,
90+
).toBe("claudeAgent");
91+
});
92+
});
93+
6394
describe("instance-scoped model selection", () => {
6495
it("preserves server-provided legacy model metadata", () => {
6596
const baseProvider = provider({

‎apps/web/src/modelSelection.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,19 @@ export function resolvePlanAgentHealPatch(input: {
389389
return Object.keys(patch).length > 0 ? patch : null;
390390
}
391391

392+
/**
393+
* Providers eligible for server-side text generation (thread titles, branch
394+
* names, source-control text). Generic ACP agents only run prompt turns, so
395+
* every reader and writer of `textGenerationModelSelection` and
396+
* `sourceControlWriterModelSelection` must resolve against this list; mixing
397+
* filtered reads with unfiltered writes persists a selection the server rejects.
398+
*/
399+
export function filterTextGenerationProviders(
400+
providers: ReadonlyArray<ServerProvider>,
401+
): ReadonlyArray<ServerProvider> {
402+
return providers.filter((provider) => provider.driver !== ProviderDriverKind.make("acp"));
403+
}
404+
392405
export function resolveAppModelSelectionState(
393406
settings: UnifiedSettings,
394407
providers: ReadonlyArray<ServerProvider>,

0 commit comments

Comments
 (0)