From 32a00c976db4548d7baa5d015f5e9bbec72518dd Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Thu, 12 Nov 2026 10:49:22 -0600
Subject: [PATCH] fix(tui): keep the Mini draft caret when closing the command
 palette (#63260)

---
 packages/tui/src/mini/footer.prompt.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/tui/src/mini/footer.prompt.tsx b/packages/tui/src/mini/footer.prompt.tsx
index b7b2046fc19..53ae744b841 100644
--- a/packages/tui/src/mini/footer.prompt.tsx
+++ b/packages/tui/src/mini/footer.prompt.tsx
@@ -361,6 +361,7 @@ export function createPromptState(input: PromptInput): PromptState {
     history = createPromptHistory(input.history?.())
   })
   let draft: RunPrompt = { text: "", parts: [] }
+  let draftCursor = 0
   let stash: RunPrompt = { text: "", parts: [] }
   let area: TextareaRenderable | undefined
   const measure = (text: string) => measureEditText(text, { widthMethod: renderer.widthMethod })
@@ -704,6 +705,7 @@ export function createPromptState(input: PromptInput): PromptState {
   const restore = (value: RunPrompt, cursor = Infinity) => {
     revision += 1
     draft = promptCopy(value)
+    draftCursor = cursor
     setShell(value.mode === "shell")
     if (!area || area.isDestroyed) {
       return
@@ -726,6 +728,7 @@ export function createPromptState(input: PromptInput): PromptState {
     clearParts()
     hide()
     draft = emptyPrompt(shell())
+    draftCursor = 0
     if (!area || area.isDestroyed) {
       return
     }
@@ -792,6 +795,7 @@ export function createPromptState(input: PromptInput): PromptState {
     }
 
     if (area && !area.isDestroyed) {
+      draftCursor = area.cursorOffset
       area.off("line-info-change", scheduleRows)
     }
 
@@ -809,7 +813,7 @@ export function createPromptState(input: PromptInput): PromptState {
         return
       }
 
-      restore(draft)
+      restore(draft, draftCursor)
       refresh()
     })
   }
@@ -1353,6 +1357,7 @@ export function createPromptState(input: PromptInput): PromptState {
   const submitPrompt = (next: RunPrompt, delivery: RunDelivery = "steer") => {
     if (!area || area.isDestroyed) {
       draft = promptCopy(next)
+      draftCursor = Infinity
     }
 
     if (visible()) {
@@ -1506,13 +1511,6 @@ export function createPromptState(input: PromptInput): PromptState {
 
     hide()
     prev = kind
-    if (kind !== "prompt") {
-      return
-    }
-
-    queueMicrotask(() => {
-      restore(draft)
-    })
   })
 
   return {