PR comments

Author: charlesvien

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

@@ -28,7 +28,6 @@ interface MessageEditorProps {
   autoFocus?: boolean;
   currentMode?: ExecutionMode;
   onModeChange?: () => void;
-  onEditQueuedMessages?: () => string | null;
 }
 
 export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
@@ -44,7 +43,6 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
       autoFocus = false,
       currentMode,
       onModeChange,
-      onEditQueuedMessages,
     },
     ref,
   ) => {
@@ -84,7 +82,6 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
       onSubmit,
       onBashCommand,
       onBashModeChange,
-      onEditQueuedMessages,
     });
 
     useImperativeHandle(

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

@@ -1,3 +1,4 @@
+import { getSessionActions } from "@features/sessions/stores/sessionStore";
 import { trpcVanilla } from "@renderer/trpc/client";
 import { toast } from "@renderer/utils/toast";
 import { useSettingsStore } from "@stores/settingsStore";
@@ -28,7 +29,6 @@ export interface UseTiptapEditorOptions {
   onBashCommand?: (command: string) => void;
   onBashModeChange?: (isBashMode: boolean) => void;
   onEmptyChange?: (isEmpty: boolean) => void;
-  onEditQueuedMessages?: () => string | null;
 }
 
 const EDITOR_CLASS =
@@ -50,7 +50,6 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
     onBashCommand,
     onBashModeChange,
     onEmptyChange,
-    onEditQueuedMessages,
   } = options;
 
   const {
@@ -64,14 +63,12 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
     onBashCommand,
     onBashModeChange,
     onEmptyChange,
-    onEditQueuedMessages,
   });
   callbackRefs.current = {
     onSubmit,
     onBashCommand,
     onBashModeChange,
     onEmptyChange,
-    onEditQueuedMessages,
   };
 
   const prevBashModeRef = useRef(false);
@@ -148,7 +145,7 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
 
             if (event.key === "ArrowUp" && (isEmpty || isAtStart)) {
               const queuedContent =
-                callbackRefs.current.onEditQueuedMessages?.();
+                getSessionActions().popQueuedMessagesAsText(taskId);
               if (queuedContent !== null && queuedContent !== undefined) {
                 event.preventDefault();
                 view.dispatch(

apps/twig/src/renderer/features/sessions/components/SessionView.tsx

@@ -46,7 +46,6 @@ interface SessionViewProps {
   errorMessage?: string;
   onRetry?: () => void;
   onDelete?: () => void;
-  onEditQueuedMessages?: () => string | null;
 }
 
 const DEFAULT_ERROR_MESSAGE =
@@ -67,7 +66,6 @@ export function SessionView({
   errorMessage = DEFAULT_ERROR_MESSAGE,
   onRetry,
   onDelete,
-  onEditQueuedMessages,
 }: SessionViewProps) {
   const showRawLogs = useShowRawLogs();
   const { setShowRawLogs } = useSessionViewActions();
@@ -415,7 +413,6 @@ export function SessionView({
                 onCancel={onCancelPrompt}
                 currentMode={currentMode}
                 onModeChange={!isCloud ? handleModeChange : undefined}
-                onEditQueuedMessages={onEditQueuedMessages}
               />
             </Box>
           )}

apps/twig/src/renderer/features/sessions/stores/sessionStore.ts

@@ -127,6 +127,7 @@ interface SessionActions {
   clearSessionError: (taskId: string) => Promise<void>;
   removeQueuedMessage: (taskId: string, queueId: string) => void;
   popAllQueuedMessages: (taskId: string) => QueuedMessage[];
+  popQueuedMessagesAsText: (taskId: string) => string | null;
 }
 
 interface AuthCredentials {
@@ -1402,6 +1403,14 @@ const useStore = create<SessionStore>()(
 
           return messages;
         },
+
+        popQueuedMessagesAsText: (taskId: string): string | null => {
+          const messages = useStore
+            .getState()
+            .actions.popAllQueuedMessages(taskId);
+          if (messages.length === 0) return null;
+          return messages.map((msg) => msg.content).join("\n\n");
+        },
       },
     };
   }),

apps/twig/src/renderer/features/task-detail/components/TaskLogsPanel.tsx

@@ -160,12 +160,6 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
     requestFocus,
   ]);
 
-  const handleEditQueuedMessages = useCallback((): string | null => {
-    const queuedMessages = popAllQueuedMessages(taskId);
-    if (queuedMessages.length === 0) return null;
-    return queuedMessages.map((msg) => msg.content).join("\n\n");
-  }, [taskId, popAllQueuedMessages]);
-
   const { appendUserShellExecute } = useSessionActions();
 
   const handleRetry = useCallback(async () => {
@@ -219,7 +213,6 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
             errorMessage={errorMessage}
             onRetry={handleRetry}
             onDelete={handleDelete}
-            onEditQueuedMessages={handleEditQueuedMessages}
           />
         </ErrorBoundary>
       </Box>