Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import { DialogWorkspaceCreate, restoreWorkspaceSession } from "../dialog-worksp
import { DialogWorkspaceUnavailable } from "../dialog-workspace-unavailable"
import { DialogAgreement, FREE_AGREEMENT_KEY, FREE_MODEL_IDS } from "../dialog-agreement"
import { useArgs } from "@tui/context/args"
import { createPromptSubmitGuard } from "./submit-guard"

export type PromptProps = {
sessionID?: string
Expand Down Expand Up @@ -117,6 +118,7 @@ export function Prompt(props: PromptProps) {
const dialog = useDialog()
const toast = useToast()
const status = createMemo(() => sync.data.session_status?.[props.sessionID ?? ""] ?? { type: "idle" })
const submitGuard = createPromptSubmitGuard()
const history = usePromptHistory()
const stash = usePromptStash()
const command = useCommandDialog()
Expand Down Expand Up @@ -431,6 +433,7 @@ export function Prompt(props: PromptProps) {
on(
() => status().type,
(type, prev) => {
submitGuard.update(type)
if (type !== "idle") {
// A new run started (or the session went non-idle): invalidate any
// in-flight prediction and hide a stale suggestion.
Expand Down Expand Up @@ -1161,6 +1164,8 @@ export function Prompt(props: PromptProps) {
})),
})
} else {
if (!submitGuard.tryStart(status().type)) return false
setTimeout(() => submitGuard.releaseIfUnstarted(status().type), 5000)
sdk.client.session
.promptAsync({
sessionID,
Expand All @@ -1179,6 +1184,7 @@ export function Prompt(props: PromptProps) {
],
})
.catch((err) => {
submitGuard.fail()
toast.show({
message: err instanceof Error ? err.message : "Failed to send message",
variant: "error",
Expand Down
33 changes: 33 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/prompt/submit-guard.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
type PromptStatus = "idle" | string

export function createPromptSubmitGuard() {
let locked = false
let observedRun = false

return {
tryStart(status: PromptStatus) {
if (locked || status !== "idle") return false
locked = true
observedRun = false
return true
},
update(status: PromptStatus) {
if (!locked) return
if (status !== "idle") {
observedRun = true
return
}
if (!observedRun) return
locked = false
observedRun = false
},
fail() {
locked = false
observedRun = false
},
releaseIfUnstarted(status: PromptStatus) {
if (!locked || observedRun || status !== "idle") return
locked = false
},
}
}
35 changes: 35 additions & 0 deletions packages/opencode/test/cli/cmd/tui/prompt-submit-guard.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { describe, expect, test } from "bun:test"
import { createPromptSubmitGuard } from "../../../../src/cli/cmd/tui/component/prompt/submit-guard"

describe("prompt submit guard", () => {
test("blocks duplicate submits until the active run returns idle", () => {
const guard = createPromptSubmitGuard()

expect(guard.tryStart("idle")).toBe(true)
expect(guard.tryStart("idle")).toBe(false)

guard.update("busy")
expect(guard.tryStart("busy")).toBe(false)

guard.update("idle")
expect(guard.tryStart("idle")).toBe(true)
})

test("releases when prompt dispatch fails before a run starts", () => {
const guard = createPromptSubmitGuard()

expect(guard.tryStart("idle")).toBe(true)
guard.fail()

expect(guard.tryStart("idle")).toBe(true)
})

test("can release if no run status arrives after dispatch", () => {
const guard = createPromptSubmitGuard()

expect(guard.tryStart("idle")).toBe(true)
guard.releaseIfUnstarted("idle")

expect(guard.tryStart("idle")).toBe(true)
})
})