Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

feat(chat): give thread and agent model pickers the provider rail and favourites

rubenluetke10-beepe4198befa8f1
diff --git a/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx b/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx
index 928d421970..f40e08f24a 100644
--- a/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentchat/ComposerBrainPicker.tsx
@@ -77,6 +77,7 @@ export function ComposerBrainPicker({
title,
className,
chevron = true,
+ testId = "composer-model",
}: {
value: string;
/** One group per provider, its id equal to that provider's section id. */
@@ -93,6 +94,8 @@ export function ComposerBrainPicker({
title?: string;
className?: string;
chevron?: boolean;
+ /** Lands on the trigger; the panel gets `${testId}-panel`. */
+ testId?: string;
}) {
const t = useT();
const [favorites, toggleFavorite] = useFavoriteModels();
@@ -204,7 +207,7 @@ export function ComposerBrainPicker({
: t("agent_chat.no_models")
}
disabled={disabled}
- testId="composer-model"
+ testId={testId}
triggerHint={false}
triggerIcon={false}
triggerPrefix={triggerPrefix}
@@ -216,7 +219,7 @@ export function ComposerBrainPicker({
);
}
-function RailButton({
+export function RailButton({
active,
label,
muted = false,
diff --git a/jarvis/ui/web/frontend/src/components/agentic/threads/ThreadPickers.tsx b/jarvis/ui/web/frontend/src/components/agentic/threads/ThreadPickers.tsx
index 189f830922..200ccad7ee 100644
--- a/jarvis/ui/web/frontend/src/components/agentic/threads/ThreadPickers.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentic/threads/ThreadPickers.tsx
@@ -1,4 +1,6 @@
import { useMemo } from "react";
+import { brainValue, splitBrainValue } from "@/components/agentchat/AgentComposer";
+import { ComposerBrainPicker, type BrainSection } from "@/components/agentchat/ComposerBrainPicker";
import { AgentMark } from "@/components/agentic/AgentMark";
import { isUnguardedPermissionMode, permissionModeIcon } from "@/components/agentchat/permissionIcons";
import { Combobox, type ComboboxGroup, type ComboboxOption } from "@/components/ui/combobox";
@@ -33,8 +35,6 @@ export function agentName(provider: Pick<ProviderOption, "agent" | "label">): st
}
}
-const SEP = "\u0000";
-
const EFFORTS = new Set(["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"]);
/** An effort level in the chat's own words ("" is the agent's default). */
@@ -63,22 +63,29 @@ export function AgentModelPicker({
lockedProvider: string | null;
onPick: (provider: string, model: string) => void;
}) {
- const olderLabel = useT()("agent_chat.older_models");
+ const t = useT();
+ const olderLabel = t("agent_chat.older_models");
+ const defaultLabel = t("agent_chat.model_default");
const saved = useSavedHiddenModels((state) => state.hidden);
const groups = useMemo<ComboboxGroup[]>(() => providers.map((provider) => {
const locked = lockedProvider !== null && provider.id !== lockedProvider;
const disabled = !provider.connected || locked;
const hint = locked ? "new thread" : !provider.connected ? (provider.cli_installed === false ? "not installed" : "connect first") : undefined;
const icon = <AgentMark agent={provider.agent ?? ""} label={provider.label} logoUrl={provider.logoUrl} variant="plain" size="sm" />;
+ // Whose model a row is, on a quiet second line under its name.
+ const owner = (note?: string) => <span className="inline-flex min-w-0 items-center gap-1.5">
+ <span className="inline-flex shrink-0 scale-[0.86]">{icon}</span>
+ <span className="truncate">{note ? `${agentName(provider)} · ${note}` : agentName(provider)}</span>
+ </span>;
// Models switched off on the API Keys page stay out; the current pick stays.
const current = provider.id === draft.provider ? draft.model : "";
const models = offeredModels(provider, modelsOf(provider, liveModels), current, saved).filter((model) => model.id);
const toOption = (model: CuratedModel): ComboboxOption => ({
- value: `${provider.id}${SEP}${model.id}`,
+ value: brainValue(provider.id, model.id),
label: model.label || model.id,
- hint: hint ?? model.note,
+ description: owner(model.note),
+ hint,
searchText: `${model.id} ${agentName(provider)}`,
- icon,
disabled,
});
// Newest of each model line first; earlier versions fold away.
@@ -87,17 +94,25 @@ export function AgentModelPicker({
id: provider.id,
label: agentName(provider),
options: [
- { value: `${provider.id}${SEP}`, label: agentName(provider), hint: hint ?? "default model", icon, disabled },
+ { value: brainValue(provider.id, ""), label: defaultLabel, triggerLabel: agentName(provider), description: owner(), hint, disabled, searchText: agentName(provider) },
...ranked.current.map(toOption),
],
more: ranked.older.length ? { label: olderLabel, options: ranked.older.map(toOption) } : undefined,
};
- }), [providers, liveModels, lockedProvider, draft.provider, draft.model, saved, olderLabel]);
- return <Combobox ariaLabel="Coding agent and model" testId="thread-model-picker"
- value={`${draft.provider}${SEP}${draft.model}`} groups={groups}
- onChange={(value) => { const [provider, model = ""] = value.split(SEP); onPick(provider, model); }}
+ }), [providers, liveModels, lockedProvider, draft.provider, draft.model, saved, olderLabel, defaultLabel]);
+ // The rail on the panel's left: one mark per coding agent, plus favourites.
+ const sections = useMemo<BrainSection[]>(() => providers.map((provider) => ({
+ id: provider.id,
+ label: agentName(provider),
+ icon: <AgentMark agent={provider.agent ?? ""} label={provider.label} logoUrl={provider.logoUrl} variant="plain" size="sm" />,
+ muted: !provider.connected || (lockedProvider !== null && provider.id !== lockedProvider),
+ })), [providers, lockedProvider]);
+ const pickedIcon = providers.find((provider) => provider.id === draft.provider);
+ return <ComposerBrainPicker testId="thread-model-picker" ariaLabel="Coding agent and model"
+ value={brainValue(draft.provider, draft.model)} groups={groups} sections={sections} currentSection={draft.provider}
+ onChange={(value) => { const [provider, model] = splitBrainValue(value); onPick(provider, model); }}
fallbackLabel={draft.model || (providers.length ? "Choose an agent" : "Loading agents…")} searchPlaceholder="Search agents and models"
- triggerHint={false} className={TRIGGER} />;
+ triggerPrefix={pickedIcon ? <AgentMark agent={pickedIcon.agent ?? ""} label={pickedIcon.label} logoUrl={pickedIcon.logoUrl} variant="plain" size="sm" /> : undefined} />;
}
export function EffortPicker({ provider, draft, liveModels, onPick, separated = false }: {
diff --git a/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.test.tsx b/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.test.tsx
index bbbb6e4ded..c273f88c6a 100644
--- a/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.test.tsx
@@ -177,7 +177,7 @@ test("a cold menu renders models without waiting for subscription account discov
let release!: () => void;
accountsGate = new Promise<void>((resolve) => { release = resolve; });
try {
- mount(); await open();
+ mount(); await open(); show("gemini");
expect(screen.getByTitle("gemini-small")).toBeTruthy();
expect(screen.queryByText("Loading the provider catalog…")).toBeNull();
} finally {
@@ -199,10 +199,18 @@ async function open() {
return screen.getByRole("textbox", { name: "Search models" });
}
+/** Lists one provider's models, as a click on its rail mark does. */
+function show(id: string) {
+ fireEvent.click(screen.getByTestId(`agent-model-rail-${id}`));
+}
+
test("groups connected models and hides disconnected or empty local endpoints", async () => {
mount(); await open();
expect(screen.getByRole("group", { name: "openai · API key" })).toBeTruthy();
+ show("gemini");
expect(screen.getByTitle("gemini-small")).toBeTruthy();
+ expect(screen.queryByTestId("agent-model-rail-offline")).toBeNull();
+ expect(screen.queryByTestId("agent-model-rail-ollama")).toBeNull();
expect(screen.queryByTitle("offline-small")).toBeNull();
expect(screen.queryByTitle("ollama-small")).toBeNull();
expect(screen.queryByRole("combobox")).toBeNull();
@@ -221,7 +229,7 @@ test("clicking a model persists immediately, preserves the account and updates t
});
test("changing provider resets the subscription account and uses a supported effort", async () => {
- mount(); await open();
+ mount(); await open(); show("gemini");
fireEvent.click(screen.getByTitle("gemini-small"));
await waitFor(() => expect(posts).toHaveLength(1));
expect(posts[0]).toEqual({ provider: "gemini", model: "gemini-small", effort: "low", account_id: "" });
@@ -254,7 +262,7 @@ test("search filters by model and provider, and Escape closes without saving", a
});
test("the effort submenu commits the model and chosen effort together", async () => {
- mount(); await open();
+ mount(); await open(); show("gemini");
fireEvent.click(within(screen.getByRole("group", { name: "gemini · API key" })).getByRole("button", { name: "Thinking effort: Large" }));
fireEvent.click(within(screen.getByRole("menu", { name: "Thinking effort" })).getByRole("menuitemradio", { name: "Medium" }));
await waitFor(() => expect(posts[0]).toEqual({ provider: "gemini", model: "gemini-large", effort: "medium", account_id: "" }));
@@ -263,7 +271,7 @@ test("the effort submenu commits the model and chosen effort together", async ()
test("OpenCode models are offered without a duplicate app-managed login", async () => {
extraProviders = [provider("opencode", { runner: "opencode-cli", cli_installed: true,
curated_models: [{ id: "opencode/test-free", label: "Free model" }] })];
- mount(); await open();
+ mount(); await open(); show("opencode");
fireEvent.click(screen.getByTitle("opencode/test-free"));
await waitFor(() => expect(posts[0].provider).toBe("opencode"));
expect(posts[0].model).toBe("opencode/test-free");
@@ -275,7 +283,7 @@ test("all connected subscription accounts are selectable for a model", async ()
{ id: "work", label: "Work", connected: true }, { id: "personal", label: "Personal", connected: true },
{ id: "expired", label: "Expired", connected: false },
] }];
- mount(); await open();
+ mount(); await open(); show("openai-codex");
fireEvent.click(screen.getByRole("button", { name: "Account: ChatGPT / Codex subscription" }));
expect(screen.queryByRole("menuitemradio", { name: "Expired" })).toBeNull();
fireEvent.click(screen.getByRole("menuitemradio", { name: "Personal" }));
@@ -288,6 +296,7 @@ test("refresh reloads catalogs and reveals newly available models", async () =>
mount(); await open();
extraProviders = [provider("opencode", { runner: "opencode-cli", cli_installed: true })];
fireEvent.click(screen.getByRole("button", { name: "Refresh models" }));
+ fireEvent.click(await screen.findByTestId("agent-model-rail-opencode"));
fireEvent.click(await screen.findByRole("button", { name: /Show more models/ }));
await screen.findByTitle("opencode-small");
expect(catalogCalls).toBe(2);
@@ -296,6 +305,7 @@ test("refresh reloads catalogs and reveals newly available models", async () =>
test("local endpoints show only installed models, and search works by model id", async () => {
liveModels.ollama = [{ id: "qwen3:8b", label: "Qwen 3" }];
mount(); const input = await open();
+ fireEvent.click(await screen.findByTestId("agent-model-rail-ollama"));
await screen.findByTitle("qwen3:8b");
fireEvent.change(input, { target: { value: "qwen3:8b" } });
fireEvent.click(screen.getByTitle("qwen3:8b"));
@@ -305,9 +315,9 @@ test("local endpoints show only installed models, and search works by model id",
test("keyboard navigation moves through results and closes back to the trigger", async () => {
mount(); const input = await open();
fireEvent.keyDown(input, { key: "ArrowDown" });
- expect(document.activeElement).toBe(screen.getByTitle("gemini-small"));
+ expect(document.activeElement).toBe(screen.getByTitle("openai-small"));
fireEvent.keyDown(document.activeElement!, { key: "ArrowDown" });
- expect(document.activeElement).toBe(screen.getByTitle("gemini-large"));
+ expect(document.activeElement).toBe(screen.getByTitle("openai-large"));
fireEvent.keyDown(document.activeElement!, { key: "Escape" });
expect(document.activeElement).toBe(screen.getByRole("button", { name: "Model" }));
});
@@ -326,9 +336,9 @@ test("subscriptions precede OpenCode, which initially shows only explicit free m
{ id: "opencode/big-pickle", label: "Big Pickle" },
] }), provider("z-plan", { runner: "grok-cli", cli_installed: true })];
mount(); await open();
- const groups = screen.getAllByRole("group");
- expect(groups[0].getAttribute("aria-label")).toBe("Grok subscription");
- expect(groups[1].getAttribute("aria-label")).toBe("opencode");
+ const rail = screen.getAllByTestId(/^agent-model-rail-/).map((mark) => mark.getAttribute("aria-label"));
+ expect(rail.slice(0, 3)).toEqual(["Favorites", "Grok subscription", "opencode"]);
+ show("opencode");
expect(screen.getByTitle("opencode/test-free")).toBeTruthy();
expect(screen.getByTitle("opencode/big-pickle")).toBeTruthy();
expect(screen.queryByTitle("opencode/paid")).toBeNull();
@@ -341,8 +351,8 @@ test("subscriptions precede OpenCode, which initially shows only explicit free m
test("OpenRouter folds independently, searching finds hidden models, and clearing restores the fold", async () => {
extraProviders = [provider("openrouter")];
- mount(); const input = await open();
- const toggle = screen.getByRole("button", { name: "openrouter · API key" });
+ mount(); const input = await open(); show("openrouter");
+ const toggle = within(screen.getByRole("menu", { name: "Model" })).getByRole("button", { name: "openrouter · API key" });
expect(toggle.getAttribute("aria-expanded")).toBe("false");
expect(screen.queryByTitle("openrouter-small")).toBeNull();
fireEvent.click(toggle);
@@ -358,7 +368,7 @@ test("OpenRouter folds independently, searching finds hidden models, and clearin
test("hidden OpenCode models remain selectable through search and a reopened menu is compact", async () => {
extraProviders = [provider("opencode", { runner: "opencode-cli", cli_installed: true })];
- mount(); const input = await open();
+ mount(); const input = await open(); show("opencode");
fireEvent.click(screen.getByRole("button", { name: /Show more models/ }));
fireEvent.keyDown(input, { key: "Escape" });
const reopened = await open();
@@ -373,7 +383,7 @@ test.each([
["glm", "glm-cli"], ["deepseek-harness", "dsh-cli"],
] as const)("%s can use its CLI account without a published model list", async (id, runner) => {
extraProviders = [provider(id, { runner, cli_installed: true, curated_models: [], default_model: "", effort_levels: [], default_effort: "" })];
- mount(); await open();
+ mount(); await open(); show(id);
const group = screen.getByRole("group", { name: id });
fireEvent.click(within(group).getByRole("menuitemradio", { name: /Default model/ }));
await waitFor(() => expect(posts[0]).toEqual({ provider: id, model: "", effort: "", account_id: "" }));
diff --git a/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.tsx b/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.tsx
index 7925d5f1fe..c7ce751921 100644
--- a/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.tsx
+++ b/jarvis/ui/web/frontend/src/components/society/chat/AgentModelPicker.tsx
@@ -1,8 +1,9 @@
import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent } from "react";
import { createPortal } from "react-dom";
-import { Check, ChevronDown, ChevronRight, Loader2, RefreshCw, Search, Users } from "lucide-react";
+import { Check, ChevronDown, ChevronRight, Loader2, RefreshCw, Search, Star, Users } from "lucide-react";
import { ProviderLogo } from "@/components/providers/ProviderLogo";
-import { effortLabel } from "@/components/agentchat/AgentComposer";
+import { brainValue, effortLabel } from "@/components/agentchat/AgentComposer";
+import { RailButton, useFavoriteModels } from "@/components/agentchat/ComposerBrainPicker";
import { useAgentChat } from "@/components/agentchat/AgentChatStoreContext";
import { useT } from "@/i18n";
import type { CuratedModel } from "@/lib/agentChatApi";
@@ -17,7 +18,13 @@ import { useModelMenuData } from "./useModelMenuData";
type Submenu = { provider: string; model?: CuratedModel; anchor: DOMRect };
const menuRow = "flex w-full items-center gap-2 px-3 py-1.5 text-left text-[13px] text-popover-foreground hover:bg-secondary focus-visible:bg-secondary focus-visible:outline-none disabled:opacity-45";
-/** A searchable provider catalog, with account and effort submenus. */
+const FAVORITES = "favorites";
+
+/**
+ * A searchable provider catalog, with account and effort submenus. A rail on
+ * the left picks which provider's models are listed (plus a starred tab);
+ * typing searches every provider at once.
+ */
export function AgentModelPicker({ agent, busy, onSavingChange }: {
agent: SocietyAgent; busy: boolean; onSavingChange: (saving: boolean) => void;
}) {
@@ -31,6 +38,9 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
const [accounts, setAccounts] = useState<Record<string, string>>({});
const [submenu, setSubmenu] = useState<Submenu | null>(null);
const [expanded, setExpanded] = useState<Record<string, boolean>>({});
+ // Rows are prepared while closed, so start on the agent's own provider.
+ const [section, setSection] = useState(agent.provider);
+ const [favorites, toggleFavorite] = useFavoriteModels();
const [position, setPosition] = useState<CSSProperties>({});
const trigger = useRef<HTMLButtonElement>(null);
const panel = useRef<HTMLDivElement>(null);
@@ -64,6 +74,19 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
modelGroupOrder(a.seat) - modelGroupOrder(b.seat) || a.title.localeCompare(b.title));
}, [seats, search, titleKey]);
const sideSeat = seats.find((seat) => seat.provider.id === submenu?.provider);
+ const browsing = !search.trim();
+ const activeSection = section === FAVORITES || groups.some((group) => group.seat.provider.id === section) ? section : groups[0]?.seat.provider.id ?? "";
+ const showFavorites = browsing && activeSection === FAVORITES;
+ const shownGroups = browsing ? groups.filter((group) => group.seat.provider.id === activeSection) : groups;
+ const railSeats = groups.map((group) => group.seat);
+ const starred = useMemo(() => favorites.flatMap((value) => {
+ for (const seat of seats) {
+ const model = seat.provider.curated_models.find((entry) => brainValue(seat.provider.id, entry.id) === value);
+ if (model) return [{ seat, model }];
+ }
+ return [];
+ }), [favorites, seats]);
+ const pickSection = (id: string) => { setSubmenu(null); setSection(id); input.current?.focus({ preventScroll: true }); };
function close() {
if (inFlight.current) return;
@@ -88,7 +111,7 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
const rect = trigger.current?.getBoundingClientRect();
if (!rect) return;
const above = rect.top > window.innerHeight - rect.bottom;
- const width = Math.min(320, window.innerWidth - 16);
+ const width = Math.min(380, window.innerWidth - 16);
const next: CSSProperties = { position: "fixed", width, left: Math.max(8, Math.min(rect.left, window.innerWidth - width - 8)),
maxHeight: Math.min(560, Math.max(120, (above ? rect.top : window.innerHeight - rect.bottom) - 16)),
...(above ? { bottom: window.innerHeight - rect.top + 6 } : { top: rect.bottom + 6 }),
@@ -180,10 +203,48 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
top: Math.max(8, Math.min(submenu.anchor.top, window.innerHeight - 300)), maxHeight: Math.min(290, window.innerHeight - 16),
} : {};
+ /** One model row; `owner` adds the provider's name under it (the starred tab mixes providers). */
+ const row = (seat: BrainSeat, model: CuratedModel, owner = false) => {
+ const selected = agent.provider === seat.provider.id && agent.model === model.id && (agent.accountId ?? "") === currentAccount(seat);
+ const effort = preferredEffort(seat, model);
+ const value = brainValue(seat.provider.id, model.id);
+ const isFavorite = favorites.includes(value);
+ const starLabel = t(isFavorite ? "agent_chat.favorite_remove" : "agent_chat.favorite_add");
+ return <div key={value} className={cn("group flex items-center", selected && "bg-secondary/70")}>
+ <button type="button" role="menuitemradio" aria-checked={selected} disabled={busy || saving} data-menu-choice
+ onKeyDown={(event) => {
+ if (event.key === "ArrowRight" && effortsFor(seat, model.id).length) {
+ event.preventDefault(); event.stopPropagation();
+ setSubmenu({ provider: seat.provider.id, model, anchor: event.currentTarget.getBoundingClientRect() });
+ }
+ }}
+ onClick={() => void save(seat, model)} className={cn(menuRow, "min-w-0 flex-1")} title={model.id}>
+ <span className="flex min-w-0 flex-col">
+ <span className="min-w-0 truncate">{model.label || model.id}<span className="ml-1 text-muted-foreground">{effort ? effortLabel(effort, t) : ""}</span></span>
+ {owner ? <span className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+ <ProviderLogo providerId={seat.provider.id} label={seat.provider.label} size="sm" /><span className="truncate">{providerTitle(seat, t)}</span>
+ </span> : null}
+ </span>
+ {selected ? <Check className="ml-auto h-3.5 w-3.5 shrink-0" aria-hidden /> : null}
+ </button>
+ <button type="button" aria-label={starLabel} aria-pressed={isFavorite} title={starLabel} data-testid="agent-model-star"
+ onClick={() => toggleFavorite(value)}
+ className={cn("rounded p-1.5 hover:bg-secondary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
+ isFavorite ? "text-warning" : "text-faint-foreground hover:text-foreground")}>
+ <Star className={cn("h-3 w-3", isFavorite && "fill-current")} aria-hidden />
+ </button>
+ {effortsFor(seat, model.id).length ? <button type="button" disabled={busy || saving} aria-label={`${t("society.chat.effort")}: ${model.label}`} aria-haspopup="menu"
+ onClick={(event) => setSubmenu({ provider: seat.provider.id, model, anchor: event.currentTarget.getBoundingClientRect() })}
+ className="mr-1 rounded p-1.5 text-muted-foreground opacity-60 hover:bg-secondary hover:opacity-100 focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring">
+ <ChevronRight className="h-3 w-3" aria-hidden />
+ </button> : null}
+ </div>;
+ };
+
return <>
<button ref={trigger} data-chat-model-trigger type="button" aria-label={t("society.chat.model")} aria-haspopup="menu" aria-expanded={open} aria-controls={open ? menuId : undefined}
disabled={busy || saving} title={busy ? t("society.chat.model_busy") : t("society.chat.model")}
- onClick={() => { if (open) close(); else { setSearch(""); setAccounts({}); setExpanded({}); setError(null); setOpen(true); } }}
+ onClick={() => { if (open) close(); else { setSearch(""); setAccounts({}); setExpanded({}); setError(null); setSection(agent.provider || ""); setOpen(true); } }}
className="flex max-w-full items-center gap-1.5 rounded-full px-2 py-1 text-xs text-muted-foreground hover:bg-secondary hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50">
{agent.provider ? <ProviderLogo providerId={agent.provider} label={agent.providerLabel} size="sm" /> : null}
<span className="truncate">{agent.model || agent.providerLabel || t("society.chat.model_default")}</span>
@@ -191,8 +252,20 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
<ChevronDown className="h-3 w-3 shrink-0" aria-hidden />
</button>
{host && (open || !loading) ? createPortal(<>
- <div ref={panel} id={menuId} aria-hidden={!open} style={{ ...position, visibility: open ? "visible" : "hidden", contain: "layout paint style" }} className="fixed z-[80] flex flex-col overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-float"
+ <div ref={panel} id={menuId} aria-hidden={!open} style={{ ...position, visibility: open ? "visible" : "hidden", contain: "layout paint style" }} className="fixed z-[80] flex overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-float"
onKeyDown={(event) => moveFocus(event, panel.current)}>
+ {!loading && !failed && railSeats.length ? <div role="toolbar" aria-orientation="vertical" aria-label={t("agent_chat.pick_provider")} data-testid="agent-model-rail"
+ className="scrollbar-jarvis flex w-12 shrink-0 flex-col gap-1 overflow-y-auto border-r border-border bg-sheen/[0.03] p-1.5">
+ <RailButton active={showFavorites} label={t("agent_chat.favorites")} onSelect={() => pickSection(FAVORITES)} testId="agent-model-rail-favorites">
+ <Star className="h-4 w-4 fill-current" aria-hidden />
+ </RailButton>
+ <span className="mx-1 my-0.5 border-b border-border" aria-hidden />
+ {railSeats.map((seat) => <RailButton key={seat.provider.id} active={browsing && activeSection === seat.provider.id} label={providerTitle(seat, t)}
+ onSelect={() => pickSection(seat.provider.id)} testId={`agent-model-rail-${seat.provider.id}`}>
+ <span className="inline-flex scale-[1.3]"><ProviderLogo providerId={seat.provider.id} label={seat.provider.label} size="sm" /></span>
+ </RailButton>)}
+ </div> : null}
+ <div className="flex min-h-0 min-w-0 flex-1 flex-col">
<div className="flex shrink-0 items-center gap-2 border-b border-border px-3 py-2.5">
<Search className="h-3.5 w-3.5 text-muted-foreground" aria-hidden />
<input ref={input} aria-label={t("society.chat.model_search")} placeholder={t("society.chat.model_search")}
@@ -204,7 +277,10 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
{loading ? <p role="status" className="px-3 py-3 text-xs text-muted-foreground">{t("society.create.catalog_loading")}</p> : null}
{failed ? <p role="alert" className="px-3 py-3 text-xs text-destructive">{t("society.chat.model_load_failed")}</p> : null}
{!loading && !failed && groups.length === 0 ? <p className="px-3 py-3 text-xs text-muted-foreground">{t(refreshing ? "society.chat.models_loading" : "society.chat.model_no_matches")}</p> : null}
- {!loading && !failed ? groups.map(({ seat, title, models, older }) => {
+ {!loading && !failed && showFavorites ? (starred.length
+ ? starred.map(({ seat, model }) => row(seat, model, true))
+ : <p className="px-3 py-3 text-xs text-muted-foreground">{t("agent_chat.favorites_empty")}</p>) : null}
+ {!loading && !failed && !showFavorites ? shownGroups.map(({ seat, title, models, older }) => {
const isExpanded = expanded[seat.provider.id] ?? false;
const shown = visibleModels(seat, models, isExpanded, search);
const foldable = collapsibleModels(seat) && !search.trim();
@@ -216,28 +292,7 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
const lineup = folded.length ? shown.filter((model) => !older.has(model)) : shown;
const olderOpen = expanded[olderKey] ?? folded.some((model) => agent.provider === seat.provider.id && agent.model === model.id);
const toggleOlder = () => { setSubmenu(null); setExpanded((previous) => ({ ...previous, [olderKey]: !olderOpen })); };
- const row = (model: CuratedModel) => {
- const selected = agent.provider === seat.provider.id && agent.model === model.id && (agent.accountId ?? "") === currentAccount(seat);
- const effort = preferredEffort(seat, model);
- return <div key={model.id} className={cn("group flex items-center", selected && "bg-secondary/70")}>
- <button type="button" role="menuitemradio" aria-checked={selected} disabled={busy || saving} data-menu-choice
- onKeyDown={(event) => {
- if (event.key === "ArrowRight" && effortsFor(seat, model.id).length) {
- event.preventDefault(); event.stopPropagation();
- setSubmenu({ provider: seat.provider.id, model, anchor: event.currentTarget.getBoundingClientRect() });
- }
- }}
- onClick={() => void save(seat, model)} className={cn(menuRow, "min-w-0 flex-1")} title={model.id}>
- <span className="min-w-0 truncate">{model.label || model.id}<span className="ml-1 text-muted-foreground">{effort ? effortLabel(effort, t) : ""}</span></span>
- {selected ? <Check className="ml-auto h-3.5 w-3.5 shrink-0" aria-hidden /> : null}
- </button>
- {effortsFor(seat, model.id).length ? <button type="button" disabled={busy || saving} aria-label={`${t("society.chat.effort")}: ${model.label}`} aria-haspopup="menu"
- onClick={(event) => setSubmenu({ provider: seat.provider.id, model, anchor: event.currentTarget.getBoundingClientRect() })}
- className="mr-1 rounded p-1.5 text-muted-foreground opacity-60 hover:bg-secondary hover:opacity-100 focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring">
- <ChevronRight className="h-3 w-3" aria-hidden />
- </button> : null}
- </div>;
- };
+ const toRow = (model: CuratedModel) => row(seat, model);
return <div key={seat.provider.id} role="group" aria-label={title}>
<div className="sticky top-0 z-10 flex items-center gap-1 bg-popover px-3 pb-1 pt-3">
{foldable && isRouter ? <button type="button" data-menu-choice disabled={busy || saving}
@@ -254,14 +309,14 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
</button> : null}
</div>
<div id={choicesId}>
- {lineup.map(row)}
+ {lineup.map(toRow)}
{folded.length ? <button type="button" data-menu-choice disabled={busy || saving} aria-expanded={olderOpen} onClick={toggleOlder}
className={cn(menuRow, "text-muted-foreground")}>
<span className="min-w-0 flex-1 truncate">{t("agent_chat.older_models")}</span>
<span className="text-xs">{folded.length}</span>
<ChevronRight className={cn("h-3 w-3 shrink-0 transition-transform", olderOpen && "rotate-90")} aria-hidden />
</button> : null}
- {olderOpen ? folded.map(row) : null}
+ {olderOpen ? folded.map(toRow) : null}
</div>
{foldable && !isRouter && (isExpanded || shown.length < models.length) ? <button type="button" data-menu-choice
disabled={busy || saving} aria-expanded={isExpanded} aria-controls={choicesId} onClick={toggle}
@@ -278,6 +333,7 @@ export function AgentModelPicker({ agent, busy, onSavingChange }: {
<RefreshCw className={cn("h-3.5 w-3.5", refreshing && "animate-spin")} aria-hidden />{t("society.chat.model_refresh")}
</button>
</div>
+ </div>
</div>
{open && submenu && sideSeat ? <div ref={sidePanel} style={sideStyle} role="menu" aria-label={t(submenu.model ? "society.chat.effort" : "society.chat.model_account")}
className="z-[81] overflow-y-auto rounded-md border border-border bg-popover py-1 shadow-float" onKeyDown={(event) => moveFocus(event, sidePanel.current)}>