mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-16 21:15:57 +03:00
fix(tui): show execution failures that happen before any step (#60079)
This commit is contained in:
committed by
GitHub
Unverified
parent
78c31ea68c
commit
6a0acd174b
@@ -370,6 +370,8 @@ export function reduceSessionRows(
|
||||
})
|
||||
usage.previousTurnCache = { read: last.tokens.cache.read, model: last.model }
|
||||
}
|
||||
// An execution failure that repeats the error of the turn's last step or compaction is already on screen.
|
||||
let shownError: SessionMessageAssistant["error"]
|
||||
const entries = [
|
||||
...messages.filter((message) => !pending.has(message.id)),
|
||||
...pendingCompactions,
|
||||
@@ -377,10 +379,15 @@ export function reduceSessionRows(
|
||||
].reduce<ProjectionEntry[]>((rows, message) => {
|
||||
if (message.type !== "assistant") {
|
||||
if (message.type === "idle") {
|
||||
if (message.error && (message.error.type !== shownError?.type || message.error.message !== shownError.message))
|
||||
rows.push({ entry: { type: "message", messageID: message.id }, path: [], closesPrevious: true })
|
||||
shownError = undefined
|
||||
flushTurn(rows)
|
||||
return rows
|
||||
}
|
||||
if (message.type === "synthetic" && !message.description?.trim()) return rows
|
||||
if (message.type === "compaction" && message.status !== "running")
|
||||
shownError = message.status === "failed" ? message.error : undefined
|
||||
if (message.type === "compaction" && message.status === "completed" && usage) usage.previousTurnCache = undefined
|
||||
rows.push({
|
||||
entry: { type: "message", messageID: message.id },
|
||||
@@ -390,6 +397,7 @@ export function reduceSessionRows(
|
||||
return rows
|
||||
}
|
||||
usage?.steps.push(message)
|
||||
shownError = message.error
|
||||
const ordinals = { text: 0, reasoning: 0 }
|
||||
message.content.forEach((part) => {
|
||||
const partID = part.type === "tool" ? part.id : `${part.type}:${ordinals[part.type]++}`
|
||||
|
||||
@@ -3,7 +3,13 @@ import type { SessionMessageAssistant, SessionMessageInfo } from "@opencode/clie
|
||||
import { createMemo, createRoot } from "solid-js"
|
||||
import { createStore } from "solid-js/store"
|
||||
import { SessionTurn } from "@opencode/util/session-turn"
|
||||
import { cacheReuseDrop, messageBoundaryIDs, reduceSessionRows, sessionRowID } from "../../../src/routes/session/rows"
|
||||
import {
|
||||
cacheReuseDrop,
|
||||
messageBoundaryIDs,
|
||||
reduceSessionRows,
|
||||
sessionRowID,
|
||||
type SessionRow,
|
||||
} from "../../../src/routes/session/rows"
|
||||
|
||||
test("indexed tail footer calculations do not subscribe to an unrelated history prefix", () => {
|
||||
createRoot((dispose) => {
|
||||
@@ -505,6 +511,92 @@ test("places a running compaction barrier before every queued user message", ()
|
||||
])
|
||||
})
|
||||
|
||||
test("shows an execution failure that happened before any step", () => {
|
||||
const unavailable = { type: "provider.no-route", message: "Model unavailable: opencode/gpt-5.5" }
|
||||
|
||||
expect(
|
||||
reduceSessionRows([
|
||||
{ type: "user", id: "user", text: "Are you there?", time: { created: 1 } },
|
||||
failed("idle", unavailable),
|
||||
{ type: "user", id: "next", text: "Try again", time: { created: 3 } },
|
||||
failed("idle-next", unavailable),
|
||||
]),
|
||||
).toEqual([
|
||||
{ type: "message", messageID: "user" },
|
||||
{ type: "message", messageID: "idle" },
|
||||
{ type: "message", messageID: "next" },
|
||||
{ type: "message", messageID: "idle-next" },
|
||||
])
|
||||
})
|
||||
|
||||
test("shows an execution failure once when its last step already shows the error", () => {
|
||||
const quota = { type: "provider.quota", message: "Insufficient account funds" }
|
||||
const step = { ...assistant("assistant", []), error: quota }
|
||||
const compaction: SessionMessageInfo = {
|
||||
type: "compaction",
|
||||
id: "compaction",
|
||||
status: "failed",
|
||||
reason: "auto",
|
||||
error: quota,
|
||||
time: { created: 2 },
|
||||
}
|
||||
|
||||
expect(reduceSessionRows([step, failed("idle", quota)])).toEqual([
|
||||
{ type: "assistant-footer", messageID: "assistant" },
|
||||
])
|
||||
expect(reduceSessionRows([compaction, failed("idle", quota)])).toEqual([{ type: "message", messageID: "compaction" }])
|
||||
})
|
||||
|
||||
test("shows an execution failure that differs from the last step's error", () => {
|
||||
const interrupted = { ...assistant("assistant", []), error: { type: "aborted", message: "Step interrupted" } }
|
||||
const compaction: SessionMessageInfo = {
|
||||
type: "compaction",
|
||||
id: "compaction",
|
||||
status: "failed",
|
||||
reason: "manual",
|
||||
error: { type: "provider.timeout", message: "Compaction timed out" },
|
||||
time: { created: 2 },
|
||||
}
|
||||
const blocked = { type: "unknown", message: "Instructions could not be loaded" }
|
||||
|
||||
expect(reduceSessionRows([interrupted, failed("idle", { type: "tool.execution", message: "Tool crashed" })])).toEqual(
|
||||
[
|
||||
{ type: "assistant-footer", messageID: "assistant" },
|
||||
{ type: "message", messageID: "idle" },
|
||||
],
|
||||
)
|
||||
expect(reduceSessionRows([compaction, failed("idle", blocked)])).toEqual([
|
||||
{ type: "message", messageID: "compaction" },
|
||||
{ type: "message", messageID: "idle" },
|
||||
])
|
||||
})
|
||||
|
||||
test("keeps an execution failure in place ahead of the prompt it left pending", () => {
|
||||
const messages: SessionMessageInfo[] = [
|
||||
{ type: "user", id: "stranded", text: "Go", time: { created: 1 } },
|
||||
failed("idle", { type: "unknown", message: "Instructions could not be loaded" }),
|
||||
{
|
||||
type: "model-switched",
|
||||
id: "model",
|
||||
model: { id: "other", providerID: "provider" },
|
||||
time: { created: 3 },
|
||||
},
|
||||
]
|
||||
const rows: SessionRow[] = [
|
||||
{ type: "message", messageID: "idle" },
|
||||
{ type: "message", messageID: "model" },
|
||||
{ type: "message", messageID: "stranded" },
|
||||
]
|
||||
|
||||
expect(reduceSessionRows(messages, new Set(["stranded"]))).toEqual(rows)
|
||||
// A resync loads projected messages before pending input.
|
||||
expect(reduceSessionRows([...messages.slice(1), messages[0]], new Set(["stranded"]))).toEqual(rows)
|
||||
})
|
||||
|
||||
function failed(id: string, error: SessionMessageAssistant["error"]): SessionMessageInfo {
|
||||
return { type: "idle", id, outcome: "failed", error, time: { created: 2 } }
|
||||
}
|
||||
|
||||
function assistant(id: string, content: SessionMessageAssistant["content"]): SessionMessageAssistant {
|
||||
return {
|
||||
type: "assistant",
|
||||
|
||||
Reference in New Issue
Block a user