monadical/opencode
14
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: ensure mcp tools are sanitized (#11984)

Browse Source
This commit is contained in:
Aiden Cline
2026-02-03 12:22:00 -06:00
committed by GitHub
parent dcff5b6596
commit b7b734f51f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/opencode/src/provider/transform.ts
View File

@@ -1,5 +1,6 @@
import type { APICallError, ModelMessage } from "ai" import type { APICallError, ModelMessage } from "ai"
import { mergeDeep, unique } from "remeda" import { mergeDeep, unique } from "remeda"
import type { JSONSchema7 } from "@ai-sdk/provider"
import type { JSONSchema } from "zod/v4/core" import type { JSONSchema } from "zod/v4/core"
import type { Provider } from "./provider" import type { Provider } from "./provider"
import type { ModelsDev } from "./models" import type { ModelsDev } from "./models"
@@ -719,7 +720,7 @@ export namespace ProviderTransform {
return standardLimit return standardLimit
} }
export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema) { export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema | JSONSchema7): JSONSchema7 {
/* /*
if (["openai", "azure"].includes(providerID)) { if (["openai", "azure"].includes(providerID)) {
if (schema.type === "object" && schema.properties) { if (schema.type === "object" && schema.properties) {
@@ -793,7 +794,7 @@ export namespace ProviderTransform {
schema = sanitizeGemini(schema) schema = sanitizeGemini(schema)
} }
return schema return schema as JSONSchema7
} }
export function error(providerID: string, error: APICallError) { export function error(providerID: string, error: APICallError) {

4
packages/opencode/src/session/prompt.ts
View File

@@ -9,7 +9,7 @@ import { SessionRevert } from "./revert"
import { Session } from "." import { Session } from "."
import { Agent } from "../agent/agent" import { Agent } from "../agent/agent"
import { Provider } from "../provider/provider" import { Provider } from "../provider/provider"
import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions } from "ai" import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions, asSchema } from "ai"
import { SessionCompaction } from "./compaction" import { SessionCompaction } from "./compaction"
import { Instance } from "../project/instance" import { Instance } from "../project/instance"
import { Bus } from "../bus" import { Bus } from "../bus"
@@ -738,6 +738,8 @@ export namespace SessionPrompt {
const execute = item.execute const execute = item.execute
if (!execute) continue if (!execute) continue
const transformed = ProviderTransform.schema(input.model, asSchema(item.inputSchema).jsonSchema)
item.inputSchema = jsonSchema(transformed)
// Wrap execute to add plugin hooks and format output // Wrap execute to add plugin hooks and format output
item.execute = async (args, opts) => { item.execute = async (args, opts) => {
const ctx = context(args, opts) const ctx = context(args, opts)