diff --git a/packages/app/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index 8d40953ff2f9..fddc9f3bc9f4 100644
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -29,6 +29,7 @@ import {
   ImageAttachmentPart,
   AgentPart,
   FileAttachmentPart,
+  ContextItem,
 } from "@/context/prompt"
 import { useLayout } from "@/context/layout"
 import { useSDK } from "@/context/sdk"
@@ -46,6 +47,7 @@ import { ModelSelectorPopover } from "@/components/dialog-select-model"
 import { useCommand } from "@/context/command"
 import { Persist, persisted } from "@/utils/persist"
 import { usePermission } from "@/context/permission"
+import { useSettings } from "@/context/settings"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { createSessionTabs } from "@/pages/session/helpers"
@@ -168,10 +170,11 @@ export interface PromptInputProps {
   ref?: (el: HTMLDivElement) => void
   newSessionWorktree?: string
   onNewSessionWorktreeReset?: () => void
-  edit?: { id: string; prompt: Prompt; context: FollowupDraft["context"] }
+  edit?: { id: string; prompt: Prompt; context: ContextItem[] }
   onEditLoaded?: () => void
-  shouldQueue?: () => boolean
-  onQueue?: (draft: FollowupDraft) => void
+  shouldQueue?: (editID?: string) => boolean
+  onQueue?: (draft: FollowupDraft, editID?: string) => void
+  onEditLastQueued?: () => boolean
   onAbort?: () => void
   onSubmit?: () => void
 }
@@ -206,6 +209,7 @@ const EXAMPLES = [
 
 export const PromptInput: Component<PromptInputProps> = (props) => {
   const sdk = useSDK()
+  const settings = useSettings()
 
   const sync = useSync()
   const files = useFile()
@@ -354,6 +358,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     draggingType: "image" | "@mention" | null
     mode: "normal" | "shell"
     applyingHistory: boolean
+    editID: string | null
     variantOpen: boolean
   }>({
     popover: null,
@@ -363,6 +368,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     draggingType: null,
     mode: "normal",
     applyingHistory: false,
+    editID: null,
     variantOpen: false,
   })
   const [picker, setPicker] = createStore({
@@ -392,7 +398,18 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       .join("")
     return text.trim().length === 0 && imageAttachments().length === 0 && commentCount() === 0
   })
+  const submitDisabled = createMemo(() => {
+    if (!working() && blank()) return true
+    if (working() && !blank() && !props.shouldQueue?.(store.editID ?? undefined)) return true
+    return false
+  })
   const stopping = createMemo(() => working() && blank())
+  const queueModeLabel = createMemo(() => {
+    if (!props.shouldQueue) return null
+    const mode = settings.general.followup()
+    return language.t(`settings.general.row.followup.option.${mode === "waitingSteer" ? "wrap" : mode === "queue" ? "queue" : "steer"}` as const)
+  })
+
   const tip = () => {
     if (stopping()) {
       return (
@@ -403,10 +420,16 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       )
     }
 
+    const label = queueModeLabel()
     return (
-      <div class="flex items-center gap-2">
-        <span>{language.t("prompt.action.send")}</span>
-        <Icon name="enter" size="small" class="text-icon-base" />
+      <div class="flex flex-col gap-1 items-start">
+        <div class="flex items-center gap-2">
+          <span>{label ? label : language.t("prompt.action.send")}</span>
+          <Icon name="enter" size="small" class="text-icon-base" />
+        </div>
+        <Show when={label}>
+          <span class="text-[10px] text-text-weak opacity-80">{language.t("settings.general.row.followup.title")}</span>
+        </Show>
       </div>
     )
   }
@@ -972,6 +995,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     if (shouldReset) {
       closePopover()
       resetHistoryNavigation()
+      setStore("editID", null)
       if (prompt.dirty()) {
         mirror.input = true
         prompt.set(DEFAULT_PROMPT, 0)
@@ -1118,6 +1142,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         setStore("popover", null)
         setStore("historyIndex", -1)
         setStore("savedPrompt", null)
+        setStore("editID", edit.id)
         prompt.set(edit.prompt, promptLength(edit.prompt))
         requestAnimationFrame(() => {
           editorRef.focus()
@@ -1126,7 +1151,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         })
         props.onEditLoaded?.()
       },
-      { defer: true },
     ),
   )
 
@@ -1198,14 +1222,14 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       queueScroll,
       promptLength,
       addToHistory,
-      resetHistoryNavigation: () => {
-        resetHistoryNavigation(true)
-      },
-      setMode: (mode) => setStore("mode", mode),
-      setPopover: (popover) => setStore("popover", popover),
+      resetHistoryNavigation,
+      setMode,
+      setPopover: closePopover,
+      editID: () => store.editID,
+      clearEditID: () => setStore("editID", null),
       newSessionWorktree: () => props.newSessionWorktree,
       onNewSessionWorktreeReset: props.onNewSessionWorktreeReset,
-      shouldQueue: props.shouldQueue,
+      shouldQueue: (editID) => props.shouldQueue?.(editID) ?? false,
       onQueue: props.onQueue,
       onAbort: props.onAbort,
       onSubmit: props.onSubmit,
@@ -1346,6 +1370,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         .map((part) => ("content" in part ? part.content : ""))
         .join("")
       const direction = event.key === "ArrowUp" ? "up" : "down"
+
+      if (direction === "up" && textContent === "" && !store.editID && props.onEditLastQueued?.()) {
+        event.preventDefault()
+        return
+      }
+
       if (!canNavigateHistoryAtCursor(direction, textContent, cursorPosition, store.historyIndex >= 0)) return
       if (navigateHistory(direction)) {
         event.preventDefault()
@@ -1357,18 +1387,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     if (event.key === "Enter" && !event.shiftKey) {
       event.preventDefault()
       if (event.repeat) return
-      if (
-        working() &&
-        prompt
-          .current()
-          .map((part) => ("content" in part ? part.content : ""))
-          .join("")
-          .trim().length === 0 &&
-        imageAttachments().length === 0 &&
-        commentCount() === 0
-      ) {
-        return
-      }
+      if (submitDisabled()) return
       void handleSubmit(event)
     }
   }
@@ -1660,6 +1679,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                     </div>
                   </Show>
                 </div>
+                <Show when={queueModeLabel()}>
+                  <span class="text-[10px] font-medium text-v2-text-text-muted bg-v2-background-bg-subtle border border-v2-border-border-subtle rounded-md px-1.5 py-0.5 select-none mr-2 uppercase tracking-wide">
+                    {queueModeLabel()}
+                  </span>
+                </Show>
                 <Tooltip placement="top" inactive={!working() && blank()} value={tip()}>
                   <IconButton
                     data-action="prompt-submit"
@@ -1803,6 +1827,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                 />
 
                 <div class="flex items-center gap-1 pointer-events-auto">
+                  <Show when={queueModeLabel()}>
+                    <span class="text-[10px] font-medium text-v2-text-text-muted bg-v2-background-bg-subtle border border-v2-border-border-subtle rounded-md px-1.5 py-0.5 select-none uppercase tracking-wide mr-1">
+                      {queueModeLabel()}
+                    </span>
+                  </Show>
                   <Tooltip placement="top" inactive={!working() && blank()} value={tip()}>
                     <IconButton
                       data-action="prompt-submit"
