@vybestack/llxprt-code 0.10.0 → 0.11.0-nightly.260728.ffaa8d5d7

package/src/ui/containers/AppContainer/builders/buildUIState.ts

@@ -23,6 +23,7 @@ import type {
 } from '@vybestack/llxprt-code-core';
 import type { ToolInfo } from '@vybestack/llxprt-code-agents';
 import type { SlashCommandRuntime } from '../../../cliUiRuntime.js';
+import type { QueuedSubmission } from '../../../hooks/agentStream/types.js';
 import type { SlashCommand, CommandContext } from '../../../commands/types.js';
 import type { LoadedSettings } from '../../../../config/settings.js';
 import type {
@@ -135,7 +136,6 @@ export interface UIStateParams {
   ctrlCPressedOnce: boolean;
   ctrlDPressedOnce: boolean;
   showEscapePrompt: boolean;
-  showIdeRestartPrompt: boolean;
   quittingMessages: HistoryItem[] | null;
 
   // Display options
@@ -143,6 +143,8 @@ export interface UIStateParams {
   showErrorDetails: boolean;
   showToolDescriptions: boolean;
   isTodoPanelCollapsed: boolean;
+  isQueuedMessagesPanelCollapsed: boolean;
+  queuedSubmissions: readonly QueuedSubmission[];
   isNarrow: boolean;
   vimModeEnabled: boolean;
   vimMode: string | undefined;
@@ -195,7 +197,6 @@ export interface UIStateParams {
   currentIDE: IdeInfo | undefined;
 
   // Trust
-  isRestarting: boolean;
   isTrustedFolder: boolean;
 
   // Welcome onboarding
@@ -316,7 +317,6 @@ function buildConfirmationAndExit(p: UIStateParams) {
     ctrlCPressedOnce: p.ctrlCPressedOnce,
     ctrlDPressedOnce: p.ctrlDPressedOnce,
     showEscapePrompt: p.showEscapePrompt,
-    showIdeRestartPrompt: p.showIdeRestartPrompt,
     quittingMessages: p.quittingMessages,
   };
 }
@@ -327,6 +327,8 @@ function buildDisplayAndContext(p: UIStateParams) {
     showErrorDetails: p.showErrorDetails,
     showToolDescriptions: p.showToolDescriptions,
     isTodoPanelCollapsed: p.isTodoPanelCollapsed,
+    isQueuedMessagesPanelCollapsed: p.isQueuedMessagesPanelCollapsed,
+    queuedSubmissions: p.queuedSubmissions,
     isNarrow: p.isNarrow,
     vimModeEnabled: p.vimModeEnabled,
     vimMode: p.vimMode,
@@ -365,7 +367,6 @@ function buildProcessingAndCommands(p: UIStateParams) {
     commandContext: p.commandContext,
     shouldShowIdePrompt: p.shouldShowIdePrompt,
     currentIDE: p.currentIDE,
-    isRestarting: p.isRestarting,
     isTrustedFolder: p.isTrustedFolder,
   };
 }

package/src/ui/containers/AppContainer/hooks/useAppBootstrap.ts

@@ -5,7 +5,7 @@
  */
 
 import type React from 'react';
-import { useCallback, useEffect, useMemo, useState, useRef } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useStdin, useStdout } from 'ink';
 import { useResponsive } from '../../../hooks/useResponsive.js';
 import { useBracketedPaste } from '../../../hooks/useBracketedPaste.js';
@@ -18,7 +18,6 @@ import {
 } from '../../../../constants/historyLimits.js';
 import { useHistory } from '../../../hooks/useHistoryManager.js';
 import { useMemoryMonitor } from '../../../hooks/useMemoryMonitor.js';
-import { TodoPausePreserver } from '../../../hooks/useTodoPausePreserver.js';
 import {
   type IContent,
   type IdeInfo,
@@ -41,7 +40,6 @@ import { registerCleanup } from '../../../../utils/cleanup.js';
 import type { Agent } from '@vybestack/llxprt-code-agents';
 import type { LoadedSettings } from '../../../../config/settings.js';
 import type { HistoryItem } from '../../../types.js';
-import type { TodoContinuationHook } from './useTodoContinuationFlow.js';
 import type {
   AgentClientSource,
   StreamRuntime,
@@ -106,13 +104,6 @@ export interface AppBootstrapResult {
   tokenMetrics: ReturnType<typeof useTokenMetricsTracking>['tokenMetrics'];
   todos: ReturnType<typeof useTodoContext>['todos'];
   updateTodos: ReturnType<typeof useTodoContext>['updateTodos'];
-  todoPauseController: TodoPausePreserver;
-  todoContinuationRef: React.MutableRefObject<Pick<
-    TodoContinuationHook,
-    'handleTodoPause' | 'clearPause'
-  > | null>;
-  hadToolCallsRef: React.MutableRefObject<boolean>;
-  registerTodoPause: () => void;
   recordingIntegrationRef: React.MutableRefObject<RecordingIntegration | null>;
   recordingSwapCallbacks: ReturnType<
     typeof useRecordingInfrastructure
@@ -192,27 +183,10 @@ function useBootstrapHistory(props: AppBootstrapProps) {
   };
 }
 
-/** Initializes task-list state and pause controller */
+/** Initializes task-list state */
 function useBootstrapTodo() {
   const { todos, updateTodos } = useTodoContext();
-  const todoPauseController = useMemo(() => new TodoPausePreserver(), []);
-  const todoContinuationRef = useRef<Pick<
-    TodoContinuationHook,
-    'handleTodoPause' | 'clearPause'
-  > | null>(null);
-  const hadToolCallsRef = useRef<boolean>(false);
-  const registerTodoPause = useCallback(() => {
-    todoPauseController.registerTodoPause();
-    todoContinuationRef.current?.handleTodoPause('paused by model');
-  }, [todoPauseController]);
-  return {
-    todos,
-    updateTodos,
-    todoPauseController,
-    todoContinuationRef,
-    hadToolCallsRef,
-    registerTodoPause,
-  };
+  return { todos, updateTodos };
 }
 
 /** Initializes recording, IDE prompt, messages, and token metrics */
@@ -324,10 +298,6 @@ export function useAppBootstrap(props: AppBootstrapProps): AppBootstrapResult {
     stdout: h.stdout,
     todos: t.todos,
     updateTodos: t.updateTodos,
-    todoPauseController: t.todoPauseController,
-    todoContinuationRef: t.todoContinuationRef,
-    hadToolCallsRef: t.hadToolCallsRef,
-    registerTodoPause: t.registerTodoPause,
     recordingIntegrationRef: e.recordingIntegrationRef,
     recordingSwapCallbacks: e.recordingSwapCallbacks,
     idePromptAnswered: e.idePromptAnswered,

package/src/ui/containers/AppContainer/hooks/useAppDialogs.ts

@@ -11,7 +11,6 @@ import { useThemeCommand } from '../../../hooks/useThemeCommand.js';
 import { useAuthCommand } from '../../../hooks/useAuthCommand.js';
 import { useFolderTrust } from '../../../hooks/useFolderTrust.js';
 import { useWelcomeOnboarding } from '../../../hooks/useWelcomeOnboarding.js';
-import { useIdeTrustListener } from '../../../hooks/useIdeTrustListener.js';
 import { useEditorSettings } from '../../../hooks/useEditorSettings.js';
 import { useExtensionUpdates } from '../../../hooks/useExtensionUpdates.js';
 import { useOAuthOrchestration } from '../../../hooks/useOAuthOrchestration.js';
@@ -27,7 +26,6 @@ import { useDisplayPreferences } from './useDisplayPreferences.js';
 import { useModelTracking } from './useModelTracking.js';
 import { useIdeContextBridge } from './useIdeContextBridge.js';
 import { useQueueErrorTimeout } from './useQueueErrorTimeout.js';
-import { useIdeRestartHotkey } from './useIdeRestartHotkey.js';
 import { useMemoryRefreshAction } from './useMemoryRefreshAction.js';
 import { useModelRuntimeSync } from './useModelRuntimeSync.js';
 import { useAppEventHandlers } from './useAppEventHandlers.js';
@@ -73,7 +71,6 @@ function useDialogsState() {
     IdeContext | undefined
   >();
   const [showEscapePrompt, setShowEscapePrompt] = useState(false);
-  const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
   const [isProcessing, setIsProcessing] = useState<boolean>(false);
   const [embeddedShellFocused, setEmbeddedShellFocused] = useState(false);
   const [queueErrorMessage, setQueueErrorMessage] = useState<string | null>(
@@ -115,8 +112,6 @@ function useDialogsState() {
     setIdeContextState,
     showEscapePrompt,
     setShowEscapePrompt,
-    showIdeRestartPrompt,
-    setShowIdeRestartPrompt,
     isProcessing,
     setIsProcessing,
     embeddedShellFocused,
@@ -183,16 +178,11 @@ function useIdeTrustEffect(
   config: AppDialogsParams['config'],
   st: ReturnType<typeof useDialogsState>,
 ) {
-  const { needsRestart: ideNeedsRestart } = useIdeTrustListener(config);
-  useEffect(() => {
-    if (ideNeedsRestart) st.setShowIdeRestartPrompt(true);
-  }, [ideNeedsRestart, st]);
   useQueueErrorTimeout({
     queueErrorMessage: st.queueErrorMessage,
     setQueueErrorMessage: st.setQueueErrorMessage,
     timeoutMs: QUEUE_ERROR_DISPLAY_DURATION_MS,
   });
-  useIdeRestartHotkey({ isActive: st.showIdeRestartPrompt });
 }
 
 function useDialogsAuthProviders(
@@ -280,11 +270,10 @@ function useDialogsAuth(
   const { config, settings, appState, addItem } = p;
   const theme = useThemeCommand(settings, appState, addItem);
   const settingsCmd = useSettingsCommand();
-  const folderTrust = useFolderTrust(settings, addItem);
+  const folderTrust = useFolderTrust(settings, addItem, config);
   const welcome = useWelcomeOnboarding({
     settings,
-    isFolderTrustComplete:
-      !folderTrust.isFolderTrustDialogOpen && !folderTrust.isRestarting,
+    isFolderTrustComplete: !folderTrust.isFolderTrustDialogOpen,
     agent: p.agent,
   });
   useIdeTrustEffect(config, st);
@@ -309,7 +298,6 @@ function useDialogsAuth(
     closeSettingsDialog: settingsCmd.closeSettingsDialog,
     isFolderTrustDialogOpen: folderTrust.isFolderTrustDialogOpen,
     handleFolderTrustSelect: folderTrust.handleFolderTrustSelect,
-    isRestarting: folderTrust.isRestarting,
     isWelcomeDialogOpen: welcome.showWelcome,
     welcomeState: welcome.state,
     welcomeActions: welcome.actions,

package/src/ui/containers/AppContainer/hooks/useAppInput.ts

@@ -15,7 +15,7 @@ import { useVimMode } from '../../../contexts/VimModeContext.js';
 import { useVim } from '../../../hooks/vim.js';
 import { useTextBuffer } from '../../../components/shared/text-buffer.js';
 import { useInputHistoryStore } from '../../../hooks/useInputHistoryStore.js';
-import { useTodoPausePreserver } from '../../../hooks/useTodoPausePreserver.js';
+import { shouldClearTodos } from '../../../hooks/useTodoPausePreserver.js';
 import { StreamingState, type HistoryItem } from '../../../types.js';
 import { submitOAuthCode } from '../../../oauth-submission.js';
 import { getPendingOAuthProvider } from '../../../oauthGlobalState.js';
@@ -28,6 +28,7 @@ import { useSlashCommandActions } from './useSlashCommandActions.js';
 import { useExitHandling } from './useExitHandling.js';
 import { useInputHandling } from './useInputHandling.js';
 import { useShellFocusAutoReset } from './useShellFocusAutoReset.js';
+import { useSteer } from './useSteer.js';
 import * as fs from 'fs';
 import type { AppBootstrapResult } from './useAppBootstrap.js';
 import type { AppDialogsResult } from './useAppDialogs.js';
@@ -46,10 +47,6 @@ export interface AppInputParams {
   loadHistory: AppBootstrapResult['loadHistory'];
   todos: AppBootstrapResult['todos'];
   updateTodos: AppBootstrapResult['updateTodos'];
-  todoPauseController: AppBootstrapResult['todoPauseController'];
-  todoContinuationRef: AppBootstrapResult['todoContinuationRef'];
-  hadToolCallsRef: AppBootstrapResult['hadToolCallsRef'];
-  registerTodoPause: AppBootstrapResult['registerTodoPause'];
   recordingIntegrationRef: AppBootstrapResult['recordingIntegrationRef'];
   recordingSwapCallbacks: AppBootstrapResult['recordingSwapCallbacks'];
   recordingIntegration: AppBootstrapResult['recordingIntegration'];
@@ -313,7 +310,6 @@ function useInputStreamSetup(
     settings,
     history,
     addItem,
-    registerTodoPause,
     recordingIntegration,
     runtimeMessageBus,
     stdout,
@@ -345,7 +341,6 @@ function useInputStreamSetup(
     setEmbeddedShellFocused,
     stdout.columns,
     stdout.rows,
-    registerTodoPause,
     handleExternalEditorOpen,
     recordingIntegration,
     runtimeMessageBus,
@@ -358,21 +353,15 @@ function useInputStreamWiring(
   core: ReturnType<typeof useInputCore>,
   setup: ReturnType<typeof useInputStreamSetup>,
 ) {
-  const {
-    todos,
-    updateTodos,
-    todoPauseController,
-    todoContinuationRef,
-    hadToolCallsRef,
-    embeddedShellFocused,
-    setEmbeddedShellFocused,
-  } = p;
+  const { todos, updateTodos, embeddedShellFocused, setEmbeddedShellFocused } =
+    p;
   const {
     buffer,
     inputHistoryStore,
     lastSubmittedPromptRef,
     agentStreamResult,
   } = setup;
+  const { submitQuery } = agentStreamResult;
   const pendingHistoryItems = useMemo(
     () => [
       ...(core.pendingHistoryItems as HistoryItem[]),
@@ -390,30 +379,47 @@ function useInputStreamWiring(
   const { handleFinalSubmit } = useInputHandling({
     buffer,
     inputHistoryStore,
-    submitQuery: agentStreamResult.submitQuery,
+    submitQuery,
     pendingHistoryItems,
     lastSubmittedPromptRef,
-    hadToolCallsRef,
-    todoContinuationRef,
     needsRelogin: p.appState.needsRelogin,
     appDispatch: p.appDispatch,
   });
-  const { handleUserInputSubmit } = useTodoPausePreserver({
-    controller: todoPauseController,
-    updateTodos,
-    handleFinalSubmit,
-    todos,
-  });
+  const handleUserInputSubmit = useCallback(
+    (submittedValue: string) => {
+      if (shouldClearTodos(todos)) {
+        updateTodos([]);
+      }
+      handleFinalSubmit(submittedValue);
+    },
+    [todos, updateTodos, handleFinalSubmit],
+  );
+  const enqueueSteer = useCallback(
+    (message: string) => {
+      void submitQuery(message);
+    },
+    [submitQuery],
+  );
+  const handleSteer = useSteer(
+    p.agent,
+    agentStreamResult.streamingState,
+    agentStreamResult.sanitizeContent,
+    pendingHistoryItems,
+    enqueueSteer,
+  );
   const {
     activeShellPtyId: _ptyIdFromStream,
     pendingHistoryItems: _pendingFromStream,
+    queuedSubmissions,
     ...streamRest
   } = agentStreamResult;
   return {
     handleFinalSubmit,
     handleUserInputSubmit,
+    handleSteer,
     pendingHistoryItems,
     activeShellPtyId,
+    queuedSubmissions,
     ...streamRest,
   };
 }

package/src/ui/containers/AppContainer/hooks/useAppLayout.ts

@@ -12,7 +12,6 @@ import { getAllLlxprtMdFilenames } from '@vybestack/llxprt-code-core';
 import { useKeybindings } from './useKeybindings.js';
 import { useLayoutMeasurement } from './useLayoutMeasurement.js';
 import { useFlickerDetector } from '../../../hooks/useFlickerDetector.js';
-import { useTodoContinuationFlow } from './useTodoContinuationFlow.js';
 import { useSelectionDebugLogger } from './useSelectionDebugLogger.js';
 import { useClearScreenAction } from './useClearScreenAction.js';
 import { useConfirmationSelection } from './useConfirmationSelection.js';
@@ -29,10 +28,7 @@ import type { UiRuntime } from '../../../cliUiRuntime.js';
 export interface AppLayoutParams {
   // From bootstrap
   uiRuntime: UiRuntime;
-  agent: AppBootstrapResult['agent'];
   settings: AppBootstrapResult['settings'];
-  todoContinuationRef: AppBootstrapResult['todoContinuationRef'];
-  hadToolCallsRef: AppBootstrapResult['hadToolCallsRef'];
   runtimeMessageBus: AppBootstrapResult['runtimeMessageBus'];
   consoleMessages: AppBootstrapResult['consoleMessages'];
   clearConsoleMessagesState: AppBootstrapResult['clearConsoleMessagesState'];
@@ -52,6 +48,8 @@ export interface AppLayoutParams {
   setRenderMarkdown: AppDialogsResult['setRenderMarkdown'];
   isTodoPanelCollapsed: AppDialogsResult['isTodoPanelCollapsed'];
   setIsTodoPanelCollapsed: AppDialogsResult['setIsTodoPanelCollapsed'];
+  isQueuedMessagesPanelCollapsed: AppDialogsResult['isQueuedMessagesPanelCollapsed'];
+  setIsQueuedMessagesPanelCollapsed: AppDialogsResult['setIsQueuedMessagesPanelCollapsed'];
   setFooterHeight: AppDialogsResult['setFooterHeight'];
   footerHeight: AppDialogsResult['footerHeight'];
   copyModeEnabled: AppDialogsResult['copyModeEnabled'];
@@ -84,6 +82,7 @@ export interface AppLayoutParams {
   handleSlashCommand: AppInputResult['handleSlashCommand'];
   inputHistoryStore: AppInputResult['inputHistoryStore'];
   handleUserInputSubmit: AppInputResult['handleUserInputSubmit'];
+  handleSteer: AppInputResult['handleSteer'];
   interactiveRuntimeReady: AppInputResult['interactiveRuntimeReady'];
   vimModeEnabled: AppInputResult['vimModeEnabled'];
   terminalHeight: AppInputResult['terminalHeight'];
@@ -98,6 +97,59 @@ function pickCopyModeKeybindingState(p: AppLayoutParams) {
   };
 }
 
+function buildKeybindingsConfig(
+  p: AppLayoutParams,
+  exitState: {
+    requestCtrlCExit: AppLayoutParams['requestCtrlCExit'];
+    requestCtrlDExit: AppLayoutParams['requestCtrlDExit'];
+    ctrlCPressedOnce: AppLayoutParams['ctrlCPressedOnce'];
+    cancelOngoingRequest: AppLayoutParams['cancelOngoingRequest'];
+    bufferTextLength: number;
+  },
+  displayState: {
+    showErrorDetails: AppLayoutParams['showErrorDetails'];
+    setShowErrorDetails: AppLayoutParams['setShowErrorDetails'];
+    showToolDescriptions: AppLayoutParams['showToolDescriptions'];
+    setShowToolDescriptions: AppLayoutParams['setShowToolDescriptions'];
+    renderMarkdown: AppLayoutParams['renderMarkdown'];
+    setRenderMarkdown: AppLayoutParams['setRenderMarkdown'];
+    isTodoPanelCollapsed: AppLayoutParams['isTodoPanelCollapsed'];
+    setIsTodoPanelCollapsed: AppLayoutParams['setIsTodoPanelCollapsed'];
+    isQueuedMessagesPanelCollapsed: AppLayoutParams['isQueuedMessagesPanelCollapsed'];
+    setIsQueuedMessagesPanelCollapsed: AppLayoutParams['setIsQueuedMessagesPanelCollapsed'];
+    constrainHeight: AppLayoutParams['constrainHeight'];
+    setConstrainHeight: AppLayoutParams['setConstrainHeight'];
+    refreshStatic: AppLayoutParams['refreshStatic'];
+    addItem: AppLayoutParams['addItem'];
+    handleSlashCommand: AppLayoutParams['handleSlashCommand'];
+  },
+  shellState: {
+    activeShellPtyId: AppLayoutParams['activeShellPtyId'];
+    setEmbeddedShellFocused: AppLayoutParams['setEmbeddedShellFocused'];
+    ideContextState: AppLayoutParams['ideContextState'];
+  },
+) {
+  const { uiRuntime } = p;
+  return {
+    exit: exitState,
+    display: displayState,
+    shell: {
+      activeShellPtyId: shellState.activeShellPtyId,
+      setEmbeddedShellFocused: shellState.setEmbeddedShellFocused,
+      getEnableInteractiveShell: () =>
+        uiRuntime.shell.getEnableInteractiveShell(),
+    },
+    copyMode: pickCopyModeKeybindingState(p),
+    ideContext: {
+      getIdeMode: () => uiRuntime.ide.getIdeMode(),
+      ideContextState: shellState.ideContextState,
+    },
+    mcp: {
+      getMcpServers: () => uiRuntime.mcp.getMcpServers(),
+    },
+  };
+}
+
 function useLayoutKeybindingsAndHistory(p: AppLayoutParams) {
   const {
     uiRuntime,
@@ -114,6 +166,8 @@ function useLayoutKeybindingsAndHistory(p: AppLayoutParams) {
     setRenderMarkdown,
     isTodoPanelCollapsed,
     setIsTodoPanelCollapsed,
+    isQueuedMessagesPanelCollapsed,
+    setIsQueuedMessagesPanelCollapsed,
     ideContextState,
     activeShellPtyId,
     setEmbeddedShellFocused,
@@ -127,44 +181,36 @@ function useLayoutKeybindingsAndHistory(p: AppLayoutParams) {
     buffer,
     useAlternateBuffer,
   } = p;
-  useKeybindings({
-    exit: {
-      requestCtrlCExit,
-      requestCtrlDExit,
-      ctrlCPressedOnce,
-      cancelOngoingRequest,
-      bufferTextLength: buffer.text.length,
-    },
-    display: {
-      showErrorDetails,
-      setShowErrorDetails,
-      showToolDescriptions,
-      setShowToolDescriptions,
-      renderMarkdown,
-      setRenderMarkdown,
-      isTodoPanelCollapsed,
-      setIsTodoPanelCollapsed,
-      constrainHeight,
-      setConstrainHeight,
-      refreshStatic,
-      addItem,
-      handleSlashCommand,
-    },
-    shell: {
-      activeShellPtyId,
-      setEmbeddedShellFocused,
-      getEnableInteractiveShell: () =>
-        uiRuntime.shell.getEnableInteractiveShell(),
-    },
-    copyMode: pickCopyModeKeybindingState(p),
-    ideContext: {
-      getIdeMode: () => uiRuntime.ide.getIdeMode(),
-      ideContextState,
-    },
-    mcp: {
-      getMcpServers: () => uiRuntime.mcp.getMcpServers(),
-    },
-  });
+  useKeybindings(
+    buildKeybindingsConfig(
+      p,
+      {
+        requestCtrlCExit,
+        requestCtrlDExit,
+        ctrlCPressedOnce,
+        cancelOngoingRequest,
+        bufferTextLength: buffer.text.length,
+      },
+      {
+        showErrorDetails,
+        setShowErrorDetails,
+        showToolDescriptions,
+        setShowToolDescriptions,
+        renderMarkdown,
+        setRenderMarkdown,
+        isTodoPanelCollapsed,
+        setIsTodoPanelCollapsed,
+        isQueuedMessagesPanelCollapsed,
+        setIsQueuedMessagesPanelCollapsed,
+        constrainHeight,
+        setConstrainHeight,
+        refreshStatic,
+        addItem,
+        handleSlashCommand,
+      },
+      { activeShellPtyId, setEmbeddedShellFocused, ideContextState },
+    ),
+  );
   const logger = useLogger(uiRuntime.storage);
   useInputHistoryBootstrap({ inputHistoryStore, logger });
   const handleClearScreen = useClearScreenAction({
@@ -178,19 +224,11 @@ function useLayoutKeybindingsAndHistory(p: AppLayoutParams) {
 
 function useLayoutMeasure(p: AppLayoutParams) {
   const {
-    uiRuntime,
-    agent,
-    todoContinuationRef,
-    hadToolCallsRef,
     consoleMessages,
     constrainHeight,
     setFooterHeight,
     footerHeight,
-    streamingState,
-    history,
-    pendingHistoryItems,
     confirmationRequest,
-    setDebugMessage,
     terminalHeight,
   } = p;
   useSelectionDebugLogger({ confirmationRequest });
@@ -212,16 +250,6 @@ function useLayoutMeasure(p: AppLayoutParams) {
     [terminalHeight, footerHeight],
   );
   useFlickerDetector(rootUiRef, terminalHeight, constrainHeight);
-  useTodoContinuationFlow({
-    uiRuntime,
-    agent,
-    streamingState,
-    history,
-    pendingHistoryItems,
-    setDebugMessage,
-    todoContinuationRef,
-    hadToolCallsRef,
-  });
   return {
     mainControlsRef,
     pendingHistoryItemRef,
@@ -249,6 +277,7 @@ function useLayoutContext(p: AppLayoutParams) {
     terminalHeight,
     terminalWidth,
     handleUserInputSubmit,
+    handleSteer,
     interactiveRuntimeReady,
     vimModeEnabled,
     startupGuardsInitialized,
@@ -298,6 +327,7 @@ function useLayoutContext(p: AppLayoutParams) {
     mainAreaWidth,
     placeholder,
     activeHooks,
+    handleSteer,
   };
 }
 

package/src/ui/containers/AppContainer/hooks/useDisplayPreferences.ts

@@ -43,6 +43,10 @@ export interface UseDisplayPreferencesResult {
   isTodoPanelCollapsed: boolean;
   setIsTodoPanelCollapsed: (collapsed: boolean) => void;
 
+  // Queued messages panel collapse state
+  isQueuedMessagesPanelCollapsed: boolean;
+  setIsQueuedMessagesPanelCollapsed: (collapsed: boolean) => void;
+
   // Settings nonce for forcing re-renders when settings change
   settingsNonce: number;
 }
@@ -55,6 +59,8 @@ export function useDisplayPreferences(): UseDisplayPreferencesResult {
   const [copyModeEnabled, setCopyModeEnabled] = useState(false);
   const [renderMarkdown, setRenderMarkdown] = useState<boolean>(true);
   const [isTodoPanelCollapsed, setIsTodoPanelCollapsed] = useState(false);
+  const [isQueuedMessagesPanelCollapsed, setIsQueuedMessagesPanelCollapsed] =
+    useState(false);
   const [settingsNonce, setSettingsNonce] = useState(0);
 
   const toggleDebugProfiler = useCallback(() => {
@@ -98,6 +104,10 @@ export function useDisplayPreferences(): UseDisplayPreferencesResult {
     isTodoPanelCollapsed,
     setIsTodoPanelCollapsed,
 
+    // Queued messages panel collapse state
+    isQueuedMessagesPanelCollapsed,
+    setIsQueuedMessagesPanelCollapsed,
+
     // Settings nonce
     settingsNonce,
   };

package/src/ui/containers/AppContainer/hooks/useInputHandling.ts

@@ -18,10 +18,6 @@ export interface UseInputHandlingParams {
   submitQuery: (query: string) => Promise<void>;
   pendingHistoryItems: HistoryItemWithoutId[];
   lastSubmittedPromptRef: React.MutableRefObject<string | null>;
-  hadToolCallsRef: React.MutableRefObject<boolean>;
-  todoContinuationRef: React.MutableRefObject<{
-    clearPause: () => void;
-  } | null>;
   /** Whether the user needs to re-authenticate before continuing. */
   needsRelogin: boolean;
   /** Dispatch app actions (e.g., open auth dialog). */
@@ -39,7 +35,9 @@ export interface UseInputHandlingResult {
 /**
  * Checks if any tool is currently executing in pending history items.
  */
-function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]): boolean {
+export function isToolExecuting(
+  pendingHistoryItems: HistoryItemWithoutId[],
+): boolean {
   return pendingHistoryItems.some((item) => {
     if (item.type === 'tool_group') {
       return item.tools.some(
@@ -80,8 +78,6 @@ function useFinalSubmitHandler({
   inputHistoryStore,
   submitQuery,
   lastSubmittedPromptRef,
-  hadToolCallsRef,
-  todoContinuationRef,
   needsRelogin,
   appDispatch,
 }: UseInputHandlingParams): (submittedValue: string) => void {
@@ -101,14 +97,6 @@ function useFinalSubmitHandler({
         return;
       }
 
-      /**
-       * @plan PLAN-20260129-TODOPERSIST.P12
-       * Reset continuation attempt counter when user submits a new prompt.
-       * This prevents the continuation limit from blocking future continuations
-       * after user interaction.
-       */
-      hadToolCallsRef.current = false;
-      todoContinuationRef.current?.clearPause();
       lastSubmittedPromptRef.current = trimmedValue;
       inputHistoryStore.addInput(trimmedValue);
       void submitQuery(trimmedValue);
@@ -116,8 +104,6 @@ function useFinalSubmitHandler({
     [
       submitQuery,
       inputHistoryStore,
-      hadToolCallsRef,
-      todoContinuationRef,
       lastSubmittedPromptRef,
       needsRelogin,
       appDispatch,