From cdc92d16e4f0c61cf416f67d0b2ae50e93f0380c Mon Sep 17 00:00:00 2001 From: KRATOS <84986124+gnanam1990@users.noreply.github.com> Date: Sat, 4 Apr 2026 17:57:59 +0530 Subject: [PATCH] fix(repl): queue prompt guidance for next turn (#333) Keep normal prompt submissions during generation queued instead of interrupting the current turn. Add a visible next-turn banner in the prompt area so users can tell their follow-up guidance was accepted, and cover the new behavior with focused tests. Fixes #328 Co-authored-by: Claude --- .../PromptInputQueuedCommands.test.tsx | 35 ++++++++ .../PromptInput/PromptInputQueuedCommands.tsx | 24 +++-- src/utils/handlePromptSubmit.test.ts | 89 +++++++++++++++++++ src/utils/handlePromptSubmit.ts | 7 +- 4 files changed, 147 insertions(+), 8 deletions(-) create mode 100644 src/components/PromptInput/PromptInputQueuedCommands.test.tsx create mode 100644 src/utils/handlePromptSubmit.test.ts diff --git a/src/components/PromptInput/PromptInputQueuedCommands.test.tsx b/src/components/PromptInput/PromptInputQueuedCommands.test.tsx new file mode 100644 index 00000000..50cf4403 --- /dev/null +++ b/src/components/PromptInput/PromptInputQueuedCommands.test.tsx @@ -0,0 +1,35 @@ +import React from 'react' +import { afterEach, beforeEach, describe, expect, it, mock } from 'bun:test' +import { renderToString } from '../../utils/staticRender.js' + +describe('PromptInputQueuedCommands', () => { + beforeEach(() => { + mock.module('../../hooks/useCommandQueue.js', () => ({ + useCommandQueue: () => [ + { + value: 'Use another library', + mode: 'prompt', + }, + ], + })) + + mock.module('src/state/AppState.js', () => ({ + useAppState: ( + selector: (state: { viewingAgentTaskId?: string; isBriefOnly: boolean }) => unknown, + ) => selector({ viewingAgentTaskId: undefined, isBriefOnly: false }), + })) + }) + + afterEach(() => { + mock.restore() + }) + + it('shows a next-turn guidance banner for queued prompt messages', async () => { + const { PromptInputQueuedCommands } = await import('./PromptInputQueuedCommands.js') + + const output = await renderToString(, 100) + + expect(output).toContain('1 message queued for next turn') + expect(output).toContain('Use another library') + }) +}) diff --git a/src/components/PromptInput/PromptInputQueuedCommands.tsx b/src/components/PromptInput/PromptInputQueuedCommands.tsx index 16129692..7f251af3 100644 --- a/src/components/PromptInput/PromptInputQueuedCommands.tsx +++ b/src/components/PromptInput/PromptInputQueuedCommands.tsx @@ -1,13 +1,14 @@ import { feature } from 'bun:bundle'; import * as React from 'react'; import { useMemo } from 'react'; -import { Box } from 'src/ink.js'; +import { Box, Text } from 'src/ink.js'; import { useAppState } from 'src/state/AppState.js'; +import type { AppState } from 'src/state/AppState.js'; import { STATUS_TAG, SUMMARY_TAG, TASK_NOTIFICATION_TAG } from '../../constants/xml.js'; import { QueuedMessageProvider } from '../../context/QueuedMessageContext.js'; import { useCommandQueue } from '../../hooks/useCommandQueue.js'; import type { QueuedCommand } from '../../types/textInputTypes.js'; -import { isQueuedCommandVisible } from '../../utils/messageQueueManager.js'; +import { isQueuedCommandEditable, isQueuedCommandVisible } from '../../utils/messageQueueManager.js'; import { createUserMessage, EMPTY_LOOKUPS, normalizeMessages } from '../../utils/messages.js'; import { jsonParse } from '../../utils/slowOperations.js'; import { Message } from '../Message.js'; @@ -70,17 +71,25 @@ function processQueuedCommands(queuedCommands: QueuedCommand[]): QueuedCommand[] } function PromptInputQueuedCommandsImpl(): React.ReactNode { const queuedCommands = useCommandQueue(); - const viewingAgent = useAppState(s => !!s.viewingAgentTaskId); + const viewingAgent = useAppState((s: AppState) => !!s.viewingAgentTaskId); // Brief layout: dim queue items + skip the paddingX (brief messages // already indent themselves). Gate mirrors the brief-spinner/message // check elsewhere — no teammate-view override needed since this // component early-returns when viewing a teammate. const useBriefLayout = feature('KAIROS') || feature('KAIROS_BRIEF') ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant - useAppState(s_0 => s_0.isBriefOnly) : false; + useAppState((s_0: AppState) => s_0.isBriefOnly) : false; // createUserMessage mints a fresh UUID per call; without memoization, streaming // re-renders defeat Message's areMessagePropsEqual (compares uuid) → flicker. + const queuedPromptCount = useMemo( + () => + queuedCommands.filter( + cmd => isQueuedCommandEditable(cmd) && cmd.mode === 'prompt', + ).length, + [queuedCommands], + ); + const messages = useMemo(() => { if (queuedCommands.length === 0) return null; // task-notification is shown via useInboxNotification; most isMeta commands @@ -108,10 +117,15 @@ function PromptInputQueuedCommandsImpl(): React.ReactNode { return null; } return + {queuedPromptCount > 0 && + + {queuedPromptCount === 1 ? '1 message queued for next turn' : `${queuedPromptCount} messages queued for next turn`} + + } {messages.map((message, i) => )} ; } export const PromptInputQueuedCommands = React.memo(PromptInputQueuedCommandsImpl); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["feature","React","useMemo","Box","useAppState","STATUS_TAG","SUMMARY_TAG","TASK_NOTIFICATION_TAG","QueuedMessageProvider","useCommandQueue","QueuedCommand","isQueuedCommandVisible","createUserMessage","EMPTY_LOOKUPS","normalizeMessages","jsonParse","Message","EMPTY_SET","Set","isIdleNotification","value","parsed","type","MAX_VISIBLE_NOTIFICATIONS","createOverflowNotificationMessage","count","processQueuedCommands","queuedCommands","filteredCommands","filter","cmd","taskNotifications","mode","otherCommands","length","visibleNotifications","slice","overflowCount","overflowCommand","PromptInputQueuedCommandsImpl","ReactNode","viewingAgent","s","viewingAgentTaskId","useBriefLayout","isBriefOnly","messages","visibleCommands","processedCommands","map","content","message","i","PromptInputQueuedCommands","memo"],"sources":["PromptInputQueuedCommands.tsx"],"sourcesContent":["import { feature } from 'bun:bundle'\nimport * as React from 'react'\nimport { useMemo } from 'react'\nimport { Box } from 'src/ink.js'\nimport { useAppState } from 'src/state/AppState.js'\nimport {\n  STATUS_TAG,\n  SUMMARY_TAG,\n  TASK_NOTIFICATION_TAG,\n} from '../../constants/xml.js'\nimport { QueuedMessageProvider } from '../../context/QueuedMessageContext.js'\nimport { useCommandQueue } from '../../hooks/useCommandQueue.js'\nimport type { QueuedCommand } from '../../types/textInputTypes.js'\nimport { isQueuedCommandVisible } from '../../utils/messageQueueManager.js'\nimport {\n  createUserMessage,\n  EMPTY_LOOKUPS,\n  normalizeMessages,\n} from '../../utils/messages.js'\nimport { jsonParse } from '../../utils/slowOperations.js'\nimport { Message } from '../Message.js'\n\nconst EMPTY_SET = new Set<string>()\n\n/**\n * Check if a command value is an idle notification that should be hidden.\n * Idle notifications are processed silently without showing to the user.\n */\nfunction isIdleNotification(value: string): boolean {\n  try {\n    const parsed = jsonParse(value)\n    return parsed?.type === 'idle_notification'\n  } catch {\n    return false\n  }\n}\n\n// Maximum number of task notification lines to show\nconst MAX_VISIBLE_NOTIFICATIONS = 3\n\n/**\n * Create a synthetic overflow notification message for capped task notifications.\n */\nfunction createOverflowNotificationMessage(count: number): string {\n  return `<${TASK_NOTIFICATION_TAG}>\n<${SUMMARY_TAG}>+${count} more tasks completed</${SUMMARY_TAG}>\n<${STATUS_TAG}>completed</${STATUS_TAG}>\n</${TASK_NOTIFICATION_TAG}>`\n}\n\n/**\n * Process queued commands to cap task notifications at MAX_VISIBLE_NOTIFICATIONS lines.\n * Other command types are always shown in full.\n * Idle notifications are filtered out entirely.\n */\nfunction processQueuedCommands(\n  queuedCommands: QueuedCommand[],\n): QueuedCommand[] {\n  // Filter out idle notifications - they are processed silently\n  const filteredCommands = queuedCommands.filter(\n    cmd => typeof cmd.value !== 'string' || !isIdleNotification(cmd.value),\n  )\n\n  // Separate task notifications from other commands\n  const taskNotifications = filteredCommands.filter(\n    cmd => cmd.mode === 'task-notification',\n  )\n  const otherCommands = filteredCommands.filter(\n    cmd => cmd.mode !== 'task-notification',\n  )\n\n  // If notifications fit within limit, return all commands as-is\n  if (taskNotifications.length <= MAX_VISIBLE_NOTIFICATIONS) {\n    return [...otherCommands, ...taskNotifications]\n  }\n\n  // Show first (MAX_VISIBLE_NOTIFICATIONS - 1) notifications, then a summary\n  const visibleNotifications = taskNotifications.slice(\n    0,\n    MAX_VISIBLE_NOTIFICATIONS - 1,\n  )\n  const overflowCount =\n    taskNotifications.length - (MAX_VISIBLE_NOTIFICATIONS - 1)\n\n  // Create synthetic overflow message\n  const overflowCommand: QueuedCommand = {\n    value: createOverflowNotificationMessage(overflowCount),\n    mode: 'task-notification',\n  }\n\n  return [...otherCommands, ...visibleNotifications, overflowCommand]\n}\n\nfunction PromptInputQueuedCommandsImpl(): React.ReactNode {\n  const queuedCommands = useCommandQueue()\n  const viewingAgent = useAppState(s => !!s.viewingAgentTaskId)\n  // Brief layout: dim queue items + skip the paddingX (brief messages\n  // already indent themselves). Gate mirrors the brief-spinner/message\n  // check elsewhere — no teammate-view override needed since this\n  // component early-returns when viewing a teammate.\n  const useBriefLayout =\n    feature('KAIROS') || feature('KAIROS_BRIEF')\n      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant\n        useAppState(s => s.isBriefOnly)\n      : false\n\n  // createUserMessage mints a fresh UUID per call; without memoization, streaming\n  // re-renders defeat Message's areMessagePropsEqual (compares uuid) → flicker.\n  const messages = useMemo(() => {\n    if (queuedCommands.length === 0) return null\n    // task-notification is shown via useInboxNotification; most isMeta commands\n    // (scheduled tasks, proactive ticks) are system-generated and hidden.\n    // Channel messages are the exception — isMeta but shown so the keyboard\n    // user sees what arrived.\n    const visibleCommands = queuedCommands.filter(isQueuedCommandVisible)\n    if (visibleCommands.length === 0) return null\n    const processedCommands = processQueuedCommands(visibleCommands)\n    return normalizeMessages(\n      processedCommands.map(cmd => {\n        let content = cmd.value\n        if (cmd.mode === 'bash' && typeof content === 'string') {\n          content = `<bash-input>${content}</bash-input>`\n        }\n        // [Image #N] placeholders are inline in the text value (inserted at\n        // paste time), so the queue preview shows them without stub blocks.\n        return createUserMessage({ content })\n      }),\n    )\n  }, [queuedCommands])\n\n  // Don't show leader's queued commands when viewing any agent's transcript\n  if (viewingAgent || messages === null) {\n    return null\n  }\n\n  return (\n    <Box marginTop={1} flexDirection=\"column\">\n      {messages.map((message, i) => (\n        <QueuedMessageProvider\n          key={i}\n          isFirst={i === 0}\n          useBriefLayout={useBriefLayout}\n        >\n          <Message\n            message={message}\n            lookups={EMPTY_LOOKUPS}\n            addMargin={false}\n            tools={[]}\n            commands={[]}\n            verbose={false}\n            inProgressToolUseIDs={EMPTY_SET}\n            progressMessagesForMessage={[]}\n            shouldAnimate={false}\n            shouldShowDot={false}\n            isTranscriptMode={false}\n            isStatic={true}\n          />\n        </QueuedMessageProvider>\n      ))}\n    </Box>\n  )\n}\n\nexport const PromptInputQueuedCommands = React.memo(\n  PromptInputQueuedCommandsImpl,\n)\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,YAAY;AACpC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,OAAO,QAAQ,OAAO;AAC/B,SAASC,GAAG,QAAQ,YAAY;AAChC,SAASC,WAAW,QAAQ,uBAAuB;AACnD,SACEC,UAAU,EACVC,WAAW,EACXC,qBAAqB,QAChB,wBAAwB;AAC/B,SAASC,qBAAqB,QAAQ,uCAAuC;AAC7E,SAASC,eAAe,QAAQ,gCAAgC;AAChE,cAAcC,aAAa,QAAQ,+BAA+B;AAClE,SAASC,sBAAsB,QAAQ,oCAAoC;AAC3E,SACEC,iBAAiB,EACjBC,aAAa,EACbC,iBAAiB,QACZ,yBAAyB;AAChC,SAASC,SAAS,QAAQ,+BAA+B;AACzD,SAASC,OAAO,QAAQ,eAAe;AAEvC,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;;AAEnC;AACA;AACA;AACA;AACA,SAASC,kBAAkBA,CAACC,KAAK,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC;EAClD,IAAI;IACF,MAAMC,MAAM,GAAGN,SAAS,CAACK,KAAK,CAAC;IAC/B,OAAOC,MAAM,EAAEC,IAAI,KAAK,mBAAmB;EAC7C,CAAC,CAAC,MAAM;IACN,OAAO,KAAK;EACd;AACF;;AAEA;AACA,MAAMC,yBAAyB,GAAG,CAAC;;AAEnC;AACA;AACA;AACA,SAASC,iCAAiCA,CAACC,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC;EAChE,OAAO,IAAIlB,qBAAqB;AAClC,GAAGD,WAAW,KAAKmB,KAAK,0BAA0BnB,WAAW;AAC7D,GAAGD,UAAU,eAAeA,UAAU;AACtC,IAAIE,qBAAqB,GAAG;AAC5B;;AAEA;AACA;AACA;AACA;AACA;AACA,SAASmB,qBAAqBA,CAC5BC,cAAc,EAAEjB,aAAa,EAAE,CAChC,EAAEA,aAAa,EAAE,CAAC;EACjB;EACA,MAAMkB,gBAAgB,GAAGD,cAAc,CAACE,MAAM,CAC5CC,GAAG,IAAI,OAAOA,GAAG,CAACV,KAAK,KAAK,QAAQ,IAAI,CAACD,kBAAkB,CAACW,GAAG,CAACV,KAAK,CACvE,CAAC;;EAED;EACA,MAAMW,iBAAiB,GAAGH,gBAAgB,CAACC,MAAM,CAC/CC,GAAG,IAAIA,GAAG,CAACE,IAAI,KAAK,mBACtB,CAAC;EACD,MAAMC,aAAa,GAAGL,gBAAgB,CAACC,MAAM,CAC3CC,GAAG,IAAIA,GAAG,CAACE,IAAI,KAAK,mBACtB,CAAC;;EAED;EACA,IAAID,iBAAiB,CAACG,MAAM,IAAIX,yBAAyB,EAAE;IACzD,OAAO,CAAC,GAAGU,aAAa,EAAE,GAAGF,iBAAiB,CAAC;EACjD;;EAEA;EACA,MAAMI,oBAAoB,GAAGJ,iBAAiB,CAACK,KAAK,CAClD,CAAC,EACDb,yBAAyB,GAAG,CAC9B,CAAC;EACD,MAAMc,aAAa,GACjBN,iBAAiB,CAACG,MAAM,IAAIX,yBAAyB,GAAG,CAAC,CAAC;;EAE5D;EACA,MAAMe,eAAe,EAAE5B,aAAa,GAAG;IACrCU,KAAK,EAAEI,iCAAiC,CAACa,aAAa,CAAC;IACvDL,IAAI,EAAE;EACR,CAAC;EAED,OAAO,CAAC,GAAGC,aAAa,EAAE,GAAGE,oBAAoB,EAAEG,eAAe,CAAC;AACrE;AAEA,SAASC,6BAA6BA,CAAA,CAAE,EAAEtC,KAAK,CAACuC,SAAS,CAAC;EACxD,MAAMb,cAAc,GAAGlB,eAAe,CAAC,CAAC;EACxC,MAAMgC,YAAY,GAAGrC,WAAW,CAACsC,CAAC,IAAI,CAAC,CAACA,CAAC,CAACC,kBAAkB,CAAC;EAC7D;EACA;EACA;EACA;EACA,MAAMC,cAAc,GAClB5C,OAAO,CAAC,QAAQ,CAAC,IAAIA,OAAO,CAAC,cAAc,CAAC;EACxC;EACAI,WAAW,CAACsC,GAAC,IAAIA,GAAC,CAACG,WAAW,CAAC,GAC/B,KAAK;;EAEX;EACA;EACA,MAAMC,QAAQ,GAAG5C,OAAO,CAAC,MAAM;IAC7B,IAAIyB,cAAc,CAACO,MAAM,KAAK,CAAC,EAAE,OAAO,IAAI;IAC5C;IACA;IACA;IACA;IACA,MAAMa,eAAe,GAAGpB,cAAc,CAACE,MAAM,CAAClB,sBAAsB,CAAC;IACrE,IAAIoC,eAAe,CAACb,MAAM,KAAK,CAAC,EAAE,OAAO,IAAI;IAC7C,MAAMc,iBAAiB,GAAGtB,qBAAqB,CAACqB,eAAe,CAAC;IAChE,OAAOjC,iBAAiB,CACtBkC,iBAAiB,CAACC,GAAG,CAACnB,GAAG,IAAI;MAC3B,IAAIoB,OAAO,GAAGpB,GAAG,CAACV,KAAK;MACvB,IAAIU,GAAG,CAACE,IAAI,KAAK,MAAM,IAAI,OAAOkB,OAAO,KAAK,QAAQ,EAAE;QACtDA,OAAO,GAAG,eAAeA,OAAO,eAAe;MACjD;MACA;MACA;MACA,OAAOtC,iBAAiB,CAAC;QAAEsC;MAAQ,CAAC,CAAC;IACvC,CAAC,CACH,CAAC;EACH,CAAC,EAAE,CAACvB,cAAc,CAAC,CAAC;;EAEpB;EACA,IAAIc,YAAY,IAAIK,QAAQ,KAAK,IAAI,EAAE;IACrC,OAAO,IAAI;EACb;EAEA,OACE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ;AAC7C,MAAM,CAACA,QAAQ,CAACG,GAAG,CAAC,CAACE,OAAO,EAAEC,CAAC,KACvB,CAAC,qBAAqB,CACpB,GAAG,CAAC,CAACA,CAAC,CAAC,CACP,OAAO,CAAC,CAACA,CAAC,KAAK,CAAC,CAAC,CACjB,cAAc,CAAC,CAACR,cAAc,CAAC;AAEzC,UAAU,CAAC,OAAO,CACN,OAAO,CAAC,CAACO,OAAO,CAAC,CACjB,OAAO,CAAC,CAACtC,aAAa,CAAC,CACvB,SAAS,CAAC,CAAC,KAAK,CAAC,CACjB,KAAK,CAAC,CAAC,EAAE,CAAC,CACV,QAAQ,CAAC,CAAC,EAAE,CAAC,CACb,OAAO,CAAC,CAAC,KAAK,CAAC,CACf,oBAAoB,CAAC,CAACI,SAAS,CAAC,CAChC,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAC/B,aAAa,CAAC,CAAC,KAAK,CAAC,CACrB,aAAa,CAAC,CAAC,KAAK,CAAC,CACrB,gBAAgB,CAAC,CAAC,KAAK,CAAC,CACxB,QAAQ,CAAC,CAAC,IAAI,CAAC;AAE3B,QAAQ,EAAE,qBAAqB,CACxB,CAAC;AACR,IAAI,EAAE,GAAG,CAAC;AAEV;AAEA,OAAO,MAAMoC,yBAAyB,GAAGpD,KAAK,CAACqD,IAAI,CACjDf,6BACF,CAAC","ignoreList":[]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["feature","React","useMemo","Box","useAppState","STATUS_TAG","SUMMARY_TAG","TASK_NOTIFICATION_TAG","QueuedMessageProvider","useCommandQueue","QueuedCommand","isQueuedCommandVisible","createUserMessage","EMPTY_LOOKUPS","normalizeMessages","jsonParse","Message","EMPTY_SET","Set","isIdleNotification","value","parsed","type","MAX_VISIBLE_NOTIFICATIONS","createOverflowNotificationMessage","count","processQueuedCommands","queuedCommands","filteredCommands","filter","cmd","taskNotifications","mode","otherCommands","length","visibleNotifications","slice","overflowCount","overflowCommand","PromptInputQueuedCommandsImpl","ReactNode","viewingAgent","s","viewingAgentTaskId","useBriefLayout","isBriefOnly","messages","visibleCommands","processedCommands","map","content","message","i","PromptInputQueuedCommands","memo"],"sources":["PromptInputQueuedCommands.tsx"],"sourcesContent":["import { feature } from 'bun:bundle'\nimport * as React from 'react'\nimport { useMemo } from 'react'\nimport { Box } from 'src/ink.js'\nimport { useAppState } from 'src/state/AppState.js'\nimport {\n  STATUS_TAG,\n  SUMMARY_TAG,\n  TASK_NOTIFICATION_TAG,\n} from '../../constants/xml.js'\nimport { QueuedMessageProvider } from '../../context/QueuedMessageContext.js'\nimport { useCommandQueue } from '../../hooks/useCommandQueue.js'\nimport type { QueuedCommand } from '../../types/textInputTypes.js'\nimport { isQueuedCommandVisible } from '../../utils/messageQueueManager.js'\nimport {\n  createUserMessage,\n  EMPTY_LOOKUPS,\n  normalizeMessages,\n} from '../../utils/messages.js'\nimport { jsonParse } from '../../utils/slowOperations.js'\nimport { Message } from '../Message.js'\n\nconst EMPTY_SET = new Set<string>()\n\n/**\n * Check if a command value is an idle notification that should be hidden.\n * Idle notifications are processed silently without showing to the user.\n */\nfunction isIdleNotification(value: string): boolean {\n  try {\n    const parsed = jsonParse(value)\n    return parsed?.type === 'idle_notification'\n  } catch {\n    return false\n  }\n}\n\n// Maximum number of task notification lines to show\nconst MAX_VISIBLE_NOTIFICATIONS = 3\n\n/**\n * Create a synthetic overflow notification message for capped task notifications.\n */\nfunction createOverflowNotificationMessage(count: number): string {\n  return `<${TASK_NOTIFICATION_TAG}>\n<${SUMMARY_TAG}>+${count} more tasks completed</${SUMMARY_TAG}>\n<${STATUS_TAG}>completed</${STATUS_TAG}>\n</${TASK_NOTIFICATION_TAG}>`\n}\n\n/**\n * Process queued commands to cap task notifications at MAX_VISIBLE_NOTIFICATIONS lines.\n * Other command types are always shown in full.\n * Idle notifications are filtered out entirely.\n */\nfunction processQueuedCommands(\n  queuedCommands: QueuedCommand[],\n): QueuedCommand[] {\n  // Filter out idle notifications - they are processed silently\n  const filteredCommands = queuedCommands.filter(\n    cmd => typeof cmd.value !== 'string' || !isIdleNotification(cmd.value),\n  )\n\n  // Separate task notifications from other commands\n  const taskNotifications = filteredCommands.filter(\n    cmd => cmd.mode === 'task-notification',\n  )\n  const otherCommands = filteredCommands.filter(\n    cmd => cmd.mode !== 'task-notification',\n  )\n\n  // If notifications fit within limit, return all commands as-is\n  if (taskNotifications.length <= MAX_VISIBLE_NOTIFICATIONS) {\n    return [...otherCommands, ...taskNotifications]\n  }\n\n  // Show first (MAX_VISIBLE_NOTIFICATIONS - 1) notifications, then a summary\n  const visibleNotifications = taskNotifications.slice(\n    0,\n    MAX_VISIBLE_NOTIFICATIONS - 1,\n  )\n  const overflowCount =\n    taskNotifications.length - (MAX_VISIBLE_NOTIFICATIONS - 1)\n\n  // Create synthetic overflow message\n  const overflowCommand: QueuedCommand = {\n    value: createOverflowNotificationMessage(overflowCount),\n    mode: 'task-notification',\n  }\n\n  return [...otherCommands, ...visibleNotifications, overflowCommand]\n}\n\nfunction PromptInputQueuedCommandsImpl(): React.ReactNode {\n  const queuedCommands = useCommandQueue()\n  const viewingAgent = useAppState(s => !!s.viewingAgentTaskId)\n  // Brief layout: dim queue items + skip the paddingX (brief messages\n  // already indent themselves). Gate mirrors the brief-spinner/message\n  // check elsewhere — no teammate-view override needed since this\n  // component early-returns when viewing a teammate.\n  const useBriefLayout =\n    feature('KAIROS') || feature('KAIROS_BRIEF')\n      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant\n        useAppState(s => s.isBriefOnly)\n      : false\n\n  // createUserMessage mints a fresh UUID per call; without memoization, streaming\n  // re-renders defeat Message's areMessagePropsEqual (compares uuid) → flicker.\n  const messages = useMemo(() => {\n    if (queuedCommands.length === 0) return null\n    // task-notification is shown via useInboxNotification; most isMeta commands\n    // (scheduled tasks, proactive ticks) are system-generated and hidden.\n    // Channel messages are the exception — isMeta but shown so the keyboard\n    // user sees what arrived.\n    const visibleCommands = queuedCommands.filter(isQueuedCommandVisible)\n    if (visibleCommands.length === 0) return null\n    const processedCommands = processQueuedCommands(visibleCommands)\n    return normalizeMessages(\n      processedCommands.map(cmd => {\n        let content = cmd.value\n        if (cmd.mode === 'bash' && typeof content === 'string') {\n          content = `<bash-input>${content}</bash-input>`\n        }\n        // [Image #N] placeholders are inline in the text value (inserted at\n        // paste time), so the queue preview shows them without stub blocks.\n        return createUserMessage({ content })\n      }),\n    )\n  }, [queuedCommands])\n\n  // Don't show leader's queued commands when viewing any agent's transcript\n  if (viewingAgent || messages === null) {\n    return null\n  }\n\n  return (\n    <Box marginTop={1} flexDirection=\"column\">\n      {messages.map((message, i) => (\n        <QueuedMessageProvider\n          key={i}\n          isFirst={i === 0}\n          useBriefLayout={useBriefLayout}\n        >\n          <Message\n            message={message}\n            lookups={EMPTY_LOOKUPS}\n            addMargin={false}\n            tools={[]}\n            commands={[]}\n            verbose={false}\n            inProgressToolUseIDs={EMPTY_SET}\n            progressMessagesForMessage={[]}\n            shouldAnimate={false}\n            shouldShowDot={false}\n            isTranscriptMode={false}\n            isStatic={true}\n          />\n        </QueuedMessageProvider>\n      ))}\n    </Box>\n  )\n}\n\nexport const PromptInputQueuedCommands = React.memo(\n  PromptInputQueuedCommandsImpl,\n)\n"],"mappings":"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","ignoreList":[]} diff --git a/src/utils/handlePromptSubmit.test.ts b/src/utils/handlePromptSubmit.test.ts new file mode 100644 index 00000000..c6dbb4f5 --- /dev/null +++ b/src/utils/handlePromptSubmit.test.ts @@ -0,0 +1,89 @@ +import { afterEach, beforeEach, describe, expect, it, mock } from 'bun:test' +import { getCommandQueue, resetCommandQueue } from './messageQueueManager.js' + +describe('handlePromptSubmit', () => { + beforeEach(() => { + resetCommandQueue() + mock.module('src/services/analytics/index.js', () => ({ + logEvent: () => {}, + })) + }) + + afterEach(() => { + resetCommandQueue() + mock.restore() + }) + + it('queues prompt submissions during generation without interrupting the current turn', async () => { + const { handlePromptSubmit } = await import('./handlePromptSubmit.js') + + const abortCalls: unknown[] = [] + const inputChanges: string[] = [] + let cursorOffset = 123 + let bufferCleared = false + let pastedContentsCleared = false + let historyReset = false + + await handlePromptSubmit({ + input: ' use another library ', + mode: 'prompt', + pastedContents: {}, + helpers: { + setCursorOffset: offset => { + cursorOffset = offset + }, + clearBuffer: () => { + bufferCleared = true + }, + resetHistory: () => { + historyReset = true + }, + }, + onInputChange: value => { + inputChanges.push(value) + }, + setPastedContents: updater => { + const nextValue = + typeof updater === 'function' + ? updater({ 1: { id: 1, type: 'text', content: 'x' } }) + : updater + pastedContentsCleared = Object.keys(nextValue).length === 0 + }, + abortController: { + abort: (reason: unknown) => { + abortCalls.push(reason) + }, + } as never, + hasInterruptibleToolInProgress: true, + queryGuard: { + isActive: true, + } as never, + isExternalLoading: false, + commands: [], + messages: [], + mainLoopModel: 'sonnet', + ideSelection: undefined, + querySource: 'repl' as never, + setToolJSX: () => {}, + getToolUseContext: () => ({}) as never, + setUserInputOnProcessing: () => {}, + setAbortController: () => {}, + onQuery: async () => {}, + setAppState: () => ({}) as never, + }) + + expect(abortCalls).toEqual([]) + expect(inputChanges).toEqual(['']) + expect(cursorOffset).toBe(0) + expect(bufferCleared).toBe(true) + expect(pastedContentsCleared).toBe(true) + expect(historyReset).toBe(true) + expect(getCommandQueue()).toMatchObject([ + { + value: 'use another library', + preExpansionValue: 'use another library', + mode: 'prompt', + }, + ]) + }) +}) diff --git a/src/utils/handlePromptSubmit.ts b/src/utils/handlePromptSubmit.ts index 4e514dd0..c11de745 100644 --- a/src/utils/handlePromptSubmit.ts +++ b/src/utils/handlePromptSubmit.ts @@ -316,9 +316,10 @@ export async function handlePromptSubmit( return } - // Interrupt the current turn when all executing tools have - // interruptBehavior 'cancel' (e.g. SleepTool). - if (params.hasInterruptibleToolInProgress) { + // Prompt submissions during generation should guide the next turn without + // interrupting the current one. Keep the explicit interrupt path only for + // non-prompt inputs that opt into that behavior. + if (mode !== 'prompt' && params.hasInterruptibleToolInProgress) { logForDebugging( `[interrupt] Aborting current turn: streamMode=${params.streamMode}`, )