@dexto/tui 1.7.1 → 1.8.0

package/dist/containers/InputContainer.cjs

@@ -32,13 +32,14 @@ __export(InputContainer_exports, {
 });
 module.exports = __toCommonJS(InputContainer_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
+var import_react = __toESM(require("react"), 1);
 var import_core = require("@dexto/core");
 var import_InputArea = require("../components/input/InputArea.js");
 var import_services = require("../services/index.js");
 var import_contexts = require("../contexts/index.js");
 var import_messageFormatting = require("../utils/messageFormatting.js");
 var import_idGenerator = require("../utils/idGenerator.js");
+var import_queuedComposerContent = require("../utils/queuedComposerContent.js");
 var import_host = require("../host/index.js");
 var import_overlayPresentation = require("../utils/overlayPresentation.js");
 var import_agent_backend = require("../agent-backend.js");
@@ -50,6 +51,7 @@ const InputContainer = (0, import_react.forwardRef)(
     session,
     initialPrompt,
     approval,
+    steerMessages,
     queuedMessages,
     setInput,
     setUi,
@@ -57,6 +59,7 @@ const InputContainer = (0, import_react.forwardRef)(
     setMessages,
     setPendingMessages,
     setDequeuedBuffer,
+    setSteerMessages,
     setQueuedMessages,
     setApproval,
     setApprovalQueue,
@@ -68,6 +71,8 @@ const InputContainer = (0, import_react.forwardRef)(
     useStreaming = true
   }, ref) {
     const sessionCreationPromiseRef = (0, import_react.useRef)(null);
+    const queuedEditPendingRef = (0, import_react.useRef)(false);
+    const [isQueuedEditPending, setIsQueuedEditPending] = import_react.default.useState(false);
     const didAutoSubmitInitialPromptRef = (0, import_react.useRef)(false);
     const soundService = (0, import_contexts.useSoundService)();
     const autoApproveEditsRef = (0, import_react.useRef)(ui.autoApproveEdits);
@@ -83,21 +88,81 @@ const InputContainer = (0, import_react.forwardRef)(
         sessionCreationPromiseRef.current = null;
       }
     }, [session.id]);
-    const extractTextFromContent = (0, import_react.useCallback)((content) => {
-      return content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
-    }, []);
+    const popQueuedMessageForEdit = (0, import_react.useCallback)(
+      async (message, editingQueuedFollowUp, removeMessage) => {
+        if (queuedEditPendingRef.current) {
+          return;
+        }
+        const result = (0, import_queuedComposerContent.restoreQueuedContentForComposer)(message);
+        if (!result.ok) {
+          setMessages((prev) => [
+            ...prev,
+            {
+              id: (0, import_idGenerator.generateMessageId)("system"),
+              role: "system",
+              content: result.reason,
+              timestamp: /* @__PURE__ */ new Date()
+            }
+          ]);
+          return;
+        }
+        queuedEditPendingRef.current = true;
+        setIsQueuedEditPending(true);
+        let removed = false;
+        try {
+          removed = await removeMessage();
+          if (!removed) {
+            setMessages((prev) => [
+              ...prev,
+              {
+                id: (0, import_idGenerator.generateMessageId)("system"),
+                role: "system",
+                content: "Queued input could not be edited because it is no longer pending.",
+                timestamp: /* @__PURE__ */ new Date()
+              }
+            ]);
+            return;
+          }
+          buffer.setText(result.composer.text);
+          setInput((prev) => ({
+            ...prev,
+            value: result.composer.text,
+            images: result.composer.images,
+            pastedBlocks: [],
+            historyIndex: -1,
+            draftBeforeHistory: "",
+            editingQueuedFollowUp
+          }));
+        } catch {
+          setMessages((prev) => [
+            ...prev,
+            {
+              id: (0, import_idGenerator.generateMessageId)("system"),
+              role: "system",
+              content: "Queued input could not be edited. Try again.",
+              timestamp: /* @__PURE__ */ new Date()
+            }
+          ]);
+        } finally {
+          queuedEditPendingRef.current = false;
+          setIsQueuedEditPending(false);
+        }
+      },
+      [buffer, setInput, setMessages]
+    );
     const handleHistoryNavigate = (0, import_react.useCallback)(
       (direction) => {
         const { history, historyIndex, draftBeforeHistory } = input;
         if (direction === "up") {
           if (queuedMessages.length > 0 && session.id) {
+            const sessionId = session.id;
             const lastQueued = queuedMessages[queuedMessages.length - 1];
             if (lastQueued) {
-              const text = extractTextFromContent(lastQueued.content);
-              buffer.setText(text);
-              setInput((prev) => ({ ...prev, value: text }));
-              agent.removeQueuedMessage(session.id, lastQueued.id).catch(() => {
-              });
+              void popQueuedMessageForEdit(
+                lastQueued,
+                true,
+                () => agent.removeFollowUpMessage(sessionId, lastQueued.id)
+              );
               return;
             }
           }
@@ -110,7 +175,8 @@ const InputContainer = (0, import_react.forwardRef)(
               ...prev,
               draftBeforeHistory: currentText,
               historyIndex: history.length - 1,
-              value: history[history.length - 1] || ""
+              value: history[history.length - 1] || "",
+              editingQueuedFollowUp: false
             }));
             buffer.setText(history[history.length - 1] || "");
             return;
@@ -121,7 +187,12 @@ const InputContainer = (0, import_react.forwardRef)(
           }
           const historyItem = history[newIndex] || "";
           buffer.setText(historyItem);
-          setInput((prev) => ({ ...prev, value: historyItem, historyIndex: newIndex }));
+          setInput((prev) => ({
+            ...prev,
+            value: historyItem,
+            historyIndex: newIndex,
+            editingQueuedFollowUp: false
+          }));
         } else {
           if (ui.isProcessing) return;
           if (historyIndex < 0) return;
@@ -132,7 +203,8 @@ const InputContainer = (0, import_react.forwardRef)(
             setInput((prev) => ({
               ...prev,
               value: historyItem,
-              historyIndex: newIndex
+              historyIndex: newIndex,
+              editingQueuedFollowUp: false
             }));
           } else {
             buffer.setText(draftBeforeHistory);
@@ -140,7 +212,8 @@ const InputContainer = (0, import_react.forwardRef)(
               ...prev,
               value: draftBeforeHistory,
               historyIndex: -1,
-              draftBeforeHistory: ""
+              draftBeforeHistory: "",
+              editingQueuedFollowUp: false
             }));
           }
         }
