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): put models first in the agent picker (#6635)

Wolf Mermelsteinb3fe17880bd2
diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsx
index c1d031276b..dafddb7122 100644
--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx
@@ -96,35 +96,6 @@ export function AgentPicker(props: {
>
<div class="flex min-h-0 max-h-[min(28rem,var(--kb-popper-content-available-height))] flex-col">
<div class="min-h-0 overflow-y-auto overscroll-contain">
- <For each={['coder', 'agent'] as const}>
- {(kind) => (
- <Show when={agents().some((agent) => agent.kind === kind)}>
- <Dropdown.Group>
- <Dropdown.GroupLabel>
- {kind === 'coder' ? 'Coding agents' : 'Agents'}
- </Dropdown.GroupLabel>
- <For each={agents().filter((agent) => agent.kind === kind)}>
- {(agent) => (
- <AgentPickerRow
- agent={agent}
- selected={agent.id === props.selected?.id}
- modelOverride={
- agent.id === props.selected?.id
- ? props.modelOverride
- : undefined
- }
- onSelect={(model) => choose(agent, model)}
- onConnect={() => {
- setOpen(false);
- props.onConnect(agent);
- }}
- />
- )}
- </For>
- </Dropdown.Group>
- </Show>
- )}
- </For>
<Show when={macro()}>
{(agent) => (
<Dropdown.Group>
@@ -169,6 +140,35 @@ export function AgentPicker(props: {
</Dropdown.Group>
)}
</Show>
+ <For each={['agent', 'coder'] as const}>
+ {(kind) => (
+ <Show when={agents().some((agent) => agent.kind === kind)}>
+ <Dropdown.Group>
+ <Dropdown.GroupLabel>
+ {kind === 'coder' ? 'Coding agents' : 'Agents'}
+ </Dropdown.GroupLabel>
+ <For each={agents().filter((agent) => agent.kind === kind)}>
+ {(agent) => (
+ <AgentPickerRow
+ agent={agent}
+ selected={agent.id === props.selected?.id}
+ modelOverride={
+ agent.id === props.selected?.id
+ ? props.modelOverride
+ : undefined
+ }
+ onSelect={(model) => choose(agent, model)}
+ onConnect={() => {
+ setOpen(false);
+ props.onConnect(agent);
+ }}
+ />
+ )}
+ </For>
+ </Dropdown.Group>
+ </Show>
+ )}
+ </For>
<Show when={props.loading}>
<div
role="status"
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 e7f848230f..5c7a5b986e 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -419,12 +419,28 @@ describe('agent-led new conversation', () => {
);
});
it('groups by kind and selects direct models through Macro with readable names and icons', async () => {
- const send = page();
+ const send = page(true, [
+ {
+ bot: { id: 'saved-agent', name: 'Reviewer', handle: 'reviewer' },
+ harness: 'in-memory',
+ default_model: 'saved-default',
+ },
+ ]);
await selectAgent(/Cursor/);
openAgents();
- const coding = within(screen.getByRole('group', { name: 'Coding agents' }));
- expect(screen.queryByRole('group', { name: 'Agents' })).toBeNull();
- const models = within(screen.getByRole('group', { name: 'Models' }));
+ const modelsGroup = screen.getByRole('group', { name: 'Models' });
+ const agentsGroup = screen.getByRole('group', { name: 'Agents' });
+ const codingGroup = screen.getByRole('group', { name: 'Coding agents' });
+ expect(
+ modelsGroup.compareDocumentPosition(agentsGroup) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
+ expect(
+ agentsGroup.compareDocumentPosition(codingGroup) &
+ Node.DOCUMENT_POSITION_FOLLOWING
+ ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
+ const coding = within(codingGroup);
+ const models = within(modelsGroup);
expect(coding.getByRole('menuitem', { name: /Cursor/ })).toBeTruthy();
expect(coding.queryByRole('menuitem', { name: /Macro/ })).toBeNull();
expect(screen.queryByRole('menuitem', { name: /Macro/ })).toBeNull();
diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.md
index 857723563c..4db8dd07e9 100644
--- a/docs/AGENT_GUIDE/ai-chat.md
+++ b/docs/AGENT_GUIDE/ai-chat.md
@@ -30,7 +30,7 @@
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 **Coding agents** and **Agents** sections. A **Models** section lists
+ grouped in **Models**, **Agents**, and **Coding agents** sections. **Models** lists
Macro’s available models with readable names (for example, **Sonnet 5**) and
provider icons aligned with the agent icons. The chat catalog offers Sonnet 5,
Opus 5, and Haiku 4.5; older Sonnet and Opus versions are not offered.