mirrors/opencode
1
0
Fork 0
mirror of https://github.com/sst/opencode.git synced 2025-12-23 10:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

sync

Browse source
This commit is contained in:
Dax Raad 2025-09-14 04:03:19 -04:00
parent 7c860a3535
commit 6605ea64e3
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cloud/core/src/util/fn.ts
View file

@ -1,11 +1,11 @@
import { z } from "zod"
export function fn<T extends z.ZodType, Result>(schema: T, cb: (input: z.output<T>) => Result) {
const result = (input: z.input<T>) => {
export function fn<T extends z.ZodType, Result>(schema: T, cb: (input: z.infer<T>) => Result) {
const result = (input: z.infer<T>) => {
const parsed = schema.parse(input)
return cb(parsed)
}
result.force = (input: z.input<T>) => cb(input)
result.force = (input: z.infer<T>) => cb(input)
result.schema = schema
return result
}

18
packages/opencode/src/tool/registry.ts
View file

@ -179,14 +179,22 @@ export namespace ToolRegistry {
return result
}
<<<<<<< Updated upstream
function sanitizeGeminiParameters(schema: z.ZodTypeAny, visited = new Set<z.ZodTypeAny>()): z.ZodTypeAny {
=======
function sanitizeGeminiParameters(schema: z.ZodType, visited = new Set()): z.ZodType {
>>>>>>> Stashed changes
if (!schema || visited.has(schema)) {
return schema
}
visited.add(schema)
if (schema instanceof z.ZodDefault) {
<<<<<<< Updated upstream
const innerSchema = schema._def.innerType
=======
const innerSchema = schema.unwrap()
>>>>>>> Stashed changes
// Handle Gemini's incompatibility with `default` on `anyOf` (unions).
if (innerSchema instanceof z.ZodUnion) {
// The schema was `z.union(...).default(...)`, which is not allowed.
@ -265,14 +273,20 @@ export namespace ToolRegistry {
return schema
}
function optionalToNullable(schema: z.ZodTypeAny): z.ZodTypeAny {
function optionalToNullable(schema: z.core.$ZodType): z.core.$ZodType {
if (schema instanceof z.ZodObject) {
const shape = schema.shape
const newShape: Record<string, z.ZodTypeAny> = {}
const newShape: Record<string, z.core.$ZodType> = {}
for (const [key, value] of Object.entries(shape)) {
<<<<<<< Updated upstream
if (value instanceof z.ZodOptional) {
newShape[key] = value.unwrap().nullable()
=======
const zodValue = value as z.ZodTypeAny
if (zodValue instanceof z.core.$ZodOptional) {
newShape[key] = zodValue.nullable()
>>>>>>> Stashed changes
} else {
newShape[key] = optionalToNullable(value)
}