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
5 changes: 4 additions & 1 deletion 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 { visiblePromptStatus } from "./status"

export type PromptProps = {
sessionID?: string
Expand Down Expand Up @@ -116,7 +117,9 @@ export function Prompt(props: PromptProps) {
const sync = useSync()
const dialog = useDialog()
const toast = useToast()
const status = createMemo(() => sync.data.session_status?.[props.sessionID ?? ""] ?? { type: "idle" })
const status = createMemo(() =>
visiblePromptStatus(sync.data.session_status?.[props.sessionID ?? ""] ?? { type: "idle" }, local.model.current()),
)
const history = usePromptHistory()
const stash = usePromptStash()
const command = useCommandDialog()
Expand Down
18 changes: 18 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/prompt/status.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { SessionStatus } from "@mimo-ai/sdk/v2"

type ModelRef = {
providerID: string
modelID: string
}

type RetryStatus = Extract<SessionStatus, { type: "retry" }> & Partial<ModelRef>

export function visiblePromptStatus(status: SessionStatus, model: ModelRef | undefined): SessionStatus {
if (status.type !== "retry") return status

const retry = status as RetryStatus
if (!retry.providerID || !retry.modelID || !model) return status
if (retry.providerID === model.providerID && retry.modelID === model.modelID) return status

return { type: "idle" }
}
2 changes: 2 additions & 0 deletions packages/opencode/src/session/processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,8 @@ export const layer: Layer.Layer<
attempt: info.attempt,
message: info.message,
next: info.next,
providerID: ctx.model.providerID,
modelID: ctx.model.id,
})
: Effect.void,
}),
Expand Down
2 changes: 2 additions & 0 deletions packages/opencode/src/session/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export const Info = z
attempt: z.number(),
message: z.string(),
next: z.number(),
providerID: z.string().optional(),
modelID: z.string().optional(),
}),
z.object({
type: z.literal("busy"),
Expand Down
31 changes: 31 additions & 0 deletions packages/opencode/test/cli/tui/prompt-status.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { expect, test } from "bun:test"
import { visiblePromptStatus } from "../../../src/cli/cmd/tui/component/prompt/status"

test("hides retry status from a previously selected model", () => {
expect(
visiblePromptStatus(
{
type: "retry",
attempt: 1,
message: "quota exceeded",
next: Date.now() + 1000,
providerID: "glm",
modelID: "glm-4.5",
},
{ providerID: "mimo", modelID: "mimo-auto" },
),
).toEqual({ type: "idle" })
})

test("keeps retry status for the current model", () => {
const status = {
type: "retry" as const,
attempt: 1,
message: "quota exceeded",
next: Date.now() + 1000,
providerID: "glm",
modelID: "glm-4.5",
}

expect(visiblePromptStatus(status, { providerID: "glm", modelID: "glm-4.5" })).toBe(status)
})
16 changes: 16 additions & 0 deletions packages/opencode/test/session/retry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,22 @@ describe("session.retry.delay", () => {
},
})
})

test("retry status preserves the model that scheduled the retry", () => {
expect(
SessionStatus.Info.parse({
type: "retry",
attempt: 1,
message: "quota exceeded",
next: Date.now() + 1000,
providerID: "glm",
modelID: "glm-4.5",
}),
).toMatchObject({
providerID: "glm",
modelID: "glm-4.5",
})
})
})

describe("session.retry.retryable", () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/js/src/v2/gen/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,8 @@ export type SessionStatus =
attempt: number
message: string
next: number
providerID?: string
modelID?: string
}
| {
type: "busy"
Expand Down