Skip to content

fix(opencode): sanitize OpenAI MCP tool schemas - #32489

Merged
rekram1-node merged 4 commits into
anomalyco:devfrom
jquense:codex/openai-mcp-schema-sanitize
Jun 17, 2026
Merged

fix(opencode): sanitize OpenAI MCP tool schemas#32489
rekram1-node merged 4 commits into
anomalyco:devfrom
jquense:codex/openai-mcp-schema-sanitize

Conversation

@jquense

@jquensejquense commented Jun 16, 2026•
edited by rekram1-node
Loading

Copy link
Copy Markdown
Contributor

Issue for this PR

Addresses #32488. Tuple-style items remain unsupported and will be handled separately.

Type of change

  • Bug fix
  • New feature
  • Refactor / code improvement
  • Documentation

What does this PR do?

MCP servers can expose tool input schemas with JSON Schema keywords that OpenAI tool schemas do not support. This sanitizes tool schemas for models using the OpenAI or Azure AI SDK adapters before sending them to the model, mirroring Codex's compatibility lowering: unsupported keywords are dropped, const becomes enum, and missing object/array children get permissive defaults.

Scoping by adapter covers direct OpenAI and Azure providers as well as OpenCode Zen and custom providers configured with @ai-sdk/openai. Models using other adapters keep their schemas unchanged.

How did you verify your code works?

  • bun test test/provider/transform.test.ts --timeout 30000
  • bun typecheck from packages/opencode
  • Push hook also ran bun turbo typecheck successfully

Screenshots / recordings

N/A - non-UI change.

Checklist

  • I have tested my changes locally
  • I have not included unrelated changes in this PR

@github-actions

github-actionsBot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

The following comment was made by an LLM, it may be inaccurate:

I found one related PR:

Related PR:

Why it's related: This PR also deals with sanitizing OpenAI schemas. It may address similar compatibility issues between MCP tool schemas and OpenAI's schema requirements. This should be reviewed to ensure there's no overlapping work or to determine if it's a complementary fix.

The current PR (32489) is not a duplicate of itself, and the other results appear to be unrelated to schema sanitization work.

@jquense
jquenseforce-pushed the codex/openai-mcp-schema-sanitize branch 3 times, most recently from dba7bab to 5bc6b68CompareJune 16, 2026 13:30
@jquense
jquenseforce-pushed the codex/openai-mcp-schema-sanitize branch from 5bc6b68 to aa7e6f4CompareJune 16, 2026 13:31
@github-actions

github-actionsBot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

Thanks for your contribution!

This PR doesn't have a linked issue. All PRs must reference an existing issue.

