fix(prompt-retry): preserve async holds without blocking validation fallbacks

This commit is contained in:
YeonGyu-Kim
2026-05-19 13:48:33 +09:00
parent 5f733f471c
commit e57bac3b6b
9 changed files with 168 additions and 6 deletions
+11 -4
View File
@@ -8,7 +8,6 @@ import {
import {
dispatchInternalPrompt,
releasePromptAsyncReservation,
type InternalPromptDispatchResult,
} from "./prompt-async-gate"
type Client = ReturnType<typeof createOpencodeClient>
@@ -34,6 +33,15 @@ function extractMessage(error: unknown): string {
return String(error)
}
function isAgentResolutionError(error: unknown): boolean {
const message = extractMessage(error)
return message.includes("Agent not found") || message.includes("agent.name")
}
function shouldReleaseReservationAfterFailedAsyncPrompt(error: unknown): boolean {
return parseModelSuggestion(error) !== null || isAgentResolutionError(error)
}
export function parseModelSuggestion(error: unknown): ModelSuggestionInfo | null {
if (!error) return null
@@ -98,10 +106,9 @@ export async function promptWithModelSuggestionRetry(
): Promise<void> {
const timeoutMs = options.timeoutMs ?? PROMPT_TIMEOUT_MS
const timeoutContext = createPromptTimeoutContext(args, timeoutMs)
let promptResult: InternalPromptDispatchResult | undefined
try {
promptResult = await dispatchInternalPrompt({
const promptResult = await dispatchInternalPrompt({
mode: "async",
client,
sessionID: args.path.id,
@@ -125,7 +132,7 @@ export async function promptWithModelSuggestionRetry(
if (timeoutContext.wasTimedOut()) {
throw new Error(`promptAsync timed out after ${timeoutMs}ms`)
}
if (promptResult?.status === "failed") {
if (shouldReleaseReservationAfterFailedAsyncPrompt(error)) {
releasePromptAsyncReservation(args.path.id, "model-suggestion-retry")
}
throw error