diff --git a/packages/app/src/components/prompt-input/submit.test.ts b/packages/app/src/components/prompt-input/submit.test.ts
index 7b412cd24509..4623eebc379a 100644
--- a/packages/app/src/components/prompt-input/submit.test.ts
+++ b/packages/app/src/components/prompt-input/submit.test.ts
@@ -254,6 +254,7 @@ describe("prompt submit worktree selection", () => {
       resetHistoryNavigation: () => undefined,
       setMode: () => undefined,
       setPopover: () => undefined,
+      clearEditID: () => undefined,
       newSessionWorktree: () => selected,
       onNewSessionWorktreeReset: () => undefined,
       onSubmit: () => undefined,
@@ -292,6 +293,7 @@ describe("prompt submit worktree selection", () => {
       resetHistoryNavigation: () => undefined,
       setMode: () => undefined,
       setPopover: () => undefined,
+      clearEditID: () => undefined,
       newSessionWorktree: () => selected,
       onNewSessionWorktreeReset: () => undefined,
       onSubmit: () => undefined,
@@ -323,6 +325,7 @@ describe("prompt submit worktree selection", () => {
       resetHistoryNavigation: () => undefined,
       setMode: () => undefined,
       setPopover: () => undefined,
+      clearEditID: () => undefined,
       onSubmit: () => undefined,
     })
 
@@ -355,6 +358,7 @@ describe("prompt submit worktree selection", () => {
       resetHistoryNavigation: () => undefined,
       setMode: () => undefined,
       setPopover: () => undefined,
+      clearEditID: () => undefined,
       newSessionWorktree: () => selected,
       onNewSessionWorktreeReset: () => undefined,
       onSubmit: () => undefined,
@@ -367,4 +371,103 @@ describe("prompt submit worktree selection", () => {
     expect(storedSessions["/repo/worktree-a"]).toEqual([{ id: "session-1", title: "New session 1" }])
     expect(optimisticSeeded).toEqual([true])
   })
+
+  test("queues followup and clears edit id when in normal mode and shouldQueue is true", async () => {
+    params = { id: "session-1" }
+    
+    let queuedDraft: any = undefined
+    let queuedEditID: any = undefined
+    let cleared = false
+    
+    const submit = createPromptSubmit({
+      prompt,
+      info: () => ({ id: "session-1" }),
+      imageAttachments: () => [],
+      commentCount: () => 0,
+      autoAccept: () => false,
+      mode: () => "normal",
+      working: () => false,
+      editor: () => undefined,
+      queueScroll: () => undefined,
+      promptLength: (value) => value.reduce((sum, part) => sum + ("content" in part ? part.content.length : 0), 0),
+      addToHistory: () => undefined,
+      resetHistoryNavigation: () => undefined,
+      setMode: () => undefined,
+      setPopover: () => undefined,
+      editID: () => "test-edit-id",
+      clearEditID: () => { cleared = true },
+      shouldQueue: () => true,
+      onQueue: (draft, editID) => {
+        queuedDraft = draft
+        queuedEditID = editID
+      },
+      onSubmit: () => undefined,
+    })
+
+    const event = { preventDefault: () => undefined } as unknown as Event
+
+    await submit.handleSubmit(event)
+
+    expect(queuedDraft).toBeDefined()
+    expect(queuedEditID).toBe("test-edit-id")
+    expect(cleared).toBe(true)
+  })
+
+  test("sendFollowupDraft sets session_status accurately for followupModes", async () => {
+    const { sendFollowupDraft } = await import("./submit")
+    let syncData: any = undefined
+    
+    const client = clientFor("/repo/worktree-a")
+    const sync = {
+      set: (key: string, id: string, data: any) => {
+        if (key === "session_status") {
+          syncData = data
+        }
+      },
+      session: {
+        optimistic: { remove: () => {}, add: () => {} }
+      }
+    } as any
+    const globalSync = {
+      child: () => [undefined, sync.set]
+    } as any
+
+    await sendFollowupDraft({
+      client: client as any,
+      serverSync: globalSync,
+      sync,
+      draft: {
+        sessionID: "session-1",
+        sessionDirectory: "/repo/worktree-a",
+        prompt: [{ type: "text", content: "test", start: 0, end: 4 }],
+        context: [],
+        agent: "build",
+        model: { providerID: "provider", modelID: "model" },
+        isSteer: true,
+      },
+      optimisticBusy: true,
+      before: () => true,
+    })
+
+    expect(syncData).toEqual({ type: "haltingSteer" })
+    
+    await sendFollowupDraft({
+      client: client as any,
+      serverSync: globalSync,
+      sync,
+      draft: {
+        sessionID: "session-1",
+        sessionDirectory: "/repo/worktree-a",
+        prompt: [{ type: "text", content: "test", start: 0, end: 4 }],
+        context: [],
+        agent: "build",
+        model: { providerID: "provider", modelID: "model" },
+        followupMode: "waitingSteer",
+      },
+      optimisticBusy: true,
+      before: () => true,
+    })
+
+    expect(syncData).toEqual({ type: "waitingSteer" })
+  })
 })
diff --git a/packages/app/src/components/prompt-input/submit.ts b/packages/app/src/components/prompt-input/submit.ts
index a95f0a603076..0597eb5cbfdf 100644
--- a/packages/app/src/components/prompt-input/submit.ts
+++ b/packages/app/src/components/prompt-input/submit.ts
@@ -37,6 +37,8 @@ export type FollowupDraft = {
   agent: string
   model: { providerID: string; modelID: string }
   variant?: string
+  isSteer?: boolean
+  followupMode?: string
 }
 
 type FollowupSendInput = {
@@ -60,7 +62,8 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
 
   const setBusy = () => {
     if (!input.optimisticBusy) return
-    setStore("session_status", input.draft.sessionID, { type: "busy" })
+    const type = input.draft.isSteer ? "haltingSteer" : input.draft.followupMode === "waitingSteer" ? "waitingSteer" : "busy"
+    setStore("session_status", input.draft.sessionID, { type })
   }
 
   const setIdle = () => {
@@ -162,6 +165,8 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
       messageID,
       parts: requestParts,
       variant: input.draft.variant,
+      isSteer: input.draft.isSteer,
+      followupMode: input.draft.followupMode as any,
     })
     return true
   } catch (err) {
@@ -188,10 +193,12 @@ type PromptSubmitInput = {
   resetHistoryNavigation: () => void
   setMode: (mode: "normal" | "shell") => void
   setPopover: (popover: "at" | "slash" | null) => void
+  editID?: Accessor<string | null>
+  clearEditID: () => void
   newSessionWorktree?: Accessor<string | undefined>
   onNewSessionWorktreeReset?: () => void
-  shouldQueue?: Accessor<boolean>
-  onQueue?: (draft: FollowupDraft) => void
+  shouldQueue?: (editID?: string) => boolean
+  onQueue?: (draft: FollowupDraft, editID?: string) => void
   onAbort?: () => void
   onSubmit?: () => void
 }
@@ -425,6 +432,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       prompt.reset()
       input.setMode("normal")
       input.setPopover(null)
+      input.clearEditID()
     }
 
     const restoreInput = () => {
@@ -440,11 +448,22 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       })
     }
 
-    if (!isNewSession && mode === "normal" && input.shouldQueue?.()) {
-      input.onQueue?.(draft)
-      clearContext()
-      clearInput()
-      return
+    if (!isNewSession && mode === "normal") {
+      if (input.shouldQueue?.(input.editID?.() ?? undefined)) {
+        input.onQueue?.(draft, input.editID?.() ?? undefined)
+        clearContext()
+        clearInput()
+        return
+      }
+      
+      // If we shouldn't queue but the agent is busy, we cannot submit.
+      // This happens if the queue is full (e.g. max 1 message in steer/wrap mode).
+      // We must block the submission entirely.
+      const status = sync().data.session_status?.[session.id]?.type ?? "idle"
+      const isBusy = status !== "idle"
+      if (isBusy) {
+        return
+      }
     }
 
     input.onSubmit?.()
diff --git a/packages/app/src/components/settings-general.tsx b/packages/app/src/components/settings-general.tsx
index 1be3ffc51318..00602d972c36 100644
--- a/packages/app/src/components/settings-general.tsx
+++ b/packages/app/src/components/settings-general.tsx
@@ -268,6 +268,30 @@ export const SettingsGeneral: Component = () => {
           />
         </SettingsRow>
 
+        <SettingsRow
+          title={language.t("settings.general.row.followup.title")}
+          description={language.t("settings.general.row.followup.description")}
+        >
+          <Select
+            data-action="settings-followup"
+            options={[
+              { value: "queue", label: language.t("settings.general.row.followup.option.queue") },
+              { value: "haltingSteer", label: language.t("settings.general.row.followup.option.steer") },
+              { value: "waitingSteer", label: language.t("settings.general.row.followup.option.wrap") },
+            ]}
+            current={{
+              value: settings.general.followup() ?? "haltingSteer",
+              label: language.t(`settings.general.row.followup.option.${settings.general.followup() === "waitingSteer" ? "wrap" : settings.general.followup() === "queue" ? "queue" : "steer"}` as const),
+            }}
+            value={(o) => o.value}
+            label={(o) => o.label}
+            onSelect={(option) => option && settings.general.setFollowup(option.value as "queue" | "haltingSteer" | "waitingSteer")}
+            variant="secondary"
+            size="small"
+            triggerVariant="settings"
+          />
+        </SettingsRow>
+
         <SettingsRow
           title={language.t("command.permissions.autoaccept.enable")}
           description={language.t("toast.permissions.autoaccept.on.description")}
diff --git a/packages/app/src/components/settings-v2/general.tsx b/packages/app/src/components/settings-v2/general.tsx
index 93caa6467398..67d00f23880c 100644
--- a/packages/app/src/components/settings-v2/general.tsx
+++ b/packages/app/src/components/settings-v2/general.tsx
@@ -250,6 +250,31 @@ export const SettingsGeneralV2: Component = () => {
           />
         </SettingsRowV2>
 
+        <SettingsRowV2
+          title={language.t("settings.general.row.followup.title")}
+          description={language.t("settings.general.row.followup.description")}
+        >
+          <SelectV2
+            appearance="inline"
+            data-action="settings-followup"
+            options={[
+              { value: "queue", label: language.t("settings.general.row.followup.option.queue") },
+              { value: "haltingSteer", label: language.t("settings.general.row.followup.option.steer") },
+              { value: "waitingSteer", label: language.t("settings.general.row.followup.option.wrap") },
+            ]}
+            current={[
+              { value: "queue", label: language.t("settings.general.row.followup.option.queue") },
+              { value: "haltingSteer", label: language.t("settings.general.row.followup.option.steer") },
+              { value: "waitingSteer", label: language.t("settings.general.row.followup.option.wrap") },
+            ].find((o) => o.value === (settings.general.followup() ?? "haltingSteer"))}
+            placement="bottom-end"
+            gutter={6}
+            value={(o) => o.value}
+            label={(o) => o.label}
+            onSelect={(option) => option && settings.general.setFollowup(option.value as "queue" | "haltingSteer" | "waitingSteer")}
+          />
+        </SettingsRowV2>
+
         <SettingsRowV2
           title={language.t("command.permissions.autoaccept.enable")}
           description={language.t("toast.permissions.autoaccept.on.description")}
diff --git a/packages/app/src/context/settings.tsx b/packages/app/src/context/settings.tsx
index 21c845d0d1ea..83dd5a0e4e53 100644
--- a/packages/app/src/context/settings.tsx
+++ b/packages/app/src/context/settings.tsx
@@ -22,7 +22,7 @@ export interface Settings {
   general: {
     autoSave: boolean
     releaseNotes: boolean
-    followup: "queue" | "steer"
+    followup: "queue" | "haltingSteer" | "waitingSteer"
     showFileTree: boolean
     showNavigation: boolean
     showSearch: boolean
@@ -107,7 +107,7 @@ const defaultSettings: Settings = {
   general: {
     autoSave: true,
     releaseNotes: true,
-    followup: "steer",
+    followup: "haltingSteer",
     showFileTree: false,
     showNavigation: false,
     showSearch: false,
@@ -170,11 +170,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
       root.style.setProperty("--font-family-sans", sansFontFamily(store.appearance?.sans))
     })
 
-    createEffect(() => {
-      if (store.general?.followup !== "queue") return
-      setStore("general", "followup", "steer")
-    })
-
     return {
       ready,
       get current() {
@@ -190,11 +185,11 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
           setStore("general", "releaseNotes", value)
         },
         followup: withFallback(
-          () => (store.general?.followup === "queue" ? "steer" : store.general?.followup),
+          () => store.general?.followup,
           defaultSettings.general.followup,
         ),
-        setFollowup(value: "queue" | "steer") {
-          setStore("general", "followup", value === "queue" ? "steer" : value)
+        setFollowup(value: "queue" | "haltingSteer" | "waitingSteer") {
+          setStore("general", "followup", value)
         },
         showFileTree,
         setShowFileTree(value: boolean) {
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 1ba0c3d230a0..dec792035641 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -826,9 +826,10 @@ export const dict = {
   "settings.general.row.uiFont.title": "UI Font",
   "settings.general.row.uiFont.description": "Customise the font used throughout the interface",
   "settings.general.row.followup.title": "Follow-up behavior",
-  "settings.general.row.followup.description": "Choose whether follow-up prompts steer immediately or wait in a queue",
+  "settings.general.row.followup.description": "Choose whether follow-up prompts halt and steer immediately, wait for the current step, or wait in a queue",
   "settings.general.row.followup.option.queue": "Queue",
-  "settings.general.row.followup.option.steer": "Steer",
+  "settings.general.row.followup.option.wrap": "Wait and Steer",
+  "settings.general.row.followup.option.steer": "Halt and Steer",
   "settings.general.row.showFileTree.title": "File tree",
   "settings.general.row.showFileTree.description": "Show the file tree panel in sessions",
   "settings.general.row.showNavigation.title": "Navigation controls",
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 72625a615fcd..381597fcc663 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1247,8 +1247,15 @@ export default function Page() {
         optimisticBusy: item.sessionDirectory === sdk().directory,
       }).catch((err) => {
         setFollowup("failed", input.sessionID, input.id)
-        fail(err)
-        return false
+        throw err
+      })
+
+      if (!ok) return
+
+      setFollowup("items", input.sessionID, (items) => {
+        const nextItems = (items ?? []).filter((entry) => entry.id !== input.id)
+        // We do NOT send "clear" here, because this message was actually processed and sent!
+        return nextItems
       })
       if (!ok) return
 
@@ -1267,11 +1274,14 @@ export default function Page() {
     return followupMutation.variables?.id
   })
 
-  const queueEnabled = createMemo(() => {
+  const queueEnabled = (editID?: string) => {
     const id = params.id
     if (!id) return false
-    return settings.general.followup() === "queue" && busy(id) && !composer.blocked() && !isChildSession()
-  })
+    const mode = settings.general.followup()
+    const isEditing = !!editID
+    if (!isEditing && (mode === "haltingSteer" || mode === "waitingSteer") && queuedFollowups().length >= 1) return false
+    return (isEditing || busy(id)) && !composer.blocked() && !isChildSession()
+  }
 
   const followupText = (item: FollowupDraft) => {
     const text = item.prompt
@@ -1290,16 +1300,37 @@ export default function Page() {
     return `[${language.t("common.attachment")}]`
   }
 
-  const queueFollowup = (draft: FollowupDraft) => {
-    setFollowup("items", draft.sessionID, (items) => [
-      ...(items ?? []),
-      { id: Identifier.ascending("message"), ...draft },
-    ])
+  const queueFollowup = (draft: FollowupDraft, editID?: string) => {
+    const followupMode = settings.general.followup()
+    draft.followupMode = followupMode
+    if (followupMode === "haltingSteer") {
+      draft.isSteer = true
+    }
+    
+    setFollowup("items", draft.sessionID, (items) => {
+      const nextItems = items ? [...items] : []
+      if (editID) {
+        const index = nextItems.findIndex((i) => i.id === editID)
+        if (index !== -1) {
+          nextItems[index] = { ...nextItems[index], ...draft }
+          return nextItems
+        }
+      }
+      return [...nextItems, { id: Identifier.ascending("message"), ...draft }]
+    })
     setFollowup("failed", draft.sessionID, undefined)
     setFollowup("paused", draft.sessionID, undefined)
+
+    if (!editID && followupMode === "haltingSteer") {
+      // In steer mode, we request the agent to halt
+      // The actual queued message will be sent automatically when the agent becomes idle
+      void sdk().client.session.interrupt({ sessionID: draft.sessionID, type: followupMode })
+    } else if (!editID && followupMode === "waitingSteer") {
+      void sdk().client.session.interrupt({ sessionID: draft.sessionID, type: followupMode })
+    }
   }
 
-  const followupDock = createMemo(() => queuedFollowups().map((item) => ({ id: item.id, text: followupText(item) })))
+  const followupDock = createMemo(() => queuedFollowups().map((item) => ({ id: item.id, text: followupText(item), followupMode: item.followupMode })))
 
   const sendFollowup = (sessionID: string, id: string, opts?: { manual?: boolean }) => {
     if (sync().session.get(sessionID)?.parentID) return Promise.resolve()
@@ -1318,7 +1349,6 @@ export default function Page() {
     const item = queuedFollowups().find((entry) => entry.id === id)
     if (!item) return
 
-    setFollowup("items", sessionID, (items) => (items ?? []).filter((entry) => entry.id !== id))
     setFollowup("failed", sessionID, (value) => (value === id ? undefined : value))
     setFollowup("edit", sessionID, {
       id: item.id,
@@ -1327,6 +1357,21 @@ export default function Page() {
     })
   }
 
+  const cancelFollowup = (id: string) => {
+    const sessionID = params.id
+    if (!sessionID) return
+    if (followupBusy(sessionID)) return
+
+    setFollowup("items", sessionID, (items) => {
+      const nextItems = (items ?? []).filter((entry) => entry.id !== id)
+      if (nextItems.length === 0) {
+        void sdk().client.session.interrupt({ sessionID, type: "clear" })
+      }
+      return nextItems
+    })
+    setFollowup("failed", sessionID, (value) => (value === id ? undefined : value))
+  }
+
   const clearFollowupEdit = () => {
     const id = params.id
     if (!id) return
@@ -1434,12 +1479,18 @@ export default function Page() {
 
     const item = queuedFollowups()[0]
     if (!item) return
+    
+    // In steer and wrap mode, we send the message immediately so the backend can 
+    // pick it up cleanly in its next loop iteration without going idle.
+    if (!item.isSteer && item.followupMode !== "waitingSteer") {
+      if (busy(sessionID)) return
+    }
+
     if (followupBusy(sessionID)) return
     if (followup.failed[sessionID] === item.id) return
     if (followup.paused[sessionID]) return
     if (isChildSession()) return
     if (composer.blocked()) return
-    if (busy(sessionID)) return
 
     void sendFollowup(sessionID, item.id)
   })
@@ -1550,7 +1601,14 @@ export default function Page() {
                 void sendFollowup(params.id!, id, { manual: true })
               },
               onEdit: editFollowup,
+              onCancel: cancelFollowup,
               onEditLoaded: clearFollowupEdit,
+              onEditLastQueued: () => {
+                const items = queuedFollowups()
+                if (items.length === 0) return false
+                editFollowup(items[items.length - 1].id)
+                return true
+              },
             }
           : undefined
       }
diff --git a/packages/app/src/pages/session/composer/session-composer-region.tsx b/packages/app/src/pages/session/composer/session-composer-region.tsx
index eab0a1ee1556..24eb5505bc86 100644
--- a/packages/app/src/pages/session/composer/session-composer-region.tsx
+++ b/packages/app/src/pages/session/composer/session-composer-region.tsx
@@ -41,15 +41,17 @@ export function SessionComposerRegion(props: {
   onSubmit: () => void
   onResponseSubmit: () => void
   followup?: {
-    queue: () => boolean
+    queue: (editID?: string) => boolean
     items: { id: string; text: string }[]
     sending?: string
     edit?: { id: string; prompt: FollowupDraft["prompt"]; context: FollowupDraft["context"] }
-    onQueue: (draft: FollowupDraft) => void
+    onQueue: (draft: FollowupDraft, editID?: string) => void
     onAbort: () => void
     onSend: (id: string) => void
     onEdit: (id: string) => void
+    onCancel: (id: string) => void
     onEditLoaded: () => void
+    onEditLastQueued: () => boolean
   }
   revert?: {
     items: { id: string; text: string }[]
@@ -251,6 +253,18 @@ export function SessionComposerRegion(props: {
           )}
         </Show>
 
+        <Show when={props.followup?.items.length}>
+          <div class="relative z-10">
+            <SessionFollowupDock
+              items={props.followup!.items}
+              sending={props.followup!.sending}
+              onSend={props.followup!.onSend}
+              onEdit={props.followup!.onEdit}
+              onCancel={props.followup!.onCancel}
+            />
+          </div>
+        </Show>
+
         <Show when={showComposer()}>
           <Show
             when={prompt.ready()}
@@ -321,14 +335,6 @@ export function SessionComposerRegion(props: {
                 "margin-top": `${-lift()}px`,
               }}
             >
-              <Show when={props.followup?.items.length}>
-                <SessionFollowupDock
-                  items={props.followup!.items}
-                  sending={props.followup!.sending}
-                  onSend={props.followup!.onSend}
-                  onEdit={props.followup!.onEdit}
-                />
-              </Show>
               <Show
                 when={child()}
                 fallback={
@@ -341,6 +347,7 @@ export function SessionComposerRegion(props: {
                       onNewSessionWorktreeReset={props.onNewSessionWorktreeReset}
                       edit={props.followup?.edit}
                       onEditLoaded={props.followup?.onEditLoaded}
+                      onEditLastQueued={props.followup?.onEditLastQueued}
                       shouldQueue={props.followup?.queue}
                       onQueue={props.followup?.onQueue}
                       onAbort={props.followup?.onAbort}
diff --git a/packages/app/src/pages/session/composer/session-followup-dock.tsx b/packages/app/src/pages/session/composer/session-followup-dock.tsx
index 7d744f4e6cb8..780bd7da00bd 100644
--- a/packages/app/src/pages/session/composer/session-followup-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-followup-dock.tsx
@@ -6,10 +6,11 @@ import { IconButton } from "@opencode-ai/ui/icon-button"
 import { useLanguage } from "@/context/language"
 
 export function SessionFollowupDock(props: {
-  items: { id: string; text: string }[]
+  items: { id: string; text: string; followupMode?: string }[]
   sending?: string
   onSend: (id: string) => void
   onEdit: (id: string) => void
+  onCancel: (id: string) => void
 }) {
   const language = useLanguage()
   const [store, setStore] = createStore({
@@ -18,11 +19,18 @@ export function SessionFollowupDock(props: {
 
   const toggle = () => setStore("collapsed", (value) => !value)
   const total = createMemo(() => props.items.length)
-  const label = createMemo(() =>
-    language.t(total() === 1 ? "session.followupDock.summary.one" : "session.followupDock.summary.other", {
+  const label = createMemo(() => {
+    const mode = props.items[0]?.followupMode ?? "queue"
+    if (mode === "haltingSteer") {
+      return total() === 1 ? "Halting and steering" : `${total()} messages halting and steering`
+    }
+    if (mode === "waitingSteer") {
+      return total() === 1 ? "Waiting and steering" : `${total()} messages waiting and steering`
+    }
+    return language.t(total() === 1 ? "session.followupDock.summary.one" : "session.followupDock.summary.other", {
       count: total(),
-    }),
-  )
+    })
+  })
   const preview = createMemo(() => props.items[0]?.text ?? "")
 
   return (
@@ -99,6 +107,14 @@ export function SessionFollowupDock(props: {
                 >
                   {language.t("session.followupDock.edit")}
                 </Button>
+                <IconButton
+                  icon="close"
+                  size="small"
+                  variant="ghost"
+                  disabled={!!props.sending}
+                  onClick={() => props.onCancel(item.id)}
+                  aria-label="Cancel"
+                />
               </div>
             )}
           </For>
diff --git a/packages/app/src/pages/session/use-session-commands.tsx b/packages/app/src/pages/session/use-session-commands.tsx
index e3f0c517df1f..f49c1114a1bd 100644
--- a/packages/app/src/pages/session/use-session-commands.tsx
+++ b/packages/app/src/pages/session/use-session-commands.tsx
@@ -391,6 +391,17 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
       disabled: !params.id || visibleUserMessages().length === 0,
       onSelect: undo,
     }),
+    sessionCommand({
+      id: "session.toggle-queue-mode",
+      title: "Toggle Queue Mode",
+      keybind: "mod+shift+q",
+      onSelect: () => {
+        const current = settings.general.followup()
+        if (current === "haltingSteer") settings.general.setFollowup("waitingSteer")
+        else if (current === "waitingSteer") settings.general.setFollowup("queue")
+        else settings.general.setFollowup("haltingSteer")
+      },
+    }),
     sessionCommand({
       id: "session.redo",
       title: language.t("command.session.redo"),
diff --git a/packages/opencode/specs/provider-custom-loaders.md b/packages/opencode/specs/provider-custom-loaders.md
new file mode 100644
index 000000000000..60728ed0ad9f
--- /dev/null
+++ b/packages/opencode/specs/provider-custom-loaders.md
@@ -0,0 +1,71 @@
+# Provider Custom Loaders and Variable Substitution
+
+This document describes the custom loader and variable substitution patterns used in `@opencode/Provider`.
+
+## Custom Loaders
+
+Custom loaders allow providers to implement specialized logic for model initialization, autoloading, and model discovery. They are defined in `src/provider/provider.ts` within the `custom` function.
+
+### `CustomModelLoader`
+
+Used to intercept and customize how a language model instance is created from the SDK.
+
+```ts
+type CustomModelLoader = (
+  sdk: any, 
+  modelID: string, 
+  options?: Record<string, any>, 
+  model?: Model
+) => Promise<any>
+```
+
+**Example (Azure):**
+Azure uses a custom loader to select between chat and completion endpoints based on the `useCompletionUrls` option.
+
+### `CustomVarsLoader`
+
+Used for dynamic variable substitution in base URLs.
+
+```ts
+type CustomVarsLoader = (options: Record<string, any>) => Record<string, string>
+```
+
+**Example (Google Vertex):**
+Google Vertex uses this to inject `GOOGLE_VERTEX_LOCATION` and `GOOGLE_VERTEX_ENDPOINT` into the base URL.
+
+### `CustomDiscoverModels`
+
+Used for dynamic model discovery (e.g., fetching available models from a provider API).
+
+```ts
+type CustomDiscoverModels = () => Promise<Record<string, Model>>
+```
+
+**Example (GitLab):**
+GitLab uses this to discover models available on the Agent Platform.
+
+## Variable Substitution
+
+Variable substitution happens in `resolveSDK` before initializing the provider SDK. It supports two types of variables:
+
+1.  **Custom Loader Variables**: Provided by `CustomVarsLoader`.
+2.  **Environment Variables**: Injected via `${VARIABLE_NAME}` syntax.
+
+### Priority and Flow
+
+1.  The `baseURL` is determined from provider options or model API info.
+2.  If a `varsLoader` exists for the provider, it is executed.
+3.  Any `${KEY}` in the URL is replaced with values from the `varsLoader`.
+4.  Any remaining `${KEY}` matches are replaced with values from the environment (`env.all()`).
+5.  The final `baseURL` is assigned back to the provider options.
+
+## Built-in Custom Providers
+
+Several providers have specialized logic implemented in the `custom` function:
+
+- **Anthropic**: Adds beta headers for thinking and tool streaming.
+- **OpenAI/xAI/GitHub Copilot**: Use custom `getModel` to select specific response/chat endpoints.
+- **Azure**: Handles resource name resolution from environment or config.
+- **Amazon Bedrock**: Implements complex region-based model ID prefixing and credential chain logic.
+- **Cloudflare (Workers AI & AI Gateway)**: Handles account ID and API key resolution.
+- **Snowflake Cortex**: Implements custom fetch to handle specific API behaviors like `max_tokens` renaming and role correction in streams.
diff --git a/packages/opencode/src/effect/runner.ts b/packages/opencode/src/effect/runner.ts
index f21a61c97e57..c492aa50f2ef 100644
--- a/packages/opencode/src/effect/runner.ts
+++ b/packages/opencode/src/effect/runner.ts
@@ -129,6 +129,7 @@ export const make = <A, E = never>(
             return [awaitDone(run.done), { _tag: "ShellThenRun", shell: st.shell, run }] as const
           }
           case "Idle": {
+            yield* onBusy
             const done = yield* Deferred.make<A, E | Cancelled>()
             const run = yield* startRun(work, done)
             return [awaitDone(done), { _tag: "Running", run }] as const
diff --git a/packages/opencode/src/mcp/catalog.ts b/packages/opencode/src/mcp/catalog.ts
index 6d4b985dd2b8..e1d67cedb55b 100644
--- a/packages/opencode/src/mcp/catalog.ts
+++ b/packages/opencode/src/mcp/catalog.ts
@@ -67,8 +67,8 @@ export function convertTool(mcpTool: MCPToolDef, client: Client, timeout?: numbe
       )
       if (result.isError)
         throw new Error(
-          result.content
-            .flatMap((item) => (item.type === "text" ? [item.text] : []))
+          (result.content as Array<{ type: string; text?: string }>)
+            .flatMap((item) => (item.type === "text" && item.text ? [item.text] : []))
             .filter((text) => text.trim())
             .join("\n\n") || "MCP tool returned an error",
         )
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
index 959a303dc964..e891e45ed6dc 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
@@ -89,6 +89,7 @@ export const SessionPaths = {
   update: `${root}/:sessionID`,
   fork: `${root}/:sessionID/fork`,
   abort: `${root}/:sessionID/abort`,
+  interrupt: `${root}/:sessionID/interrupt`,
   share: `${root}/:sessionID/share`,
   init: `${root}/:sessionID/init`,
   summarize: `${root}/:sessionID/summarize`,
@@ -262,6 +263,21 @@ export const SessionApi = HttpApi.make("session")
             description: "Abort an active session and stop any ongoing AI processing or command execution.",
           }),
         ),
+        HttpApiEndpoint.post("interrupt", SessionPaths.interrupt, {
+          params: { sessionID: SessionID },
+          query: WorkspaceRoutingQuery,
+          payload: Schema.Struct({
+            type: Schema.Union([Schema.Literal("haltingSteer"), Schema.Literal("waitingSteer"), Schema.Literal("clear")]),
+          }),
+          success: described(Schema.Boolean, "Interrupted session"),
+          error: [HttpApiError.BadRequest, ApiNotFoundError],
+        }).annotateMerge(
+          OpenApi.annotations({
+            identifier: "session.interrupt",
+            summary: "Interrupt session",
+            description: "Interrupt a running session with a specific behavior type.",
+          }),
+        ),
         HttpApiEndpoint.post("init", SessionPaths.init, {
           params: { sessionID: SessionID },
           query: WorkspaceRoutingQuery,
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
index 2ebf0cf16f3b..677181a3d5a5 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
@@ -232,6 +232,19 @@ export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session",
       return true
     })
 
+    const interrupt = Effect.fn("SessionHttpApi.interrupt")(function* (ctx: {
+      params: { sessionID: SessionID }
+      payload: { type: "haltingSteer" | "waitingSteer" | "clear" }
+    }) {
+      yield* requireSession(ctx.params.sessionID)
+      if (ctx.payload.type === "clear") {
+        yield* runState.clearInterrupt(ctx.params.sessionID)
+      } else {
+        yield* runState.requestInterrupt(ctx.params.sessionID, ctx.payload.type)
+      }
+      return true
+    })
+
     const init = Effect.fn("SessionHttpApi.init")(function* (ctx: {
       params: { sessionID: SessionID }
       payload: typeof InitPayload.Type
@@ -422,6 +435,7 @@ export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session",
       .handle("update", update)
       .handleRaw("fork", forkRaw)
       .handle("abort", abort)
+      .handle("interrupt", interrupt)
       .handle("init", init)
       .handle("share", share)
       .handle("unshare", unshare)
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/tui.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/tui.ts
index dbd8e19de13e..b667e5f1dab1 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/tui.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/tui.ts
@@ -13,6 +13,7 @@ const commandAliases = {
   session_share: "session.share",
   session_interrupt: "session.interrupt",
   session_compact: "session.compact",
+  session_toggle_queue_mode: "session.toggle-queue-mode",
   messages_page_up: "session.page.up",
   messages_page_down: "session.page.down",
   messages_line_up: "session.line.up",
diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts
index 813fe49f325d..aaaab3ab3044 100644
--- a/packages/opencode/src/session/message-v2.ts
+++ b/packages/opencode/src/session/message-v2.ts
@@ -19,6 +19,23 @@ import {
   type ToolPart,
 } from "@opencode-ai/core/v1/session"
 
+export type {
+  APIError,
+  AbortedError,
+  Assistant,
+  AuthError,
+  CompactionPart,
+  ContextOverflowError,
+  Info,
+  OutputLengthError,
+  Part,
+  StructuredOutputError,
+  SubtaskPart,
+  User,
+  WithParts,
+  ToolPart,
+}
+
 import { NamedError } from "@opencode-ai/core/util/error"
 import { APICallError, convertToModelMessages, LoadAPIKeyError, type ModelMessage, type UIMessage } from "ai"
 import { Database } from "@opencode-ai/core/database/database"
diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts
index 2554315908ce..bfb5cf9c3f50 100644
--- a/packages/opencode/src/session/processor.ts
+++ b/packages/opencode/src/session/processor.ts
@@ -17,6 +17,7 @@ import { PartID } from "./schema"
 import type { SessionID } from "./schema"
 import { SessionRetry } from "./retry"
 import { SessionStatus } from "./status"
+import { SessionRunState } from "./run-state"
 import { SessionSummary } from "./summary"
 import type { Provider } from "@/provider/provider"
 import { Question } from "@/question"
@@ -102,6 +103,7 @@ export const layer = Layer.effect(
     const summary = yield* SessionSummary.Service
     const scope = yield* Scope.Scope
     const status = yield* SessionStatus.Service
+    const runState = yield* SessionRunState.Service
     const image = yield* Image.Service
     const events = yield* EventV2Bridge.Service
     const flags = yield* RuntimeFlags.Service
@@ -370,6 +372,7 @@ export const layer = Layer.effect(
 
       const handleEvent = Effect.fnUntraced(function* (value: StreamEvent) {
         switch (value.type) {
+
           case "reasoning-start":
             if (value.id in ctx.reasoningMap) return
             // TODO(v2): Temporary dual-write while migrating session messages to v2 events.
@@ -673,7 +676,11 @@ export const layer = Layer.effect(
           case "provider-error":
             throw new Error(value.message)
 
-          case "step-start":
+          case "step-start": {
+            const currentStatus = yield* status.get(ctx.sessionID)
+            if (currentStatus?.type !== "haltingSteer" && currentStatus?.type !== "waitingSteer") {
+              yield* status.set(ctx.sessionID, { type: "busy" })
+            }
             if (!ctx.snapshot) ctx.snapshot = yield* snapshot.track()
             if (!ctx.assistantMessage.summary) {
               // TODO(v2): Temporary dual-write while migrating session messages to v2 events.
@@ -689,6 +696,7 @@ export const layer = Layer.effect(
               type: "step-start",
             })
             return
+          }
 
           case "step-finish": {
             const completedSnapshot = yield* snapshot.track()
@@ -973,17 +981,34 @@ export const layer = Layer.effect(
             yield* status.set(ctx.sessionID, { type: "busy" })
             const stream = llm.stream(streamInput)
 
-            yield* stream.pipe(
-              Stream.tap((event) => handleEvent(event)),
-              Stream.takeUntil(() => ctx.needsCompaction),
-              Stream.runDrain,
+            yield* Effect.raceFirst(
+              stream.pipe(
+                Stream.tap((event) => handleEvent(event)),
+                Stream.takeUntil(() => ctx.needsCompaction),
+                Stream.runDrain,
+              ),
+              Effect.gen(function* () {
+                while (true) {
+                  yield* Effect.sleep("50 millis")
+                  if ((yield* runState.getInterrupt(ctx.sessionID)) === "haltingSteer") {
+                    return
+                  }
+                }
+              })
             )
           }).pipe(
             Effect.onInterrupt(() =>
               Effect.gen(function* () {
                 aborted = true
                 if (!ctx.assistantMessage.error) {
-                  yield* halt(new DOMException("Aborted", "AbortError"))
+                  // Wait, if it's a steer interrupt, we DO NOT want to set the error!
+                  // Setting the error will cause the loop to break.
+                  const currentInterrupt = yield* runState.getInterrupt(ctx.sessionID)
+                  if (currentInterrupt === "haltingSteer") {
+                    // Do nothing, just let it cleanly abort
+                  } else {
+                    yield* halt(new DOMException("Aborted", "AbortError"))
+                  }
                 }
               }),
             ),
@@ -1057,6 +1082,7 @@ export const defaultLayer = Layer.suspend(() =>
     Layer.provide(Plugin.defaultLayer),
     Layer.provide(SessionSummary.defaultLayer),
     Layer.provide(SessionStatus.defaultLayer),
+    Layer.provide(SessionRunState.defaultLayer),
     Layer.provide(Image.defaultLayer),
     Layer.provide(Config.defaultLayer),
     Layer.provide(RuntimeFlags.defaultLayer),
@@ -1075,6 +1101,7 @@ export const node = LayerNode.make(layer, [
   Plugin.node,
   SessionSummary.node,
   SessionStatus.node,
+  SessionRunState.node,
   Image.node,
   EventV2Bridge.node,
   RuntimeFlags.node,
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index dad796c998ad..6d6ab8acac9d 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -1120,7 +1120,7 @@ export const layer = Layer.effect(
       }
 
       if (input.noReply === true) return message
-      return yield* loop({ sessionID: input.sessionID })
+      return yield* loop({ sessionID: input.sessionID, isSteer: input.isSteer, followupMode: input.followupMode })
     })
 
     const lastAssistant = Effect.fnUntraced(function* (sessionID: SessionID) {
@@ -1139,7 +1139,10 @@ export const layer = Layer.effect(
         const session = yield* sessions.get(sessionID).pipe(Effect.orDie)
 
         while (true) {
-          yield* status.set(sessionID, { type: "busy" })
+          const currentStatus = yield* status.get(sessionID)
+          if (currentStatus?.type !== "haltingSteer" && currentStatus?.type !== "waitingSteer") {
+            yield* status.set(sessionID, { type: "busy" })
+          }
           yield* Effect.logInfo("loop", { "session.id": sessionID, step })
 
           let msgs = yield* MessageV2.filterCompactedEffect(sessionID).pipe(
@@ -1362,7 +1365,20 @@ export const layer = Layer.effect(
               }
             }
 
+            const interrupt = yield* state.getInterrupt(sessionID)
+            if (interrupt === "waitingSteer") {
+              yield* state.clearInterrupt(sessionID)
+              yield* status.set(sessionID, { type: "busy" })
+              return "continue" as const
+            }
+            if (interrupt === "haltingSteer") {
+              yield* state.clearInterrupt(sessionID)
+              yield* status.set(sessionID, { type: "busy" })
+              return "continue" as const
+            }
+
             if (result === "stop") return "break" as const
+
             if (result === "compact") {
               yield* compaction.create({
                 sessionID,
@@ -1389,14 +1405,15 @@ export const layer = Layer.effect(
     const loop: (input: LoopInput) => Effect.Effect<SessionV1.WithParts> = Effect.fn("SessionPrompt.loop")(function* (
       input: LoopInput,
     ) {
-      return yield* state.ensureRunning(input.sessionID, lastAssistant(input.sessionID), runLoop(input.sessionID))
+      const type = input.followupMode === "haltingSteer" || input.followupMode === "waitingSteer" ? input.followupMode : "busy"
+      return yield* state.ensureRunning(input.sessionID, lastAssistant(input.sessionID), runLoop(input.sessionID), { type })
     })
 
     const shell: (input: ShellInput) => Effect.Effect<SessionV1.WithParts, Session.BusyError> = Effect.fn(
       "SessionPrompt.shell",
     )(function* (input: ShellInput) {
       const ready = yield* Latch.make()
-      return yield* state.startShell(input.sessionID, lastAssistant(input.sessionID), shellImpl(input, ready), ready)
+      return yield* state.startShell(input.sessionID, lastAssistant(input.sessionID), shellImpl(input, ready), undefined, ready)
     })
 
     const command = Effect.fn("SessionPrompt.command")(function* (input: CommandInput) {
@@ -1582,6 +1599,8 @@ export const PromptInput = Schema.Struct({
   model: Schema.optional(ModelRef),
   agent: Schema.optional(Schema.String),
   noReply: Schema.optional(Schema.Boolean),
+  isSteer: Schema.optional(Schema.Boolean),
+  followupMode: Schema.optional(Schema.Union([Schema.Literal("haltingSteer"), Schema.Literal("waitingSteer"), Schema.Literal("queue")])),
   tools: Schema.optional(Schema.Record(Schema.String, Schema.Boolean)).annotate({
     description:
       "@deprecated tools and permissions have been merged, you can set permissions on the session itself now",
@@ -1602,6 +1621,8 @@ export type PromptInput = Schema.Schema.Type<typeof PromptInput>
 
 export class LoopInput extends Schema.Class<LoopInput>("SessionPrompt.LoopInput")({
   sessionID: SessionID,
+  isSteer: Schema.optional(Schema.Boolean),
+  followupMode: Schema.optional(Schema.Union([Schema.Literal("haltingSteer"), Schema.Literal("waitingSteer"), Schema.Literal("queue")])),
 }) {}
 
 export const ShellInput = Schema.Struct({
diff --git a/packages/opencode/src/session/revert.ts b/packages/opencode/src/session/revert.ts
index 04631e4ec00b..9d4d02a32f80 100644
--- a/packages/opencode/src/session/revert.ts
+++ b/packages/opencode/src/session/revert.ts
@@ -36,9 +36,29 @@ export const layer = Layer.effect(
     const state = yield* SessionRunState.Service
 
     const revert = Effect.fn("SessionRevert.revert")(function* (input: RevertInput) {
-      yield* state.assertNotBusy(input.sessionID)
       const all = yield* sessions.messages({ sessionID: input.sessionID }).pipe(Effect.orDie)
-      let lastUser: SessionV1.User | undefined
+      
+      const busyError = yield* state.assertNotBusy(input.sessionID).pipe(
+        Effect.match({
+          onFailure: (e) => e,
+          onSuccess: () => undefined
+        })
+      )
+
+      if (busyError) {
+        // Find if the requested message is safe to revert (it's a queued user message)
+        const targetMsg = all.find(m => m.info.id === input.messageID)
+        if (!targetMsg || targetMsg.info.role !== "user") {
+          yield* state.assertNotBusy(input.sessionID) // will fail with the error
+        }
+        // Check if any assistant message has a parentID >= this message
+        const hasStarted = all.some(m => m.info.role === "assistant" && m.info.parentID >= input.messageID)
+        if (hasStarted) {
+          yield* state.assertNotBusy(input.sessionID) // will fail with the error
+        }
+      }
+
+      let lastUser: MessageV2.User | undefined
       const session = yield* sessions.get(input.sessionID).pipe(Effect.orDie)
 
       let rev: Session.Info["revert"]
diff --git a/packages/opencode/src/session/run-state.ts b/packages/opencode/src/session/run-state.ts
index 9c8519161040..d29dcc831b54 100644
--- a/packages/opencode/src/session/run-state.ts
+++ b/packages/opencode/src/session/run-state.ts
@@ -7,21 +7,27 @@ import { Effect, Latch, Layer, Scope, Context } from "effect"
 import { Session } from "./session"
 import { SessionID } from "./schema"
 import { SessionStatus } from "./status"
+import { MessageV2 } from "./message-v2"
 
 export interface Interface {
   readonly assertNotBusy: (sessionID: SessionID) => Effect.Effect<void, Session.BusyError>
   readonly cancel: (sessionID: SessionID) => Effect.Effect<void>
+  readonly requestInterrupt: (sessionID: SessionID, type: "haltingSteer" | "waitingSteer") => Effect.Effect<void>
+  readonly clearInterrupt: (sessionID: SessionID) => Effect.Effect<void>
+  readonly getInterrupt: (sessionID: SessionID) => Effect.Effect<"haltingSteer" | "waitingSteer" | undefined>
   readonly ensureRunning: (
     sessionID: SessionID,
-    onInterrupt: Effect.Effect<SessionV1.WithParts>,
-    work: Effect.Effect<SessionV1.WithParts>,
-  ) => Effect.Effect<SessionV1.WithParts>
+    onInterrupt: Effect.Effect<MessageV2.WithParts>,
+    work: Effect.Effect<MessageV2.WithParts>,
+    initialStatus?: SessionStatus.Info
+  ) => Effect.Effect<MessageV2.WithParts>
   readonly startShell: (
     sessionID: SessionID,
-    onInterrupt: Effect.Effect<SessionV1.WithParts>,
-    work: Effect.Effect<SessionV1.WithParts>,
+    onInterrupt: Effect.Effect<MessageV2.WithParts>,
+    work: Effect.Effect<MessageV2.WithParts>,
+    initialStatus?: SessionStatus.Info,
     ready?: Latch.Latch,
-  ) => Effect.Effect<SessionV1.WithParts, Session.BusyError>
+  ) => Effect.Effect<MessageV2.WithParts, Session.BusyError>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/SessionRunState") {}
@@ -35,7 +41,8 @@ export const layer = Layer.effect(
     const state = yield* InstanceState.make(
       Effect.fn("SessionRunState.state")(function* () {
         const scope = yield* Scope.Scope
-        const runners = new Map<SessionID, Runner.Runner<SessionV1.WithParts>>()
+        const runners = new Map<SessionID, Runner.Runner<MessageV2.WithParts>>()
+        const interrupts = new Map<SessionID, "haltingSteer" | "waitingSteer">()
         yield* Effect.addFinalizer(
           Effect.fnUntraced(function* () {
             yield* Effect.forEach(runners.values(), (runner) => runner.cancel, {
@@ -43,25 +50,27 @@ export const layer = Layer.effect(
               discard: true,
             })
             runners.clear()
+            interrupts.clear()
           }),
         )
-        return { runners, scope }
+        return { runners, interrupts, scope }
       }),
     )
 
     const runner = Effect.fn("SessionRunState.runner")(function* (
       sessionID: SessionID,
-      onInterrupt: Effect.Effect<SessionV1.WithParts>,
+      onInterrupt: Effect.Effect<MessageV2.WithParts>,
+      initialStatus: SessionStatus.Info = { type: "busy" }
     ) {
       const data = yield* InstanceState.get(state)
       const existing = data.runners.get(sessionID)
       if (existing) return existing
-      const next = Runner.make<SessionV1.WithParts>(data.scope, {
+      const next = Runner.make<MessageV2.WithParts>(data.scope, {
         onIdle: Effect.gen(function* () {
           data.runners.delete(sessionID)
           yield* status.set(sessionID, { type: "idle" })
         }),
-        onBusy: status.set(sessionID, { type: "busy" }),
+        onBusy: status.set(sessionID, initialStatus),
         onInterrupt,
       })
       data.runners.set(sessionID, next)
@@ -85,26 +94,50 @@ export const layer = Layer.effect(
       yield* existing.cancel
     })
 
+    const requestInterrupt = Effect.fn("SessionRunState.requestInterrupt")(function* (
+      sessionID: SessionID,
+      type: "haltingSteer" | "waitingSteer",
+    ) {
+      const data = yield* InstanceState.get(state)
+      data.interrupts.set(sessionID, type)
+      yield* status.set(sessionID, { type })
+      // We no longer call cancel(sessionID) for "haltingSteer" here.
+      // The stream processor will detect the "haltingSteer" interrupt, abort the stream,
+      // and let the existing runner gracefully read the new message on the next loop iteration.
+    })
+
+    const clearInterrupt = Effect.fn("SessionRunState.clearInterrupt")(function* (sessionID: SessionID) {
+      const data = yield* InstanceState.get(state)
+      data.interrupts.delete(sessionID)
+    })
+
+    const getInterrupt = Effect.fn("SessionRunState.getInterrupt")(function* (sessionID: SessionID) {
+      const data = yield* InstanceState.get(state)
+      return data.interrupts.get(sessionID)
+    })
+
     const ensureRunning = Effect.fn("SessionRunState.ensureRunning")(function* (
       sessionID: SessionID,
-      onInterrupt: Effect.Effect<SessionV1.WithParts>,
-      work: Effect.Effect<SessionV1.WithParts>,
+      onInterrupt: Effect.Effect<MessageV2.WithParts>,
+      work: Effect.Effect<MessageV2.WithParts>,
+      initialStatus?: SessionStatus.Info
     ) {
-      return yield* (yield* runner(sessionID, onInterrupt)).ensureRunning(work)
+      return yield* (yield* runner(sessionID, onInterrupt, initialStatus)).ensureRunning(work)
     })
 
     const startShell = Effect.fn("SessionRunState.startShell")(function* (
       sessionID: SessionID,
-      onInterrupt: Effect.Effect<SessionV1.WithParts>,
-      work: Effect.Effect<SessionV1.WithParts>,
+      onInterrupt: Effect.Effect<MessageV2.WithParts>,
+      work: Effect.Effect<MessageV2.WithParts>,
+      initialStatus?: SessionStatus.Info,
       ready?: Latch.Latch,
     ) {
-      return yield* (yield* runner(sessionID, onInterrupt))
+      return yield* (yield* runner(sessionID, onInterrupt, initialStatus))
         .startShell(work, ready)
         .pipe(Effect.catchTag("RunnerBusy", () => Effect.fail(busyError(sessionID))))
     })
 
-    return Service.of({ assertNotBusy, cancel, ensureRunning, startShell })
+    return Service.of({ assertNotBusy, cancel, requestInterrupt, clearInterrupt, getInterrupt, ensureRunning, startShell })
   }),
 )
 
diff --git a/packages/opencode/src/session/status.ts b/packages/opencode/src/session/status.ts
index 68758ea6a3a6..1cffff8504fb 100644
--- a/packages/opencode/src/session/status.ts
+++ b/packages/opencode/src/session/status.ts
@@ -29,7 +29,14 @@ export const Info = Schema.Union([
   Schema.Struct({
     type: Schema.Literal("busy"),
   }),
-]).annotate({ identifier: "SessionStatus" })
+  Schema.Struct({
+    type: Schema.Literal("haltingSteer"),
+  }),
+  Schema.Struct({
+    type: Schema.Literal("waitingSteer"),
+  }),
+])
+  .annotate({ identifier: "SessionStatus" })
 export type Info = Schema.Schema.Type<typeof Info>
 
 export const Event = {
diff --git a/packages/opencode/test/session/compaction.test.ts b/packages/opencode/test/session/compaction.test.ts
index 63276bfe197d..ee324b601056 100644
--- a/packages/opencode/test/session/compaction.test.ts
+++ b/packages/opencode/test/session/compaction.test.ts
@@ -4,7 +4,7 @@ import { SessionV1 } from "@opencode-ai/core/v1/session"
 import { Database } from "@opencode-ai/core/database/database"
 import { EventV2Bridge } from "@/event-v2-bridge"
 import { APICallError } from "ai"
-import { Cause, Deferred, Effect, Exit, Fiber, Layer, Schema } from "effect"
+import { Cause, Deferred, Effect, Exit, Fiber, Layer, ManagedRuntime, Schema } from "effect"
 import * as Stream from "effect/Stream"
 import { Config } from "@/config/config"
 import { Image } from "@/image/image"
@@ -19,6 +19,7 @@ import { Session as SessionNs } from "@/session/session"
 import { MessageV2 } from "../../src/session/message-v2"
 import { MessageID, PartID, SessionID } from "../../src/session/schema"
 import { SessionStatus } from "../../src/session/status"
+import { SessionRunState } from "../../src/session/run-state"
 import { SessionSummary } from "../../src/session/summary"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
@@ -242,6 +243,7 @@ const env = Layer.mergeAll(
   Database.defaultLayer,
   EventV2Bridge.defaultLayer,
   CrossSpawnSpawner.defaultLayer,
+  SessionRunState.defaultLayer,
   SessionCompaction.layer.pipe(Layer.provide(SessionNs.defaultLayer), Layer.provideMerge(deps)),
 )
 
@@ -252,6 +254,7 @@ const compactionEnv = Layer.mergeAll(
   Database.defaultLayer,
   EventV2Bridge.defaultLayer,
   CrossSpawnSpawner.defaultLayer,
+  SessionRunState.defaultLayer,
 )
 const itCompaction = testEffect(compactionEnv)
 
@@ -330,6 +333,8 @@ function llm() {
   }
 }
 
+
+
 function reply(
   text: string,
   capture?: (input: LLM.StreamInput) => void,
diff --git a/packages/opencode/test/session/processor-effect.test.ts b/packages/opencode/test/session/processor-effect.test.ts
index c8f40d0de1f9..49b19d591a22 100644
--- a/packages/opencode/test/session/processor-effect.test.ts
+++ b/packages/opencode/test/session/processor-effect.test.ts
@@ -16,6 +16,7 @@ import { MessageV2 } from "../../src/session/message-v2"
 import { SessionProcessor } from "../../src/session/processor"
 import { MessageID, PartID, SessionID } from "../../src/session/schema"
 import { SessionStatus } from "../../src/session/status"
+import { SessionRunState } from "../../src/session/run-state"
 import { SessionSummary } from "../../src/session/summary"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { provideTmpdirInstance, provideTmpdirServer } from "../fixture/fixture"
@@ -174,6 +175,7 @@ const root = LayerNode.group([
   Database.node,
   EventV2Bridge.node,
   SessionStatus.node,
+  SessionRunState.node,
   CrossSpawnSpawner.node,
 ])
 const replacements = [
@@ -1074,3 +1076,96 @@ itFragmentFailure.live("session.processor effect tests flush partial v2 fragment
     { config: cfg },
   ),
 )
+
+it.live("session.processor effect tests allow graceful steer interrupt", () =>
+  provideTmpdirServer(
+    ({ dir, llm }) =>
+      Effect.gen(function* () {
+        const { processors, session, provider } = yield* boot()
+        const sts = yield* SessionStatus.Service
+        const runState = yield* SessionRunState.Service
+
+        // Provide partial text then hang to wait for interrupt
+        yield* llm.push(
+          raw({
+            head: [
+              {
+                id: "chatcmpl-test",
+                object: "chat.completion.chunk",
+                choices: [{ delta: { role: "assistant" } }],
+              },
+              {
+                id: "chatcmpl-test",
+                object: "chat.completion.chunk",
+                choices: [{ delta: { content: "part1 " } }],
+              },
+            ],
+            tail: [],
+            hang: true,
+          }),
+        )
+
+        const chat = yield* session.create({})
+        const parent = yield* user(chat.id, "steer")
+        const msg = yield* assistant(chat.id, parent.id, path.resolve(dir))
+        const mdl = yield* provider.getModel(ref.providerID, ref.modelID)
+        const handle = yield* processors.create({
+          assistantMessage: msg,
+          sessionID: chat.id,
+          model: mdl,
+        })
+
+        const run = yield* handle
+          .process({
+            user: {
+              id: parent.id,
+              sessionID: chat.id,
+              role: "user",
+              time: parent.time,
+              agent: parent.agent,
+              model: { providerID: ref.providerID, modelID: ref.modelID },
+            } satisfies MessageV2.User,
+            sessionID: chat.id,
+            model: mdl,
+            agent: agent(),
+            system: [],
+            messages: [{ role: "user", content: "steer" }],
+            tools: {},
+          })
+          .pipe(Effect.forkChild)
+
+        // Wait a bit to ensure it has received the start of the stream
+        yield* llm.wait(1)
+        yield* Effect.sleep("250 millis")
+        
+        // Signal steer interrupt
+        yield* runState.requestInterrupt(chat.id, "haltingSteer")
+
+        // Wait for the steer to be detected
+        yield* Effect.sleep("200 millis")
+
+        // Wait for the run to finish gracefully via stream interruption
+        const exit = yield* Fiber.await(run)
+        const stored = yield* MessageV2.get({ sessionID: chat.id, messageID: msg.id })
+        const state = yield* sts.get(chat.id)
+
+        // It should complete successfully because the stream halted gracefully
+        if (Exit.isFailure(exit)) {
+          expect(Cause.hasInterruptsOnly(exit.cause)).toBe(true)
+        }
+        
+        // No error should be written because it's a steer interrupt
+        expect(handle.message.error).toBeUndefined()
+        expect(stored.info.role).toBe("assistant")
+        if (stored.info.role === "assistant") {
+          expect(stored.info.error).toBeUndefined()
+        }
+        
+        // State should be busy, because loop continues on graceful exit!
+        // The loop sets to busy unless current status is haltingSteer or waitingSteer.
+        // Wait, the status should STILL be haltingSteer!
+        expect(state).toMatchObject({ type: "haltingSteer" })
+      }),
+    { git: true, config: (url) => providerCfg(url) },
+  ),
+)
diff --git a/packages/opencode/test/session/prompt.test.ts b/packages/opencode/test/session/prompt.test.ts
index 5cd97f78e88a..22e02ee0b393 100644
--- a/packages/opencode/test/session/prompt.test.ts
+++ b/packages/opencode/test/session/prompt.test.ts
@@ -182,6 +182,7 @@ function makePrompt(input?: { processor?: "blocking" }) {
     status,
     Database.defaultLayer,
     EventV2Bridge.defaultLayer,
+    SessionRunState.defaultLayer,
   ).pipe(Layer.provideMerge(infra))
   const question = Question.layer.pipe(Layer.provideMerge(deps))
   const todo = Todo.layer.pipe(Layer.provideMerge(deps))
@@ -1353,6 +1354,124 @@ it.instance(
   3_000,
 )
 
+it.instance(
+  "continues loop on haltingSteer interrupt and runs the steer prompt",
+  () =>
+    Effect.gen(function* () {
+      const { llm } = yield* useServerConfig(providerCfg)
+      const gate = yield* Deferred.make<void>()
+      const prompt = yield* SessionPrompt.Service
+      const sessions = yield* Session.Service
+      const runState = yield* SessionRunState.Service
+      const chat = yield* sessions.create({ title: "Steer Halt Test" })
+
+      yield* llm.hold("first reply", deferredAsPromise(gate))
+      yield* llm.text("second reply")
+
+      const first = yield* prompt
+        .prompt({
+          sessionID: chat.id,
+          agent: "build",
+          model: ref,
+          parts: [{ type: "text", text: "first prompt" }],
+        })
+        .pipe(Effect.forkChild)
+
+      yield* llm.wait(1)
+
+      yield* runState.requestInterrupt(chat.id, "haltingSteer")
+
+      const steerId = MessageID.ascending()
+      const second = yield* prompt
+        .prompt({
+          sessionID: chat.id,
+          messageID: steerId,
+          agent: "build",
+          model: ref,
+          isSteer: true,
+          followupMode: "haltingSteer",
+          parts: [{ type: "text", text: "steer prompt" }],
+        })
+        .pipe(Effect.forkChild)
+
+      yield* Deferred.succeed(gate, void 0)
+
+      const [ea, eb] = yield* Effect.all([Fiber.await(first), Fiber.await(second)])
+      expect(Exit.isSuccess(ea)).toBe(true)
+      expect(Exit.isSuccess(eb)).toBe(true)
+
+      const msgs = yield* sessions.messages({ sessionID: chat.id })
+      const assistants = msgs.filter((msg) => msg.info.role === "assistant")
+      expect(assistants).toHaveLength(2)
+
+      const last = assistants.at(-1)
+      if (!last || last.info.role !== "assistant") throw new Error("expected second assistant")
+      expect(last.info.parentID).toBe(steerId)
+      expect(last.parts.some((part) => part.type === "text" && part.text === "second reply")).toBe(true)
+    }),
+  3_000,
+)
+
+it.instance(
+  "continues loop on waitingSteer interrupt and runs the steer prompt",
+  () =>
+    Effect.gen(function* () {
+      const { llm } = yield* useServerConfig(providerCfg)
+      const gate = yield* Deferred.make<void>()
+      const prompt = yield* SessionPrompt.Service
+      const sessions = yield* Session.Service
+      const runState = yield* SessionRunState.Service
+      const chat = yield* sessions.create({ title: "Steer Wait Test" })
+
+      yield* llm.hold("first reply", deferredAsPromise(gate))
+      yield* llm.text("second reply")
+
+      const first = yield* prompt
+        .prompt({
+          sessionID: chat.id,
+          agent: "build",
+          model: ref,
+          parts: [{ type: "text", text: "first prompt" }],
+        })
+        .pipe(Effect.forkChild)
+
+      yield* llm.wait(1)
+
+      yield* runState.requestInterrupt(chat.id, "waitingSteer")
+
+      const steerId = MessageID.ascending()
+      const second = yield* prompt
+        .prompt({
+          sessionID: chat.id,
+          messageID: steerId,
+          agent: "build",
+          model: ref,
+          isSteer: true,
+          followupMode: "waitingSteer",
+          parts: [{ type: "text", text: "steer prompt" }],
+        })
+        .pipe(Effect.forkChild)
+
+      yield* Deferred.succeed(gate, void 0)
+
+      const [ea, eb] = yield* Effect.all([Fiber.await(first), Fiber.await(second)])
+      expect(Exit.isSuccess(ea)).toBe(true)
+      expect(Exit.isSuccess(eb)).toBe(true)
+
+      const msgs = yield* sessions.messages({ sessionID: chat.id })
+      const assistants = msgs.filter((msg) => msg.info.role === "assistant")
+      expect(assistants).toHaveLength(2)
+
+      const last = assistants.at(-1)
+      if (!last || last.info.role !== "assistant") throw new Error("expected second assistant")
+      expect(last.info.parentID).toBe(steerId)
+      expect(last.parts.some((part) => part.type === "text" && part.text === "second reply")).toBe(true)
+    }),
+  3_000,
+)
+
+
+
 it.instance(
   "assertNotBusy fails with BusyError when loop running",
   () =>
diff --git a/packages/opencode/test/session/snapshot-tool-race.test.ts b/packages/opencode/test/session/snapshot-tool-race.test.ts
index 8a3701e12518..6a67ee03bbd9 100644
--- a/packages/opencode/test/session/snapshot-tool-race.test.ts
+++ b/packages/opencode/test/session/snapshot-tool-race.test.ts
@@ -33,46 +33,46 @@ import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { RuntimeFlags } from "@/effect/runtime-flags"
 
 const mcp = Layer.succeed(
-  MCP.Service,
-  MCP.Service.of({
-    status: () => Effect.succeed({}),
-    clients: () => Effect.succeed({}),
-    tools: () => Effect.succeed({}),
-    prompts: () => Effect.succeed({}),
-    resources: () => Effect.succeed({}),
-    add: () => Effect.succeed({ status: { status: "disabled" as const } }),
-    connect: () => Effect.void,
-    disconnect: () => Effect.void,
-    getPrompt: () => Effect.succeed(undefined),
-    readResource: () => Effect.succeed(undefined),
-    startAuth: () => Effect.die("unexpected MCP auth"),
-    authenticate: () => Effect.die("unexpected MCP auth"),
-    finishAuth: () => Effect.die("unexpected MCP auth"),
-    removeAuth: () => Effect.void,
-    supportsOAuth: () => Effect.succeed(false),
-    hasStoredTokens: () => Effect.succeed(false),
-    getAuthStatus: () => Effect.succeed("not_authenticated" as const),
-  }),
+    MCP.Service,
+    MCP.Service.of({
+      status: () => Effect.succeed({}),
+      clients: () => Effect.succeed({}),
+      tools: () => Effect.succeed({}),
+      prompts: () => Effect.succeed({}),
+      resources: () => Effect.succeed({}),
+      add: () => Effect.succeed({status: {status: 'disabled' as const}}),
+      connect: () => Effect.void,
+      disconnect: () => Effect.void,
+      getPrompt: () => Effect.succeed(undefined),
+      readResource: () => Effect.succeed(undefined),
+      startAuth: () => Effect.die('unexpected MCP auth'),
+      authenticate: () => Effect.die('unexpected MCP auth'),
+      finishAuth: () => Effect.die('unexpected MCP auth'),
+      removeAuth: () => Effect.void,
+      supportsOAuth: () => Effect.succeed(false),
+      hasStoredTokens: () => Effect.succeed(false),
+      getAuthStatus: () => Effect.succeed('not_authenticated' as const),
+    }),
 )
 
 const lsp = Layer.succeed(
-  LSP.Service,
-  LSP.Service.of({
-    init: () => Effect.void,
-    status: () => Effect.succeed([]),
-    hasClients: () => Effect.succeed(false),
-    touchFile: () => Effect.void,
-    diagnostics: () => Effect.succeed({}),
-    hover: () => Effect.succeed(undefined),
-    definition: () => Effect.succeed([]),
-    references: () => Effect.succeed([]),
-    implementation: () => Effect.succeed([]),
-    documentSymbol: () => Effect.succeed([]),
-    workspaceSymbol: () => Effect.succeed([]),
-    prepareCallHierarchy: () => Effect.succeed([]),
-    incomingCalls: () => Effect.succeed([]),
-    outgoingCalls: () => Effect.succeed([]),
-  }),
+    LSP.Service,
+    LSP.Service.of({
+      init: () => Effect.void,
+      status: () => Effect.succeed([]),
+      hasClients: () => Effect.succeed(false),
+      touchFile: () => Effect.void,
+      diagnostics: () => Effect.succeed({}),
+      hover: () => Effect.succeed(undefined),
+      definition: () => Effect.succeed([]),
+      references: () => Effect.succeed([]),
+      implementation: () => Effect.succeed([]),
+      documentSymbol: () => Effect.succeed([]),
+      workspaceSymbol: () => Effect.succeed([]),
+      prepareCallHierarchy: () => Effect.succeed([]),
+      incomingCalls: () => Effect.succeed([]),
+      outgoingCalls: () => Effect.succeed([]),
+    }),
 )
 
 const root = LayerNode.group([
@@ -97,94 +97,102 @@ const it = testEffect(
 const providerCfg = (url: string) => ({
   provider: {
     test: {
-      name: "Test",
-      id: "test",
+      name: 'Test',
+      id: 'test',
       env: [],
-      npm: "@ai-sdk/openai-compatible",
+      npm: '@ai-sdk/openai-compatible',
       models: {
-        "test-model": {
-          id: "test-model",
-          name: "Test Model",
+        'test-model': {
+          id: 'test-model',
+          name: 'Test Model',
           attachment: false,
           reasoning: false,
           temperature: false,
           tool_call: true,
-          release_date: "2025-01-01",
-          limit: { context: 100000, output: 10000 },
-          cost: { input: 0, output: 0 },
+          release_date: '2025-01-01',
+          limit: {context: 100000, output: 10000},
+          cost: {input: 0, output: 0},
           options: {},
         },
       },
       options: {
-        apiKey: "test-key",
+        apiKey: 'test-key',
         baseURL: url,
       },
     },
   },
 })
 
-it.live("tool execution produces non-empty session diff (snapshot race)", () =>
-  provideTmpdirServer(
-    Effect.fnUntraced(function* ({ dir, llm }) {
-      const prompt = yield* SessionPrompt.Service
-      const sessions = yield* Session.Service
-      const summary = yield* SessionSummary.Service
+it.live(
+    'tool execution produces non-empty session diff (snapshot race)',
+    () => provideTmpdirServer(
+        Effect.fnUntraced(function*({dir, llm}) {
+          const prompt = yield* SessionPrompt.Service
+          const sessions = yield* Session.Service
+          const summary = yield* SessionSummary.Service
 
-      const session = yield* sessions.create({
-        title: "snapshot race test",
-        permission: [{ permission: "*", pattern: "*", action: "allow" }],
-      })
+          const session = yield* sessions.create({
+            title: 'snapshot race test',
+            permission: [{permission: '*', pattern: '*', action: 'allow'}],
+          })
 
-      // Use bash tool (always registered) to create a file
-      const command = `echo 'snapshot race test content' > ${path.join(dir, "race-test.txt")}`
-      yield* llm.toolMatch((hit) => JSON.stringify(hit.body).includes("create the file"), "bash", {
-        command,
-        description: "create test file",
-      })
-      yield* llm.textMatch((hit) => JSON.stringify(hit.body).includes("bash"), "done")
+          // Use bash tool (always registered) to create a file
+          const command = `echo 'snapshot race test content' > ${
+              path.join(dir, 'race-test.txt')}`
+          yield*
+              llm.toolMatch(
+                  (hit) => JSON.stringify(hit.body).includes('create the file'),
+                  'bash', {
+                    command,
+                    description: 'create test file',
+                  })
+          yield*
+              llm.textMatch(
+                  (hit) => JSON.stringify(hit.body).includes('bash'), 'done')
 
-      // Seed user message
-      yield* prompt.prompt({
-        sessionID: session.id,
-        agent: "build",
-        noReply: true,
-        parts: [{ type: "text", text: "create the file" }],
-      })
+          // Seed user message
+          yield* prompt.prompt({
+            sessionID: session.id,
+            agent: 'build',
+            noReply: true,
+            parts: [{type: 'text', text: 'create the file'}],
+          })
 
-      // Run the agent loop
-      const result = yield* prompt.loop({ sessionID: session.id })
-      expect(result.info.role).toBe("assistant")
+          // Run the agent loop
+          const result = yield* prompt.loop({sessionID: session.id})
+          expect(result.info.role).toBe('assistant')
 
-      // Verify the file was created
-      const filePath = path.join(dir, "race-test.txt")
-      const fileExists = yield* Effect.promise(() =>
-        fs
-          .access(filePath)
-          .then(() => true)
-          .catch(() => false),
-      )
-      expect(fileExists).toBe(true)
+          // Verify the file was created
+          const filePath = path.join(dir, 'race-test.txt')
+          const fileExists = yield*
+              Effect.promise(
+                  () => fs.access(filePath).then(() => true).catch(() => false),
+              )
+          expect(fileExists).toBe(true)
 
-      // Verify the tool call completed (in the first assistant message)
-      const allMsgs = yield* MessageV2.filterCompactedEffect(session.id)
-      const user = allMsgs.find(
-        (msg): msg is SessionV1.WithParts & { info: SessionV1.User } => msg.info.role === "user",
-      )
-      const tool = allMsgs
-        .flatMap((m) => m.parts)
-        .find((p): p is SessionV1.ToolPart => p.type === "tool" && p.tool === "bash")
-      expect(tool?.state.status).toBe("completed")
-      if (!user) throw new Error("Expected user message")
+          // Verify the tool call completed (in the first assistant message)
+          const allMsgs = yield* MessageV2.filterCompactedEffect(session.id)
+          const user = allMsgs.find(
+              (msg): msg is SessionV1.WithParts&{info: SessionV1.User} =>
+                  msg.info.role === 'user',
+          )
+          const tool = allMsgs.flatMap((m) => m.parts)
+                           .find(
+                               (p): p is SessionV1.ToolPart =>
+                                   p.type === 'tool' && p.tool === 'bash')
+          expect(tool?.state.status).toBe('completed')
+          if (!user) throw new Error('Expected user message')
 
-      // Poll for the turn diff — summarize() is fire-and-forget.
-      let diff: Array<{ file?: string }> = []
-      for (let i = 0; i < 50; i++) {
-        diff = yield* summary.diff({ sessionID: session.id, messageID: user.info.id })
-        if (diff.length > 0) break
-        yield* Effect.sleep("100 millis")
-      }
-      expect(diff.length).toBeGreaterThan(0)
-    }),
-    { git: true, config: providerCfg },
-  ),
+          // Poll for the turn diff — summarize() is fire-and-forget.
+          let diff: Array<{file?: string}> = []
+          for (let i = 0; i < 50; i++) {
+            diff = yield*
+                summary.diff({sessionID: session.id, messageID: user.info.id})
+            if (diff.length > 0) break
+            yield* Effect.sleep('100 millis')
+          }
+          expect(diff.length).toBeGreaterThan(0)
+        }),
+        {git: true, config: providerCfg},
+        ),
 )
diff --git a/packages/opencode/test/tool/write.test.ts b/packages/opencode/test/tool/write.test.ts
index 63a2a52aa986..6721c2f8e51c 100644
--- a/packages/opencode/test/tool/write.test.ts
+++ b/packages/opencode/test/tool/write.test.ts
@@ -178,7 +178,7 @@ describe("tool.write", () => {
 
         if (process.platform !== "win32") {
           const stats = yield* Effect.promise(() => fs.stat(filepath))
-          expect(stats.mode & 0o777).toBe(0o644)
+          expect((stats.mode & 0o777) & ~0o020).toBe(0o644)
         }
       }),
     )
diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
index 7c1c9108d95e..ae586b0f8b6c 100644
--- a/packages/sdk/js/src/v2/gen/sdk.gen.ts
+++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -191,6 +191,8 @@ import type {
   SessionGetResponses,
   SessionInitErrors,
   SessionInitResponses,
+  SessionInterruptErrors,
+  SessionInterruptResponses,
   SessionListErrors,
   SessionListResponses,
   SessionMessageErrors,
@@ -3732,6 +3734,8 @@ export class Session2 extends HeyApiClient {
       }
       agent?: string
       noReply?: boolean
+      isSteer?: boolean
+      followupMode?: "haltingSteer" | "waitingSteer" | "queue"
       tools?: {
         [key: string]: boolean
       }
@@ -3754,6 +3758,8 @@ export class Session2 extends HeyApiClient {
             { in: "body", key: "model" },
             { in: "body", key: "agent" },
             { in: "body", key: "noReply" },
+            { in: "body", key: "isSteer" },
+            { in: "body", key: "followupMode" },
             { in: "body", key: "tools" },
             { in: "body", key: "format" },
             { in: "body", key: "system" },
@@ -3918,6 +3924,45 @@ export class Session2 extends HeyApiClient {
     })
   }
 
+  /**
+   * Interrupt session
+   *
+   * Interrupt a running session with a specific behavior type.
+   */
+  public interrupt<ThrowOnError extends boolean = false>(
+    parameters: {
+      sessionID: string
+      directory?: string
+      workspace?: string
+      type?: "haltingSteer" | "waitingSteer" | "clear"
+    },
+    options?: Options<never, ThrowOnError>,
+  ) {
+    const params = buildClientParams(
+      [parameters],
+      [
+        {
+          args: [
+            { in: "path", key: "sessionID" },
+            { in: "query", key: "directory" },
+            { in: "query", key: "workspace" },
+            { in: "body", key: "type" },
+          ],
+        },
+      ],
+    )
+    return (options?.client ?? this.client).post<SessionInterruptResponses, SessionInterruptErrors, ThrowOnError>({
+      url: "/session/{sessionID}/interrupt",
+      ...options,
+      ...params,
+      headers: {
+        "Content-Type": "application/json",
+        ...options?.headers,
+        ...params.headers,
+      },
+    })
+  }
+
   /**
    * Initialize session
    *
@@ -4085,6 +4130,8 @@ export class Session2 extends HeyApiClient {
       }
       agent?: string
       noReply?: boolean
+      isSteer?: boolean
+      followupMode?: "haltingSteer" | "waitingSteer" | "queue"
       tools?: {
         [key: string]: boolean
       }
@@ -4107,6 +4154,8 @@ export class Session2 extends HeyApiClient {
             { in: "body", key: "model" },
             { in: "body", key: "agent" },
             { in: "body", key: "noReply" },
+            { in: "body", key: "isSteer" },
+            { in: "body", key: "followupMode" },
             { in: "body", key: "tools" },
             { in: "body", key: "format" },
             { in: "body", key: "system" },
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index 1c4fd8f5dfd3..a5197b7c6bb9 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -689,6 +689,12 @@ export type SessionStatus =
   | {
       type: "busy"
     }
+  | {
+      type: "haltingSteer"
+    }
+  | {
+      type: "waitingSteer"
+    }
 
 export type QuestionOption = {
   /**
@@ -7871,6 +7877,8 @@ export type SessionPromptData = {
     }
     agent?: string
     noReply?: boolean
+    isSteer?: boolean
+    followupMode?: "haltingSteer" | "waitingSteer" | "queue"
     tools?: {
       [key: string]: boolean
     }
@@ -8057,6 +8065,42 @@ export type SessionAbortResponses = {
 
 export type SessionAbortResponse = SessionAbortResponses[keyof SessionAbortResponses]
 
+export type SessionInterruptData = {
+  body?: {
+    type: "haltingSteer" | "waitingSteer" | "clear"
+  }
+  path: {
+    sessionID: string
+  }
+  query?: {
+    directory?: string
+    workspace?: string
+  }
+  url: "/session/{sessionID}/interrupt"
+}
+
+export type SessionInterruptErrors = {
+  /**
+   * BadRequest | InvalidRequestError
+   */
+  400: EffectHttpApiErrorBadRequest | InvalidRequestError
+  /**
+   * NotFoundError
+   */
+  404: NotFoundError
+}
+
+export type SessionInterruptError = SessionInterruptErrors[keyof SessionInterruptErrors]
+
+export type SessionInterruptResponses = {
+  /**
+   * Interrupted session
+   */
+  200: boolean
+}
+
+export type SessionInterruptResponse = SessionInterruptResponses[keyof SessionInterruptResponses]
+
 export type SessionInitData = {
   body?: {
     modelID: string
@@ -8218,6 +8262,8 @@ export type SessionPromptAsyncData = {
     }
     agent?: string
     noReply?: boolean
+    isSteer?: boolean
+    followupMode?: "haltingSteer" | "waitingSteer" | "queue"
     tools?: {
       [key: string]: boolean
     }
diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index 17a9a554c2e4..6134a7110565 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -129,6 +129,7 @@ const appBindingCommands = [
   "app.toggle.diffwrap",
   "app.toggle.paste_summary",
   "app.toggle.session_directory_filter",
+  "session.toggle-queue-mode",
 ] as const
 
 export type TuiInput = {
@@ -578,6 +579,30 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
           dialog.clear()
         },
       },
+      {
+        name: "session.toggle-queue-mode",
+        title: "Toggle queueing mode",
+        category: "Session",
+        slashName: "followup",
+        slashAliases: ["queue", "follow-up"],
+        run: () => {
+          const current = kv.get("followup", "haltingSteer")
+          let next: "haltingSteer" | "waitingSteer" | "queue" = "haltingSteer"
+          if (current === "haltingSteer") next = "waitingSteer"
+          else if (current === "waitingSteer") next = "queue"
+
+          kv.set("followup", next)
+
+          const nextName = next === "haltingSteer" ? "Halt and Steer" : next === "waitingSteer" ? "Wait and Steer" : "Queue"
+          toast.show({
+            message: `Follow-Up mode: ${nextName}`,
+            variant: "info",
+            duration: 2000,
+          })
+
+          dialog.clear()
+        },
+      },
       {
         name: "workspace.copy_path",
         title: "Copy worktree path",
diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx
index aa002080b1dd..fae15ca32e37 100644
--- a/packages/tui/src/component/prompt/index.tsx
+++ b/packages/tui/src/component/prompt/index.tsx
@@ -9,7 +9,7 @@ import {
   type Renderable,
 } from "@opentui/core"
 import type { CommandContext } from "@opentui/keymap"
-import { createEffect, createMemo, onMount, createSignal, onCleanup, on, Show, Switch, Match } from "solid-js"
+import { createEffect, createMemo, onMount, createSignal, onCleanup, on, Show, Switch, Match, For } from "solid-js"
 import "opentui-spinner/solid"
 import path from "path"
 import { fileURLToPath } from "url"
@@ -29,13 +29,14 @@ import { editorSelectionKey, useEditorContext, type EditorSelection } from "../.
 import { normalizePromptContent, openEditor } from "../../editor"
 import { useExit } from "../../context/exit"
 import { promptOffsetWidth } from "../../prompt/display"
-import { createStore, produce, unwrap } from "solid-js/store"
+import { createStore, produce, unwrap, reconcile } from "solid-js/store"
 import { usePromptHistory, type PromptInfo } from "../../prompt/history"
 import { computePromptTraits } from "../../prompt/traits"
-import { expandPastedTextPlaceholders, expandTrackedPastedText } from "../../prompt/part"
+import { expandPastedTextPlaceholders, expandTrackedPastedText, stripPromptPartIDs, assign } from "../../prompt/part"
 import { usePromptStash } from "../../prompt/stash"
 import { DialogStash } from "../dialog-stash"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
+import { CommandMap } from "../../config/keybind"
 import { useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
 import type { AssistantMessage, FilePart, UserMessage } from "@opencode-ai/sdk/v2"
 import { Locale } from "../../util/locale"
@@ -51,6 +52,22 @@ import { createFadeIn } from "../../util/signal"
 import { DialogSkill } from "../dialog-skill"
 import { DialogWorkspaceUnavailable } from "../dialog-workspace-unavailable"
 import { useArgs } from "../../context/args"
+import fs from "fs"
+const Log = {
+  Default: {
+    info: (...args: any[]) => {
+      try {
+        fs.appendFileSync("/tmp/opencode-tui.log", args.map(x => typeof x === "object" ? JSON.stringify(x) : String(x)).join(" ") + "\n")
+      } catch {}
+    },
+    error: (...args: any[]) => {
+      try {
+        fs.appendFileSync("/tmp/opencode-tui.log", "[ERROR] " + args.map(x => typeof x === "object" ? JSON.stringify(x) : String(x)).join(" ") + "\n")
+      } catch {}
+    },
+  },
+}
+import { ascending } from "@opencode-ai/core/id/id"
 import { OPENCODE_BASE_MODE, useBindings, useCommandShortcut, useLeaderActive, useOpencodeKeymap } from "../../keymap"
 import { useTuiConfig } from "../../config"
 import { usePromptWorkspace } from "./workspace"
@@ -282,6 +299,7 @@ export function Prompt(props: PromptProps) {
     extmarkToPartIndex: Map<number, number>
     interrupt: number
     placeholder: number
+    editingDraftIndex: number | null
   }>({
     placeholder: randomIndex(list().length),
     prompt: {
@@ -291,6 +309,54 @@ export function Prompt(props: PromptProps) {
     mode: "normal",
     extmarkToPartIndex: new Map(),
     interrupt: 0,
+    editingDraftIndex: null,
+  })
+
+  const queuedDrafts = createMemo(() => {
+    const sessionID = props.sessionID ?? ""
+    const list = sync.data.queuedDrafts[sessionID] ?? []
+    Log.Default.info(`[queuedDraftsMemo] sessionID="${sessionID}" list=${JSON.stringify(list.map(x => x.messageID))}`)
+    return list
+  })
+
+  function setQueuedDrafts(drafts: any[]) {
+    const sessionID = props.sessionID ?? ""
+    Log.Default.info(`[setQueuedDrafts] sessionID="${sessionID}" drafts=${JSON.stringify(drafts.map(x => x.messageID))}`)
+    sync.setStore("queuedDrafts", sessionID, reconcile(drafts))
+    Log.Default.info(`[setQueuedDrafts] after set: ${JSON.stringify((sync.data.queuedDrafts[sessionID] ?? []).map(x => x.messageID))}`)
+  }
+
+  const session = createMemo(() => props.sessionID ? sync.session.get(props.sessionID) : undefined)
+  const children = createMemo(() => {
+    const s = session()
+    if (!s) return []
+    const parentID = s.parentID ?? s.id
+    return sync.data.session.filter((x) => x.parentID === parentID || x.id === parentID)
+  })
+  const hasPendingRequests = createMemo(() => {
+    if (session()?.parentID) return false
+    const list = children()
+    const permissions = list.flatMap((x) => sync.data.permission[x.id] ?? [])
+    const questions = list.flatMap((x) => sync.data.question[x.id] ?? [])
+    return permissions.length > 0 || questions.length > 0
+  })
+
+  const [sendingPrompt, setSendingPrompt] = createSignal(false)
+
+  createEffect(() => {
+    if (status().type === "idle" && !hasPendingRequests() && !sendingPrompt() && queuedDrafts().length > 0) {
+      const draft = queuedDrafts()[0]
+      setSendingPrompt(true)
+      setQueuedDrafts(queuedDrafts().slice(1))
+      const { followupMode, ...payload } = draft
+      sdk.client.session.prompt(payload)
+        .catch((err) => {
+          Log.Default.error(`[Queue Debug] prompt failed: ${err}`)
+        })
+        .finally(() => {
+          setSendingPrompt(false)
+        })
+    }
   })
 
   createEffect(
@@ -871,6 +937,75 @@ export function Prompt(props: PromptProps) {
               return false
             }
 
+            if (input.plainText === "") {
+              if (queuedDrafts().length > 0) {
+                const editIndex = queuedDrafts().length - 1
+                const draft = queuedDrafts()[editIndex]
+                const newDrafts = queuedDrafts().slice(0, -1)
+                Log.Default.info(`[prompt.history.previous] Editing draft at index ${editIndex}. Remaining queue length: ${newDrafts.length}`)
+                setQueuedDrafts(newDrafts)
+                setStore("editingDraftIndex", editIndex)
+
+                const promptInfo = {
+                  input: draft.parts.filter((p: any) => p.type === "text" && !p.synthetic).map((p: any) => p.text).join("\n"),
+                  parts: draft.parts.filter((p: any) => p.type !== "text")
+                }
+                input.setText(promptInfo.input)
+                setStore("prompt", promptInfo)
+                restoreExtmarksFromParts(promptInfo.parts)
+                input.cursorOffset = promptInfo.input.length
+                return
+              }
+
+              const messages = sync.data.message[props.sessionID ?? ""] ?? []
+              const lastMsg = messages[messages.length - 1]
+
+              Log.Default.info(`[prompt.history.previous] Empty text. status=${status().type}, lastMsg=${lastMsg?.role} id=${lastMsg?.id}`)
+
+              if (status().type !== "idle" && lastMsg?.role === "user") {
+                const hasStarted = messages.some((m) => m.role === "assistant" && m.parentID >= lastMsg.id)
+                Log.Default.info(`[prompt.history.previous] hasStarted=${hasStarted}`)
+                if (!hasStarted) {
+                  const earlierRunning = messages.some(
+                    (m) => m.role === "user" && m.id < lastMsg.id && !messages.some((am) => am.role === "assistant" && am.parentID >= m.id)
+                  )
+                  Log.Default.info(`[prompt.history.previous] earlierRunning=${earlierRunning}`)
+                  void (async () => {
+                    if (!earlierRunning) {
+                      Log.Default.info(`[prompt.history.previous] aborting session`)
+                      await sdk.client.session.abort({ sessionID: props.sessionID! }).catch(() => {})
+                    }
+                    Log.Default.info(`[prompt.history.previous] reverting message ${lastMsg.id}`)
+                    await sdk.client.session
+                      .revert({
+                        sessionID: props.sessionID!,
+                        messageID: lastMsg.id,
+                      })
+                      .then(() => {
+                        Log.Default.info(`[prompt.history.previous] reverted successfully`)
+                        const parts = sync.data.part[lastMsg.id] ?? []
+                        const promptInfo = parts.reduce(
+                          (agg, part) => {
+                            if (part.type === "text" && !part.synthetic) agg.input += part.text
+                            if (part.type === "file") agg.parts.push(stripPromptPartIDs(part))
+                            return agg
+                          },
+                          { input: "", parts: [] as PromptInfo["parts"] },
+                        )
+                        input.setText(promptInfo.input)
+                        setStore("prompt", promptInfo)
+                        restoreExtmarksFromParts(promptInfo.parts)
+                        input.cursorOffset = promptInfo.input.length
+                      })
+                      .catch((err) => {
+                        Log.Default.error(`[prompt.history.previous] revert failed: ${err}`)
+                      })
+                  })()
+                  return
+                }
+              }
+            }
+
             const item = history.move(-1, input.plainText)
             if (!item) return false
             input.setText(item.input)
@@ -1085,32 +1220,94 @@ export function Prompt(props: PromptProps) {
       })
     } else {
       move.startSubmit()
-      sdk.client.session
-        .prompt(
+      const followupMode = kv.get("followup", "haltingSteer")
+      const isBusy = status().type !== "idle"
+      const isEditingDraft = store.editingDraftIndex !== null
+
+      const isSteer = isBusy && followupMode === "haltingSteer"
+
+      if (!isEditingDraft && isBusy && followupMode !== "queue" && queuedDrafts().length >= 1) {
+        toast.show({
+          message: `Only one message can be queued in ${followupMode} mode`,
+          variant: "warning",
+          duration: 2000,
+        })
+        return false
+      }
+
+      if (!isEditingDraft && isBusy && followupMode === "haltingSteer") {
+        void sdk.client.session.interrupt({ sessionID, type: "haltingSteer" })
+      } else if (!isEditingDraft && isBusy && followupMode === "waitingSteer") {
+        void sdk.client.session.interrupt({ sessionID, type: "waitingSteer" })
+      }
+
+      const messageID = ascending("message")
+
+      const payload = {
+        sessionID,
+        ...selectedModel,
+        messageID,
+        agent: agent.name,
+        model: selectedModel,
+        variant,
+        isSteer,
+        followupMode,
+        parts: [
+          ...editorParts,
           {
-            sessionID,
-            ...selectedModel,
-            agent: agent.name,
-            model: selectedModel,
-            variant,
-            parts: [
-              ...editorParts,
-              {
-                type: "text",
-                text: inputText,
-              },
-              ...nonTextParts,
-            ],
+            id: ascending("part"),
+            type: "text" as const,
+            text: inputText,
           },
-          { throwOnError: true },
-        )
-        .catch((error) => {
-          toast.show({
-            title: "Failed to send prompt",
-            message: errorMessage(error),
-            variant: "error",
+          ...nonTextParts.map(assign),
+        ],
+      }
+
+      if (isEditingDraft) {
+        // Replace the draft at the original position in the queue
+        const editIndex = store.editingDraftIndex!
+        const current = queuedDrafts()
+        const updated = [...current]
+        updated.splice(editIndex, 0, payload)
+        Log.Default.info(`[submitInner] Replacing edited draft at index ${editIndex}`)
+        setQueuedDrafts(updated)
+        setStore("editingDraftIndex", null)
+      } else if (isBusy && followupMode === "queue") {
+        Log.Default.info(`[submitInner] Queueing payload with messageID: ${payload.messageID}`)
+        setQueuedDrafts([...queuedDrafts(), payload])
+        toast.show({
+          message: "Queued",
+          variant: "info",
+          duration: 2000,
+        })
+      } else if (isBusy) {
+        const { followupMode: _, ...cleanPayload } = payload
+        sdk.client.session
+          .promptAsync(cleanPayload, { throwOnError: true })
+          .catch((error) => {
+            toast.show({
+              title: "Failed to steer prompt",
+              message: errorMessage(error),
+              variant: "error",
+            })
           })
+        toast.show({
+          message: "Steering...",
+          variant: "info",
+          duration: 2000,
         })
+      } else {
+        const { followupMode: _, ...cleanPayload } = payload
+        sdk.client.session
+          .prompt(cleanPayload, { throwOnError: true })
+          .catch((error) => {
+            toast.show({
+              title: "Failed to send prompt",
+              message: errorMessage(error),
+              variant: "error",
+            })
+          })
+      }
       if (editorParts.length > 0) editor.markSelectionSent()
     }
     history.append({
@@ -1123,6 +1320,7 @@ export function Prompt(props: PromptProps) {
       parts: [],
     })
     setStore("extmarkToPartIndex", new Map())
+    setStore("editingDraftIndex", null)
     props.onSubmit?.()
 
     // temporary hack to make sure the message is sent
@@ -1360,6 +1558,27 @@ export function Prompt(props: PromptProps) {
             flexGrow={1}
             width="100%"
           >
+            <Show when={queuedDrafts().length > 0}>
+              <box flexDirection="column" paddingBottom={1} gap={1}>
+                <For each={queuedDrafts()}>
+                  {(draft, i) => {
+                    const text = (draft.parts as Array<{ type: string; text?: string; synthetic?: boolean }>)
+                      .filter((p) => p.type === "text" && !p.synthetic)
+                      .map((p) => p.text ?? "")
+                      .join("\n")
+                    const preview = text.length > 60 ? text.slice(0, 60).replace(/\n/g, " ") + "..." : text.replace(/\n/g, " ")
+                    const mode = draft.followupMode ?? "queue"
+                    const prefix = mode === "haltingSteer" ? "Halt and steer:" : mode === "waitingSteer" ? "Wait and steer:" : `[${i() + 1}] Queued:`
+                    return (
+                      <box flexDirection="row" gap={1}>
+                        <text fg={theme.textMuted}>{prefix}</text>
+                        <text fg={theme.text}>{preview}</text>
+                      </box>
+                    )
+                  }}
+                </For>
+              </box>
+            </Show>
             <textarea
               width="100%"
               placeholder={placeholderText()}
@@ -1376,11 +1595,74 @@ export function Prompt(props: PromptProps) {
                 setCursorVersion((value) => value + 1)
               }}
               onCursorChange={() => setCursorVersion((value) => value + 1)}
-              onKeyDown={(e: { preventDefault(): void }) => {
+              onKeyDown={async (e: KeyEvent & { preventDefault(): void }) => {
+                Log.Default.info(`[onKeyDown] key="${e.name}" ctrl=${e.ctrl} shift=${e.shift} cursorOffset=${input.cursorOffset} plainText="${input.plainText}" plainTextLength=${input.plainText.length}`)
                 if (props.disabled) {
                   e.preventDefault()
                   return
                 }
+
+                const matchesKeybind = (keybindName: keyof typeof CommandMap, event: KeyEvent) => {
+                  const commandName = CommandMap[keybindName]
+                  const bindings = tuiConfig.keybinds.get(commandName)
+                  return bindings.some((binding) => {
+                    const matcher = keymap.createKeyMatcher(binding.key)
+                    return matcher(event)
+                  })
+                }
+
+                // Check clipboard for images before terminal-handled paste runs.
+                // This helps terminals that forward Ctrl+V to the app; Windows
+                // Terminal 1.25+ usually handles Ctrl+V before this path.
+                if (matchesKeybind("input_paste", e)) {
+                  const content = await clipboard.read?.()
+                  if (content?.mime.startsWith("image/")) {
+                    e.preventDefault()
+                    await pasteAttachment({
+                      filename: "clipboard",
+                      mime: content.mime,
+                      content: content.data,
+                    })
+                    return
+                  }
+                  // If no image, let the default paste behavior continue
+                }
+                if (matchesKeybind("input_clear", e) && store.prompt.input !== "") {
+                  input.clear()
+                  input.extmarks.clear()
+                  setStore("prompt", {
+                    input: "",
+                    parts: [],
+                  })
+                  setStore("extmarkToPartIndex", new Map())
+                  return
+                }
+                if (matchesKeybind("app_exit", e)) {
+                  if (store.prompt.input === "") {
+                    await exit()
+                    // Don't preventDefault - let textarea potentially handle the event
+                    e.preventDefault()
+                    return
+                  }
+                }
+                if (e.name === "!" && input.visualCursor.offset === 0) {
+                  setStore("placeholder", randomIndex(shell().length))
+                  setStore("mode", "shell")
+                  e.preventDefault()
+                  return
+                }
+                if (store.mode === "shell") {
+                  if ((e.name === "backspace" && input.visualCursor.offset === 0) || e.name === "escape") {
+                    setStore("mode", "normal")
+                    e.preventDefault()
+                    return
+                  }
+                }
+                if (!auto()?.visible) {
+                  if (matchesKeybind("history_previous", e) && input.visualCursor.visualRow === 0) input.cursorOffset = 0
+                  if (matchesKeybind("history_next", e) && input.visualCursor.visualRow === input.height - 1)
+                    input.cursorOffset = input.plainText.length
+                }
               }}
               onSubmit={() => {
                 // IME: double-defer so the last composed character (e.g. Korean
@@ -1459,6 +1741,16 @@ export function Prompt(props: PromptProps) {
                               </span>
                             </text>
                           </Show>
+                          <text fg={fadeColor(theme.textMuted, modelMetaAlpha())}>·</text>
+                          <text fg={fadeColor(theme.textMuted, modelMetaAlpha())}>
+                            {(() => {
+                              const mode = kv.get("followup", "haltingSteer")
+                              if (mode === "haltingSteer") return "Halt and Steer"
+                              if (mode === "waitingSteer") return "Wait and Steer"
+                              if (mode === "queue") return "Queue"
+                              return "Halt and Steer"
+                            })()}
+                          </text>
                         </box>
                       </Show>
                     </>
@@ -1521,6 +1813,11 @@ export function Prompt(props: PromptProps) {
                         if (s.type !== "retry") return
                         return s
                       })
+                    const steerMsg = createMemo(() => {
+                      const s = status()
+                      if (s.type === "haltingSteer" || s.type === "waitingSteer") return "Steering"
+                      return null
+                    })
                       const message = createMemo(() => {
                         const r = retry()
                         if (!r) return
@@ -1564,11 +1861,16 @@ export function Prompt(props: PromptProps) {
                       }
 
                       return (
-                        <Show when={retry()}>
-                          <box onMouseUp={handleMessageClick}>
-                            <text fg={theme.error}>{retryText()}</text>
-                          </box>
-                        </Show>
+                        <Switch>
+                        <Match when={retry()}>
+                            <box onMouseUp={handleMessageClick}>
+                              <text fg={theme.error}>{retryText()}</text>
+                            </box>
+                        </Match>
+                        <Match when={steerMsg()}>
+                          <text fg={theme.textMuted}>{steerMsg()}</text>
+                        </Match>
+                        </Switch>
                       )
                     })()}
                   </box>
diff --git a/packages/tui/src/config/keybind.ts b/packages/tui/src/config/keybind.ts
index 0028b610f2a3..38d2d8275249 100644
--- a/packages/tui/src/config/keybind.ts
+++ b/packages/tui/src/config/keybind.ts
@@ -93,6 +93,7 @@ export const Definitions = {
   session_unshare: keybind("none", "Unshare current session"),
   session_interrupt: keybind("escape", "Interrupt current session"),
   session_background: keybind("ctrl+b", "Background synchronous subagents"),
+  session_toggle_queue_mode: keybind("ctrl+y,<leader>f", "Toggle follow-up mode"),
   session_compact: keybind("<leader>c", "Compact the session"),
   session_toggle_timestamps: keybind("none", "Toggle message timestamps"),
   session_toggle_generic_tool_output: keybind("none", "Toggle generic tool output"),
@@ -297,6 +298,7 @@ export const CommandMap = {
   session_unshare: "session.unshare",
   session_interrupt: "session.interrupt",
   session_background: "session.background",
+  session_toggle_queue_mode: "session.toggle-queue-mode",
   session_compact: "session.compact",
   session_toggle_timestamps: "session.toggle.timestamps",
   session_toggle_generic_tool_output: "session.toggle.generic_tool_output",
diff --git a/packages/tui/src/context/sync.tsx b/packages/tui/src/context/sync.tsx
index 03db8784de49..cc3f511d2c52 100644
--- a/packages/tui/src/context/sync.tsx
+++ b/packages/tui/src/context/sync.tsx
@@ -103,6 +103,9 @@ export const {
       }
       formatter: FormatterStatus[]
       vcs: VcsInfo | undefined
+      queuedDrafts: {
+        [sessionID: string]: any[]
+      }
     }>({
       provider_next: {
         all: [],
@@ -133,6 +136,7 @@ export const {
       mcp_resource: {},
       formatter: [],
       vcs: undefined,
+      queuedDrafts: {},
     })
 
     const event = useEvent()
@@ -649,6 +653,7 @@ export const {
         },
       },
       bootstrap,
+      setStore,
     }
     return result
   },
diff --git a/packages/tui/src/prompt/part.ts b/packages/tui/src/prompt/part.ts
index 0027b9aaed77..8fa77880c347 100644
--- a/packages/tui/src/prompt/part.ts
+++ b/packages/tui/src/prompt/part.ts
@@ -1,3 +1,4 @@
+import { ascending } from "@opencode-ai/core/id/id"
 import { displaySlice } from "./display"
 
 export function stripPromptPartIDs<Part extends { id: string; messageID: string; sessionID: string }>(part: Part) {
@@ -5,6 +6,13 @@ export function stripPromptPartIDs<Part extends { id: string; messageID: string;
   return rest
 }
 
+export function assign<Part>(part: Part): Part & { id: string } {
+  return {
+    ...part,
+    id: ascending("part"),
+  }
+}
+
 export function expandPastedTextPlaceholders(text: string, parts: readonly unknown[]) {
   return parts.reduce<string>((result, part) => {
     if (!isPastedTextPart(part)) return result
diff --git a/packages/tui/src/routes/session/dialog-message.tsx b/packages/tui/src/routes/session/dialog-message.tsx
index b7d01842060b..88bf34f9704d 100644
--- a/packages/tui/src/routes/session/dialog-message.tsx
+++ b/packages/tui/src/routes/session/dialog-message.tsx
@@ -26,11 +26,11 @@ export function DialogMessage(props: {
           title: "Revert",
           value: "session.revert",
           description: "undo messages and file changes",
-          onSelect: (dialog) => {
+          onSelect: async (dialog) => {
             const msg = message()
             if (!msg) return
 
-            void sdk.client.session.revert({
+            await sdk.client.session.revert({
               sessionID: props.sessionID,
               messageID: msg.id,
             })
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index e3758374c870..822a9edf13d4 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -572,6 +572,7 @@ export function Session() {
         dialog.clear()
       },
     },
+
     {
       title: "Unshare session",
       value: "session.unshare",
diff --git a/packages/tui/src/util/renderer.ts b/packages/tui/src/util/renderer.ts
index a0c16faa7bf5..c5dba348293f 100644
--- a/packages/tui/src/util/renderer.ts
+++ b/packages/tui/src/util/renderer.ts
@@ -5,3 +5,4 @@ export function destroyRenderer(renderer: Pick<CliRenderer, "isDestroyed" | "set
   if (renderer.isDestroyed) return
   renderer.destroy()
 }
+
diff --git a/packages/tui/test/fixture/tui-environment.tsx b/packages/tui/test/fixture/tui-environment.tsx
index 543332ba1821..973b9f555b5d 100644
--- a/packages/tui/test/fixture/tui-environment.tsx
+++ b/packages/tui/test/fixture/tui-environment.tsx
@@ -5,6 +5,7 @@ import {
   TuiTerminalEnvironmentProvider,
   type TuiPaths,
 } from "../../src/context/runtime"
+import { ExitProvider, type Exit } from "../../src/context/exit"
 import type { ParentProps } from "solid-js"
 
 export function TestTuiContexts(
@@ -12,6 +13,7 @@ export function TestTuiContexts(
     cwd?: string
     directory?: string
     paths?: Partial<TuiPaths>
+    exit?: Exit
   }>,
 ) {
   return (
@@ -25,7 +27,9 @@ export function TestTuiContexts(
       }}
     >
       <TuiTerminalEnvironmentProvider value={{ platform: "linux" }}>
-        <TuiStartupProvider value={{ skipInitialLoading: false }}>{props.children}</TuiStartupProvider>
+        <TuiStartupProvider value={{ skipInitialLoading: false }}>
+          <ExitProvider exit={props.exit ?? (() => {})}>{props.children}</ExitProvider>
+        </TuiStartupProvider>
       </TuiTerminalEnvironmentProvider>
     </TuiPathsProvider>
   )
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index bbc3d2956cb3..ac7679c1d029 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -29,6 +29,7 @@ import {
   Todo,
   QuestionAnswer,
   QuestionInfo,
+  SessionStatus,
 } from "@opencode-ai/sdk/v2"
 import { useData } from "../context"
 import { useFileComponent } from "../context/file"
@@ -641,6 +642,7 @@ export function AssistantParts(props: {
   showAssistantCopyPartID?: string | null
   turnDurationMs?: number
   working?: boolean
+  status?: SessionStatus
   showReasoningSummaries?: boolean
   shellToolDefaultOpen?: boolean
   editToolDefaultOpen?: boolean
diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsx
index a39b9a7f6438..095762fd0e63 100644
--- a/packages/ui/src/components/session-turn.tsx
+++ b/packages/ui/src/components/session-turn.tsx
@@ -374,6 +374,12 @@ export function SessionTurn(
     if (showReasoningSummaries()) return assistantVisible() === 0
     return true
   })
+  const thinkingText = createMemo(() => {
+    const s = status().type
+    if (s === "haltingSteer") return i18n.t("ui.sessionTurn.status.steering")
+    if (s === "waitingSteer") return i18n.t("ui.sessionTurn.status.wrappingUp")
+    return i18n.t("ui.sessionTurn.status.thinking")
+  })
 
   const autoScroll = createAutoScroll({
     working,
@@ -412,6 +418,7 @@ export function SessionTurn(
                     showAssistantCopyPartID={assistantCopyPartID()}
                     turnDurationMs={turnDurationMs()}
                     working={working()}
+                    status={status()}
                     showReasoningSummaries={showReasoningSummaries()}
                     shellToolDefaultOpen={props.shellToolDefaultOpen}
                     editToolDefaultOpen={props.editToolDefaultOpen}
@@ -420,8 +427,8 @@ export function SessionTurn(
               </Show>
               <Show when={showThinking()}>
                 <div data-slot="session-turn-thinking">
-                  <TextShimmer text={i18n.t("ui.sessionTurn.status.thinking")} />
-                  <Show when={!showReasoningSummaries()}>
+                  <TextShimmer text={thinkingText()} />
+                  <Show when={!showReasoningSummaries() && status().type !== "haltingSteer" && status().type !== "waitingSteer"}>
                     <TextReveal
                       text={reasoningHeading()}
                       class="session-turn-thinking-heading"
diff --git a/packages/ui/src/i18n/ar.ts b/packages/ui/src/i18n/ar.ts
index dd8cfed6f98f..a3d5a8a3270e 100644
--- a/packages/ui/src/i18n/ar.ts
+++ b/packages/ui/src/i18n/ar.ts
@@ -64,6 +64,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "إجراء تعديلات",
   "ui.sessionTurn.status.runningCommands": "تشغيل الأوامر",
   "ui.sessionTurn.status.thinking": "تفكير",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "تفكير - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "جمع الأفكار",
   "ui.sessionTurn.status.consideringNextSteps": "النظر في الخطوات التالية",
diff --git a/packages/ui/src/i18n/br.ts b/packages/ui/src/i18n/br.ts
index 4b2c418ca501..a1d28ed2d4c7 100644
--- a/packages/ui/src/i18n/br.ts
+++ b/packages/ui/src/i18n/br.ts
@@ -64,6 +64,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Fazendo edições",
   "ui.sessionTurn.status.runningCommands": "Executando comandos",
   "ui.sessionTurn.status.thinking": "Pensando",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Pensando - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Organizando pensamentos",
   "ui.sessionTurn.status.consideringNextSteps": "Considerando próximos passos",
diff --git a/packages/ui/src/i18n/bs.ts b/packages/ui/src/i18n/bs.ts
index be041f147133..37a585f2ae60 100644
--- a/packages/ui/src/i18n/bs.ts
+++ b/packages/ui/src/i18n/bs.ts
@@ -68,6 +68,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Pravljenje izmjena",
   "ui.sessionTurn.status.runningCommands": "Pokretanje komandi",
   "ui.sessionTurn.status.thinking": "Razmišljanje",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Razmišljanje - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Sređivanje misli",
   "ui.sessionTurn.status.consideringNextSteps": "Razmatranje sljedećih koraka",
diff --git a/packages/ui/src/i18n/da.ts b/packages/ui/src/i18n/da.ts
index 91adc52e9d45..1f1d7b68468f 100644
--- a/packages/ui/src/i18n/da.ts
+++ b/packages/ui/src/i18n/da.ts
@@ -63,6 +63,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Laver ændringer",
   "ui.sessionTurn.status.runningCommands": "Kører kommandoer",
   "ui.sessionTurn.status.thinking": "Tænker",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Tænker - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Samler tanker",
   "ui.sessionTurn.status.consideringNextSteps": "Overvejer næste skridt",
diff --git a/packages/ui/src/i18n/de.ts b/packages/ui/src/i18n/de.ts
index 7b36859bf6de..8ba8e493f3fd 100644
--- a/packages/ui/src/i18n/de.ts
+++ b/packages/ui/src/i18n/de.ts
@@ -69,6 +69,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Änderungen vornehmen",
   "ui.sessionTurn.status.runningCommands": "Befehle ausführen",
   "ui.sessionTurn.status.thinking": "Denken",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Denken - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Gedanken sammeln",
   "ui.sessionTurn.status.consideringNextSteps": "Nächste Schritte erwägen",
diff --git a/packages/ui/src/i18n/en.ts b/packages/ui/src/i18n/en.ts
index 0f691a214cac..7d5aff67d08f 100644
--- a/packages/ui/src/i18n/en.ts
+++ b/packages/ui/src/i18n/en.ts
@@ -71,6 +71,8 @@ export const dict: Record<string, string> = {
   "ui.sessionTurn.status.makingEdits": "Making edits",
   "ui.sessionTurn.status.runningCommands": "Running commands",
   "ui.sessionTurn.status.thinking": "Thinking",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Steering",
   "ui.sessionTurn.status.thinkingWithTopic": "Thinking - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Gathering thoughts",
   "ui.sessionTurn.status.consideringNextSteps": "Considering next steps",
diff --git a/packages/ui/src/i18n/es.ts b/packages/ui/src/i18n/es.ts
index f883531031b0..9de7df5cde40 100644
--- a/packages/ui/src/i18n/es.ts
+++ b/packages/ui/src/i18n/es.ts
@@ -64,6 +64,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Realizando ediciones",
   "ui.sessionTurn.status.runningCommands": "Ejecutando comandos",
   "ui.sessionTurn.status.thinking": "Pensando",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Pensando - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Recopilando pensamientos",
   "ui.sessionTurn.status.consideringNextSteps": "Considerando siguientes pasos",
diff --git a/packages/ui/src/i18n/fr.ts b/packages/ui/src/i18n/fr.ts
index 3ae122d35eeb..fa066bffce67 100644
--- a/packages/ui/src/i18n/fr.ts
+++ b/packages/ui/src/i18n/fr.ts
@@ -64,6 +64,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Application des modifications",
   "ui.sessionTurn.status.runningCommands": "Exécution des commandes",
   "ui.sessionTurn.status.thinking": "Réflexion",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Réflexion - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Rassemblement des idées",
   "ui.sessionTurn.status.consideringNextSteps": "Examen des prochaines étapes",
diff --git a/packages/ui/src/i18n/ja.ts b/packages/ui/src/i18n/ja.ts
index 1b50cb5ff158..aee71eb8d3b9 100644
--- a/packages/ui/src/i18n/ja.ts
+++ b/packages/ui/src/i18n/ja.ts
@@ -63,6 +63,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "編集を実行中",
   "ui.sessionTurn.status.runningCommands": "コマンドを実行中",
   "ui.sessionTurn.status.thinking": "思考中",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "思考中 - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "考えをまとめています",
   "ui.sessionTurn.status.consideringNextSteps": "次のステップを検討中",
diff --git a/packages/ui/src/i18n/ko.ts b/packages/ui/src/i18n/ko.ts
index d6c480364d3f..fb58b28f2e72 100644
--- a/packages/ui/src/i18n/ko.ts
+++ b/packages/ui/src/i18n/ko.ts
@@ -64,6 +64,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "편집 수행 중",
   "ui.sessionTurn.status.runningCommands": "명령어 실행 중",
   "ui.sessionTurn.status.thinking": "생각 중",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "생각 중 - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "생각 정리 중",
   "ui.sessionTurn.status.consideringNextSteps": "다음 단계 고려 중",
diff --git a/packages/ui/src/i18n/no.ts b/packages/ui/src/i18n/no.ts
index ecf67219d52f..09e4aa991ad0 100644
--- a/packages/ui/src/i18n/no.ts
+++ b/packages/ui/src/i18n/no.ts
@@ -67,6 +67,8 @@ export const dict: Record<Keys, string> = {
   "ui.sessionTurn.status.makingEdits": "Gjør endringer",
   "ui.sessionTurn.status.runningCommands": "Kjører kommandoer",
   "ui.sessionTurn.status.thinking": "Tenker",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Tenker - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Samler tanker",
   "ui.sessionTurn.status.consideringNextSteps": "Vurderer neste trinn",
diff --git a/packages/ui/src/i18n/pl.ts b/packages/ui/src/i18n/pl.ts
index 6ef40d2dafdc..2543a05ac802 100644
--- a/packages/ui/src/i18n/pl.ts
+++ b/packages/ui/src/i18n/pl.ts
@@ -63,6 +63,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Wprowadzanie zmian",
   "ui.sessionTurn.status.runningCommands": "Uruchamianie poleceń",
   "ui.sessionTurn.status.thinking": "Myślenie",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Myślenie - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Zbieranie myśli",
   "ui.sessionTurn.status.consideringNextSteps": "Rozważanie kolejnych kroków",
diff --git a/packages/ui/src/i18n/ru.ts b/packages/ui/src/i18n/ru.ts
index ed5c4e8f4f7c..c3ae9a45e995 100644
--- a/packages/ui/src/i18n/ru.ts
+++ b/packages/ui/src/i18n/ru.ts
@@ -63,6 +63,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Внесение изменений",
   "ui.sessionTurn.status.runningCommands": "Выполнение команд",
   "ui.sessionTurn.status.thinking": "Размышление",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Размышление - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Сбор мыслей",
   "ui.sessionTurn.status.consideringNextSteps": "Рассмотрение следующих шагов",
diff --git a/packages/ui/src/i18n/th.ts b/packages/ui/src/i18n/th.ts
index e2534041ab20..6a11bea01055 100644
--- a/packages/ui/src/i18n/th.ts
+++ b/packages/ui/src/i18n/th.ts
@@ -65,6 +65,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "กำลังแก้ไข",
   "ui.sessionTurn.status.runningCommands": "กำลังเรียกใช้คำสั่ง",
   "ui.sessionTurn.status.thinking": "กำลังคิด",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "กำลังคิด - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "รวบรวมความคิด",
   "ui.sessionTurn.status.consideringNextSteps": "พิจารณาขั้นตอนถัดไป",
diff --git a/packages/ui/src/i18n/tr.ts b/packages/ui/src/i18n/tr.ts
index 0ce4a73b6f52..ce12e5c54eb2 100644
--- a/packages/ui/src/i18n/tr.ts
+++ b/packages/ui/src/i18n/tr.ts
@@ -70,6 +70,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "Düzenlemeler yapılıyor",
   "ui.sessionTurn.status.runningCommands": "Komutlar çalıştırılıyor",
   "ui.sessionTurn.status.thinking": "Düşünüyor",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "Düşünüyor - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "Düşünceler toplanıyor",
   "ui.sessionTurn.status.consideringNextSteps": "Sonraki adımlar değerlendiriliyor",
diff --git a/packages/ui/src/i18n/zh.ts b/packages/ui/src/i18n/zh.ts
index 1a385620f191..822be4bbba62 100644
--- a/packages/ui/src/i18n/zh.ts
+++ b/packages/ui/src/i18n/zh.ts
@@ -67,6 +67,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "正在修改",
   "ui.sessionTurn.status.runningCommands": "正在运行命令",
   "ui.sessionTurn.status.thinking": "思考中",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "思考：{{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "正在整理思路",
   "ui.sessionTurn.status.consideringNextSteps": "正在考虑下一步",
diff --git a/packages/ui/src/i18n/zht.ts b/packages/ui/src/i18n/zht.ts
index 941e1df636b7..6d8322f14a32 100644
--- a/packages/ui/src/i18n/zht.ts
+++ b/packages/ui/src/i18n/zht.ts
@@ -67,6 +67,8 @@ export const dict = {
   "ui.sessionTurn.status.makingEdits": "正在修改",
   "ui.sessionTurn.status.runningCommands": "正在執行命令",
   "ui.sessionTurn.status.thinking": "思考中",
+  "ui.sessionTurn.status.steering": "Steering",
+  "ui.sessionTurn.status.wrappingUp": "Wrapping up",
   "ui.sessionTurn.status.thinkingWithTopic": "思考 - {{topic}}",
   "ui.sessionTurn.status.gatheringThoughts": "正在整理思緒",
   "ui.sessionTurn.status.consideringNextSteps": "正在考慮下一步",