Please:

  1. Open an issue describing the bug/feature (if one doesn't exist)
  2. Add Fixes #<number> or Closes #<number> to this PR description

See CONTRIBUTING.md for details.

@rekram1-node
rekram1-node enabled auto-merge (squash) June 16, 2026 23:59
@rekram1-node
rekram1-node disabled auto-merge June 17, 2026 00:00
@rekram1-node
rekram1-node merged commit 213ff3f into anomalyco:devJun 17, 2026
8 of 10 checks passed
This was referenced Jun 17, 2026
Open
Open
Open
johnko added a commit to johnko/opencode that referenced this pull request Jun 17, 2026
@johnko
Merge branch 'upstream' into dev
9b813c8
* upstream: (4536 commits)
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
chore: update nix node_modules hashes
fix(provider): pass apiKey to createUnified for Cloudflare AI Gateway (anomalyco#32052)
chore: generate
feat(app): make session timelines much faster AND without flicker or scroll jumps (anomalyco#32331)
chore: update nix node_modules hashes
chore: generate
experiment: better web picker using @pierre/tree (anomalyco#31208)
fix(mcp): default tool schema properties (anomalyco#32568)
fix(web): persist docs language selection (anomalyco#32551)
fix(tui): render move errors inline (anomalyco#32241)
Revert "fix(mcp): type tool error content"
fix(mcp): enable progress timeout resets (anomalyco#32477)
fix(mcp): stop idle OAuth callback server (anomalyco#32245)
chore: generate
chore: update nix node_modules hashes
fix(mcp): type tool error content
fix(stats): align homepage model ranks
fix(mcp): handle tool result errors (anomalyco#32244)
fix(stats): rank model pages by week
...
LuisAlbertoMK added a commit to LuisAlbertoMK/opencode that referenced this pull request Jun 17, 2026
@LuisAlbertoMK
merge(upstream): cherry-pick 4 high-value upstream fixes
1630cbc
- fix(tui): render move errors inline (anomalyco#32241)
- fix(mcp): enable progress timeout resets (anomalyco#32477)
- fix(mcp): default tool schema properties (anomalyco#32568)
- fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
@rekram1-noderekram1-node mentioned this pull request Jun 17, 2026
Closed
davidgut1982 pushed a commit to davidgut1982/opencode that referenced this pull request Jun 19, 2026
@jquensejquense
@rekram1-node@davidgut1982
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
e8c0532
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
ausard pushed a commit to ausardcompany/alexi that referenced this pull request Jun 19, 2026
alexi-bot
feat(providers): Codex-style sanitizeOpenAISchema for MCP tool schemas
21ed92d
Add a JSON schema lowering pass for MCP tool inputSchemas that targets
SAP AI Core OpenAI deployments (gpt-*, o1-*, o3-*, or any deployment
whose ai-sdk wrapper is @ai-sdk/openai or @ai-sdk/azure). Mirrors the
Codex / opencode lowering algorithm shipped in anomalyco/opencode#32489 so
JSON Schema 2020-12 features OpenAI rejects (boolean schemas,
prefixItems, if/then/else, dependentSchemas, unevaluatedProperties,
patternProperties, ...) are dropped or rewritten to the closest legal
shape before tool registration.
Exports from src/providers/transform.ts:
- sanitizeOpenAISchema(schema) - pure lowering pass; never mutates input.
- isOpenAIShapedModel(model, providerMeta?) - detects gpt-/o1-/o3- ids
or @ai-sdk/openai|azure providerMeta.
- lowerMcpToolsForOpenAIShaped(tools, model, providerMeta?) - call-site
helper that produces NEW tool descriptors per request so the cached
McpToolInfo in McpClientManager is safe for non-OpenAI deployments
in the same process.
Non-OpenAI SAP AI Core deployments (anthropic--*, gemini-*, mistralai--*,
amazon--*, deepseek-ai--*) pass through untouched - they accept JSON
Schema 2020-12 fine and the lowering would strip semantically meaningful
constraints.
Tests port the opencode transform.test.ts fixtures, covering boolean
schemas, ref preservation, tuple/prefixItems lowering, const -> enum
folding, type inference from properties/items, required filtering of
non-string entries, dropped composition keywords, description
preservation, and a non-mutation guarantee.
Closes#805 [alexi-bot]
@ausardausard mentioned this pull request Jun 19, 2026
Merged
ausard added a commit to ausardcompany/alexi that referenced this pull request Jun 19, 2026
@ausardalexi-bot
feat(providers): Codex-style sanitizeOpenAISchema for MCP tool schemas (
4949be3
#809)
Add a JSON schema lowering pass for MCP tool inputSchemas that targets
SAP AI Core OpenAI deployments (gpt-*, o1-*, o3-*, or any deployment
whose ai-sdk wrapper is @ai-sdk/openai or @ai-sdk/azure). Mirrors the
Codex / opencode lowering algorithm shipped in anomalyco/opencode#32489 so
JSON Schema 2020-12 features OpenAI rejects (boolean schemas,
prefixItems, if/then/else, dependentSchemas, unevaluatedProperties,
patternProperties, ...) are dropped or rewritten to the closest legal
shape before tool registration.
Exports from src/providers/transform.ts:
- sanitizeOpenAISchema(schema) - pure lowering pass; never mutates input.
- isOpenAIShapedModel(model, providerMeta?) - detects gpt-/o1-/o3- ids
or @ai-sdk/openai|azure providerMeta.
- lowerMcpToolsForOpenAIShaped(tools, model, providerMeta?) - call-site
helper that produces NEW tool descriptors per request so the cached
McpToolInfo in McpClientManager is safe for non-OpenAI deployments
in the same process.
Non-OpenAI SAP AI Core deployments (anthropic--*, gemini-*, mistralai--*,
amazon--*, deepseek-ai--*) pass through untouched - they accept JSON
Schema 2020-12 fine and the lowering would strip semantically meaningful
constraints.
Tests port the opencode transform.test.ts fixtures, covering boolean
schemas, ref preservation, tuple/prefixItems lowering, const -> enum
folding, type inference from properties/items, required filtering of
non-string entries, dropped composition keywords, description
preservation, and a non-mutation guarantee.
Closes#805 [alexi-bot]
Co-authored-by: alexi-bot <alexi-bot@users.noreply.github.com>
thdxr pushed a commit that referenced this pull request Jun 21, 2026
@jquensejquense
@rekram1-node@thdxr
fix(opencode): sanitize OpenAI MCP tool schemas (#32489)
54daa0f
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
@wgu9wgu9 mentioned this pull request Jun 21, 2026
Closed
6 tasks
@ben181231ben181231 mentioned this pull request Jun 22, 2026
Closed
markjaquith pushed a commit to markjaquith/opencode that referenced this pull request Jun 23, 2026
@jquensejquense@rekram1-node
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
5ea27cb
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
BenGu3 pushed a commit to BenGu3/opencode that referenced this pull request Jun 27, 2026
@jquensejquense
@rekram1-node@BenGu3
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
5baf8ec
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
panyw5 pushed a commit to panyw5/opencode that referenced this pull request Jul 3, 2026
@jquensejquense
@rekram1-node@panyw5
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
20efa62
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
@KamilKleinaKamilKleina mentioned this pull request Jul 6, 2026
Open
@LuizGustavoWTLuizGustavoWT mentioned this pull request Jul 20, 2026
Open
avion23 pushed a commit to avion23/opencode that referenced this pull request Jul 20, 2026
@jquensejquense@rekram1-node
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
f54fd4a
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
3kaiu pushed a commit to 3kaiu/opencode-x that referenced this pull request Jul 31, 2026
@jquensejquense@rekram1-node
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
a9be928
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
@vrutkovsvrutkovs mentioned this pull request Jul 31, 2026
Open
6 tasks
MarsQiu007 referenced this pull request in MarsQiu007/openNovel Jul 31, 2026
@jquensejquense@rekram1-node
fix(opencode): sanitize OpenAI MCP tool schemas (#32489)
74c0895
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
banlanzs pushed a commit to banlanzs/opencode that referenced this pull request Aug 6, 2026
@jquensejquense@rekram1-node
fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
5d7b02d
Co-authored-by: jquense <jquense@ramp.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

contributor

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jquense@rekram1-node