Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(agents/app views): tweak new input, update agents view (#6574)
Seamusbea8f9de1214
diff --git a/apps/web/src/features/agents-view/agents-view.css b/apps/web/src/features/agents-view/agents-view.cssindex 493d782b37..cd986f7e22 100644--- a/apps/web/src/features/agents-view/agents-view.css+++ b/apps/web/src/features/agents-view/agents-view.css@@ -348,7 +348,8 @@:where(.agents-view, .agents-view-portal) .composer-drawer-content {display: flex;align-items: center;- padding: 6px 12px 10px;+ margin-top: -32px;+ padding: 42px 12px 10px;border-radius: 0 0 20px 20px;background: var(--surface-2);border: var(--hair) solid var(--edge-muted);diff --git a/apps/web/src/features/agents-view/components/AgentSessionPane.tsx b/apps/web/src/features/agents-view/components/AgentSessionPane.tsxindex c3d8aa0766..061bcc8d58 100644--- a/apps/web/src/features/agents-view/components/AgentSessionPane.tsx+++ b/apps/web/src/features/agents-view/components/AgentSessionPane.tsx@@ -1,28 +1,35 @@import { AgentComposer } from '@app/features/block-agent/component/AgentComposer';import { AgentPullRequestChip } from '@app/features/block-agent/component/AgentPullRequestChip';import { agentSessionTitle } from '@app/features/block-agent/component/AgentSplitHeader';+import { AgentSidePanelSections } from '@app/features/block-agent/component/sidepanel/AgentSidePanelSections';import { Transcript } from '@app/features/block-agent/component/Transcript';import {AgentSessionProvider,useAgentSession,} from '@app/features/block-agent/context/AgentSessionContext';-import { isDisconnected } from '@app/features/block-agent/context/create-session-status-controller';import {forgetPendingSession,pendingSession,} from '@app/features/block-agent/context/pending-session';+import { useBlockEntityCommands } from '@app/features/next-soup/actions';+import { SidePanel } from '@components/app/side-panel';import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';import {SplitTitleFileMenu,StaticSplitLabel,} from '@components/app/split-layout/components/SplitLabel';-import { useSplitLayout } from '@components/app/split-layout/layout';-import { ProviderIcon } from '@core/component/AI/component/ProviderIcon';+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import {+ modelProvider,+ ProviderIcon,+} from '@core/component/AI/component/ProviderIcon';+import { EntityIcon } from '@core/component/EntityIcon';import { LoadErrorPanel } from '@core/component/EntityLoadGate';import { Permissions } from '@core/component/SharePermissions';import {ShareDialogContext,ShareModal,+ ShareTrigger,} from '@core/component/TopBar/ShareButton';import { useUserId } from '@core/context/user';import { openExternalUrl } from '@core/util/url';@@ -30,44 +37,29 @@ import type { AgentSessionEntity } from '@entity';import ArrowSquareOut from '@phosphor/arrow-square-out.svg';import GitBranch from '@phosphor/git-branch.svg';import ShareIcon from '@phosphor/share.svg';-import {- type FavoritesFilter,- useAddFavoriteMutation,- useFavoritesData,- useRemoveFavoriteMutation,-} from '@queries/favorites/favorites';import { createSignal, onCleanup, Show, Suspense } from 'solid-js';-import type { AgentsMode } from '../core/mode';-import { repositoryLabel } from '../core/repository';-import { type RosterAgent, runtimeLabel } from '../core/roster';import { ChatSessionInput } from './ChatComposer';import { SessionModelSelector } from './ModelSelector';-import { modelLabel } from './model-label';import { Topbar } from './Topbar';-const FAVORITES_FILTER: FavoritesFilter = { entityType: ['agent_session'] };--function SessionContent(props: {- mode: AgentsMode;- roster: RosterAgent[];+function SessionCommands(props: {+ entity: AgentSessionEntity;onDeleted: () => void;}) {- const {- blockedOnUser,- loadFailed,- loadRetryable,- metadata,- pending,- retryLoad,- session,- sessionId,- status,- working,- } = useAgentSession();- const { openWithSplit } = useSplitLayout();- const favorites = useFavoritesData(FAVORITES_FILTER);- const addFavorite = useAddFavoriteMutation();- const removeFavorite = useRemoveFavoriteMutation();+ const panel = useSplitPanelOrThrow();+ useBlockEntityCommands({+ id: props.entity.id,+ scopeId: panel.splitHotkeyScope,+ resolveEntity: () => props.entity,+ onDeleted: props.onDeleted,+ });+ return null;+}++function SessionContent(props: { onDeleted: () => void }) {+ const { loadFailed, loadRetryable, metadata, retryLoad, session, sessionId } =+ useAgentSession();+ const panel = useSplitPanelOrThrow();const [shareOpen, setShareOpen] = createSignal(false);const userId = useUserId();@@ -94,38 +86,6 @@ function SessionContent(props: {: current.status.kind,};};- const isFavorite = () => {- const id = sessionId();- return (- !!id &&- (favorites()?.favorites ?? []).some(- (favorite) => favorite.entityId === id- )- );- };- const agent = () =>- props.roster.find((candidate) => candidate.botId === session()?.botId);- const state = () => {- if (pending()) return { cls: 'running', label: 'Starting' };- if (isDisconnected(status()))- return { cls: 'failed', label: 'Disconnected' };- if (blockedOnUser()) return { cls: 'waiting', label: 'Needs input' };- if (working()) return { cls: 'running', label: 'Running' };- return { cls: 'done', label: 'Ready' };- };-- const toggleFavorite = () => {- const id = sessionId();- if (!id) return;- const args = { entityId: id, entityType: 'agent_session' as const };- if (isFavorite()) removeFavorite.mutate(args);- else addFavorite.mutate(args);- };- const openInSplit = () => {- const id = sessionId();- if (id) openWithSplit({ type: 'agent', id }, { referredFrom: 'launcher' });- };-return (<ShareDialogContext.Providervalue={{@@ -134,147 +94,138 @@ function SessionContent(props: {close: () => setShareOpen(false),}}>- <Topbar- title={title()}- titleContent={- <>- <StaticSplitLabel- label={title()}- icon={- <ProviderIcon- model={metadata()?.model ?? session()?.model}- class="size-4 shrink-0"- />- }- />- <Show when={entity()}>- {(current) => (- <SplitTitleFileMenu>- <SplitFileMenu- id={current().id}- itemType="agent_session"- entityKind="agent"- name={title()}- entity={current()}- permissions={permissions()}- onDelete={props.onDeleted}- ops={[- { op: 'rename' },- { op: 'delete' },- {- label: 'Open repository',- icon: GitBranch,- action: () => {- const url = session()?.repoUrl;- if (url) openExternalUrl(url);- },- },- ]}- tools={[- {- label: () => {- const provider = session()?.external?.provider;- if (provider === 'claude-cloud')- return 'Open in Claude';- return provider- ? `Open in ${provider.charAt(0).toUpperCase()}${provider.slice(1)}`- : 'Open externally';- },- icon: ArrowSquareOut,- condition: () => Boolean(session()?.external?.url),- action: () => {- const url = session()?.external?.url;- if (url) openExternalUrl(url);- },- },- {- label: 'Share',- icon: ShareIcon,- action: () => setShareOpen(true),- },- ]}- />- </SplitTitleFileMenu>- )}- </Show>- </>- }- session={{- favorite: isFavorite(),- onToggleFavorite: toggleFavorite,- onShare: () => setShareOpen(true),- onSidePanel: openInSplit,- }}- >- <Show when={session()?.pullRequestUrl}>- {(url) => <AgentPullRequestChip url={url()} />}- </Show>- </Topbar>- <div class="body">- <section class="page pane" data-active aria-label="Agent session">- <div class="meta mono">- <Show when={sessionId()}>- {(id) => (- <span>- <span class="k">session</span> {id()}- </span>- )}- </Show>- <Show when={agent()}>- {(current) => (- <span>- <span class="k">agent</span> @{current().handle}- </span>- )}- </Show>- <Show when={session()?.harness}>- {(harness) => (- <span>- <span class="k">harness</span>{' '}- {runtimeLabel(harness(), undefined, [])}- </span>- )}- </Show>- <Show when={metadata()?.model ?? session()?.model}>- {(model) => (- <span>- <span class="k">model</span> {modelLabel(model())}- </span>- )}- </Show>- <Show when={session()?.repoUrl}>- {(url) => (- <span>- <span class="k">repo</span> {repositoryLabel(url())}- </span>- )}- </Show>- <span class={`stdot ${state().cls}`}>{state().label}</span>- </div>- <Show- when={!loadFailed()}- fallback={- <LoadErrorPanel- title="Unable to load this session"- onRetry={loadRetryable() ? retryLoad : undefined}+ <SidePanel.Root defaultOpen={false} persistKey="agent">+ <Topbar+ title={title()}+ titleContent={+ <>+ <StaticSplitLabel+ label={title()}+ icon={+ <Show+ when={modelProvider(metadata()?.model ?? session()?.model)}+ fallback={+ <EntityIcon+ targetType="chat"+ size="xs"+ class="shrink-0"+ />+ }+ >+ <ProviderIcon+ model={metadata()?.model ?? session()?.model}+ class="size-4 shrink-0"+ />+ </Show>+ }/>- }- >- <div class="transcript-host">- <Transcript />- </div>- <div class="dock">- <div class="composer-anchor">- <AgentComposer- autofocus- input={ChatSessionInput}- modelSelector={SessionModelSelector}- />- </div>- </div>+ <Show when={entity()}>+ {(current) => (+ <>+ <SessionCommands+ entity={current()}+ onDeleted={props.onDeleted}+ />+ <SplitTitleFileMenu>+ <SplitFileMenu+ id={current().id}+ itemType="agent_session"+ entityKind="agent"+ name={title()}+ entity={current()}+ permissions={permissions()}+ onDelete={props.onDeleted}+ ops={[+ { op: 'rename' },+ { op: 'delete' },+ {+ label: 'Open repository',+ icon: GitBranch,+ action: () => {+ const url = session()?.repoUrl;+ if (url) openExternalUrl(url);+ },+ },+ ]}+ tools={[+ {+ label: () => {+ const provider = session()?.external?.provider;+ if (provider === 'claude-cloud')+ return 'Open in Claude';+ return provider+ ? `Open in ${provider.charAt(0).toUpperCase()}${provider.slice(1)}`+ : 'Open externally';+ },+ icon: ArrowSquareOut,+ condition: () => Boolean(session()?.external?.url),+ action: () => {+ const url = session()?.external?.url;+ if (url) openExternalUrl(url);+ },+ },+ {+ label: 'Share',+ icon: ShareIcon,+ action: () => setShareOpen(true),+ },+ ]}+ />+ </SplitTitleFileMenu>+ </>+ )}+ </Show>+ </>+ }+ >+ <Show when={session()?.pullRequestUrl}>+ {(url) => <AgentPullRequestChip url={url()} />}</Show>- </section>- </div>+ <Show when={sessionId()}>+ {(id) => (+ <ShareTrigger+ id={id()}+ blockType="agent"+ hotkeyScope={panel.splitHotkeyScope}+ />+ )}+ </Show>+ <SidePanel.Toggle />+ </Topbar>+ <div class="relative min-h-0 min-w-0 flex-1">+ <SidePanel.Layout headerToggle={false}>+ <AgentSidePanelSections />+ <section+ class="page pane size-full min-w-0"+ data-active+ aria-label="Agent session"+ >+ <Show+ when={!loadFailed()}+ fallback={+ <LoadErrorPanel+ title="Unable to load this session"+ onRetry={loadRetryable() ? retryLoad : undefined}+ />+ }+ >+ <div class="transcript-host">+ <Transcript />+ </div>+ <div class="dock">+ <div class="composer-anchor">+ <AgentComposer+ autofocus+ input={ChatSessionInput}+ modelSelector={SessionModelSelector}+ />+ </div>+ </div>+ </Show>+ </section>+ </SidePanel.Layout>+ </div>+ </SidePanel.Root><Show when={sessionId() && session()}>{(_) => (@@ -299,8 +250,6 @@ function SessionContent(props: {/** A conversation opened in the workspace: its title row, transcript, and composer. */export function AgentSessionPane(props: {id: string;- mode: AgentsMode;- roster: RosterAgent[];onSessionId: (sessionId: string) => void;onDeleted: () => void;}) {@@ -313,11 +262,7 @@ export function AgentSessionPane(props: {return (<AgentSessionProvider blockId={props.id} onSessionId={props.onSessionId}>- <SessionContent- mode={props.mode}- roster={props.roster}- onDeleted={props.onDeleted}- />+ <SessionContent onDeleted={props.onDeleted} /></AgentSessionProvider>);}diff --git a/apps/web/src/features/agents-view/components/ChatComposer.test.tsx b/apps/web/src/features/agents-view/components/ChatComposer.test.tsxindex 0d6c5a20af..b98b0f5478 100644--- a/apps/web/src/features/agents-view/components/ChatComposer.test.tsx+++ b/apps/web/src/features/agents-view/components/ChatComposer.test.tsx@@ -1,9 +1,18 @@+import { $createQuoteNode, QuoteNode } from '@lexical/rich-text';import { fireEvent, render, screen } from '@solidjs/testing-library';+import {+ $createParagraphNode,+ $createTextNode,+ $getRoot,+ createEditor,+ type LexicalEditor,+} from 'lexical';import { createSignal } from 'solid-js';import { beforeEach, describe, expect, it, vi } from 'vitest';import { ChatComposer, ChatSessionInput } from './ChatComposer';const editor = vi.hoisted(() => ({+ lexical: undefined as LexicalEditor | undefined,clear: vi.fn(),setMarkdown: vi.fn(),enter: undefined as@@ -17,7 +26,9 @@ vi.mock('@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder',() => ({buildConfig: () => {+ editor.lexical = createEditor({ nodes: [QuoteNode] });const builder = {+ buildHandle: () => ({ lexical: editor.lexical }),namespace: () => builder,withMentions: () => builder,withEmojis: () => builder,@@ -42,11 +53,7 @@ vi.mock(focus: vi.fn(),getMarkdown: () => editor.text,},- lexical: {- update: vi.fn(),- dispatchCommand: vi.fn(),- getRootElement: () => null,- },+ lexical: editor.lexical,};return builder;},@@ -60,6 +67,14 @@ vi.mock('@core/component/LexicalMarkdown/builder/MarkdownShell', () => ({}));beforeEach(() => {+ vi.stubGlobal(+ 'ResizeObserver',+ class {+ observe() {}+ unobserve() {}+ disconnect() {}+ }+ );vi.clearAllMocks();editor.text = '';editor.enter = undefined;@@ -194,3 +209,27 @@ describe('Chat session input', () => {expect(event.defaultPrevented).toBe(false);});});++it('expands for a short quote and collapses when replaced with a paragraph', () => {+ const { container } = render(() => <ChatSessionInput onSend={vi.fn()} />);+ const layout = container.querySelector('[data-composer-compact]');+ expect(layout?.getAttribute('data-composer-compact')).toBe('true');+ editor.lexical!.update(+ () => {+ $getRoot()+ .clear()+ .append($createQuoteNode().append($createTextNode('short')));+ },+ { discrete: true }+ );+ expect(layout?.getAttribute('data-composer-compact')).toBe('false');+ editor.lexical!.update(+ () => {+ $getRoot()+ .clear()+ .append($createParagraphNode().append($createTextNode('short')));+ },+ { discrete: true }+ );+ expect(layout?.getAttribute('data-composer-compact')).toBe('true');+});diff --git a/apps/web/src/features/agents-view/components/ChatComposer.tsx b/apps/web/src/features/agents-view/components/ChatComposer.tsxindex b994c35907..374f815598 100644--- a/apps/web/src/features/agents-view/components/ChatComposer.tsx+++ b/apps/web/src/features/agents-view/components/ChatComposer.tsx@@ -1,9 +1,11 @@import type { AgentInputProps } from '@app/features/block-agent/ui';import { buildConfig } from '@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder';import { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownShell';+import { createComposerLayout } from '@core/component/LexicalMarkdown/utils/create-composer-layout';import { isTouchDevice } from '@core/mobile/isTouchDevice';import { useTouchOutsideToDismissKeyboard } from '@core/mobile/useTouchOutsideToDismissKeyboard';import { $insertReferencedPaste } from '@macro-inc/lexical-core';+import { createResizeObserver } from '@solid-primitives/resize-observer';import { Button, ComposerSurface, SendButton } from '@ui';import {createEffect,@@ -33,6 +35,11 @@ export function ChatComposer(props: {() => props.draft.trim().length === 0,!props.session);+ const [layout, setLayout] = createSignal<HTMLDivElement>();+ const [height, setHeight] = createSignal<number>();+ createResizeObserver(layout, (_, element) => {+ setHeight(element.getBoundingClientRect().height);+ });let container: HTMLDivElement | undefined;useTouchOutsideToDismissKeyboard(() => container);const disabled = () => !!props.blockedReason || props.session?.disabled;@@ -73,6 +80,10 @@ export function ChatComposer(props: {editor.withSkills();}+ const { isCompact } = createComposerLayout(editor.buildHandle().lexical, {+ container: layout,+ });+// Apply host-supplied drafts (Home suggestions) to the existing editor.createEffect(() => {if (props.draft !== editor.controls.getMarkdown())@@ -119,72 +130,79 @@ export function ChatComposer(props: {<ComposerSurfaceas="div"data-agent-composer="chat"- class="flex min-w-0 items-end gap-2 rounded-[32px] px-4 py-3"+ class="relative z-10 min-w-0 rounded-[32px] transition-[height] duration-150 ease-out motion-reduce:transition-none"+ style={{ height: height() === undefined ? undefined : `${height()}px` }}onPointerDown={focusEditor}onMouseDown={focusEditor}>- <div class="max-h-60 min-w-0 flex-1 self-center overflow-y-auto px-1">- <MarkdownShell- class="h-auto min-h-6 text-base leading-6 [&_[data-markdown-editable]]:min-h-6 [&_[data-markdown-editable]]:outline-none [&_[data-markdown-editable]>.md-p]:my-0 [&_[data-markdown-placeholder]]:max-w-full [&_[data-markdown-placeholder]>p]:m-0 [&_[data-markdown-placeholder]>p]:truncate"- config={editor}- initialValue={props.draft}- placeholder={props.placeholder ?? tip()}- refFn={(element) =>- element.setAttribute('aria-label', 'Message the agent')- }- autofocus={- !isTouchDevice() &&- (props.autoFocus ?? props.session?.autofocus ?? true)- }- />- </div><div- data-composer-controls- class="flex min-w-0 max-w-[55%] shrink-0 items-center"- role="group"- aria-label="Composer settings"+ ref={setLayout}+ data-composer-compact={isCompact()}+ class="group/composer flex min-w-0 data-[composer-compact=false]:flex-col data-[composer-compact=false]:items-stretch items-end gap-2 px-4 py-3">- <div class="ml-auto flex min-w-0 max-w-full items-center gap-2 [&_.menu]:right-0 [&_.menu]:left-auto [&_.menu-anchor]:min-w-0 [&_.pill]:max-w-full">- {props.selector}- <Show- when={- props.session?.busy &&- props.session.onStop &&- !props.draft.trim()+ <div class="max-h-60 min-w-0 flex-1 self-center group-data-[composer-compact=false]/composer:flex-none group-data-[composer-compact=false]/composer:self-stretch overflow-y-auto px-1">+ <MarkdownShell+ class="h-auto min-h-6 text-base leading-6 [&_[data-markdown-editable]]:min-h-6 [&_[data-markdown-editable]]:outline-none [&_[data-markdown-editable]>.md-p]:my-0 [&_[data-markdown-placeholder]]:max-w-full [&_[data-markdown-placeholder]>p]:m-0 [&_[data-markdown-placeholder]>p]:truncate"+ config={editor}+ initialValue={props.draft}+ placeholder={props.placeholder ?? tip()}+ refFn={(element) =>+ element.setAttribute('aria-label', 'Message the agent')}- fallback={- <SendButton- appearance="composer"- aria-label="Send"- title={props.blockedReason}- disabled={!props.draft.trim() || disabled()}- onClick={() => send()}- />+ autofocus={+ !isTouchDevice() &&+ (props.autoFocus ?? props.session?.autofocus ?? true)}- >+ />+ </div>+ <div+ data-composer-controls+ class="flex min-w-0 max-w-[55%] group-data-[composer-compact=false]/composer:max-w-none shrink-0 items-center"+ role="group"+ aria-label="Composer settings"+ >+ <div class="ml-auto flex min-w-0 max-w-full items-center gap-2 [&_.menu]:right-0 [&_.menu]:left-auto [&_.menu-anchor]:min-w-0 [&_.pill]:max-w-full">+ {props.selector}<Show- when={canSendNext()}+ when={+ props.session?.busy &&+ props.session.onStop &&+ !props.draft.trim()+ }fallback={- <Button- variant="strong"- size="icon-composer"- label="Stop"- disabled={disabled()}- onClick={() => props.session?.onStop?.()}- >- <div class="size-3.5 rounded-sm bg-current" />- </Button>+ <SendButton+ appearance="composer"+ aria-label="Send"+ title={props.blockedReason}+ disabled={!props.draft.trim() || disabled()}+ onClick={() => send()}+ />}>- <SendButton- appearance="composer"- aria-label="Send next queued message"- tooltip="Send next queued message"- shortcut="Enter"- onClick={() => props.session?.onStop?.()}- />+ <Show+ when={canSendNext()}+ fallback={+ <Button+ variant="strong"+ size="icon-composer"+ label="Stop"+ disabled={disabled()}+ onClick={() => props.session?.onStop?.()}+ >+ <div class="size-3.5 rounded-sm bg-current" />+ </Button>+ }+ >+ <SendButton+ appearance="composer"+ aria-label="Send next queued message"+ tooltip="Send next queued message"+ shortcut="Enter"+ onClick={() => props.session?.onStop?.()}+ />+ </Show></Show>- </Show>+ </div></div></div></ComposerSurface>diff --git a/apps/web/src/features/agents-view/components/ModelSelector.test.tsx b/apps/web/src/features/agents-view/components/ModelSelector.test.tsxindex 58bac1ad90..29af4a9019 100644--- a/apps/web/src/features/agents-view/components/ModelSelector.test.tsx+++ b/apps/web/src/features/agents-view/components/ModelSelector.test.tsx@@ -42,7 +42,6 @@ describe('shared model selector', () => {/>));const trigger = screen.getByRole('button', { name: 'Model' });- expect(trigger.classList.contains('pill')).toBe(true);fireEvent.keyDown(trigger, { key: 'Enter' });fireEvent.keyDown(screen.getByRole('menuitem', { name: /Sonnet 4/ }), {key: 'Enter',diff --git a/apps/web/src/features/agents-view/components/ModelSelector.tsx b/apps/web/src/features/agents-view/components/ModelSelector.tsxindex 5516b00e46..c35cd7ba39 100644--- a/apps/web/src/features/agents-view/components/ModelSelector.tsx+++ b/apps/web/src/features/agents-view/components/ModelSelector.tsx@@ -32,7 +32,7 @@ export function ModelSelector(props: {}))}triggerLabel={props.label}placeholder={modelLabel(props.model)}- triggerClass="pill min-w-0 max-w-full gap-2 border-0 text-ink-muted"+ 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]"ariaLabel="Model"placement="top-end"disabled={props.disabled}diff --git a/apps/web/src/features/agents-view/components/Topbar.test.tsx b/apps/web/src/features/agents-view/components/Topbar.test.tsxindex 4892d95b8e..5fed6c2a14 100644--- a/apps/web/src/features/agents-view/components/Topbar.test.tsx+++ b/apps/web/src/features/agents-view/components/Topbar.test.tsx@@ -8,21 +8,17 @@ vi.mock('@app/components/view-shell/ViewShell', () => ({TopBar: (props: ParentProps) => <div>{props.children}</div>,},}));+vi.mock('@components/app/split-panel', () => ({+ SplitPanel: { CloseButton: () => null },+}));afterEach(cleanup);it('uses the block title control without duplicating its title or session menu', () => {const share = vi.fn();render(() => (- <Topbar- title="Session"- titleContent={<button>Session title menu</button>}- session={{- favorite: false,- onToggleFavorite: vi.fn(),- onShare: share,- onSidePanel: vi.fn(),- }}- />+ <Topbar title="Session" titleContent={<button>Session title menu</button>}>+ <button onClick={share}>Share</button>+ </Topbar>));expect(screen.getByRole('button', { name: 'Session title menu' })@@ -38,4 +34,6 @@ it('keeps the plain heading for the new conversation page', () => {expect(screen.getByRole('heading', { name: 'New conversation' })).toBeTruthy();+ expect(screen.queryByRole('button', { name: 'Share' })).toBeNull();+ expect(screen.queryByRole('button', { name: 'Side panel' })).toBeNull();});diff --git a/apps/web/src/features/agents-view/components/Topbar.tsx b/apps/web/src/features/agents-view/components/Topbar.tsxindex 232418b046..27d659c311 100644--- a/apps/web/src/features/agents-view/components/Topbar.tsx+++ b/apps/web/src/features/agents-view/components/Topbar.tsx@@ -1,79 +1,25 @@import { ViewShell } from '@app/components/view-shell/ViewShell';-import ShareIcon from '@phosphor/share.svg';-import SidebarIcon from '@phosphor/sidebar.svg';-import SparkleIcon from '@phosphor/sparkle.svg';-import SparkleFillIcon from '@phosphor-fill/sparkle-fill.svg';-import { type JSX, Show } from 'solid-js';+import { SplitPanel } from '@components/app/split-panel';+import type { JSX } from 'solid-js';-/** What the toolbar can do to the open session. */-export type SessionActions = {- favorite: boolean;- onToggleFavorite: () => void;- onShare: () => void;- onSidePanel: () => void;-};--/**- * The main pane's title row. Session-only controls stay in the markup and the- * stylesheet hides them until the root carries `data-session`.- */+/** Shared workspace chrome for conversation and new-session pages. */export function Topbar(props: {title: string;titleContent?: JSX.Element;- session?: SessionActions;children?: JSX.Element;}) {return (<ViewShell.TopBar class="touch:flex">- <div class="flex min-w-0 flex-1 items-center">+ <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />+ <div class="flex min-w-0 items-center gap-1">{props.titleContent ?? (- <h1 class="min-w-0 truncate text-sm font-semibold text-ink">+ <h1 class="min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink">{props.title}</h1>)}</div>- <div class="flex shrink-0 items-center gap-2">+ <div class="ml-auto flex shrink-0 items-center gap-2">{props.children}- <div class="bbar" role="toolbar" aria-label="Session actions">- <button- type="button"- class="icon-btn session-only"- aria-label={- props.session?.favorite ? 'Remove from favorites' : 'Favorite'- }- title="Favorite"- aria-pressed={props.session?.favorite}- disabled={!props.session}- onClick={() => props.session?.onToggleFavorite()}- >- <Show- when={props.session?.favorite}- fallback={<SparkleIcon class="ph" />}- >- <SparkleFillIcon class="ph" style={{ color: 'var(--accent)' }} />- </Show>- </button>- <button- type="button"- class="icon-btn"- aria-label="Share"- title="Share"- disabled={!props.session}- onClick={() => props.session?.onShare()}- >- <ShareIcon class="ph" />- </button>- <button- type="button"- class="icon-btn"- aria-label="Side panel"- title="Side panel (])"- disabled={!props.session}- onClick={() => props.session?.onSidePanel()}- >- <SidebarIcon class="ph" />- </button>- </div></div></ViewShell.TopBar>);diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsxindex 0ce0d23030..62695f940a 100644--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx@@ -57,32 +57,34 @@ export function AgentPicker(props: {? label(): `${props.selected?.name ?? 'Choose agent'} · ${label()}`}- class="pill min-w-0 max-w-full gap-2"+ class="h-[33.75px] min-w-0 max-w-full gap-[5.625px] rounded-full bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder"><Showwhen={rawModel()}fallback={<Show when={props.selected}>- {(agent) => <AgentIcon agent={agent()} class="size-6 shrink-0" />}+ {(agent) => (+ <AgentIcon agent={agent()} class="size-[15px] shrink-0" />+ )}</Show>}>- <ProviderIcon model={model()} class="size-6" />+ <ProviderIcon model={model()} class="size-[15px]" /></Show>- <span class="min-w-0 truncate text-left text-sm leading-5">+ <span class="min-w-0 truncate text-left leading-5"><Showwhen={rawModel()}fallback={<>{props.selected?.name ?? 'Choose agent'}- <span class="text-[13px] text-ink-muted"> · {label()}</span>+ <span> · {label()}</span></>}>{label()}</Show></span>- <CaretDownIcon class="size-3 shrink-0" />+ <CaretDownIcon class="size-[15px] shrink-0" /></Dropdown.Trigger><Dropdown.Contentclass="w-80 max-w-[calc(100vw-1rem)] overflow-hidden"@@ -134,12 +136,14 @@ export function AgentPicker(props: {title={modelLabel(option.id, option.name)}onSelect={() => choose(agent(), option.id)}>- <Show- when={modelProvider(option.id)}- fallback={<SparkleIcon class="size-5 shrink-0" />}- >- <ProviderIcon model={option.id} class="size-5" />- </Show>+ <span class="flex size-5 shrink-0 items-center justify-center">+ <Show+ when={modelProvider(option.id)}+ fallback={<SparkleIcon class="size-4 shrink-0" />}+ >+ <ProviderIcon model={option.id} class="size-4" />+ </Show>+ </span><span class="min-w-0 flex-1 truncate">{modelLabel(option.id, option.name)}</span>diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsxindex 9ca4046e71..42d18c7798 100644--- a/apps/web/src/features/agents-view/views/AgentsView.tsx+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx@@ -6,6 +6,7 @@ import { PreviewPanel } from '@components/app/PreviewPanel';import { useSplitLayout } from '@components/app/split-layout/layout';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { SplitPanel } from '@components/app/split-panel';+import { ChatEmptyStateContext } from '@core/component/AI/component/message/EmptyChatState';import { StaticMarkdownContext } from '@core/component/LexicalMarkdown/component/core/StaticMarkdown';import { toast } from '@core/component/Toast/Toast';import { useUserId } from '@core/context/user';@@ -381,8 +382,6 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {<Suspense fallback={<LoadingComposer />}><AgentSessionPaneid={conversation.id}- mode={mode()}- roster={rosterSource.roster()}onSessionId={(sessionId) =>adoptSessionId(conversation.id, sessionId)}@@ -391,14 +390,26 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {</Suspense></Match><Match when={true}>- <Topbar title="Chat" /><div class="body"><Suspense fallback={<LoadingComposer />}>- <PreviewPanel- selectedEntity={conversation}- orchestrator={orchestrator}- splitPanelContext={panel}- />+ <ChatEmptyStateContext.Provider+ value={() => (+ <div class="px-4 py-16 text-center">+ <h2 class="text-[28px] font-medium tracking-[-0.03em] text-ink">+ What should we work on?+ </h2>+ </div>+ )}+ >+ <PreviewPanel+ selectedEntity={conversation}+ orchestrator={orchestrator}+ splitPanelContext={panel}+ headerLeading={+ <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />+ }+ />+ </ChatEmptyStateContext.Provider></Suspense></div></Match>diff --git a/apps/web/src/features/block-agent/ui/AgentInput.test.tsx b/apps/web/src/features/block-agent/ui/AgentInput.test.tsxindex 22b9755de8..a74a31a54a 100644--- a/apps/web/src/features/block-agent/ui/AgentInput.test.tsx+++ b/apps/web/src/features/block-agent/ui/AgentInput.test.tsx@@ -1,3 +1,11 @@+import { $createQuoteNode, QuoteNode } from '@lexical/rich-text';+import {+ $createParagraphNode,+ $createTextNode,+ $getRoot,+ createEditor,+ type LexicalEditor,+} from 'lexical';/*** @vitest-environment jsdom*/@@ -7,6 +15,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';import { AgentInput } from './AgentInput';const editor = vi.hoisted(() => ({+ lexical: undefined as LexicalEditor | undefined,clear: vi.fn(),enter: undefined as (() => boolean) | undefined,change: undefined as ((markdown: string) => void) | undefined,@@ -16,7 +25,9 @@ vi.mock('@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder',() => ({buildConfig: () => {+ editor.lexical = createEditor({ nodes: [QuoteNode] });const builder = {+ buildHandle: () => ({ lexical: editor.lexical }),namespace: () => builder,withMentions: () => builder,withEmojis: () => builder,@@ -38,9 +49,7 @@ vi.mock(clear: editor.clear,focus: vi.fn(),},- lexical: {- update: vi.fn(),- },+ lexical: editor.lexical,};return builder;},@@ -67,6 +76,14 @@ vi.mock();beforeEach(() => {+ vi.stubGlobal(+ 'ResizeObserver',+ class {+ observe() {}+ unobserve() {}+ disconnect() {}+ }+ );editor.clear.mockClear();editor.enter = undefined;editor.change = undefined;@@ -118,3 +135,27 @@ describe('queued message advancement', () => {expect(onStop).not.toHaveBeenCalled();});});++it('expands for a short quote and collapses when replaced with a paragraph', () => {+ const { container } = render(() => <AgentInput onSend={vi.fn()} />);+ const layout = container.querySelector('[data-composer-compact]');+ expect(layout?.getAttribute('data-composer-compact')).toBe('true');+ editor.lexical!.update(+ () => {+ $getRoot()+ .clear()+ .append($createQuoteNode().append($createTextNode('short')));+ },+ { discrete: true }+ );+ expect(layout?.getAttribute('data-composer-compact')).toBe('false');+ editor.lexical!.update(+ () => {+ $getRoot()+ .clear()+ .append($createParagraphNode().append($createTextNode('short')));+ },+ { discrete: true }+ );+ expect(layout?.getAttribute('data-composer-compact')).toBe('true');+});diff --git a/apps/web/src/features/block-agent/ui/AgentInput.tsx b/apps/web/src/features/block-agent/ui/AgentInput.tsxindex e0f429cd7e..475922b40c 100644--- a/apps/web/src/features/block-agent/ui/AgentInput.tsx+++ b/apps/web/src/features/block-agent/ui/AgentInput.tsx@@ -1,3 +1,4 @@+import { createResizeObserver } from '@solid-primitives/resize-observer';/*** The agent block's composer: the chat input's look and its markdown editing* surface (`MarkdownShell` over a lean `EditorConfigBuilder`), including `@`@@ -10,6 +11,7 @@import { buildConfig } from '@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder';import { ComposerEditor } from '@core/component/LexicalMarkdown/component/ComposerEditor';import type { AgentCommandItem } from '@core/component/LexicalMarkdown/plugins';+import { createComposerLayout } from '@core/component/LexicalMarkdown/utils/create-composer-layout';import { isMobile } from '@core/mobile/isMobile';import { isTouchDevice } from '@core/mobile/isTouchDevice';import { useTouchOutsideToDismissKeyboard } from '@core/mobile/useTouchOutsideToDismissKeyboard';@@ -66,27 +68,20 @@ export interface AgentInputProps {registerFocus?: (focus: (() => void) | undefined) => void;}-/** Past this height a phone draft is scroll-capped so it cannot eat the dock. */-const SINGLE_LINE_HEIGHT = 40;-export function AgentInput(props: AgentInputProps) {const [markdown, setMarkdown] = createSignal('');let containerRef: HTMLDivElement | undefined;- let bodyRef: HTMLDivElement | undefined;+ const [layout, setLayout] = createSignal<HTMLDivElement>();+ const [height, setHeight] = createSignal<number>();+ createResizeObserver(layout, (_, element) => {+ setHeight(element.getBoundingClientRect().height);+ });useTouchOutsideToDismissKeyboard(() => containerRef);// Sending while busy is allowed — the service queues prompts behind the// running turn.const canSend = () => markdown().trim().length > 0 && !props.disabled;- // Caps tall drafts on a phone so the editor cannot eat the viewport- // above the dock. Controls live in a footer row, not over the text.- const isMultiline = () => {- if (markdown().trim().length === 0) return false;- if (!bodyRef) return false;- return bodyRef.scrollHeight > SINGLE_LINE_HEIGHT;- };-const send = () => {if (!canSend()) return;const content = markdown().trim();@@ -136,6 +131,14 @@ export function AgentInput(props: AgentInputProps) {}).onChange(setMarkdown);+ const { isCompact, hasMultilineContent } = createComposerLayout(+ editor.buildHandle().lexical,+ {+ container: layout,+ mode: () => (isTouchDevice() ? 'expanded' : 'auto'),+ }+ );+onMount(() => {props.registerFocus?.(() => editor.controls.focus());onCleanup(() => props.registerFocus?.(undefined));@@ -178,19 +181,23 @@ export function AgentInput(props: AgentInputProps) {</Show>{/* h-auto beats Surface's size-full so the in-flow controls are notclipped over the editor (that was Auto sitting on the placeholder). */}- <ComposerSurface class="h-auto">+ <ComposerSurface+ class="h-auto transition-[height] duration-150 ease-out motion-reduce:transition-none"+ style={{ height: height() === undefined ? undefined : `${height()}px` }}+ >{/* Desktop: one row, send right of the text. Touch: the text getsthe whole width and the controls drop to a footer row (modelleft, send right) — the chat-tall / channel footer shape. */}<div- class="flex items-end gap-[3.75px] p-[7.5px] min-h-[48.75px] touch:min-h-0 touch:flex-col touch:items-stretch touch:gap-0 touch:p-0"+ ref={setLayout}+ data-composer-compact={isCompact()}+ class="group/composer flex items-end data-[composer-compact=false]:flex-col data-[composer-compact=false]:items-stretch gap-[3.75px] p-[7.5px] min-h-[48.75px] touch:min-h-0 touch:flex-col touch:items-stretch touch:gap-0 touch:p-0"onPointerDown={focusEditor}onMouseDown={focusEditor}><divid={AGENT_INPUT_TEXT_AREA_ID}- ref={bodyRef}- class="min-w-0 flex-1 text-base text-ink not-touch:px-[9.375px] not-touch:py-[4.6875px] not-touch:leading-[24.375px] not-touch:min-h-[24.375px] not-touch:text-composer-ink touch:px-3 touch:py-2"+ class="min-w-0 flex-1 group-data-[composer-compact=false]/composer:flex-none text-base text-ink not-touch:px-[9.375px] not-touch:py-[4.6875px] not-touch:leading-[24.375px] not-touch:min-h-[24.375px] not-touch:text-composer-ink touch:px-3 touch:py-2"classList={{// While empty only the placeholder renders; keep it to one clipped// line so it doesn't wrap into the single-line height.@@ -198,7 +205,7 @@ export function AgentInput(props: AgentInputProps) {markdown().trim().length === 0,// Long drafts must not eat the mobile viewport above the dock.'max-h-[calc(32*var(--dvh,1dvh))] overflow-y-auto':- isMultiline() && isMobile(),+ hasMultilineContent() && isMobile(),}}><ComposerEditordiff --git a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsxindex 0c1b7279bf..3e8df761e7 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@@ -1,6 +1,7 @@import CaretDown from '@phosphor/caret-left.svg';import CaretRight from '@phosphor/caret-right.svg';import CheckIcon from '@phosphor/check.svg';+import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';import SparkleIcon from '@phosphor/sparkle.svg';import { cn, Dropdown } from '@ui';import { createMemo, createSignal, For, type JSX, Show } from 'solid-js';@@ -174,23 +175,29 @@ export function ModelCatalogMenu(return (<>- <div class="border-b border-edge-muted bg-menu p-1.5">- <input- ref={props.searchRef}- aria-label={props.searchPlaceholder ?? 'Search models'}- placeholder={props.searchPlaceholder ?? 'Search models'}- value={query()}- onInput={(event) => setQuery(event.currentTarget.value)}- onMouseDown={(event: MouseEvent) => event.stopPropagation()}- onClick={(event) => event.stopPropagation()}- onKeyDown={(event) => {- if (event.key !== 'Escape') event.stopPropagation();- }}- onKeyUp={(event) => {- if (event.key !== 'Escape') event.stopPropagation();- }}- class="w-full rounded-lg border border-edge-muted bg-transparent px-3 py-2 text-sm text-ink outline-none placeholder:text-ink-extra-muted focus:border-accent"- />+ <div class="bg-menu p-1.5">+ <div class="flex items-center gap-2 px-2">+ <MagnifyingGlassIcon+ aria-hidden="true"+ class="size-4 shrink-0 text-ink-extra-muted"+ />+ <input+ ref={props.searchRef}+ aria-label={props.searchPlaceholder ?? 'Search models'}+ placeholder={props.searchPlaceholder ?? 'Search models'}+ value={query()}+ onInput={(event) => setQuery(event.currentTarget.value)}+ onMouseDown={(event: MouseEvent) => event.stopPropagation()}+ onClick={(event) => event.stopPropagation()}+ onKeyDown={(event) => {+ if (event.key !== 'Escape') event.stopPropagation();+ }}+ onKeyUp={(event) => {+ if (event.key !== 'Escape') event.stopPropagation();+ }}+ class="min-w-0 w-full border-0 bg-transparent py-2 text-sm text-ink outline-none placeholder:text-ink-extra-muted"+ />+ </div></div>{props.children}@@ -220,7 +227,6 @@ export function ModelCatalogMenu(</Show><Show when={extraCount() > 0}>- <Dropdown.Separator class="h-px border-0 bg-edge-muted" /><Dropdown.Group><Dropdown.Sub><Dropdown.SubTrigger>diff --git a/apps/web/src/lib/core/component/AI/component/message/EmptyChatState.tsx b/apps/web/src/lib/core/component/AI/component/message/EmptyChatState.tsxindex 16f7a76973..a9a6e756c9 100644--- a/apps/web/src/lib/core/component/AI/component/message/EmptyChatState.tsx+++ b/apps/web/src/lib/core/component/AI/component/message/EmptyChatState.tsx@@ -1,5 +1,9 @@import { ChatTipsSection } from '@app/features/home/chat-tips';import { RecentSessionsSection } from '@app/features/home/home-recent-sessions';+import { createContext, type JSX, useContext } from 'solid-js';++/** Allows a host to replace the standalone chat onboarding surface. */+export const ChatEmptyStateContext = createContext<() => JSX.Element>();/*** Empty state for a fresh chat, laid out identically to the home body:@@ -7,6 +11,8 @@ import { RecentSessionsSection } from '@app/features/home/home-recent-sessions';* content — forcing the parent height here would guarantee a scrollbar.*/export function EmptyChatState() {+ const renderEmptyState = useContext(ChatEmptyStateContext);+ if (renderEmptyState) return renderEmptyState();return (<div class="mx-auto flex w-full max-w-3xl flex-col gap-6 px-4 pb-6 pt-10 md:pt-16"><RecentSessionsSection />diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.mdindex 9a19c0353a..53c16f7942 100644--- a/docs/AGENT_GUIDE/ai-chat.md+++ b/docs/AGENT_GUIDE/ai-chat.md@@ -10,7 +10,12 @@runtime status. Changing the composer mode does not filter the sidebar.Selecting a row opens its own mode; Shift-click opens it in a new split.- The starting page has a compact composer that starts at one line and grows- with longer prompts or Shift+Enter. **Agent** and **Send** sit inside the input on the right.+ with longer prompts or Shift+Enter. Lists, quotes, headings, and other+ non-paragraph blocks expand immediately, even with short text. This also applies+ to session composers. The editor takes the full width and controls move below;+ returning to a short paragraph restores the compact row. Height changes animate+ over 150ms, with reduced-motion preferences respected. **Agent** and **Send**+ sit inside the input on the right.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 isno Chat/Code switch or separate model button.@@ -37,7 +42,9 @@while the agent and model lists scroll. It opens the roster on the selected kind'stab, where either kind can be created.- Selecting a coding agent reveals a repository drawer directly under the input- with a short slide and fade; selecting a chat agent retracts it. Reduced-motion+ with a short slide and fade; it extends 32px behind the rounded input and stays+ behind it throughout the transition, keeping its existing edge-muted border.+ Selecting a chat agent retracts it. Reduced-motionpreferences disable the animation. The hidden drawer is inert. **Repository**offers **Choose automatically**, recent repositories, or GitHub `owner/repo` /URL entry confirmed with **Use repository**. Once selected, **Branch** opens@@ -379,6 +386,16 @@ outside the tool group so the live reasoning row stays visible. Do not waitfor every Thinking label to disappear — only the tail one is in flight.### Sharing a session+In the Agents workspace, saved sessions use the shared top-bar controls: session+icon, title and action menu, Share, Copy Share Link, and a side-panel toggle.+There is no breadcrumb because Agents has no subspaces. Unknown model providers+fall back to the chat icon. The toggle (or `]`) opens the session's Details, Plan,+Changes, and Activity sections when available, beside the transcript in wide+layouts or over it in narrow layouts; it does not open another split.+New conversation pages have no disabled session action buttons. Older chats+also have one header row, and empty chats show a simple conversation prompt+instead of the standalone recent-sessions and tips surface.+Saved sessions have **Share** and **Copy Share Link** in the desktop header;on mobile, open the session title menu and choose **Share**. The owner canselect people or channels and send the session with an optional message using@@ -502,6 +519,10 @@ Both AI composers display their model trigger label at the input text size(15px), using the softer secondary text color. This includes the agent modelcatalog trigger and mobile model sheet trigger. Opening the agent modelcatalog focuses the `Search models` field so you can type immediately.+The search field is borderless inside the menu. New-session and active-session+model triggers use a transparent round pill with a background only on hover,+15px icons, and compact spacing,+matching the production chat composer's proportions.Soup and recent-chat icons recognize the provider in the saved model ID evenwhen that model is no longer selectable. For example, `openai/gpt-5.5` retains