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
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ConfigError } from "@/config/error"
import { NamedError } from "@opencode-ai/core/util/error"
import * as Log from "@opencode-ai/core/util/log"
import { Cause, Effect } from "effect"
Expand All @@ -18,6 +19,10 @@ export const errorLayer = HttpRouter.middleware<{ handles: unknown }>()((effect)
if (!defect) return Effect.failCause(cause)

const error = defect.defect
if (ConfigError.JsonError.isInstance(error) || ConfigError.InvalidError.isInstance(error)) {
return Effect.succeed(HttpServerResponse.jsonUnsafe(error.toObject(), { status: 400 }))
}

const ref = `err_${crypto.randomUUID().slice(0, 8)}`

log.error("failed", { ref, error, cause: Cause.pretty(cause) })
Expand Down
43 changes: 36 additions & 7 deletions packages/opencode/test/server/httpapi-error-middleware.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe("HttpApi error middleware", () => {
}),
)

it.live("does not expose config defects from generic middleware", () =>
it.live("returns config validation defects for startup requests", () =>
Effect.gen(function* () {
const configError = new ConfigError.InvalidError({
path: "/tmp/opencode.json",
Expand All @@ -68,13 +68,42 @@ describe("HttpApi error middleware", () => {

const response = yield* HttpClientRequest.get("/config-error").pipe(HttpClient.execute)
const body = yield* response.json
const serialized = JSON.stringify(body)

expect(response.status).toBe(500)
expectUnknownErrorBody(body)
expect(serialized).not.toContain("/tmp/opencode.json")
expect(serialized).not.toContain("provider")
expect(serialized).not.toContain("anthropic")
expect(response.status).toBe(400)
expect(body).toEqual({
name: "ConfigInvalidError",
data: {
path: "/tmp/opencode.json",
issues: [{ message: "Expected object", path: ["provider", "anthropic", "options"] }],
},
})
}),
)

it.live("returns config json defects for startup requests", () =>
Effect.gen(function* () {
const configError = new ConfigError.JsonError({
path: "/tmp/opencode.jsonc",
message: "ValueExpected at line 3, column 1",
})

yield* HttpRouter.add("GET", "/config-json-error", Effect.die(configError)).pipe(
Layer.provide(errorLayer),
HttpRouter.serve,
Layer.build,
)

const response = yield* HttpClientRequest.get("/config-json-error").pipe(HttpClient.execute)
const body = yield* response.json

expect(response.status).toBe(400)
expect(body).toEqual({
name: "ConfigJsonError",
data: {
path: "/tmp/opencode.jsonc",
message: "ValueExpected at line 3, column 1",
},
})
}),
)

Expand Down
Loading