Skip to content

Commit 1969632

Browse files
fix(web): support mixed trigger label in agent picker and project defaults
1 parent 1f2ddc9 commit 1969632

3 files changed

Lines changed: 37 additions & 8 deletions

File tree

‎apps/web/src/components/chat/AgentPicker.test.tsx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,27 @@ it("does not collide custom agents whose id is 'default' or 'none' with control
202202
choose("control:default");
203203
expect(label()).toBe("Agent");
204204
});
205+
206+
it("renders an explicit trigger label and suppresses the tier badge when triggerLabel is provided", () => {
207+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
208+
act(() => {
209+
renderer = create(
210+
<AgentPicker
211+
agents={sampleAgents}
212+
selectedAgentId={AgentId.make("code-reviewer")}
213+
onSelectAgent={() => {}}
214+
triggerLabel="Mixed"
215+
/>,
216+
);
217+
});
218+
const label = renderer.root
219+
.findByProps({ "data-composer-control-label": true })
220+
.children.join("");
221+
expect(label).toBe("Mixed");
222+
expect(
223+
renderer.root
224+
.findAllByType("span")
225+
.map((s) => s.children.join(""))
226+
.filter((t) => t === "Reasoning"),
227+
).toHaveLength(0);
228+
});

‎apps/web/src/components/chat/AgentPicker.tsx‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ export interface AgentPickerProps extends AgentPickerMenuContentProps {
186186
hidden?: boolean | undefined;
187187
className?: string | undefined;
188188
triggerClassName?: string | undefined;
189+
triggerLabel?: string | undefined;
189190
}
190191

191192
export const AgentPicker = memo(function AgentPicker({
@@ -205,6 +206,7 @@ export const AgentPicker = memo(function AgentPicker({
205206
hidden = false,
206207
className,
207208
triggerClassName,
209+
triggerLabel: propsTriggerLabel,
208210
}: AgentPickerProps) {
209211
const [open, setOpen] = useComposerMenuState(hidden);
210212
const menuProps = useComposerMenuProps();
@@ -217,13 +219,15 @@ export const AgentPicker = memo(function AgentPicker({
217219
? (agents.find((agent) => agent.id === defaultAgentId) ?? null)
218220
: null;
219221

220-
const triggerLabel = activeAgent
221-
? activeAgent.name
222-
: allowNone && selectedAgentId === null
223-
? noneLabel
224-
: defaultAgent
225-
? `${defaultAgent.name} (Default)`
226-
: "Agent";
222+
const triggerLabel =
223+
propsTriggerLabel ??
224+
(activeAgent
225+
? activeAgent.name
226+
: allowNone && selectedAgentId === null
227+
? noneLabel
228+
: defaultAgent
229+
? `${defaultAgent.name} (Default)`
230+
: "Agent");
227231

228232
return (
229233
<Menu open={open} onOpenChange={setOpen}>
@@ -241,7 +245,7 @@ export const AgentPicker = memo(function AgentPicker({
241245
<span data-composer-control-label className="max-w-28 truncate text-left sm:max-w-36">
242246
{triggerLabel}
243247
</span>
244-
{activeAgent?.tier ? (
248+
{propsTriggerLabel === undefined && activeAgent?.tier ? (
245249
<Badge variant="outline" size="sm" className="hidden sm:inline-flex">
246250
{activeAgent.tier === "economy" ? "Economy" : "Reasoning"}
247251
</Badge>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
398398
? "New threads in this project do not use a custom agent by default."
399399
: "New threads do not use a custom agent by default."
400400
}
401+
{...(mixedAgent ? { triggerLabel: "Mixed" } : {})}
401402
getAgentDisabledReason={agentDisabledReason}
402403
disabled={unavailable || (isAgentRosterPending && agentRoster.data === null)}
403404
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}

0 commit comments

Comments
 (0)