diff --git a/apps/web/src/features/agents-view/components/ModelSelector.tsx b/apps/web/src/features/agents-view/components/ModelSelector.tsx
index 4218194d7e5..d144d1828d9 100644
--- a/apps/web/src/features/agents-view/components/ModelSelector.tsx
+++ b/apps/web/src/features/agents-view/components/ModelSelector.tsx
@@ -4,6 +4,7 @@ import {
   type ModelRowProps,
 } from '@core/component/AI/component/input/ModelCatalogPicker';
 import { modelLabel } from '@core/component/AI/constant/model-label';
+import { cn } from '@ui';
 import type { Component, JSX } from 'solid-js';
 
 export type ModelChoice = {
@@ -21,6 +22,9 @@ export function ModelSelector(props: {
   disabled?: boolean;
   modelRow?: Component<ModelRowProps>;
   pending?: boolean;
+  /** Show only the model's logo, for phone composers. */
+  compact?: boolean;
+  triggerClass?: string;
   onSelect: (id: string) => void;
   onCloseAutoFocus?: (event: Event) => void;
   children?: JSX.Element;
@@ -38,7 +42,12 @@ export function ModelSelector(props: {
       }))}
       triggerLabel={props.label}
       placeholder={modelLabel(props.model)}
-      triggerClass="h-[33.75px] min-w-0 max-w-full gap-[5.625px] rounded-full border-0 bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder [&_svg]:size-[15px]"
+      compact={props.compact}
+      triggerClass={cn(
+        'h-[33.75px] min-w-0 max-w-full gap-[5.625px] rounded-full border-0 bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder [&_svg]:size-[15px]',
+        props.compact && 'size-[34px] shrink-0 justify-center p-0',
+        props.triggerClass
+      )}
       ariaLabel="Model"
       placement="top-end"
       disabled={props.disabled}
diff --git a/apps/web/src/features/agents-view/core/roster.test.ts b/apps/web/src/features/agents-view/core/roster.test.ts
index f3f3b788274..84e410c35a4 100644
--- a/apps/web/src/features/agents-view/core/roster.test.ts
+++ b/apps/web/src/features/agents-view/core/roster.test.ts
@@ -147,8 +147,9 @@ describe('rosterForAgentPicker and kindForBot', () => {
     ],
   });
 
