splash screen pass

Author: simonklee

packages/opencode/src/cli/cmd/run/runtime.lifecycle.ts

@@ -9,6 +9,7 @@
 // Also wires SIGINT so Ctrl-c during a turn triggers the two-press exit
 // sequence through RunFooter.requestExit().
 import { createCliRenderer, type CliRenderer, type ScrollbackWriter } from "@opentui/core"
+import { Session as SessionApi } from "@/session/session"
 import * as Locale from "@/util/locale"
 import { withRunSpan } from "./otel"
 import { entrySplash, exitSplash, splashMeta } from "./splash"
@@ -28,7 +29,6 @@ import type {
 import { formatModelLabel } from "./variant.shared"
 
 const FOOTER_HEIGHT = 7
-const DEFAULT_TITLE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
 
 type SplashState = {
   entry: boolean
@@ -70,7 +70,7 @@ export type LifecycleInput = {
 
 export type Lifecycle = {
   footer: FooterApi
-  close(input: { showExit: boolean; sessionTitle?: string; sessionID?: string }): Promise<void>
+  close(input: { showExit: boolean; sessionTitle?: string; sessionID?: string; history?: RunPrompt[] }): Promise<void>
 }
 
 // Gracefully tears down the renderer. Order matters: switch external output
@@ -95,7 +95,7 @@ function shutdown(renderer: CliRenderer): void {
 }
 
 function splashInfo(title: string | undefined, history: RunPrompt[]) {
-  if (title && !DEFAULT_TITLE.test(title)) {
+  if (title && !SessionApi.isDefaultTitle(title)) {
     return {
       title,
       showSession: true,
@@ -235,7 +235,7 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
       process.on("SIGINT", sigint)
 
       let closed = false
-      const close = async (next: { showExit: boolean; sessionTitle?: string; sessionID?: string }) => {
+      const close = async (next: { showExit: boolean; sessionTitle?: string; sessionID?: string; history?: RunPrompt[] }) => {
         if (closed) {
           return
         }
@@ -256,7 +256,7 @@ export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lif
               const show = renderer.isDestroyed ? false : next.showExit
               if (!renderer.isDestroyed && show) {
                 const sessionID = next.sessionID || input.getSessionID?.() || input.sessionID
-                const splash = splashInfo(next.sessionTitle ?? input.sessionTitle, input.history)
+                const splash = splashInfo(next.sessionTitle ?? input.sessionTitle, next.history ?? input.history)
                 queueSplash(
                   renderer,
                   state,

packages/opencode/src/cli/cmd/run/runtime.queue.ts

@@ -27,7 +27,7 @@ export type QueueInput = {
   footer: FooterApi
   initialInput?: string
   trace?: Trace
-  onPrompt?: () => void
+  onSend?: (prompt: RunPrompt) => void
   run: (prompt: RunPrompt, signal: AbortSignal) => Promise<void>
 }
 
@@ -126,6 +126,7 @@ export async function runPromptQueue(input: QueueInput): Promise<void> {
             const commit = { kind: "user", text: prompt.text, phase: "start", source: "system" } as const
             input.trace?.write("ui.commit", commit)
             input.footer.append(commit)
+            input.onSend?.(prompt)
 
             const next = await Promise.race([task, stop.promise])
             if (next.type === "closed") {
@@ -185,7 +186,6 @@ export async function runPromptQueue(input: QueueInput): Promise<void> {
       return
     }
 
-    input.onPrompt?.()
     state.queue.push(prompt)
     emit(
       {

packages/opencode/src/cli/cmd/run/runtime.ts

@@ -20,7 +20,7 @@ import { createRuntimeLifecycle } from "./runtime.lifecycle"
 import { recordRunSpanError, setRunSpanAttributes, withRunSpan } from "./otel"
 import { trace } from "./trace"
 import { cycleVariant, formatModelLabel, resolveSavedVariant, resolveVariant, saveVariant } from "./variant.shared"
-import type { RunInput } from "./types"
+import type { RunInput, RunPrompt } from "./types"
 
 /** @internal Exported for testing */
 export { pickVariant, resolveVariant } from "./variant.shared"
@@ -80,6 +80,7 @@ type RuntimeState = {
   limits: Record<string, number>
   activeVariant: string | undefined
   sessionID: string
+  history: RunPrompt[]
   sessionTitle?: string
   agent: string | undefined
   demo?: ReturnType<typeof createRunDemo>
@@ -156,6 +157,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput): Promise<void> {
         limits: {},
         activeVariant: resolveVariant(ctx.variant, session.variant, savedVariant, []),
         sessionID: ctx.sessionID,
+        history: [...session.history],
         sessionTitle: ctx.sessionTitle,
         agent: ctx.agent,
       }
@@ -179,7 +181,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput): Promise<void> {
 
         state.session = input.resolveSession(ctx).then((next) => {
           state.sessionID = next.sessionID
-          state.sessionTitle = next.sessionTitle
+          state.sessionTitle = next.sessionTitle ?? state.sessionTitle
           state.agent = next.agent
           setRunSpanAttributes(span, {
             "opencode.agent.name": state.agent,
@@ -405,8 +407,9 @@ async function runInteractiveRuntime(input: RunRuntimeInput): Promise<void> {
           footer,
           initialInput: input.initialInput,
           trace: log,
-          onPrompt: () => {
+          onSend: (prompt) => {
             state.shown = true
+            state.history.push(prompt)
           },
           run: async (prompt, signal) => {
             if (state.demo && (await state.demo.prompt(prompt, signal))) {
@@ -489,6 +492,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput): Promise<void> {
           showExit: state.shown && hasSession(input, state),
           sessionTitle: title,
           sessionID: state.sessionID,
+          history: state.history,
         })
       }
     },

packages/opencode/src/cli/cmd/run/splash.ts

@@ -1,12 +1,11 @@
 // Entry and exit splash banners for direct interactive mode scrollback.
 //
-// Renders the opencode ASCII logo with half-block shadow characters, the
-// session title, and contextual hints (entry: "/exit to finish", exit:
-// "opencode -s <id>" to resume). These are scrollback snapshots, so they
-// become immutable terminal history once committed.
+// Renders the full opencode entry logo and a compact [O] exit badge, plus
+// session metadata and the resume command. These are scrollback snapshots, so
+// they become immutable terminal history once committed.
 //
-// The logo uses a cell-based renderer. cells() classifies each character
-// in the logo template as text, full-block, half-block-mix, or
+// Both variants use a cell-based renderer. cells() classifies each character
+// in the source template as text, full-block, half-block-mix, or
 // half-block-top, and draw() renders it with foreground/background shadow
 // colors from the theme.
 import {
@@ -20,7 +19,7 @@ import {
   type ScrollbackWriter,
 } from "@opentui/core"
 import * as Locale from "@/util/locale"
-import { logo } from "@/cli/logo"
+import { go, logo } from "@/cli/logo"
 import type { RunSplashTheme } from "./theme"
 
 export const SPLASH_TITLE_LIMIT = 50
@@ -77,11 +76,27 @@ function title(text: string | undefined): string {
     return SPLASH_TITLE_FALLBACK
   }
 
-  if (!text.trim()) {
+  let value = ""
+  let gap = false
+  for (const char of text.trim()) {
+    if (char === " " || char === "\n" || char === "\r" || char === "\t") {
+      gap = true
+      continue
+    }
+
+    if (gap && value.length > 0) {
+      value += " "
+    }
+
+    value += char
+    gap = false
+  }
+
+  if (!value) {
     return SPLASH_TITLE_FALLBACK
   }
 
-  return Locale.truncate(text.trim(), SPLASH_TITLE_LIMIT)
+  return Locale.truncate(value, SPLASH_TITLE_LIMIT)
 }
 
 function write(
@@ -188,58 +203,66 @@ function build(input: SplashWriterInput, kind: "entry" | "exit", ctx: Scrollback
   const left = color(input.theme.left, fallback(81, "#38bdf8"))
   const right = color(input.theme.right, RGBA.defaultForeground(RGBA.fromHex("#f8fafc")))
   const leftShadow = color(input.theme.leftShadow, fallback(238, "#334155"))
-  const rightShadow = color(input.theme.rightShadow, fallback(240, "#475569"))
-  let y = 0
-
-  for (let i = 0; i < logo.left.length; i += 1) {
-    const leftText = logo.left[i] ?? ""
-    const rightText = logo.right[i] ?? ""
-
-    draw(lines, leftText, {
-      left: 0,
-      top: y,
-      fg: left,
-      shadow: leftShadow,
-    })
-    draw(lines, rightText, {
-      left: leftText.length + 1,
-      top: y,
-      fg: right,
-      shadow: rightShadow,
-    })
-    y += 1
-  }
+  let height = 1
 
-  y += 1
+  if (kind === "entry") {
+    const rightShadow = color(input.theme.rightShadow, fallback(240, "#475569"))
+
+    for (let i = 0; i < logo.left.length; i += 1) {
+      const leftText = logo.left[i] ?? ""
+      const rightText = logo.right[i] ?? ""
+
+      draw(lines, leftText, {
+        left: 0,
+        top: i,
+        fg: left,
+        shadow: leftShadow,
+      })
+      draw(lines, rightText, {
+        left: leftText.length + 1,
+        top: i,
+        fg: right,
+        shadow: rightShadow,
+      })
+    }
 
-  if (input.showSession !== false) {
-    const label = "Session".padEnd(10, " ")
-    push(lines, 0, y, label, input.theme.left, undefined, TextAttributes.DIM)
-    push(lines, label.length, y, meta.title, input.theme.right, undefined, TextAttributes.BOLD)
-    y += 1
-  }
+    height = logo.left.length + 1
 
-  if (kind === "entry") {
-    push(lines, 0, y, "Type /exit to finish.", input.theme.left, undefined, undefined)
-    y += 1
+    if (input.showSession !== false) {
+      const top = logo.left.length + 1
+      const label = "Session".padEnd(10, " ")
+      push(lines, 0, top, label, left, undefined, TextAttributes.DIM)
+      push(lines, label.length, top, meta.title, right, undefined, TextAttributes.BOLD)
+      height = top + 1
+    }
   }
 
   if (kind === "exit") {
-    const next = "Continue".padEnd(10, " ")
-    push(lines, 0, y, next, input.theme.left, undefined, TextAttributes.DIM)
-    push(
-      lines,
-      next.length,
-      y,
-      `opencode -s ${meta.session_id}`,
-      input.theme.right,
-      undefined,
-      TextAttributes.BOLD,
-    )
-    y += 1
+    const mark = go.right.slice(1)
+    const top = 1
+    const body_left = (mark[0]?.length ?? 0) + 2
+    const session = "Session  "
+    const label = "Continue "
+
+    for (let i = 0; i < mark.length; i += 1) {
+      draw(lines, mark[i] ?? "", {
+        left: 0,
+        top: top + i,
+        fg: left,
+        shadow: leftShadow,
+      })
+    }
+
+    if (input.showSession !== false) {
+      push(lines, body_left, top, session, left, undefined, TextAttributes.DIM)
+      push(lines, body_left + session.length, top, meta.title, right, undefined, TextAttributes.BOLD)
+    }
+
+    push(lines, body_left, top + 1, label, left, undefined, TextAttributes.DIM)
+    push(lines, body_left + label.length, top + 1, `opencode run -i -s ${meta.session_id}`, right, undefined, TextAttributes.BOLD)
+    height = top + mark.length
   }
 
-  const height = Math.max(1, y)
   const root = new BoxRenderable(ctx.renderContext, {
     id: `run-direct-splash-${kind}-${id++}`,
     position: "absolute",

packages/opencode/test/cli/run/runtime.queue.test.ts

@@ -129,6 +129,24 @@ describe("run runtime queue", () => {
     ])
   })
 
+  test("passes prompts to onSend", async () => {
+    const ui = footer()
+    const seen: string[] = []
+
+    await runPromptQueue({
+      footer: ui.api,
+      initialInput: "  hello  ",
+      onSend: (input) => {
+        seen.push(input.text)
+      },
+      run: async () => {
+        ui.api.close()
+      },
+    })
+
+    expect(seen).toEqual(["  hello  "])
+  })
+
   test("runs queued prompts in order", async () => {
     const ui = footer()
     const seen: string[] = []