From 17b81643e7532cd3081340aa205c8151f509a728 Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Wed, 26 Nov 2025 23:33:08 +0000
Subject: [PATCH 01/22] Update Nix flake.lock and hashes

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 231ac606b099..b0749bea4f0c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764081664,
-        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
+        "lastModified": 1764138170,
+        "narHash": "sha256-2bCmfCUZyi2yj9FFXYKwsDiaZmizN75cLhI/eWmf3tk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
+        "rev": "bb813de6d2241bcb1b5af2d3059f560c66329967",
         "type": "github"
       },
       "original": {

From 71e4bdf1f099cd76215c76d032254d6a5a052616 Mon Sep 17 00:00:00 2001
From: OpeOginni <brightoginni123@gmail.com>
Date: Thu, 27 Nov 2025 00:34:19 +0100
Subject: [PATCH 02/22] feat(tui): implement search functionality in session
 view

- Added a search input component to allow users to search through messages.
- Implemented logic to highlight search matches and navigate between them.
- Updated the theme syntax rules to include strikethrough styling.
- Enhanced message rendering to support search highlighting for text and markdown parts.
---
 .../cli/cmd/tui/component/prompt/search.tsx   | 234 ++++++++++++++
 .../src/cli/cmd/tui/context/theme.tsx         |  14 +-
 .../src/cli/cmd/tui/routes/session/index.tsx  | 300 ++++++++++++++++--
 3 files changed, 524 insertions(+), 24 deletions(-)
 create mode 100644 packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx
new file mode 100644
index 000000000000..0158f2b7653d
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx
@@ -0,0 +1,234 @@
+import { BoxRenderable, TextareaRenderable, type KeyBinding } from "@opentui/core"
+import { createEffect, createMemo, createSignal, type JSX, onMount, Show } from "solid-js"
+import { useTheme } from "@tui/context/theme"
+import { EmptyBorder } from "@tui/component/border"
+import { createStore } from "solid-js/store"
+import { useKeybind } from "@tui/context/keybind"
+import { Locale } from "@/util/locale"
+import { useLocal } from "@tui/context/local"
+import { RGBA } from "@opentui/core"
+import { useSDK } from "@tui/context/sdk"
+import { useSync } from "@tui/context/sync"
+import { useExit } from "../../context/exit"
+
+export type SearchInputProps = {
+  disabled?: boolean
+  onSubmit?: (query: string) => void
+  onExit?: () => void
+  onInput?: (query: string) => void
+  onNext?: () => void
+  onPrevious?: () => void
+  matchInfo?: { current: number; total: number }
+  sessionID?: string
+  ref?: (ref: SearchInputRef) => void
+  placeholder?: string
+}
+
+export type SearchInputRef = {
+  focused: boolean
+  reset(): void
+  blur(): void
+  focus(): void
+  getValue(): string
+}
+
+export function SearchInput(props: SearchInputProps) {
+  let input: TextareaRenderable
+  let anchor: BoxRenderable
+
+  const exit = useExit()
+  const keybind = useKeybind()
+  const local = useLocal()
+  const sdk = useSDK()
+  const sync = useSync()
+  const { theme } = useTheme()
+
+  const highlight = createMemo(() => {
+    const agent = local.agent.current()
+    if (agent?.color) return RGBA.fromHex(agent.color)
+    const agents = local.agent.list()
+    const index = agents.findIndex((x) => x.name === "search")
+    const colors = [theme.secondary, theme.accent, theme.success, theme.warning, theme.primary, theme.error]
+    if (index === -1) return colors[0]
+    return colors[index % colors.length]
+  })
+
+  const textareaKeybindings = createMemo(() => {
+    const submitBindings = keybind.all.input_submit || []
+    return [
+      { name: "return", action: "submit" },
+      ...submitBindings.map((binding) => ({
+        name: binding.name,
+        ctrl: binding.ctrl || undefined,
+        meta: binding.meta || undefined,
+        shift: binding.shift || undefined,
+        action: "submit" as const,
+      })),
+    ] satisfies KeyBinding[]
+  })
+
+  const [store, setStore] = createStore<{
+    input: string
+  }>({
+    input: "",
+  })
+
+  createEffect(() => {
+    if (props.disabled) input.cursorColor = theme.backgroundElement
+    if (!props.disabled) input.cursorColor = theme.primary
+  })
+
+  props.ref?.({
+    get focused() {
+      return input.focused
+    },
+    focus() {
+      input.focus()
+    },
+    blur() {
+      input.blur()
+    },
+    reset() {
+      input.clear()
+      setStore("input", "")
+    },
+    getValue() {
+      return store.input
+    },
+  })
+
+  function submit() {
+    if (props.disabled) return
+    if (!store.input) return
+    props.onSubmit?.(store.input)
+    input.clear()
+    setStore("input", "")
+  }
+
+  onMount(() => {
+    input.focus()
+  })
+
+  return (
+    <>
+      <box ref={(r) => (anchor = r)}>
+        <box
+          border={["left"]}
+          borderColor={highlight()}
+          customBorderChars={{
+            ...EmptyBorder,
+            vertical: "┃",
+            bottomLeft: "╹",
+          }}
+        >
+          <box
+            paddingLeft={2}
+            paddingRight={1}
+            paddingTop={1}
+            flexShrink={0}
+            backgroundColor={theme.backgroundElement}
+            flexGrow={1}
+          >
+            <textarea
+              placeholder={props.placeholder}
+              textColor={theme.text}
+              focusedTextColor={theme.text}
+              minHeight={1}
+              maxHeight={6}
+              onContentChange={() => {
+                const text = input.plainText.trim()
+                setStore("input", text)
+                props.onInput?.(text)
+              }}
+              keyBindings={textareaKeybindings()}
+              onKeyDown={async (e) => {
+                if (props.disabled) {
+                  e.preventDefault()
+                  return
+                }
+
+                if (e.name === "down") {
+                  e.preventDefault()
+                  props.onNext?.()
+                  return
+                }
+
+                if (e.name === "up") {
+                  e.preventDefault()
+                  props.onPrevious?.()
+                  return
+                }
+
+                if (e.name === "escape" || (e.ctrl && e.name === "f")) {
+                  props.onExit?.()
+                  e.preventDefault()
+                  return
+                }
+
+                if (keybind.match("app_exit", e)) {
+                  await exit()
+                  return
+                }
+              }}
+              onSubmit={submit}
+              ref={(r: TextareaRenderable) => (input = r)}
+              focusedBackgroundColor={theme.backgroundElement}
+              cursorColor={highlight()}
+            />
+            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1}>
+              <text fg={highlight()}>Search</text>
+              <Show
+                when={props.matchInfo && props.matchInfo.total > 0}
+                fallback={
+                  <text fg={theme.textMuted}>
+                    {store.input ? "No matches" : "Go through session history"}
+                  </text>
+                }
+              >
+                <text fg={theme.text}>
+                  {props.matchInfo!.current + 1} of {props.matchInfo!.total}
+                </text>
+              </Show>
+            </box>
+          </box>
+        </box>
+        <box
+          height={1}
+          border={["left"]}
+          borderColor={highlight()}
+          customBorderChars={{
+            ...EmptyBorder,
+            vertical: "╹",
+          }}
+        >
+          <box
+            height={1}
+            border={["bottom"]}
+            borderColor={theme.backgroundElement}
+            customBorderChars={
+              theme.background.a != 0
+                ? {
+                    ...EmptyBorder,
+                    horizontal: "▀",
+                  }
+                : {
+                    ...EmptyBorder,
+                    horizontal: " ",
+                  }
+            }
+          />
+        </box>
+        <box flexDirection="row" justifyContent="flex-end">
+          <box gap={2} flexDirection="row">
+            <text fg={theme.text}>
+              ↑/↓ <span style={{ fg: theme.textMuted }}>navigate</span>
+            </text>
+            <text fg={theme.text}>
+              esc <span style={{ fg: theme.textMuted }}>exit</span>
+            </text>
+          </box>
+        </box>
+      </box>
+    </>
+  )
+}
diff --git a/packages/opencode/src/cli/cmd/tui/context/theme.tsx b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
index 88b9616b06a2..03ffbb621a2c 100644
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -840,6 +840,14 @@ function getSyntaxRules(theme: Theme) {
         foreground: theme.textMuted,
       },
     },
+    {
+      scope: ["markup.strikethrough"],
+      style: {
+        foreground: theme.background,
+        background: theme.primary,
+        strikethrough: true,
+      },
+    },
     // Additional common highlight groups
     {
       scope: ["string.special", "string.special.url"],
@@ -933,12 +941,6 @@ function getSyntaxRules(theme: Theme) {
         foreground: theme.syntaxOperator,
       },
     },
