Add prompt history to task input and fix command center text selection

Author: charlesvien

apps/code/src/renderer/features/command-center/components/CommandCenterGrid.tsx

@@ -60,6 +60,8 @@ function GridCell({
 
   const handleCellClick = useCallback(() => {
     setActiveTask(cell.taskId);
+    const selection = window.getSelection();
+    if (selection && !selection.isCollapsed) return;
     const actionSelector =
       cellRef.current?.querySelector<HTMLElement>("[tabindex='0']");
     actionSelector?.focus();

apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx

@@ -2,12 +2,13 @@ import "./message-editor.css";
 import type { SessionConfigOption } from "@agentclientprotocol/sdk";
 import { BranchSelector } from "@features/git-interaction/components/BranchSelector";
 import { useGitQueries } from "@features/git-interaction/hooks/useGitQueries";
+import { getUserPromptsForTask } from "@features/sessions/stores/sessionStore";
 import { useConnectivity } from "@hooks/useConnectivity";
 import { ArrowUp, Circle, Stop } from "@phosphor-icons/react";
 import { Flex, IconButton, Text, Tooltip } from "@radix-ui/themes";
 import { EditorContent } from "@tiptap/react";
 import { hasOpenOverlay } from "@utils/overlay";
-import { forwardRef, useEffect, useImperativeHandle } from "react";
+import { forwardRef, useCallback, useEffect, useImperativeHandle } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { useDraftStore } from "../stores/draftStore";
 import { useTiptapEditor } from "../tiptap/useTiptapEditor";
@@ -167,6 +168,11 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
     const cloudDiffStats = context?.cloudDiffStats;
     const isSubmitDisabled = disabled || !isOnline;
 
+    const getPromptHistory = useCallback(
+      () => getUserPromptsForTask(taskId),
+      [taskId],
+    );
+
     const {
       editor,
       isReady,
@@ -192,6 +198,7 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
       isLoading,
       autoFocus,
       context: { taskId, repoPath },
+      getPromptHistory,
       onSubmit,
       onBashCommand,
       onBashModeChange,

apps/code/src/renderer/features/message-editor/stores/promptHistoryStore.ts

@@ -1,20 +1,18 @@
-import { getUserPromptsForTask } from "@features/sessions/stores/sessionStore";
 import { create } from "zustand";
 
 interface PromptHistoryStore {
   index: number;
   savedInput: string;
-  navigateUp: (taskId: string, currentInput: string) => string | null;
-  navigateDown: (taskId: string) => string | null;
+  navigateUp: (history: string[], currentInput: string) => string | null;
+  navigateDown: (history: string[]) => string | null;
   reset: () => void;
 }
 
 export const usePromptHistoryStore = create<PromptHistoryStore>((set, get) => ({
   index: -1,
   savedInput: "",
 
-  navigateUp: (taskId, currentInput) => {
-    const history = getUserPromptsForTask(taskId);
+  navigateUp: (history, currentInput) => {
     if (history.length === 0) return null;
 
     const { index } = get();
@@ -31,12 +29,10 @@ export const usePromptHistoryStore = create<PromptHistoryStore>((set, get) => ({
     return history[history.length - 1 - newIndex] ?? null;
   },
 
-  navigateDown: (taskId) => {
+  navigateDown: (history) => {
     const { index, savedInput } = get();
     if (index === -1) return null;
 
-    const history = getUserPromptsForTask(taskId);
-
     if (index > 0) {
       const newIndex = index - 1;
       set({ index: newIndex });

apps/code/src/renderer/features/message-editor/stores/taskInputHistoryStore.ts

@@ -0,0 +1,34 @@
+import { create } from "zustand";
+import { persist } from "zustand/middleware";
+
+interface TaskInputHistoryState {
+  prompts: string[];
+}
+
+interface TaskInputHistoryActions {
+  addPrompt: (prompt: string) => void;
+}
+
+type TaskInputHistoryStore = TaskInputHistoryState & TaskInputHistoryActions;
+
+const MAX_HISTORY = 50;
+
+export const useTaskInputHistoryStore = create<TaskInputHistoryStore>()(
+  persist(
+    (set) => ({
+      prompts: [],
+      addPrompt: (prompt) =>
+        set((state) => {
+          const trimmed = prompt.trim();
+          if (!trimmed) return state;
+          const filtered = state.prompts.filter((p) => p !== trimmed);
+          const updated = [...filtered, trimmed].slice(-MAX_HISTORY);
+          return { prompts: updated };
+        }),
+    }),
+    {
+      name: "task-input-history",
+      partialize: (state) => ({ prompts: state.prompts }),
+    },
+  ),
+);

apps/code/src/renderer/features/message-editor/tiptap/useTiptapEditor.ts

@@ -28,6 +28,7 @@ export interface UseTiptapEditorOptions {
     bashMode?: boolean;
   };
   clearOnSubmit?: boolean;
+  getPromptHistory?: () => string[];
   onSubmit?: (text: string) => void;
   onBashCommand?: (command: string) => void;
   onBashModeChange?: (isBashMode: boolean) => void;
@@ -82,6 +83,7 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
     context,
     capabilities = {},
     clearOnSubmit = true,
+    getPromptHistory,
     onSubmit,
     onBashCommand,
     onBashModeChange,
@@ -116,6 +118,9 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
   const submitDisabledRef = useRef(submitDisabled);
   submitDisabledRef.current = submitDisabled;
 
+  const getPromptHistoryRef = useRef(getPromptHistory);
+  getPromptHistoryRef.current = getPromptHistory;
+
   const prevBashModeRef = useRef(false);
   const prevIsEmptyRef = useRef(true);
   const submitRef = useRef<() => void>(() => {});
@@ -192,35 +197,38 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
             }
           }
 
-          if (
-            taskId &&
-            (event.key === "ArrowUp" || event.key === "ArrowDown")
-          ) {
+          if (event.key === "ArrowUp" || event.key === "ArrowDown") {
+            const historyGetter = getPromptHistoryRef.current;
+            if (!taskId && !historyGetter) return false;
+
             const currentText = view.state.doc.textContent;
             const isEmpty = !currentText.trim();
             const { from } = view.state.selection;
             const isAtStart = from === 1;
             const isAtEnd = from === view.state.doc.content.size - 1;
 
             const forceNavigate = event.shiftKey;
+            const history = historyGetter?.() ?? [];
 
             if (
               event.key === "ArrowUp" &&
               (forceNavigate || isEmpty || isAtStart)
             ) {
-              const queuedContent =
-                sessionStoreSetters.dequeueMessagesAsText(taskId);
-              if (queuedContent !== null && queuedContent !== undefined) {
-                event.preventDefault();
-                view.dispatch(
-                  view.state.tr
-                    .delete(1, view.state.doc.content.size - 1)
-                    .insertText(queuedContent, 1),
-                );
-                return true;
+              if (taskId) {
+                const queuedContent =
+                  sessionStoreSetters.dequeueMessagesAsText(taskId);
+                if (queuedContent !== null && queuedContent !== undefined) {
+                  event.preventDefault();
+                  view.dispatch(
+                    view.state.tr
+                      .delete(1, view.state.doc.content.size - 1)
+                      .insertText(queuedContent, 1),
+                  );
+                  return true;
+                }
               }
 
-              const newText = historyActions.navigateUp(taskId, currentText);
+              const newText = historyActions.navigateUp(history, currentText);
               if (newText !== null) {
                 event.preventDefault();
                 view.dispatch(
@@ -236,7 +244,7 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
               event.key === "ArrowDown" &&
               (forceNavigate || isEmpty || isAtEnd)
             ) {
-              const newText = historyActions.navigateDown(taskId);
+              const newText = historyActions.navigateDown(history);
               if (newText !== null) {
                 event.preventDefault();
                 view.dispatch(

apps/code/src/renderer/features/task-detail/components/TaskInputEditor.tsx

@@ -3,6 +3,7 @@ import { TourHighlight } from "@components/TourHighlight";
 import { AttachmentsBar } from "@features/message-editor/components/AttachmentsBar";
 import { EditorToolbar } from "@features/message-editor/components/EditorToolbar";
 import type { MessageEditorHandle } from "@features/message-editor/components/MessageEditor";
+import { useTaskInputHistoryStore } from "@features/message-editor/stores/taskInputHistoryStore";
 import { useTiptapEditor } from "@features/message-editor/tiptap/useTiptapEditor";
 import { ReasoningLevelSelector } from "@features/sessions/components/ReasoningLevelSelector";
 import { UnifiedModelSelector } from "@features/sessions/components/UnifiedModelSelector";
@@ -11,7 +12,7 @@ import { useConnectivity } from "@hooks/useConnectivity";
 import { ArrowUp } from "@phosphor-icons/react";
 import { Box, Flex, IconButton, Text, Tooltip } from "@radix-ui/themes";
 import { EditorContent } from "@tiptap/react";
-import { forwardRef, useImperativeHandle } from "react";
+import { forwardRef, useCallback, useImperativeHandle } from "react";
 import "./TaskInput.css";
 
 interface TaskInputEditorProps {
@@ -59,6 +60,11 @@ export const TaskInputEditor = forwardRef<
     const { isOnline } = useConnectivity();
     const isSubmitDisabled = isCreatingTask || !isOnline;
 
+    const getPromptHistory = useCallback(
+      () => useTaskInputHistoryStore.getState().prompts,
+      [],
+    );
+
     const {
       editor,
       isEmpty,
@@ -74,14 +80,16 @@ export const TaskInputEditor = forwardRef<
       removeAttachment,
     } = useTiptapEditor({
       sessionId,
-      placeholder: "What do you want to work on? - @ to add context",
+      placeholder:
+        "What do you want to work on? \u2191\u2193 for history, @ to add context",
       disabled: isCreatingTask,
       submitDisabled: !isOnline,
       isLoading: isCreatingTask,
       autoFocus,
       context: { repoPath, taskId: previewTaskId },
       capabilities: { commands: true, bashMode: false },
       clearOnSubmit: false,
+      getPromptHistory,
       onSubmit: (text) => {
         if (text && canSubmit) {
           onSubmit();

apps/code/src/renderer/features/task-detail/hooks/useTaskCreation.ts

@@ -1,5 +1,6 @@
 import { useAuthStore } from "@features/auth/stores/authStore";
 import type { MessageEditorHandle } from "@features/message-editor/components/MessageEditor";
+import { useTaskInputHistoryStore } from "@features/message-editor/stores/taskInputHistoryStore";
 import {
   contentToXml,
   extractFilePaths,
@@ -123,6 +124,11 @@ export function useTaskCreation({
 
       log.info("Submitting task", { workspaceMode, selectedDirectory });
 
+      const plainText = editor.getText()?.trim();
+      if (plainText) {
+        useTaskInputHistoryStore.getState().addPrompt(plainText);
+      }
+
       const input = prepareTaskInput(content, {
         selectedDirectory,
         selectedRepository,