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
feat(agent): send next queued message on enter (#6221)
Wolf Mermelsteinb3ef62997912
diff --git a/apps/web/src/features/block-agent/component/AgentComposer.tsx b/apps/web/src/features/block-agent/component/AgentComposer.tsxindex 32540d8817..990705e129 100644--- a/apps/web/src/features/block-agent/component/AgentComposer.tsx+++ b/apps/web/src/features/block-agent/component/AgentComposer.tsx@@ -76,6 +76,7 @@ export function AgentComposer() {placeholder="Message the agent, @mention anything"autofocus={autofocus}busy={composer.busy()}+ hasQueuedMessages={queuedItems().length > 0}// Prompts go straight to the service, so sending needs a session to// post to — a block whose create is still on the wire can be typed// into, but not sent from, until the id lands.diff --git a/apps/web/src/features/block-agent/ui/AgentInput.test.tsx b/apps/web/src/features/block-agent/ui/AgentInput.test.tsxnew file mode 100644index 0000000000..22b9755de8--- /dev/null+++ b/apps/web/src/features/block-agent/ui/AgentInput.test.tsx@@ -0,0 +1,120 @@+/**+ * @vitest-environment jsdom+ */++import { fireEvent, render, screen } from '@solidjs/testing-library';+import { beforeEach, describe, expect, it, vi } from 'vitest';+import { AgentInput } from './AgentInput';++const editor = vi.hoisted(() => ({+ clear: vi.fn(),+ enter: undefined as (() => boolean) | undefined,+ change: undefined as ((markdown: string) => void) | undefined,+}));++vi.mock(+ '@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder',+ () => ({+ buildConfig: () => {+ const builder = {+ namespace: () => builder,+ withMentions: () => builder,+ withEmojis: () => builder,+ withLinks: () => builder,+ withHistory: () => builder,+ withCode: () => builder,+ withRestoreFocus: () => builder,+ withAgentCommands: () => builder,+ onEnter: (callback: () => boolean) => {+ editor.enter = callback;+ return builder;+ },+ onFocusLeave: () => builder,+ onChange: (callback: (markdown: string) => void) => {+ editor.change = callback;+ return builder;+ },+ controls: {+ clear: editor.clear,+ focus: vi.fn(),+ },+ lexical: {+ update: vi.fn(),+ },+ };+ return builder;+ },+ })+);++vi.mock('@core/component/LexicalMarkdown/builder/MarkdownShell', () => ({+ MarkdownShell: () => <div data-testid="agent-input-editor" />,+}));++vi.mock('@phosphor/arrow-up.svg', () => ({+ default: () => <span data-testid="send-icon" />,+}));++vi.mock('@phosphor/spinner-gap.svg', () => ({+ default: () => <span data-testid="spinner-icon" />,+}));++vi.mock(+ '@phosphor-icons/core/regular/arrow-bend-down-left.svg?component-solid',+ () => ({+ default: () => <span data-testid="enter-icon" />,+ })+);++beforeEach(() => {+ editor.clear.mockClear();+ editor.enter = undefined;+ editor.change = undefined;+});++describe('queued message advancement', () => {+ it('shows a pressable Enter action that advances the next queued message', () => {+ const onStop = vi.fn();++ render(() => (+ <AgentInput busy hasQueuedMessages onSend={vi.fn()} onStop={onStop} />+ ));++ const sendNext = screen.getByRole('button', {+ name: 'Send next queued message',+ });+ expect(screen.getByTestId('enter-icon')).toBeTruthy();++ fireEvent.click(sendNext);+ expect(onStop).toHaveBeenCalledTimes(1);++ editor.enter?.();+ expect(onStop).toHaveBeenCalledTimes(2);+ });++ it('sends typed text instead of advancing past it', () => {+ const onSend = vi.fn();+ const onStop = vi.fn();++ render(() => (+ <AgentInput busy hasQueuedMessages onSend={onSend} onStop={onStop} />+ ));++ editor.change?.(' another request ');+ editor.enter?.();++ expect(onSend).toHaveBeenCalledWith('another request');+ expect(onStop).not.toHaveBeenCalled();+ expect(editor.clear).toHaveBeenCalledOnce();+ });++ it('keeps Enter inert when there is no queued message or draft', () => {+ const onStop = vi.fn();++ render(() => <AgentInput busy onSend={vi.fn()} onStop={onStop} />);++ expect(screen.getByRole('button', { name: 'Stop' })).toBeTruthy();+ editor.enter?.();+ expect(onStop).not.toHaveBeenCalled();+ });+});diff --git a/apps/web/src/features/block-agent/ui/AgentInput.tsx b/apps/web/src/features/block-agent/ui/AgentInput.tsxindex 155a200496..705e14ba2e 100644--- a/apps/web/src/features/block-agent/ui/AgentInput.tsx+++ b/apps/web/src/features/block-agent/ui/AgentInput.tsx@@ -11,6 +11,7 @@ import { buildConfig } from '@core/component/LexicalMarkdown/builder/MarkdownConimport { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownShell';import type { AgentCommandItem } from '@core/component/LexicalMarkdown/plugins';import { $insertReferencedPaste } from '@macro-inc/lexical-core';+import EnterIcon from '@phosphor-icons/core/regular/arrow-bend-down-left.svg?component-solid';import { Button, SendButton, Surface } from '@ui';import { createSignal, type JSX, onCleanup, onMount, Show } from 'solid-js';@@ -21,6 +22,11 @@ export interface AgentInputProps {placeholder?: string;/** The agent is working: the send button becomes a stop square. */busy?: boolean;+ /**+ * A waiting action can be advanced by ending the current turn. While the+ * input is empty, Enter and the matching button do exactly that.+ */+ hasQueuedMessages?: boolean;disabled?: boolean;autofocus?: boolean;/**@@ -77,6 +83,20 @@ export function AgentInput(props: AgentInputProps) {props.onSend(content);};+ const canSendNext = () =>+ markdown().trim().length === 0 &&+ props.busy &&+ props.hasQueuedMessages &&+ !props.disabled &&+ props.onStop !== undefined;++ const sendNext = () => {+ if (!canSendNext()) return;+ // Stop bypasses the server queue. The cancelled turn ending immediately+ // dispatches its oldest waiting action, so the queue remains FIFO.+ props.onStop?.();+ };+const editor = buildConfig('chat').namespace('agent-input').withMentions({@@ -90,7 +110,8 @@ export function AgentInput(props: AgentInputProps) {.withRestoreFocus().withAgentCommands({ commands: () => props.commands?.() ?? [] }).onEnter(() => {- send();+ if (canSend()) send();+ else sendNext();return true;}).onFocusLeave({@@ -162,15 +183,29 @@ export function AgentInput(props: AgentInputProps) {/>}>- <Button- variant="ghost"- size="icon-sm"- label="Stop"- onClick={() => props.onStop?.()}- class="rounded-[11px] size-7.5 text-ink-extra-muted not-disabled:bg-ink/5 not-disabled:hover:bg-ink/10"+ <Show+ when={canSendNext()}+ fallback={+ <Button+ variant="ghost"+ size="icon-sm"+ label="Stop"+ onClick={() => props.onStop?.()}+ class="rounded-[11px] size-7.5 text-ink-extra-muted not-disabled:bg-ink/5 not-disabled:hover:bg-ink/10"+ >+ <div class="size-3.5 rounded-sm bg-current" />+ </Button>+ }>- <div class="size-3.5 rounded-sm bg-current" />- </Button>+ <SendButton+ aria-label="Send next queued message"+ tooltip="Send next queued message"+ shortcut="Enter"+ onClick={sendNext}+ >+ <EnterIcon />+ </SendButton>+ </Show></Show></div></div>diff --git a/docs/AGENT_GUIDE/ai-chat.md b/docs/AGENT_GUIDE/ai-chat.mdindex 7f3a439f8c..9d3ef25a72 100644--- a/docs/AGENT_GUIDE/ai-chat.md+++ b/docs/AGENT_GUIDE/ai-chat.md@@ -67,7 +67,11 @@ transcript (and in the originating channel thread).user message in the transcript.- Keyboard: Up at the very start of the composer input moves focus into thebottom (next-to-send) queue row; further Up presses walk toward newer entries, Down- walks back and past the bottom row returns to the input.+ walks back and past the bottom row returns to the input. When the composer is empty+ and a prompt is queued, its action becomes `Send next queued message` (an Enter+ symbol); pressing Enter or clicking that button cancels the current turn so the next+ queued prompt starts immediately. Typed composer text still takes priority and Enter+ queues that new prompt normally.- The stop button cancels only the **current** turn. The queue keeps draining: the nextqueued prompt starts a new turn. To fully quiesce a session, remove the queuedentries, then stop.