@@ -152,10 +225,26 @@ const InputContainer = (0, import_react.forwardRef)(
         queuedMessages,
         session.id,
         agent,
-        extractTextFromContent,
+        popQueuedMessageForEdit,
         ui.isProcessing
       ]
     );
+    const handleCurrentTurnEdit = (0, import_react.useCallback)(() => {
+      if (steerMessages.length === 0 || !session.id) {
+        return false;
+      }
+      const lastSteer = steerMessages[steerMessages.length - 1];
+      if (!lastSteer) {
+        return false;
+      }
+      const sessionId = session.id;
+      void popQueuedMessageForEdit(
+        lastSteer,
+        false,
+        () => agent.removeSteerMessage(sessionId, lastSteer.id)
+      );
+      return true;
+    }, [agent, popQueuedMessageForEdit, session.id, steerMessages]);
     const handleTriggerOverlay = (0, import_react.useCallback)(
       (trigger) => {
         if (approval) return;
@@ -308,7 +397,7 @@ const InputContainer = (0, import_react.forwardRef)(
       return result;
     }, []);
     const handleSubmit = (0, import_react.useCallback)(
-      async (value, bypassOverlayCheck = false) => {
+      async (value, bypassOverlayCheck = false, queueAsFollowUp = false) => {
         const expandedValue = expandPasteBlocks(value, input.pastedBlocks);
         const trimmed = expandedValue.trim();
         if (!trimmed) return;
@@ -321,8 +410,13 @@ const InputContainer = (0, import_react.forwardRef)(
               mimeType: img.mimeType
             });
           }
+          const submitAsFollowUp = queueAsFollowUp || input.editingQueuedFollowUp;
           try {
-            await agent.queueMessage(session.id, { content });
+            if (submitAsFollowUp) {
+              await agent.followUp(session.id, { content });
+            } else {
+              await agent.steer(session.id, { content });
+            }
             buffer.setText("");
             setInput((prev) => {
               const newHistory = prev.history.length > 0 && prev.history[prev.history.length - 1] === trimmed ? prev.history : [...prev.history, trimmed].slice(-100);
@@ -332,6 +426,7 @@ const InputContainer = (0, import_react.forwardRef)(
                 history: newHistory,
                 historyIndex: -1,
                 draftBeforeHistory: "",
+                editingQueuedFollowUp: false,
                 images: [],
                 pastedBlocks: []
               };
@@ -342,7 +437,7 @@ const InputContainer = (0, import_react.forwardRef)(
               {
                 id: (0, import_idGenerator.generateMessageId)("error"),
                 role: "system",
-                content: `Failed to queue message: ${error instanceof Error ? error.message : String(error)}`,
+                content: `Failed to submit ${submitAsFollowUp ? "follow-up" : "steer"} message: ${error instanceof Error ? error.message : String(error)}`,
                 timestamp: /* @__PURE__ */ new Date()
               }
             ]);
@@ -363,6 +458,7 @@ const InputContainer = (0, import_react.forwardRef)(
             history: newHistory,
             historyIndex: -1,
             draftBeforeHistory: "",
+            editingQueuedFollowUp: false,
             images: [],
             // Clear images on submit
             pastedBlocks: [],
@@ -464,6 +560,7 @@ const InputContainer = (0, import_react.forwardRef)(
                   setDequeuedBuffer,
                   setUi,
                   setSession,
+                  setSteerMessages,
                   setQueuedMessages,
                   setApproval,
                   setApprovalQueue
@@ -583,6 +680,7 @@ ${trimmed}`;
                 setDequeuedBuffer,
                 setUi,
                 setSession,
+                setSteerMessages,
                 setQueuedMessages,
                 setApproval,
                 setApprovalQueue
@@ -629,6 +727,7 @@ ${trimmed}`;
         setMessages,
         setPendingMessages,
         setDequeuedBuffer,
+        setSteerMessages,
         setQueuedMessages,
         setSession,
         agent,
@@ -667,7 +766,7 @@ ${trimmed}`;
     const mainInputAllowed = mainInputAllowedOverlays.includes(ui.activeOverlay);
     const isHistorySearchActive = ui.historySearch.isActive;
     const isInputActive = !approval && mainInputAllowed && !isHistorySearchActive;
-    const isInputDisabled = approval !== null || !mainInputAllowed || isHistorySearchActive;
+    const isInputDisabled = approval !== null || !mainInputAllowed || isHistorySearchActive || isQueuedEditPending;
     const shouldHandleSubmit = ui.activeOverlay === "none" || ui.activeOverlay === "approval";
     const canNavigateHistory = !approval && ui.activeOverlay === "none";
     const shouldHideInputArea = (0, import_overlayPresentation.getOverlayPresentation)(ui.activeOverlay, approval) === "focus";
@@ -684,10 +783,12 @@ ${trimmed}`;
         buffer,
         onSubmit: shouldHandleSubmit ? handleSubmit : () => {
         },
+        onQueueSubmit: shouldHandleSubmit ? (value) => void handleSubmit(value, false, true) : void 0,
         isDisabled: isInputDisabled,
         isActive: isInputActive,
         placeholder,
         onHistoryNavigate: canNavigateHistory ? handleHistoryNavigate : void 0,
+        onCurrentTurnEdit: handleCurrentTurnEdit,
         onTriggerOverlay: handleTriggerOverlay,
         onKeyboardScroll,
         imageCount: input.images.length,

package/dist/containers/InputContainer.d.ts

@@ -26,7 +26,9 @@ interface InputContainerProps {
     /** If provided, auto-submits once when the UI is ready */
     initialPrompt?: string | undefined;
     approval: ApprovalRequest | null;
-    /** Queued messages waiting to be processed */
+    /** Active-turn input waiting for the next executor boundary */
+    steerMessages: QueuedMessage[];
+    /** Follow-up messages waiting to run after the current turn */
     queuedMessages: QueuedMessage[];
     setInput: React.Dispatch<React.SetStateAction<InputState>>;
     setUi: React.Dispatch<React.SetStateAction<UIState>>;
@@ -37,7 +39,9 @@ interface InputContainerProps {
     setPendingMessages: React.Dispatch<React.SetStateAction<Message[]>>;
     /** Setter for dequeued buffer (user messages waiting to render after pending) */
     setDequeuedBuffer: React.Dispatch<React.SetStateAction<Message[]>>;
-    /** Setter for queued messages */
+    /** Setter for active-turn steer messages */
+    setSteerMessages: React.Dispatch<React.SetStateAction<QueuedMessage[]>>;
+    /** Setter for queued follow-up messages */
     setQueuedMessages: React.Dispatch<React.SetStateAction<QueuedMessage[]>>;
     /** Setter for current approval request (for approval UI via processStream) */
     setApproval: React.Dispatch<React.SetStateAction<ApprovalRequest | null>>;

package/dist/containers/InputContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InputContainer.d.ts","sourceRoot":"","sources":["../../src/containers/InputContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAA0E,MAAM,OAAO,CAAC;AAC/F,OAAO,KAAK,EAAoC,aAAa,EAAE,MAAM,aAAa,CAAC;AAGnF,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EACR,OAAO,EACP,OAAO,EACP,UAAU,EACV,YAAY,EAGZ,QAAQ,EACX,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAGtE,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,qBAAqB,CAAC;AAK7B,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACjC,yEAAyE;IACzE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,UAAU,mBAAmB;IACzB,yCAAyC;IACzC,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,YAAY,CAAC;IACtB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,8CAA8C;IAC9C,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,mEAAmE;IACnE,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,iCAAiC;IACjC,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8EAA8E;IAC9E,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,sEAAsE;IACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,eAAe,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC;IACtD,6EAA6E;IAC7E,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,kGA20B1B,CAAC"}
+{"version":3,"file":"InputContainer.d.ts","sourceRoot":"","sources":["../../src/containers/InputContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAA0E,MAAM,OAAO,CAAC;AAC/F,OAAO,KAAK,EAAoC,aAAa,EAAE,MAAM,aAAa,CAAC;AAGnF,OAAO,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EACR,OAAO,EACP,OAAO,EACP,UAAU,EACV,YAAY,EAGZ,QAAQ,EACX,MAAM,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAGtE,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,qBAAqB,CAAC;AAK7B,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACjC,yEAAyE;IACzE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,UAAU,mBAAmB;IACzB,yCAAyC;IACzC,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,EAAE,YAAY,CAAC;IACtB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,+DAA+D;IAC/D,aAAa,EAAE,aAAa,EAAE,CAAC;IAC/B,+DAA+D;IAC/D,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,mEAAmE;IACnE,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,4CAA4C;IAC5C,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACxE,2CAA2C;IAC3C,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8EAA8E;IAC9E,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,yEAAyE;IACzE,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,sEAAsE;IACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,eAAe,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC;IACtD,6EAA6E;IAC7E,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,kGAo7B1B,CAAC"}

package/dist/containers/InputContainer.js

@@ -1,11 +1,12 @@
 import { jsx } from "react/jsx-runtime";
-import { useCallback, useRef, useEffect, useImperativeHandle, forwardRef } from "react";
+import React, { useCallback, useRef, useEffect, useImperativeHandle, forwardRef } from "react";
 import { getReasoningProfile } from "@dexto/core";
 import { InputArea } from "../components/input/InputArea.js";
 import { processStream } from "../services/index.js";
 import { useSoundService } from "../contexts/index.js";
 import { createUserMessage } from "../utils/messageFormatting.js";
 import { generateMessageId } from "../utils/idGenerator.js";
+import { restoreQueuedContentForComposer } from "../utils/queuedComposerContent.js";
 import { captureAnalytics } from "../host/index.js";
 import { getOverlayPresentation } from "../utils/overlayPresentation.js";
 import {
@@ -21,6 +22,7 @@ const InputContainer = forwardRef(
     session,
     initialPrompt,
     approval,
+    steerMessages,
     queuedMessages,
     setInput,
     setUi,
@@ -28,6 +30,7 @@ const InputContainer = forwardRef(
     setMessages,
     setPendingMessages,
     setDequeuedBuffer,
+    setSteerMessages,
     setQueuedMessages,
     setApproval,
     setApprovalQueue,
@@ -39,6 +42,8 @@ const InputContainer = forwardRef(
     useStreaming = true
   }, ref) {
     const sessionCreationPromiseRef = useRef(null);
+    const queuedEditPendingRef = useRef(false);
+    const [isQueuedEditPending, setIsQueuedEditPending] = React.useState(false);
     const didAutoSubmitInitialPromptRef = useRef(false);
     const soundService = useSoundService();
     const autoApproveEditsRef = useRef(ui.autoApproveEdits);
@@ -54,21 +59,81 @@ const InputContainer = forwardRef(
         sessionCreationPromiseRef.current = null;
       }
     }, [session.id]);
-    const extractTextFromContent = useCallback((content) => {
-      return content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
-    }, []);
+    const popQueuedMessageForEdit = useCallback(
+      async (message, editingQueuedFollowUp, removeMessage) => {
+        if (queuedEditPendingRef.current) {
+          return;
+        }
+        const result = restoreQueuedContentForComposer(message);
+        if (!result.ok) {
+          setMessages((prev) => [
+            ...prev,
+            {
+              id: generateMessageId("system"),
+              role: "system",
+              content: result.reason,
+              timestamp: /* @__PURE__ */ new Date()
+            }
+          ]);
+          return;
+        }
+        queuedEditPendingRef.current = true;
+        setIsQueuedEditPending(true);
+        let removed = false;
+        try {
+          removed = await removeMessage();
+          if (!removed) {
+            setMessages((prev) => [
+              ...prev,
+              {
+                id: generateMessageId("system"),
+                role: "system",
+                content: "Queued input could not be edited because it is no longer pending.",
+                timestamp: /* @__PURE__ */ new Date()
+              }
+            ]);
+            return;
+          }
+          buffer.setText(result.composer.text);
+          setInput((prev) => ({
+            ...prev,
+            value: result.composer.text,
+            images: result.composer.images,
+            pastedBlocks: [],
+            historyIndex: -1,
+            draftBeforeHistory: "",
+            editingQueuedFollowUp
+          }));
+        } catch {
+          setMessages((prev) => [
+            ...prev,
+            {
+              id: generateMessageId("system"),
+              role: "system",
+              content: "Queued input could not be edited. Try again.",
+              timestamp: /* @__PURE__ */ new Date()
+            }
+          ]);
+        } finally {
+          queuedEditPendingRef.current = false;
+          setIsQueuedEditPending(false);
+        }
+      },
+      [buffer, setInput, setMessages]
+    );
     const handleHistoryNavigate = useCallback(
       (direction) => {
         const { history, historyIndex, draftBeforeHistory } = input;
         if (direction === "up") {
           if (queuedMessages.length > 0 && session.id) {
+            const sessionId = session.id;
             const lastQueued = queuedMessages[queuedMessages.length - 1];
             if (lastQueued) {
-              const text = extractTextFromContent(lastQueued.content);
-              buffer.setText(text);
-              setInput((prev) => ({ ...prev, value: text }));
-              agent.removeQueuedMessage(session.id, lastQueued.id).catch(() => {
-              });
+              void popQueuedMessageForEdit(
+                lastQueued,
+                true,
+                () => agent.removeFollowUpMessage(sessionId, lastQueued.id)
+              );
               return;
             }
           }
@@ -81,7 +146,8 @@ const InputContainer = forwardRef(
               ...prev,
               draftBeforeHistory: currentText,
               historyIndex: history.length - 1,
-              value: history[history.length - 1] || ""
+              value: history[history.length - 1] || "",
+              editingQueuedFollowUp: false
             }));
             buffer.setText(history[history.length - 1] || "");
             return;
@@ -92,7 +158,12 @@ const InputContainer = forwardRef(
           }
           const historyItem = history[newIndex] || "";
           buffer.setText(historyItem);
-          setInput((prev) => ({ ...prev, value: historyItem, historyIndex: newIndex }));
+          setInput((prev) => ({
+            ...prev,
+            value: historyItem,
+            historyIndex: newIndex,
+            editingQueuedFollowUp: false
+          }));
         } else {
           if (ui.isProcessing) return;
           if (historyIndex < 0) return;
@@ -103,7 +174,8 @@ const InputContainer = forwardRef(
             setInput((prev) => ({
               ...prev,
               value: historyItem,
-              historyIndex: newIndex
+              historyIndex: newIndex,
+              editingQueuedFollowUp: false
             }));
           } else {
             buffer.setText(draftBeforeHistory);
@@ -111,7 +183,8 @@ const InputContainer = forwardRef(
               ...prev,
               value: draftBeforeHistory,
               historyIndex: -1,
-              draftBeforeHistory: ""
+              draftBeforeHistory: "",
+              editingQueuedFollowUp: false
             }));
           }
         }
@@ -123,10 +196,26 @@ const InputContainer = forwardRef(
         queuedMessages,
         session.id,
         agent,
-        extractTextFromContent,
+        popQueuedMessageForEdit,
         ui.isProcessing
       ]
     );
+    const handleCurrentTurnEdit = useCallback(() => {
+      if (steerMessages.length === 0 || !session.id) {
+        return false;
+      }
+      const lastSteer = steerMessages[steerMessages.length - 1];
+      if (!lastSteer) {
+        return false;
+      }
+      const sessionId = session.id;
+      void popQueuedMessageForEdit(
+        lastSteer,
+        false,
+        () => agent.removeSteerMessage(sessionId, lastSteer.id)
+      );
+      return true;
+    }, [agent, popQueuedMessageForEdit, session.id, steerMessages]);
     const handleTriggerOverlay = useCallback(
       (trigger) => {
         if (approval) return;
@@ -279,7 +368,7 @@ const InputContainer = forwardRef(
       return result;
     }, []);
     const handleSubmit = useCallback(
-      async (value, bypassOverlayCheck = false) => {
+      async (value, bypassOverlayCheck = false, queueAsFollowUp = false) => {
         const expandedValue = expandPasteBlocks(value, input.pastedBlocks);
         const trimmed = expandedValue.trim();
         if (!trimmed) return;
@@ -292,8 +381,13 @@ const InputContainer = forwardRef(
               mimeType: img.mimeType
             });
           }
+          const submitAsFollowUp = queueAsFollowUp || input.editingQueuedFollowUp;
           try {
-            await agent.queueMessage(session.id, { content });
+            if (submitAsFollowUp) {
+              await agent.followUp(session.id, { content });
+            } else {
+              await agent.steer(session.id, { content });
+            }
             buffer.setText("");
             setInput((prev) => {
               const newHistory = prev.history.length > 0 && prev.history[prev.history.length - 1] === trimmed ? prev.history : [...prev.history, trimmed].slice(-100);
@@ -303,6 +397,7 @@ const InputContainer = forwardRef(
                 history: newHistory,
                 historyIndex: -1,
                 draftBeforeHistory: "",
+                editingQueuedFollowUp: false,
                 images: [],
                 pastedBlocks: []
               };
@@ -313,7 +408,7 @@ const InputContainer = forwardRef(
               {
                 id: generateMessageId("error"),
                 role: "system",
-                content: `Failed to queue message: ${error instanceof Error ? error.message : String(error)}`,
+                content: `Failed to submit ${submitAsFollowUp ? "follow-up" : "steer"} message: ${error instanceof Error ? error.message : String(error)}`,
                 timestamp: /* @__PURE__ */ new Date()
               }
             ]);
@@ -334,6 +429,7 @@ const InputContainer = forwardRef(
             history: newHistory,
             historyIndex: -1,
             draftBeforeHistory: "",
+            editingQueuedFollowUp: false,
             images: [],
             // Clear images on submit
             pastedBlocks: [],
@@ -435,6 +531,7 @@ const InputContainer = forwardRef(
                   setDequeuedBuffer,
                   setUi,
                   setSession,
+                  setSteerMessages,
                   setQueuedMessages,
                   setApproval,
                   setApprovalQueue
@@ -554,6 +651,7 @@ ${trimmed}`;
                 setDequeuedBuffer,
                 setUi,
                 setSession,
+                setSteerMessages,
                 setQueuedMessages,
                 setApproval,
                 setApprovalQueue
@@ -600,6 +698,7 @@ ${trimmed}`;
         setMessages,
         setPendingMessages,
         setDequeuedBuffer,
+        setSteerMessages,
         setQueuedMessages,
         setSession,
         agent,
@@ -638,7 +737,7 @@ ${trimmed}`;
     const mainInputAllowed = mainInputAllowedOverlays.includes(ui.activeOverlay);
     const isHistorySearchActive = ui.historySearch.isActive;
     const isInputActive = !approval && mainInputAllowed && !isHistorySearchActive;
-    const isInputDisabled = approval !== null || !mainInputAllowed || isHistorySearchActive;
+    const isInputDisabled = approval !== null || !mainInputAllowed || isHistorySearchActive || isQueuedEditPending;
     const shouldHandleSubmit = ui.activeOverlay === "none" || ui.activeOverlay === "approval";
     const canNavigateHistory = !approval && ui.activeOverlay === "none";
     const shouldHideInputArea = getOverlayPresentation(ui.activeOverlay, approval) === "focus";
@@ -655,10 +754,12 @@ ${trimmed}`;
         buffer,
         onSubmit: shouldHandleSubmit ? handleSubmit : () => {
         },
+        onQueueSubmit: shouldHandleSubmit ? (value) => void handleSubmit(value, false, true) : void 0,
         isDisabled: isInputDisabled,
         isActive: isInputActive,
         placeholder,
         onHistoryNavigate: canNavigateHistory ? handleHistoryNavigate : void 0,
+        onCurrentTurnEdit: handleCurrentTurnEdit,
         onTriggerOverlay: handleTriggerOverlay,
         onKeyboardScroll,
         imageCount: input.images.length,