Skip to content

Commit 0194d31

Browse files
committed
fix(es-app): keep provider errors in conversation (anomalyco#164)
1 parent e9165b4 commit 0194d31

6 files changed

Lines changed: 96 additions & 8 deletions

File tree

‎packages/es-app/src/components/subagent-transcript.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { DataProvider } from "@opencode-ai/session-ui/context"
44
import { TranscriptMessage } from "./transcript-message"
55
import { Dialog } from "@opencode-ai/ui/dialog"
66
import { oc } from "../api"
7-
import { createLiveSession } from "../live-session"
7+
import { createLiveSession, errorText } from "../live-session"
88

99
export const SubagentTranscript = (props: { sessionID: string; directory: string; onDispose: () => void }) => {
1010
const controller = new AbortController()
@@ -39,6 +39,12 @@ export const SubagentTranscript = (props: { sessionID: string; directory: string
3939
const Transcript = (props: { session: Session }) => {
4040
const live = createLiveSession(props.session.id, props.session.directory)
4141
const messages = () => live.data.message[props.session.id] ?? []
42+
const topError = () => {
43+
const value = live.error()
44+
const latest = messages().at(-1)
45+
return latest?.role === "assistant" && latest.error && latest.error.name !== "MessageAbortedError" &&
46+
value === errorText(latest.error) ? "" : value
47+
}
4248
const valid = () => live.data.session[0]?.id === props.session.id &&
4349
live.data.session[0]?.directory === props.session.directory
4450
onMount(() => { void live.load().catch(() => {}) })
@@ -52,7 +58,7 @@ const Transcript = (props: { session: Session }) => {
5258
<Show when={live.connectionError()}>{(error) => <div role="alert" class="err">
5359
{error()} <button disabled={live.loading()} onClick={() => void live.load().catch(() => {})}>Retry</button>
5460
</div>}</Show>
55-
<Show when={live.error()}>{(error) => <div role="alert" class="err">{error()}</div>}</Show>
61+
<Show when={topError()}>{(error) => <div role="alert" class="err">{error()}</div>}</Show>
5662
<Show when={!live.loading() && !live.connectionError() && !valid()}>
5763
<div role="alert" class="err">The transcript does not match the requested subagent.</div>
5864
</Show>

‎packages/es-app/src/components/transcript-message.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { createMemo, createSignal, Show, type ComponentProps } from "solid-js"
22
import { Message } from "@opencode-ai/session-ui/message-part"
3+
import { errorText } from "../live-session"
34

45
export const TranscriptMessage = (props: ComponentProps<typeof Message>) => {
6+
const messageError = createMemo(() => props.message.role === "assistant" && props.message.error?.name !== "MessageAbortedError"
7+
? props.message.error : undefined)
58
const generated = createMemo(() => {
69
if (props.message.role !== "user" || !props.parts.length ||
710
!props.parts.every(part => part.type === "text" && part.synthetic === true)) return ""
@@ -23,7 +26,12 @@ export const TranscriptMessage = (props: ComponentProps<typeof Message>) => {
2326
const result = copied || await navigator.clipboard?.writeText(generated()).then(() => true, () => false)
2427
setCopyState(result ? "Copied" : "Copy failed")
2528
}
26-
return <Show when={generated()} fallback={<Message {...props} activityRows />}>
29+
return <Show when={generated()} fallback={<>
30+
<Message {...props} activityRows />
31+
<Show when={messageError()}>{(error) =>
32+
<div class="conversation-error" data-message-error-id={props.message.id} role="note" aria-label="Provider error">{errorText(error())}</div>
33+
}</Show>
34+
</>}>
2735
<details class="generated-input" data-generated-message-id={props.message.id} onToggle={event => setOpen(event.currentTarget.open)}>
2836
<summary class="activity-row">
2937
<span class="activity-kind">Generated input</span>

‎packages/es-app/src/index.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,17 @@ td { padding: 4px 10px 4px 0; border-bottom: 1px solid var(--surface0); }
11661166
.turn-summary .agent { color: var(--text); }
11671167
.turn-summary.interrupted .marker,
11681168
.turn-summary.interrupted .agent { color: var(--overlay0); }
1169+
.conversation-error {
1170+
margin: 8px 0 12px;
1171+
border-inline-start: 2px solid var(--red);
1172+
background: var(--surface0);
1173+
color: var(--text);
1174+
padding: 10px 12px;
1175+
white-space: pre-wrap;
1176+
overflow-wrap: anywhere;
1177+
max-height: 30vh;
1178+
overflow-y: auto;
1179+
}
11691180

11701181
/* right info panel: one recessed sidebar, sections split by headings only */
11711182
.session-info {

‎packages/es-app/src/live-session.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const isTerminal = (event: LiveEvent) =>
3434
event.properties?.info?.role === "assistant" &&
3535
!!(event.properties.info.error || event.properties.info.time?.completed))
3636

37-
const errorText = (error: unknown): string => {
37+
export const errorText = (error: unknown): string => {
3838
if (typeof error === "string" && error) return error
3939
if (error && typeof error === "object") {
4040
if ("data" in error && error.data && typeof error.data === "object" && "message" in error.data)
@@ -86,7 +86,8 @@ export function createLiveSession(
8686
const message = latest()
8787
return (
8888
transientError() ||
89-
(message?.role === "assistant" && message.id > clearedThrough() && message.error ? errorText(message.error) : "")
89+
(message?.role === "assistant" && message.id > clearedThrough() && message.error?.name !== "MessageAbortedError" && message.error
90+
? errorText(message.error) : "")
9091
)
9192
}
9293
const connectionError = () => [connection.stream, connection.snapshot, connection.event].filter(Boolean).join("\n")

‎packages/es-app/src/pages/session.tsx‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { MessagePartProps } from "@opencode-ai/session-ui/message-part"
77
import type { ToolPart } from "@opencode-ai/sdk/v2"
88
import { useDialog } from "@opencode-ai/ui/context/dialog"
99
import { oc } from "../api"
10-
import { createLiveSession } from "../live-session"
10+
import { createLiveSession, errorText } from "../live-session"
1111
import FakeCaret from "../components/fake-caret"
1212
import { RelativeLines } from "../components/relative-lines"
1313
import SessionInfo from "../components/session-info"
@@ -232,6 +232,15 @@ function SessionView(props: { sessionID: string; directory: string }) {
232232
const status = () => live.data.session_status[sessionID]?.type ??
233233
(!activity.error(sessionID, directory) ? activity.status(sessionID) : undefined) ?? "idle"
234234
const messages = createMemo(() => live.data.message[sessionID] ?? [])
235+
const inlineError = () => {
236+
const latest = messages().at(-1)
237+
return latest?.role === "assistant" && latest.error?.name !== "MessageAbortedError" && latest.error
238+
? errorText(latest.error) : ""
239+
}
240+
const bannerError = () => {
241+
const value = live.error()
242+
return error() || (value !== inlineError() ? value : "")
243+
}
235244
const transcriptQuestionTools = createMemo(() => new Set(messages().flatMap((message) =>
236245
(live.data.part[message.id] ?? []).flatMap((part) =>
237246
part.type === "tool" && part.tool === "question" ? [`${message.id}\u0000${part.callID}`] : [],
@@ -298,7 +307,8 @@ function SessionView(props: { sessionID: string; directory: string }) {
298307
<div class="session-work-status" role="status" data-state={workState()}>
299308
<Show when={workState() === "working" || workState() === "retry"}><span class="session-work-spinner" aria-hidden="true" /></Show>
300309
<span>{workState() === "working" ? "Working" : workState() === "retry" ? "Retrying" :
301-
workState() === "waiting" ? "Waiting for your reply" : workState() === "failed" ? "Session failed — see error above" : "Reconnecting — activity unavailable"}</span>
310+
workState() === "waiting" ? "Waiting for your reply" : workState() === "failed" ?
311+
`Session failed — see error ${inlineError() ? "in conversation" : "above"}` : "Reconnecting — activity unavailable"}</span>
302312
</div>
303313
</Show>
304314
)
@@ -876,7 +886,7 @@ function SessionView(props: { sessionID: string; directory: string }) {
876886
</AppHeader>
877887

878888
<div class="session-alerts">
879-
<Show when={error() || live.error()}><div class="err" role="alert">{error() || live.error()}</div></Show>
889+
<Show when={bannerError()}><div class="err" role="alert">{bannerError()}</div></Show>
880890
<Show when={live.connectionError()}>
881891
<div class="err" role="alert">{live.connectionError()}
882892
<button disabled={live.loading()} onClick={() => { void live.load().catch(() => {}) }}>reconnect</button>
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import { createRequire } from "node:module"
2+
import { startPanelPreview } from "./composer-panel-preview.mjs"
3+
4+
const { chromium, expect } = createRequire(new URL("../../app/package.json", import.meta.url))("@playwright/test")
5+
const preview = await startPanelPreview()
6+
const browser = await chromium.launch({ channel: "chrome", headless: true })
7+
const page = await browser.newPage()
8+
const writes = []
9+
page.on("request", (request) => {
10+
if (!["GET", "HEAD", "OPTIONS"].includes(request.method())) writes.push(request.method())
11+
})
12+
preview.fixture.messages[1].info.error = {
13+
name: "APIError", data: { message: "Usage limit has been reached", statusCode: 429, isRetryable: false },
14+
}
15+
16+
try {
17+
await page.goto(preview.url)
18+
const errors = page.locator(".session-page .transcript .conversation-error")
19+
await expect(errors).toHaveCount(1)
20+
await expect(errors.first()).toHaveText("Usage limit has been reached")
21+
await expect(page.locator(".session-alerts .err")).toHaveCount(0)
22+
23+
preview.fixture.messages.push(
24+
{ info: { ...preview.fixture.messages[0].info, id: "msg_3", time: { created: 3 } }, parts: [] },
25+
{ info: { ...preview.fixture.messages[1].info, id: "msg_4", parentID: "msg_3", time: { created: 4, completed: 5 },
26+
error: { name: "ProviderAuthError", data: { providerID: "fixture", message: "Token is expired" } } }, parts: [] },
27+
)
28+
await page.reload()
29+
await expect(errors).toHaveCount(2)
30+
await expect(errors.nth(0)).toHaveText("Usage limit has been reached")
31+
await expect(errors.nth(1)).toHaveText("Token is expired")
32+
await expect(page.locator(".session-alerts .err")).toHaveCount(0)
33+
34+
preview.fixture.messages.push(
35+
{ info: { ...preview.fixture.messages[0].info, id: "msg_5", time: { created: 6 } }, parts: [] },
36+
{ info: { ...preview.fixture.messages[1].info, id: "msg_6", parentID: "msg_5", time: { created: 7 },
37+
error: { name: "MessageAbortedError", data: { message: "Interrupted" } } }, parts: [] },
38+
)
39+
await page.reload()
40+
await expect(errors).toHaveCount(2)
41+
await expect(page.locator(".turn-summary.interrupted")).toHaveCount(1)
42+
await expect(page.locator(".session-alerts .err")).toHaveCount(0)
43+
44+
preview.fixture.emit("session.error", { sessionID: "ses_a", error: { name: "UnknownError", data: { message: "Transient connection failure" } } })
45+
await expect(page.locator(".session-alerts .err")).toContainText("Transient connection failure")
46+
await expect(errors).toHaveCount(2)
47+
expect(writes).toEqual([])
48+
console.log("persistent provider errors in conversation: PASS")
49+
} finally {
50+
await browser.close()
51+
await preview.close()
52+
}

0 commit comments

Comments
 (0)