fix(tui): make prompt metadata responsive (#46801)

Co-authored-by: James Long <17031+jlongster@users.noreply.github.com>
This commit is contained in:
opencode-agent[bot]
2026-09-02 14:08:50 -04:00
committed by GitHub
Unverified
parent b45882ec87
commit d37122350b
3 changed files with 188 additions and 61 deletions
+14 -50
View File
@@ -68,6 +68,7 @@ import { useDirectoryRecents } from "../../prompt/directory-recents"
import { directoryRecentValue } from "../../prompt/directory-completion"
import { useWorkingDirectoryActions } from "../../ui/working-directory-actions"
import { truncateFilePath } from "../../ui/file-path"
import { PromptMetadataRow } from "./metadata"
export type PromptProps = {
sessionID?: string
@@ -104,10 +105,6 @@ function randomIndex(count: number) {
return Math.floor(Math.random() * count)
}
function fadeColor(color: RGBA, alpha: number) {
return RGBA.fromValues(color.r, color.g, color.b, color.a * alpha)
}
export function PromptInterruptStatus(props: {
armed: boolean
animations?: boolean
@@ -1838,52 +1835,19 @@ export function Prompt(props: PromptProps) {
syntaxStyle={syntax()}
/>
<box flexDirection="row" flexShrink={0} paddingTop={1} gap={1} justifyContent="space-between">
<box flexDirection="row" gap={1} flexGrow={1} flexShrink={1} minWidth={0}>
<Show when={agentLabel()} fallback={<box height={1} />}>
{(label) => (
<>
<text fg={fadeColor(highlight(), agentMetaAlpha())}>{label()}</text>
<Show
when={store.mode === "normal" && local.permission.mode === "auto" && dimensions().width >= 44}
>
<text fg={fadeColor(theme.text.subdued, agentMetaAlpha())}>auto</text>
</Show>
<Show when={store.mode === "normal" && dimensions().width >= 28}>
<box flexDirection="row" gap={1} flexGrow={1} flexShrink={1} minWidth={0}>
<text fg={fadeColor(theme.text.subdued, modelMetaAlpha())}>·</text>
<text
flexShrink={1}
minWidth={0}
wrapMode="none"
truncate
fg={fadeColor(muted() ? theme.text.subdued : theme.text.default, modelMetaAlpha())}
>
{promptDisplay().modelLabel}
</text>
<Show when={dimensions().width >= 50}>
<text flexShrink={0} fg={fadeColor(theme.text.subdued, modelMetaAlpha())}>
{promptDisplay().providerLabel}
</text>
</Show>
<Show when={promptDisplay().variant && dimensions().width >= 70}>
<text fg={fadeColor(theme.text.subdued, variantMetaAlpha())}>·</text>
<text>
<span
style={{
fg: fadeColor(theme.text.feedback.warning.default, variantMetaAlpha()),
bold: true,
}}
>
{promptDisplay().variant}
</span>
</text>
</Show>
</box>
</Show>
</>
)}
</Show>
</box>
<PromptMetadataRow
mode={store.mode}
agent={agentLabel()}
auto={local.permission.mode === "auto"}
model={promptDisplay().modelLabel}
provider={promptDisplay().providerLabel}
variant={promptDisplay().variant}
muted={!!muted()}
highlight={highlight()}
agentAlpha={agentMetaAlpha()}
modelAlpha={modelMetaAlpha()}
variantAlpha={variantMetaAlpha()}
/>
<Show when={hasRightContent()}>
<box flexDirection="row" gap={1} alignItems="center">
{props.right}
@@ -0,0 +1,146 @@
import { RGBA, TextAttributes } from "@opentui/core"
import { useTerminalDimensions } from "@opentui/solid"
import { createMemo, Show } from "solid-js"
import { useTheme } from "../../context/theme"
import { Locale } from "../../util/locale"
import { stringWidth } from "../../util/string-width"
export function PromptMetadataRow(props: {
mode: "normal" | "shell"
agent?: string
auto: boolean
model: string
provider: string
variant?: string
muted: boolean
highlight: RGBA
agentAlpha: number
modelAlpha: number
variantAlpha: number
}) {
const theme = useTheme()
const dimensions = useTerminalDimensions()
const layout = createMemo(() => {
if (props.mode === "shell") return { agent: props.agent ?? "Shell", model: "" }
return promptMetadataLayout({
width: Math.max(0, dimensions().width - (dimensions().width < 44 ? 9 : 13)),
terminalWidth: dimensions().width,
agent: props.agent ?? "",
auto: props.auto,
model: props.model,
provider: props.provider,
variant: props.variant,
})
})
return (
<box flexDirection="row" gap={1} flexGrow={1} flexShrink={1} minWidth={0}>
<Show
when={(props.mode === "shell" || props.agent) && (layout().agent || layout().model)}
fallback={<box height={1} />}
>
<Show when={layout().agent}>
{(agent) => <text fg={fade(props.highlight, props.agentAlpha)}>{agent()}</text>}
</Show>
<Show when={props.mode === "normal" && layout().auto}>
<text fg={fade(theme.text.subdued, props.agentAlpha)}>auto</text>
</Show>
<Show when={props.mode === "normal" && layout().model}>
<box flexDirection="row" gap={1} flexGrow={1} flexShrink={1} minWidth={0}>
<Show when={layout().agent}>
<text fg={fade(theme.text.subdued, props.modelAlpha)}>·</text>
</Show>
<text
flexShrink={1}
minWidth={0}
wrapMode="none"
truncate
fg={fade(props.muted ? theme.text.subdued : theme.text.default, props.modelAlpha)}
>
{layout().model}
</text>
<Show when={layout().provider}>
{(provider) => (
<text flexShrink={0} fg={fade(theme.text.subdued, props.modelAlpha)}>
{provider()}
</text>
)}
</Show>
<Show when={layout().variant}>
{(variant) => (
<>
<text fg={fade(theme.text.subdued, props.variantAlpha)}>·</text>
<text
fg={fade(theme.text.feedback.warning.default, props.variantAlpha)}
attributes={TextAttributes.BOLD}
>
{variant()}
</text>
</>
)}
</Show>
</box>
</Show>
</Show>
</box>
)
}
function fade(color: RGBA, alpha: number) {
return RGBA.fromValues(color.r, color.g, color.b, color.a * alpha)
}
type Layout = {
agent?: string
auto?: boolean
model: string
provider?: string
variant?: string
}
function promptMetadataLayout(input: {
width: number
terminalWidth: number
agent: string
auto?: boolean
model: string
provider: string
variant?: string
}) {
const agent = input.terminalWidth < 44 ? undefined : input.agent
const provider = input.terminalWidth < 44 ? "" : input.provider
const candidates: Layout[] = [
{ agent, auto: input.auto, model: input.model, provider, variant: input.variant },
{ agent, model: input.model, provider, variant: input.variant },
{
agent,
model: input.model,
provider: provider.split(" / ").at(-1) ?? provider,
variant: input.variant,
},
{ agent, model: input.model, variant: input.variant },
]
const fit = candidates.find((candidate) => stringWidth(text(candidate)) <= input.width)
if (fit) return fit
const prefix = agent ? `${agent} · ` : ""
const suffix = input.variant ? ` · ${input.variant}` : ""
return {
agent,
model: Locale.truncateWidth(
input.model,
Math.max(9, input.width - stringWidth(prefix) - stringWidth(suffix)),
).replace(/\s+…$/, "…"),
variant: input.variant,
}
}
function text(input: Layout) {
return [
...(input.agent ? [input.agent] : []),
...(input.auto ? ["auto"] : []),
...(input.model ? [...(input.agent ? ["·"] : []), input.model] : []),
...(input.provider ? [input.provider] : []),
...(input.variant ? ["·", input.variant] : []),
].join(" ")
}
@@ -2,6 +2,7 @@ import { Plugin } from "@opencode-ai/plugin/tui"
import { createMemo, createSignal, Match, Show, Switch } from "solid-js"
import { contextUsage, formatContextUsage } from "../../util/session"
import { useTerminalDimensions } from "@opentui/solid"
import { stringWidth } from "../../util/string-width"
const money = new Intl.NumberFormat("en-US", {
style: "currency",
@@ -47,13 +48,22 @@ export function PromptFooter(props: {
})
const live = createMemo(() => Boolean(subagents() || shells()))
const shortcut = (id: string) => props.context.keymap.shortcuts(id)[0]
const layout = createMemo(() => {
const command = shortcut("command.palette.show")
if (status().length === 0) return { usage: false, shortcuts: dimensions().width >= 44 }
return promptFooterLayout({
width: Math.max(0, dimensions().width - 8),
usage: status(),
shortcuts: command ? [`${command} commands`] : [],
})
})
return (
<Switch>
<Match when={props.mode === "normal"}>
<Switch>
<Match when={live() || status().length > 0}>
<box flexDirection="row" flexShrink={1} minWidth={0}>
<box flexDirection="row" flexShrink={props.showDetails && layout().usage ? 0 : 1} minWidth={0}>
<Show when={live()}>
<box
flexShrink={0}
@@ -74,21 +84,21 @@ export function PromptFooter(props: {
</text>
</box>
</Show>
<Show when={props.showDetails && status().length > 0}>
<text fg={props.context.theme.text.subdued} wrapMode="none" truncate flexShrink={1}>
<Show when={props.showDetails && layout().usage && status().length > 0}>
<text fg={props.context.theme.text.subdued} wrapMode="none" flexShrink={0}>
<Show when={live()}> · </Show>
{status().join(" · ")}
</text>
</Show>
</box>
</Match>
<Match when={props.showDetails && dimensions().width >= 44}>
<Match when={props.showDetails && layout().shortcuts}>
<text fg={props.context.theme.text.default} flexShrink={0}>
{shortcut("agent.cycle")} <span style={{ fg: props.context.theme.text.subdued }}>agents</span>
</text>
</Match>
</Switch>
<Show when={props.showDetails}>
<Show when={props.showDetails && layout().shortcuts}>
<text fg={props.context.theme.text.default} wrapMode="none" flexShrink={0}>
{shortcut("command.palette.show")} <span style={{ fg: props.context.theme.text.subdued }}>commands</span>
</text>
@@ -112,13 +122,20 @@ export default Plugin.define({
context.ui.slot({
append: "prompt.footer",
render: (props) => (
<PromptFooter
context={context}
sessionID={props.sessionID}
mode={props.mode}
showDetails={props.showDetails}
/>
<PromptFooter context={context} sessionID={props.sessionID} mode={props.mode} showDetails={props.showDetails} />
),
})
},
})
function promptFooterLayout(input: { width: number; usage: string[]; shortcuts: string[] }) {
const usage = input.usage.join(" · ")
const shortcuts = input.shortcuts.join(" · ")
const available = Math.max(0, input.width - Math.min(28, Math.floor(input.width / 2)))
if (usage && shortcuts && stringWidth(`${usage} · ${shortcuts}`) <= available) {
return { usage: true, shortcuts: true }
}
if (usage && stringWidth(usage) <= available) return { usage: true, shortcuts: false }
if (!usage && shortcuts && stringWidth(shortcuts) <= available) return { usage: false, shortcuts: true }
return { usage: false, shortcuts: false }
}