Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(agents): keep one close button in split headers (#8546)

gbirmandb3a327d997e
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 054126d555..f13fab5577 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -125,6 +125,7 @@ ownership. Cancel, logout, and the ten-minute timeout retire pending callbacks.
- Reserve the safe area plus the category row above mobile Search, and only the safe area above Channels; their hidden split headers must not add another blank strip.
- Follow [mobile layout and chrome](../../.agents/rules/web/mobile.md#layout-and-chrome) for full-frame views and record tabs; verify their first controls below the navigation with a nonzero safe area on phones and tablets.
- Keep split chrome portal targets reactive so cached views can mount before their header, and clear a retiring header's targets only while it still owns them.
+- Let `ViewShell.TopBar` own split close and navigation controls; do not add a second split close button inside Agents headers or their preview `headerLeading`.
- Show only the Recent conversation feed in mobile Channels, without view tabs or a persisted mobile tab selection.
- Mount the mobile search input before focusing it inside the dock tap; keep navigation in that handler so focus does not trigger a second navigation or lose iOS keyboard activation.
- Preserve focused chrome editors during deferred split insertion/removal autofocus; explicit return-focus commands may still focus the pane.
diff --git a/apps/web/src/features/agents-view/components/Topbar.test.tsx b/apps/web/src/features/agents-view/components/Topbar.test.tsx
index 66c50831af..ace5143e3a 100644
--- a/apps/web/src/features/agents-view/components/Topbar.test.tsx
+++ b/apps/web/src/features/agents-view/components/Topbar.test.tsx
@@ -8,9 +8,6 @@ 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', () => {
diff --git a/apps/web/src/features/agents-view/components/Topbar.tsx b/apps/web/src/features/agents-view/components/Topbar.tsx
index 47e1ab2d83..e20d94b0d5 100644
--- a/apps/web/src/features/agents-view/components/Topbar.tsx
+++ b/apps/web/src/features/agents-view/components/Topbar.tsx
@@ -1,5 +1,4 @@
import { ViewShell } from '@app/components/view-shell/ViewShell';
-import { SplitPanel } from '@components/app/split-panel';
import ArrowLeft from '@phosphor/arrow-left.svg';
import { Button } from '@ui';
import { type JSX, Show } from 'solid-js';
@@ -13,12 +12,7 @@ export function Topbar(props: {
}) {
return (
<ViewShell.TopBar class="touch:flex">
- <Show
- when={props.onBack}
- fallback={
- <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />
- }
- >
+ <Show when={props.onBack}>
<Button
variant="ghost"
size="icon-md"
diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsx
index 14d5a64a64..ed36e59b93 100644
--- a/apps/web/src/features/agents-view/views/AgentsView.tsx
+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx
@@ -446,9 +446,6 @@ function AgentsWorkspace(props: { initialRoute?: AgentsRoute }) {
target={previewBlockTarget(conversation)}
orchestrator={orchestrator}
splitPanelContext={panel}
- headerLeading={
- <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />
- }
/>
</ChatEmptyStateContext.Provider>
</Suspense>
diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.md
index 813ddf0e4f..a2f24f2cf8 100644
--- a/docs/agent-guide/ai-chat.md
+++ b/docs/agent-guide/ai-chat.md
@@ -302,6 +302,12 @@ the shimmer.
Home’s **Connect your tools** and agent replies’ **Connect app** chips open this
Integrations page. It shows installed tools above the app catalog, with personal Gmail/GitHub account links in a separate section above.
+ In a secondary desktop split, the new-conversation page and existing chats show
+ one close button beside **Show navigation** while the sidebar is collapsed.
+ Verify this below 720px pane width, then expand and collapse navigation and
+ check that closing the split works. Mobile **Back to conversations** still
+ returns to the conversation list.
+
To recreate Slack channels, open **Settings → Integrations → Slack → Import
channels** (or **Connections → Slack** from the Agents workspace). The card
appears only for a connected, enabled Pipedream Slack account. Click **Find