Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

chore(agents): group the agent model catalog and add open-weight models (#6971)

Wolf Mermelstein8b74442e635e
diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsx
index f456a6e7b0..bf1bb5b6a3 100644
--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx
@@ -1,8 +1,5 @@
import { ModelCatalogMenu } from '@core/component/AI/component/input/ModelCatalogPicker';
-import {
- ModelIcon,
- ProviderIcon,
-} from '@core/component/AI/component/ProviderIcon';
+import { ProviderIcon } from '@core/component/AI/component/ProviderIcon';
import { modelLabel } from '@core/component/AI/constant/model-label';
import CaretDownIcon from '@phosphor/caret-down.svg';
import CaretRightIcon from '@phosphor/caret-right.svg';
@@ -97,41 +94,21 @@ export function AgentPicker(props: {
<div class="min-h-0 overflow-y-auto overscroll-contain">
<Show when={macro()}>
{(agent) => (
- <Dropdown.Group>
- <Dropdown.GroupLabel>Models</Dropdown.GroupLabel>
- <For each={macroCatalog.models()}>
- {(option) => (
- <Dropdown.Item
- closeOnSelect
- class="min-w-0 gap-2"
- disabled={Boolean(agent().unavailableReason)}
- textValue={modelLabel(option.id, option.name)}
- title={modelLabel(option.id, option.name)}
- onSelect={() => choose(agent(), option.id)}
- >
- <span class="flex size-5 shrink-0 items-center justify-center">
- <ModelIcon model={option.id} />
- </span>
- <span class="min-w-0 flex-1 truncate">
- {modelLabel(option.id, option.name)}
- </span>
- <Show
- when={
- props.selected?.id === agent().id &&
- model() === option.id
- }
- >
- <CheckIcon class="size-3.5 shrink-0 text-accent" />
- </Show>
- </Dropdown.Item>
- )}
- </For>
- <Show when={macroCatalog.models().length === 0}>
- <div role="status" class="px-3 py-2 text-xs text-ink-muted">
- {macroCatalog.message()}
- </div>
- </Show>
- </Dropdown.Group>
+ <ModelCatalogMenu
+ value={
+ props.selected?.id === agent().id ? (model() ?? null) : null
+ }
+ recommendedId={macroCatalog.currentModel()}
+ disabled={Boolean(agent().unavailableReason)}
+ options={macroCatalog.models().map((option) => ({
+ id: option.id,
+ label: modelLabel(option.id, option.name),
+ description: option.description ?? undefined,
+ group: option.group ?? undefined,
+ }))}
+ onSelect={(id) => choose(agent(), id)}
+ emptyMessage={macroCatalog.message()}
+ />
)}
</Show>
<For each={['agent', 'coder'] as const}>
diff --git a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
index e20d9e95e1..a068d56bb1 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -12,6 +12,7 @@ import {
import type { JSX } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { buildAgentRoster, type PersistedAgentLike } from '../core/roster';
+import { AgentPicker } from './AgentPicker';
import { NewChatPage } from './NewChatPage';
const mocks = vi.hoisted(() => ({
@@ -99,6 +100,18 @@ vi.mock('@queries/agents/models', () => ({
id: 'anthropic/claude-sonnet-5',
name: 'anthropic/claude-sonnet-5',
},
+ { id: 'anthropic/claude-opus-5', name: 'Claude Opus 5' },
+ { id: 'openai/gpt-5.6', name: 'GPT-5.6' },
+ { id: 'google/gemini-3.8-flash', name: 'Gemini 3.8 Flash' },
+ { id: 'fireworks/kimi-k3', name: 'Kimi K3' },
+ { id: 'fireworks/glm-5p3', name: 'GLM 5.3' },
+ {
+ id: 'fireworks/glm-5p3-flash',
+ name: 'GLM 5.3 Flash',
+ },
+ { id: 'fireworks/qwen3p8-max', name: 'Qwen 3.8 Max' },
+ { id: 'fireworks/minimax-m3', name: 'MiniMax M3' },
+ { id: 'cerebras/gpt-oss-120b', name: 'GPT OSS 120B' },
],
};
},
@@ -186,7 +199,15 @@ async function hoverAgent(name: string) {
screen
.getByRole('menuitem', { name: new RegExp(`^${name}`) })
.dispatchEvent(event);
- const search = await screen.findByRole('textbox', { name: 'Search models' });
+ await waitFor(() =>
+ expect(
+ screen.getAllByRole('textbox', { name: 'Search models' })
+ ).toHaveLength(2)
+ );
+ const search = screen
+ .getAllByRole('textbox', { name: 'Search models' })
+ .at(-1);
+ if (!search) throw new Error('Agent model search did not open');
return within(search.closest('[role="menu"]') as HTMLElement);
}
@@ -416,7 +437,11 @@ describe('agent-led new conversation', () => {
fireEvent.keyDown(screen.getByRole('menuitem', { name: /^Cursor/ }), {
key: 'ArrowRight',
});
- await screen.findByRole('textbox', { name: 'Search models' });
+ await waitFor(() =>
+ expect(
+ screen.getAllByRole('textbox', { name: 'Search models' })
+ ).toHaveLength(2)
+ );
expect(
screen
.getByRole('menuitem', { name: /GPT-5/ })
@@ -446,19 +471,19 @@ describe('agent-led new conversation', () => {
it('clears a temporary model choice when selecting another agent', async () => {
page();
openAgents();
- fireEvent.keyDown(screen.getByRole('menuitem', { name: /Sonnet 4/ }), {
- key: 'Enter',
- });
+ const model = screen.getByTitle('Sonnet 5');
+ model.focus();
+ fireEvent.keyDown(model, { key: 'Enter' });
await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
expect(screen.getByRole('button', { name: 'Agent' }).textContent).toContain(
- 'Sonnet 4'
+ 'Sonnet 5'
);
await selectAgent(/Cursor/);
expect(screen.getByRole('button', { name: 'Agent' }).textContent).toContain(
'Cursor default'
);
});
- it('groups by kind and selects direct models through Macro with readable names and icons', async () => {
+ it('groups the Macro catalog and selects direct models with readable names and icons', async () => {
const send = page(true, [
{
bot: { id: 'saved-agent', name: 'Reviewer', handle: 'reviewer' },
@@ -468,7 +493,7 @@ describe('agent-led new conversation', () => {
]);
await selectAgent(/Cursor/);
openAgents();
- const modelsGroup = screen.getByRole('group', { name: 'Models' });
+ const modelsGroup = screen.getByRole('group', { name: 'Recommended' });
const agentsGroup = screen.getByRole('group', { name: 'Agents' });
const codingGroup = screen.getByRole('group', { name: 'Coding agents' });
expect(
@@ -480,19 +505,26 @@ describe('agent-led new conversation', () => {
Node.DOCUMENT_POSITION_FOLLOWING
).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
const coding = within(codingGroup);
- const models = within(modelsGroup);
+ const search = screen.getByRole('textbox', { name: 'Search models' });
+ expect(screen.getByRole('menuitem', { name: /More models/ })).toBeTruthy();
+ fireEvent.input(search, { target: { value: 'GLM' } });
+ expect(screen.getByTitle('GLM 5.3')).toBeTruthy();
+ expect(screen.getByTitle('GLM 5.3 Flash')).toBeTruthy();
+ fireEvent.input(search, { target: { value: '' } });
expect(coding.getByRole('menuitem', { name: /Cursor/ })).toBeTruthy();
expect(coding.queryByRole('menuitem', { name: /Macro/ })).toBeNull();
expect(screen.queryByRole('menuitem', { name: /Macro/ })).toBeNull();
+ const models = within(screen.getByRole('group', { name: 'Recommended' }));
expect(
models.queryByRole('menuitem', { name: /Cursor default|GPT-5/ })
).toBeNull();
expect(models.queryByRole('menuitem', { name: /Fable 5.1/ })).toBeNull();
- const sonnet = models.getByRole('menuitem', { name: 'Sonnet 5' });
+ const sonnet = models.getByTitle('Sonnet 5');
expect(
sonnet.querySelector('[data-ai-provider="anthropic"] svg')
).toBeTruthy();
expect(screen.queryByText('anthropic/claude-sonnet-5')).toBeNull();
+ sonnet.focus();
fireEvent.keyDown(sonnet, { key: 'Enter' });
await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
expect(mocks.rememberInmemModel).toHaveBeenCalledWith(
@@ -523,6 +555,49 @@ describe('agent-led new conversation', () => {
modelOverride: 'anthropic/claude-sonnet-5',
});
});
+ it('keeps unavailable Macro models disabled throughout the catalog', async () => {
+ const roster = buildAgentRoster({
+ agents: [],
+ runtimes: [],
+ cursorConnected: true,
+ cursorNeedsConnection: false,
+ });
+ const macro = {
+ ...roster[0],
+ unavailableReason: 'Temporarily unavailable',
+ };
+ const onSelect = vi.fn();
+ render(() => (
+ <AgentPicker
+ agents={[macro]}
+ selected={macro}
+ loading={false}
+ onSelect={onSelect}
+ onConnect={vi.fn()}
+ onCreate={vi.fn()}
+ />
+ ));
+ openAgents();
+ const sonnet = screen.getByTitle('Sonnet 5');
+ expect(sonnet.getAttribute('aria-disabled')).toBe('true');
+ fireEvent.click(sonnet);
+ fireEvent.keyDown(sonnet, { key: 'Enter' });
+
+ const search = screen.getByRole('textbox', { name: 'Search models' });
+ fireEvent.input(search, { target: { value: 'GLM' } });
+ const flash = screen.getByTitle('GLM 5.3 Flash');
+ expect(flash.getAttribute('aria-disabled')).toBe('true');
+ fireEvent.click(flash);
+ fireEvent.input(search, { target: { value: '' } });
+
+ const more = screen.getByRole('menuitem', { name: /More models/ });
+ more.focus();
+ fireEvent.keyDown(more, { key: 'ArrowRight' });
+ const extra = await screen.findByTitle('GLM 5.3 Flash');
+ expect(extra.getAttribute('aria-disabled')).toBe('true');
+ fireEvent.click(extra);
+ expect(onSelect).not.toHaveBeenCalled();
+ });
it('restores a preferred Macro model on a fresh composer', () => {
mocks.preferredInmemModel = 'anthropic/claude-sonnet-5';
page();
diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx
index 0e3f6f651a..61cbdc9b14 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.test.tsx
@@ -99,8 +99,8 @@ vi.mock('@ui', () => {
const OPTIONS: CatalogModelOption[] = [
{ id: 'auto', label: 'Auto', group: 'Auto' },
{ id: 'grok', label: 'Cursor Grok 4.6 High Fast' },
- { id: 'opus', label: 'Claude Opus 5 High' },
- { id: 'sonnet', label: 'Claude Sonnet 5 High' },
+ { id: 'opus', label: 'Opus 5 High' },
+ { id: 'sonnet', label: 'Sonnet 5 High' },
{ id: 'sol', label: 'GPT-5.6 Sol High' },
{ id: 'gemini', label: 'Gemini 3.8 Flash High' },
];
@@ -168,10 +168,10 @@ describe('ModelCatalogPicker more models at phone width', () => {
fireEvent.click(screen.getByText('More models'));
expect(screen.getByText('Gemini 3.8 Flash High')).toBeTruthy();
- expect(screen.queryByText('Claude Opus 5 High')).toBeNull();
+ expect(screen.queryByText('Opus 5 High')).toBeNull();
fireEvent.click(screen.getByRole('menuitem', { name: 'Recommended' }));
- expect(screen.getByText('Claude Opus 5 High')).toBeTruthy();
+ expect(screen.getByText('Opus 5 High')).toBeTruthy();
expect(screen.queryByText('Gemini 3.8 Flash High')).toBeNull();
});
});
diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx
index 9c22873cc7..60ecb714f7 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx
@@ -18,6 +18,8 @@ import {
type ModelCatalogPickerProps = {
value: string | null;
+ /** Model to feature first without marking it selected. */
+ recommendedId?: string | null;
options: CatalogModelOption[];
onSelect: (id: string) => void;
disabled?: boolean;
@@ -36,6 +38,7 @@ type ModelCatalogPickerProps = {
function ModelRow(props: {
option: CatalogModelOption;
selected: boolean;
+ disabled?: boolean;
/** Trailing muted text, e.g. the family a search hit belongs to. */
hint?: string;
onSelect: () => void;
@@ -43,6 +46,7 @@ function ModelRow(props: {
return (
<Dropdown.Item
closeOnSelect
+ disabled={props.disabled}
class={cn('h-8 gap-2', props.selected && 'bg-ink/5 text-ink font-medium')}
title={props.option.description ?? props.option.label}
onSelect={props.onSelect}
@@ -63,6 +67,7 @@ function ModelRow(props: {
function FamilyList(props: {
families: ModelFamily[];
value: string | null;
+ disabled?: boolean;
onSelect: (id: string) => void;
}) {
return (
@@ -77,6 +82,7 @@ function FamilyList(props: {
<ModelRow
option={option}
selected={option.id === props.value}
+ disabled={props.disabled}
onSelect={() => props.onSelect(option.id)}
/>
)}
@@ -143,7 +149,9 @@ export function ModelCatalogPicker(props: ModelCatalogPickerProps) {
>
<ModelCatalogMenu
value={props.value}
+ recommendedId={props.recommendedId}
options={props.options}
+ disabled={props.disabled || props.pending}
onSelect={props.onSelect}
emptyMessage={props.emptyMessage}
searchPlaceholder={props.searchPlaceholder}
@@ -163,8 +171,10 @@ export function ModelCatalogMenu(
props: Pick<
ModelCatalogPickerProps,
| 'value'
+ | 'recommendedId'
| 'options'
| 'onSelect'
+ | 'disabled'
| 'emptyMessage'
| 'searchPlaceholder'
| 'children'
@@ -187,7 +197,10 @@ export function ModelCatalogMenu(
const catalog = createMemo(() =>
props.options.length <= MAX_RECOMMENDED_MODELS
? { recommended: props.options, families: [] }
- : buildModelCatalog(props.options, props.value ?? undefined)
+ : buildModelCatalog(
+ props.options,
+ props.value ?? props.recommendedId ?? undefined
+ )
);
const extraFamilies = createMemo(() => moreModelFamilies(catalog()));
const extraCount = createMemo(() =>
@@ -247,6 +260,7 @@ export function ModelCatalogMenu(
<FamilyList
families={extraFamilies()}
value={props.value}
+ disabled={props.disabled}
onSelect={props.onSelect}
/>
</Dropdown.Group>
@@ -261,6 +275,7 @@ export function ModelCatalogMenu(
option={option}
hint={modelFamilyHint(option)}
selected={option.id === props.value}
+ disabled={props.disabled}
onSelect={() => props.onSelect(option.id)}
/>
)}
@@ -307,6 +322,7 @@ export function ModelCatalogMenu(
<FamilyList
families={extraFamilies()}
value={props.value}
+ disabled={props.disabled}
onSelect={props.onSelect}
/>
</Dropdown.Group>
@@ -330,6 +346,7 @@ export function ModelCatalogMenu(
option={option}
hint={modelFamilyHint(option)}
selected={option.id === props.value}
+ disabled={props.disabled}
onSelect={() => props.onSelect(option.id)}
/>
)}
diff --git a/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts b/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts
index 4e4083f320..9b7da9ef13 100644
--- a/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts
+++ b/apps/web/src/lib/core/component/AI/component/input/modelCatalog.ts
@@ -29,11 +29,12 @@ export type ModelCatalog = {
const RECOMMENDED_PREFIXES = [
'Auto',
'Cursor Grok 4.6',
- 'Claude Opus 5',
- 'Claude Sonnet 5',
+ 'Opus 5',
+ 'Sonnet 5',
'GPT-5.6 Sol',
'Gemini 3.8 Flash',
'Codex',
+ 'GLM 5.3',
'Kimi K3',
] as const;
diff --git a/apps/web/src/lib/core/component/AI/constant/model-label.test.ts b/apps/web/src/lib/core/component/AI/constant/model-label.test.ts
index 61f2178f89..11ff9db742 100644
--- a/apps/web/src/lib/core/component/AI/constant/model-label.test.ts
+++ b/apps/web/src/lib/core/component/AI/constant/model-label.test.ts
@@ -13,6 +13,14 @@ describe('modelLabel', () => {
'DeepSeek V4 Pro'
);
expect(modelLabel('fireworks/muse-glimmer-30b')).toBe('Muse Glimmer');
+ expect(modelLabel('fireworks/glm-5p3')).toBe('GLM 5.3');
+ expect(modelLabel('fireworks/glm-5p3-flash')).toBe('GLM 5.3 Flash');
+ expect(modelLabel('fireworks/qwen3p8-max')).toBe('Qwen 3.8 Max');
+ expect(modelLabel('fireworks/minimax-m3')).toBe('MiniMax M3');
+ expect(modelLabel('cerebras/gpt-oss-120b')).toBe('GPT OSS 120B');
+ expect(modelLabel('fireworks/nemotron-lightning-3p5-30b-a3b')).toBe(
+ 'Nemotron Lightning 3.5 30B A3B'
+ );
expect(modelLabel('google/gemini-3.8-flash')).toBe('Gemini 3.8 Flash');
expect(modelLabel('gemini-3.8-flash')).toBe('Gemini 3.8 Flash');
});
diff --git a/apps/web/src/lib/core/component/AI/constant/model-label.ts b/apps/web/src/lib/core/component/AI/constant/model-label.ts
index bcf088d3b7..9e511acf5c 100644
--- a/apps/web/src/lib/core/component/AI/constant/model-label.ts
+++ b/apps/web/src/lib/core/component/AI/constant/model-label.ts
@@ -22,6 +22,12 @@ const HARNESS_PRETTYNAME: Record<string, string> = {
'kimi-k3': 'Kimi K3',
'deepseek-v4-pro-0813': 'DeepSeek V4 Pro',
'muse-glimmer-30b': 'Muse Glimmer',
+ 'glm-5p3': 'GLM 5.3',
+ 'glm-5p3-flash': 'GLM 5.3 Flash',
+ 'qwen3p8-max': 'Qwen 3.8 Max',
+ 'minimax-m3': 'MiniMax M3',
+ 'gpt-oss-120b': 'GPT OSS 120B',
+ 'nemotron-lightning-3p5-30b-a3b': 'Nemotron Lightning 3.5 30B A3B',
'gemini-3.8-flash': 'Gemini 3.8 Flash',
};
diff --git a/crates/agent_inmem/src/domain/models.rs b/crates/agent_inmem/src/domain/models.rs
index f5d4d54700..473199caf9 100644
--- a/crates/agent_inmem/src/domain/models.rs
+++ b/crates/agent_inmem/src/domain/models.rs
@@ -15,6 +15,15 @@ pub const ROUTED_MODELS: &[(&str, &str)] = &[
("fireworks/kimi-k3", "Kimi K3"),
("fireworks/deepseek-v4-pro-0813", "DeepSeek V4 Pro"),
("fireworks/muse-glimmer-30b", "Muse Glimmer"),
+ ("fireworks/glm-5p3", "GLM 5.3"),
+ ("fireworks/glm-5p3-flash", "GLM 5.3 Flash"),
+ ("fireworks/qwen3p8-max", "Qwen 3.8 Max"),
+ ("fireworks/minimax-m3", "MiniMax M3"),
+ ("cerebras/gpt-oss-120b", "GPT OSS 120B"),
+ (
+ "fireworks/nemotron-lightning-3p5-30b-a3b",
+ "Nemotron Lightning 3.5 30B A3B",
+ ),
("google/gemini-3.8-flash", "Gemini 3.8 Flash"),
];
diff --git a/crates/agent_inmem/src/domain/models/test.rs b/crates/agent_inmem/src/domain/models/test.rs
index 13612d961b..1828f17a85 100644
--- a/crates/agent_inmem/src/domain/models/test.rs
+++ b/crates/agent_inmem/src/domain/models/test.rs
@@ -23,6 +23,15 @@ fn routed_models_have_house_names() {
"DeepSeek V4 Pro"
);
assert_eq!(display_name("fireworks/muse-glimmer-30b"), "Muse Glimmer");
+ assert_eq!(display_name("fireworks/glm-5p3"), "GLM 5.3");
+ assert_eq!(display_name("fireworks/glm-5p3-flash"), "GLM 5.3 Flash");
+ assert_eq!(display_name("fireworks/qwen3p8-max"), "Qwen 3.8 Max");
+ assert_eq!(display_name("fireworks/minimax-m3"), "MiniMax M3");
+ assert_eq!(display_name("cerebras/gpt-oss-120b"), "GPT OSS 120B");
+ assert_eq!(
+ display_name("fireworks/nemotron-lightning-3p5-30b-a3b"),
+ "Nemotron Lightning 3.5 30B A3B"
+ );
assert_eq!(display_name("google/gemini-3.8-flash"), "Gemini 3.8 Flash");
assert_eq!(
display_name("anthropic/claude-sonnet-5"),
@@ -37,7 +46,7 @@ fn routed_models_use_known_providers() {
for (model, _) in ROUTED_MODELS {
let provider = model.split('/').next().expect("a provider segment");
assert!(
- matches!(provider, "fireworks" | "google"),
+ matches!(provider, "cerebras" | "fireworks" | "google"),
"unregistered provider in {model}"
);
}
diff --git a/crates/macro_db_client/migrations/20260925042500_seed_additional_fireworks_open_weight_pricing.sql b/crates/macro_db_client/migrations/20260925042500_seed_additional_fireworks_open_weight_pricing.sql
new file mode 100644
index 0000000000..137580b650
--- /dev/null
+++ b/crates/macro_db_client/migrations/20260925042500_seed_additional_fireworks_open_weight_pricing.sql
@@ -0,0 +1,11 @@
+-- Seed standard-tier Fireworks serverless prices (USD per million tokens)
+-- for the additional open-weight models advertised by the Macro agent.
+-- ON CONFLICT preserves prices managed at runtime through set_pricing.
+INSERT INTO ai_pricing (model, price_per_million_in, price_per_million_out) VALUES
+ ('glm-5p3', 1.40, 4.40),
+ ('glm-5p3-flash', 0.15, 0.50),
+ ('qwen3p8-max', 2.00, 6.00),
+ ('minimax-m3', 0.30, 1.20),
+ ('nemotron-lightning-3p5-30b-a3b', 0.05, 0.20)
+ON CONFLICT (model) DO NOTHING;
+-- Add migration script here
diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.md
index abf0fbc48a..f89854bc01 100644
--- a/docs/AGENT_GUIDE/ai-chat.md
+++ b/docs/AGENT_GUIDE/ai-chat.md
@@ -65,19 +65,23 @@ permission failures should display a failed tool call without a successful resul
Direct model selections show only the model name and provider icon in the input.
Saved and coding agents show their identity beside the current model. There is
no Chat/Code switch or separate model button.
-- The agent dropdown includes every saved agent regardless of runtime, plus Cursor,
- grouped in **Models**, **Agents**, and **Coding agents** sections. **Models** lists
- Macro’s available models with readable names (for example, **Sonnet 5**) and
- provider or model icons aligned with the agent icons. The in-memory catalog
- offers the closed Anthropic and OpenAI chat models, Fireworks-hosted
- **Kimi K3**, **DeepSeek V4 Pro**, and **Muse Glimmer**, and Google's
- **Gemini 3.8 Flash**; older Sonnet and Opus versions are not offered.
+- The agent dropdown includes every saved agent regardless of runtime, plus Cursor.
+ Macro's models use the same searchable catalog as running sessions: a short
+ **Recommended** list and a **More models** submenu grouped by model family,
+ followed by **Agents** and **Coding agents** sections. Models have readable
+ names (for example, **Sonnet 5**) and provider or model icons aligned with the
+ agent icons. The in-memory catalog offers the closed Anthropic and OpenAI chat
+ models; Kimi, DeepSeek, Muse, GLM, Qwen, MiniMax, GPT OSS, and Nemotron
+ open-weight models; and Google's **Gemini 3.8 Flash**. Older Sonnet and Opus
+ versions are not offered.
Selecting a model here selects
the default runtime and applies that model to the next send, retracting the repository drawer.
- A model chosen from that **Models** list is remembered in local storage as the
- default for Macro's in-memory agent until another Models entry is picked.
+ A model chosen from that catalog is remembered in local storage as the
+ default for Macro's in-memory agent until another model entry is picked.
The built-in Macro agent is the only agent excluded from these sections; its models remain available.
- Unavailable paired agents stay visible with a reason. Model discovery uses the
+ Unavailable paired agents stay visible with a reason.
+ If Macro is unavailable, its catalog stays searchable but
+ model choices are disabled in every list. Model discovery uses the
selected runtime, including Claude Cloud. Every coding agent opens the repository
drawer; chat agents hide it. Repository/branch overrides are currently applied
only to Cursor sessions by the create-session API.