From f7a4024e5ba5508db621f8cfe8c5616a95b7910b Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 20 Oct 2025 23:55:30 +0200
Subject: [PATCH 01/25] textarea

---
 .../cmd/tui/component/prompt/autocomplete.tsx | 16 ++--
 .../cli/cmd/tui/component/prompt/index.tsx    | 73 ++++++++++++-------
 2 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 45d19657e6..82d8338d96 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -1,4 +1,4 @@
-import type { ParsedKey, BoxRenderable, InputRenderable } from "@opentui/core"
+import type { BoxRenderable, TextareaRenderable, KeyEvent } from "@opentui/core"
 import fuzzysort from "fuzzysort"
 import { firstBy } from "remeda"
 import { createMemo, createResource, createEffect, onMount, For, Show } from "solid-js"
@@ -12,7 +12,7 @@ import type { PromptInfo } from "./history"
 
 export type AutocompleteRef = {
   onInput: (value: string) => void
-  onKeyDown: (e: ParsedKey) => void
+  onKeyDown: (e: KeyEvent) => void
   visible: false | "@" | "/"
 }
 
@@ -28,7 +28,7 @@ export function Autocomplete(props: {
   sessionID?: string
   setPrompt: (input: (prompt: PromptInfo) => void) => void
   anchor: () => BoxRenderable
-  input: () => InputRenderable
+  input: () => TextareaRenderable
   ref: (ref: AutocompleteRef) => void
 }) {
   const sdk = useSDK()
@@ -138,8 +138,9 @@ export function Autocomplete(props: {
         display: "/" + command.name,
         description: command.description,
         onSelect: () => {
+          console.log("commands.onSelect", command.name, Bun.stringWidth(props.input().value))
           props.input().value = "/" + command.name + " "
-          props.input().cursorPosition = props.input().value.length
+          props.input().cursorOffset = Bun.stringWidth(props.input().value)
         },
       })
     }