-  it('includes every runtime and excludes only the built-in Macro identity', () => {
+  it('lists built-in Macro first once and every other runtime after it', () => {
     expect(rosterForAgentPicker(roster).map((a) => a.id)).toEqual([
+      MACRO_PERSONA_ID,
       CURSOR_BOT_ID,
       'bot-in-memory',
       'bot-cursor',
diff --git a/apps/web/src/features/agents-view/core/roster.ts b/apps/web/src/features/agents-view/core/roster.ts
index aee19ae97fe..ceb7e69dd98 100644
--- a/apps/web/src/features/agents-view/core/roster.ts
+++ b/apps/web/src/features/agents-view/core/roster.ts
@@ -206,14 +206,20 @@ export function buildAgentRoster(input: RosterInput): RosterAgent[] {
   ];
 }
 
-/** Every agent belongs in the picker; Macro is represented by model choices. */
+/** Every agent belongs in the picker, Macro first; its bot aliases would repeat it. */
 export function rosterForAgentPicker(
   roster: readonly RosterAgent[]
 ): RosterAgent[] {
-  return roster.filter(
-    (agent) =>
-      agent.id !== MACRO_PERSONA_ID && !isMacroAgentId(agent.botId ?? agent.id)
-  );
+  return roster
+    .filter(
+      (agent) =>
+        agent.id === MACRO_PERSONA_ID ||
+        !isMacroAgentId(agent.botId ?? agent.id)
+    )
+    .sort(
+      (a, b) =>
+        Number(b.id === MACRO_PERSONA_ID) - Number(a.id === MACRO_PERSONA_ID)
+    );
 }
 
 /**
diff --git a/apps/web/src/features/agents-view/tour.ts b/apps/web/src/features/agents-view/tour.ts
index acd99cf9228..ba3cca9c8e5 100644
--- a/apps/web/src/features/agents-view/tour.ts
+++ b/apps/web/src/features/agents-view/tour.ts
@@ -36,7 +36,7 @@ export const agentsTour = defineViewTour({
       entryLabel: 'Choose Chat or Code to pick an agent',
       title: 'Choose your agent and model',
       description:
-        'Open this picker to choose an agent for the current mode. In Chat, Macro’s models are listed here too; each agent’s submenu lets you choose a model for that conversation.',
+        'Choose the agent for the current mode here, Macro first. The model beside it uses the agent’s default; change it to use another model for your next message.',
     },
     {
       target: AGENTS_TOUR.agentList,
diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsx
index 9ad53015393..e5da93c272a 100644
--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx
@@ -1,9 +1,6 @@
-import { ModelCatalogMenu } from '@core/component/AI/component/input/ModelCatalogPicker';
-import { ModelIcon } from '@core/component/AI/component/ProviderIcon';
 import { modelLabel } from '@core/component/AI/constant/model-label';
 import { isTouchDevice } from '@core/mobile/isTouchDevice';
 import CaretDownIcon from '@icon/system/regular/caret-down.svg';
-import CaretRightIcon from '@icon/system/regular/caret-right.svg';
 import PlusIcon from '@icon/system/regular/plus.svg';
 import { buttonClasses, cn, Dropdown } from '@ui';
 import { tourTarget } from '@ui/components/Tour';
@@ -15,23 +12,25 @@ import type {
 } from '../../block-agent/state/session-config';
 import { AgentIcon } from '../components/AgentGlyph';
 import { AgentPickerIdentity } from '../components/AgentPickerIdentity';
+import { ModelSelector } from '../components/ModelSelector';
 import { agentPickerGroups } from '../core/agent-picker-groups';
-import { MACRO_PERSONA_ID, type RosterAgent } from '../core/roster';
+import type { RosterAgent } from '../core/roster';
 import { createComposerModels } from '../queries/composer-models';
 import { AGENTS_TOUR } from '../tour';
 import { MobileAgentPicker } from './MobileAgentPicker';
 
-/** Agent selection with a per-message model catalog in each submenu. */
+/** The agent to run, then a model control that overrides its default for one send. */
 export type AgentPickerProps = {
   agents: RosterAgent[];
   selected?: RosterAgent;
   modelOverride?: string;
   loading: boolean;
   triggerClass?: string;
-  /** Configuration forms also show the saved model name on mobile. */
+  /** Configuration forms also show the agent and model names on mobile. */
   showModelLabel?: boolean;
   effortLabel?: string;
   effortSelection?: EffortSelection;
+  /** An agent alone means its default model; `model` is the model control's override. */
   onSelect: (agent: RosterAgent, model?: string) => void;
   /** Supply only when the host can persist and apply effort selections. */
   onSelectEffort?: (
@@ -46,314 +45,171 @@ export type AgentPickerProps = {
 
 export function AgentPicker(props: AgentPickerProps) {
   return (
-    <Show when={isTouchDevice()} fallback={<DesktopAgentPicker {...props} />}>
-      <MobileAgentPicker {...props} />
-    </Show>
+    <div class="flex min-w-0 items-center gap-1">
+      <Show when={isTouchDevice()} fallback={<DesktopAgentPicker {...props} />}>
+        <MobileAgentPicker {...props} />
+      </Show>
+      <Show when={props.selected}>
+        {(agent) => <AgentModelOverride {...props} agent={agent()} />}
+      </Show>
+    </div>
+  );
+}
+
+/** The selected agent's harness models; a pick never changes the agent or its saved default. */
+function AgentModelOverride(props: AgentPickerProps & { agent: RosterAgent }) {
+  const catalog = createComposerModels(() => props.agent);
+  const model = () =>
+    props.modelOverride ?? props.agent.defaultModel ?? catalog.currentModel();
+  const label = () =>
+    [
+      modelLabel(
+        model(),
+        catalog.models().find((option) => option.id === model())?.name
+      ),
+      props.effortLabel,
+    ]
+      .filter(Boolean)
+      .join(' · ');
+  return (
+    <ModelSelector
+      model={model()}
+      label={label()}
+      compact={isTouchDevice() && !props.showModelLabel}
+      triggerClass={props.triggerClass}
+      options={catalog.models().map((option) => ({
+        id: option.id,
+        name: option.name,
+        description: option.description ?? undefined,
+        group: option.group ?? undefined,
+      }))}
+      disabled={Boolean(props.agent.unavailableReason)}
+      onCloseAutoFocus={props.onCloseAutoFocus}
+      onSelect={(id) => props.onSelect(props.agent, id)}
+      modelRow={
+        props.onSelectEffort
+          ? (row) => (
+              <AgentModelMenuItem
+                {...row}
+                harness={props.agent.harness}
+                effortValue={
+                  row.selected ? props.effortSelection?.value : undefined
+                }
+                onSelectEffort={(effort) =>
+                  props.onSelectEffort?.(props.agent, row.option.id, effort)
+                }
+              />
+            )
+          : undefined
+      }
+      emptyMessage={catalog.message()}
+    />
   );
 }
 
 function DesktopAgentPicker(props: AgentPickerProps) {
   const [open, setOpen] = createSignal(false);
-  const catalog = createComposerModels(() => props.selected);
-  const macro = () =>
-    props.agents.find((agent) => agent.id === MACRO_PERSONA_ID);
-  const macroCatalog = createComposerModels(macro);
   const groups = () => agentPickerGroups(props.agents);
-  const rawModel = () => props.selected?.id === MACRO_PERSONA_ID;
-  const model = () =>
-    props.modelOverride ??
-    props.selected?.defaultModel ??
-    catalog.currentModel();
-  const baseLabel = () =>
-    modelLabel(
-      model(),
-      catalog.models().find((option) => option.id === model())?.name
-    );
-  const label = () =>
-    [baseLabel(), props.effortLabel].filter(Boolean).join(' · ');
-  const choose = (agent: RosterAgent, model?: string) => {
-    props.onSelect(agent, model);
-    setOpen(false);
-  };
-  const chooseEffort = (
-    agent: RosterAgent,
-    model: string,
-    effort: EffortChoice
-  ) => {
-    props.onSelectEffort?.(agent, model, effort);
-    setOpen(false);
-  };
   return (
     <Dropdown open={open()} onOpenChange={setOpen} placement="top-end">
       <Dropdown.Trigger
         variant="ghost"
         aria-label="Agent"
         ref={tourTarget(AGENTS_TOUR.picker)}
-        title={
-          rawModel()
-            ? label()
-            : `${props.selected?.name ?? 'Choose agent'} · ${label()}`
-        }
+        title={props.selected?.name ?? 'Choose agent'}
         class={cn(
           'h-[33.75px] min-w-0 max-w-full gap-[5.625px] px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder',
           props.triggerClass
         )}
       >
-        <Show when={!rawModel()}>
-          <Show
-            when={props.selected}
-            fallback={
+        <Show
+          when={props.selected}
+          fallback={
+            <span class="min-w-0 truncate text-left leading-5">
+              Choose agent
+            </span>
+          }
+        >
+          {(agent) => (
+            <>
+              <AgentIcon agent={agent()} class="size-[15px] shrink-0" />
               <span class="min-w-0 truncate text-left leading-5">
-                Choose agent
+                {agent().name}
               </span>
-            }
-          >
-            {(agent) => (
-              <>
-                <AgentIcon agent={agent()} class="size-[15px] shrink-0" />
-                <span class="min-w-0 truncate text-left leading-5">
-                  {agent().name}
-                </span>
-              </>
-            )}
-          </Show>
-        </Show>
-        <Show when={rawModel()}>
-          <ModelIcon model={model()} class="size-[15px] shrink-0" />
+            </>
+          )}
         </Show>
-        <span class="min-w-0 truncate text-left leading-5">{label()}</span>
         <CaretDownIcon class="size-[15px] shrink-0" />
       </Dropdown.Trigger>
       <Dropdown.Content
-        class="w-88 max-w-[calc(100vw-1rem)] overflow-hidden"
+        class="w-80 max-w-[calc(100vw-1rem)] overflow-hidden"
+        onCloseAutoFocus={props.onCloseAutoFocus}
         onPointerDown={(event: PointerEvent) => event.stopPropagation()}
         onMouseDown={(event: MouseEvent) => event.stopPropagation()}
       >
-        <div class="flex min-h-0 max-h-[min(28rem,var(--kb-popper-content-available-height))] flex-col">
-          <div
-            class="min-h-0 space-y-1 overflow-y-auto overscroll-contain px-2 pb-2"
-            classList={{ 'pt-2': !macro() }}
-          >
-            <Show when={macro()}>
-              {(agent) => (
-                <ModelCatalogMenu
-                  autoFocusSearch
-                  value={
-                    props.selected?.id === agent().id ? (model() ?? null) : null
-                  }
-                  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)}
-                  modelRow={
-                    props.onSelectEffort
-                      ? (row) => (
-                          <AgentModelMenuItem
-                            {...row}
-                            harness={agent().harness}
-                            effortValue={
-                              row.selected
-                                ? props.effortSelection?.value
-                                : undefined
-                            }
-                            onSelectEffort={(effort) =>
-                              chooseEffort(agent(), row.option.id, effort)
-                            }
-                          />
-                        )
-                      : undefined
-                  }
-                  emptyMessage={macroCatalog.message()}
-                />
-              )}
-            </Show>
-            <For each={groups()}>
-              {(group) => (
-                <Dropdown.Group class="py-0">
-                  <Dropdown.GroupLabel class="h-6 font-medium text-ink-muted">
-                    {group.label}
-                  </Dropdown.GroupLabel>
-                  <For each={group.agents}>
-                    {(agent) => (
-                      <AgentPickerRow
+        <div class="min-h-0 max-h-[min(28rem,var(--kb-popper-content-available-height))] space-y-1 overflow-y-auto overscroll-contain p-2">
+          <For each={groups()}>
+            {(group) => (
+              <Dropdown.Group class="py-0">
+                <Dropdown.GroupLabel class="h-6 font-medium text-ink-muted">
+                  {group.label}
+                </Dropdown.GroupLabel>
+                <For each={group.agents}>
+                  {(agent) => (
+                    <Dropdown.Item
+                      closeOnSelect
+                      class="min-w-0 gap-3 py-2"
+                      disabled={Boolean(
+                        agent.unavailableReason && !agent.connectLabel
+                      )}
+                      title={agent.unavailableReason}
+                      onSelect={() => {
+                        if (agent.unavailableReason) props.onConnect(agent);
+                        else props.onSelect(agent);
+                      }}
+                    >
+                      <AgentPickerIdentity
                         agent={agent}
                         selected={agent.id === props.selected?.id}
-                        modelOverride={
+                        model={
                           agent.id === props.selected?.id
                             ? props.modelOverride
                             : undefined
                         }
-                        effortSelection={
-                          agent.id === props.selected?.id
-                            ? props.effortSelection
-                            : undefined
-                        }
-                        onSelect={(model) => choose(agent, model)}
-                        onSelectEffort={
-                          props.onSelectEffort
-                            ? (model, effort) =>
-                                chooseEffort(agent, model, effort)
-                            : undefined
-                        }
-                        onConnect={() => {
-                          setOpen(false);
-                          props.onConnect(agent);
-                        }}
                       />
-                    )}
-                  </For>
-                </Dropdown.Group>
-              )}
-            </For>
-            <Show when={!props.loading && !macro() && groups().length === 0}>
-              <p role="status" class="px-3 py-2 text-sm text-ink-muted">
-                No agents available
-              </p>
-            </Show>
-            <Show when={props.loading}>
-              <div role="status" class="px-3 py-2 text-xs text-ink-muted">
-                Loading agents…
-              </div>
-            </Show>
-            <Dropdown.Group class="items-end px-1.5 pt-1 pb-0">
-              <Dropdown.Item
-                closeOnSelect
-                class={buttonClasses({
-                  variant: 'strong',
-                  size: 'sm',
-                  glass: false,
-                  class: 'w-auto gap-1.5 data-highlighted:overlay-hover',
-                })}
-                onSelect={() => {
-                  setOpen(false);
-                  props.onCreate();
-                }}
-              >
-                <PlusIcon class="size-4" />
-                Create agent
-              </Dropdown.Item>
-            </Dropdown.Group>
-          </div>
+                    </Dropdown.Item>
+                  )}
+                </For>
+              </Dropdown.Group>
+            )}
+          </For>
+          <Show when={!props.loading && groups().length === 0}>
+            <p role="status" class="px-3 py-2 text-sm text-ink-muted">
+              No agents available
+            </p>
+          </Show>
+          <Show when={props.loading}>
+            <div role="status" class="px-3 py-2 text-xs text-ink-muted">
+              Loading agents…
+            </div>
+          </Show>
+          <Dropdown.Group class="items-end px-1.5 pt-1 pb-0">
+            <Dropdown.Item
+              closeOnSelect
+              class={buttonClasses({
+                variant: 'strong',
+                size: 'sm',
+                glass: false,
+                class: 'w-auto gap-1.5 data-highlighted:overlay-hover',
+              })}
+              onSelect={props.onCreate}
+            >
+              <PlusIcon class="size-4" />
+              Create agent
+            </Dropdown.Item>
+          </Dropdown.Group>
         </div>
       </Dropdown.Content>
     </Dropdown>
   );
 }
-
-function AgentPickerRow(props: {
-  agent: RosterAgent;
-  selected: boolean;
-  modelOverride?: string;
-  effortSelection?: EffortSelection;
-  onSelect: (model?: string) => void;
-  onSelectEffort?: (model: string, effort: EffortChoice) => void;
-  onConnect: () => void;
-}) {
-  const [open, setOpen] = createSignal(false);
-  const identity = () => (
-    <AgentPickerIdentity
-      agent={props.agent}
-      selected={props.selected}
-      model={props.modelOverride}
-    />
-  );
-  return (
-    <div class="flex min-w-0 items-center gap-1">
-      <Show
-        when={!props.agent.unavailableReason}
-        fallback={
-          <Dropdown.Item
-            closeOnSelect
-            class="min-w-0 flex-1 gap-3 py-2"
-            disabled={!props.agent.connectLabel}
-            title={props.agent.unavailableReason}
-            onSelect={props.onConnect}
-          >
-            {identity()}
-          </Dropdown.Item>
-        }
-      >
-        <Dropdown.Sub open={open()} onOpenChange={setOpen} overlap>
-          <Dropdown.SubTrigger
-            class="min-w-0 flex-1 gap-3 py-2"
-            textValue={props.agent.name}
-            onClick={() => {
-              if (!isTouchDevice()) props.onSelect();
-            }}
-            onKeyDown={(event) => {
-              if (event.key !== 'Enter' && event.key !== ' ') return;
-              event.preventDefault();
-              event.stopPropagation();
-              props.onSelect();
-            }}
-          >
-            {identity()}
-            <CaretRightIcon class="size-3 shrink-0 text-ink-muted" />
-          </Dropdown.SubTrigger>
-          <Dropdown.SubContent
-            aria-label={`Models for ${props.agent.name}`}
-            class="w-72 max-w-[calc(100vw-1rem)] max-h-[min(28rem,var(--kb-popper-content-available-height))] overflow-y-auto overscroll-contain"
-            onOpenAutoFocus={(event: Event) => event.preventDefault()}
-            onPointerDown={(event: PointerEvent) => event.stopPropagation()}
-            onMouseDown={(event: MouseEvent) => event.stopPropagation()}
-          >
-            <Show when={open()}>
-              <AgentModels
-                agent={props.agent}
-                modelOverride={props.modelOverride}
-                effortSelection={props.effortSelection}
-                onSelect={props.onSelect}
-                onSelectEffort={props.onSelectEffort}
-              />
-            </Show>
-          </Dropdown.SubContent>
-        </Dropdown.Sub>
-      </Show>
-    </div>
-  );
-}
-
-function AgentModels(props: {
-  agent: RosterAgent;
-  modelOverride?: string;
-  effortSelection?: EffortSelection;
-  onSelect: (model?: string) => void;
-  onSelectEffort?: (model: string, effort: EffortChoice) => void;
-}) {
-  const catalog = createComposerModels(() => props.agent);
-  const defaultModel = () => props.agent.defaultModel ?? catalog.currentModel();
-  return (
-    <ModelCatalogMenu
-      autoFocusSearch
-      value={props.modelOverride ?? defaultModel() ?? null}
-      options={catalog.models().map((option) => ({
-        id: option.id,
-        label: modelLabel(option.id, option.name),
-        description: option.description ?? undefined,
-        group: option.group ?? undefined,
-      }))}
-      onSelect={props.onSelect}
-      modelRow={
-        props.onSelectEffort
-          ? (row) => (
-              <AgentModelMenuItem
-                {...row}
-                harness={props.agent.harness}
-                effortValue={
-                  row.selected ? props.effortSelection?.value : undefined
-                }
-                onSelectEffort={(effort) =>
-                  props.onSelectEffort?.(row.option.id, effort)
-                }
-              />
-            )
-          : undefined
-      }
-      emptyMessage={catalog.message()}
-    />
-  );
-}
diff --git a/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx b/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx
index d9062d75dff..ebd5a00b5f7 100644
--- a/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx
@@ -1,92 +1,34 @@
 import { MobileDrawer } from '@components/app/mobile/MobileDrawer';
-import {
-  buildModelCatalog,
-  matchesModelQuery,
-} from '@core/component/AI/component/input/modelCatalog';
-import { ModelIcon } from '@core/component/AI/component/ProviderIcon';
-import { modelLabel } from '@core/component/AI/constant/model-label';
-import ArrowLeft from '@icon/system/regular/arrow-left.svg';
-import CaretRight from '@icon/system/regular/caret-right.svg';
-import Check from '@icon/system/regular/check.svg';
 import MagnifyingGlass from '@icon/system/regular/magnifying-glass.svg';
 import Plus from '@icon/system/regular/plus.svg';
-import SquaresFour from '@icon/system/regular/squares-four.svg';
 import { Button } from '@ui';
-import { createMemo, createSignal, For, Show } from 'solid-js';
+import { createSignal, For, Show } from 'solid-js';
 import { AgentIcon } from '../components/AgentGlyph';
 import { AgentPickerIdentity } from '../components/AgentPickerIdentity';
 import { agentPickerGroups } from '../core/agent-picker-groups';
-import { MACRO_PERSONA_ID, type RosterAgent } from '../core/roster';
-import { createComposerModels } from '../queries/composer-models';
+import type { RosterAgent } from '../core/roster';
 import type { AgentPickerProps } from './AgentPicker';
 
-/** A single sheet drills into models without hover menus or offscreen submenus. */
+/** A bottom sheet of agents; the composer's model control sits beside its trigger. */
 export function MobileAgentPicker(props: AgentPickerProps) {
   const [open, setOpen] = createSignal(false);
   const [query, setQuery] = createSignal('');
-  const [showAll, setShowAll] = createSignal(false);
-  let searchInput: HTMLInputElement | undefined;
-  const [browsing, setBrowsing] = createSignal<RosterAgent>();
-  const macro = () =>
-    props.agents.find((agent) => agent.id === MACRO_PERSONA_ID);
-  const catalog = createComposerModels(() => browsing() ?? macro());
-  const model = () => props.modelOverride ?? props.selected?.defaultModel;
-  const label = () =>
-    props.selected?.id === MACRO_PERSONA_ID
-      ? modelLabel(model())
-      : (props.selected?.name ?? 'Choose agent');
   const matches = (text: string) =>
     text.toLocaleLowerCase().includes(query().trim().toLocaleLowerCase());
-  const modelSections = createMemo(() => {
-    const options = catalog.models().map((option) => ({
-      id: option.id,
-      label: modelLabel(option.id, option.name),
-      group: option.group ?? undefined,
-    }));
-    const { frontier, providers } = buildModelCatalog(options, true);
-    const search = query().trim().toLowerCase();
-    return (
-      showAll() || search || frontier.length === 0
-        ? providers
-        : [{ label: 'Suggested', options: frontier }]
-    )
-      .map((section) => ({
-        label: section.label,
-        options: section.options.filter((option) =>
-          matchesModelQuery(option, search)
-        ),
-      }))
-      .filter((section) => section.options.length > 0);
-  });
   const groups = () =>
     agentPickerGroups(
       props.agents.filter((agent) =>
         matches(`${agent.name} ${agent.runtime.label}`)
       )
     );
-  const searchLabel = () =>
-    browsing() || showAll()
-      ? 'Search models'
-      : macro()
-        ? 'Search agents and models'
-        : 'Search agents';
   const changeOpen = (next: boolean) => {
     setOpen(next);
-    if (!next) {
-      setQuery('');
-      setBrowsing(undefined);
-      setShowAll(false);
-    }
+    if (!next) setQuery('');
   };
-  const choose = (agent: RosterAgent, model?: string) => {
-    props.onSelect(agent, model);
+  const choose = (agent: RosterAgent) => {
     changeOpen(false);
-  };
-  const browse = (agent?: RosterAgent) => {
-    setQuery('');
-    setBrowsing(agent);
-    setShowAll(false);
-    searchInput?.focus();
+    if (agent.unavailableReason) props.onConnect(agent);
+    else props.onSelect(agent);
   };
   return (
     <MobileDrawer
@@ -101,7 +43,7 @@ export function MobileAgentPicker(props: AgentPickerProps) {
         variant="ghost"
         size="sm"
         aria-label="Agent"
-        title={label()}
+        title={props.selected?.name ?? 'Choose agent'}
         class={
           props.showModelLabel
             ? 'h-[34px] max-w-full min-w-0 gap-1.5 rounded-full px-2 text-ink-muted'
@@ -113,55 +55,21 @@ export function MobileAgentPicker(props: AgentPickerProps) {
         onMouseDown={(event: MouseEvent) => event.preventDefault()}
       >
         {/* Icon only on a phone; the title and the sheet name the choice. */}
-        <Show
-          when={props.selected?.id !== MACRO_PERSONA_ID && props.selected}
-          fallback={<ModelIcon model={model()} class="size-[18px]" />}
-        >
+        <Show when={props.selected}>
           {(agent) => <AgentIcon agent={agent()} class="size-[18px]" />}
         </Show>
         <Show when={props.showModelLabel}>
-          <span class="min-w-0 truncate">{modelLabel(model())}</span>
+          <span class="min-w-0 truncate">
+            {props.selected?.name ?? 'Choose agent'}
+          </span>
         </Show>
       </MobileDrawer.Trigger>
       <MobileDrawer.Portal>
         <MobileDrawer.Overlay />
-        <MobileDrawer.Content aria-label="Choose an agent or model">
+        <MobileDrawer.Content aria-label="Choose an agent">
           <MobileDrawer.Handle />
           <div class="flex items-center gap-2 px-4 pb-3">
-            <Show when={browsing() || showAll()}>
-              <Button
-                variant="ghost"
-                size="icon-md"
-                label={showAll() ? 'Back to Suggested' : 'Back to agents'}
-                onClick={() => {
-                  if (showAll()) {
-                    setShowAll(false);
-                    setQuery('');
-                    searchInput?.focus();
-                  } else browse();
-                }}
-              >
-                <ArrowLeft />
-              </Button>
-            </Show>
-            <h2 class="min-w-0 flex-1 truncate font-medium">
-              {showAll()
-                ? 'All models'
-                : (browsing()?.name ??
-                  (macro() ? 'Agents and models' : 'Choose an agent'))}
-            </h2>
-            <Show when={browsing()}>
-              {(agent) => (
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  aria-label={`Use ${agent().name} default`}
-                  onClick={() => choose(agent())}
-                >
-                  Use default
-                </Button>
-              )}
-            </Show>
+            <h2 class="min-w-0 flex-1 truncate font-medium">Choose an agent</h2>
           </div>
           <div class="mx-4 mb-2 flex h-9 shrink-0 items-center gap-2 px-3">
             <MagnifyingGlass
@@ -169,151 +77,59 @@ export function MobileAgentPicker(props: AgentPickerProps) {
               class="size-4 shrink-0 text-ink-extra-muted"
             />
             <input
-              ref={searchInput}
-              aria-label={searchLabel()}
-              placeholder={searchLabel()}
+              aria-label="Search agents"
+              placeholder="Search agents"
               value={query()}
               onInput={(event) => setQuery(event.currentTarget.value)}
               class="h-full min-w-0 w-full border-0 bg-transparent p-0 text-base outline-none placeholder:text-ink-extra-muted"
             />
           </div>
           <MobileDrawer.ScrollBody class="gap-1">
-            <Show when={browsing() ?? macro()}>
-              <For each={modelSections()}>
-                {(section) => (
-                  <div>
-                    <MobileDrawer.Label class="px-4 pb-1 font-medium text-ink-muted">
-                      {section.label}
-                    </MobileDrawer.Label>
-                    <MobileDrawer.Section
-                      class="rounded-none bg-transparent p-0"
-                      role="group"
-                      aria-label={section.label}
-                    >
-                      <For each={section.options}>
-                        {(option) => (
-                          <MobileDrawer.Item
-                            disabled={Boolean(
-                              (browsing() ?? macro())?.unavailableReason
-                            )}
-                            onClick={() => {
-                              const agent = browsing() ?? macro();
-                              if (agent) choose(agent, option.id);
-                            }}
-                          >
-                            <ModelIcon model={option.id} />
-                            <span class="min-w-0 flex-1 truncate">
-                              {option.label}
-                            </span>
-                            <Show
-                              when={
-                                props.selected?.id ===
-                                  (browsing() ?? macro())?.id &&
-                                model() === option.id
-                              }
-                            >
-                              <Check class="size-4 text-accent" />
-                            </Show>
-                          </MobileDrawer.Item>
-                        )}
-                      </For>
-                    </MobileDrawer.Section>
-                  </div>
-                )}
-              </For>
-              <Show
-                when={
-                  !showAll() &&
-                  !query() &&
-                  modelSections().some(
-                    (section) => section.label === 'Suggested'
-                  )
-                }
-              >
-                <MobileDrawer.Section class="rounded-none bg-transparent p-0">
-                  <MobileDrawer.Item
-                    onClick={() => {
-                      setShowAll(true);
-                      searchInput?.focus();
-                    }}
+            <For each={groups()}>
+              {(group) => (
+                <div>
+                  <MobileDrawer.Label class="px-4 pb-1 font-medium text-ink-muted">
+                    {group.label}
+                  </MobileDrawer.Label>
+                  <MobileDrawer.Section
+                    class="rounded-none bg-transparent p-0"
+                    role="group"
+                    aria-label={group.label}
                   >
-                    <SquaresFour class="size-4 shrink-0 text-ink-muted" />
-                    <span class="flex-1">More models</span>
-                    <CaretRight class="size-4" />
-                  </MobileDrawer.Item>
-                </MobileDrawer.Section>
-              </Show>
-              <Show when={modelSections().length === 0}>
-                <p role="status" class="px-4 py-3 text-sm text-ink-muted">
-                  {query() ? 'No matching models' : catalog.message()}
-                </p>
-              </Show>
+                    <For each={group.agents}>
+                      {(agent) => (
+                        <MobileDrawer.Item
+                          class="min-w-0"
+                          disabled={Boolean(
+                            agent.unavailableReason && !agent.connectLabel
+                          )}
+                          onClick={() => choose(agent)}
+                        >
+                          <AgentPickerIdentity
+                            agent={agent}
+                            selected={props.selected?.id === agent.id}
+                            model={
+                              props.selected?.id === agent.id
+                                ? props.modelOverride
+                                : undefined
+                            }
+                          />
+                        </MobileDrawer.Item>
+                      )}
+                    </For>
+                  </MobileDrawer.Section>
+                </div>
+              )}
+            </For>
+            <Show when={!props.loading && groups().length === 0}>
+              <p role="status" class="px-4 py-3 text-sm text-ink-muted">
+                {query() ? 'No matching agents' : 'No agents available'}
+              </p>
             </Show>
-            <Show when={!browsing() && !showAll()}>
-              <For each={groups()}>
-                {(group) => (
-                  <div>
-                    <MobileDrawer.Label class="px-4 pb-1 font-medium text-ink-muted">
-                      {group.label}
-                    </MobileDrawer.Label>
-                    <MobileDrawer.Section
-                      class="rounded-none bg-transparent p-0"
-                      role="group"
-                      aria-label={group.label}
-                    >
-                      <For each={group.agents}>
-                        {(agent) => (
-                          <div class="flex items-center">
-                            <MobileDrawer.Item
-                              class="min-w-0 flex-1"
-                              disabled={Boolean(
-                                agent.unavailableReason && !agent.connectLabel
-                              )}
-                              onClick={() => {
-                                if (agent.unavailableReason) {
-                                  changeOpen(false);
-                                  props.onConnect(agent);
-                                } else choose(agent);
-                              }}
-                            >
-                              <AgentPickerIdentity
-                                agent={agent}
-                                selected={props.selected?.id === agent.id}
-                                model={
-                                  props.selected?.id === agent.id
-                                    ? props.modelOverride
-                                    : undefined
-                                }
-                              />
-                            </MobileDrawer.Item>
-                            <Show when={!agent.unavailableReason}>
-                              <Button
-                                variant="ghost"
-                                size="icon-md"
-                                class="mr-1 size-11 shrink-0"
-                                label={`Models for ${agent.name}`}
-                                onClick={() => browse(agent)}
-                              >
-                                <CaretRight />
-                              </Button>
-                            </Show>
-                          </div>
-                        )}
-                      </For>
-                    </MobileDrawer.Section>
-                  </div>
-                )}
-              </For>
-              <Show when={!props.loading && !macro() && groups().length === 0}>
-                <p role="status" class="px-4 py-3 text-sm text-ink-muted">
-                  {query() ? 'No matching agents' : 'No agents available'}
-                </p>
-              </Show>
-              <Show when={props.loading}>
-                <p role="status" class="px-4 py-3 text-sm text-ink-muted">
-                  Loading agents…
-                </p>
-              </Show>
+            <Show when={props.loading}>
+              <p role="status" class="px-4 py-3 text-sm text-ink-muted">
+                Loading agents…
+              </p>
             </Show>
             <div class="flex justify-end px-4 pt-1">
               <Button
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 6b2cbb8da8d..7a220f5cf7f 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -285,27 +285,10 @@ async function selectAgent(name: RegExp) {
     expect(trigger.getAttribute('aria-expanded')).toBe('false')
   );
 }
-async function hoverAgent(name: string) {
-  openAgents();
-  // Chat mode's root menu has its own model search; Code mode's does not.
-  const before = screen.queryAllByRole('textbox', {
-    name: 'Search models',
-  }).length;
-  const event = new MouseEvent('pointermove', { bubbles: true });
-  Object.defineProperty(event, 'pointerType', { value: 'mouse' });
-  screen
-    .getByRole('menuitem', { name: new RegExp(`^${name}`) })
-    .dispatchEvent(event);
-  await waitFor(() =>
-    expect(
-      screen.getAllByRole('textbox', { name: 'Search models' })
-    ).toHaveLength(before + 1)
-  );
-  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);
+function openModels() {
+  const trigger = screen.getByRole('button', { name: 'Model' });
+  fireEvent.keyDown(trigger, { key: 'Enter' });
+  return within(screen.getByRole('menu'));
 }
 
 describe('agent-led new conversation', () => {
@@ -349,17 +332,17 @@ describe('agent-led new conversation', () => {
     motionStyles.remove();
     vi.unstubAllGlobals();
   });
-  it('selects a coding model from the phone sheet without hover and preserves the draft', async () => {
+  it("overrides a coding agent's model from the phone model sheet and preserves the draft", async () => {
     mocks.touch = true;
     const send = page(true, [], false, [], 'code');
     fireEvent.input(screen.getByRole('textbox', { name: 'Draft' }), {
       target: { value: 'Phone draft' },
     });
-    fireEvent.click(screen.getByRole('button', { name: 'Agent' }));
-    fireEvent.click(
-      await screen.findByRole('button', { name: 'Models for Cursor' })
-    );
-    fireEvent.click(await screen.findByRole('button', { name: 'GPT-5' }));
+    expect(
+      screen.getByRole('button', { name: 'Agent' }).getAttribute('title')
+    ).toBe('Cursor');
+    fireEvent.click(screen.getByRole('button', { name: 'Model' }));
+    fireEvent.click(await screen.findByRole('radio', { name: 'GPT-5' }));
     await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
     expect(send).toHaveBeenCalledWith(
@@ -374,11 +357,13 @@ describe('agent-led new conversation', () => {
   it('filters models in the phone sheet and selects an in-memory model', async () => {
     mocks.touch = true;
     const send = page();
-    fireEvent.click(screen.getByRole('button', { name: 'Agent' }));
-    await screen.findByRole('textbox', { name: 'Search agents and models' });
-    const frontier = within(screen.getByRole('group', { name: 'Suggested' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Model' }));
+    await screen.findByRole('textbox', { name: 'Search models' });
+    const frontier = within(
+      screen.getByRole('radiogroup', { name: 'Suggested' })
+    );
     expect(
-      frontier.getAllByRole('button').map((item) => item.textContent?.trim())
+      frontier.getAllByRole('radio').map((item) => item.textContent?.trim())
     ).toEqual([
       'Opus 5.5',
       'Sonnet 5.5',
@@ -386,17 +371,14 @@ describe('agent-led new conversation', () => {
       'GPT-6 Astra',
       'Gemini 3.8 Flash',
     ]);
-    expect(screen.queryByRole('group', { name: 'Google' })).toBeNull();
+    expect(screen.queryByRole('radiogroup', { name: 'Google' })).toBeNull();
     expect(screen.getByRole('button', { name: 'More models' })).toBeTruthy();
     expect(screen.queryByText('Recommended')).toBeNull();
-    fireEvent.input(
-      screen.getByRole('textbox', { name: 'Search agents and models' }),
-      {
-        target: { value: 'Sonnet 5.5' },
-      }
-    );
-    expect(screen.queryByRole('button', { name: 'Chat default' })).toBeNull();
-    fireEvent.click(screen.getByRole('button', { name: 'Sonnet 5.5' }));
+    fireEvent.input(screen.getByRole('textbox', { name: 'Search models' }), {
+      target: { value: 'Sonnet 5.5' },
+    });
+    expect(screen.queryByRole('radio', { name: 'Chat default' })).toBeNull();
+    fireEvent.click(screen.getByRole('radio', { name: 'Sonnet 5.5' }));
     await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
     expect(send).toHaveBeenCalledWith(
@@ -408,7 +390,7 @@ describe('agent-led new conversation', () => {
   it('opens and focuses the mobile model search on the first tap', async () => {
     mocks.touch = true;
     page();
-    const trigger = screen.getByRole('button', { name: 'Agent' });
+    const trigger = screen.getByRole('button', { name: 'Model' });
     for (const type of ['pointerdown', 'mousedown']) {
       const event = new MouseEvent(type, { bubbles: true, cancelable: true });
       trigger.dispatchEvent(event);
@@ -418,14 +400,14 @@ describe('agent-led new conversation', () => {
     fireEvent.mouseUp(trigger);
     fireEvent.click(trigger);
     const search = await screen.findByRole('textbox', {
-      name: 'Search agents and models',
+      name: 'Search models',
     });
     await waitFor(() => expect(document.activeElement).toBe(search));
   });
   it('focuses desktop search on opening and reopening the model selector', async () => {
     page();
     for (let attempt = 0; attempt < 2; attempt++) {
-      openAgents();
+      openModels();
       const search = screen.getByRole('textbox', { name: 'Search models' });
       await waitFor(() => expect(document.activeElement).toBe(search));
       fireEvent.input(search, { target: { value: 'Sonnet' } });
@@ -511,8 +493,10 @@ describe('agent-led new conversation', () => {
     expect(
       screen.getByRole('heading', { name: 'What should we work on?' })
     ).toBeTruthy();
-    expect(screen.queryByRole('button', { name: 'Model' })).toBeNull();
-    expect(screen.getByRole('button', { name: 'Agent' }).textContent).toContain(
+    expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(
+      'Macro'
+    );
+    expect(screen.getByRole('button', { name: 'Model' }).textContent).toContain(
       'Chat default'
     );
     expect(
@@ -603,8 +587,9 @@ describe('agent-led new conversation', () => {
     ).toBeTruthy();
     expect(screen.queryByRole('button', { name: 'Repository' })).toBeNull();
     openAgents();
-    expect(screen.getByRole('group', { name: 'Suggested' })).toBeTruthy();
+    expect(screen.getByRole('menuitem', { name: /^Macro/ })).toBeTruthy();
     expect(screen.queryByRole('menuitem', { name: /Cursor/ })).toBeNull();
+    expect(screen.queryByRole('textbox', { name: 'Search models' })).toBeNull();
     fireEvent.keyDown(document, { key: 'Escape' });
     await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
@@ -906,61 +891,56 @@ describe('agent-led new conversation', () => {
       );
     }
   );
-  it('focuses model search when hovering an agent submenu', async () => {
+  it("lists only the selected agent's harness models in the model control", async () => {
     page(true, [], false, [], 'code');
-    const submenu = await hoverAgent('Cursor');
-    const search = submenu.getByRole('textbox', { name: 'Search models' });
+    const models = openModels();
+    const search = models.getByRole('textbox', { name: 'Search models' });
     await waitFor(() => expect(document.activeElement).toBe(search));
-
+    expect(models.getByRole('menuitem', { name: /GPT-5/ })).toBeTruthy();
+    expect(models.queryByTitle('Sonnet 5.5')).toBeNull();
     fireEvent.input(search, { target: { value: 'GPT' } });
-    expect((search as HTMLInputElement).value).toBe('GPT');
-    expect(submenu.getByRole('menuitem', { name: /GPT-5/ })).toBeTruthy();
     expect(
-      submenu.queryByRole('menuitem', { name: /Cursor default/ })
+      models.queryByRole('menuitem', { name: /Cursor default/ })
     ).toBeNull();
   });
 
-  it('shows the model beside the agent and sends a hovered model choice only once', async () => {
+  it('starts the chosen agent on its default model', async () => {
     const send = page(true, [], false, [], 'code');
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toContain(
+    await selectAgent(/^Cursor/);
+    expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(
+      'Cursor'
+    );
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Cursor default'
     );
-    await hoverAgent('Cursor');
-    expect(screen.queryByText('Use agent default')).toBeNull();
+    fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+    expect(send).toHaveBeenLastCalledWith({
+      onFailure: expect.any(Function),
+      prompt: 'Prompt',
+      botId: CURSOR_BOT_ID,
+      repoUrl: undefined,
+    });
+  });
+
+  it("overrides the agent's model for one send without changing the agent", async () => {
+    const send = page(true, [], false, [], 'code');
+    const models = openModels();
     expect(
-      screen
+      models
         .getByRole('menuitem', { name: /Cursor default/ })
         .querySelector('.text-accent')
     ).toBeTruthy();
-    const model = screen.getByTitle('GPT-5');
-    expect(model.querySelector('.text-accent')).toBeNull();
+    const model = models.getByTitle('GPT-5');
     expect(model.querySelector('[data-ai-provider="openai"] svg')).toBeTruthy();
     fireEvent.keyDown(model, { key: 'Enter' });
     await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toContain(
-      'GPT-5'
+    expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(
+      'Cursor'
     );
-    expect(screen.getByRole('button', { name: 'Repository' })).toBeTruthy();
-    openAgents();
-    fireEvent.keyDown(screen.getByRole('menuitem', { name: /^Cursor/ }), {
-      key: 'ArrowRight',
-    });
-    await waitFor(() =>
-      expect(
-        screen.getAllByRole('textbox', { name: 'Search models' })
-      ).toHaveLength(1)
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
+      'GPT-5 · Low'
     );
-    expect(
-      screen.getByTitle('GPT-5').querySelector('.text-accent')
-    ).toBeTruthy();
-    expect(
-      screen
-        .getByRole('menuitem', { name: /Cursor default/ })
-        .querySelector('.text-accent')
-    ).toBeNull();
-    fireEvent.keyDown(document, { key: 'Escape' });
-    fireEvent.keyDown(document, { key: 'Escape' });
-    await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
+    expect(screen.getByRole('button', { name: 'Repository' })).toBeTruthy();
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
     expect(send).toHaveBeenLastCalledWith({
       onFailure: expect.any(Function),
@@ -969,28 +949,40 @@ describe('agent-led new conversation', () => {
       repoUrl: undefined,
       modelOverride: 'gpt-5',
     });
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toContain(
+    // The override was for that send; the agent's default returns.
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Cursor default'
     );
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
     expect(send.mock.calls[1][0]).not.toHaveProperty('modelOverride');
   });
+  it('drops a model override when the agent is chosen again', async () => {
+    page(true, [], false, [], 'code');
+    fireEvent.keyDown(openModels().getByTitle('GPT-5'), { key: 'Enter' });
+    await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
+      'GPT-5 · Low'
+    );
+    await selectAgent(/^Cursor/);
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
+      'Cursor default'
+    );
+  });
   it('clears a temporary model choice when switching to Code', async () => {
     page();
-    openAgents();
-    const model = screen.getByTitle('Sonnet 5.5');
+    const model = openModels().getByTitle('Sonnet 5.5');
     model.focus();
     fireEvent.keyDown(model, { key: 'Enter' });
     await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toContain(
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Sonnet 5.5'
     );
     fireEvent.click(screen.getByRole('radio', { name: 'Code' }));
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toContain(
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Cursor default'
     );
   });
-  it('groups the Macro catalog and selects direct models with readable names and icons', async () => {
+  it('lists Macro first among agents and groups its models with readable names and icons', async () => {
     const send = page(true, [
       {
         bot: { id: 'saved-agent', name: 'Reviewer', handle: 'reviewer' },
@@ -999,34 +991,38 @@ describe('agent-led new conversation', () => {
       },
     ]);
     openAgents();
-    const modelsGroup = screen.getByRole('group', { name: 'Suggested' });
-    const agentsGroup = screen.getByRole('group', { name: 'Your agents' });
+    const agents = within(screen.getByRole('menu'));
+    const builtIn = agents.getByRole('group', { name: 'Built-in' });
+    const saved = agents.getByRole('group', { name: 'Your agents' });
     expect(
-      modelsGroup.compareDocumentPosition(agentsGroup) &
-        Node.DOCUMENT_POSITION_FOLLOWING
+      builtIn.compareDocumentPosition(saved) & Node.DOCUMENT_POSITION_FOLLOWING
     ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
-    expect(screen.queryByRole('group', { name: 'Coding agents' })).toBeNull();
-    const search = screen.getByRole('textbox', { name: 'Search models' });
-    expect(screen.getByRole('menuitem', { name: /More models/ })).toBeTruthy();
-    expect(screen.queryByRole('group', { name: 'Z.ai' })).toBeNull();
+    expect(
+      within(builtIn).getByRole('menuitem', { name: /^Macro/ })
+    ).toBeTruthy();
+    expect(agents.queryByRole('textbox', { name: 'Search models' })).toBeNull();
+    fireEvent.keyDown(document, { key: 'Escape' });
+    await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
+
+    const models = openModels();
+    const search = models.getByRole('textbox', { name: 'Search models' });
+    expect(models.getByRole('menuitem', { name: /More models/ })).toBeTruthy();
+    expect(models.queryByRole('group', { name: 'Z.ai' })).toBeNull();
     fireEvent.input(search, { target: { value: 'GLM' } });
-    expect(screen.getByTitle('GLM 5.3')).toBeTruthy();
-    expect(screen.getByTitle('GLM 5.3 Flash')).toBeTruthy();
+    expect(models.getByTitle('GLM 5.3')).toBeTruthy();
+    expect(models.getByTitle('GLM 5.3 Flash')).toBeTruthy();
     fireEvent.input(search, { target: { value: '' } });
-    expect(screen.queryByRole('menuitem', { name: /Cursor/ })).toBeNull();
-    expect(screen.queryByRole('menuitem', { name: /^Macro/ })).toBeNull();
-    const models = within(screen.getByRole('group', { name: 'Suggested' }));
+    const suggested = within(models.getByRole('group', { name: 'Suggested' }));
     expect(
-      models.queryByRole('menuitem', { name: /Cursor default/ })
-    ).toBeNull();
-    expect(models.getAllByRole('menuitem').map((item) => item.title)).toEqual([
+      suggested.getAllByRole('menuitem').map((item) => item.title)
+    ).toEqual([
       'Opus 5.5',
       'Sonnet 5.5',
       'GPT-5.6',
       'GPT-6 Astra',
       'Gemini 3.8 Flash',
     ]);
-    const sonnet = models.getByTitle('Sonnet 5.5');
+    const sonnet = suggested.getByTitle('Sonnet 5.5');
     expect(
       sonnet.querySelector('[data-ai-provider="anthropic"] svg')
     ).toBeTruthy();
@@ -1037,10 +1033,10 @@ describe('agent-led new conversation', () => {
     expect(mocks.rememberInmemModel).toHaveBeenCalledWith(
       'anthropic/claude-sonnet-5-5'
     );
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toBe(
-      'Sonnet 5.5'
+    expect(screen.getByRole('button', { name: 'Agent' }).textContent).toBe(
+      'Macro'
     );
-    const trigger = screen.getByRole('button', { name: 'Agent' });
+    const trigger = screen.getByRole('button', { name: 'Model' });
     expect(trigger.title).toBe('Sonnet 5.5');
     expect(
       trigger.querySelector('[data-ai-provider="anthropic"] svg')
@@ -1054,8 +1050,8 @@ describe('agent-led new conversation', () => {
       repoUrl: undefined,
       modelOverride: 'anthropic/claude-sonnet-5-5',
     });
-    // Macro Models picks stick: a second send still uses the preferred model.
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toBe(
+    // Macro's model picks stick: a second send still uses the preferred model.
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Sonnet 5.5'
     );
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
@@ -1063,7 +1059,7 @@ describe('agent-led new conversation', () => {
       modelOverride: 'anthropic/claude-sonnet-5-5',
     });
   });
-  it('keeps unavailable Macro models disabled throughout the catalog', async () => {
+  it("keeps an unavailable agent's models disabled throughout the catalog", async () => {
     const roster = buildAgentRoster({
       agents: [],
       runtimes: [],
@@ -1086,31 +1082,15 @@ describe('agent-led new conversation', () => {
         onCreate={vi.fn()}
       />
     ));
-    openAgents();
-    const sonnet = screen.getByTitle('Sonnet 5.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(
+      screen.getByRole('button', { name: 'Model' }).hasAttribute('disabled')
+    ).toBe(true);
     expect(onSelect).not.toHaveBeenCalled();
   });
   it('restores a preferred Macro model on a fresh composer', () => {
     mocks.preferredInmemModel = 'anthropic/claude-sonnet-5-5';
     page();
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toBe(
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Sonnet 5.5'
     );
   });
@@ -1118,15 +1098,12 @@ describe('agent-led new conversation', () => {
     mocks.freePlan = true;
     mocks.preferredInmemModel = 'anthropic/claude-sonnet-5-5';
     const send = page();
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toBe(
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'Gemini 3.8 Flash'
     );
-    openAgents();
-    await waitFor(() => expect(screen.getByRole('menu')).toBeTruthy());
-    expect(screen.queryByTitle('Sonnet 5.5')).toBeNull();
-    expect(
-      within(screen.getByRole('menu')).getByTitle('Gemini 3.8 Flash')
-    ).toBeTruthy();
+    const models = openModels();
+    expect(models.queryByTitle('Sonnet 5.5')).toBeNull();
+    expect(models.getByTitle('Gemini 3.8 Flash')).toBeTruthy();
     fireEvent.keyDown(screen.getByRole('menu'), { key: 'Escape' });
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
     expect(send).toHaveBeenCalledWith(
@@ -1164,7 +1141,7 @@ describe('agent-led new conversation', () => {
       mocks.tier = tier;
       mocks.currentEffort = 'ultra';
       const send = page(true, [], false, [], 'code');
-      const models = await hoverAgent('Cursor');
+      const models = openModels();
       fireEvent.keyDown(models.getByRole('menuitem', { name: /^GPT-5/ }), {
         key: 'Enter',
       });
@@ -1182,7 +1159,7 @@ describe('agent-led new conversation', () => {
   );
   it('passes opaque effort and clears it with the model override after sending', async () => {
     const send = page(true, [], false, [], 'code');
-    const models = await hoverAgent('Cursor');
+    const models = openModels();
     fireEvent.keyDown(models.getByRole('menuitem', { name: /^GPT-5/ }), {
       key: 'ArrowRight',
     });
@@ -1192,7 +1169,7 @@ describe('agent-led new conversation', () => {
     });
     await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
     mocks.capabilitiesPending = true;
-    expect(screen.getByRole('button', { name: 'Agent' }).title).toContain(
+    expect(screen.getByRole('button', { name: 'Model' }).title).toBe(
       'GPT-5 · Ultra'
     );
     fireEvent.click(screen.getByRole('button', { name: 'Send' }));
diff --git a/apps/web/src/features/routines/routine-creator.test.tsx b/apps/web/src/features/routines/routine-creator.test.tsx
index 8e98d017678..84314aeef95 100644
--- a/apps/web/src/features/routines/routine-creator.test.tsx
+++ b/apps/web/src/features/routines/routine-creator.test.tsx
@@ -104,6 +104,7 @@ vi.mock('../agents-view/queries/agent-roster-source', () => ({
             default_model: 'claude-sonnet-4-6',
           },
         ],
+        macroDefaultModel: 'claude-sonnet-4-6',
         runtimes: [],
         cursorConnected: false,
         cursorNeedsConnection: true,
@@ -174,41 +175,27 @@ function inputPrompt(value = 'Summarize updates'): HTMLTextAreaElement {
   return editor;
 }
 
-function openPicker(): void {
-  const trigger = screen.getByRole('button', { name: 'Agent' });
+async function choose(
+  control: 'Agent' | 'Model',
+  item: RegExp | string
+): Promise<void> {
+  const trigger = screen.getByRole('button', { name: control });
   trigger.focus();
   fireEvent.keyDown(trigger, { key: 'Enter' });
+  const row = screen.getByRole('menuitem', { name: item });
+  row.focus();
+  fireEvent.keyDown(row, { key: 'Enter' });
+  await waitFor(() =>
+    expect(trigger.getAttribute('aria-expanded')).toBe('false')
+  );
 }
 
+/** Macro with a model, an agent on its default, or an agent with a model override. */
 async function selectTarget(
   target: 'model' | 'agent' | 'override'
 ): Promise<void> {
-  openPicker();
-  if (target === 'agent') {
-    fireEvent.click(screen.getByRole('menuitem', { name: /^Researcher/ }));
-  } else {
-    let menu: HTMLElement | undefined;
-    if (target === 'override') {
-      const row = screen.getByRole('menuitem', { name: /^Researcher/ });
-      row.focus();
-      fireEvent.keyDown(row, { key: 'ArrowRight' });
-      // Do not select the same model from the root Macro catalog.
-      menu = await screen.findByRole('menu', { name: /^Researcher/ });
-      await within(menu).findByRole('textbox', { name: 'Search models' });
-    }
-    const item = (menu ? within(menu) : screen).getByRole('menuitem', {
-      name: 'Custom model',
-    });
-    item.focus();
-    fireEvent.keyDown(item, { key: 'Enter' });
-  }
-  await waitFor(() =>
-    expect(
-      screen
-        .getByRole('button', { name: 'Agent' })
-        .getAttribute('aria-expanded')
-    ).toBe('false')
-  );
+  await choose('Agent', target === 'model' ? /^Macro/ : /^Researcher/);
+  if (target !== 'agent') await choose('Model', 'Custom model');
 }
 
 function create(): void {
diff --git a/apps/web/src/features/routines/views/routine-execution-picker.test.tsx b/apps/web/src/features/routines/views/routine-execution-picker.test.tsx
index 7c007bea175..b62a92abdec 100644
--- a/apps/web/src/features/routines/views/routine-execution-picker.test.tsx
+++ b/apps/web/src/features/routines/views/routine-execution-picker.test.tsx
@@ -4,7 +4,6 @@ import {
   render,
   screen,
   waitFor,
-  within,
 } from '@solidjs/testing-library';
 import { type ComponentProps, createResource, createSignal } from 'solid-js';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -96,6 +95,7 @@ const external: PersistedAgentLike = {
 function roster(connected = true) {
   return buildAgentRoster({
     agents: [managed, external],
+    macroDefaultModel: 'chat-model',
     runtimes: [{ id: 'workstation', name: 'Workstation', connected }],
     cursorConnected: false,
     cursorNeedsConnection: true,
@@ -129,8 +129,8 @@ function mount(target: RoutineTarget, overrides: Partial<ViewProps> = {}) {
   ));
   return { selection, onChange, onConnect, onCreate };
 }
-function openPicker() {
-  const trigger = screen.getByRole('button', { name: 'Agent' });
+function openPicker(name: 'Agent' | 'Model' = 'Agent') {
+  const trigger = screen.getByRole('button', { name });
   trigger.focus();
   fireEvent.keyDown(trigger, { key: 'Enter' });
   return trigger;
@@ -141,19 +141,6 @@ async function expectClosed(trigger: HTMLElement) {
   );
   await waitFor(() => expect(document.activeElement).toBe(trigger));
 }
-async function openModels(name: string) {
-  const trigger = openPicker();
-  const row = screen.getByRole('menuitem', { name: new RegExp(`^${name}`) });
-  row.focus();
-  fireEvent.keyDown(row, { key: 'ArrowRight' });
-  // The root Macro catalog also has a search box; wait for the agent submenu.
-  const menu = await screen.findByRole('menu', {
-    name: new RegExp(`^${name}`),
-  });
-  expect(menu.getAttribute('aria-label')).toBe(`Models for ${name}`);
-  await within(menu).findByRole('textbox', { name: 'Search models' });
-  return { trigger, menu: within(menu) };
-}
 
 let styles: HTMLStyleElement;
 beforeEach(() => {
@@ -187,7 +174,7 @@ afterEach(() => {
 });
 
 describe('routine execution picker', () => {
-  it('selects Macro models with the keyboard and restores trigger focus', async () => {
+  it('switches to Macro and picks its model with the keyboard, restoring trigger focus', async () => {
     const { selection } = mount({
       kind: 'agent',
       agentId: managedId,
@@ -196,13 +183,21 @@ describe('routine execution picker', () => {
     expect(
       screen.getByRole('group', { name: 'Routine model or agent' })
     ).toBeTruthy();
-    const trigger = openPicker();
+    const agentTrigger = openPicker();
+    const macro = screen.getByRole('menuitem', { name: /^Macro/ });
+    macro.focus();
+    fireEvent.keyDown(macro, { key: 'Enter' });
+    expect(selection()).toEqual({ kind: 'model', model: 'chat-model' });
+    await expectClosed(agentTrigger);
+    expect(agentTrigger.textContent).toContain('Macro');
+    const modelTrigger = openPicker('Model');
     const item = screen.getByRole('menuitem', { name: 'Other model' });
     item.focus();
     fireEvent.keyDown(item, { key: 'Enter' });
     expect(selection()).toEqual({ kind: 'model', model: 'other-model' });
-    await expectClosed(trigger);
-    expect(trigger.textContent).toContain('Other model');
+    await expectClosed(modelTrigger);
+    expect(modelTrigger.textContent).toContain('Other model');
+    expect(agentTrigger.textContent).toContain('Macro');
   });
 
   it.each(['Researcher', 'Local worker'])(
@@ -214,8 +209,9 @@ describe('routine execution picker', () => {
         modelOverride: 'old-model',
       });
       const trigger = openPicker();
-      fireEvent.click(
-        screen.getByRole('menuitem', { name: new RegExp(`^${name}`) })
+      fireEvent.keyDown(
+        screen.getByRole('menuitem', { name: new RegExp(`^${name}`) }),
+        { key: 'Enter' }
       );
       expect(selection()).toEqual({
         kind: 'agent',
@@ -230,11 +226,18 @@ describe('routine execution picker', () => {
     ['Researcher', managedId, 'Other model', 'other-model'],
     ['Local worker', externalId, 'Custom model', 'vendor/custom-model'],
   ])(
-    'selects runtime-specific nested models for %s',
+    'chooses %s, then a model from its runtime in the Model control',
     async (name, agentId, label, model) => {
       const { selection } = mount({ kind: 'model', model: 'chat-model' });
-      const { trigger, menu } = await openModels(name);
-      const item = menu.getByRole('menuitem', { name: label });
+      const agentTrigger = openPicker();
+      fireEvent.keyDown(
+        screen.getByRole('menuitem', { name: new RegExp(`^${name}`) }),
+        { key: 'Enter' }
+      );
+      expect(selection()).toEqual({ kind: 'agent', agentId });
+      await expectClosed(agentTrigger);
+      const modelTrigger = openPicker('Model');
+      const item = screen.getByRole('menuitem', { name: label });
       item.focus();
       fireEvent.keyDown(item, { key: 'Enter' });
       expect(selection()).toEqual({
@@ -242,7 +245,8 @@ describe('routine execution picker', () => {
         agentId,
         modelOverride: model,
       });
-      await expectClosed(trigger);
+      await expectClosed(modelTrigger);
+      expect(agentTrigger.textContent).toContain(name);
     }
   );
 
@@ -303,12 +307,12 @@ describe('routine execution picker', () => {
       }
     );
     const trigger = openPicker();
-    fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Other model' }), {
+    fireEvent.keyDown(screen.getByRole('menuitem', { name: /^Macro/ }), {
       key: 'Enter',
     });
     await expectClosed(trigger);
     setLoading(false);
-    expect(selection()).toEqual({ kind: 'model', model: 'other-model' });
+    expect(selection()).toEqual({ kind: 'model', model: 'chat-model' });
     expect(onChange).toHaveBeenCalledOnce();
   });
 
@@ -344,11 +348,11 @@ describe('routine execution picker', () => {
     { kind: 'model', model: 'retired-model' },
     { kind: 'agent', agentId: externalId, modelOverride: 'retired-model' },
   ] satisfies RoutineTarget[])(
-    'keeps an unavailable model in the trigger with a warning: %j',
+    'keeps an unavailable model in the Model trigger with a warning: %j',
     (target) => {
       const { onChange } = mount(target);
       expect(
-        screen.getByRole('button', { name: 'Agent' }).textContent
+        screen.getByRole('button', { name: 'Model' }).textContent
       ).toContain('Retired Model');
       expect(screen.getByRole('status').textContent).toContain(
         'not available from this runtime'
@@ -408,7 +412,9 @@ describe('routine execution picker', () => {
     fireEvent.input(prompt, { target: { value: 'Keep writing' } });
     expect(screen.getByRole('status').textContent).toContain('Loading models');
     const trigger = openPicker();
-    fireEvent.click(screen.getByRole('menuitem', { name: /Researcher/ }));
+    fireEvent.keyDown(screen.getByRole('menuitem', { name: /^Researcher/ }), {
+      key: 'Enter',
+    });
     await expectClosed(trigger);
     setCatalogs({
       'in-memory': {
diff --git a/apps/web/src/features/routines/views/routine-execution-picker.tsx b/apps/web/src/features/routines/views/routine-execution-picker.tsx
index 9cdd73dd7f6..3bc3595d40e 100644
--- a/apps/web/src/features/routines/views/routine-execution-picker.tsx
+++ b/apps/web/src/features/routines/views/routine-execution-picker.tsx
@@ -104,7 +104,11 @@ export function RoutineExecutionPickerView(props: Props): JSX.Element {
 
   function select(agent: RosterAgent, override?: string): void {
     if (agent.id === MACRO_PERSONA_ID) {
-      if (override) props.onChange({ kind: 'model', model: override });
+      // Re-choosing Macro keeps its saved model; switching to it starts on its default.
+      const model =
+        override ??
+        (props.target.kind === 'model' ? undefined : agent.defaultModel);
+      if (model) props.onChange({ kind: 'model', model });
       return;
     }
     if (!agent.botId) return;
diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.md
index 1727e376500..a7b87710ca0 100644
--- a/docs/agent-guide/ai-chat.md
+++ b/docs/agent-guide/ai-chat.md
@@ -143,23 +143,22 @@ unified diff with **Back to conversation**; returning preserves the unsent draft
 
 The mobile conversation list omits the desktop **Agents** and **Connections** controls. Use the Agents composer or global create menu to start
 a conversation. Returning to the list and reopening the composer preserves the
-draft, attachments, agent, model, repository, and branch. Tap the
-agent/model control once to open a bottom sheet with its search field focused,
-without first focusing or expanding the message input. Tap an agent to use its
-default model, or its model arrow to choose a model; **Create agent** opens the
-roster. Agents are clustered into **Built-in**, **Your agents**, and **Needs
-connection**, with runtime/model details below their names. Code opens directly
-on these groups without an empty Models section or an unrelated runtime warning.
+draft, attachments, agent, model, repository, and branch. The composer shows
+two icon buttons: the agent's icon and the model's logo. Tap the agent icon once
+to open a bottom sheet of agents, without first focusing or expanding the
+message input. Tap an agent to use its default model; **Create agent** opens the
+roster. Agents are clustered into **Built-in** (Macro first), **Your agents**,
+and **Needs connection**, with runtime/model details below their names. Tap the
+model logo to open the selected agent's model sheet with its search focused.
 **Create agent** uses the shared rounded pill button with a subtle fill at the
 bottom right at the end of the scrolling list. The picker uses one
 continuous surface, with labels and spacing separating groups instead of nested
 shaded cards. Provider sections use compact spacing, with labels close to their
-rows. Model lists start with
-**Suggested**, with Gemini last when available, followed by **More models** and your agents. **More models**
+rows. Model sheets start with
+**Suggested**, with Gemini last when available, followed by **More models**. **More models**
 opens the complete provider catalog, including copies of Suggested choices;
 use Back to return. Search accepts
-model names, IDs, and providers. When browsing an agent, **Use default** in the
-header selects its configured model.
+model names, IDs, and providers.
 
 The floating mobile composer appears only on **Agents**; Home and other views
 keep their New action or their own reply/comment composer.
@@ -434,23 +433,24 @@ the shimmer.
   row. Focusing a session input on a phone also expands it. Height changes animate
   over 200ms, with reduced-motion preferences respected. **Agent** and **Send**
   sit inside the input on the right.
-  Desktop model selectors always show the selected model name alongside the icon.
-  Saved and coding agents show their own icon and name plus the model name on desktop, without a
-  second model icon; phones use an icon-only picker. Routine configuration
-  keeps the saved model name visible in its picker, including unavailable models.
-- The agent dropdown includes saved agents of the selected mode regardless of
-  runtime, plus Cursor in Code mode.
-  Macro's models use the same searchable catalog as running sessions:
+  The composer has two controls: **Agent** shows the selected agent's icon and
+  name (Macro included), and **Model** beside it shows the effective model's
+  logo and name. Phones show both as icon-only buttons. Routine configuration
+  keeps the agent and saved model names visible, including unavailable models.
+- The agent dropdown lists only agents: Macro first under **Built-in**, then
+  saved agents of the selected mode regardless of runtime, plus Cursor in Code
+  mode. Choosing an agent uses its default model and clears any override.
+- The model control lists only the selected agent's harness models, from the
+  same searchable catalog as running sessions. For Macro:
   **Suggested** lists **Opus 5.5**, **Sonnet 5.5**, **GPT-5.6** (Sol in
   runtime catalogs), **GPT-6 Astra**, and **Gemini**, when available, in that order. The
   **More models** submenu contains the complete catalog grouped by provider,
-  including the Suggested choices and effort/speed variants. Your agents
-  follow Suggested and More models in the root menu. Choosing a model
+  including the Suggested choices and effort/speed variants. Choosing a model
   does not reorder the sections. Search matches names, IDs, and provider names. The compact borderless search
   field receives focus when the selector opens or reopens. Its opaque header
   meets the top of the scroll area so rows cannot show through above it.
-  **Built-in**, **Your agents**, and **Needs connection** groups follow when
-  they have entries. Each agent row shows its runtime and model, or its setup
+  In the agent dropdown, **Built-in**, **Your agents**, and **Needs connection**
+  groups appear when they have entries. Each agent row shows its runtime and model, or its setup
   action/availability reason. **Create agent** uses the shared rounded pill
   button at the bottom right with a subtle background. Models have readable
   names (for example, **Sonnet 5.5**) and provider or model icons aligned with the
@@ -461,26 +461,18 @@ the shimmer.
   open-weight models; and Google's **Gemini 3.8 Flash**. The Anthropic models
   are **Sonnet 5.5**, **Opus 5.5**, and **Haiku 4.5**; older Claude versions
   (Sonnet 5, Opus 5, Fable 5.1) are not offered.
-  Selecting a model here selects
-  the default runtime and applies that model to the next send, hiding the repository controls while keeping the mode bar visible.
-  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.
+  A model chosen for Macro is remembered in local storage as the user's
+  default for Macro's in-memory agent until another model is picked; the
+  persona's saved default never changes.
   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
+  If the selected agent is unavailable, its model control is disabled. Model discovery uses the
   selected runtime. Every coding agent shows repository
   controls; chat agents hide those controls but keep the mode bar. Repository/branch overrides are currently applied
   only to Cursor sessions by the create-session API.
   The most recently used supported,
   available agent is selected initially; otherwise Macro is selected.
-  Hover an agent (or use the right arrow key) to open its model submenu, with
-  the searchable Settings catalog, provider icons, and scrollable provider sections.
-  The submenu focuses the `Search models` field so you can type immediately.
-  Clicking an agent directly, or pressing Enter/Space on its focused row, uses
-  its default and clears any previous model override. Right Arrow still opens
-  the model submenu; choosing a submenu model selects both the agent and that
-  model. Escape dismisses the picker and restores focus to its trigger.
+  Opening the model control focuses its `Search models` field so you can type
+  immediately. Escape dismisses either picker and restores focus to the input.
   A checkmark identifies the selected model,
   including when it is the agent’s configured default; there is no separate default row.
   Disconnected Cursor offers **Connect Cursor**, opening Settings → Agents → Runtimes.
@@ -541,8 +533,8 @@ the shimmer.
   and cannot be changed for local sessions. The native Claude/Codex TUI remains
   interactive in Herdr, and local turns appear in the Macro transcript.
 - Sending starts a session with the chosen agent's configured default model;
-  a model selected from its submenu overrides that default for the next send
-  only. Sending or choosing another agent clears the override. This does not
+  a model selected from the model control overrides that default for the next
+  send only (Macro keeps the remembered model described above). Sending or choosing another agent clears the override. This does not
   update the saved agent; configure persistent defaults in the agent editor.
   Within an existing session, the model picker remains available on the right.
   Its trigger, model options, and session metadata use the same readable model names