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
13 changes: 11 additions & 2 deletions packages/opencode/src/session/message-v2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { MessageTable, PartTable, SessionTable } from "@opencode-ai/core/session
import { ProviderError } from "@/provider/error"
import { iife } from "@/util/iife"
import { errorMessage } from "@/util/error"
import { isContextOverflow } from "@opencode-ai/llm"
import { isMedia } from "@/util/media"
import type { SystemError } from "bun"
import type { Provider } from "@/provider/provider"
Expand Down Expand Up @@ -713,8 +714,16 @@ export function fromError(
},
{ cause: e },
).toObject()
case e instanceof Error:
return new NamedError.Unknown({ message: errorMessage(e) }, { cause: e }).toObject()
case e instanceof Error: {
const msg = errorMessage(e)
if (isContextOverflow(msg)) {
return new ContextOverflowError(
{ message: msg, responseBody: msg },
{ cause: e },
).toObject()
}
return new NamedError.Unknown({ message: msg }, { cause: e }).toObject()
}
default:
try {
const parsed = ProviderError.parseStreamError(e)
Expand Down
22 changes: 22 additions & 0 deletions packages/opencode/test/session/message-v2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1487,6 +1487,28 @@ describe("session.message-v2.fromError", () => {
expect(SessionV1.ContextOverflowError.isInstance(result)).toBe(true)
})

test("detects context overflow from generic Error messages", () => {
const cases = [
"prompt is too long: 213462 tokens > 200000 maximum",
"Your input exceeds the context window of this model",
"The input token count (1196265) exceeds the maximum number of tokens allowed (1048575)",
"Please reduce the length of the messages or completion",
"This model's maximum context length is 8192 tokens",
]

cases.forEach((message) => {
const error = new Error(message)
const result = MessageV2.fromError(error, { providerID })
expect(SessionV1.ContextOverflowError.isInstance(result)).toBe(true)
})
})

test("does not classify generic non-overflow Error as context overflow", () => {
const result = MessageV2.fromError(new Error("Network connection lost."), { providerID })
expect(SessionV1.ContextOverflowError.isInstance(result)).toBe(false)
expect(result.name).toBe("UnknownError")
})

test("does not classify 429 no body as context overflow", () => {
const result = MessageV2.fromError(
new APICallError({
Expand Down
Loading