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): preserve drafts on Home and New conversation (#6850)

Wolf Mermelsteind4b19b0c9f4a
diff --git a/apps/web/src/features/agents-view/primitives/composer-draft.test.ts b/apps/web/src/features/agents-view/primitives/composer-draft.test.ts
new file mode 100644
index 0000000000..b99394c344
--- /dev/null
+++ b/apps/web/src/features/agents-view/primitives/composer-draft.test.ts
@@ -0,0 +1,68 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import { createRoot } from 'solid-js';
+import { beforeEach, describe, expect, it } from 'vitest';
+import {
+ createPersistedComposerDraft,
+ HOME_CONVERSATION_DRAFT_KEY,
+ NEW_CONVERSATION_DRAFT_KEY,
+} from './composer-draft';
+
+describe('createPersistedComposerDraft', () => {
+ it('keeps Home and Agents drafts independent when either is cleared', () => {
+ createRoot((dispose) => {
+ const home = createPersistedComposerDraft(HOME_CONVERSATION_DRAFT_KEY);
+ const agents = createPersistedComposerDraft();
+ home.setDraft('Home prompt');
+ agents.setDraft('Agents prompt');
+ dispose();
+ });
+ createRoot((dispose) => {
+ const home = createPersistedComposerDraft(HOME_CONVERSATION_DRAFT_KEY);
+ const agents = createPersistedComposerDraft();
+ expect(home.draft()).toBe('Home prompt');
+ expect(agents.draft()).toBe('Agents prompt');
+ home.setDraft('');
+ expect(agents.draft()).toBe('Agents prompt');
+ dispose();
+ });
+ expect(localStorage.getItem(HOME_CONVERSATION_DRAFT_KEY)).toBeNull();
+ });
+ beforeEach(() => {
+ localStorage.clear();
+ });
+
+ it('rehydrates the persisted draft for the same key', () => {
+ createRoot((dispose) => {
+ const draft = createPersistedComposerDraft();
+ draft.setDraft('keep this prompt');
+ expect(draft.draft()).toBe('keep this prompt');
+ dispose();
+ });
+
+ createRoot((dispose) => {
+ const draft = createPersistedComposerDraft();
+ expect(draft.draft()).toBe('keep this prompt');
+ dispose();
+ });
+ });
+
+ it('removes the persisted value when the draft becomes empty', () => {
+ createRoot((dispose) => {
+ const draft = createPersistedComposerDraft();
+ draft.setDraft('keep this prompt');
+ draft.setDraft('');
+ dispose();
+ });
+
+ expect(localStorage.getItem(NEW_CONVERSATION_DRAFT_KEY)).toBeNull();
+
+ createRoot((dispose) => {
+ const draft = createPersistedComposerDraft();
+ expect(draft.draft()).toBe('');
+ dispose();
+ });
+ });
+});
diff --git a/apps/web/src/features/agents-view/primitives/composer-draft.ts b/apps/web/src/features/agents-view/primitives/composer-draft.ts
new file mode 100644
index 0000000000..59a1ac9968
--- /dev/null
+++ b/apps/web/src/features/agents-view/primitives/composer-draft.ts
@@ -0,0 +1,32 @@
+import { createPersistenceKey } from '@queries/persistence';
+import { makePersisted } from '@solid-primitives/storage';
+import { createSignal } from 'solid-js';
+
+/** Same localStorage projection channel composers use for unsent drafts. */
+export const NEW_CONVERSATION_DRAFT_KEY = createPersistenceKey(
+ 'input-value-agents-new-conversation',
+ 0
+);
+
+/** Home owns its draft separately from the Agents page's New conversation. */
+export const HOME_CONVERSATION_DRAFT_KEY = createPersistenceKey(
+ 'input-value-home-agent-conversation',
+ 0
+);
+
+export const NEW_CONVERSATION_ATTACHMENTS_KEY = createPersistenceKey(
+ 'attachment-tracker-agents-new-conversation',
+ 0
+);
+
+/** Keep a composer draft after the New conversation page remounts. */
+export function createPersistedComposerDraft(
+ name = NEW_CONVERSATION_DRAFT_KEY
+) {
+ const raw = createSignal<string | undefined>(undefined);
+ const [persisted, setPersisted] = makePersisted(raw, { name });
+ return {
+ draft: () => persisted() ?? '',
+ setDraft: (value: string) => setPersisted(value || undefined),
+ };
+}
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 343aa29007..e2aa5254f1 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -154,6 +154,10 @@ vi.mock('../components/ChatComposer', () => ({
),
}));
+beforeEach(() => {
+ localStorage.clear();
+});
+
function page(
connected = true,
agents: PersistedAgentLike[] = [],
@@ -298,6 +302,17 @@ describe('agent-led new conversation', () => {
repoBranch: 'feature/home',
});
});
+ it('restores an unsent draft after the page remounts', () => {
+ page();
+ fireEvent.input(screen.getByRole('textbox', { name: 'Draft' }), {
+ target: { value: 'Keep this prompt' },
+ });
+ cleanup();
+ page();
+ expect(
+ (screen.getByRole('textbox', { name: 'Draft' }) as HTMLInputElement).value
+ ).toBe('Keep this prompt');
+ });
it('starts a new conversation on Choose repository, 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 1e26c65d16..c738ecbaef 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.tsx
@@ -14,6 +14,10 @@ import { ChatComposer } from '../components/ChatComposer';
import type { AgentKind } from '../core/agent-kind';
import { defaultBranchFor } from '../core/repository';
import { MACRO_PERSONA_ID, type RosterAgent } from '../core/roster';
+import {
+ createPersistedComposerDraft,
+ NEW_CONVERSATION_ATTACHMENTS_KEY,
+} from '../primitives/composer-draft';
import { createPreferredInmemModel } from '../primitives/preferred-inmem-model';
import { createRecentRepositories } from '../primitives/recent-repositories';
import { createComposerModels } from '../queries/composer-models';
@@ -58,10 +62,12 @@ export function NewChatPage(props: {
const [modelOverride, setModelOverride] = createSignal<string>();
// A new conversation starts on Automatic until the caller picks a repository.
const [repoUrl, setRepoUrl] = createSignal<string | undefined>();
- const [localDraft, setLocalDraft] = createSignal('');
- const draft = () => props.draft ?? localDraft();
+ const persistedDraft = createPersistedComposerDraft();
+ const draft = () => props.draft ?? persistedDraft.draft();
const setDraft = (text: string) =>
- props.onDraftChange ? props.onDraftChange(text) : setLocalDraft(text);
+ props.onDraftChange
+ ? props.onDraftChange(text)
+ : persistedDraft.setDraft(text);
const [branchOverride, setBranchOverride] = createSignal<string>();
const recentAgentId = () => {
const ids = recentAgents.ids();
@@ -125,7 +131,12 @@ export function NewChatPage(props: {
if (agent.harness === 'cursor') openSettings('Harness');
};
- const attachmentTracker = createInputAttachmentTracker();
+ const attachmentTracker = createInputAttachmentTracker({
+ // Home supplies its own text draft; attachment persistence here is for Agents.
+ persistenceKey: props.onDraftChange
+ ? undefined
+ : NEW_CONVERSATION_ATTACHMENTS_KEY,
+ });
const attachFiles = (files: File[]) =>
void uploadInputAttachments({
files,
diff --git a/apps/web/src/features/home/home-agent-composer.test.tsx b/apps/web/src/features/home/home-agent-composer.test.tsx
index eec2ea90cc..a4be0e4dc7 100644
--- a/apps/web/src/features/home/home-agent-composer.test.tsx
+++ b/apps/web/src/features/home/home-agent-composer.test.tsx
@@ -70,6 +70,7 @@ vi.mock('../agents-view/views/NewChatPage', () => ({
}));
beforeEach(() => {
+ localStorage.clear();
vi.clearAllMocks();
const [pendingDraft, setPendingDraft] = createSignal<string | null>(null);
mocks.pendingDraft = pendingDraft;
@@ -124,3 +125,49 @@ it('does not replace a newer typed draft when suggested context resolves late',
'My new task'
);
});
+
+it('restores Home text after visiting an agent session and returning', () => {
+ const first = render(() => <HomeAgentComposer />);
+ fireEvent.input(screen.getByRole('textbox'), {
+ target: { value: 'Unsent Home prompt' },
+ });
+ first.unmount();
+ render(() => <HomeAgentComposer />);
+ expect((screen.getByRole('textbox') as HTMLInputElement).value).toBe(
+ 'Unsent Home prompt'
+ );
+});
+
+it('keeps a cleared Home draft empty on the next visit', () => {
+ const first = render(() => <HomeAgentComposer />);
+ fireEvent.input(screen.getByRole('textbox'), {
+ target: { value: 'Clear me' },
+ });
+ fireEvent.input(screen.getByRole('textbox'), { target: { value: '' } });
+ first.unmount();
+ render(() => <HomeAgentComposer />);
+ expect((screen.getByRole('textbox') as HTMLInputElement).value).toBe('');
+});
+
+it('ignores suggested context that finishes after leaving Home', async () => {
+ let resolve!: (value: string) => void;
+ mocks.buildPrompt.mockReturnValue(
+ new Promise<string>((done) => {
+ resolve = done;
+ })
+ );
+ const first = render(() => <HomeAgentComposer />);
+ mocks.setPendingDraft('Suggested task');
+ first.unmount();
+ const second = render(() => <HomeAgentComposer />);
+ fireEvent.input(screen.getByRole('textbox'), {
+ target: { value: 'Newer Home draft' },
+ });
+ second.unmount();
+ resolve('Old suggestion');
+ await Promise.resolve();
+ render(() => <HomeAgentComposer />);
+ expect((screen.getByRole('textbox') as HTMLInputElement).value).toBe(
+ 'Newer Home draft'
+ );
+});
diff --git a/apps/web/src/features/home/home-agent-composer.tsx b/apps/web/src/features/home/home-agent-composer.tsx
index fbfc23b559..d8081a7703 100644
--- a/apps/web/src/features/home/home-agent-composer.tsx
+++ b/apps/web/src/features/home/home-agent-composer.tsx
@@ -6,11 +6,15 @@ import { useSettingsState } from '@core/constant/SettingsState';
import { useUserId } from '@core/context/user';
import { registerHotkey } from '@core/hotkey/hotkeys';
import { TOKENS } from '@core/hotkey/tokens';
-import { createEffect, createSignal } from 'solid-js';
+import { createEffect, onCleanup } from 'solid-js';
import '../agents-view/agents-view.css';
import { modeForKind } from '../agents-view/core/agent-kind';
import { kindForBot } from '../agents-view/core/roster';
import { agentsRouteId } from '../agents-view/core/route';
+import {
+ createPersistedComposerDraft,
+ HOME_CONVERSATION_DRAFT_KEY,
+} from '../agents-view/primitives/composer-draft';
import { createAgentRosterSource } from '../agents-view/queries/agent-roster-source';
import {
NewChatPage,
@@ -25,9 +29,15 @@ export function HomeAgentComposer(props: { autoFocus?: boolean }) {
const roster = createAgentRosterSource();
const settings = useSettingsState();
const userId = useUserId();
- const [draft, setDraft] = createSignal('');
+ const { draft, setDraft } = createPersistedComposerDraft(
+ HOME_CONVERSATION_DRAFT_KEY
+ );
let focus: (() => void) | undefined;
let draftVersion = 0;
+ onCleanup(() => {
+ // A suggestion started on a previous visit must not overwrite saved text.
+ draftVersion++;
+ });
const applySuggestion = async (content: string) => {
const version = ++draftVersion;
try {
diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.md
index 6c9ba9da0b..b27f1b9751 100644
--- a/docs/AGENT_GUIDE/ai-chat.md
+++ b/docs/AGENT_GUIDE/ai-chat.md
@@ -117,7 +117,14 @@ the shimmer.
The built-in sandbox and paired macrod runtimes are not offered here.
- Selecting an agent changes the heading: **What should we work on?** for chat
agents and **What should we build?** for coding agents. The draft stays intact
- when changing agents. **Create agent** stays pinned at the bottom of the dropdown
+ when changing agents. Unsent New conversation text and attachments also come
+ back after opening a session and returning, the same way channel replies persist
+ when switching channels. Home's agent input also restores unsent text, under a
+ separate key from Agents → New conversation. Check the Home path explicitly:
+ type a prompt on Home, visit an agent session, then return using the Home sidebar
+ button or Back. The Home prompt should remain after returning and after a reload.
+ Sending or clearing the input removes only that surface's saved text draft.
+ **Create agent** stays pinned at the bottom of the dropdown
while the agent and model lists scroll. It opens the roster on the selected kind's
tab, where either kind can be created.
- On Home and New conversation, selecting a coding agent expands the input even