From 6ee160f89c10293d635990798779988d34b092b4 Mon Sep 17 00:00:00 2001
From: Alex Alecu <a.marian.alexandru@gmail.com>
Date: Thu, 23 Apr 2026 17:56:56 +0300
Subject: [PATCH] fix(cli): preserve prompt text on dismiss

---
 .../preserve-input-across-blocking-overlays.md     |  5 +++++
 packages/opencode/src/cli/cmd/tui/plugin/slots.tsx | 14 +++++++++++++-
 .../src/cli/cmd/tui/routes/session/index.tsx       |  4 +++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/preserve-input-across-blocking-overlays.md

diff --git a/.changeset/preserve-input-across-blocking-overlays.md b/.changeset/preserve-input-across-blocking-overlays.md
new file mode 100644
index 00000000000..fe4a59786af
--- /dev/null
+++ b/.changeset/preserve-input-across-blocking-overlays.md
@@ -0,0 +1,5 @@
+---
+"@kilocode/cli": patch
+---
+
+Preserve typed text in the main prompt when a blocking question, suggestion, permission, or network overlay is shown and then dismissed.
diff --git a/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx b/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx
index a6d5ba7f955..d9bc05d7266 100644
--- a/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx
+++ b/packages/opencode/src/cli/cmd/tui/plugin/slots.tsx
@@ -1,5 +1,6 @@
 import type { TuiPluginApi, TuiSlotContext, TuiSlotMap, TuiSlotProps } from "@kilocode/plugin/tui"
 import { createSlot, createSolidSlotRegistry, type JSX, type SolidPlugin } from "@opentui/solid"
+import { children } from "solid-js"
 import { isRecord } from "@/util/record"
 
 type RuntimeSlotMap = TuiSlotMap<Record<string, object>>
@@ -21,7 +22,18 @@ function empty<Name extends string>(_props: TuiSlotProps<Name>) {
 
 let view: Slot = empty
 
-export const Slot: Slot = (props) => view(props)
+export const Slot = <Name extends string>(props: TuiSlotProps<Name>) => {
+  // kilocode_change start - stabilize fallback children so replace-mode slots
+  // don't recreate stateful defaults like the session prompt on prop changes.
+  const value = children(() => props.children)
+  return view({
+    ...props,
+    get children() {
+      return value()
+    },
+  } as TuiSlotProps<Name>)
+  // kilocode_change end
+}
 
 function isHostSlotPlugin(value: unknown): value is HostSlotPlugin<Record<string, object>> {
   if (!isRecord(value)) return false
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 001f66c130a..b9cc4bce5ef 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1295,7 +1295,8 @@ export function Session() {
                 <NetworkPrompt request={network()[0]} />
               </Show>
               {/* kilocode_change end */}
-              <Show when={visible()}>
+              {/* kilocode_change start */}
+              <Show when={!session()?.parentID}>
                 <TuiPluginRuntime.Slot
                   name="session_prompt"
                   mode="replace"
@@ -1317,6 +1318,7 @@ export function Session() {
                   />
                 </TuiPluginRuntime.Slot>
               </Show>
+              {/* kilocode_change end */}
             </box>
           </Show>
           <Toast />