Merge PR integration batch: sst#4898, sst#4791, sst#4900, sst#4709 fixes

Merged upstream PRs:
- sst#4898: Search in messages (Ctrl+F)
- sst#4791: Bash output viewer with ANSI color support
- sst#4900: Double Ctrl+C to exit
- sst#4709: Token counting fixes for synthetic/noReply messages

Updated README for shuvcode fork project.

Author: kcrommett

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>

bun.lock

@@ -256,6 +256,7 @@
         "jsonc-parser": "3.3.1",
         "minimatch": "10.0.3",
         "open": "10.1.2",
+        "opentui-ansi-vt": "1.2.7",
         "opentui-spinner": "0.0.6",
         "partial-json": "0.1.7",
         "remeda": "catalog:",
@@ -2969,6 +2970,8 @@
 
     "openid-client": ["[email protected]", "", { "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": ["[email protected]", "", { "dependencies": { "strip-ansi": "^7.1.2" }, "peerDependencies": { "@opentui/core": "*" }, "optionalPeers": ["@opentui/core"] }, "sha512-mcumATXHkagt7JUK+5mpBPaUW0LHrwysp8JQqDBnZG22vb1TTh/HmGjWFXBWe4oo4Rshw7s7NWIbt0/jCWOgcw=="],
+
     "opentui-spinner": ["[email protected]", "", { "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-xupLOeVQEAXEvVJCvHkfX6fChDWmJIPHe5jyUrVb8+n4XVTX8mBNhitFfB9v2ZbkC1H2UwPab/ElePHoW37NcA=="],
 
     "own-keys": ["[email protected]", "", { "dependencies": { "get-intrinsic": "^1.2.6", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" } }, "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg=="],

flake.lock

@@ -1,3 +1,3 @@
 {
-  "nodeModules": "sha256-+PJZG5jNxBGkxblpnNa4lvfBi9YEvHaGQRE0+avNwHY="
+  "nodeModules": "sha256-49BR28UJHRoBHvNpaqVnjB/asDkcLfZI0uL3w0aQ05o="
 }

nix/hashes.json

@@ -82,6 +82,7 @@
     "jsonc-parser": "3.3.1",
     "minimatch": "10.0.3",
     "open": "10.1.2",
+    "opentui-ansi-vt": "1.2.7",
     "opentui-spinner": "0.0.6",
     "partial-json": "0.1.7",
     "remeda": "catalog:",

packages/opencode/package.json

@@ -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"
@@ -30,10 +31,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 +280,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 +368,9 @@ export function Prompt(props: PromptProps) {
     get focused() {
       return input.focused
     },
+    get text() {
+      return input.plainText
+    },
     focus() {
       input.focus()
     },
@@ -496,6 +506,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
@@ -680,7 +706,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) {

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

@@ -0,0 +1,230 @@
+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>
+    </>
+  )
+}