-    {
-      scope: ["markup.strikethrough"],
-      style: {
-        foreground: theme.textMuted,
-      },
-    },
     {
       scope: ["markup.underline"],
       style: {
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index c0d173421a02..c3ff44217467 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -62,6 +62,7 @@ import { Toast, useToast } from "../../ui/toast"
 import { useKV } from "../../context/kv.tsx"
 import { Editor } from "../../util/editor"
 import stripAnsi from "strip-ansi"
+import { SearchInput, type SearchInputRef } from "../../component/prompt/search.tsx"
 
 addDefaultParsers(parsers.parsers)
 
@@ -75,12 +76,22 @@ class CustomSpeedScroll implements ScrollAcceleration {
   reset(): void {}
 }
 
+type SearchMatch = {
+  messageID: string
+  partID?: string
+  text: string
+  index: number
+}
+
 const context = createContext<{
   width: number
   conceal: () => boolean
   showThinking: () => boolean
   showTimestamps: () => boolean
   sync: ReturnType<typeof useSync>
+  searchQuery: () => string
+  currentMatchIndex: () => number
+  matches: () => SearchMatch[]
 }>()
 
 function use() {
@@ -171,11 +182,87 @@ export function Session() {
 
   let scroll: ScrollBoxRenderable
   let prompt: PromptRef
+  let search: SearchInputRef
+  const [searchMode, setSearchMode] = createSignal(false)
+  const [searchQuery, setSearchQuery] = createSignal("")
+  const [currentMatchIndex, setCurrentMatchIndex] = createSignal(0)
   const keybind = useKeybind()
 
+  const matches = createMemo(() => {
+    const query = searchQuery().toLowerCase().trim()
+    if (!query) return []
+
+    const result: SearchMatch[] = []
+    let matchIndex = 0
+
+    for (const message of messages()) {
+      const parts = sync.data.part[message.id] ?? []
+      for (const part of parts) {
+        if (part.type === "text" && !part.synthetic) {
+          const text = part.text.toLowerCase()
+          let pos = 0
+          while ((pos = text.indexOf(query, pos)) !== -1) {
+            result.push({
+              messageID: message.id,
+              partID: part.id,
+              text: part.text.slice(pos, pos + query.length),
+              index: matchIndex++,
+            })
+            pos += query.length
+          }
+        }
+      }
+    }
+    return result
+  })
+
+  createEffect(() => {
+    const m = matches()
+    if (m.length === 0) {
+      setCurrentMatchIndex(0)
+    } else if (currentMatchIndex() >= m.length) {
+      setCurrentMatchIndex(m.length - 1)
+    }
+  })
+
+  function handleNextMatch() {
+    const m = matches()
+    if (m.length === 0) return
+    const next = (currentMatchIndex() + 1) % m.length
+    setCurrentMatchIndex(next)
+    scrollToMatch(next)
+  }
+
+  function handlePrevMatch() {
+    const m = matches()
+    if (m.length === 0) return
+    const next = currentMatchIndex() === 0 ? m.length - 1 : currentMatchIndex() - 1
+    setCurrentMatchIndex(next)
+    scrollToMatch(next)
+  }
+
+  function scrollToMatch(index: number) {
+    const m = matches()
+    if (index < 0 || index >= m.length) return
+    const match = m[index]
+    const child = scroll?.getChildren().find((c) => c.id === match.messageID)
+    if (child) {
+      const y = child.y - scroll.y
+      if (y < 0 || y >= scroll.height) {
+        scroll.scrollBy(y - Math.floor(scroll.height / 3))
+      }
+    }
+  }
+
   useKeyboard((evt) => {
     if (dialog.stack.length > 0) return
 
+    if (evt.ctrl && evt.name === "f") {
+      setSearchMode(!searchMode())
+      evt.preventDefault()
+      return
+    }
+
     const first = permissions()[0]
     if (first) {
       const response = iife(() => {
@@ -731,6 +818,9 @@ export function Session() {
           return contentWidth()
         },
         conceal,
+        searchQuery,
+        currentMatchIndex,
+        matches,
         showThinking,
         showTimestamps,
         sync,
@@ -876,14 +966,39 @@ export function Session() {
               </For>
             </scrollbox>
             <box flexShrink={0}>
-              <Prompt
-                ref={(r) => (prompt = r)}
-                disabled={permissions().length > 0}
-                onSubmit={() => {
-                  toBottom()
-                }}
-                sessionID={route.sessionID}
-              />
+              <Show when={!searchMode()}>
+                <Prompt
+                  ref={(r) => (prompt = r)}
+                  disabled={permissions().length > 0}
+                  onSubmit={() => {
+                    toBottom()
+                  }}
+                  sessionID={route.sessionID}
+                />
+              </Show>
+              <Show when={searchMode()}>
+                <SearchInput
+                  ref={(r) => (search = r)}
+                  sessionID={route.sessionID}
+                  disabled={permissions().length > 0}
+                  onInput={(query) => {
+                    setSearchQuery(query)
+                    setCurrentMatchIndex(0)
+                  }}
+                  onNext={handleNextMatch}
+                  onPrevious={handlePrevMatch}
+                  matchInfo={
+                    matches().length > 0
+                      ? { current: currentMatchIndex(), total: matches().length }
+                      : undefined
+                  }
+                  onExit={() => {
+                    setSearchMode(false)
+                    setSearchQuery("")
+                    setCurrentMatchIndex(0)
+                  }}
+                />
+              </Show>
             </box>
           </Show>
           <Toast />
@@ -906,6 +1021,93 @@ const MIME_BADGE: Record<string, string> = {
   "application/x-directory": "dir",
 }
 
+function SearchHighlighter(props: {
+  text: string
+  query: string
+  messageID: string
+  partID?: string
+  fg?: any
+}) {
+  const ctx = use()
+  const { theme } = useTheme()
+
+  const segments = createMemo(() => {
+    const query = props.query.toLowerCase()
+    if (!query) return [{ text: props.text, highlight: false, isActive: false }]
+
+    const result: { text: string; highlight: boolean; isActive: boolean }[] = []
+    const text = props.text
+    const lower = text.toLowerCase()
+    let lastIndex = 0
+    let matchCount = 0
+
+    let pos = 0
+    while ((pos = lower.indexOf(query, pos)) !== -1) {
+      if (pos > lastIndex) {
+        result.push({ text: text.slice(lastIndex, pos), highlight: false, isActive: false })
+      }
+
+      const currentMatch = ctx.matches().find(
+        (m) =>
+          m.messageID === props.messageID &&
+          (!props.partID || m.partID === props.partID) &&
+          m.index === ctx.currentMatchIndex(),
+      )
+      const isActive =
+        currentMatch?.messageID === props.messageID &&
+        (!props.partID || currentMatch?.partID === props.partID) &&
+        matchCount ===
+          ctx
+            .matches()
+            .filter(
+              (m) =>
+                m.messageID === props.messageID &&
+                (!props.partID || m.partID === props.partID) &&
+                m.index <= ctx.currentMatchIndex(),
+            ).length -
+            1
+
+      result.push({
+        text: text.slice(pos, pos + query.length),
+        highlight: true,
+        isActive,
+      })
+      lastIndex = pos + query.length
+      pos = lastIndex
+      matchCount++
+    }
+
+    if (lastIndex < text.length) {
+      result.push({ text: text.slice(lastIndex), highlight: false, isActive: false })
+    }
+
+    return result
+  })
+
+  return (
+    <text fg={props.fg ?? theme.text}>
+      <For each={segments()}>
+        {(segment) => (
+          <Show
+            when={segment.highlight}
+            fallback={<>{segment.text}</>}
+          >
+            <span
+              style={{
+                bg: segment.isActive ? theme.primary : theme.warning,
+                fg: theme.background,
+                bold: segment.isActive,
+              }}
+            >
+              {segment.text}
+            </span>
+          </Show>
+        )}
+      </For>
+    </text>
+  )
+}
+
 function UserMessage(props: {
   message: UserMessage
   parts: Part[]
@@ -948,7 +1150,17 @@ function UserMessage(props: {
             backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
             flexShrink={0}
           >
-            <text fg={theme.text}>{text()?.text}</text>
+            <Show
+              when={ctx.searchQuery()}
+              fallback={<text fg={theme.text}>{text()?.text}</text>}
+            >
+              <SearchHighlighter
+                text={text()?.text ?? ""}
+                query={ctx.searchQuery()}
+                messageID={props.message.id}
+                partID={text()?.id}
+              />
+            </Show>
             <Show when={files().length}>
               <box flexDirection="row" paddingBottom={1} paddingTop={1} gap={1} flexWrap="wrap">
                 <For each={files()}>
@@ -1101,21 +1313,73 @@ function ReasoningPart(props: { last: boolean; part: ReasoningPart; message: Ass
   )
 }
 
+function MarkdownSearchHighlighter(props: {
+  text: string
+  query: string
+  messageID: string
+  partID?: string
+  syntaxStyle: any
+  conceal: boolean
+}) {
+  const ctx = use()
+  const { theme } = useTheme()
+
+  const content = createMemo(() => {
+    if (!props.query) return props.text
+    const escapedQuery = props.query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+    // Use ~~ for strikethrough to represent the highlighted system
+    return props.text.replace(new RegExp(escapedQuery, "gi"), "~~$&~~")
+  })
+
+  return (
+    <code
+      filetype="markdown"
+      drawUnstyledText={false}
+      streaming={true}
+      syntaxStyle={props.syntaxStyle}
+      content={content()}
+      conceal={props.conceal}
+      fg={theme.text}
+    />
+  )
+}
+
 function TextPart(props: { last: boolean; part: TextPart; message: AssistantMessage }) {
   const ctx = use()
   const { theme, syntax } = useTheme()
+
+  const hasMatch = createMemo(() => {
+    const query = ctx.searchQuery().toLowerCase()
+    if (!query) return false
+    return props.part.text.toLowerCase().includes(query)
+  })
+
   return (
     <Show when={props.part.text.trim()}>
       <box id={"text-" + props.part.id} paddingLeft={3} marginTop={1} flexShrink={0}>
-        <code
-          filetype="markdown"
-          drawUnstyledText={false}
-          streaming={true}
-          syntaxStyle={syntax()}
-          content={props.part.text.trim()}
-          conceal={ctx.conceal()}
-          fg={theme.text}
-        />
+        <Show
+          when={hasMatch()}
+          fallback={
+            <code
+              filetype="markdown"
+              drawUnstyledText={false}
+              streaming={true}
+              syntaxStyle={syntax()}
+              content={props.part.text.trim()}
+              conceal={ctx.conceal()}
+              fg={theme.text}
+            />
+          }
+        >
+          <MarkdownSearchHighlighter
+            text={props.part.text.trim()}
+            query={ctx.searchQuery()}
+            messageID={props.message.id}
+            partID={props.part.id}
+            syntaxStyle={syntax()}
+            conceal={ctx.conceal()}
+          />
+        </Show>
       </box>
     </Show>
   )

From d887d1128f0719190be2e19f9d8b48744db9d1a8 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Wed, 26 Nov 2025 23:35:22 +0000
Subject: [PATCH 03/22] chore: format code

---
 .../cli/cmd/tui/component/prompt/search.tsx   |  6 +---
 .../src/cli/cmd/tui/routes/session/index.tsx  | 36 +++++++------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx
index 0158f2b7653d..60dccbd6fb77 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/search.tsx
@@ -179,11 +179,7 @@ export function SearchInput(props: SearchInputProps) {
               <text fg={highlight()}>Search</text>
               <Show
                 when={props.matchInfo && props.matchInfo.total > 0}
-                fallback={
-                  <text fg={theme.textMuted}>
-                    {store.input ? "No matches" : "Go through session history"}
-                  </text>
-                }
+                fallback={<text fg={theme.textMuted}>{store.input ? "No matches" : "Go through session history"}</text>}
               >
                 <text fg={theme.text}>
                   {props.matchInfo!.current + 1} of {props.matchInfo!.total}
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index c3ff44217467..8a3ff43bdd7f 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -988,9 +988,7 @@ export function Session() {
                   onNext={handleNextMatch}
                   onPrevious={handlePrevMatch}
                   matchInfo={
-                    matches().length > 0
-                      ? { current: currentMatchIndex(), total: matches().length }
-                      : undefined
+                    matches().length > 0 ? { current: currentMatchIndex(), total: matches().length } : undefined
                   }
                   onExit={() => {
                     setSearchMode(false)
@@ -1021,13 +1019,7 @@ const MIME_BADGE: Record<string, string> = {
   "application/x-directory": "dir",
 }
 
-function SearchHighlighter(props: {
-  text: string
-  query: string
-  messageID: string
-  partID?: string
-  fg?: any
-}) {
+function SearchHighlighter(props: { text: string; query: string; messageID: string; partID?: string; fg?: any }) {
   const ctx = use()
   const { theme } = useTheme()
 
@@ -1047,12 +1039,14 @@ function SearchHighlighter(props: {
         result.push({ text: text.slice(lastIndex, pos), highlight: false, isActive: false })
       }
 
-      const currentMatch = ctx.matches().find(
-        (m) =>
-          m.messageID === props.messageID &&
-          (!props.partID || m.partID === props.partID) &&
-          m.index === ctx.currentMatchIndex(),
-      )
+      const currentMatch = ctx
+        .matches()
+        .find(
+          (m) =>
+            m.messageID === props.messageID &&
+            (!props.partID || m.partID === props.partID) &&
+            m.index === ctx.currentMatchIndex(),
+        )
       const isActive =
         currentMatch?.messageID === props.messageID &&
         (!props.partID || currentMatch?.partID === props.partID) &&
@@ -1088,10 +1082,7 @@ function SearchHighlighter(props: {
     <text fg={props.fg ?? theme.text}>
       <For each={segments()}>
         {(segment) => (
-          <Show
-            when={segment.highlight}
-            fallback={<>{segment.text}</>}
-          >
+          <Show when={segment.highlight} fallback={<>{segment.text}</>}>
             <span
               style={{
                 bg: segment.isActive ? theme.primary : theme.warning,
@@ -1150,10 +1141,7 @@ function UserMessage(props: {
             backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
             flexShrink={0}
           >
-            <Show
-              when={ctx.searchQuery()}
-              fallback={<text fg={theme.text}>{text()?.text}</text>}
-            >
+            <Show when={ctx.searchQuery()} fallback={<text fg={theme.text}>{text()?.text}</text>}>
               <SearchHighlighter
                 text={text()?.text ?? ""}
                 query={ctx.searchQuery()}

From 9b55c81e3d5cb1bc6a8e817ee5bc50adb0bed68c Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Thu, 27 Nov 2025 11:07:24 +0100
Subject: [PATCH 04/22] feat(tui): add bash output viewer with ANSI color
 support

Adds an bash output viewer with full ANSI color support. When bash commands
produce more than 20 lines of output, users can click to expand into a
full-screen viewer with syntax highlighting and keyboard navigation.

Key features:
- Full ANSI/VT color rendering using opentui-ansi-vt terminal emulation
- Truncated preview (20 lines) with 'Click to view full output' expansion
- Prompt text preservation when entering/exiting viewer
- Force color output in bash commands (FORCE_COLOR, CLICOLOR, TERM env vars)

Technical changes:
- Added opentui-ansi-vt dependency for terminal buffer rendering
- Added initialValue prop to Prompt component to restore draft text
- Strip ANSI codes for search to match actual text content
---
 bun.lock                                      |   3 +
 packages/opencode/package.json                |   1 +
 .../cli/cmd/tui/component/prompt/index.tsx    |   9 +
 .../src/cli/cmd/tui/routes/session/index.tsx  | 346 +++++++++++-------
 packages/opencode/src/tool/bash.ts            |  14 +
 packages/plugin/package.json                  |   2 +-
 packages/sdk/js/package.json                  |   2 +-
 7 files changed, 247 insertions(+), 130 deletions(-)

diff --git a/bun.lock b/bun.lock
index 9ea4c7de3023..31bff9d085ae 100644
--- a/bun.lock
+++ b/bun.lock
@@ -256,6 +256,7 @@
         "jsonc-parser": "3.3.1",
         "minimatch": "10.0.3",
         "open": "10.1.2",
+        "opentui-ansi-vt": "1.2.5",
         "opentui-spinner": "0.0.5",
         "partial-json": "0.1.7",
         "remeda": "catalog:",
@@ -2969,6 +2970,8 @@
 
     "openid-client": ["openid-client@5.6.4", "", { "dependencies": { "jose": "^4.15.4", "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" } }, "sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA=="],
 
+    "opentui-ansi-vt": ["opentui-ansi-vt@1.2.5", "", { "dependencies": { "strip-ansi": "^7.1.2" }, "peerDependencies": { "@opentui/core": "*" }, "optionalPeers": ["@opentui/core"] }, "sha512-9m2U3un7c5thRjFM2xNNAgbFbC0Zi53s2adj52lnZfR8u7q8P6KBRZ0dNVCuN/KxAsPgpFRuQXXmZXufMrSaZg=="],
+
     "opentui-spinner": ["opentui-spinner@0.0.5", "", { "dependencies": { "cli-spinners": "^3.3.0" }, "peerDependencies": { "@opentui/core": "^0.1.49", "@opentui/react": "^0.1.49", "@opentui/solid": "^0.1.49", "typescript": "^5" }, "optionalPeers": ["@opentui/react", "@opentui/solid"] }, "sha512-abSWzWA7eyuD0PjerAWbBznLmOQn+8xRDaLGCVIs4ctETi2laNFr5KwicYnPXsHZpPc2neV7WtQm+diCEfOhLA=="],
 
     "own-keys": ["own-keys@1.0.1", "", { "dependencies": { "get-intrinsic": "^1.2.6", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" } }, "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg=="],
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index e0909c194602..f348caf119c0 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -82,6 +82,7 @@
     "jsonc-parser": "3.3.1",
     "minimatch": "10.0.3",
     "open": "10.1.2",
+    "opentui-ansi-vt": "1.2.5",
     "opentui-spinner": "0.0.5",
     "partial-json": "0.1.7",
     "remeda": "catalog:",
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 06e9a49e676f..95b649ad336b 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -30,10 +30,12 @@ export type PromptProps = {
   ref?: (ref: PromptRef) => void
   hint?: JSX.Element
   showPlaceholder?: boolean
+  initialValue?: string
 }
 
 export type PromptRef = {
   focused: boolean
+  text: string
   set(prompt: PromptInfo): void
   reset(): void
   blur(): void
@@ -277,6 +279,10 @@ export function Prompt(props: PromptProps) {
 
   onMount(() => {
     promptPartTypeId = input.extmarks.registerType("prompt-part")
+    if (props.initialValue) {
+      input.setText(props.initialValue)
+      setStore("prompt", "input", props.initialValue)
+    }
   })
 
   function restoreExtmarksFromParts(parts: PromptInfo["parts"]) {
@@ -361,6 +367,9 @@ export function Prompt(props: PromptProps) {
     get focused() {
       return input.focused
     },
+    get text() {
+      return input.plainText
+    },
     focus() {
       input.focus()
     },
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index fdbcb34f9df9..2e034f51d8ef 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -19,6 +19,7 @@ import { SplitBorder } from "@tui/component/border"
 import { useTheme } from "@tui/context/theme"
 import {
   BoxRenderable,
+  InputRenderable,
   ScrollBoxRenderable,
   addDefaultParsers,
   MacOSScrollAccel,
@@ -63,9 +64,13 @@ import { useKV } from "../../context/kv.tsx"
 import { Editor } from "../../util/editor"
 import stripAnsi from "strip-ansi"
 import { Footer } from "./footer.tsx"
+import { extend } from "@opentui/solid"
+import { TerminalBufferRenderable } from "opentui-ansi-vt/terminal-buffer"
 
 addDefaultParsers(parsers.parsers)
 
+extend({ "terminal-buffer": TerminalBufferRenderable })
+
 class CustomSpeedScroll implements ScrollAcceleration {
   constructor(private speed: number) {}
 
@@ -76,12 +81,19 @@ class CustomSpeedScroll implements ScrollAcceleration {
   reset(): void {}
 }
 
+type BashOutputView = {
+  command: string
+  output: () => string
+}
+
 const context = createContext<{
   width: number
   conceal: () => boolean
   showThinking: () => boolean
   showTimestamps: () => boolean
   sync: ReturnType<typeof useSync>
+  bashOutput: () => BashOutputView | undefined
+  showBashOutput: (view: BashOutputView | undefined) => void
 }>()
 
 function use() {
@@ -113,6 +125,8 @@ export function Session() {
   const [conceal, setConceal] = createSignal(true)
   const [showThinking, setShowThinking] = createSignal(true)
   const [showTimestamps, setShowTimestamps] = createSignal(kv.get("timestamps", "hide") === "show")
+  const [bashOutput, setBashOutput] = createSignal<BashOutputView | undefined>(undefined)
+  const [promptDraft, setPromptDraft] = createSignal("")
 
   const wide = createMemo(() => dimensions().width > 120)
   const sidebarVisible = createMemo(() => {
@@ -176,12 +190,35 @@ export function Session() {
   })
 
   let scroll: ScrollBoxRenderable
+  let bashScroll: ScrollBoxRenderable
   let prompt: PromptRef
   const keybind = useKeybind()
 
   useKeyboard((evt) => {
     if (dialog.stack.length > 0) return
 
+    if (bashOutput()) {
+      const scroll = bashScroll
+      const amount = 3
+      if (evt.name === "escape" || (evt.name === "c" && evt.ctrl)) {
+        setBashOutput(undefined)
+        evt.preventDefault()
+      } else if (evt.name === "up") {
+        scroll?.scrollBy(-amount)
+        evt.preventDefault()
+      } else if (evt.name === "down") {
+        scroll?.scrollBy(amount)
+        evt.preventDefault()
+      } else if (evt.name === "home") {
+        scroll?.scrollTo(0)
+        evt.preventDefault()
+      } else if (evt.name === "end") {
+        scroll?.scrollTo(scroll.scrollHeight)
+        evt.preventDefault()
+      }
+      return
+    }
+
     const first = permissions()[0]
     if (first) {
       const response = iife(() => {
@@ -740,6 +777,11 @@ export function Session() {
         showThinking,
         showTimestamps,
         sync,
+        bashOutput,
+        showBashOutput: (view) => {
+          if (view && prompt) setPromptDraft(prompt.text)
+          setBashOutput(view)
+        },
       }}
     >
       <box flexDirection="row">
@@ -748,130 +790,158 @@ export function Session() {
             <Show when={!sidebarVisible()}>
               <Header />
             </Show>
-            <scrollbox
-              ref={(r) => (scroll = r)}
-              scrollbarOptions={{
-                paddingLeft: 2,
-                visible: false,
-                trackOptions: {
-                  backgroundColor: theme.backgroundElement,
-                  foregroundColor: theme.border,
-                },
-              }}
-              stickyScroll={true}
-              stickyStart="bottom"
-              flexGrow={1}
-              scrollAcceleration={scrollAcceleration()}
-            >
-              <For each={messages()}>
-                {(message, index) => (
-                  <Switch>
-                    <Match when={message.id === revert()?.messageID}>
-                      {(function () {
-                        const command = useCommandDialog()
-                        const [hover, setHover] = createSignal(false)
-                        const dialog = useDialog()
-
-                        const handleUnrevert = async () => {
-                          const confirmed = await DialogConfirm.show(
-                            dialog,
-                            "Confirm Redo",
-                            "Are you sure you want to restore the reverted messages?",
-                          )
-                          if (confirmed) {
-                            command.trigger("session.redo")
-                          }
-                        }
-
-                        return (
-                          <box
-                            onMouseOver={() => setHover(true)}
-                            onMouseOut={() => setHover(false)}
-                            onMouseUp={handleUnrevert}
-                            marginTop={1}
-                            flexShrink={0}
-                            border={["left"]}
-                            customBorderChars={SplitBorder.customBorderChars}
-                            borderColor={theme.backgroundPanel}
-                          >
-                            <box
-                              paddingTop={1}
-                              paddingBottom={1}
-                              paddingLeft={2}
-                              backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
-                            >
-                              <text fg={theme.textMuted}>{revert()!.reverted.length} message reverted</text>
-                              <text fg={theme.textMuted}>
-                                <span style={{ fg: theme.text }}>{keybind.print("messages_redo")}</span> or /redo to
-                                restore
-                              </text>
-                              <Show when={revert()!.diffFiles?.length}>
-                                <box marginTop={1}>
-                                  <For each={revert()!.diffFiles}>
-                                    {(file) => (
-                                      <text>
-                                        {file.filename}
-                                        <Show when={file.additions > 0}>
-                                          <span style={{ fg: theme.diffAdded }}> +{file.additions}</span>
-                                        </Show>
-                                        <Show when={file.deletions > 0}>
-                                          <span style={{ fg: theme.diffRemoved }}> -{file.deletions}</span>
-                                        </Show>
-                                      </text>
-                                    )}
-                                  </For>
+            <Switch>
+              <Match when={bashOutput()}>
+                {(view) => (
+                  <box flexGrow={1} flexDirection="column">
+                    <box paddingLeft={1} paddingBottom={1} flexShrink={0}>
+                      <text fg={theme.textMuted}>$ {view().command}</text>
+                    </box>
+                    <scrollbox
+                      ref={(r) => (bashScroll = r)}
+                      flexGrow={1}
+                      paddingLeft={1}
+                      paddingBottom={1}
+                      scrollAcceleration={scrollAcceleration()}
+                    >
+                      <terminal-buffer ansi={view().output()} cols={contentWidth()} />
+                    </scrollbox>
+                    <box flexShrink={0} paddingLeft={1}>
+                      <text fg={theme.textMuted}>ESC to close | ↑/↓ scroll | Home/End top/bottom</text>
+                    </box>
+                  </box>
+                )}
+              </Match>
+              <Match when={!bashOutput()}>
+                <>
+                  <scrollbox
+                    ref={(r) => (scroll = r)}
+                    scrollbarOptions={{
+                      paddingLeft: 2,
+                      visible: false,
+                      trackOptions: {
+                        backgroundColor: theme.backgroundElement,
+                        foregroundColor: theme.border,
+                      },
+                    }}
+                    stickyScroll={true}
+                    stickyStart="bottom"
+                    flexGrow={1}
+                    scrollAcceleration={scrollAcceleration()}
+                  >
+                    <For each={messages()}>
+                      {(message, index) => (
+                        <Switch>
+                          <Match when={message.id === revert()?.messageID}>
+                            {(function () {
+                              const command = useCommandDialog()
+                              const [hover, setHover] = createSignal(false)
+                              const dialog = useDialog()
+
+                              const handleUnrevert = async () => {
+                                const confirmed = await DialogConfirm.show(
+                                  dialog,
+                                  "Confirm Redo",
+                                  "Are you sure you want to restore the reverted messages?",
+                                )
+                                if (confirmed) {
+                                  command.trigger("session.redo")
+                                }
+                              }
+
+                              return (
+                                <box
+                                  onMouseOver={() => setHover(true)}
+                                  onMouseOut={() => setHover(false)}
+                                  onMouseUp={handleUnrevert}
+                                  marginTop={1}
+                                  flexShrink={0}
+                                  border={["left"]}
+                                  customBorderChars={SplitBorder.customBorderChars}
+                                  borderColor={theme.backgroundPanel}
+                                >
+                                  <box
+                                    paddingTop={1}
+                                    paddingBottom={1}
+                                    paddingLeft={2}
+                                    backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
+                                  >
+                                    <text fg={theme.textMuted}>{revert()!.reverted.length} message reverted</text>
+                                    <text fg={theme.textMuted}>
+                                      <span style={{ fg: theme.text }}>{keybind.print("messages_redo")}</span> or /redo
+                                      to restore
+                                    </text>
+                                    <Show when={revert()!.diffFiles?.length}>
+                                      <box marginTop={1}>
+                                        <For each={revert()!.diffFiles}>
+                                          {(file) => (
+                                            <text>
+                                              {file.filename}
+                                              <Show when={file.additions > 0}>
+                                                <span style={{ fg: theme.diffAdded }}> +{file.additions}</span>
+                                              </Show>
+                                              <Show when={file.deletions > 0}>
+                                                <span style={{ fg: theme.diffRemoved }}> -{file.deletions}</span>
+                                              </Show>
+                                            </text>
+                                          )}
+                                        </For>
+                                      </box>
+                                    </Show>
+                                  </box>
                                 </box>
-                              </Show>
-                            </box>
-                          </box>
-                        )
-                      })()}
-                    </Match>
-                    <Match when={revert()?.messageID && message.id >= revert()!.messageID}>
-                      <></>
-                    </Match>
-                    <Match when={message.role === "user"}>
-                      <UserMessage
-                        index={index()}
-                        onMouseUp={() => {
-                          if (renderer.getSelection()?.getSelectedText()) return
-                          dialog.replace(() => (
-                            <DialogMessage
-                              messageID={message.id}
-                              sessionID={route.sessionID}
-                              setPrompt={(promptInfo) => prompt.set(promptInfo)}
+                              )
+                            })()}
+                          </Match>
+                          <Match when={revert()?.messageID && message.id >= revert()!.messageID}>
+                            <></>
+                          </Match>
+                          <Match when={message.role === "user"}>
+                            <UserMessage
+                              index={index()}
+                              onMouseUp={() => {
+                                if (renderer.getSelection()?.getSelectedText()) return
+                                dialog.replace(() => (
+                                  <DialogMessage
+                                    messageID={message.id}
+                                    sessionID={route.sessionID}
+                                    setPrompt={(promptInfo) => prompt.set(promptInfo)}
+                                  />
+                                ))
+                              }}
+                              message={message as UserMessage}
+                              parts={sync.data.part[message.id] ?? []}
+                              pending={pending()}
                             />
-                          ))
-                        }}
-                        message={message as UserMessage}
-                        parts={sync.data.part[message.id] ?? []}
-                        pending={pending()}
-                      />
-                    </Match>
-                    <Match when={message.role === "assistant"}>
-                      <AssistantMessage
-                        last={lastAssistant()?.id === message.id}
-                        message={message as AssistantMessage}
-                        parts={sync.data.part[message.id] ?? []}
-                      />
-                    </Match>
-                  </Switch>
-                )}
-              </For>
-            </scrollbox>
-            <box flexShrink={0}>
-              <Prompt
-                ref={(r) => (prompt = r)}
-                disabled={permissions().length > 0}
-                onSubmit={() => {
-                  toBottom()
-                }}
-                sessionID={route.sessionID}
-              />
-            </box>
-            <Show when={!sidebarVisible()}>
-              <Footer />
-            </Show>
+                          </Match>
+                          <Match when={message.role === "assistant"}>
+                            <AssistantMessage
+                              last={lastAssistant()?.id === message.id}
+                              message={message as AssistantMessage}
+                              parts={sync.data.part[message.id] ?? []}
+                            />
+                          </Match>
+                        </Switch>
+                      )}
+                    </For>
+                  </scrollbox>
+                  <box flexShrink={0}>
+                    <Prompt
+                      ref={(r) => (prompt = r)}
+                      disabled={permissions().length > 0}
+                      onSubmit={() => {
+                        toBottom()
+                      }}
+                      sessionID={route.sessionID}
+                      initialValue={promptDraft()}
+                    />
+                  </box>
+                  <Show when={!sidebarVisible()}>
+                    <Footer />
+                  </Show>
+                </>
+              </Match>
+            </Switch>
           </Show>
           <Toast />
         </box>
@@ -1255,26 +1325,46 @@ function ToolTitle(props: { fallback: string; when: any; icon: string; children:
   )
 }
 
+const BASH_DISPLAY_LINES = 20
+
 ToolRegistry.register<typeof BashTool>({
   name: "bash",
   container: "block",
   render(props) {
-    const output = createMemo(() => stripAnsi(props.metadata.output?.trim() ?? ""))
+    const rawOutput = createMemo(() => props.metadata.output?.trim() ?? "")
+    const ctx = use()
     const { theme } = useTheme()
+
+    const displayOutput = createMemo(() => {
+      const lines = rawOutput().split("\n")
+      if (lines.length <= BASH_DISPLAY_LINES) return rawOutput()
+      return lines.slice(0, BASH_DISPLAY_LINES).join("\n") + `\n... (${lines.length - BASH_DISPLAY_LINES} more lines)`
+    })
+
+    const truncated = createMemo(() => rawOutput().split("\n").length > BASH_DISPLAY_LINES)
+
     return (
-      <>
+      <box>
         <ToolTitle icon="#" fallback="Writing command..." when={props.input.command}>
           {props.input.description || "Shell"}
         </ToolTitle>
         <Show when={props.input.command}>
           <text fg={theme.text}>$ {props.input.command}</text>
         </Show>
-        <Show when={output()}>
-          <box>
-            <text fg={theme.text}>{output()}</text>
+        <Show when={displayOutput()}>
+          {/* rows here means that the ANSI is rendered via Ghostty as 2 lines per page. Then the result is returned as 20 lines */}
+          <terminal-buffer ansi={displayOutput()} rows={2} limit={20} cols={ctx.width} />
+        </Show>
+        <Show when={truncated()}>
+          <box
+            onMouseUp={() => {
+              ctx.showBashOutput({ command: props.input.command!, output: rawOutput })
+            }}
+          >
+            <text fg={theme.textMuted}>Click to view full output</text>
           </box>
         </Show>
-      </>
+      </box>
     )
   },
 })
diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index d8af0a77f46f..a40c1d64b919 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -217,6 +217,20 @@ export const BashTool = Tool.define("bash", async () => {
         shell,
         cwd: Instance.directory,
         env: {
+          // Force color output in as many tools as possible
+          FORCE_COLOR: "3",
+          CLICOLOR: "1",
+          CLICOLOR_FORCE: "1",
+          TERM: "xterm-256color",
+          TERM_PROGRAM: "bash-tool",
+          TERM_COLOR: "1",
+          NO_COLOR: "", // Unset to avoid accidental no-color
+          PY_COLORS: "1",
+          ANSICON: "1",
+          COLORTERM: "truecolor",
+          // Some tools respect these too; although most are covered above
+          NODE_DISABLE_COLORS: "",
+          // Inherit rest of env below
           ...process.env,
         },
         stdio: ["ignore", "pipe", "pipe"],
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index d4875c3a39cd..5cf3c465bca0 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -24,4 +24,4 @@
     "typescript": "catalog:",
     "@typescript/native-preview": "catalog:"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 1b9dc0fcf37a..a0c125c68633 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -26,4 +26,4 @@
   "publishConfig": {
     "directory": "dist"
   }
-}
\ No newline at end of file
+}

From 32716f5da9a4c24fe41d6e9bd3764eac6d5e1da8 Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Thu, 27 Nov 2025 11:19:49 +0100
Subject: [PATCH 05/22] limit to MAX_OUTPUT_LENGTH

---
 packages/opencode/src/tool/bash.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index a40c1d64b919..6b7e0c086850 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -248,7 +248,11 @@ export const BashTool = Tool.define("bash", async () => {
       })
 
       const append = (chunk: Buffer) => {
+        if (output.length >= MAX_OUTPUT_LENGTH) return
         output += chunk.toString()
+        if (output.length > MAX_OUTPUT_LENGTH) {
+          output = output.slice(0, MAX_OUTPUT_LENGTH)
+        }
         ctx.metadata({
           metadata: {
             output,

From 7b75a3393baa139fedeb291b5bb0e5b5377e552d Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Thu, 27 Nov 2025 11:28:52 +0100
Subject: [PATCH 06/22] remove ANSI from model output with ptyToText

---
 bun.lock                                                   | 4 ++--
 packages/opencode/package.json                             | 2 +-
 packages/opencode/src/cli/cmd/tui/routes/session/index.tsx | 2 --
 packages/opencode/src/tool/bash.ts                         | 3 ++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bun.lock b/bun.lock
index 31bff9d085ae..ccf2df3ba3cd 100644
--- a/bun.lock
+++ b/bun.lock
@@ -256,7 +256,7 @@
         "jsonc-parser": "3.3.1",
         "minimatch": "10.0.3",
         "open": "10.1.2",
-        "opentui-ansi-vt": "1.2.5",
+        "opentui-ansi-vt": "1.2.6",
         "opentui-spinner": "0.0.5",
         "partial-json": "0.1.7",
         "remeda": "catalog:",
@@ -2970,7 +2970,7 @@
 
     "openid-client": ["openid-client@5.6.4", "", { "dependencies": { "jose": "^4.15.4", "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" } }, "sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA=="],
 
-    "opentui-ansi-vt": ["opentui-ansi-vt@1.2.5", "", { "dependencies": { "strip-ansi": "^7.1.2" }, "peerDependencies": { "@opentui/core": "*" }, "optionalPeers": ["@opentui/core"] }, "sha512-9m2U3un7c5thRjFM2xNNAgbFbC0Zi53s2adj52lnZfR8u7q8P6KBRZ0dNVCuN/KxAsPgpFRuQXXmZXufMrSaZg=="],
+    "opentui-ansi-vt": ["opentui-ansi-vt@1.2.6", "", { "dependencies": { "strip-ansi": "^7.1.2" }, "peerDependencies": { "@opentui/core": "*" }, "optionalPeers": ["@opentui/core"] }, "sha512-Or/TPJa0v1Uj15z3Kt1mX2PgIjwc5lywhRCn/F/1a89C28Nvo6Inb4aRT+Uf6hgQyrqQHl58Uo2pCPMWzC3MIQ=="],
 
     "opentui-spinner": ["opentui-spinner@0.0.5", "", { "dependencies": { "cli-spinners": "^3.3.0" }, "peerDependencies": { "@opentui/core": "^0.1.49", "@opentui/react": "^0.1.49", "@opentui/solid": "^0.1.49", "typescript": "^5" }, "optionalPeers": ["@opentui/react", "@opentui/solid"] }, "sha512-abSWzWA7eyuD0PjerAWbBznLmOQn+8xRDaLGCVIs4ctETi2laNFr5KwicYnPXsHZpPc2neV7WtQm+diCEfOhLA=="],
 
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index f348caf119c0..419cd2d814a0 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -82,7 +82,7 @@
     "jsonc-parser": "3.3.1",
     "minimatch": "10.0.3",
     "open": "10.1.2",
-    "opentui-ansi-vt": "1.2.5",
+    "opentui-ansi-vt": "1.2.6",
     "opentui-spinner": "0.0.5",
     "partial-json": "0.1.7",
     "remeda": "catalog:",
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 2e034f51d8ef..ef686691f433 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -19,7 +19,6 @@ import { SplitBorder } from "@tui/component/border"
 import { useTheme } from "@tui/context/theme"
 import {
   BoxRenderable,
-  InputRenderable,
   ScrollBoxRenderable,
   addDefaultParsers,
   MacOSScrollAccel,
@@ -62,7 +61,6 @@ import { Clipboard } from "../../util/clipboard"
 import { Toast, useToast } from "../../ui/toast"
 import { useKV } from "../../context/kv.tsx"
 import { Editor } from "../../util/editor"
-import stripAnsi from "strip-ansi"
 import { Footer } from "./footer.tsx"
 import { extend } from "@opentui/solid"
 import { TerminalBufferRenderable } from "opentui-ansi-vt/terminal-buffer"
diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index 6b7e0c086850..c5966fe4be58 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -15,6 +15,7 @@ import { fileURLToPath } from "url"
 import { Flag } from "@/flag/flag.ts"
 import path from "path"
 import { iife } from "@/util/iife"
+import { ptyToText } from "opentui-ansi-vt"
 
 const DEFAULT_MAX_OUTPUT_LENGTH = 30_000
 const MAX_OUTPUT_LENGTH = (() => {
@@ -354,7 +355,7 @@ export const BashTool = Tool.define("bash", async () => {
           exit: proc.exitCode,
           description: params.description,
         },
-        output,
+        output: ptyToText(output),
       }
     },
   }

From ec52beb58cd123aeeab3705b5f66ac9b2817ea11 Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Thu, 27 Nov 2025 11:29:22 +0100
Subject: [PATCH 07/22] use 120 rows for terminal output

---
 packages/opencode/src/tool/bash.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index c5966fe4be58..2fc0cfee137e 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -355,7 +355,7 @@ export const BashTool = Tool.define("bash", async () => {
           exit: proc.exitCode,
           description: params.description,
         },
-        output: ptyToText(output),
+        output: ptyToText(output, { rows: 120, cols: 256 }),
       }
     },
   }

From 0bb9de45f907b1339c1bd402edb7fdb4bf7447a2 Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Thu, 27 Nov 2025 10:32:45 +0000
Subject: [PATCH 08/22] Update Nix flake.lock and hashes

---
 flake.lock      | 6 +++---
 nix/hashes.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index b0749bea4f0c..5653a5af38a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764138170,
-        "narHash": "sha256-2bCmfCUZyi2yj9FFXYKwsDiaZmizN75cLhI/eWmf3tk=",
+        "lastModified": 1764167966,
+        "narHash": "sha256-nXv6xb7cq+XpjBYIjWEGTLCqQetxJu6zvVlrqHMsCOA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb813de6d2241bcb1b5af2d3059f560c66329967",
+        "rev": "5c46f3bd98147c8d82366df95bbef2cab3a967ea",
         "type": "github"
       },
       "original": {
diff --git a/nix/hashes.json b/nix/hashes.json
index 1f11430f2d21..d408d0166f3f 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-dTGBX5mde/hQP36MSFwq3G81OdwpcYRl8bcjLpesbPw="
+  "nodeModules": "sha256-bjSgxRWKD/+7FABN/9LIwc3aquHvb9KHFcggCw+1qXI="
 }

From f3d9ab6fd2b4af3e31d3e6d98dcb3db87b9ed97c Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Thu, 27 Nov 2025 11:48:03 +0100
Subject: [PATCH 09/22] chore: update opentui-ansi-vt to 1.2.7

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

diff --git a/bun.lock b/bun.lock
index ccf2df3ba3cd..24e67803d5e9 100644
--- a/bun.lock
+++ b/bun.lock
@@ -256,7 +256,7 @@
         "jsonc-parser": "3.3.1",
         "minimatch": "10.0.3",
         "open": "10.1.2",
-        "opentui-ansi-vt": "1.2.6",
+        "opentui-ansi-vt": "1.2.7",
         "opentui-spinner": "0.0.5",
         "partial-json": "0.1.7",
         "remeda": "catalog:",
@@ -2970,7 +2970,7 @@
 
     "openid-client": ["openid-client@5.6.4", "", { "dependencies": { "jose": "^4.15.4", "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" } }, "sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA=="],
 
-    "opentui-ansi-vt": ["opentui-ansi-vt@1.2.6", "", { "dependencies": { "strip-ansi": "^7.1.2" }, "peerDependencies": { "@opentui/core": "*" }, "optionalPeers": ["@opentui/core"] }, "sha512-Or/TPJa0v1Uj15z3Kt1mX2PgIjwc5lywhRCn/F/1a89C28Nvo6Inb4aRT+Uf6hgQyrqQHl58Uo2pCPMWzC3MIQ=="],
+    "opentui-ansi-vt": ["opentui-ansi-vt@1.2.7", "", { "dependencies": { "strip-ansi": "^7.1.2" }, "peerDependencies": { "@opentui/core": "*" }, "optionalPeers": ["@opentui/core"] }, "sha512-mcumATXHkagt7JUK+5mpBPaUW0LHrwysp8JQqDBnZG22vb1TTh/HmGjWFXBWe4oo4Rshw7s7NWIbt0/jCWOgcw=="],
 
     "opentui-spinner": ["opentui-spinner@0.0.5", "", { "dependencies": { "cli-spinners": "^3.3.0" }, "peerDependencies": { "@opentui/core": "^0.1.49", "@opentui/react": "^0.1.49", "@opentui/solid": "^0.1.49", "typescript": "^5" }, "optionalPeers": ["@opentui/react", "@opentui/solid"] }, "sha512-abSWzWA7eyuD0PjerAWbBznLmOQn+8xRDaLGCVIs4ctETi2laNFr5KwicYnPXsHZpPc2neV7WtQm+diCEfOhLA=="],
 
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 419cd2d814a0..cf6c37941460 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -82,7 +82,7 @@
     "jsonc-parser": "3.3.1",
     "minimatch": "10.0.3",
     "open": "10.1.2",
-    "opentui-ansi-vt": "1.2.6",
+    "opentui-ansi-vt": "1.2.7",
     "opentui-spinner": "0.0.5",
     "partial-json": "0.1.7",
     "remeda": "catalog:",

From 0b773bd27d0c1fa94fc992da6d914c486684702b Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Thu, 27 Nov 2025 10:50:15 +0000
Subject: [PATCH 10/22] Update Nix flake.lock and hashes

---
 nix/hashes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/hashes.json b/nix/hashes.json
index d408d0166f3f..d8cf19833af9 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-bjSgxRWKD/+7FABN/9LIwc3aquHvb9KHFcggCw+1qXI="
+  "nodeModules": "sha256-w0Vw7QQxg6a7v0YiAtmeimoO9IQH+3ECQJ1g+KXPOhk="
 }

From 4d0350760f92cc828d7577df837226c78e07f4fe Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Thu, 27 Nov 2025 11:54:02 +0100
Subject: [PATCH 11/22] feat(tui): add page up/down support to bash output
 viewer

---
 .../opencode/src/cli/cmd/tui/routes/session/index.tsx    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index ef686691f433..4895f54d8923 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -198,6 +198,7 @@ export function Session() {
     if (bashOutput()) {
       const scroll = bashScroll
       const amount = 3
+      const pageAmount = Math.max(1, dimensions().height - 4)
       if (evt.name === "escape" || (evt.name === "c" && evt.ctrl)) {
         setBashOutput(undefined)
         evt.preventDefault()
@@ -207,6 +208,12 @@ export function Session() {
       } else if (evt.name === "down") {
         scroll?.scrollBy(amount)
         evt.preventDefault()
+      } else if (evt.name === "pageup") {
+        scroll?.scrollBy(-pageAmount)
+        evt.preventDefault()
+      } else if (evt.name === "pagedown") {
+        scroll?.scrollBy(pageAmount)
+        evt.preventDefault()
       } else if (evt.name === "home") {
         scroll?.scrollTo(0)
         evt.preventDefault()
@@ -805,7 +812,7 @@ export function Session() {
                       <terminal-buffer ansi={view().output()} cols={contentWidth()} />
                     </scrollbox>
                     <box flexShrink={0} paddingLeft={1}>
-                      <text fg={theme.textMuted}>ESC to close | ↑/↓ scroll | Home/End top/bottom</text>
+                      <text fg={theme.textMuted}>ESC to close | ↑/↓ scroll | PgUp/PgDn page | Home/End top/bottom</text>
                     </box>
                   </box>
                 )}

From aa3661a060492f79a347d60347c700e31cd3f5fc Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Fri, 28 Nov 2025 14:11:39 +0000
Subject: [PATCH 12/22] Update Nix flake.lock and hashes

---
 nix/hashes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/hashes.json b/nix/hashes.json
index 08fee7014dd1..379507e2c899 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-RHAcxfg1XmbGhft9kT+NA2JOan3yVKD76U1zV0cVIow="
+  "nodeModules": "sha256-M6xLQ0uBmxGtWyAi/4pletRpKUD1PyiyvMs5V0d42Rk="
 }

From e3c2d1ad3d56ce79eb055f8d96a5e43bc1c49a22 Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Sat, 29 Nov 2025 09:47:02 +0000
Subject: [PATCH 13/22] Update Nix flake.lock and hashes

---
 flake.lock      | 6 +++---
 nix/hashes.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 33aae38122be..43d198c90c8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764290847,
-        "narHash": "sha256-VwPgoDgnd628GdE3KyLqTyPF1WWh0VwT5UoKygoi8sg=",
+        "lastModified": 1764352606,
+        "narHash": "sha256-ZwPqcETKhoQ+TS40+hFr5CY4wzcNGKhi6l8w2HmmxKc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd5fedfc384cb98d9fd3827b55f4522f49efda42",
+        "rev": "24e915b36ca87d32777d766da3a3f4e3ce22cc98",
         "type": "github"
       },
       "original": {
diff --git a/nix/hashes.json b/nix/hashes.json
index 1a2d2158854a..6a292ac12403 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-4OrnnZy44edgShLMUrYFsO+07gAnL//pGKO/ehWu5P4="
+  "nodeModules": "sha256-49BR28UJHRoBHvNpaqVnjB/asDkcLfZI0uL3w0aQ05o="
 }

From fb9043a92be0ef53a01f90ad7e657fbc9a82c815 Mon Sep 17 00:00:00 2001
From: OpeOginni <brightoginni123@gmail.com>
Date: Sat, 29 Nov 2025 15:24:00 +0100
Subject: [PATCH 14/22] fix(tui): improve match navigation and search
 highlighting

- Refactored match navigation logic to prevent scrolling to the same message when navigating through matches.
- Enhanced search highlighting to correctly identify and highlight query text within code blocks.
- Updated rendering of Assistant messages to include IDs for better scrolling functionality during searches.
---
 .../src/cli/cmd/tui/routes/session/index.tsx  | 103 +++++++++++++-----
 1 file changed, 73 insertions(+), 30 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 8a3ff43bdd7f..2954ee255b85 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -228,24 +228,32 @@ export function Session() {
   function handleNextMatch() {
     const m = matches()
     if (m.length === 0) return
-    const next = (currentMatchIndex() + 1) % m.length
+    const current = currentMatchIndex()
+    const next = (current + 1) % m.length
     setCurrentMatchIndex(next)
-    scrollToMatch(next)
+    
+    if (m.length === 1 || m[current]?.messageID !== m[next]?.messageID) {
+      scrollToMatch(next)
+    }
   }
 
   function handlePrevMatch() {
     const m = matches()
     if (m.length === 0) return
-    const next = currentMatchIndex() === 0 ? m.length - 1 : currentMatchIndex() - 1
+    const current = currentMatchIndex()
+    const next = current === 0 ? m.length - 1 : current - 1
     setCurrentMatchIndex(next)
-    scrollToMatch(next)
+    
+    if (m.length === 1 || m[current]?.messageID !== m[next]?.messageID) {
+      scrollToMatch(next)
+    }
   }
 
   function scrollToMatch(index: number) {
     const m = matches()
     if (index < 0 || index >= m.length) return
     const match = m[index]
-    const child = scroll?.getChildren().find((c) => c.id === match.messageID)
+    const child = scroll?.getChildren?.()?.find((c) => c.id === match.messageID)
     if (child) {
       const y = child.y - scroll.y
       if (y < 0 || y >= scroll.height) {
@@ -1033,33 +1041,20 @@ function SearchHighlighter(props: { text: string; query: string; messageID: stri
     let lastIndex = 0
     let matchCount = 0
 
+    // Pre-filter matches for this message/part
+    const partMatches = ctx.matches().filter(m => 
+      m.messageID === props.messageID && 
+      (!props.partID || m.partID === props.partID)
+    )
+
     let pos = 0
     while ((pos = lower.indexOf(query, pos)) !== -1) {
       if (pos > lastIndex) {
         result.push({ text: text.slice(lastIndex, pos), highlight: false, isActive: false })
       }
 
-      const currentMatch = ctx
-        .matches()
-        .find(
-          (m) =>
-            m.messageID === props.messageID &&
-            (!props.partID || m.partID === props.partID) &&
-            m.index === ctx.currentMatchIndex(),
-        )
-      const isActive =
-        currentMatch?.messageID === props.messageID &&
-        (!props.partID || currentMatch?.partID === props.partID) &&
-        matchCount ===
-          ctx
-            .matches()
-            .filter(
-              (m) =>
-                m.messageID === props.messageID &&
-                (!props.partID || m.partID === props.partID) &&
-                m.index <= ctx.currentMatchIndex(),
-            ).length -
-            1
+      const globalMatch = partMatches[matchCount]
+      const isActive = globalMatch?.index === ctx.currentMatchIndex()
 
       result.push({
         text: text.slice(pos, pos + query.length),
@@ -1217,8 +1212,9 @@ function AssistantMessage(props: { message: AssistantMessage; parts: Part[]; las
     return props.message.time.completed - user.time.created
   })
 
+  // We need to provide Assistant messages with ID to be able to scrolled to when searched
   return (
-    <>
+    <box id={props.message.id} flexDirection="column" flexShrink={0}>
       <For each={props.parts}>
         {(part, index) => {
           const component = createMemo(() => PART_MAPPING[part.type as keyof typeof PART_MAPPING])
@@ -1262,7 +1258,7 @@ function AssistantMessage(props: { message: AssistantMessage; parts: Part[]; las
           </box>
         </Match>
       </Switch>
-    </>
+    </box>
   )
 }
 
@@ -1312,11 +1308,58 @@ function MarkdownSearchHighlighter(props: {
   const ctx = use()
   const { theme } = useTheme()
 
+  // const content = createMemo(() => {
+  //   if (!props.query) return props.text
+  //   const escapedQuery = props.query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+  //   // Use ~~ for strikethrough to represent the highlighted system
+  //   return props.text.replace(new RegExp(escapedQuery, "gi"), "~~$&~~")
+  // })
+
   const content = createMemo(() => {
     if (!props.query) return props.text
     const escapedQuery = props.query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-    // Use ~~ for strikethrough to represent the highlighted system
-    return props.text.replace(new RegExp(escapedQuery, "gi"), "~~$&~~")
+    
+    // Regex to find:
+    // 1. Fenced code blocks (```...```)
+    // 2. Inline code blocks (`...`)
+    // 3. The query text (when outside code blocks)
+    const regex = new RegExp(`(\`{3,}[\\s\\S]*?\`{3,}|\`[^\`]*\`)|(${escapedQuery})`, "gi")
+
+    return props.text.replace(regex, (match, codeBlock, queryText) => {
+      if (codeBlock) {
+        // If the code block doesn't contain the query, leave it alone
+        if (!new RegExp(escapedQuery, "gi").test(codeBlock)) {
+          return match
+        }
+
+        // Determine delimiter (``` or `) based on the start of the match
+        const delimiterMatch = match.match(/^`+/)
+        const delimiter = delimiterMatch ? delimiterMatch[0] : "`"
+        
+        // Extract the inner text (remove wrapping backticks)
+        const innerContent = match.slice(delimiter.length, -delimiter.length)
+        
+        // Split content by query, using capturing group () to keep the matched text
+        const parts = innerContent.split(new RegExp(`(${escapedQuery})`, "gi"))
+        
+        return parts.map((part, index) => {
+          // Even indices: Content parts (code)
+          // Odd indices: Matched query (highlight)
+          if (index % 2 === 0) {
+            // If this code segment is empty (e.g. match at start/end), return nothing
+            // This prevents creating empty `` blocks
+            if (!part) return ""
+            return `${delimiter}${part}${delimiter}`
+          } else {
+            // This is the match -> Apply highlight style
+            return `~~${part}~~`
+          }
+        }).join("")
+      }
+      
+      // Match found outside of any code block
+      return `~~${match}~~`
+    })
   })
 
   return (

From c18a37b8a2852d7e629d9d4cb69aceacea3d01ee Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 29 Nov 2025 14:24:46 +0000
Subject: [PATCH 15/22] chore: format code

---
 .../src/cli/cmd/tui/routes/session/index.tsx  | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 2954ee255b85..fcf20c524eef 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -231,7 +231,7 @@ export function Session() {
     const current = currentMatchIndex()
     const next = (current + 1) % m.length
     setCurrentMatchIndex(next)
-    
+
     if (m.length === 1 || m[current]?.messageID !== m[next]?.messageID) {
       scrollToMatch(next)
     }
@@ -243,7 +243,7 @@ export function Session() {
     const current = currentMatchIndex()
     const next = current === 0 ? m.length - 1 : current - 1
     setCurrentMatchIndex(next)
-    
+
     if (m.length === 1 || m[current]?.messageID !== m[next]?.messageID) {
       scrollToMatch(next)
     }
@@ -1042,10 +1042,9 @@ function SearchHighlighter(props: { text: string; query: string; messageID: stri
     let matchCount = 0
 
     // Pre-filter matches for this message/part
-    const partMatches = ctx.matches().filter(m => 
-      m.messageID === props.messageID && 
-      (!props.partID || m.partID === props.partID)
-    )
+    const partMatches = ctx
+      .matches()
+      .filter((m) => m.messageID === props.messageID && (!props.partID || m.partID === props.partID))
 
     let pos = 0
     while ((pos = lower.indexOf(query, pos)) !== -1) {
@@ -1318,7 +1317,7 @@ function MarkdownSearchHighlighter(props: {
   const content = createMemo(() => {
     if (!props.query) return props.text
     const escapedQuery = props.query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-    
+
     // Regex to find:
     // 1. Fenced code blocks (```...```)
     // 2. Inline code blocks (`...`)
@@ -1335,28 +1334,30 @@ function MarkdownSearchHighlighter(props: {
         // Determine delimiter (``` or `) based on the start of the match
         const delimiterMatch = match.match(/^`+/)
         const delimiter = delimiterMatch ? delimiterMatch[0] : "`"
-        
+
         // Extract the inner text (remove wrapping backticks)
         const innerContent = match.slice(delimiter.length, -delimiter.length)
-        
+
         // Split content by query, using capturing group () to keep the matched text
         const parts = innerContent.split(new RegExp(`(${escapedQuery})`, "gi"))
-        
-        return parts.map((part, index) => {
-          // Even indices: Content parts (code)
-          // Odd indices: Matched query (highlight)
-          if (index % 2 === 0) {
-            // If this code segment is empty (e.g. match at start/end), return nothing
-            // This prevents creating empty `` blocks
-            if (!part) return ""
-            return `${delimiter}${part}${delimiter}`
-          } else {
-            // This is the match -> Apply highlight style
-            return `~~${part}~~`
-          }
-        }).join("")
+
+        return parts
+          .map((part, index) => {
+            // Even indices: Content parts (code)
+            // Odd indices: Matched query (highlight)
+            if (index % 2 === 0) {
+              // If this code segment is empty (e.g. match at start/end), return nothing
+              // This prevents creating empty `` blocks
+              if (!part) return ""
+              return `${delimiter}${part}${delimiter}`
+            } else {
+              // This is the match -> Apply highlight style
+              return `~~${part}~~`
+            }
+          })
+          .join("")
       }
-      
+
       // Match found outside of any code block
       return `~~${match}~~`
     })

From eca6cb64f0c5195e956438b69a078eb7ed867d12 Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Sat, 29 Nov 2025 14:31:29 +0000
Subject: [PATCH 16/22] Update Nix flake.lock and hashes

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 33aae38122be..f35c345f0bad 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764290847,
-        "narHash": "sha256-VwPgoDgnd628GdE3KyLqTyPF1WWh0VwT5UoKygoi8sg=",
+        "lastModified": 1764384123,
+        "narHash": "sha256-UoliURDJFaOolycBZYrjzd9Cc66zULEyHqGFH3QHEq0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd5fedfc384cb98d9fd3827b55f4522f49efda42",
+        "rev": "59b6c96beacc898566c9be1052ae806f3835f87d",
         "type": "github"
       },
       "original": {

From c104413f640bca61308f6151b442b7b96079ed7b Mon Sep 17 00:00:00 2001
From: OpeOginni <brightoginni123@gmail.com>
Date: Sat, 29 Nov 2025 15:37:17 +0100
Subject: [PATCH 17/22] chore(tui-search): Removed active match
 differenciation, since we cant get it working in Assistant Messages
 (markdown)

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

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index aea11b09f15b..75255a534537 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1082,9 +1082,9 @@ function SearchHighlighter(props: { text: string; query: string; messageID: stri
           <Show when={segment.highlight} fallback={<>{segment.text}</>}>
             <span
               style={{
-                bg: segment.isActive ? theme.primary : theme.warning,
+                bg: theme.primary, // segment.isActive ? theme.primary : theme.warning, -> keeping as primary to match markdown
                 fg: theme.background,
-                bold: segment.isActive,
+                // bold: segment.isActive, // disabled because we cant get working for markdown matches
               }}
             >
               {segment.text}

From ea0def3ad88d80367a4c10a621828af4039d77fd Mon Sep 17 00:00:00 2001
From: Mohamed Amine Guitouni <notam1ne2002@gmail.com>
Date: Sat, 29 Nov 2025 17:12:10 +0100
Subject: [PATCH 18/22] feat: implement double Ctrl+C to exit functionality
 with warning toast

---
 .../cli/cmd/tui/component/prompt/index.tsx    | 19 ++++++++++++++++++-
 1 file changed, 18 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 ae11fcc23117..82d9bfa6c20b 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -17,6 +17,7 @@ import { useRenderer } from "@opentui/solid"
 import { Editor } from "@tui/util/editor"
 import { useExit } from "../../context/exit"
 import { Clipboard } from "../../util/clipboard"
+import { useToast } from "../../ui/toast"
 import type { FilePart } from "@opencode-ai/sdk"
 import { TuiEvent } from "../../event"
 import { iife } from "@/util/iife"
@@ -496,6 +497,22 @@ export function Prompt(props: PromptProps) {
     input.clear()
   }
   const exit = useExit()
+  const toast = useToast()
+  let lastExitAttempt = 0
+
+  async function tryExit() {
+    const now = Date.now()
+    if (now - lastExitAttempt < 2000) {
+      await exit()
+      return
+    }
+    lastExitAttempt = now
+    toast.show({
+      variant: "warning",
+      message: "Press again to exit",
+      duration: 2000,
+    })
+  }
 
   function pasteText(text: string, virtualText: string) {
     const currentOffset = input.visualCursor.offset
@@ -676,7 +693,7 @@ export function Prompt(props: PromptProps) {
                   return
                 }
                 if (keybind.match("app_exit", e)) {
-                  await exit()
+                  await tryExit()
                   return
                 }
                 if (e.name === "!" && input.visualCursor.offset === 0) {

From 04edae1676a3dc625170c269a1d06d7bae11f300 Mon Sep 17 00:00:00 2001
From: Kyle Crommett <kyle@latitudes.io>
Date: Sat, 29 Nov 2025 21:44:14 -0800
Subject: [PATCH 19/22] fix: improve token counting for synthetic and noReply
 messages (PR #4709)

Cherry-pick fix from upstream PR #4709 by arsham:
- Use 'ignored' flag instead of 'synthetic' for accurate token counts
- Fix sentEstimate formula to prevent double-counting tool result tokens
- Add null checks in calculateToolResultTokens for safety
- Prevents exponential growth from double-counting in session totals
---
 packages/opencode/src/session/prompt.ts |  4 ++--
 packages/opencode/src/util/token.ts     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index 11ea8d1df064..c93816cef875 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -455,7 +455,7 @@ export namespace SessionPrompt {
           outputEstimate: lastFinished?.outputEstimate,
           reasoningEstimate: lastFinished?.reasoningEstimate,
           contextEstimate: lastFinished?.contextEstimate,
-          sentEstimate: (lastAssistant?.sentEstimate || 0) + (lastUser.sentEstimate || 0) + toolResultTokens,
+          sentEstimate: (lastAssistant?.sentEstimate || 0) + (lastUser.sentEstimate || 0),
         })) as MessageV2.Assistant,
         sessionID: sessionID,
         model: model.info,
@@ -1103,7 +1103,7 @@ export namespace SessionPrompt {
     )
 
     const userText = parts
-      .filter((p) => p.type === "text" && !(p as MessageV2.TextPart).synthetic)
+      .filter((p) => p.type === "text" && !p.ignored)
       .map((p) => (p as MessageV2.TextPart).text)
       .join("")
 
diff --git a/packages/opencode/src/util/token.ts b/packages/opencode/src/util/token.ts
index 58b33855c975..fc47a98ae0a5 100644
--- a/packages/opencode/src/util/token.ts
+++ b/packages/opencode/src/util/token.ts
@@ -29,17 +29,21 @@ export namespace Token {
     let tokens = 0
     for (const part of parts) {
       if (part.type === "tool") {
-        // Tool input is sent in both completed and error states
-        tokens += estimate(JSON.stringify(part.state.input))
+        // Add null check for part.state
+        if (!part.state) continue
+
+        // Safe access to input
+        if (part.state.input) {
+          tokens += estimate(JSON.stringify(part.state.input))
+        }
 
         if (part.state.status === "completed") {
-          // Tool result output - check if compacted
-          const output = part.state.time.compacted ? "[Old tool result content cleared]" : part.state.output
+          // Use optional chaining for compacted check
+          const output = part.state.time?.compacted ? "[Old tool result content cleared]" : (part.state.output ?? "")
           tokens += estimate(output)
         }
 
-        if (part.state.status === "error") {
-          // Tool error text is sent back to the API
+        if (part.state.status === "error" && part.state.error) {
           tokens += estimate(part.state.error)
         }
       }

From 3d0bb87b2ddcebdda7a1aafd104433f41077e776 Mon Sep 17 00:00:00 2001
From: Kyle Crommett <kyle@latitudes.io>
Date: Sat, 29 Nov 2025 21:45:00 -0800
Subject: [PATCH 20/22] docs: update README for shuvcode fork

- Add header explaining this is a fork for PR integration testing
- Include table of merged PRs with upstream status
- Preserve original opencode documentation below
---
 README.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/README.md b/README.md
index 799cf00a2a80..acbe7b2a4d67 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,27 @@
+# shuvcode
+
+> **A fork of [sst/opencode](https://github.com/sst/opencode)** - The AI coding agent built for the terminal.
+
+This fork serves as an integration testing ground for upstream PRs before they are merged into the main opencode repository. We merge, test, and validate promising features and fixes to help ensure quality contributions to the upstream project.
+
+---
+
+## Merged PRs (Pending Upstream)
+
+The following PRs have been merged into this fork and are awaiting merge into upstream:
+
+| PR                                                 | Title                             | Status | Description                                                        |
+| -------------------------------------------------- | --------------------------------- | ------ | ------------------------------------------------------------------ |
+| [#4898](https://github.com/sst/opencode/pull/4898) | Search in messages                | Open   | Ctrl+F to search through session messages with highlighting        |
+| [#4791](https://github.com/sst/opencode/pull/4791) | Bash output with ANSI             | Open   | Full terminal emulation for bash output with color support         |
+| [#4900](https://github.com/sst/opencode/pull/4900) | Double Ctrl+C to exit             | Open   | Require double Ctrl+C within 2 seconds to prevent accidental exits |
+| [#4709](https://github.com/sst/opencode/pull/4709) | Live token usage during streaming | Open   | Real-time token tracking and display during model responses        |
+| [#4773](https://github.com/sst/opencode/pull/4773) | Configurable subagent visibility  | Open   | Allow agents to restrict which subagents they can invoke           |
+
+_Last updated: 2025-11-29_
+
+---
+
 <p align="center">
   <a href="https://opencode.ai">
     <picture>

From 6e9b984ea3f0c3028ab6e038a5b19366ef65aaf8 Mon Sep 17 00:00:00 2001
From: Kyle Crommett <kyle@latitudes.io>
Date: Sat, 29 Nov 2025 21:52:42 -0800
Subject: [PATCH 21/22] changing sidebar version display to shuvcode

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

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
index c63f5116ab25..51e8acf2fa68 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx
@@ -269,9 +269,9 @@ export function Sidebar(props: { sessionID: string }) {
           </Show>
           <text fg={theme.textMuted}>{directory()}</text>
           <text fg={theme.textMuted}>
-            <span style={{ fg: theme.success }}>•</span> <b>Open</b>
+            <span style={{ fg: theme.success }}>•</span> <b>shuv</b>
             <span style={{ fg: theme.text }}>
-              <b>Code</b>
+              <b>code</b>
             </span>{" "}
             <span>{Installation.VERSION}</span>
           </text>

From fe79203829c6343f02894c3ab2173e47c216bc80 Mon Sep 17 00:00:00 2001
From: Github Action <action@github.com>
Date: Sun, 30 Nov 2025 05:54:39 +0000
Subject: [PATCH 22/22] Update Nix flake.lock and hashes

---
 flake.lock      | 6 +++---
 nix/hashes.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 43d198c90c8e..211be53aa99b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764352606,
-        "narHash": "sha256-ZwPqcETKhoQ+TS40+hFr5CY4wzcNGKhi6l8w2HmmxKc=",
+        "lastModified": 1764445028,
+        "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "24e915b36ca87d32777d766da3a3f4e3ce22cc98",
+        "rev": "a09378c0108815dbf3961a0e085936f4146ec415",
         "type": "github"
       },
       "original": {
diff --git a/nix/hashes.json b/nix/hashes.json
index 6a292ac12403..162d100ac435 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-49BR28UJHRoBHvNpaqVnjB/asDkcLfZI0uL3w0aQ05o="
+  "nodeModules": "sha256-AFi1XqNAoEF88GCG6OUWNMTHhQDCkI2m5qtwGyuUl38="
 }