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.

fix(agents): align model selector and speed button heights (#8972)

Wolf Mermelsteinf389abf8efa2
diff --git a/apps/web/src/features/agents-view/components/ModelSelector.tsx b/apps/web/src/features/agents-view/components/ModelSelector.tsx
index 4218194d7e..019537b20b 100644
--- a/apps/web/src/features/agents-view/components/ModelSelector.tsx
+++ b/apps/web/src/features/agents-view/components/ModelSelector.tsx
@@ -38,7 +38,8 @@ 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]"
+ triggerSize="md"
+ triggerClass="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]"
ariaLabel="Model"
placement="top-end"
disabled={props.disabled}
diff --git a/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx b/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx
index d2fe51bdd7..aa9661f6ad 100644
--- a/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx
+++ b/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx
@@ -20,10 +20,6 @@ import type { ModelOption } from '@service-agent-fold/generated/types';
import { type Component, createMemo, Show } from 'solid-js';
import { withoutRedundantGroups } from './model-groups';
-/** Compact ghost pill — the same trigger for every session composer. */
-const PILL_TRIGGER_CLASS =
- 'h-6 w-auto max-w-[9rem] min-w-0 justify-start gap-1 rounded-full border-transparent bg-ink/5 px-2 text-left text-sm text-ink-subtle hover:bg-ink/10 touch:h-8 touch:max-w-[60vw] touch:gap-1.5 touch:rounded-lg touch:bg-transparent touch:px-1.5 touch:hover:bg-hover';
-
export interface AgentModelSelectorProps {
/** Current model id, when the fold has learned it. */
model: string | null;
@@ -79,7 +75,8 @@ export function AgentModelSelector(props: AgentModelSelectorProps) {
pending={isTouchDevice() && props.changingTo !== undefined}
ariaLabel="Agent model"
emptyMessage="Waiting for the agent to report its models."
- triggerClass={PILL_TRIGGER_CLASS}
+ triggerClass="w-auto max-w-[9rem] min-w-0 justify-start gap-1 rounded-full border-transparent bg-ink/5 px-2 text-left text-sm text-ink-subtle hover:bg-ink/10 touch:max-w-[60vw] touch:gap-1.5 touch:rounded-lg touch:bg-transparent touch:px-1.5 touch:hover:bg-hover"
+ triggerSize="md"
contentClass="overflow-hidden"
placement="top-start"
/>
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 56824152bc..0dc54bb64a 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
@@ -8,7 +8,7 @@ import CheckIcon from '@icon/system/regular/check.svg';
import LockIcon from '@icon/system/regular/lock-simple.svg';
import MagnifyingGlassIcon from '@icon/system/regular/magnifying-glass.svg';
import SquaresFour from '@icon/system/regular/squares-four.svg';
-import { Button, cn, Dropdown } from '@ui';
+import { Button, type ButtonSize, cn, Dropdown } from '@ui';
import {
type Component,
createMemo,
@@ -43,6 +43,7 @@ type ModelCatalogPickerProps = {
children?: JSX.Element;
emptyMessage?: string;
triggerClass?: string;
+ triggerSize?: ButtonSize;
contentClass?: string;
placeholder?: string;
searchPlaceholder?: string;
@@ -227,7 +228,8 @@ export function ModelCatalogPicker(props: ModelCatalogPickerProps) {
);
const triggerClass = () =>
cn(
- 'h-9 justify-between border border-edge-muted bg-transparent px-3 text-left text-sm text-ink hover:bg-ink/3',
+ 'justify-between border border-edge-muted bg-transparent px-3 text-left text-sm text-ink hover:bg-ink/3',
+ props.triggerSize === undefined && 'h-9',
props.triggerClass
);
@@ -253,7 +255,7 @@ export function ModelCatalogPicker(props: ModelCatalogPickerProps) {
>
<Dropdown.Trigger
variant="ghost"
- size="sm"
+ size={props.triggerSize ?? 'sm'}
class={triggerClass()}
aria-label={props.ariaLabel}
aria-busy={props.pending || undefined}
@@ -353,7 +355,7 @@ function ModelCatalogSheet(
ref={setTrigger}
as={Button}
variant="ghost"
- size="sm"
+ size={props.triggerSize ?? 'sm'}
aria-label={props.ariaLabel}
aria-busy={props.pending || undefined}
title={props.title}
diff --git a/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx b/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx
index 44d22c34dd..104db25cfa 100644
--- a/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx
@@ -38,7 +38,7 @@ export function SpeedToggle(props: { model: string }) {
<Show when={speed()}>
<Button
variant="ghost"
- size="icon-composer"
+ size="icon-md"
label={label()}
aria-label={label()}
aria-pressed={enabled()}
diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.md
index 81232d92fd..dce8bbcc79 100644
--- a/docs/agent-guide/ai-chat.md
+++ b/docs/agent-guide/ai-chat.md
@@ -176,6 +176,10 @@ The editor and model picker stay mounted so collapsing preserves the draft.
Dismissing the model or effort selector on mobile returns focus to the message input.
Active sessions use the same compact mobile model drawer: focused search, Suggested
with Gemini last, and More models for the complete provider catalog.
+In new and active agent composers, check that the model selector and lightning
+speed toggle share a height and vertical center: 32px on desktop and 36px with
+touch emulation. Open the model picker and toggle fast mode to verify both
+controls remain interactive at desktop, phone, and tablet widths.
Repository and branch pickers keep the composer expanded while their search
fields are focused, so their anchor stays in place.