@@ -238,9 +239,10 @@ export function Autocomplete(props: {
   }
 
   function show(mode: "@" | "/") {
+    console.log("show", mode, props.input().visualCursor.offset)
     setStore({
       visible: mode,
-      index: props.input().cursorPosition,
+      index: props.input().visualCursor.offset,
       position: {
         x: props.anchor().x,
         y: props.anchor().y,
@@ -262,7 +264,7 @@ export function Autocomplete(props: {
       onInput(value: string) {
         if (store.visible && value.length <= store.index) hide()
       },
-      onKeyDown(e: ParsedKey) {
+      onKeyDown(e: KeyEvent) {
         if (store.visible) {
           if (e.name === "up") move(-1)
           if (e.name === "down") move(1)
@@ -278,7 +280,7 @@ export function Autocomplete(props: {
           }
 
           if (e.name === "/") {
-            if (props.input().cursorPosition === 0) show("/")
+            if (props.input().visualCursor.offset === 0) show("/")
           }
         }
       },
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index c7cd50dd1c..78f5be221e 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -1,4 +1,4 @@
-import { InputRenderable, TextAttributes, BoxRenderable } from "@opentui/core"
+import { TextAttributes, BoxRenderable, TextareaRenderable, MouseEvent, KeyEvent } from "@opentui/core"
 import { createEffect, createMemo, Match, Switch, type JSX } from "solid-js"
 import { useLocal } from "@tui/context/local"
 import { Theme } from "@tui/context/theme"
@@ -34,7 +34,7 @@ export type PromptRef = {
 }
 
 export function Prompt(props: PromptProps) {
-  let input: InputRenderable
+  let input: TextareaRenderable
   let anchor: BoxRenderable
   let autocomplete: AutocompleteRef
 
@@ -69,7 +69,8 @@ export function Prompt(props: PromptProps) {
               input: content,
               parts: [],
             })
-            input.cursorPosition = content.length
+            console.log("editor.open", content, Bun.stringWidth(content))
+            input.cursorOffset = Bun.stringWidth(content)
           }
         },
       },
@@ -141,7 +142,8 @@ export function Prompt(props: PromptProps) {
     },
     set(prompt) {
       setStore("prompt", prompt)
-      input.cursorPosition = prompt.input.length
+      console.log("prompt.set", prompt.input, Bun.stringWidth(prompt.input))
+      input.cursorOffset = Bun.stringWidth(prompt.input)
     },
     reset() {
       setStore("prompt", {
@@ -243,7 +245,8 @@ export function Prompt(props: PromptProps) {
         input={() => input}
         setPrompt={(cb) => {
           setStore("prompt", produce(cb))
-          input.cursorPosition = store.prompt.input.length
+          console.log("setPrompt", store.prompt.input, Bun.stringWidth(store.prompt.input))
+          input.cursorOffset = Bun.stringWidth(store.prompt.input)
         }}
         value={store.prompt.input}
       />
@@ -252,18 +255,23 @@ export function Prompt(props: PromptProps) {
           flexDirection="row"
           {...SplitBorder}
           borderColor={keybind.leader ? Theme.accent : store.mode === "shell" ? Theme.secondary : undefined}
+          justifyContent="space-evenly"
         >
-          <box backgroundColor={Theme.backgroundElement} width={3} justifyContent="center" alignItems="center">
+          <box
+            backgroundColor={Theme.backgroundElement}
+            width={3}
+            height="100%"
+            justifyContent="center"
+            alignItems="center"
+          >
             <text attributes={TextAttributes.BOLD} fg={Theme.primary}>
               {store.mode === "normal" ? ">" : "!"}
             </text>
           </box>
-          <box paddingTop={1} paddingBottom={2} backgroundColor={Theme.backgroundElement} flexGrow={1}>
-            <input
-              onPaste={async function (text) {
-                this.insertText(text)
-              }}
-              onInput={(value) => {
+          <box paddingTop={1} paddingBottom={1} backgroundColor={Theme.backgroundElement} flexGrow={1}>
+            <textarea
+              onContentChange={() => {
+                const value = input.value
                 let diff = value.length - store.prompt.input.length
                 setStore(
                   produce((draft) => {
@@ -272,7 +280,7 @@ export function Prompt(props: PromptProps) {
                       const part = draft.prompt.parts[i]
                       if (!part.source) continue
                       const source = part.type === "agent" ? part.source : part.source.text
-                      if (source.start >= input.cursorPosition) {
+                      if (source.start >= input.visualCursor.offset) {
                         source.start += diff
                         source.end += diff
                       }
@@ -282,7 +290,14 @@ export function Prompt(props: PromptProps) {
                         draft.prompt.input =
                           draft.prompt.input.slice(0, source.start) + draft.prompt.input.slice(source.end)
                         draft.prompt.parts.splice(i, 1)
-                        input.cursorPosition = Math.max(0, source.start - 1)
+                        console.log(
+                          "onContentChange setting cursor offset",
+                          value,
+                          input.visualCursor.offset,
+                          source.start,
+                          source.end,
+                        )
+                        input.cursorOffset = Math.max(0, source.start - 1)
                         i--
                       }
                     }
@@ -291,7 +306,7 @@ export function Prompt(props: PromptProps) {
                 autocomplete.onInput(value)
               }}
               value={store.prompt.input}
-              onKeyDown={async (e) => {
+              onKeyDown={async (e: KeyEvent) => {
                 if (props.disabled) {
                   e.preventDefault()
                   return
@@ -307,27 +322,31 @@ export function Prompt(props: PromptProps) {
                   await exit()
                   return
                 }
-                if (e.name === "!" && input.cursorPosition === 0) {
+                if (e.name === "!" && input.visualCursor.offset === 0) {
                   setStore("mode", "shell")
                   e.preventDefault()
                   return
                 }
                 if (store.mode === "shell") {
-                  if ((e.name === "backspace" && input.cursorPosition === 0) || e.name === "escape") {
+                  if ((e.name === "backspace" && input.visualCursor.offset === 0) || e.name === "escape") {
                     setStore("mode", "normal")
                     e.preventDefault()
                     return
                   }
                 }
                 if (store.mode === "normal") autocomplete.onKeyDown(e)
-                if (!autocomplete.visible) {
+                if (!autocomplete.visible && input.visualCursor.offset === 0) {
                   if (e.name === "up" || e.name === "down") {
                     const direction = e.name === "up" ? -1 : 1
                     const item = history.move(direction)
                     setStore("prompt", item)
-                    input.cursorPosition = item.input.length
+                    console.log("commands.onKeyDown", "up", "down", 0)
+                    input.cursorOffset = 0
+                    e.preventDefault()
                     return
                   }
+                }
+                if (!autocomplete.visible) {
                   if (e.name === "escape" && props.sessionID) {
                     sdk.client.session.abort({
                       path: {
@@ -337,9 +356,9 @@ export function Prompt(props: PromptProps) {
                     return
                   }
                 }
-                const old = input.cursorPosition
+                const old = input.visualCursor.offset
                 setTimeout(() => {
-                  const position = input.cursorPosition
+                  const position = input.visualCursor.offset
                   const direction = Math.sign(old - position)
                   for (const part of store.prompt.parts) {
                     const source = iife(() => {
@@ -350,10 +369,12 @@ export function Prompt(props: PromptProps) {
                     if (source) {
                       if (position >= source.start && position < source.end) {
                         if (direction === 1) {
-                          input.cursorPosition = Math.max(0, source.start - 1)
+                          console.log("onKeyDown setting cursor offset", source.start - 1)
+                          input.cursorOffset = Math.max(0, source.start - 1)
                         }
                         if (direction === -1) {
-                          input.cursorPosition = source.end
+                          console.log("onKeyDown setting cursor offset", source.end)
+                          input.cursorOffset = source.end
                         }
                       }
                     }
@@ -361,8 +382,8 @@ export function Prompt(props: PromptProps) {
                 }, 0)
               }}
               onSubmit={submit}
-              ref={(r) => (input = r)}
-              onMouseDown={(r) => r.target?.focus()}
+              ref={(r: TextareaRenderable) => (input = r)}
+              onMouseDown={(r: MouseEvent) => r.target?.focus()}
               focusedBackgroundColor={Theme.backgroundElement}
               cursorColor={Theme.primary}
               backgroundColor={Theme.backgroundElement}
@@ -371,7 +392,7 @@ export function Prompt(props: PromptProps) {
           <box backgroundColor={Theme.backgroundElement} width={1} justifyContent="center" alignItems="center"></box>
         </box>
         <box flexDirection="row" justifyContent="space-between">
-          <text flexShrink={0} wrap={false}>
+          <text flexShrink={0} wrapMode="none">
             <span style={{ fg: Theme.textMuted }}>{local.model.parsed().provider}</span>{" "}
             <span style={{ bold: true }}>{local.model.parsed().model}</span>
           </text>

From efe32b16f0f0d405d557d6c354b9cddce1091af8 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Fri, 24 Oct 2025 22:42:08 +0200
Subject: [PATCH 02/25] progress

---
 .../cmd/tui/component/prompt/autocomplete.tsx | 19 +++++++++++++----
 .../cli/cmd/tui/component/prompt/index.tsx    | 21 +++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index fc81e7ac46..6dfe665f7d 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -85,6 +85,9 @@ export function Autocomplete(props: {
                 }
                 props.setPrompt((draft) => {
                   const append = "@" + item + " "
+                  const cursor = props.input().cursor
+                  props.input().editBuffer.deleteRange(0, store.index, cursor.line, cursor.visualColumn)
+                  props.input().editBuffer.insertText(append)
                   if (store.index === 0) draft.input = append
                   if (store.index > 0) draft.input = draft.input.slice(0, store.index) + append
                   draft.parts.push(part)
@@ -113,6 +116,9 @@ export function Autocomplete(props: {
           onSelect: () => {
             props.setPrompt((draft) => {
               const append = "@" + agent.name + " "
+              const cursor = props.input().cursor
+              props.input().editBuffer.deleteRange(0, store.index, cursor.line, cursor.visualColumn)
+              props.input().editBuffer.insertText(append)
               draft.input = append
               draft.parts.push({
                 type: "agent",
@@ -138,9 +144,11 @@ export function Autocomplete(props: {
         display: "/" + command.name,
         description: command.description,
         onSelect: () => {
-          console.log("commands.onSelect", command.name, Bun.stringWidth(props.input().value))
-          props.input().value = "/" + command.name + " "
-          props.input().cursorOffset = Bun.stringWidth(props.input().value)
+          const newText = "/" + command.name + " "
+          const cursor = props.input().cursor
+          props.input().editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+          props.input().editBuffer.insertText(newText)
+          props.input().cursorOffset = Bun.stringWidth(newText)
         },
       })
     }
@@ -252,7 +260,10 @@ export function Autocomplete(props: {
   }
 
   function hide() {
-    if (store.visible === "/" && !props.value.endsWith(" ")) props.input().value = ""
+    if (store.visible === "/" && !props.value.endsWith(" ")) {
+      const cursor = props.input().cursor
+      props.input().editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+    }
     setStore("visible", false)
   }
 
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index cc9632f7ba..b8fb3c93c6 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -57,14 +57,18 @@ export function Prompt(props: PromptProps) {
         value: "prompt.editor",
         onSelect: async (dialog) => {
           dialog.clear()
-          const value = input.value
-          input.value = ""
+          const value = input.plainText
+          const cursor = input.cursor
+          input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
           setStore("prompt", {
             input: "",
             parts: [],
           })
           const content = await Editor.open({ value, renderer })
           if (content) {
+            const cursor = input.cursor
+            input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+            input.editBuffer.insertText(content)
             setStore("prompt", {
               input: content,
               parts: [],
@@ -141,6 +145,9 @@ export function Prompt(props: PromptProps) {
       input.blur()
     },
     set(prompt) {
+      const cursor = input.cursor
+      input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+      input.editBuffer.insertText(prompt.input)
       setStore("prompt", prompt)
       console.log("prompt.set", prompt.input, Bun.stringWidth(prompt.input))
       input.cursorOffset = Bun.stringWidth(prompt.input)
@@ -267,7 +274,7 @@ export function Prompt(props: PromptProps) {
           <box paddingTop={1} paddingBottom={1} backgroundColor={Theme.backgroundElement} flexGrow={1}>
             <textarea
               onContentChange={() => {
-                const value = input.value
+                const value = input.plainText
                 let diff = value.length - store.prompt.input.length
                 setStore(
                   produce((draft) => {
@@ -301,7 +308,6 @@ export function Prompt(props: PromptProps) {
                 )
                 autocomplete.onInput(value)
               }}
-              value={store.prompt.input}
               onKeyDown={async (e: KeyEvent) => {
                 if (props.disabled) {
                   e.preventDefault()
@@ -334,10 +340,13 @@ export function Prompt(props: PromptProps) {
                 if (!autocomplete.visible && input.visualCursor.offset === 0) {
                   if (e.name === "up" || e.name === "down") {
                     const direction = e.name === "up" ? -1 : 1
-                    const item = history.move(direction, input.value)
+                    const item = history.move(direction, input.plainText)
                     if (item) {
+                      const cursor = input.cursor
+                      input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+                      input.editBuffer.insertText(item.input)
                       setStore("prompt", item)
-                      input.cursorPosition = item.input.length
+                      input.cursorOffset = 0
                       e.preventDefault()
                     }
                     return

From 2f9c466cf42c1da6c3686bc33f90ab3157ce14c0 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Fri, 24 Oct 2025 23:36:00 +0200
Subject: [PATCH 03/25] proper clear and history option+arrow

---
 .../cmd/tui/component/prompt/autocomplete.tsx | 14 +++++------
 .../cli/cmd/tui/component/prompt/index.tsx    | 23 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 6dfe665f7d..1c8658c87e 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -86,8 +86,8 @@ export function Autocomplete(props: {
                 props.setPrompt((draft) => {
                   const append = "@" + item + " "
                   const cursor = props.input().cursor
-                  props.input().editBuffer.deleteRange(0, store.index, cursor.line, cursor.visualColumn)
-                  props.input().editBuffer.insertText(append)
+                  props.input().deleteRange(0, store.index, cursor.line, cursor.visualColumn)
+                  props.input().insertText(append)
                   if (store.index === 0) draft.input = append
                   if (store.index > 0) draft.input = draft.input.slice(0, store.index) + append
                   draft.parts.push(part)
@@ -117,8 +117,8 @@ export function Autocomplete(props: {
             props.setPrompt((draft) => {
               const append = "@" + agent.name + " "
               const cursor = props.input().cursor
-              props.input().editBuffer.deleteRange(0, store.index, cursor.line, cursor.visualColumn)
-              props.input().editBuffer.insertText(append)
+              props.input().deleteRange(0, store.index, cursor.line, cursor.visualColumn)
+              props.input().insertText(append)
               draft.input = append
               draft.parts.push({
                 type: "agent",
@@ -146,8 +146,8 @@ export function Autocomplete(props: {
         onSelect: () => {
           const newText = "/" + command.name + " "
           const cursor = props.input().cursor
-          props.input().editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
-          props.input().editBuffer.insertText(newText)
+          props.input().deleteRange(0, 0, cursor.line, cursor.visualColumn)
+          props.input().insertText(newText)
           props.input().cursorOffset = Bun.stringWidth(newText)
         },
       })
@@ -262,7 +262,7 @@ export function Autocomplete(props: {
   function hide() {
     if (store.visible === "/" && !props.value.endsWith(" ")) {
       const cursor = props.input().cursor
-      props.input().editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+      props.input().deleteRange(0, 0, cursor.line, cursor.visualColumn)
     }
     setStore("visible", false)
   }
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index b8fb3c93c6..fa2576f92b 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -58,8 +58,7 @@ export function Prompt(props: PromptProps) {
         onSelect: async (dialog) => {
           dialog.clear()
           const value = input.plainText
-          const cursor = input.cursor
-          input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
+          input.clear()
           setStore("prompt", {
             input: "",
             parts: [],
@@ -67,13 +66,11 @@ export function Prompt(props: PromptProps) {
           const content = await Editor.open({ value, renderer })
           if (content) {
             const cursor = input.cursor
-            input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
-            input.editBuffer.insertText(content)
+            input.setText(content, { history: false })
             setStore("prompt", {
               input: content,
               parts: [],
             })
-            console.log("editor.open", content, Bun.stringWidth(content))
             input.cursorOffset = Bun.stringWidth(content)
           }
         },
@@ -146,8 +143,7 @@ export function Prompt(props: PromptProps) {
     },
     set(prompt) {
       const cursor = input.cursor
-      input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
-      input.editBuffer.insertText(prompt.input)
+      input.setText(prompt.input, { history: false })
       setStore("prompt", prompt)
       console.log("prompt.set", prompt.input, Bun.stringWidth(prompt.input))
       input.cursorOffset = Bun.stringWidth(prompt.input)
@@ -278,6 +274,7 @@ export function Prompt(props: PromptProps) {
                 let diff = value.length - store.prompt.input.length
                 setStore(
                   produce((draft) => {
+                    // This handles virtual text like @filename
                     draft.prompt.input = value
                     for (let i = 0; i < draft.prompt.parts.length; i++) {
                       const part = draft.prompt.parts[i]
@@ -314,6 +311,7 @@ export function Prompt(props: PromptProps) {
                   return
                 }
                 if (keybind.match("input_clear", e) && store.prompt.input !== "") {
+                  input.clear()
                   setStore("prompt", {
                     input: "",
                     parts: [],
@@ -337,16 +335,14 @@ export function Prompt(props: PromptProps) {
                   }
                 }
                 if (store.mode === "normal") autocomplete.onKeyDown(e)
-                if (!autocomplete.visible && input.visualCursor.offset === 0) {
-                  if (e.name === "up" || e.name === "down") {
+                if (!autocomplete.visible) {
+                  if (e.option && (e.name === "up" || e.name === "down")) {
                     const direction = e.name === "up" ? -1 : 1
                     const item = history.move(direction, input.plainText)
                     if (item) {
                       const cursor = input.cursor
-                      input.editBuffer.deleteRange(0, 0, cursor.line, cursor.visualColumn)
-                      input.editBuffer.insertText(item.input)
+                      input.setText(item.input, { history: false })
                       setStore("prompt", item)
-                      input.cursorOffset = 0
                       e.preventDefault()
                     }
                     return
@@ -364,6 +360,7 @@ export function Prompt(props: PromptProps) {
                 }
                 const old = input.visualCursor.offset
                 setTimeout(() => {
+                  // This handles virtual text like @filename
                   const position = input.visualCursor.offset
                   const direction = Math.sign(old - position)
                   for (const part of store.prompt.parts) {
@@ -375,11 +372,9 @@ export function Prompt(props: PromptProps) {
                     if (source) {
                       if (position >= source.start && position < source.end) {
                         if (direction === 1) {
-                          console.log("onKeyDown setting cursor offset", source.start - 1)
                           input.cursorOffset = Math.max(0, source.start - 1)
                         }
                         if (direction === -1) {
-                          console.log("onKeyDown setting cursor offset", source.end)
                           input.cursorOffset = source.end
                         }
                       }

From 4d0197bbd741cde2548bb12ce142df8457dd9938 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Fri, 24 Oct 2025 23:46:51 +0200
Subject: [PATCH 04/25] stash

---
 .../opencode/src/cli/cmd/tui/component/prompt/index.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index fa2576f92b..b767c37b63 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -145,10 +145,10 @@ export function Prompt(props: PromptProps) {
       const cursor = input.cursor
       input.setText(prompt.input, { history: false })
       setStore("prompt", prompt)
-      console.log("prompt.set", prompt.input, Bun.stringWidth(prompt.input))
-      input.cursorOffset = Bun.stringWidth(prompt.input)
+      input.gotoBufferEnd()
     },
     reset() {
+      input.clear()
       setStore("prompt", {
         input: "",
         parts: [],
@@ -387,7 +387,7 @@ export function Prompt(props: PromptProps) {
               onMouseDown={(r: MouseEvent) => r.target?.focus()}
               focusedBackgroundColor={Theme.backgroundElement}
               cursorColor={Theme.primary}
-              backgroundColor={Theme.backgroundElement}
+              // backgroundColor={Theme.backgroundElement} <- can be transparent as parent box has backgroundColor
             />
           </box>
           <box backgroundColor={Theme.backgroundElement} width={1} justifyContent="center" alignItems="center"></box>

From 967e963a7b491279046b6ab506746a17f22c2b6b Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sat, 25 Oct 2025 00:51:12 +0200
Subject: [PATCH 05/25] submit

---
 .../opencode/src/cli/cmd/tui/component/prompt/index.tsx     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index b767c37b63..1ed7013a95 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -305,6 +305,12 @@ export function Prompt(props: PromptProps) {
                 )
                 autocomplete.onInput(value)
               }}
+              keyBindings={[
+                { name: "return", meta: true, action: "newline" },
+                { name: "enter", meta: true, action: "newline" },
+                { name: "return", action: "submit" },
+                { name: "enter", action: "submit" },
+              ]}
               onKeyDown={async (e: KeyEvent) => {
                 if (props.disabled) {
                   e.preventDefault()

From 581f30f84defb6b8c61491189fd5e574892f6745 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sat, 25 Oct 2025 19:10:39 +0200
Subject: [PATCH 06/25] do not try to access cursor on destroyed textarea

---
 .../src/cli/cmd/tui/component/prompt/autocomplete.tsx |  4 ++--
 .../src/cli/cmd/tui/component/prompt/index.tsx        | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 1c8658c87e..027a8ffebe 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -243,11 +243,10 @@ export function Autocomplete(props: {
     const selected = options()[store.selected]
     if (!selected) return
     selected.onSelect?.()
-    setTimeout(() => hide(), 0)
+    hide()
   }
 
   function show(mode: "@" | "/") {
-    console.log("show", mode, props.input().visualCursor.offset)
     setStore({
       visible: mode,
       index: props.input().visualCursor.offset,
@@ -281,6 +280,7 @@ export function Autocomplete(props: {
           if (e.name === "down") move(1)
           if (e.name === "escape") hide()
           if (e.name === "return") select()
+          if (["up", "down", "return", "escape"].includes(e.name)) e.preventDefault()
         }
         if (!store.visible) {
           if (e.name === "@") {
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 1ed7013a95..fe5f3e59ab 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -65,7 +65,6 @@ export function Prompt(props: PromptProps) {
           })
           const content = await Editor.open({ value, renderer })
           if (content) {
-            const cursor = input.cursor
             input.setText(content, { history: false })
             setStore("prompt", {
               input: content,
@@ -142,7 +141,6 @@ export function Prompt(props: PromptProps) {
       input.blur()
     },
     set(prompt) {
-      const cursor = input.cursor
       input.setText(prompt.input, { history: false })
       setStore("prompt", prompt)
       input.gotoBufferEnd()
@@ -290,13 +288,6 @@ export function Prompt(props: PromptProps) {
                         draft.prompt.input =
                           draft.prompt.input.slice(0, source.start) + draft.prompt.input.slice(source.end)
                         draft.prompt.parts.splice(i, 1)
-                        console.log(
-                          "onContentChange setting cursor offset",
-                          value,
-                          input.visualCursor.offset,
-                          source.start,
-                          source.end,
-                        )
                         input.cursorOffset = Math.max(0, source.start - 1)
                         i--
                       }
@@ -366,6 +357,8 @@ export function Prompt(props: PromptProps) {
                 }
                 const old = input.visualCursor.offset
                 setTimeout(() => {
+                  if (input.isDestroyed) return
+
                   // This handles virtual text like @filename
                   const position = input.visualCursor.offset
                   const direction = Math.sign(old - position)

From 456dd1f62b84c35c86e32d15723535487fa4716c Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sat, 25 Oct 2025 19:20:53 +0200
Subject: [PATCH 07/25] use logical cursor

---
 .../cmd/tui/component/prompt/autocomplete.tsx    | 16 ++++++++--------
 .../src/cli/cmd/tui/component/prompt/index.tsx   |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 027a8ffebe..d4a5330e5f 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -85,8 +85,8 @@ export function Autocomplete(props: {
                 }
                 props.setPrompt((draft) => {
                   const append = "@" + item + " "
-                  const cursor = props.input().cursor
-                  props.input().deleteRange(0, store.index, cursor.line, cursor.visualColumn)
+                  const cursor = props.input().logicalCursor
+                  props.input().deleteRange(0, store.index, cursor.row, cursor.col)
                   props.input().insertText(append)
                   if (store.index === 0) draft.input = append
                   if (store.index > 0) draft.input = draft.input.slice(0, store.index) + append
@@ -116,8 +116,8 @@ export function Autocomplete(props: {
           onSelect: () => {
             props.setPrompt((draft) => {
               const append = "@" + agent.name + " "
-              const cursor = props.input().cursor
-              props.input().deleteRange(0, store.index, cursor.line, cursor.visualColumn)
+              const cursor = props.input().logicalCursor
+              props.input().deleteRange(0, store.index, cursor.row, cursor.col)
               props.input().insertText(append)
               draft.input = append
               draft.parts.push({
@@ -145,8 +145,8 @@ export function Autocomplete(props: {
         description: command.description,
         onSelect: () => {
           const newText = "/" + command.name + " "
-          const cursor = props.input().cursor
-          props.input().deleteRange(0, 0, cursor.line, cursor.visualColumn)
+          const cursor = props.input().logicalCursor
+          props.input().deleteRange(0, 0, cursor.row, cursor.col)
           props.input().insertText(newText)
           props.input().cursorOffset = Bun.stringWidth(newText)
         },
@@ -260,8 +260,8 @@ export function Autocomplete(props: {
 
   function hide() {
     if (store.visible === "/" && !props.value.endsWith(" ")) {
-      const cursor = props.input().cursor
-      props.input().deleteRange(0, 0, cursor.line, cursor.visualColumn)
+      const cursor = props.input().logicalCursor
+      props.input().deleteRange(0, 0, cursor.row, cursor.col)
     }
     setStore("visible", false)
   }
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index fe5f3e59ab..34581bf0ed 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -337,7 +337,6 @@ export function Prompt(props: PromptProps) {
                     const direction = e.name === "up" ? -1 : 1
                     const item = history.move(direction, input.plainText)
                     if (item) {
-                      const cursor = input.cursor
                       input.setText(item.input, { history: false })
                       setStore("prompt", item)
                       e.preventDefault()

From c92566773b3b9440021d9f73300c3b3960a7c1af Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 02:31:23 +0200
Subject: [PATCH 08/25] use extmarks

---
 .../cmd/tui/component/prompt/autocomplete.tsx |  55 +++++---
 .../cli/cmd/tui/component/prompt/index.tsx    | 121 ++++++++++--------
 2 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index d4a5330e5f..0d83dc628c 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -27,6 +27,7 @@ export function Autocomplete(props: {
   value: string
   sessionID?: string
   setPrompt: (input: (prompt: PromptInfo) => void) => void
+  setExtmark: (partIndex: number, extmarkId: number) => void
   anchor: () => BoxRenderable
   input: () => TextareaRenderable
   ref: (ref: AutocompleteRef) => void
@@ -68,21 +69,6 @@ export function Autocomplete(props: {
             (item): AutocompleteOption => ({
               display: item,
               onSelect: () => {
-                const part: PromptInfo["parts"][number] = {
-                  type: "file",
-                  mime: "text/plain",
-                  filename: item,
-                  url: `file://${process.cwd()}/${item}`,
-                  source: {
-                    type: "file",
-                    text: {
-                      start: store.index,
-                      end: store.index + item.length + 1,
-                      value: "@" + item,
-                    },
-                    path: item,
-                  },
-                }
                 props.setPrompt((draft) => {
                   const append = "@" + item + " "
                   const cursor = props.input().logicalCursor
@@ -90,7 +76,32 @@ export function Autocomplete(props: {
                   props.input().insertText(append)
                   if (store.index === 0) draft.input = append
                   if (store.index > 0) draft.input = draft.input.slice(0, store.index) + append
+
+                  const virtualText = "@" + item
+                  const extmarkId = props.input().extmarks.create({
+                    start: store.index,
+                    end: store.index + virtualText.length,
+                    virtual: true,
+                  })
+
+                  const part: PromptInfo["parts"][number] = {
+                    type: "file",
+                    mime: "text/plain",
+                    filename: item,
+                    url: `file://${process.cwd()}/${item}`,
+                    source: {
+                      type: "file",
+                      text: {
+                        start: store.index,
+                        end: store.index + virtualText.length,
+                        value: virtualText,
+                      },
+                      path: item,
+                    },
+                  }
+                  const partIndex = draft.parts.length
                   draft.parts.push(part)
+                  props.setExtmark(partIndex, extmarkId)
                 })
               },
             }),
@@ -120,15 +131,25 @@ export function Autocomplete(props: {
               props.input().deleteRange(0, store.index, cursor.row, cursor.col)
               props.input().insertText(append)
               draft.input = append
+
+              const virtualText = "@" + agent.name
+              const extmarkId = props.input().extmarks.create({
+                start: store.index,
+                end: store.index + virtualText.length,
+                virtual: true,
+              })
+
+              const partIndex = draft.parts.length
               draft.parts.push({
                 type: "agent",
                 source: {
                   start: store.index,
-                  end: store.index + agent.name.length + 1,
-                  value: "@" + agent.name,
+                  end: store.index + virtualText.length,
+                  value: virtualText,
                 },
                 name: agent.name,
               })
+              props.setExtmark(partIndex, extmarkId)
             })
           },
         }),
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 34581bf0ed..af8badfeb7 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -11,7 +11,6 @@ import { createStore, produce } from "solid-js/store"
 import { useKeybind } from "@tui/context/keybind"
 import { usePromptHistory, type PromptInfo } from "./history"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
-import { iife } from "@/util/iife"
 import { useCommandDialog } from "../dialog-command"
 import { useRenderer } from "@opentui/solid"
 import { Editor } from "@tui/util/editor"
@@ -80,10 +79,12 @@ export function Prompt(props: PromptProps) {
         disabled: true,
         category: "Prompt",
         onSelect: (dialog) => {
+          input.extmarks.clear()
           setStore("prompt", {
             input: "",
             parts: [],
           })
+          setStore("extmarks", new Map())
           dialog.clear()
         },
       },
@@ -118,18 +119,62 @@ export function Prompt(props: PromptProps) {
   const [store, setStore] = createStore<{
     prompt: PromptInfo
     mode: "normal" | "shell"
+    extmarks: Map<number, number>
   }>({
     prompt: {
       input: "",
       parts: [],
     },
     mode: "normal",
+    extmarks: new Map(),
   })
 
   createEffect(() => {
     input.focus()
   })
 
+  createEffect(() => {
+    if (!input) return
+    const extmarks = input.extmarks
+
+    const handleDelete = (evt: any) => {
+      setStore(
+        produce((draft) => {
+          const partIndex = Array.from(draft.extmarks.entries()).findIndex(([_, id]) => id === evt.extmark.id)
+          if (partIndex !== -1) {
+            draft.extmarks.delete(partIndex)
+            draft.prompt.parts.splice(partIndex, 1)
+          }
+        }),
+      )
+    }
+
+    const handleUpdate = (extmark: any) => {
+      setStore(
+        produce((draft) => {
+          const partIndex = Array.from(draft.extmarks.entries()).find(([_, id]) => id === extmark.id)?.[0]
+          if (partIndex !== undefined) {
+            const part = draft.prompt.parts[partIndex]
+            if (part.type === "agent" && part.source) {
+              part.source.start = extmark.start
+              part.source.end = extmark.end
+            } else if (part.type === "file" && part.source?.text) {
+              part.source.text.start = extmark.start
+              part.source.text.end = extmark.end
+            }
+          }
+        }),
+      )
+    }
+
+    extmarks.on("extmark-deleted", handleDelete)
+    extmarks.on("extmark-updated", handleUpdate)
+    return () => {
+      extmarks.off("extmark-deleted", handleDelete)
+      extmarks.off("extmark-updated", handleUpdate)
+    }
+  })
+
   props.ref?.({
     get focused() {
       return input.focused
@@ -147,10 +192,12 @@ export function Prompt(props: PromptProps) {
     },
     reset() {
       input.clear()
+      input.extmarks.clear()
       setStore("prompt", {
         input: "",
         parts: [],
       })
+      setStore("extmarks", new Map())
     },
   })
 
@@ -165,7 +212,7 @@ export function Prompt(props: PromptProps) {
           return sessionID
         })()
     const messageID = Identifier.ascending("message")
-    const input = store.prompt.input
+    const inputText = store.prompt.input
     if (store.mode === "shell") {
       sdk.client.session.shell({
         path: {
@@ -173,12 +220,12 @@ export function Prompt(props: PromptProps) {
         },
         body: {
           agent: local.agent.current().name,
-          command: input,
+          command: inputText,
         },
       })
       setStore("mode", "normal")
-    } else if (input.startsWith("/")) {
-      const [command, ...args] = input.split(" ")
+    } else if (inputText.startsWith("/")) {
+      const [command, ...args] = inputText.split(" ")
       sdk.client.session.command({
         path: {
           id: sessionID,
@@ -205,7 +252,7 @@ export function Prompt(props: PromptProps) {
             {
               id: Identifier.ascending("part"),
               type: "text",
-              text: input,
+              text: inputText,
             },
             ...store.prompt.parts.map((x) => ({
               id: Identifier.ascending("part"),
@@ -216,10 +263,12 @@ export function Prompt(props: PromptProps) {
       })
     }
     history.append(store.prompt)
+    input.extmarks.clear()
     setStore("prompt", {
       input: "",
       parts: [],
     })
+    setStore("extmarks", new Map())
     props.onSubmit?.()
 
     // temporary hack to make sure the message is sent
@@ -245,6 +294,13 @@ export function Prompt(props: PromptProps) {
           console.log("setPrompt", store.prompt.input, Bun.stringWidth(store.prompt.input))
           input.cursorOffset = Bun.stringWidth(store.prompt.input)
         }}
+        setExtmark={(partIndex, extmarkId) => {
+          setStore("extmarks", (map) => {
+            const newMap = new Map(map)
+            newMap.set(partIndex, extmarkId)
+            return newMap
+          })
+        }}
         value={store.prompt.input}
       />
       <box ref={(r) => (anchor = r)}>
@@ -269,31 +325,7 @@ export function Prompt(props: PromptProps) {
             <textarea
               onContentChange={() => {
                 const value = input.plainText
-                let diff = value.length - store.prompt.input.length
-                setStore(
-                  produce((draft) => {
-                    // This handles virtual text like @filename
-                    draft.prompt.input = value
-                    for (let i = 0; i < draft.prompt.parts.length; i++) {
-                      const part = draft.prompt.parts[i]
-                      if (!part.source) continue
-                      const source = part.type === "agent" ? part.source : part.source.text
-                      if (source.start >= input.visualCursor.offset) {
-                        source.start += diff
-                        source.end += diff
-                      }
-                      const sliced = draft.prompt.input.slice(source.start, source.end)
-                      if (sliced != source.value && diff < 0) {
-                        diff -= source.value.length
-                        draft.prompt.input =
-                          draft.prompt.input.slice(0, source.start) + draft.prompt.input.slice(source.end)
-                        draft.prompt.parts.splice(i, 1)
-                        input.cursorOffset = Math.max(0, source.start - 1)
-                        i--
-                      }
-                    }
-                  }),
-                )
+                setStore("prompt", "input", value)
                 autocomplete.onInput(value)
               }}
               keyBindings={[
@@ -309,10 +341,12 @@ export function Prompt(props: PromptProps) {
                 }
                 if (keybind.match("input_clear", e) && store.prompt.input !== "") {
                   input.clear()
+                  input.extmarks.clear()
                   setStore("prompt", {
                     input: "",
                     parts: [],
                   })
+                  setStore("extmarks", new Map())
                   return
                 }
                 if (keybind.match("app_exit", e)) {
@@ -354,31 +388,6 @@ export function Prompt(props: PromptProps) {
                     return
                   }
                 }
-                const old = input.visualCursor.offset
-                setTimeout(() => {
-                  if (input.isDestroyed) return
-
-                  // This handles virtual text like @filename
-                  const position = input.visualCursor.offset
-                  const direction = Math.sign(old - position)
-                  for (const part of store.prompt.parts) {
-                    const source = iife(() => {
-                      if (part.type === "agent") return part.source
-                      if (part.type === "file") return part.source?.text
-                      return
-                    })
-                    if (source) {
-                      if (position >= source.start && position < source.end) {
-                        if (direction === 1) {
-                          input.cursorOffset = Math.max(0, source.start - 1)
-                        }
-                        if (direction === -1) {
-                          input.cursorOffset = source.end
-                        }
-                      }
-                    }
-                  }
-                }, 0)
               }}
               onSubmit={submit}
               ref={(r: TextareaRenderable) => (input = r)}

From 10392ced4078c078b74659478b16ab733c9b8922 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 02:38:55 +0200
Subject: [PATCH 09/25] works but wth

---
 .../cmd/tui/component/prompt/autocomplete.tsx | 77 ++++++++++++-------
 .../cli/cmd/tui/component/prompt/index.tsx    |  2 -
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 0d83dc628c..2efc8758ab 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -69,21 +69,30 @@ export function Autocomplete(props: {
             (item): AutocompleteOption => ({
               display: item,
               onSelect: () => {
-                props.setPrompt((draft) => {
-                  const append = "@" + item + " "
-                  const cursor = props.input().logicalCursor
-                  props.input().deleteRange(0, store.index, cursor.row, cursor.col)
-                  props.input().insertText(append)
-                  if (store.index === 0) draft.input = append
-                  if (store.index > 0) draft.input = draft.input.slice(0, store.index) + append
+                const append = "@" + item + " "
+                const input = props.input()
+                const currentCursorOffset = input.visualCursor.offset
+
+                const savedCursorOffset = currentCursorOffset
+                input.cursorOffset = store.index
+                const startCursor = input.logicalCursor
+                input.cursorOffset = savedCursorOffset
+                const endCursor = input.logicalCursor
 
-                  const virtualText = "@" + item
-                  const extmarkId = props.input().extmarks.create({
-                    start: store.index,
-                    end: store.index + virtualText.length,
-                    virtual: true,
-                  })
+                input.deleteRange(startCursor.row, startCursor.col, endCursor.row, endCursor.col)
+                input.insertText(append)
 
+                const virtualText = "@" + item
+                const extmarkStart = store.index
+                const extmarkEnd = extmarkStart + virtualText.length
+
+                const extmarkId = input.extmarks.create({
+                  start: extmarkStart,
+                  end: extmarkEnd,
+                  virtual: true,
+                })
+
+                props.setPrompt((draft) => {
                   const part: PromptInfo["parts"][number] = {
                     type: "file",
                     mime: "text/plain",
@@ -92,8 +101,8 @@ export function Autocomplete(props: {
                     source: {
                       type: "file",
                       text: {
-                        start: store.index,
-                        end: store.index + virtualText.length,
+                        start: extmarkStart,
+                        end: extmarkEnd,
                         value: virtualText,
                       },
                       path: item,
@@ -125,26 +134,36 @@ export function Autocomplete(props: {
         (agent): AutocompleteOption => ({
           display: "@" + agent.name,
           onSelect: () => {
-            props.setPrompt((draft) => {
-              const append = "@" + agent.name + " "
-              const cursor = props.input().logicalCursor
-              props.input().deleteRange(0, store.index, cursor.row, cursor.col)
-              props.input().insertText(append)
-              draft.input = append
+            const append = "@" + agent.name + " "
+            const input = props.input()
+            const currentCursorOffset = input.visualCursor.offset
 
-              const virtualText = "@" + agent.name
-              const extmarkId = props.input().extmarks.create({
-                start: store.index,
-                end: store.index + virtualText.length,
-                virtual: true,
-              })
+            const savedCursorOffset = currentCursorOffset
+            input.cursorOffset = store.index
+            const startCursor = input.logicalCursor
+            input.cursorOffset = savedCursorOffset
+            const endCursor = input.logicalCursor
+
+            input.deleteRange(startCursor.row, startCursor.col, endCursor.row, endCursor.col)
+            input.insertText(append)
+
+            const virtualText = "@" + agent.name
+            const extmarkStart = store.index
+            const extmarkEnd = extmarkStart + virtualText.length
 
+            const extmarkId = input.extmarks.create({
+              start: extmarkStart,
+              end: extmarkEnd,
+              virtual: true,
+            })
+
+            props.setPrompt((draft) => {
               const partIndex = draft.parts.length
               draft.parts.push({
                 type: "agent",
                 source: {
-                  start: store.index,
-                  end: store.index + virtualText.length,
+                  start: extmarkStart,
+                  end: extmarkEnd,
                   value: virtualText,
                 },
                 name: agent.name,
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index af8badfeb7..5dcf202a37 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -291,8 +291,6 @@ export function Prompt(props: PromptProps) {
         input={() => input}
         setPrompt={(cb) => {
           setStore("prompt", produce(cb))
-          console.log("setPrompt", store.prompt.input, Bun.stringWidth(store.prompt.input))
-          input.cursorOffset = Bun.stringWidth(store.prompt.input)
         }}
         setExtmark={(partIndex, extmarkId) => {
           setStore("extmarks", (map) => {

From c138b4689fd1c84f09c04a34f162e77aa36b3d86 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 02:42:38 +0200
Subject: [PATCH 10/25] extract

---
 .../cmd/tui/component/prompt/autocomplete.tsx | 134 ++++++++----------
 1 file changed, 59 insertions(+), 75 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 2efc8758ab..5a1b2d2960 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -47,6 +47,45 @@ export function Autocomplete(props: {
     return props.value.substring(store.index + 1).split(" ")[0]
   })
 
+  function insertPart(text: string, part: PromptInfo["parts"][number]) {
+    const append = "@" + text + " "
+    const input = props.input()
+    const currentCursorOffset = input.visualCursor.offset
+
+    input.cursorOffset = store.index
+    const startCursor = input.logicalCursor
+    input.cursorOffset = currentCursorOffset
+    const endCursor = input.logicalCursor
+
+    input.deleteRange(startCursor.row, startCursor.col, endCursor.row, endCursor.col)
+    input.insertText(append)
+
+    const virtualText = "@" + text
+    const extmarkStart = store.index
+    const extmarkEnd = extmarkStart + virtualText.length
+
+    const extmarkId = input.extmarks.create({
+      start: extmarkStart,
+      end: extmarkEnd,
+      virtual: true,
+    })
+
+    props.setPrompt((draft) => {
+      if (part.type === "file" && part.source?.text) {
+        part.source.text.start = extmarkStart
+        part.source.text.end = extmarkEnd
+        part.source.text.value = virtualText
+      } else if (part.type === "agent" && part.source) {
+        part.source.start = extmarkStart
+        part.source.end = extmarkEnd
+        part.source.value = virtualText
+      }
+      const partIndex = draft.parts.length
+      draft.parts.push(part)
+      props.setExtmark(partIndex, extmarkId)
+    })
+  }
+
   const [files] = createResource(
     () => [filter()],
     async () => {
@@ -69,48 +108,20 @@ export function Autocomplete(props: {
             (item): AutocompleteOption => ({
               display: item,
               onSelect: () => {
-                const append = "@" + item + " "
-                const input = props.input()
-                const currentCursorOffset = input.visualCursor.offset
-
-                const savedCursorOffset = currentCursorOffset
-                input.cursorOffset = store.index
-                const startCursor = input.logicalCursor
-                input.cursorOffset = savedCursorOffset
-                const endCursor = input.logicalCursor
-
-                input.deleteRange(startCursor.row, startCursor.col, endCursor.row, endCursor.col)
-                input.insertText(append)
-
-                const virtualText = "@" + item
-                const extmarkStart = store.index
-                const extmarkEnd = extmarkStart + virtualText.length
-
-                const extmarkId = input.extmarks.create({
-                  start: extmarkStart,
-                  end: extmarkEnd,
-                  virtual: true,
-                })
-
-                props.setPrompt((draft) => {
-                  const part: PromptInfo["parts"][number] = {
+                insertPart(item, {
+                  type: "file",
+                  mime: "text/plain",
+                  filename: item,
+                  url: `file://${process.cwd()}/${item}`,
+                  source: {
                     type: "file",
-                    mime: "text/plain",
-                    filename: item,
-                    url: `file://${process.cwd()}/${item}`,
-                    source: {
-                      type: "file",
-                      text: {
-                        start: extmarkStart,
-                        end: extmarkEnd,
-                        value: virtualText,
-                      },
-                      path: item,
+                    text: {
+                      start: 0,
+                      end: 0,
+                      value: "",
                     },
-                  }
-                  const partIndex = draft.parts.length
-                  draft.parts.push(part)
-                  props.setExtmark(partIndex, extmarkId)
+                    path: item,
+                  },
                 })
               },
             }),
@@ -134,41 +145,14 @@ export function Autocomplete(props: {
         (agent): AutocompleteOption => ({
           display: "@" + agent.name,
           onSelect: () => {
-            const append = "@" + agent.name + " "
-            const input = props.input()
-            const currentCursorOffset = input.visualCursor.offset
-
-            const savedCursorOffset = currentCursorOffset
-            input.cursorOffset = store.index
-            const startCursor = input.logicalCursor
-            input.cursorOffset = savedCursorOffset
-            const endCursor = input.logicalCursor
-
-            input.deleteRange(startCursor.row, startCursor.col, endCursor.row, endCursor.col)
-            input.insertText(append)
-
-            const virtualText = "@" + agent.name
-            const extmarkStart = store.index
-            const extmarkEnd = extmarkStart + virtualText.length
-
-            const extmarkId = input.extmarks.create({
-              start: extmarkStart,
-              end: extmarkEnd,
-              virtual: true,
-            })
-
-            props.setPrompt((draft) => {
-              const partIndex = draft.parts.length
-              draft.parts.push({
-                type: "agent",
-                source: {
-                  start: extmarkStart,
-                  end: extmarkEnd,
-                  value: virtualText,
-                },
-                name: agent.name,
-              })
-              props.setExtmark(partIndex, extmarkId)
+            insertPart(agent.name, {
+              type: "agent",
+              name: agent.name,
+              source: {
+                start: 0,
+                end: 0,
+                value: "",
+              },
             })
           },
         }),

From 67b9a05aa391c7d922e56ef36e9eb29db192dc7b Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 02:49:35 +0200
Subject: [PATCH 11/25] add styles

---
 .../cli/cmd/tui/component/prompt/autocomplete.tsx  |  5 +++++
 .../src/cli/cmd/tui/component/prompt/index.tsx     | 13 +++++++++----
 .../opencode/src/cli/cmd/tui/context/theme.tsx     | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 5a1b2d2960..64379f441c 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -31,6 +31,8 @@ export function Autocomplete(props: {
   anchor: () => BoxRenderable
   input: () => TextareaRenderable
   ref: (ref: AutocompleteRef) => void
+  fileStyleId: number
+  agentStyleId: number
 }) {
   const sdk = useSDK()
   const sync = useSync()
@@ -64,10 +66,13 @@ export function Autocomplete(props: {
     const extmarkStart = store.index
     const extmarkEnd = extmarkStart + virtualText.length
 
+    const styleId = part.type === "file" ? props.fileStyleId : part.type === "agent" ? props.agentStyleId : undefined
+
     const extmarkId = input.extmarks.create({
       start: extmarkStart,
       end: extmarkEnd,
       virtual: true,
+      styleId,
     })
 
     props.setPrompt((draft) => {
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 5dcf202a37..41919be00e 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -1,7 +1,7 @@
-import { TextAttributes, BoxRenderable, TextareaRenderable, MouseEvent, KeyEvent } from "@opentui/core"
-import { createEffect, createMemo, Match, Switch, type JSX } from "solid-js"
+import { TextAttributes, BoxRenderable, TextareaRenderable, MouseEvent, KeyEvent, SyntaxStyle } from "@opentui/core"
+import { createEffect, createMemo, Match, Switch, type JSX, onMount } from "solid-js"
 import { useLocal } from "@tui/context/local"
-import { Theme } from "@tui/context/theme"
+import { Theme, syntaxTheme } from "@tui/context/theme"
 import { SplitBorder } from "@tui/component/border"
 import { useSDK } from "@tui/context/sdk"
 import { useRoute } from "@tui/context/route"
@@ -47,6 +47,9 @@ export function Prompt(props: PromptProps) {
   const command = useCommandDialog()
   const renderer = useRenderer()
 
+  const fileStyleId = syntaxTheme.getStyleId("extmark.file")!
+  const agentStyleId = syntaxTheme.getStyleId("extmark.agent")!
+
   command.register(() => {
     return [
       {
@@ -300,6 +303,8 @@ export function Prompt(props: PromptProps) {
           })
         }}
         value={store.prompt.input}
+        fileStyleId={fileStyleId}
+        agentStyleId={agentStyleId}
       />
       <box ref={(r) => (anchor = r)}>
         <box
@@ -392,7 +397,7 @@ export function Prompt(props: PromptProps) {
               onMouseDown={(r: MouseEvent) => r.target?.focus()}
               focusedBackgroundColor={Theme.backgroundElement}
               cursorColor={Theme.primary}
-              // backgroundColor={Theme.backgroundElement} <- can be transparent as parent box has backgroundColor
+              syntaxStyle={syntaxTheme}
             />
           </box>
           <box backgroundColor={Theme.backgroundElement} width={1} justifyContent="center" alignItems="center"></box>
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index 20a133482d..a62dbd123e 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -259,6 +259,20 @@ const syntaxThemeDark = [
       foreground: "#56b6c2",
     },
   },
+  {
+    scope: ["extmark.file"],
+    style: {
+      foreground: "#7fd88f",
+      bold: true,
+    },
+  },
+  {
+    scope: ["extmark.agent"],
+    style: {
+      foreground: "#9d7cd8",
+      bold: true,
+    },
+  },
   {
     scope: ["comment"],
     style: {

From 47f2ec160a509fef7977a190913e910bc0179551 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 02:56:38 +0200
Subject: [PATCH 12/25] use snapshot

---
 bun.lock                       | 20 ++++++++++----------
 packages/opencode/package.json |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bun.lock b/bun.lock
index f29e42d1ee..272679909c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -184,8 +184,8 @@
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/script": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
-        "@opentui/core": "0.1.30",
-        "@opentui/solid": "0.1.30",
+        "@opentui/core": "0.0.0-20251026-8b7fde6b",
+        "@opentui/solid": "0.0.0-20251026-8b7fde6b",
         "@parcel/watcher": "2.5.1",
         "@solid-primitives/event-bus": "1.1.2",
         "@standard-schema/spec": "1.0.0",
@@ -951,21 +951,21 @@
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
-    "@opentui/core": ["@opentui/core@0.1.30", "", { "dependencies": { "bun-ffi-structs": "^0.1.0", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.30", "@opentui/core-darwin-x64": "0.1.30", "@opentui/core-linux-arm64": "0.1.30", "@opentui/core-linux-x64": "0.1.30", "@opentui/core-win32-arm64": "0.1.30", "@opentui/core-win32-x64": "0.1.30", "bun-webgpu": "0.1.3", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": ">=0.26.0" } }, "sha512-DoPF3E//UaISDfp7jYhdU4KbOe7BVm9KqCV+TPMVo2lch8UfvtN2nCnHqtg54DCzxYuTbge9NDrapdt3jrT2oA=="],
+    "@opentui/core": ["@opentui/core@0.0.0-20251026-8b7fde6b", "", { "dependencies": { "bun-ffi-structs": "^0.1.0", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.0.0-20251026-8b7fde6b", "@opentui/core-darwin-x64": "0.0.0-20251026-8b7fde6b", "@opentui/core-linux-arm64": "0.0.0-20251026-8b7fde6b", "@opentui/core-linux-x64": "0.0.0-20251026-8b7fde6b", "@opentui/core-win32-arm64": "0.0.0-20251026-8b7fde6b", "@opentui/core-win32-x64": "0.0.0-20251026-8b7fde6b", "bun-webgpu": "0.1.3", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": ">=0.26.0" } }, "sha512-VRLk0fVzjBEXiMCi3YBESYhEyCXzSo38iglZTee/IxTa1RjCe20hG/HqIvpvVrlPLPVTm7d6daBEfvGiAEtUiQ=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.30", "", { "os": "darwin", "cpu": "arm64" }, "sha512-oFFBsVsrByzA/9LpJZ7uV2QWH44Hq/96eWO8PlPhMdlnvpqz5e0PYU3fQJUuDGptIvb9GZzIt5Og2gYar5bUIw=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20251026-8b7fde6b", "", { "os": "darwin", "cpu": "arm64" }, "sha512-VpP2E0M0QrLZ1ECFqEvaR45SH5CrvNMeOA1chMmqQr6S++XnIKGRGX9w7WoVMcE6XIW36UYx541LMHtsZvqZRg=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.30", "", { "os": "darwin", "cpu": "x64" }, "sha512-f8MNPqwfG9qUttxcrQ3VsM+rrWvO9uHGncTJbKYEKDVaQzBuKpkEZqMSA2JV3gspjL22DXSG4Q5LE6NzvmITgQ=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20251026-8b7fde6b", "", { "os": "darwin", "cpu": "x64" }, "sha512-SxasrWMcXpanJtfRZqIK+YGTwzV/FqSLoTdFi3hLTpj6lJMLicVI+Wf2T/NcyEdJDl987UFOxMpabb6GdZ0xJA=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.30", "", { "os": "linux", "cpu": "arm64" }, "sha512-6qBVjUU9XJrgePvFtCGmEIU+iRfyyydvbts+i7nKjJgmOFVZLnllP6XqA3s+lAjEQrzp+VM7beDV5MIOMjHHZg=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20251026-8b7fde6b", "", { "os": "linux", "cpu": "arm64" }, "sha512-JzWaFk4yocwVZlwLRJSYQRkkiTG21wWLMSYy8TC3FEcYbC0hkosyL1bS5LlxTy8NgXSDKjlK8IBGXDtrDMbrjg=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.30", "", { "os": "linux", "cpu": "x64" }, "sha512-K51WGZp7VT5aB8nbzZBt94YavMnI1yFe4h4n/e4TxZ4Ph3BACNmNHizEDfn05efcmXmMdgGOjazc5sNA2LrOOQ=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20251026-8b7fde6b", "", { "os": "linux", "cpu": "x64" }, "sha512-FkDaOvvK8uHOx/M/c5YPRxR00rXQyt0DO+6rj7D4gY+2Yx3fgvPm6k5RVniP1VDTII2xEM1OC4P9Gjdf/wgoLA=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.30", "", { "os": "win32", "cpu": "arm64" }, "sha512-NAkCu0VSHh5oj9wldjImqli7g4kvkA/3HP9PyAWB6zBg+QcXCl7Yi1WPEFwAU7XM1zEUBwhrj0sHcuMomq4Y8A=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20251026-8b7fde6b", "", { "os": "win32", "cpu": "arm64" }, "sha512-FM6lGmS7bFiHK8zrlv7hK5lY3oFHq5yFhhwZCQu126f9f/Ht6yBPsXceWhB1CsNQctMmNQ7MIrWiIMirba/KMQ=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.30", "", { "os": "win32", "cpu": "x64" }, "sha512-eNIQaLm+Muluma1xXa2SxHGidjknH+iVmPPbQsV7xwJlp3a318BjTr/5/lxKBz1EGzhTaiwBqwcgTSg+Q31L5w=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20251026-8b7fde6b", "", { "os": "win32", "cpu": "x64" }, "sha512-IumxFvnf2qoAw8yrenM0y2mDDbOSo/CsRg4EbZJW3lhdgpRCxEnJwMVJqoEu2rE7+Ox/1robudoq8i7QeXc8HA=="],
 
-    "@opentui/solid": ["@opentui/solid@0.1.30", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.30", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-7JAHQH8OLgJCjH2IBmdO3ggd7WHavEdlywhVzjoVvQYonTYcJjcJ2F6MJ1Qmqqm6y2+IYv3KIYMQm6HLxX5TxQ=="],
+    "@opentui/solid": ["@opentui/solid@0.0.0-20251026-8b7fde6b", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20251026-8b7fde6b", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-0h/O7tH8VwBDjGSvEMB7JW7WNCASdsGzNyWllZdn5JfWmVbnfEwqcd5ke0NMRatAFex30um4HdqdoXeewVqHTg=="],
 
     "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],
 
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 1cf290bf8d..a0dbbcf35f 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -50,8 +50,8 @@
     "@opencode-ai/plugin": "workspace:*",
     "@opencode-ai/script": "workspace:*",
     "@opencode-ai/sdk": "workspace:*",
-    "@opentui/core": "0.1.30",
-    "@opentui/solid": "0.1.30",
+    "@opentui/core": "0.0.0-20251026-8b7fde6b",
+    "@opentui/solid": "0.0.0-20251026-8b7fde6b",
     "@parcel/watcher": "2.5.1",
     "@solid-primitives/event-bus": "1.1.2",
     "@standard-schema/spec": "1.0.0",

From 59e090558cf8504bddae249795427e4b408a96fa Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 23:02:41 +0100
Subject: [PATCH 13/25] adjust to eventless api

---
 .../cmd/tui/component/prompt/autocomplete.tsx |  2 +
 .../cli/cmd/tui/component/prompt/index.tsx    | 80 +++++++++----------
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 64379f441c..0966ba5986 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -33,6 +33,7 @@ export function Autocomplete(props: {
   ref: (ref: AutocompleteRef) => void
   fileStyleId: number
   agentStyleId: number
+  promptPartTypeId: () => number
 }) {
   const sdk = useSDK()
   const sync = useSync()
@@ -73,6 +74,7 @@ export function Autocomplete(props: {
       end: extmarkEnd,
       virtual: true,
       styleId,
+      typeId: props.promptPartTypeId(),
     })
 
     props.setPrompt((draft) => {
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 41919be00e..a27330e40c 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -49,6 +49,7 @@ export function Prompt(props: PromptProps) {
 
   const fileStyleId = syntaxTheme.getStyleId("extmark.file")!
   const agentStyleId = syntaxTheme.getStyleId("extmark.agent")!
+  let promptPartTypeId: number
 
   command.register(() => {
     return [
@@ -87,7 +88,7 @@ export function Prompt(props: PromptProps) {
             input: "",
             parts: [],
           })
-          setStore("extmarks", new Map())
+          setStore("extmarkToPartIndex", new Map())
           dialog.clear()
         },
       },
@@ -122,61 +123,54 @@ export function Prompt(props: PromptProps) {
   const [store, setStore] = createStore<{
     prompt: PromptInfo
     mode: "normal" | "shell"
-    extmarks: Map<number, number>
+    extmarkToPartIndex: Map<number, number>
   }>({
     prompt: {
       input: "",
       parts: [],
     },
     mode: "normal",
-    extmarks: new Map(),
+    extmarkToPartIndex: new Map(),
   })
 
   createEffect(() => {
     input.focus()
   })
 
-  createEffect(() => {
-    if (!input) return
-    const extmarks = input.extmarks
+  onMount(() => {
+    promptPartTypeId = input.extmarks.registerType("prompt-part")
+  })
 
-    const handleDelete = (evt: any) => {
-      setStore(
-        produce((draft) => {
-          const partIndex = Array.from(draft.extmarks.entries()).findIndex(([_, id]) => id === evt.extmark.id)
-          if (partIndex !== -1) {
-            draft.extmarks.delete(partIndex)
-            draft.prompt.parts.splice(partIndex, 1)
-          }
-        }),
-      )
-    }
+  function syncExtmarksWithPromptParts() {
+    const allExtmarks = input.extmarks.getAllForTypeId(promptPartTypeId)
+    setStore(
+      produce((draft) => {
+        const newMap = new Map<number, number>()
+        const newParts: typeof draft.prompt.parts = []
 
-    const handleUpdate = (extmark: any) => {
-      setStore(
-        produce((draft) => {
-          const partIndex = Array.from(draft.extmarks.entries()).find(([_, id]) => id === extmark.id)?.[0]
+        for (const extmark of allExtmarks) {
+          const partIndex = draft.extmarkToPartIndex.get(extmark.id)
           if (partIndex !== undefined) {
             const part = draft.prompt.parts[partIndex]
-            if (part.type === "agent" && part.source) {
-              part.source.start = extmark.start
-              part.source.end = extmark.end
-            } else if (part.type === "file" && part.source?.text) {
-              part.source.text.start = extmark.start
-              part.source.text.end = extmark.end
+            if (part) {
+              if (part.type === "agent" && part.source) {
+                part.source.start = extmark.start
+                part.source.end = extmark.end
+              } else if (part.type === "file" && part.source?.text) {
+                part.source.text.start = extmark.start
+                part.source.text.end = extmark.end
+              }
+              newMap.set(extmark.id, newParts.length)
+              newParts.push(part)
             }
           }
-        }),
-      )
-    }
+        }
 
-    extmarks.on("extmark-deleted", handleDelete)
-    extmarks.on("extmark-updated", handleUpdate)
-    return () => {
-      extmarks.off("extmark-deleted", handleDelete)
-      extmarks.off("extmark-updated", handleUpdate)
-    }
-  })
+        draft.extmarkToPartIndex = newMap
+        draft.prompt.parts = newParts
+      }),
+    )
+  }
 
   props.ref?.({
     get focused() {
@@ -200,7 +194,7 @@ export function Prompt(props: PromptProps) {
         input: "",
         parts: [],
       })
-      setStore("extmarks", new Map())
+      setStore("extmarkToPartIndex", new Map())
     },
   })
 
@@ -271,7 +265,7 @@ export function Prompt(props: PromptProps) {
       input: "",
       parts: [],
     })
-    setStore("extmarks", new Map())
+    setStore("extmarkToPartIndex", new Map())
     props.onSubmit?.()
 
     // temporary hack to make sure the message is sent
@@ -296,15 +290,16 @@ export function Prompt(props: PromptProps) {
           setStore("prompt", produce(cb))
         }}
         setExtmark={(partIndex, extmarkId) => {
-          setStore("extmarks", (map) => {
+          setStore("extmarkToPartIndex", (map: Map<number, number>) => {
             const newMap = new Map(map)
-            newMap.set(partIndex, extmarkId)
+            newMap.set(extmarkId, partIndex)
             return newMap
           })
         }}
         value={store.prompt.input}
         fileStyleId={fileStyleId}
         agentStyleId={agentStyleId}
+        promptPartTypeId={() => promptPartTypeId}
       />
       <box ref={(r) => (anchor = r)}>
         <box
@@ -330,6 +325,7 @@ export function Prompt(props: PromptProps) {
                 const value = input.plainText
                 setStore("prompt", "input", value)
                 autocomplete.onInput(value)
+                syncExtmarksWithPromptParts()
               }}
               keyBindings={[
                 { name: "return", meta: true, action: "newline" },
@@ -349,7 +345,7 @@ export function Prompt(props: PromptProps) {
                     input: "",
                     parts: [],
                   })
-                  setStore("extmarks", new Map())
+                  setStore("extmarkToPartIndex", new Map())
                   return
                 }
                 if (keybind.match("app_exit", e)) {

From c0decc26afb7d7f079ed99f3f4334de9849c0837 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Sun, 26 Oct 2025 23:28:12 +0100
Subject: [PATCH 14/25] use new snapshot

---
 packages/opencode/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index a0dbbcf35f..f224e6ad4c 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -50,8 +50,8 @@
     "@opencode-ai/plugin": "workspace:*",
     "@opencode-ai/script": "workspace:*",
     "@opencode-ai/sdk": "workspace:*",
-    "@opentui/core": "0.0.0-20251026-8b7fde6b",
-    "@opentui/solid": "0.0.0-20251026-8b7fde6b",
+    "@opentui/core": "0.0.0-20251026-63abf532",
+    "@opentui/solid": "0.0.0-20251026-63abf532",
     "@parcel/watcher": "2.5.1",
     "@solid-primitives/event-bus": "1.1.2",
     "@standard-schema/spec": "1.0.0",

From 8b5c16a3bc177e50167ac19a5b107458810cc680 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 26 Oct 2025 22:29:04 +0000
Subject: [PATCH 15/25] chore: format code

---
 bun.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bun.lock b/bun.lock
index 272679909c..a30809a2e5 100644
--- a/bun.lock
+++ b/bun.lock
@@ -184,8 +184,8 @@
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/script": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
-        "@opentui/core": "0.0.0-20251026-8b7fde6b",
-        "@opentui/solid": "0.0.0-20251026-8b7fde6b",
+        "@opentui/core": "0.0.0-20251026-63abf532",
+        "@opentui/solid": "0.0.0-20251026-63abf532",
         "@parcel/watcher": "2.5.1",
         "@solid-primitives/event-bus": "1.1.2",
         "@standard-schema/spec": "1.0.0",
@@ -951,21 +951,21 @@
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
-    "@opentui/core": ["@opentui/core@0.0.0-20251026-8b7fde6b", "", { "dependencies": { "bun-ffi-structs": "^0.1.0", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.0.0-20251026-8b7fde6b", "@opentui/core-darwin-x64": "0.0.0-20251026-8b7fde6b", "@opentui/core-linux-arm64": "0.0.0-20251026-8b7fde6b", "@opentui/core-linux-x64": "0.0.0-20251026-8b7fde6b", "@opentui/core-win32-arm64": "0.0.0-20251026-8b7fde6b", "@opentui/core-win32-x64": "0.0.0-20251026-8b7fde6b", "bun-webgpu": "0.1.3", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": ">=0.26.0" } }, "sha512-VRLk0fVzjBEXiMCi3YBESYhEyCXzSo38iglZTee/IxTa1RjCe20hG/HqIvpvVrlPLPVTm7d6daBEfvGiAEtUiQ=="],
+    "@opentui/core": ["@opentui/core@0.0.0-20251026-63abf532", "", { "dependencies": { "bun-ffi-structs": "^0.1.0", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.0.0-20251026-63abf532", "@opentui/core-darwin-x64": "0.0.0-20251026-63abf532", "@opentui/core-linux-arm64": "0.0.0-20251026-63abf532", "@opentui/core-linux-x64": "0.0.0-20251026-63abf532", "@opentui/core-win32-arm64": "0.0.0-20251026-63abf532", "@opentui/core-win32-x64": "0.0.0-20251026-63abf532", "bun-webgpu": "0.1.3", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": ">=0.26.0" } }, "sha512-bE+4zXsXMGtwEOI1PIlfLGsx4+BTIxWIRWNaPtdSiLCrze02AbStyLVbcY7MpDIBhWgq61Kdrk3uSPbQSDFuEg=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20251026-8b7fde6b", "", { "os": "darwin", "cpu": "arm64" }, "sha512-VpP2E0M0QrLZ1ECFqEvaR45SH5CrvNMeOA1chMmqQr6S++XnIKGRGX9w7WoVMcE6XIW36UYx541LMHtsZvqZRg=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20251026-63abf532", "", { "os": "darwin", "cpu": "arm64" }, "sha512-A6MCyBUkVLuZSgChtPfnlQfKqyDQoF5anpBc9+aC9XbuZWCMlG6aaF6NTvtMnFG+Bznf9N3niLTsNkVBgr3wKg=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20251026-8b7fde6b", "", { "os": "darwin", "cpu": "x64" }, "sha512-SxasrWMcXpanJtfRZqIK+YGTwzV/FqSLoTdFi3hLTpj6lJMLicVI+Wf2T/NcyEdJDl987UFOxMpabb6GdZ0xJA=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20251026-63abf532", "", { "os": "darwin", "cpu": "x64" }, "sha512-H4GaszRdxvtUjx9LdYHoC+K/NEUVPhUf2p45YaatneqZQizccxajnMifjidpZfkxLOtH07fQo2/1JAcQknlwgQ=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20251026-8b7fde6b", "", { "os": "linux", "cpu": "arm64" }, "sha512-JzWaFk4yocwVZlwLRJSYQRkkiTG21wWLMSYy8TC3FEcYbC0hkosyL1bS5LlxTy8NgXSDKjlK8IBGXDtrDMbrjg=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20251026-63abf532", "", { "os": "linux", "cpu": "arm64" }, "sha512-+UO2fc1jyY0bn0IO0xj/w/SOW3luEBY4IdHzXk8JQoZ8cVEHKQ/wph4ya/oDtm2gkcZRn0dLLi/ZxEA3J1mPqQ=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20251026-8b7fde6b", "", { "os": "linux", "cpu": "x64" }, "sha512-FkDaOvvK8uHOx/M/c5YPRxR00rXQyt0DO+6rj7D4gY+2Yx3fgvPm6k5RVniP1VDTII2xEM1OC4P9Gjdf/wgoLA=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20251026-63abf532", "", { "os": "linux", "cpu": "x64" }, "sha512-Si3iRvdlGMLC8SX25hPahUtTWuD/dB178cxcNN5bF+z62olSebB4DAFLE3vwwP4/pexOTeFO/C8yvMdHp5ZYWQ=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20251026-8b7fde6b", "", { "os": "win32", "cpu": "arm64" }, "sha512-FM6lGmS7bFiHK8zrlv7hK5lY3oFHq5yFhhwZCQu126f9f/Ht6yBPsXceWhB1CsNQctMmNQ7MIrWiIMirba/KMQ=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20251026-63abf532", "", { "os": "win32", "cpu": "arm64" }, "sha512-cx/W2uK/RyK9HUVM4Vz4coynB56f+F0tbamJ81rzYTQyh3VGYoyK0OLDSKSbkF9Fm1jptH17iW6fdvRkljl/Aw=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20251026-8b7fde6b", "", { "os": "win32", "cpu": "x64" }, "sha512-IumxFvnf2qoAw8yrenM0y2mDDbOSo/CsRg4EbZJW3lhdgpRCxEnJwMVJqoEu2rE7+Ox/1robudoq8i7QeXc8HA=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20251026-63abf532", "", { "os": "win32", "cpu": "x64" }, "sha512-YbBTxdWQ89oYpu7uy0fG6yEtcbB42EF863puB8mJ8Iusd00d8nsMbVdaS7GN/gO/e3JOc/Jy1ijKqj/dZELQJg=="],
 
-    "@opentui/solid": ["@opentui/solid@0.0.0-20251026-8b7fde6b", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20251026-8b7fde6b", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-0h/O7tH8VwBDjGSvEMB7JW7WNCASdsGzNyWllZdn5JfWmVbnfEwqcd5ke0NMRatAFex30um4HdqdoXeewVqHTg=="],
+    "@opentui/solid": ["@opentui/solid@0.0.0-20251026-63abf532", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20251026-63abf532", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-kjq1f2QBJYeZeNcbw+tldx5VXB5Vt3D76gVK21mvtpbGiElIleLwPRIoLVyXfFQDiWpsRgFnd8yrS21jg+EElQ=="],
 
     "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],
 

From 06717d00e9d22c4ecef690496b3ccf3527303ae4 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 00:26:52 +0100
Subject: [PATCH 16/25] restore extmarks for history

---
 .../cli/cmd/tui/component/prompt/index.tsx    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index a27330e40c..8f780b923d 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -141,6 +141,45 @@ export function Prompt(props: PromptProps) {
     promptPartTypeId = input.extmarks.registerType("prompt-part")
   })
 
+  function restoreExtmarksFromParts(parts: PromptInfo["parts"]) {
+    input.extmarks.clear()
+    setStore("extmarkToPartIndex", new Map())
+
+    parts.forEach((part, partIndex) => {
+      let start = 0
+      let end = 0
+      let virtualText = ""
+      let styleId: number | undefined
+
+      if (part.type === "file" && part.source?.text) {
+        start = part.source.text.start
+        end = part.source.text.end
+        virtualText = part.source.text.value
+        styleId = fileStyleId
+      } else if (part.type === "agent" && part.source) {
+        start = part.source.start
+        end = part.source.end
+        virtualText = part.source.value
+        styleId = agentStyleId
+      }
+
+      if (virtualText) {
+        const extmarkId = input.extmarks.create({
+          start,
+          end,
+          virtual: true,
+          styleId,
+          typeId: promptPartTypeId,
+        })
+        setStore("extmarkToPartIndex", (map: Map<number, number>) => {
+          const newMap = new Map(map)
+          newMap.set(extmarkId, partIndex)
+          return newMap
+        })
+      }
+    })
+  }
+
   function syncExtmarksWithPromptParts() {
     const allExtmarks = input.extmarks.getAllForTypeId(promptPartTypeId)
     setStore(
@@ -185,6 +224,7 @@ export function Prompt(props: PromptProps) {
     set(prompt) {
       input.setText(prompt.input, { history: false })
       setStore("prompt", prompt)
+      restoreExtmarksFromParts(prompt.parts)
       input.gotoBufferEnd()
     },
     reset() {
@@ -372,6 +412,7 @@ export function Prompt(props: PromptProps) {
                     if (item) {
                       input.setText(item.input, { history: false })
                       setStore("prompt", item)
+                      restoreExtmarksFromParts(item.parts)
                       e.preventDefault()
                     }
                     return

From 99d8edb3729a7141aff11f7b323de7604a733904 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 00:29:29 +0100
Subject: [PATCH 17/25] use orange for extmarks

---
 packages/opencode/src/cli/cmd/tui/context/theme.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index a62dbd123e..6ef3e56ab7 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -262,14 +262,14 @@ const syntaxThemeDark = [
   {
     scope: ["extmark.file"],
     style: {
-      foreground: "#7fd88f",
+      foreground: "#f5a742",
       bold: true,
     },
   },
   {
     scope: ["extmark.agent"],
     style: {
-      foreground: "#9d7cd8",
+      foreground: "#fab283",
       bold: true,
     },
   },

From 507b9fcdd1cd6986c7a3551d1ccb1ae1de1ae05a Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 00:40:45 +0100
Subject: [PATCH 18/25] max/min height

---
 packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 8f780b923d..fa3ec8d42b 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -361,6 +361,8 @@ export function Prompt(props: PromptProps) {
           </box>
           <box paddingTop={1} paddingBottom={1} backgroundColor={Theme.backgroundElement} flexGrow={1}>
             <textarea
+              minHeight={1}
+              maxHeight={6}
               onContentChange={() => {
                 const value = input.plainText
                 setStore("prompt", "input", value)

From 79b9f5f1d238ab3326b645fe4b9f059de779592f Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 15:15:32 +0100
Subject: [PATCH 19/25] setup pasted text as part

---
 .../cli/cmd/tui/component/prompt/index.tsx    | 62 ++++++++++++++++++-
 .../src/cli/cmd/tui/context/theme.tsx         |  7 +++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index fa3ec8d42b..ee9d046116 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -1,4 +1,12 @@
-import { TextAttributes, BoxRenderable, TextareaRenderable, MouseEvent, KeyEvent, SyntaxStyle } from "@opentui/core"
+import {
+  TextAttributes,
+  BoxRenderable,
+  TextareaRenderable,
+  MouseEvent,
+  KeyEvent,
+  SyntaxStyle,
+  PasteEvent,
+} from "@opentui/core"
 import { createEffect, createMemo, Match, Switch, type JSX, onMount } from "solid-js"
 import { useLocal } from "@tui/context/local"
 import { Theme, syntaxTheme } from "@tui/context/theme"
@@ -49,6 +57,7 @@ export function Prompt(props: PromptProps) {
 
   const fileStyleId = syntaxTheme.getStyleId("extmark.file")!
   const agentStyleId = syntaxTheme.getStyleId("extmark.agent")!
+  const pasteStyleId = syntaxTheme.getStyleId("extmark.paste")!
   let promptPartTypeId: number
 
   command.register(() => {
@@ -432,6 +441,57 @@ export function Prompt(props: PromptProps) {
                 }
               }}
               onSubmit={submit}
+              onPaste={(event: PasteEvent) => {
+                if (props.disabled) {
+                  event.preventDefault()
+                  return
+                }
+                event.preventDefault()
+
+                const pastedContent = event.text.trim()
+                if (!pastedContent) return
+
+                const byteLength = new TextEncoder().encode(pastedContent).length
+                const currentOffset = input.visualCursor.offset
+                const virtualText = `[Pasted ${byteLength} bytes]`
+                const textToInsert = virtualText + " "
+                const extmarkStart = currentOffset
+                const extmarkEnd = extmarkStart + virtualText.length
+
+                input.insertText(textToInsert)
+
+                const extmarkId = input.extmarks.create({
+                  start: extmarkStart,
+                  end: extmarkEnd,
+                  virtual: true,
+                  styleId: pasteStyleId,
+                  typeId: promptPartTypeId,
+                })
+
+                const part: PromptInfo["parts"][number] = {
+                  type: "file",
+                  mime: "text/plain",
+                  filename: "pasted-content.txt",
+                  url: `data:text/plain;base64,${btoa(pastedContent)}`,
+                  source: {
+                    type: "file",
+                    text: {
+                      start: extmarkStart,
+                      end: extmarkEnd,
+                      value: virtualText,
+                    },
+                    path: "pasted-content.txt",
+                  },
+                }
+
+                setStore(
+                  produce((draft) => {
+                    const partIndex = draft.prompt.parts.length
+                    draft.prompt.parts.push(part)
+                    draft.extmarkToPartIndex.set(extmarkId, partIndex)
+                  }),
+                )
+              }}
               ref={(r: TextareaRenderable) => (input = r)}
               onMouseDown={(r: MouseEvent) => r.target?.focus()}
               focusedBackgroundColor={Theme.backgroundElement}
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index 6ef3e56ab7..423306b07a 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -273,6 +273,13 @@ const syntaxThemeDark = [
       bold: true,
     },
   },
+  {
+    scope: ["extmark.paste"],
+    style: {
+      foreground: "#7fd88f",
+      bold: true,
+    },
+  },
   {
     scope: ["comment"],
     style: {

From 24414473b8bb9e4952d938edcf20b3b99bbbc926 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 15:20:45 +0100
Subject: [PATCH 20/25] align colors

---
 packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx | 4 ++--
 packages/opencode/src/cli/cmd/tui/context/theme.tsx          | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index ee9d046116..e4c819faa5 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -451,9 +451,9 @@ export function Prompt(props: PromptProps) {
                 const pastedContent = event.text.trim()
                 if (!pastedContent) return
 
-                const byteLength = new TextEncoder().encode(pastedContent).length
+                const charCount = Bun.stringWidth(pastedContent)
                 const currentOffset = input.visualCursor.offset
-                const virtualText = `[Pasted ${byteLength} bytes]`
+                const virtualText = `[Pasted ${charCount} chars]`
                 const textToInsert = virtualText + " "
                 const extmarkStart = currentOffset
                 const extmarkEnd = extmarkStart + virtualText.length
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index 423306b07a..89a7133804 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -276,7 +276,8 @@ const syntaxThemeDark = [
   {
     scope: ["extmark.paste"],
     style: {
-      foreground: "#7fd88f",
+      foreground: "#0a0a0a",
+      background: "#f5a742",
       bold: true,
     },
   },

From 30ba4648d8c03e528b964e930c159bd1da46d3dd Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 16:11:32 +0100
Subject: [PATCH 21/25] paste with placeholder

---
 .../cli/cmd/tui/component/prompt/history.tsx   | 16 ++++++++++++++--
 .../src/cli/cmd/tui/component/prompt/index.tsx | 18 +++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx
index 04375f4585..5b90e58771 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/history.tsx
@@ -5,11 +5,23 @@ import { createStore, produce } from "solid-js/store"
 import { clone } from "remeda"
 import { createSimpleContext } from "../../context/helper"
 import { appendFile } from "fs/promises"
-import type { AgentPart, FilePart } from "@opencode-ai/sdk"
+import type { AgentPart, FilePart, TextPart } from "@opencode-ai/sdk"
 
 export type PromptInfo = {
   input: string
-  parts: (Omit<FilePart, "id" | "messageID" | "sessionID"> | Omit<AgentPart, "id" | "messageID" | "sessionID">)[]
+  parts: (
+    | Omit<FilePart, "id" | "messageID" | "sessionID">
+    | Omit<AgentPart, "id" | "messageID" | "sessionID">
+    | (Omit<TextPart, "id" | "messageID" | "sessionID"> & {
+        source?: {
+          text: {
+            start: number
+            end: number
+            value: string
+          }
+        }
+      })
+  )[]
 }
 
 export const { use: usePromptHistory, provider: PromptHistoryProvider } = createSimpleContext({
diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index e4c819faa5..5caac66d14 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -170,6 +170,11 @@ export function Prompt(props: PromptProps) {
         end = part.source.end
         virtualText = part.source.value
         styleId = agentStyleId
+      } else if (part.type === "text" && part.source?.text) {
+        start = part.source.text.start
+        end = part.source.text.end
+        virtualText = part.source.text.value
+        styleId = pasteStyleId
       }
 
       if (virtualText) {
@@ -207,6 +212,9 @@ export function Prompt(props: PromptProps) {
               } else if (part.type === "file" && part.source?.text) {
                 part.source.text.start = extmark.start
                 part.source.text.end = extmark.end
+              } else if (part.type === "text" && part.source?.text) {
+                part.source.text.start = extmark.start
+                part.source.text.end = extmark.end
               }
               newMap.set(extmark.id, newParts.length)
               newParts.push(part)
@@ -468,19 +476,15 @@ export function Prompt(props: PromptProps) {
                   typeId: promptPartTypeId,
                 })
 
-                const part: PromptInfo["parts"][number] = {
-                  type: "file",
-                  mime: "text/plain",
-                  filename: "pasted-content.txt",
-                  url: `data:text/plain;base64,${btoa(pastedContent)}`,
+                const part = {
+                  type: "text" as const,
+                  text: pastedContent,
                   source: {
-                    type: "file",
                     text: {
                       start: extmarkStart,
                       end: extmarkEnd,
                       value: virtualText,
                     },
-                    path: "pasted-content.txt",
                   },
                 }
 

From d00aecaed7495d2ffa30f08a4dace9575ea08602 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 16:13:29 +0100
Subject: [PATCH 22/25] clear after submit

---
 packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 5caac66d14..314ab7eb11 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -333,6 +333,7 @@ export function Prompt(props: PromptProps) {
           sessionID,
         })
       }, 50)
+    input.clear()
   }
   const exit = useExit()
 

From 61cf21fcc0d4426de6b85610a10dccc4e32d12a0 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 16:19:00 +0100
Subject: [PATCH 23/25] show line count for pasted text

---
 packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 314ab7eb11..76c39cd39a 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -460,9 +460,9 @@ export function Prompt(props: PromptProps) {
                 const pastedContent = event.text.trim()
                 if (!pastedContent) return
 
-                const charCount = Bun.stringWidth(pastedContent)
+                const lineCount = (pastedContent.match(/\n/g)?.length ?? 0) + 1
                 const currentOffset = input.visualCursor.offset
-                const virtualText = `[Pasted ${charCount} chars]`
+                const virtualText = `[Pasted ~${lineCount} lines]`
                 const textToInsert = virtualText + " "
                 const extmarkStart = currentOffset
                 const extmarkEnd = extmarkStart + virtualText.length

From ac492bb80f121c28094cb25434fa8b3e7a1736b5 Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Mon, 27 Oct 2025 16:36:35 +0100
Subject: [PATCH 24/25] use latest snapshot

---
 packages/opencode/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index f224e6ad4c..c72aeea3e7 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -50,8 +50,8 @@
     "@opencode-ai/plugin": "workspace:*",
     "@opencode-ai/script": "workspace:*",
     "@opencode-ai/sdk": "workspace:*",
-    "@opentui/core": "0.0.0-20251026-63abf532",
-    "@opentui/solid": "0.0.0-20251026-63abf532",
+    "@opentui/core": "0.0.0-20251027-327d7e76",
+    "@opentui/solid": "0.0.0-20251027-327d7e76",
     "@parcel/watcher": "2.5.1",
     "@solid-primitives/event-bus": "1.1.2",
     "@standard-schema/spec": "1.0.0",

From 3857592a85b8137953e02efd7f63ebf42e427589 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 27 Oct 2025 15:37:15 +0000
Subject: [PATCH 25/25] chore: format code

---
 bun.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bun.lock b/bun.lock
index a30809a2e5..2584dd220f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -184,8 +184,8 @@
         "@opencode-ai/plugin": "workspace:*",
         "@opencode-ai/script": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
-        "@opentui/core": "0.0.0-20251026-63abf532",
-        "@opentui/solid": "0.0.0-20251026-63abf532",
+        "@opentui/core": "0.0.0-20251027-327d7e76",
+        "@opentui/solid": "0.0.0-20251027-327d7e76",
         "@parcel/watcher": "2.5.1",
         "@solid-primitives/event-bus": "1.1.2",
         "@standard-schema/spec": "1.0.0",
@@ -951,21 +951,21 @@
 
     "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
 
-    "@opentui/core": ["@opentui/core@0.0.0-20251026-63abf532", "", { "dependencies": { "bun-ffi-structs": "^0.1.0", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.0.0-20251026-63abf532", "@opentui/core-darwin-x64": "0.0.0-20251026-63abf532", "@opentui/core-linux-arm64": "0.0.0-20251026-63abf532", "@opentui/core-linux-x64": "0.0.0-20251026-63abf532", "@opentui/core-win32-arm64": "0.0.0-20251026-63abf532", "@opentui/core-win32-x64": "0.0.0-20251026-63abf532", "bun-webgpu": "0.1.3", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": ">=0.26.0" } }, "sha512-bE+4zXsXMGtwEOI1PIlfLGsx4+BTIxWIRWNaPtdSiLCrze02AbStyLVbcY7MpDIBhWgq61Kdrk3uSPbQSDFuEg=="],
+    "@opentui/core": ["@opentui/core@0.0.0-20251027-327d7e76", "", { "dependencies": { "bun-ffi-structs": "^0.1.0", "jimp": "1.6.0", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.0.0-20251027-327d7e76", "@opentui/core-darwin-x64": "0.0.0-20251027-327d7e76", "@opentui/core-linux-arm64": "0.0.0-20251027-327d7e76", "@opentui/core-linux-x64": "0.0.0-20251027-327d7e76", "@opentui/core-win32-arm64": "0.0.0-20251027-327d7e76", "@opentui/core-win32-x64": "0.0.0-20251027-327d7e76", "bun-webgpu": "0.1.3", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": ">=0.26.0" } }, "sha512-9EF4TkLR4szqNmWDGYZrzti48aQ3WOaXbTKOxcAEIBNienTlvr7baNyUjwNCHsbMxsQrAIYIY7gKXjebsChxkg=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20251026-63abf532", "", { "os": "darwin", "cpu": "arm64" }, "sha512-A6MCyBUkVLuZSgChtPfnlQfKqyDQoF5anpBc9+aC9XbuZWCMlG6aaF6NTvtMnFG+Bznf9N3niLTsNkVBgr3wKg=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20251027-327d7e76", "", { "os": "darwin", "cpu": "arm64" }, "sha512-iOY4266FFXc1c2NqYBg5ED1YkfT5z7yVCrlLsqd9EIpWv72NIN3b9HLbY77jzsjDYqtFfOx2x96FyS8As+La3w=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20251026-63abf532", "", { "os": "darwin", "cpu": "x64" }, "sha512-H4GaszRdxvtUjx9LdYHoC+K/NEUVPhUf2p45YaatneqZQizccxajnMifjidpZfkxLOtH07fQo2/1JAcQknlwgQ=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20251027-327d7e76", "", { "os": "darwin", "cpu": "x64" }, "sha512-fM441iHIG9TRRBv9y/bNeG4ZymhKi4FTtdvaPDRJ9rqljTGL/NwiP57kMiaO8Gv2y9dqzUmxDyu0+QHqexl6BQ=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20251026-63abf532", "", { "os": "linux", "cpu": "arm64" }, "sha512-+UO2fc1jyY0bn0IO0xj/w/SOW3luEBY4IdHzXk8JQoZ8cVEHKQ/wph4ya/oDtm2gkcZRn0dLLi/ZxEA3J1mPqQ=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20251027-327d7e76", "", { "os": "linux", "cpu": "arm64" }, "sha512-fDnx9X6+UcPj5p3LnJV2RAKwEw82pabZwc6eIPsUNIWZj861/OnDOmxwDEMLJw4G+j5IBnk5oeHoNu6YeG0V1Q=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20251026-63abf532", "", { "os": "linux", "cpu": "x64" }, "sha512-Si3iRvdlGMLC8SX25hPahUtTWuD/dB178cxcNN5bF+z62olSebB4DAFLE3vwwP4/pexOTeFO/C8yvMdHp5ZYWQ=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20251027-327d7e76", "", { "os": "linux", "cpu": "x64" }, "sha512-oUNT2QuL+b3e7g22KsUGWsi1lktiorLg1xlgEB+HWpn7dtK9xX+6gc1dmXp2qtgJvXhlOWSCCBftSmVvLFn4eg=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20251026-63abf532", "", { "os": "win32", "cpu": "arm64" }, "sha512-cx/W2uK/RyK9HUVM4Vz4coynB56f+F0tbamJ81rzYTQyh3VGYoyK0OLDSKSbkF9Fm1jptH17iW6fdvRkljl/Aw=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20251027-327d7e76", "", { "os": "win32", "cpu": "arm64" }, "sha512-xKFfTRO/JYTnQD+Erd9tOaEPvJPwtOVDQNQ5VSRPXdyB2YAruiZ57nnryJJ6WQjIXPy+ND4X77mylxOUFTk5Wg=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20251026-63abf532", "", { "os": "win32", "cpu": "x64" }, "sha512-YbBTxdWQ89oYpu7uy0fG6yEtcbB42EF863puB8mJ8Iusd00d8nsMbVdaS7GN/gO/e3JOc/Jy1ijKqj/dZELQJg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20251027-327d7e76", "", { "os": "win32", "cpu": "x64" }, "sha512-Ymctt059k8ZVXnLCcqZC+h1f81W0KgKPGzS3Ve/+Br/v7fwsE0mWCNuinbxrFgIHMs+6947u88rp/tyhwMQBJQ=="],
 
-    "@opentui/solid": ["@opentui/solid@0.0.0-20251026-63abf532", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20251026-63abf532", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-kjq1f2QBJYeZeNcbw+tldx5VXB5Vt3D76gVK21mvtpbGiElIleLwPRIoLVyXfFQDiWpsRgFnd8yrS21jg+EElQ=="],
+    "@opentui/solid": ["@opentui/solid@0.0.0-20251027-327d7e76", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20251027-327d7e76", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-/eTp1WbjRQs2tVqXPgAVKlhMmzJP60SZ+ZJ8S4cqdQ12g++WrFWCMb8OcueLs/rgKHr07WORo7Aw9/a9I1vV/w=="],
 
     "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],