Parse command config with Effect Schema (#26801)

This commit is contained in:
Kit Langton
2026-05-11 10:22:45 -04:00
committed by GitHub
parent 6592d80460
commit 64c504212a
+8 -8
View File
@@ -1,12 +1,10 @@
export * as ConfigCommand from "./command" export * as ConfigCommand from "./command"
import * as Log from "@opencode-ai/core/util/log" import * as Log from "@opencode-ai/core/util/log"
import { Schema } from "effect" import { Cause, Exit, Schema } from "effect"
import { NamedError } from "@opencode-ai/core/util/error" import { NamedError } from "@opencode-ai/core/util/error"
import { Glob } from "@opencode-ai/core/util/glob" import { Glob } from "@opencode-ai/core/util/glob"
import { Bus } from "@/bus" import { Bus } from "@/bus"
import { zod } from "@opencode-ai/core/effect-zod"
import { withStatics } from "@opencode-ai/core/schema"
import { configEntryNameFromPath } from "./entry-name" import { configEntryNameFromPath } from "./entry-name"
import { InvalidError } from "./error" import { InvalidError } from "./error"
import * as ConfigMarkdown from "./markdown" import * as ConfigMarkdown from "./markdown"
@@ -20,10 +18,12 @@ export const Info = Schema.Struct({
agent: Schema.optional(Schema.String), agent: Schema.optional(Schema.String),
model: Schema.optional(ConfigModelID), model: Schema.optional(ConfigModelID),
subtask: Schema.optional(Schema.Boolean), subtask: Schema.optional(Schema.Boolean),
}).pipe(withStatics((s) => ({ zod: zod(s) }))) })
export type Info = Schema.Schema.Type<typeof Info> export type Info = Schema.Schema.Type<typeof Info>
const decodeInfo = Schema.decodeUnknownExit(Info)
export async function load(dir: string) { export async function load(dir: string) {
const result: Record<string, Info> = {} const result: Record<string, Info> = {}
for (const item of await Glob.scan("{command,commands}/**/*.md", { for (const item of await Glob.scan("{command,commands}/**/*.md", {
@@ -51,12 +51,12 @@ export async function load(dir: string) {
...md.data, ...md.data,
template: md.content.trim(), template: md.content.trim(),
} }
const parsed = Info.zod.safeParse(config) const parsed = decodeInfo(config, { errors: "all", propertyOrder: "original" })
if (parsed.success) { if (Exit.isSuccess(parsed)) {
result[config.name] = parsed.data result[config.name] = parsed.value
continue continue
} }
throw new InvalidError({ path: item, issues: parsed.error.issues }, { cause: parsed.error }) throw new InvalidError({ path: item, message: Cause.pretty(parsed.cause) }, { cause: Cause.squash(parsed.cause) })
} }
return result return result
} }