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): persist new-conversation drafts on the Agents page (#9504)

Wolf Mermelstein35ba5edf508a
diff --git a/apps/web/src/features/agents-view/primitives/composer-draft.ts b/apps/web/src/features/agents-view/primitives/composer-draft.ts
index 45377865c5..57ff08a460 100644
--- a/apps/web/src/features/agents-view/primitives/composer-draft.ts
+++ b/apps/web/src/features/agents-view/primitives/composer-draft.ts
@@ -19,6 +19,12 @@ export const NEW_CONVERSATION_ATTACHMENTS_KEY = createPersistenceKey(
0
);
+/** Home owns its attachments separately from the Agents page composer. */
+export const HOME_CONVERSATION_ATTACHMENTS_KEY = createPersistenceKey(
+ 'attachment-tracker-home-agent-conversation',
+ 0
+);
+
/** Keep a composer draft after the New conversation page remounts. */
export function createPersistedComposerDraft(
name = NEW_CONVERSATION_DRAFT_KEY,
diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsx
index 0e147c4fb8..384b2635c0 100644
--- a/apps/web/src/features/agents-view/views/AgentsView.tsx
+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx
@@ -60,6 +60,7 @@ import {
} from '../core/recent-conversations';
import { kindForBot } from '../core/roster';
import { type AgentsRoute, agentsRouteId } from '../core/route';
+import { createPersistedComposerDraft } from '../primitives/composer-draft';
import { createConversationListView } from '../primitives/conversation-list-view';
import { createWorkspaceMode } from '../primitives/workspace-mode';
import { agentConversationsQuery } from '../queries/agent-conversations-query';
@@ -148,7 +149,7 @@ function AgentsWorkspace(props: { route?: AgentsRoute }) {
);
const dataMode = () => dataModeFor(selected() ? mode() : workspace.mode());
const [mobileList, setMobileList] = createSignal(!isRoutinesPage());
- const [draft, setDraft] = createSignal('');
+ const persistedDraft = createPersistedComposerDraft(undefined, userId);
const [search, setSearch] = createSignal('');
// Routines that run often leave their runs unlisted; those stay a click
// away instead of in the list.
@@ -209,9 +210,10 @@ function AgentsWorkspace(props: { route?: AgentsRoute }) {
const content = panel.handle.content();
if (
content.type === 'component' &&
- typeof content.params?.draft === 'string'
+ typeof content.params?.draft === 'string' &&
+ content.params.draft.length > 0
)
- setDraft(content.params.draft);
+ persistedDraft.setDraft(content.params.draft);
showComposer();
}
)
@@ -485,8 +487,8 @@ function AgentsWorkspace(props: { route?: AgentsRoute }) {
composerFocus = focus;
}}
workspaceId={panel.handle.id}
- draft={draft()}
- onDraftChange={setDraft}
+ draft={persistedDraft.draft()}
+ onDraftChange={persistedDraft.setDraft}
roster={rosterSource.roster()}
rosterLoading={rosterSource.loading()}
availabilityLoading={rosterSource.availabilityLoading()}
diff --git a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
index c32d9e15ed..68b86b41ba 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -17,7 +17,11 @@ import {
type PersistedAgentLike,
type RuntimeLike,
} from '../core/roster';
-import { NEW_CONVERSATION_ATTACHMENTS_KEY } from '../primitives/composer-draft';
+import {
+ createPersistedComposerDraft,
+ HOME_CONVERSATION_ATTACHMENTS_KEY,
+ NEW_CONVERSATION_ATTACHMENTS_KEY,
+} from '../primitives/composer-draft';
import { createPreferredRepository } from '../primitives/preferred-repository';
import { AgentPicker } from './AgentPicker';
import { NewChatPage } from './NewChatPage';
@@ -650,6 +654,81 @@ describe('agent-led new conversation', () => {
(screen.getByRole('textbox', { name: 'Draft' }) as HTMLInputElement).value
).toBe('Keep this prompt');
});
+ it('restores a parent-owned Agents draft and its attachments after remount', () => {
+ mocks.attachments = [
+ { id: 'kept-file', name: 'notes.txt', kind: 'document' },
+ ];
+ localStorage.setItem(
+ `${NEW_CONVERSATION_ATTACHMENTS_KEY}:user`,
+ JSON.stringify(mocks.attachments)
+ );
+ const host = () => {
+ const persisted = createPersistedComposerDraft(undefined, () => 'user');
+ return (
+ <NewChatPage
+ draft={persisted.draft()}
+ onDraftChange={persisted.setDraft}
+ roster={buildAgentRoster({
+ agents: [],
+ runtimes: [],
+ cursorConnected: true,
+ cursorNeedsConnection: false,
+ macroDefaultModel: 'chat-default',
+ cursorDefaultModel: 'cursor-default',
+ })}
+ rosterLoading={false}
+ onStart={vi.fn()}
+ onOpenRoster={vi.fn()}
+ />
+ );
+ };
+ render(host);
+ fireEvent.input(screen.getByRole('textbox', { name: 'Draft' }), {
+ target: { value: 'Keep the Agents prompt' },
+ });
+ expect(screen.getByTestId('attachments').textContent).toBe('notes.txt');
+ cleanup();
+ render(host);
+ expect(
+ (screen.getByRole('textbox', { name: 'Draft' }) as HTMLInputElement).value
+ ).toBe('Keep the Agents prompt');
+ expect(screen.getByTestId('attachments').textContent).toBe('notes.txt');
+ });
+ it('keeps Home attachments off the Agents store when the parent owns the draft', () => {
+ mocks.attachments = [
+ { id: 'home-file', name: 'home-only.txt', kind: 'document' },
+ ];
+ localStorage.setItem(
+ `${HOME_CONVERSATION_ATTACHMENTS_KEY}:user`,
+ JSON.stringify(mocks.attachments)
+ );
+ localStorage.setItem(
+ `${NEW_CONVERSATION_ATTACHMENTS_KEY}:user`,
+ JSON.stringify([{ id: 'agents-file', name: 'agents.txt', kind: 'file' }])
+ );
+ render(() => {
+ const persisted = createPersistedComposerDraft(undefined, () => 'user');
+ return (
+ <NewChatPage
+ draft={persisted.draft()}
+ onDraftChange={persisted.setDraft}
+ attachmentsKey={HOME_CONVERSATION_ATTACHMENTS_KEY}
+ roster={buildAgentRoster({
+ agents: [],
+ runtimes: [],
+ cursorConnected: true,
+ cursorNeedsConnection: false,
+ macroDefaultModel: 'chat-default',
+ cursorDefaultModel: 'cursor-default',
+ })}
+ rosterLoading={false}
+ onStart={vi.fn()}
+ onOpenRoster={vi.fn()}
+ />
+ );
+ });
+ expect(screen.getByTestId('attachments').textContent).toBe('home-only.txt');
+ });
it('starts a new conversation on Auto-detect, not the last used one', async () => {
mocks.recentIds = [CURSOR_BOT_ID];
mocks.recentUrls = ['https://github.com/macro-inc/macro'];
diff --git a/apps/web/src/features/agents-view/views/NewChatPage.tsx b/apps/web/src/features/agents-view/views/NewChatPage.tsx
index f4e33a5a4b..b7136057f0 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.tsx
@@ -87,6 +87,8 @@ export function NewChatPage(props: {
workspaceId?: string;
draft?: string;
onDraftChange?: (draft: string) => void;
+ /** Override the New conversation attachment store. Home uses its own key. */
+ attachmentsKey?: string;
autoFocus?: boolean;
registerFocus?: (focus: () => void) => void;
roster: RosterAgent[];
@@ -285,12 +287,13 @@ export function NewChatPage(props: {
const attachmentTracker = createMemo(() => {
const identity = userId();
+ const key = props.attachmentsKey ?? NEW_CONVERSATION_ATTACHMENTS_KEY;
return createInputAttachmentTracker({
- // Home owns its attachments; unknown identities never read shared storage.
- persistenceKey:
- !props.onDraftChange && identity
- ? `${NEW_CONVERSATION_ATTACHMENTS_KEY}:${encodeURIComponent(identity)}`
- : undefined,
+ // Unknown identities never read shared storage. Parents may own the
+ // text draft without owning files; those still persist here.
+ persistenceKey: identity
+ ? `${key}:${encodeURIComponent(identity)}`
+ : undefined,
});
});
const attachFiles = (files: File[]) =>
diff --git a/apps/web/src/features/home/home-agent-composer.tsx b/apps/web/src/features/home/home-agent-composer.tsx
index 674921e444..406c53ea99 100644
--- a/apps/web/src/features/home/home-agent-composer.tsx
+++ b/apps/web/src/features/home/home-agent-composer.tsx
@@ -13,6 +13,7 @@ import { buildAgentPrompt } from '@app/features/agents-view/queries/composer-pro
import { fireAndForget } from '@core/util/fireAndForget';
import {
createPersistedComposerDraft,
+ HOME_CONVERSATION_ATTACHMENTS_KEY,
HOME_CONVERSATION_DRAFT_KEY,
} from '../agents-view/primitives/composer-draft';
import { createAgentRosterSource } from '../agents-view/queries/agent-roster-source';
@@ -96,6 +97,7 @@ export function HomeAgentComposer(props: { autoFocus?: boolean }) {
rosterLoading={roster.loading()}
availabilityLoading={roster.availabilityLoading()}
draft={draft()}
+ attachmentsKey={HOME_CONVERSATION_ATTACHMENTS_KEY}
onDraftChange={(value) => {
draftVersion++;
setDraft(value);