Skip to content

fix: keep vim indicator visible while busy #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leohenon merged 1 commit into from
Apr 26, 2026
Merged

fix: keep vim indicator visible while busy #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 33 additions & 37 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,37 @@ export function Prompt(props: PromptProps) {
}
})

function isInsertIndicator(indicator: string) {
return indicator === "-- INSERT --"
}

function isVisualIndicator(indicator: string) {
return ["-- VISUAL --", "-- VISUAL LINE --", "-- V-COPY --", "-- VL-COPY --"].includes(indicator)
}

function VimIndicator() {
return (
<Show when={vimIndicator()}>
{(indicator) => (
<text
fg={
vimState.pending()
? theme.textMuted
: isInsertIndicator(indicator())
? local.agent.color(local.agent.current()?.name ?? "build")
: isVisualIndicator(indicator())
? theme.text
: theme.textMuted
}
attributes={vimState.pending() || isVisualIndicator(indicator()) ? TextAttributes.BOLD : undefined}
>
{indicator()}
</text>
)}
</Show>
)
}

return (
<>
<Autocomplete
Expand Down Expand Up @@ -1830,43 +1861,7 @@ export function Prompt(props: PromptProps) {
when={status().type !== "idle"}
fallback={
<box flexDirection="row" gap={1}>
<Show when={vimIndicator()}>
{(indicator) => (
<text
fg={
vimState.pending()
? theme.textMuted
: indicator() === "INSERT" || indicator() === "-- INSERT --"
? local.agent.color(local.agent.current()?.name ?? "build")
: indicator() === "VISUAL" ||
indicator() === "-- VISUAL --" ||
indicator() === "V-LINE" ||
indicator() === "-- VISUAL LINE --" ||
indicator() === "V-COPY" ||
indicator() === "-- V-COPY --" ||
indicator() === "VL-COPY" ||
indicator() === "-- VL-COPY --"
? theme.text
: theme.textMuted
}
attributes={
vimState.pending() ||
indicator() === "VISUAL" ||
indicator() === "-- VISUAL --" ||
indicator() === "V-LINE" ||
indicator() === "-- VISUAL LINE --" ||
indicator() === "V-COPY" ||
indicator() === "-- V-COPY --" ||
indicator() === "VL-COPY" ||
indicator() === "-- VL-COPY --"
? TextAttributes.BOLD
: undefined
}
>
{indicator()}
</text>
)}
</Show>
<VimIndicator />
{props.hint ?? <text />}
</box>
}
Expand All @@ -1878,6 +1873,7 @@ export function Prompt(props: PromptProps) {
justifyContent={status().type === "retry" ? "space-between" : "flex-start"}
>
<box flexShrink={0} flexDirection="row" gap={1}>
<VimIndicator />
<box marginLeft={1}>
<Show when={kv.get("animations_enabled", true)} fallback={<text fg={theme.textMuted}>[⋯]</text>}>
<spinner color={spinnerDef().color} frames={spinnerDef().frames} interval={40} />
Expand Down
Loading