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): share session rows and PR chips across Home and sidebar (#6572)
Eric Hayes6eb146a2d148
diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsxindex ee1a4b672f..22619732d5 100644--- a/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.test.tsx@@ -1,5 +1,7 @@-import { fireEvent, render, screen } from '@solidjs/testing-library';-import { describe, expect, it, vi } from 'vitest';+import { HomeListEntity } from '@app/features/inbox-view/components/HomeListEntity';+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';+import { createSignal, type JSX } from 'solid-js';+import { afterEach, describe, expect, it, vi } from 'vitest';import {type AgentConversationEntity,groupConversations,@@ -10,6 +12,48 @@ vi.mock('@app/components/view-shell', async (importOriginal) => ({...(await importOriginal<typeof import('@app/components/view-shell')>()),useViewControlHotkeys: vi.fn(),}));+vi.mock('@phosphor/code.svg', () => ({+ default: () => <svg data-coding-icon />,+}));+vi.mock('@queries/agent-session/session', () => ({+ useAgentSessionQuery: () => ({+ get isSuccess() {+ return metadata() !== undefined;+ },+ get data() {+ return metadata();+ },+ }),+}));+vi.mock('@queries/agents/agents', () => ({+ useAgentsQuery: () => ({ isSuccess: true, data: [] }),+}));+vi.mock('@app/features/block-agent/component/AgentPullRequestChip', () => ({+ AgentPullRequestIcon: () => <svg data-pr-icon />,+}));+vi.mock('@entity', () => ({+ Entity: { Title: () => 'Recent chat', Timestamp: () => 'now' },+ MaybeEntityRow: (props: { children: JSX.Element }) => props.children,+}));+vi.mock('@entity/utils/filter', () => ({ unreadFilterFn: () => false }));+vi.mock('@app/features/inbox-view/components/HomeEntityIcon', () => ({+ HomeEntityIcon: () => null,+}));+vi.mock('@core/context/user', () => ({ useUserId: () => () => 'me' }));+vi.mock('@core/user', () => ({+ getDisplayName: () => '',+ tryMacroId: (id: string) => id,+}));++const [metadata, setMetadata] = createSignal<{+ harness: string;+ pullRequestUrl?: string;+}>();+afterEach(() => {+ cleanup();+ setMetadata(undefined);+});+vi.mock('@solid-primitives/resize-observer', () => ({createResizeObserver: () => {},}));@@ -55,7 +99,6 @@ describe('mixed Agents sidebar', () => {error={false}hasNextPage={false}loadingNextPage={false}- handleForBot={() => undefined}onNewConversation={create}onSearchChange={vi.fn()}onOpenConversation={open}@@ -66,7 +109,7 @@ describe('mixed Agents sidebar', () => {expect(screen.queryByRole('tablist')).toBeNull();const code = screen.getByRole('button', { name: /Fix build/ });const chat = screen.getByRole('button', { name: /Plan launch/ });- expect(code.getAttribute('data-kind')).toBe('code');+ expect(code.closest('[data-kind]')?.getAttribute('data-kind')).toBe('code');expect(chat.getAttribute('data-kind')).toBe('chat');expect(chat.getAttribute('aria-current')).toBe('page');fireEvent.click(code, { shiftKey: true });@@ -80,3 +123,81 @@ describe('mixed Agents sidebar', () => {expect(create).toHaveBeenCalledOnce();});});++describe.each(['home', 'sidebar'] as const)('%s agent rows', (surface) => {+ const conversation: AgentConversationEntity = {+ type: 'agent_session',+ id: 'coding-session',+ name: 'Fix build',+ ownerId: 'me',+ botId: 'cursor',+ status: 'acp_ready',+ };+ function setup() {+ const open = vi.fn();+ const view = render(() =>+ surface === 'home' ? (+ <HomeListEntity+ entity={conversation}+ occurrenceKey="coding-session"+ onClick={open}+ />+ ) : (+ <AgentsSidebar+ groups={groupConversations([conversation])}+ modeForConversation={() => 'code'}+ activeConversationId={undefined}+ search=""+ loading={false}+ error={false}+ hasNextPage={false}+ loadingNextPage={false}+ onNewConversation={vi.fn()}+ onSearchChange={vi.fn()}+ onOpenConversation={open}+ onRetry={vi.fn()}+ onLoadMore={vi.fn()}+ />+ )+ );+ return { open, view };+ }++ it('adds the PR as metadata arrives without taking over session navigation', () => {+ const { open, view } = setup();+ const session = screen.getByRole('button', { name: 'Fix build' });+ expect(screen.queryByRole('link')).toBeNull();+ setMetadata({+ harness: 'cursor',+ pullRequestUrl: 'https://github.com/macro-inc/macro/pull/42',+ });+ const pr = screen.getByRole('link', { name: 'View PR #42 in GitHub' });+ expect(pr.getAttribute('href')).toBe(+ 'https://github.com/macro-inc/macro/pull/42'+ );+ expect(pr.closest('button')).toBeNull();+ expect(view.container.querySelector('[data-kind="code"]')).toBeTruthy();+ expect(view.container.querySelector('[data-pr-icon]')).toBeTruthy();+ expect(view.container.querySelector('[data-coding-icon]')).toBeNull();+ expect(screen.queryByText('@cursor')).toBeNull();+ expect(screen.queryByText('Ready')).toBeNull();+ expect(pr.getAttribute('target')).toBe('_blank');+ fireEvent.mouseDown(pr, { button: 0, detail: 1 });+ fireEvent.click(pr);+ expect(open).not.toHaveBeenCalled();+ fireEvent.click(session, { shiftKey: true });+ expect(open).toHaveBeenCalledOnce();+ const event = open.mock.calls[0][surface === 'home' ? 0 : 1];+ expect(event.shiftKey).toBe(true);+ });++ it('keeps the session available without metadata and uses the session harness for its icon', () => {+ const { open, view } = setup();+ fireEvent.click(screen.getByRole('button', { name: 'Fix build' }));+ expect(open).toHaveBeenCalledOnce();+ setMetadata({ harness: 'in-memory' });+ expect(view.container.querySelector('[data-kind="chat"]')).toBeTruthy();+ expect(screen.queryByRole('link')).toBeNull();+ expect(screen.queryByText('Ready')).toBeNull();+ });+});diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.tsxindex fde57daa92..30f53c5a19 100644--- a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx@@ -7,24 +7,18 @@ import {import { SidebarCreateButton } from '@app/components/view-shell/SidebarCreateButton';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import ChatIcon from '@phosphor/chat-circle.svg';-import CodeIcon from '@phosphor/code.svg';import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';-import SpinnerIcon from '@phosphor/spinner.svg';import { Key } from '@solid-primitives/keyed';import { cn } from '@ui';import { createSignal, Show } from 'solid-js';-import {- conversationState,- conversationStateLabel,-} from '../core/conversation-state';import { compactAge } from '../core/format-age';import type { AgentsMode } from '../core/mode';import {type AgentConversationEntity,type ConversationGroup,- conversationBotId,conversationTimestamp,} from '../core/recent-conversations';+import { AgentSessionListItem } from '../views/AgentSessionListItem';export type AgentsSidebarProps = {modeForConversation: (conversation: AgentConversationEntity) => AgentsMode;@@ -35,8 +29,6 @@ export type AgentsSidebarProps = {error: boolean;hasNextPage: boolean;loadingNextPage: boolean;- /** The bot behind a session, as `@handle`, when the roster knows it. */- handleForBot: (botId: string | undefined) => string | undefined;onNewConversation: () => void;onSearchChange: (search: string) => void;onOpenConversation: (@@ -51,63 +43,38 @@ function Row(props: {conversation: AgentConversationEntity;mode: AgentsMode;active: boolean;- handle: string | undefined;onOpen: (event: MouseEvent) => void;}) {const title = () => props.conversation.name || 'Untitled chat';- const state = () =>- props.conversation.type === 'agent_session'- ? conversationState(props.conversation.status)- : undefined;- const age = () => compactAge(conversationTimestamp(props.conversation));- const stateLabel = () => {- const current = state();- return current ? conversationStateLabel(current) : undefined;- };-return (- <ViewSidebar.Item- active={props.active}- class={cn(props.mode === 'code' && 'h-12 items-start py-1.5 touch:h-12')}- title={title()}- data-kind={props.mode}- onClick={props.onOpen}- >- <ViewSidebar.Icon>- <Show- when={state() === 'starting'}- fallback={- <Show when={props.mode === 'code'} fallback={<ChatIcon />}>- <CodeIcon />- </Show>- }+ <Show+ when={props.conversation.type === 'agent_session' && props.conversation}+ fallback={+ <ViewSidebar.Item+ active={props.active}+ title={title()}+ data-kind="chat"+ onClick={props.onOpen}>- <SpinnerIcon class="motion-safe:animate-spin" />- </Show>- </ViewSidebar.Icon>- <span class="min-w-0 flex-1">- <span class="block truncate">{title()}</span>- <Show when={props.mode === 'code'}>- <span class="flex min-w-0 items-center gap-1.5 text-xs leading-4 text-ink-extra-muted">- <Show when={props.handle}>- {(handle) => <span class="truncate">@{handle()}</span>}- </Show>- <Show when={props.handle && stateLabel()}>- <span>·</span>- </Show>- <Show when={stateLabel()}>- {(label) => <span class="shrink-0">{label()}</span>}- </Show>- <span class="ml-auto shrink-0 tabular-nums">{age()}</span>+ <ViewSidebar.Icon>+ <ChatIcon />+ </ViewSidebar.Icon>+ <span class="min-w-0 flex-1 truncate">{title()}</span>+ <span class="shrink-0 text-xs text-ink-extra-muted tabular-nums">+ {compactAge(conversationTimestamp(props.conversation))}</span>- </Show>- </span>- <Show when={props.mode !== 'code'}>- <span class="shrink-0 text-xs text-ink-extra-muted tabular-nums">- {age()}- </span>- </Show>- </ViewSidebar.Item>+ </ViewSidebar.Item>+ }+ >+ {(session) => (+ <AgentSessionListItem+ entity={session()}+ mode={props.mode}+ active={props.active}+ onOpen={props.onOpen}+ />+ )}+ </Show>);}@@ -231,9 +198,6 @@ export function AgentsSidebar(props: AgentsSidebarProps) {active={props.activeConversationId === conversation().id}- handle={props.handleForBot(- conversationBotId(conversation())- )}onOpen={(event) =>props.onOpenConversation(conversation(), event)}diff --git a/apps/web/src/features/agents-view/core/roster.test.ts b/apps/web/src/features/agents-view/core/roster.test.tsindex 5a82528bed..c07ebcf53a 100644--- a/apps/web/src/features/agents-view/core/roster.test.ts+++ b/apps/web/src/features/agents-view/core/roster.test.ts@@ -1,4 +1,5 @@import { CURSOR_BOT_ID } from '@core/constant/cursorAgent';+import { MACRO_AGENT_BOT_ID } from '@core/constant/macroAgent';import { MACRO_CODER_BOT_ID } from '@core/constant/macroCoder';import { describe, expect, it } from 'vitest';import {@@ -7,7 +8,7 @@ import {MACRO_PERSONA_ID,type PersistedAgentLike,type RosterInput,- rosterForComposer,+ rosterForAgentPicker,} from './roster';function persisted(@@ -111,7 +112,7 @@ describe('buildAgentRoster', () => {});});-describe('rosterForComposer and kindForBot', () => {+describe('rosterForAgentPicker and kindForBot', () => {const roster = buildAgentRoster({...EMPTY,agents: [@@ -119,18 +120,51 @@ describe('rosterForComposer and kindForBot', () => {persisted({ harness: 'cursor' }),persisted({ harness: 'macrod' }),persisted({ harness: 'sandbox' }),+ persisted({ harness: 'claude-cloud' }),+ persisted({ harness: 'codex-cloud' }),+ persisted({ harness: 'future-runtime' }),+ persisted({+ harness: 'in-memory',+ bot: { id: MACRO_AGENT_BOT_ID, name: 'Macro', handle: 'macro' },+ }),+ persisted({+ harness: 'in-memory',+ bot: {+ id: `bot|${MACRO_AGENT_BOT_ID}`,+ name: 'Macro',+ handle: 'macro',+ },+ }),+ persisted({+ harness: 'in-memory',+ bot: { id: 'saved-macro-name', name: 'Macro', handle: 'my-macro' },+ }),],});- it('combines supported chat and coding agents in one picker', () => {- expect(rosterForComposer(roster).map((a) => a.id)).toEqual([- MACRO_PERSONA_ID,+ it('includes every runtime and excludes only the built-in Macro identity', () => {+ expect(rosterForAgentPicker(roster).map((a) => a.id)).toEqual([CURSOR_BOT_ID,'bot-in-memory','bot-cursor',+ 'bot-macrod',+ 'bot-sandbox',+ 'bot-claude-cloud',+ 'bot-codex-cloud',+ 'bot-future-runtime',+ 'saved-macro-name',]);});+ it.each(['claude-cloud', 'codex-cloud', 'future-runtime'])(+ 'does not block an agent just because its runtime is %s',+ (harness) => {+ const agent = roster.find((entry) => entry.harness === harness);+ expect(agent?.unavailableReason).toBeUndefined();+ expect(agent?.runtime.connected).toBe(true);+ }+ );+it('resolves a session bot to its kind, defaulting to Chat', () => {expect(kindForBot('bot-cursor', roster)).toBe('coder');expect(kindForBot(`bot|${MACRO_CODER_BOT_ID}`, roster)).toBe('coder');diff --git a/apps/web/src/features/agents-view/core/roster.ts b/apps/web/src/features/agents-view/core/roster.tsindex f25105ca93..084194fe4d 100644--- a/apps/web/src/features/agents-view/core/roster.ts+++ b/apps/web/src/features/agents-view/core/roster.ts@@ -4,6 +4,7 @@ import {CURSOR_BOT_NAME,} from '@core/constant/cursorAgent';import {+ isMacroAgentId,MACRO_AGENT_HANDLE,MACRO_AGENT_NAME,} from '@core/constant/macroAgent';@@ -119,27 +120,18 @@ function runtimeConnected(false);default:- return false;+ // Cloud runtimes have no paired-machine connection; the service owns+ // their availability and reports setup errors when they are used.+ return true;}}-/**- * Supported runtimes for starting sessions from the composer. Paired runtimes- * remain in the roster for existing sessions, but start from channel mentions.- */-function startableFromComposer(harness: string): boolean {- return (- harness === 'in-memory' || harness === 'macro-inmem' || harness === 'cursor'- );-}-function persistedAgent(agent: PersistedAgentLike,input: RosterInput): RosterAgent {const harnessId = agent.harness_id ?? undefined;const connected = runtimeConnected(agent.harness, harnessId, input);- const startable = startableFromComposer(agent.harness);return {id: agent.bot.id,botId: agent.bot.id,@@ -164,13 +156,14 @@ function persistedAgent(agent.harness === 'cursor' && input.cursorNeedsConnection? 'Connect Cursor': undefined,- unavailableReason: startable- ? agent.harness === 'cursor' && !connected- ? 'Connect Cursor to start it'- : undefined- : connected- ? 'Runs on its own machine · start it from a channel mention'- : 'Its runtime is disconnected',+ unavailableReason:+ agent.harness === 'macrod'+ ? connected+ ? 'Runs on its own machine · start it from a channel mention'+ : 'Its runtime is disconnected'+ : agent.harness === 'cursor' && !connected+ ? 'Connect Cursor to start it'+ : undefined,persisted: agent,};}@@ -212,11 +205,14 @@ export function buildAgentRoster(input: RosterInput): RosterAgent[] {];}-/** Both chat and coding agents supported by the new-conversation composer. */-export function rosterForComposer(+/** Every agent belongs in the picker; Macro is represented by model choices. */+export function rosterForAgentPicker(roster: readonly RosterAgent[]): RosterAgent[] {- return roster.filter((agent) => startableFromComposer(agent.harness));+ return roster.filter(+ (agent) =>+ agent.id !== MACRO_PERSONA_ID && !isMacroAgentId(agent.botId ?? agent.id)+ );}/**diff --git a/apps/web/src/features/agents-view/queries/composer-models.test.ts b/apps/web/src/features/agents-view/queries/composer-models.test.tsindex d45bb59c19..bf466dbfb2 100644--- a/apps/web/src/features/agents-view/queries/composer-models.test.ts+++ b/apps/web/src/features/agents-view/queries/composer-models.test.ts@@ -28,6 +28,9 @@ describe('composer model discovery', () => {).toEqual({ harness: 'macrod', harnessId: 'paired-runtime' });expect(composerModelTarget({ harness: 'macrod' })).toBeUndefined();expect(composerModelTarget({ harness: 'sandbox' })).toBeUndefined();+ expect(composerModelTarget({ harness: 'claude-cloud' })).toEqual({+ harness: 'claude-cloud',+ });});it('switches discovery targets with the selected agent and skips disconnected runtimes', () => {@@ -44,6 +47,8 @@ describe('composer model discovery', () => {});createComposerModels(agent);expect(discovery.targets?.()).toEqual([{ harness: 'cursor' }]);+ setAgent({ ...agent(), harness: 'claude-cloud' });+ expect(discovery.targets?.()).toEqual([{ harness: 'claude-cloud' }]);setAgent({ ...agent(), harness: 'macrod', harnessId: 'paired-runtime' });expect(discovery.targets?.()).toEqual([{ harness: 'macrod', harnessId: 'paired-runtime' },diff --git a/apps/web/src/features/agents-view/queries/composer-models.ts b/apps/web/src/features/agents-view/queries/composer-models.tsindex dbd368b323..c0a5beb85c 100644--- a/apps/web/src/features/agents-view/queries/composer-models.ts+++ b/apps/web/src/features/agents-view/queries/composer-models.ts@@ -2,6 +2,7 @@ import {type AgentModelTarget,useAgentModelsQueries,} from '@queries/agents/models';+import { ModelHarnessDto } from '@service-agent-harness/generated/schemas/modelHarnessDto';import type { Accessor } from 'solid-js';import type { RosterAgent } from '../core/roster';@@ -10,13 +11,18 @@ export function composerModelTarget(agent: Pick<RosterAgent, 'harness' | 'harnessId'> | undefined): AgentModelTarget | undefined {if (!agent) return;- if (agent.harness === 'in-memory' || agent.harness === 'macro-inmem') {- return { harness: 'in-memory' };- }- if (agent.harness === 'cursor') return { harness: 'cursor' };- if (agent.harness === 'macrod' && agent.harnessId) {- return { harness: 'macrod', harnessId: agent.harnessId };+ const requested =+ agent.harness === 'macro-inmem' ? 'in-memory' : agent.harness;+ const harness = Object.values(ModelHarnessDto).find(+ (value) => value === requested+ );+ if (!harness) return;+ if (harness === 'macrod') {+ return agent.harnessId+ ? { harness, harnessId: agent.harnessId }+ : undefined;}+ return { harness };}/** Keep discovery scoped to the selected, connected runtime. */diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsxindex 62695f940a..c1d031276b 100644--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx@@ -13,7 +13,11 @@ import { Dropdown } from '@ui';import { createSignal, For, Show } from 'solid-js';import { AgentIcon } from '../components/AgentGlyph';import { modelLabel } from '../components/model-label';-import { MACRO_PERSONA_ID, type RosterAgent } from '../core/roster';+import {+ MACRO_PERSONA_ID,+ type RosterAgent,+ rosterForAgentPicker,+} from '../core/roster';import { createComposerModels } from '../queries/composer-models';/** Agent selection with a per-message model catalog in each submenu. */@@ -31,8 +35,7 @@ export function AgentPicker(props: {const macro = () =>props.agents.find((agent) => agent.id === MACRO_PERSONA_ID);const macroCatalog = createComposerModels(macro);- const agents = () =>- props.agents.filter((agent) => agent.id !== MACRO_PERSONA_ID);+ const agents = () => rosterForAgentPicker(props.agents);const rawModel = () => props.selected?.id === MACRO_PERSONA_ID;const model = () =>props.modelOverride ??@@ -225,11 +228,12 @@ function AgentPickerRow(props: {closeOnSelectclass="min-w-0 flex-1"disabled={!props.agent.connectLabel}+ title={props.agent.unavailableReason}onSelect={props.onConnect}>{identity()}<span class="text-xs text-ink-muted">- {props.agent.connectLabel}+ {props.agent.connectLabel ?? props.agent.unavailableReason}</span></Dropdown.Item>}diff --git a/apps/web/src/features/agents-view/views/AgentSessionListItem.tsx b/apps/web/src/features/agents-view/views/AgentSessionListItem.tsxnew file mode 100644index 0000000000..3438b718fc--- /dev/null+++ b/apps/web/src/features/agents-view/views/AgentSessionListItem.tsx@@ -0,0 +1,127 @@+import { ViewSidebar } from '@app/components/view-shell';+import { AgentPullRequestIcon } from '@app/features/block-agent/component/AgentPullRequestChip';+import { parseGithubPrUrl, prHtmlUrl } from '@app/features/block-pr/util/prKey';+import type { AgentSessionEntity } from '@entity';+import ChatIcon from '@phosphor/chat-circle.svg';+import CodeIcon from '@phosphor/code.svg';+import SpinnerIcon from '@phosphor/spinner.svg';+import { useAgentSessionQuery } from '@queries/agent-session/session';+import { useAgentsQuery } from '@queries/agents/agents';+import { cn, pressHandlers } from '@ui';+import { ErrorBoundary, Show, Suspense } from 'solid-js';+import { kindForHarness, modeForKind, systemBotKind } from '../core/agent-kind';+import { conversationState } from '../core/conversation-state';+import { compactAge } from '../core/format-age';+import type { AgentsMode } from '../core/mode';+import { conversationTimestamp } from '../core/recent-conversations';++type Props = {+ entity: AgentSessionEntity;+ active?: boolean;+ unread?: boolean;+ mode?: AgentsMode;+ onOpen?: (event: MouseEvent) => void;+};++/** The same session row in Home and Agents, backed by shared live metadata. */+export function AgentSessionListItem(props: Props) {+ return (+ <Suspense>+ <SessionListItem {...props} />+ </Suspense>+ );+}++function SessionListItem(props: Props) {+ const query = useAgentSessionQuery(() => props.entity.id);+ const agents = useAgentsQuery();+ const session = () => (query.isSuccess ? query.data : undefined);+ const botId = () =>+ (props.entity.bot?.id ?? props.entity.botId).replace(/^bot\|/, '');+ const agent = () =>+ agents.isSuccess+ ? agents.data.find((agent) => agent.bot.id === botId())+ : undefined;+ const mode = () => {+ const harness = session()?.harness ?? agent()?.harness;+ return harness+ ? modeForKind(kindForHarness(harness))+ : (props.mode ?? modeForKind(systemBotKind(botId()) ?? 'agent'));+ };+ const title = () => props.entity.name || session()?.name || 'Untitled chat';+ const state = () => conversationState(props.entity.status);+ const pullRequest = () => parseGithubPrUrl(session()?.pullRequestUrl ?? '');+ const pullRequestUrl = () => {+ const pr = pullRequest();+ return pr ? prHtmlUrl(pr) : undefined;+ };++ return (+ <ViewSidebar.Item+ as="div"+ active={props.active}+ class={cn(+ 'relative',+ pullRequest() && 'h-auto min-h-12 items-start py-1.5 touch:h-auto'+ )}+ data-agent-session-row={props.entity.id}+ data-kind={mode()}+ >+ <button+ type="button"+ class="absolute inset-0 rounded-lg outline-none focus-visible:outline-2 focus-visible:outline-accent"+ aria-label={title()}+ aria-current={props.active ? 'page' : undefined}+ title={title()}+ {...pressHandlers((event) => props.onOpen?.(event))}+ />+ <ViewSidebar.Icon class="pointer-events-none relative">+ <Show+ when={state() === 'starting'}+ fallback={+ <Show when={mode() === 'code'} fallback={<ChatIcon />}>+ <Show when={pullRequestUrl()} fallback={<CodeIcon />}>+ {(url) => (+ <ErrorBoundary fallback={<CodeIcon />}>+ <Suspense fallback={<CodeIcon />}>+ <AgentPullRequestIcon url={url()} />+ </Suspense>+ </ErrorBoundary>+ )}+ </Show>+ </Show>+ }+ >+ <SpinnerIcon class="motion-safe:animate-spin" />+ </Show>+ </ViewSidebar.Icon>+ <span class="pointer-events-none relative min-w-0 flex-1">+ <span class="flex min-w-0 items-center gap-2">+ <span class="min-w-0 flex-1 truncate">{title()}</span>+ <span class="shrink-0 text-xs text-ink-extra-muted tabular-nums">+ {compactAge(conversationTimestamp(props.entity))}+ </span>+ <Show when={props.unread}>+ <span+ aria-label="Unread"+ class="size-1.5 shrink-0 rounded-full bg-accent"+ />+ </Show>+ </span>+ <Show when={pullRequest()}>+ {(pr) => (+ <a+ href={prHtmlUrl(pr())}+ target="_blank"+ rel="noreferrer"+ class="pointer-events-auto block truncate text-xs leading-4 text-ink-extra-muted hover:text-ink hover:underline focus-visible:outline-2 focus-visible:outline-accent"+ onClick={(event) => event.stopPropagation()}+ >+ View PR #{pr().number} in GitHub+ </a>+ )}+ </Show>+ </span>+ </ViewSidebar.Item>+ );+}diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsxindex 42d18c7798..43fc271286 100644--- a/apps/web/src/features/agents-view/views/AgentsView.tsx+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx@@ -151,10 +151,6 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {conversationMode(conversation, (botId) =>kindForBot(botId, rosterSource.roster()));- const handleForBot = (botId: string | undefined) =>- botId- ? rosterSource.roster().find((agent) => agent.botId === botId)?.handle- : undefined;onMount(() => panel.handle.setDisplayName('Agents'));@@ -316,7 +312,6 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {error={query.isLoadingError}hasNextPage={Boolean(query.hasNextPage)}loadingNextPage={query.isFetchingNextPage}- handleForBot={handleForBot}onNewConversation={showComposer}onSearchChange={setSearch}onOpenConversation={(conversation, event) =>diff --git a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx b/apps/web/src/features/agents-view/views/NewChatPage.test.tsxindex 5b7f45fdd5..0a619d253d 100644--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx@@ -233,6 +233,54 @@ describe('agent-led new conversation', () => {});expect(send.mock.calls[0][0]).not.toHaveProperty('modelOverride');});+ it.each(['claude-cloud', 'codex-cloud', 'future-runtime'])(+ 'shows the drawer for a saved %s coding agent without forwarding unsupported repository overrides',+ async (harness) => {+ const send = page(true, [+ {+ bot: {+ id: 'saved-cloud-agent',+ name: 'Cloud reviewer',+ handle: 'cloud-reviewer',+ },+ harness,+ default_model: 'saved-default',+ },+ ]);+ await selectAgent(/Cursor/);+ fireEvent.click(screen.getByRole('button', { name: 'Repository' }));+ fireEvent.input(screen.getByRole('textbox', { name: 'Add repository' }), {+ target: { value: 'macro-inc/macro' },+ });+ fireEvent.click(screen.getByRole('button', { name: 'Use repository' }));+ await selectAgent(/Cloud reviewer/);+ expect(screen.getByTestId('drawer').hasAttribute('hidden')).toBe(false);+ expect(screen.getByRole('button', { name: 'Repository' })).toBeTruthy();+ expect(screen.getByRole('button', { name: 'Branch' })).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));+ expect(send).toHaveBeenCalledWith({+ prompt: 'Prompt',+ botId: 'saved-cloud-agent',+ repoUrl: undefined,+ });+ }+ );++ it('keeps a disconnected paired agent visible with its availability reason', () => {+ page(true, [+ {+ bot: { id: 'paired-agent', name: 'Laptop agent', handle: 'laptop' },+ harness: 'macrod',+ harness_id: 'offline-machine',+ default_model: 'saved-default',+ },+ ]);+ openAgents();+ const row = screen.getByRole('menuitem', { name: /Laptop agent/ });+ expect(row.getAttribute('aria-disabled')).toBe('true');+ expect(row.textContent).toContain('Its runtime is disconnected');+ });+it('shows the model beside the agent and sends a hovered model choice only once', async () => {const send = page();expect(screen.getByRole('button', { name: 'Agent' }).textContent).toContain(diff --git a/apps/web/src/features/agents-view/views/NewChatPage.tsx b/apps/web/src/features/agents-view/views/NewChatPage.tsxindex 0fc2b6eb01..223ab1d152 100644--- a/apps/web/src/features/agents-view/views/NewChatPage.tsx+++ b/apps/web/src/features/agents-view/views/NewChatPage.tsx@@ -4,11 +4,7 @@ import { useUserId } from '@core/context/user';import { createMemo, createSignal } from 'solid-js';import { ChatComposer } from '../components/ChatComposer';import type { AgentKind } from '../core/agent-kind';-import {- MACRO_PERSONA_ID,- type RosterAgent,- rosterForComposer,-} from '../core/roster';+import { MACRO_PERSONA_ID, type RosterAgent } from '../core/roster';import { createRecentRepositories } from '../primitives/recent-repositories';import { AgentPicker } from './AgentPicker';import { RepositoryPicker } from './RepositoryPicker';@@ -39,7 +35,7 @@ export function NewChatPage(props: {const { openSettings } = useSettingsState();const recentAgents = createRecentAgentSelections(userId());const repositories = createRecentRepositories(userId());- const options = createMemo(() => rosterForComposer(props.roster));+ const options = () => props.roster;const [agentId, setAgentId] = createSignal<string>();const [modelOverride, setModelOverride] = createSignal<string>();const [repoUrl, setRepoUrl] = createSignal<string | undefined>(@@ -62,6 +58,8 @@ export function NewChatPage(props: {return options().find((agent) => agent.id === wanted) ?? options()[0];});const coding = () => selected()?.kind === 'coder';+ // The create-session API accepts explicit repositories only for Cursor.+ const canSelectRepository = () => selected()?.harness === 'cursor';const blocked = () => {const agent = selected();return agent ? agent.unavailableReason : 'Choose an agent to start';@@ -75,7 +73,7 @@ export function NewChatPage(props: {const persona = selected();if (!prompt.trim() || !persona || blocked()) return;recentAgents.remember(persona.id);- const repo = coding() ? repoUrl() : undefined;+ const repo = canSelectRepository() ? repoUrl() : undefined;if (repo) repositories.remember(repo);props.onStart({prompt,diff --git a/apps/web/src/features/block-agent/component/AgentPullRequestChip.tsx b/apps/web/src/features/block-agent/component/AgentPullRequestChip.tsxindex d54a100dc0..258954d1da 100644--- a/apps/web/src/features/block-agent/component/AgentPullRequestChip.tsx+++ b/apps/web/src/features/block-agent/component/AgentPullRequestChip.tsx@@ -18,7 +18,13 @@ import { useSplitNavigationHandler } from '@core/util/useSplitNavigationHandler'import { usePullRequestByGithubKeyQuery } from '@queries/storage/pr-mention';import type { ForeignEntity } from '@service-storage/generated/schemas';import { cn, Layer } from '@ui';-import { createMemo, type JSX, type ParentProps, Show } from 'solid-js';+import {+ type Accessor,+ createMemo,+ type JSX,+ type ParentProps,+ Show,+} from 'solid-js';import { match } from 'ts-pattern';function metadataRecord(metadata: unknown): Record<string, unknown> {@@ -158,14 +164,31 @@ function EntityChip(props: {);}-export function AgentPullRequestChip(props: { url: string }): JSX.Element {- const reference = createMemo(() => parseGithubPrUrl(props.url));+function useLinkedPullRequest(url: Accessor<string>) {+ const reference = createMemo(() => parseGithubPrUrl(url()));const githubKey = createMemo(() => {const parsed = reference();return parsed ? toGithubKey(parsed) : undefined;});const query = usePullRequestByGithubKeyQuery(githubKey);- const entity = () => (query.isSuccess ? query.data : undefined);+ const entity = () =>+ query.isSuccess ? (query.data ?? undefined) : undefined;+ return { reference, entity };+}++/** Leading list icon, with the same PR status as the chip. */+export function AgentPullRequestIcon(props: { url: string }): JSX.Element {+ const { entity } = useLinkedPullRequest(() => props.url);+ return (+ <GithubPullRequestStatusIcon+ status={pullRequestStatus(entity())}+ class="size-4"+ />+ );+}++export function AgentPullRequestChip(props: { url: string }): JSX.Element {+ const { reference, entity } = useLinkedPullRequest(() => props.url);return (<Layer depth={2}>diff --git a/apps/web/src/features/block-agent/component/Block.tsx b/apps/web/src/features/block-agent/component/Block.tsxindex 994494936d..edb366e332 100644--- a/apps/web/src/features/block-agent/component/Block.tsx+++ b/apps/web/src/features/block-agent/component/Block.tsx@@ -11,6 +11,7 @@ import { nativeNetworkStatus } from '@core/mobile/native-network-status';import { createMethodRegistration } from '@core/orchestrator';import { blockHandleSignal } from '@core/signal/load';import { useSearchParams } from '@solidjs/router';+import { EmptyStatePanel } from '@ui';import { createSignal, Show, useContext } from 'solid-js';import {AgentSessionProvider,@@ -38,8 +39,15 @@ function AgentBlockContent() {if (target) setSearchTarget(target);},});- const { session, metadata, loadFailed, loadRetryable, pending, retryLoad } =- useAgentSession();+ const {+ session,+ metadata,+ loadFailed,+ loadRetryable,+ pending,+ retryLoad,+ startupError,+ } = useAgentSession();const canAutofocusSplitContent = useCanAutofocusSplitContent();const { navigatedFromJK } = useNavigatedFromJK();@@ -56,10 +64,23 @@ function AgentBlockContent() {<Showwhen={!loadUnavailable()}fallback={- <LoadErrorPanel- title="Unable to load this document"- onRetry={loadRetryable() ? retryLoad : undefined}- />+ <Show+ when={startupError()}+ fallback={+ <LoadErrorPanel+ title="Unable to load this agent session"+ onRetry={loadRetryable() ? retryLoad : undefined}+ />+ }+ >+ {(error) => (+ <EmptyStatePanel+ centered+ title="Unable to start this agent"+ description={error()}+ />+ )}+ </Show>}>{/* One shared static-markdown editor for every text part, rather thandiff --git a/apps/web/src/features/block-agent/context/AgentSessionContext.tsx b/apps/web/src/features/block-agent/context/AgentSessionContext.tsxindex 938ec595c3..8212715bb1 100644--- a/apps/web/src/features/block-agent/context/AgentSessionContext.tsx+++ b/apps/web/src/features/block-agent/context/AgentSessionContext.tsx@@ -59,6 +59,7 @@ export type AgentSessionState = {/** The session is still being created — everything else is empty because* there is nothing to show yet, not because the load failed. */pending: Accessor<boolean>;+ startupError: Accessor<string | undefined>;/** Session metadata, absent until the load resolves. */session: Accessor<AgentSessionResponse | undefined>;/** The bot the session runs as, absent until the fold is acquired. */@@ -129,7 +130,9 @@ export function AgentSessionProvider(onSessionId?: (sessionId: string) => void;}) {- const { sessionId, pending, failed } = resolveSessionId(() => props.blockId);+ const { sessionId, pending, failed, error } = resolveSessionId(+ () => props.blockId+ );createEffect(() => {const id = sessionId();@@ -198,6 +201,7 @@ export function AgentSessionProvider(value={{sessionId,pending,+ startupError: error,session: feed.session,bot: feed.bot,metadata: feed.metadata,diff --git a/apps/web/src/features/block-agent/context/pending-session.ts b/apps/web/src/features/block-agent/context/pending-session.tsindex 9bc2577f3a..9fe4dc846d 100644--- a/apps/web/src/features/block-agent/context/pending-session.ts+++ b/apps/web/src/features/block-agent/context/pending-session.ts@@ -32,6 +32,8 @@ export type PendingSession = {sessionId: Accessor<string | undefined>;/** The create failed — this block has nothing to become. */failed: Accessor<boolean>;+ /** The startup error returned by the service. */+ error: Accessor<string | undefined>;};const pending = new Map<string, PendingSession>();@@ -68,8 +70,12 @@ export function startPendingSession(): string {const placeholder = `${PLACEHOLDER_PREFIX}${crypto.randomUUID()}`;const [sessionId, setSessionId] = createSignal<string>();- const [failed, setFailed] = createSignal(false);- pending.set(placeholder, { sessionId, failed });+ const [error, setError] = createSignal<string>();+ pending.set(placeholder, {+ sessionId,+ failed: () => error() !== undefined,+ error,+ });void agentHarnessServiceClient.create({@@ -80,7 +86,10 @@ export function startPendingSession(} satisfies CreateAgentSessionRequest).then(async (result) => {if (result.isErr()) {- setFailed(true);+ setError(+ result.error.map((error) => error.message).join(' ') ||+ 'The agent session could not be created.'+ );return;}const id = result.value.session.id;@@ -90,7 +99,10 @@ export function startPendingSession(model: options.modelOverride,});if (changed.isErr()) {- setFailed(true);+ setError(+ changed.error.map((error) => error.message).join(' ') ||+ 'The selected model could not be applied.'+ );return;}}@@ -101,14 +113,21 @@ export function startPendingSession(prompt,});if (delivered.isErr()) {- setFailed(true);+ setError(+ delivered.error.map((error) => error.message).join(' ') ||+ 'The first message could not be sent.'+ );return;}markMessageSent(`agent:${id}:${delivered.value.actionId}`);}setSessionId(id);})- .catch(() => setFailed(true));+ .catch(() =>+ setError(+ 'Could not reach the agent service. Check your connection and try again.'+ )+ );return placeholder;}diff --git a/apps/web/src/features/block-agent/context/resolve-session-id.test.ts b/apps/web/src/features/block-agent/context/resolve-session-id.test.tsindex 3642424569..de85ec6f08 100644--- a/apps/web/src/features/block-agent/context/resolve-session-id.test.ts+++ b/apps/web/src/features/block-agent/context/resolve-session-id.test.ts@@ -6,7 +6,7 @@*/import { createRoot } from 'solid-js';-import { describe, expect, it, vi } from 'vitest';+import { beforeEach, describe, expect, it, vi } from 'vitest';const create = vi.hoisted(() => ({resolve: undefined as ((id: string) => void) | undefined,@@ -21,7 +21,16 @@ vi.mock('@service-agent-harness/client', () => ({new Promise((resolve) => {create.resolve = (id: string) =>resolve({ isErr: () => false, value: { session: { id } } });- create.reject = () => resolve({ isErr: () => true });+ create.reject = () =>+ resolve({+ isErr: () => true,+ error: [+ {+ code: 'HTTP_ERROR',+ message: 'Connect GitHub to use this repository.',+ },+ ],+ });})),control: create.control,@@ -37,6 +46,8 @@ const { resolveSessionId } = await import('./resolve-session-id');/** Let the mocked create's `.then` run. */const flush = () => new Promise((resolve) => setTimeout(resolve, 0));+beforeEach(() => create.control.mockReset());+describe('a block id that is already a session', () => {it('resolves to itself, never pending', () => {createRoot((dispose) => {@@ -75,6 +86,8 @@ describe('a placeholder', () => {await flush();expect(resolved.failed()).toBe(true);+ expect(resolved.pending()).toBe(false);+ expect(resolved.error()).toBe('Connect GitHub to use this repository.');expect(resolved.sessionId()).toBeUndefined();dispose();});@@ -112,6 +125,42 @@ describe('a placeholder', () => {});});+ it('shows a model failure without sending the prompt on the wrong model', async () => {+ create.control.mockResolvedValue({+ isErr: () => true,+ error: [{ code: 'HTTP_ERROR', message: 'Model is unavailable.' }],+ });+ const placeholder = startPendingSession({+ modelOverride: 'missing',+ prompt: 'Hello',+ });+ await createRoot(async (dispose) => {+ const resolved = resolveSessionId(() => placeholder);+ create.resolve?.('session-model-error');+ await flush();+ expect(resolved.error()).toBe('Model is unavailable.');+ expect(resolved.pending()).toBe(false);+ expect(create.control).toHaveBeenCalledTimes(1);+ dispose();+ });+ });++ it('shows the first prompt failure', async () => {+ create.control.mockResolvedValue({+ isErr: () => true,+ error: [{ code: 'HTTP_ERROR', message: 'Runtime is disconnected.' }],+ });+ const placeholder = startPendingSession({ prompt: 'Hello' });+ await createRoot(async (dispose) => {+ const resolved = resolveSessionId(() => placeholder);+ create.resolve?.('session-prompt-error');+ await flush();+ expect(resolved.error()).toBe('Runtime is disconnected.');+ expect(resolved.pending()).toBe(false);+ dispose();+ });+ });+// A placeholder URL reloaded in a new tab: the create it named belonged to// the tab that is gone, so there is nothing to wait for.it('with no create behind it is a failure, not a wait', () => {diff --git a/apps/web/src/features/block-agent/context/resolve-session-id.ts b/apps/web/src/features/block-agent/context/resolve-session-id.tsindex 740733eb12..7e713f37ea 100644--- a/apps/web/src/features/block-agent/context/resolve-session-id.ts+++ b/apps/web/src/features/block-agent/context/resolve-session-id.ts@@ -18,6 +18,7 @@ export type ResolvedSessionId = {pending: Accessor<boolean>;/** The create failed, or the placeholder has no create behind it. */failed: Accessor<boolean>;+ error: Accessor<string | undefined>;};export function resolveSessionId(blockId: Accessor<string>): ResolvedSessionId {@@ -39,7 +40,14 @@ export function resolveSessionId(blockId: Accessor<string>): ResolvedSessionId {return {sessionId,- pending: () => entry() != null && entry()?.sessionId() === undefined,+ pending: () =>+ entry() != null &&+ !entry()?.failed() &&+ entry()?.sessionId() === undefined,failed: () => entry() === null || (entry()?.failed() ?? false),+ error: () =>+ entry() === null+ ? 'This conversation was not created. Return to the composer to start a new one.'+ : entry()?.error(),};}diff --git a/apps/web/src/features/inbox-view/components/HomeListEntity.tsx b/apps/web/src/features/inbox-view/components/HomeListEntity.tsxindex f02510c361..786a7274cf 100644--- a/apps/web/src/features/inbox-view/components/HomeListEntity.tsx+++ b/apps/web/src/features/inbox-view/components/HomeListEntity.tsx@@ -1,4 +1,5 @@import { ViewSidebar } from '@app/components/view-shell';+import { AgentSessionListItem } from '@app/features/agents-view/views/AgentSessionListItem';import { useUserId } from '@core/context/user';import { getDisplayName, tryMacroId } from '@core/user';import { Entity, MaybeEntityRow } from '@entity';@@ -27,65 +28,82 @@ export function HomeListEntity(props: HomeListEntityProps) {entityId={props.occurrenceKey}config={props.entityRowConfig}>- <ViewSidebar.Item- as="div"- class="group/home-item relative"- active={props.checked || props.highlighted}- {...pressHandlers((event) => {- event.preventDefault();- props.onClick?.(event);- })}- data-home-item- >- <Show- when={threadEntity()}- fallback={<HomeEntityIcon entity={props.entity} />}- >- <ViewSidebar.Icon>- <ArrowBendUpLeftIcon class="size-4" />- </ViewSidebar.Icon>- </Show>- <span- class={cn(- 'block min-w-0 flex-1 truncate font-normal',- unread() && 'text-ink'- )}- >- <Show- when={threadEntity()}- fallback={+ <Show+ when={props.entity.type === 'agent_session' && props.entity}+ fallback={+ <ViewSidebar.Item+ as="div"+ class="group/home-item relative"+ active={props.checked || props.highlighted}+ {...pressHandlers((event) => {+ event.preventDefault();+ props.onClick?.(event);+ })}+ data-home-item+ >+ <Show+ when={threadEntity()}+ fallback={<HomeEntityIcon entity={props.entity} />}+ >+ <ViewSidebar.Icon>+ <ArrowBendUpLeftIcon class="size-4" />+ </ViewSidebar.Icon>+ </Show>+ <span+ class={cn(+ 'block min-w-0 flex-1 truncate font-normal',+ unread() && 'text-ink'+ )}+ ><Show- when={props.channelName}- fallback={<Entity.Title entity={props.entity} />}+ when={threadEntity()}+ fallback={+ <Show+ when={props.channelName}+ fallback={<Entity.Title entity={props.entity} />}+ >+ {props.channelName}+ </Show>+ }>- {props.channelName}+ {(thread) => (+ <HomeThreadTitle+ entity={thread()}+ channelName={props.channelName}+ />+ )}</Show>- }- >- {(thread) => (- <HomeThreadTitle- entity={thread()}- channelName={props.channelName}+ </span>+ <span+ data-home-timestamp+ class="hidden shrink-0 text-xs font-normal text-ink-extra-muted group-hover/home-item:block"+ >+ <Entity.Timestamp+ entity={props.entity}+ overrideTimeStamp={props.timestamp ?? undefined}/>- )}- </Show>- </span>- <span- data-home-timestamp- class="hidden shrink-0 text-xs font-normal text-ink-extra-muted group-hover/home-item:block"- >- <Entity.Timestamp- entity={props.entity}- overrideTimeStamp={props.timestamp ?? undefined}- />- </span>- <Show when={unread()}>- <span- aria-label="Unread"- class="size-1.5 shrink-0 rounded-full bg-accent"+ </span>+ <Show when={unread()}>+ <span+ aria-label="Unread"+ class="size-1.5 shrink-0 rounded-full bg-accent"+ />+ </Show>+ </ViewSidebar.Item>+ }+ >+ {(session) => (+ <AgentSessionListItem+ entity={session()}+ active={props.checked || props.highlighted}+ unread={unread()}+ onOpen={(event) => {+ event.preventDefault();+ props.onClick?.(event);+ }}/>- </Show>- </ViewSidebar.Item>+ )}+ </Show></MaybeEntityRow></div>);diff --git a/apps/web/src/features/inbox-view/components/home-press.test.tsx b/apps/web/src/features/inbox-view/components/home-press.test.tsxindex a4598f2a52..d70ea01ce8 100644--- a/apps/web/src/features/inbox-view/components/home-press.test.tsx+++ b/apps/web/src/features/inbox-view/components/home-press.test.tsx@@ -4,6 +4,9 @@ import type { JSX } from 'solid-js';import { afterEach, describe, expect, it, vi } from 'vitest';import { HomeListEntity } from './HomeListEntity';+vi.mock('@app/features/agents-view/views/AgentSessionListItem', () => ({+ AgentSessionListItem: () => null,+}));vi.mock('@core/context/user', () => ({ useUserId: () => () => 'test-user' }));vi.mock('@core/user', () => ({getDisplayName: () => 'Peter',diff --git a/apps/web/src/lib/service-clients/service-agent-harness/client.test.ts b/apps/web/src/lib/service-clients/service-agent-harness/client.test.tsnew file mode 100644index 0000000000..af74b8be40--- /dev/null+++ b/apps/web/src/lib/service-clients/service-agent-harness/client.test.ts@@ -0,0 +1,50 @@+import { fetchWithToken } from '@core/util/fetchWithToken';+import { beforeEach, describe, expect, it, vi } from 'vitest';+import { agentHarnessServiceClient } from './client';++vi.mock('@core/constant/servers', () => ({+ SERVER_HOSTS: { 'agent-harness': 'https://harness.example.com' },+}));+vi.mock('@core/util/fetchWithToken', () => ({ fetchWithToken: vi.fn() }));++beforeEach(() => vi.clearAllMocks());++function errorHandler() {+ const handler = vi+ .mocked(fetchWithToken)+ .mock.calls.at(-1)?.[1]?.errorResponseHandler;+ if (!handler) throw new Error('Missing session error handler');+ return handler;+}++describe('session request errors', () => {+ it('explains repository access failures on create', async () => {+ agentHarnessServiceClient.create({});+ const error = await errorHandler()(+ new Response('repository is not available to this user', { status: 403 })+ );+ expect(error.message).toContain('Connect GitHub to Macro');+ });++ it('preserves the service reason when a control request is rejected', async () => {+ agentHarnessServiceClient.control('session-1', {+ type: 'setModel',+ model: 'missing',+ });+ const error = await errorHandler()(+ new Response('Model is unavailable.', { status: 422 })+ );+ expect(error.message).toBe('Model is unavailable.');+ });++ it('does not display an HTML proxy error as a service message', async () => {+ agentHarnessServiceClient.create({});+ const error = await errorHandler()(+ new Response('<html>upstream failure</html>', {+ status: 502,+ headers: { 'Content-Type': 'text/html' },+ })+ );+ expect(error.message).toBe('Agent request failed (HTTP 502).');+ });+});diff --git a/apps/web/src/lib/service-clients/service-agent-harness/client.ts b/apps/web/src/lib/service-clients/service-agent-harness/client.tsindex d7d319576f..2d0b1ff622 100644--- a/apps/web/src/lib/service-clients/service-agent-harness/client.ts+++ b/apps/web/src/lib/service-clients/service-agent-harness/client.ts@@ -1,5 +1,6 @@import { SERVER_HOSTS } from '@core/constant/servers';import { fetchWithToken } from '@core/util/fetchWithToken';+import type { ErrorResponseHandler } from '@core/util/safeFetch';import type {AgentSessionLogResponse,AgentSessionQueueResponse,@@ -19,6 +20,20 @@ export type { SandboxSize, SandboxSizeBody };const agentHarnessHost = SERVER_HOSTS['agent-harness'];+/** Session endpoints return safe, user-facing errors as plain text. */+const sessionError: ErrorResponseHandler<never> = async (response) => {+ const message = response.headers.get('content-type')?.startsWith('text/plain')+ ? (await response.text()).trim()+ : '';+ return {+ code: response.status === 401 ? 'UNAUTHORIZED' : 'HTTP_ERROR',+ message:+ message === 'repository is not available to this user'+ ? 'Connect GitHub to Macro with access to the selected repository, or choose a repository your Macro account can access.'+ : message || `Agent request failed (HTTP ${response.status}).`,+ };+};+/** Authenticated client for controlling live agent sessions. */export const agentHarnessServiceClient = {preview(sessionIds: string[]) {@@ -51,6 +66,7 @@ export const agentHarnessServiceClient = {method: 'POST',headers: { 'Content-Type': 'application/json' },body: JSON.stringify(request),+ errorResponseHandler: sessionError,});},@@ -92,6 +108,7 @@ export const agentHarnessServiceClient = {method: 'POST',headers: { 'Content-Type': 'application/json' },body: JSON.stringify(request),+ errorResponseHandler: sessionError,});},diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.mdindex efbfa1d1fc..d4c4978b67 100644--- a/docs/AGENT_GUIDE/ai-chat.md+++ b/docs/AGENT_GUIDE/ai-chat.md@@ -2,12 +2,22 @@## Where chats live+- If session creation fails, the session view shows **Unable to start this agent**+ with the service's reason. Repository access requires a GitHub connection to+ Macro that covers that repository; connecting only Cursor does not grant Macro+ GitHub access. Cloud agents also need a public agent gateway: Docker-only hostnames+ cannot receive their MCP callbacks. Check the runtime error before retrying, and+ start a new Claude session after correcting its gateway network configuration.+- Open **Go to Agents** → `/app/component/agents`. With AI agents enabled(`enable-chat-v3-agents`), the workspace uses one sidebar for Chat and Code.**New conversation** opens the composer. **Conversations** is a mixed listof chats and coding sessions, newest first, with one search across both.- Chat rows use a chat icon; coding rows use `</>` and show their agent and- runtime status. Changing the composer mode does not filter the sidebar.+ Chat rows use a chat icon; coding rows use `</>` (the PR status icon when a+ pull request is linked). Home and the Agents sidebar share these agent rows.+ Rows have no agent or runtime-status subtext. Sessions with a linked PR show+ **View PR #<number> in GitHub** beneath the title; clicking it opens GitHub in+ a new tab without opening the session. The leading icon reflects the PR 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 growswith longer prompts or Shift+Enter. Lists, quotes, headings, and other@@ -19,14 +29,18 @@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.-- The agent dropdown combines Cursor and saved in-memory or Cursor- agents in **Coding agents** and **Agents** sections. A **Models** section lists+- The agent dropdown includes every saved agent regardless of runtime, plus Cursor,+ grouped in **Coding agents** and **Agents** sections. A **Models** section listsMacro’s available models with readable names (for example, **Sonnet 5**) andprovider icons aligned with the agent icons. The chat catalog offers Sonnet 5,Opus 5, and Haiku 4.5; older Sonnet and Opus versions are not offered.Selecting a model here selectsthe default runtime and applies that model to the next send, retracting the repository drawer.- The built-in Macro agent is hidden from the agent sections; its models remain available.+ The built-in Macro agent is the only agent excluded from these sections; its models remain available.+ Unavailable paired agents stay visible with a reason. Model discovery uses the+ selected runtime, including Claude Cloud. Every coding agent opens the repository+ drawer; chat agents hide it. Repository/branch overrides are currently applied+ only to Cursor sessions by the create-session API.Coding agents carry a `</>` badge. 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