Merge branch 'main' into fix/thinking-messages-from-posthog

Author: annikaschmid

apps/code/src/renderer/constants/keyboard-shortcuts.ts

@@ -137,6 +137,20 @@ export const KEYBOARD_SHORTCUTS: KeyboardShortcut[] = [
     category: "panels",
     context: "Task detail",
   },
+  {
+    id: "prompt-history-prev",
+    keys: "shift+up",
+    description: "Previous prompt",
+    category: "editor",
+    context: "Message editor",
+  },
+  {
+    id: "prompt-history-next",
+    keys: "shift+down",
+    description: "Next prompt",
+    category: "editor",
+    context: "Message editor",
+  },
   {
     id: "editor-bold",
     keys: "mod+b",

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

@@ -252,7 +252,10 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
       >
         <AttachmentsBar attachments={attachments} onRemove={removeAttachment} />
 
-        <div className="max-h-[200px] min-h-[50px] flex-1 overflow-y-auto font-mono text-sm">
+        <div
+          className="max-h-[200px] min-h-[50px] flex-1 overflow-y-auto font-mono text-sm"
+          style={{ position: "relative" }}
+        >
           <EditorContent editor={editor} />
         </div>
 
@@ -265,12 +268,12 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
               onAttachFiles={onAttachFiles}
             />
             {isBashMode && (
-              <Text size="1" className="font-mono text-accent-11">
+              <Text size="1" className="ml-2 font-mono text-accent-11">
                 bash mode
               </Text>
             )}
           </Flex>
-          <Flex gap="4" align="center">
+          <Flex gap="2" align="center">
             {isLoading && onCancel ? (
               <Tooltip content="Stop">
                 <IconButton

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

@@ -157,7 +157,12 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
             const isAtStart = from === 1;
             const isAtEnd = from === view.state.doc.content.size - 1;
 
-            if (event.key === "ArrowUp" && (isEmpty || isAtStart)) {
+            const forceNavigate = event.shiftKey;
+
+            if (
+              event.key === "ArrowUp" &&
+              (forceNavigate || isEmpty || isAtStart)
+            ) {
               const queuedContent =
                 sessionStoreSetters.dequeueMessagesAsText(taskId);
               if (queuedContent !== null && queuedContent !== undefined) {
@@ -182,7 +187,10 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
               }
             }
 
-            if (event.key === "ArrowDown" && (isEmpty || isAtEnd)) {
+            if (
+              event.key === "ArrowDown" &&
+              (forceNavigate || isEmpty || isAtEnd)
+            ) {
               const newText = historyActions.navigateDown(taskId);
               if (newText !== null) {
                 event.preventDefault();