Skip to content

fix(agents): remove unsupported JSON Schema keywords for Cloud Code Assist API#567

Merged
steipete merged 10 commits into
openclaw:mainfrom
erikpr1994:fix/gemini-schema-sanitization
Jan 9, 2026
Merged

fix(agents): remove unsupported JSON Schema keywords for Cloud Code Assist API#567
steipete merged 10 commits into
openclaw:mainfrom
erikpr1994:fix/gemini-schema-sanitization

Conversation

@erikpr1994

@erikpr1994 erikpr1994 commented Jan 9, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Remove JSON Schema keywords that Cloud Code Assist API rejects (patternProperties, additionalProperties, $schema, $id, $ref, $defs, definitions)
  • Add oneOf literal flattening to match existing anyOf behavior
  • Add test to verify no unsupported keywords remain in tool schemas

Problem

When switching from Claude to Gemini mid-session (e.g., when running out of tokens), Claude's tool schemas contain JSON Schema keywords that Google's Cloud Code Assist API rejects as non-compliant with JSON Schema draft 2020-12.

Solution

Extended cleanSchemaForGemini() in src/agents/pi-tools.ts to:

  1. Remove all unsupported keywords via UNSUPPORTED_SCHEMA_KEYWORDS blocklist
  2. Flatten oneOf literals to enum (matching existing anyOf behavior)
  3. Remove additionalProperties entirely instead of just recursively cleaning it

Test Plan

  • Added test "removes unsupported JSON Schema keywords for Cloud Code Assist API compatibility"
  • All 1820 existing tests pass
  • Lint clean
  • Build successful

Changes

Keyword Before After
patternProperties Removed Removed ✓
additionalProperties Recursively cleaned Removed entirely
$schema, $id, $ref, $defs, definitions Kept Removed
oneOf literals Not flattened Flattened to enum

@erikpr1994

erikpr1994 commented Jan 9, 2026

Copy link
Copy Markdown
Contributor Author

@steipete I will be out for around 24 hours as I'm taking a flight back home. It would be nice if you can merge it asap or take care of it!

steipete added a commit that referenced this pull request Jan 9, 2026
@steipete
fix: scrub tool schemas for Cloud Code Assist (#567) (thanks @erikpr1994
6f3474a 
)
@steipete
steipete force-pushed the fix/gemini-schema-sanitization branch from b047107 to 6f3474a Compare January 9, 2026 13:08
@steipete
steipete force-pushed the fix/gemini-schema-sanitization branch from 9961d9e to caf69f1 Compare January 9, 2026 13:25
@mukhtharcm mukhtharcm mentioned this pull request Jan 9, 2026
Merged
erikpr1994 and others added 9 commits January 9, 2026 15:19
@erikpr1994 @steipete
fix(agents): remove unsupported JSON Schema keywords for Cloud Code A…
e921718 
…ssist API

Cloud Code Assist API requires strict JSON Schema draft 2020-12 compliance
and rejects keywords like patternProperties, additionalProperties, $schema,
$id, $ref, $defs, and definitions.

This extends cleanSchemaForGemini to:
- Remove all unsupported keywords from tool schemas
- Add oneOf literal flattening (matching existing anyOf behavior)
- Add test to verify no unsupported keywords remain in tool schemas
@steipete
fix: scrub tool schemas for Cloud Code Assist (openclaw#567) (thanks @…
fd535a5 
…erikpr1994)
@steipete
fix: avoid invalid UTF-16 in truncation (openclaw#567)
63f5fa4
@steipete
fix: avoid Windows runner unicode crash (openclaw#567)
760e9b3
@steipete
test: sanitize Windows CI output (openclaw#567)
090d163
@steipete
test: sanitize Windows CI buffer output (openclaw#567) (thanks @erikp…
f58b3d0 
…r1994)
@steipete
test: harden Windows CI output sanitization (openclaw#567) (thanks @e…
cb96deb 
…rikpr1994)
@steipete
test: sanitize Windows CI vitest runner output (openclaw#567) (thanks @…
fd3cbd9 
…erikpr1994)
@steipete
fix: rebase onto main + restore build/lint (openclaw#567) (thanks @er…
c228df8 
…ikpr1994)
@steipete
steipete force-pushed the fix/gemini-schema-sanitization branch from 402c7f3 to c228df8 Compare January 9, 2026 14:23
@steipete
steipete merged commit 616293f into openclaw:main Jan 9, 2026
13 of 17 checks passed
@steipete

steipete commented Jan 9, 2026

Copy link
Copy Markdown
Contributor

Landed via temp rebase onto main (merged w/ admin override; CI still running).

  • Gate (local): pnpm lint && pnpm build && CI=1 pnpm test
  • Land commit: 17a7d4e
  • Merge commit: 616293f

Thanks @erikpr1994!

dominicnunez referenced this pull request in dominicnunez/openclaw Feb 26, 2026
@steipete
fix: scrub tool schemas for Cloud Code Assist (#567) (thanks @erikpr1994
aee2e81 
)
dustin-olenslager pushed a commit to dustin-olenslager/ironclaw-supreme that referenced this pull request Mar 24, 2026
@steipete
fix: scrub tool schemas for Cloud Code Assist (openclaw#567) (thanks @…
74ec0c6 
…erikpr1994)
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
fix: scrub tool schemas for Cloud Code Assist (openclaw#567) (thanks @…
d683960 
…erikpr1994)
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
fix: avoid invalid UTF-16 in truncation (openclaw#567)
4c164a2
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
fix: avoid Windows runner unicode crash (openclaw#567)
505e4ef
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
test: sanitize Windows CI output (openclaw#567)
833efe1
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
test: sanitize Windows CI buffer output (openclaw#567) (thanks @erikp…
dabc03c 
…r1994)
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
test: harden Windows CI output sanitization (openclaw#567) (thanks @e…
915d11f 
…rikpr1994)
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
test: sanitize Windows CI vitest runner output (openclaw#567) (thanks @…
7a820aa 
…erikpr1994)
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
fix: rebase onto main + restore build/lint (openclaw#567) (thanks @er…
384f43b 
…ikpr1994)
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
test: stabilize Windows test env (openclaw#567) (thanks @erikpr1994)
2dc562a
lovewanwan pushed a commit to lovewanwan/openclaw that referenced this pull request Apr 28, 2026
@steipete
Merge pull request openclaw#567 from erikpr1994/fix/gemini-schema-san…
5e149ef 
…itization

fix(agents): remove unsupported JSON Schema keywords for Cloud Code Assist API
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
fix: scrub tool schemas for Cloud Code Assist (openclaw#567) (thanks @…
86eb6eb 
…erikpr1994)
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
fix: avoid invalid UTF-16 in truncation (openclaw#567)
876e655
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
fix: avoid Windows runner unicode crash (openclaw#567)
0c14e9e
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
test: sanitize Windows CI output (openclaw#567)
484d91e
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
test: sanitize Windows CI buffer output (openclaw#567) (thanks @erikp…
d6a15eb 
…r1994)
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
test: harden Windows CI output sanitization (openclaw#567) (thanks @e…
7657cb6 
…rikpr1994)
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
test: sanitize Windows CI vitest runner output (openclaw#567) (thanks @…
eb9fd71 
…erikpr1994)
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
fix: rebase onto main + restore build/lint (openclaw#567) (thanks @er…
747b2f2 
…ikpr1994)
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
test: stabilize Windows test env (openclaw#567) (thanks @erikpr1994)
5319f5f
github-actions Bot pushed a commit to Desicool/openclaw that referenced this pull request May 9, 2026
@steipete
Merge pull request openclaw#567 from erikpr1994/fix/gemini-schema-san…
52ea698 
…itization

fix(agents): remove unsupported JSON Schema keywords for Cloud Code Assist API
jameslcowan pushed a commit to jameslcowan/openclaw that referenced this pull request Jun 2, 2026
@steipete
fix: scrub tool schemas for Cloud Code Assist (openclaw#567) (thanks @…
4071cfe 
…erikpr1994)
@clawsweeper clawsweeper Bot mentioned this pull request Jun 25, 2026
Merged
@clawsweeper clawsweeper Bot mentioned this pull request Jul 9, 2026
Closed
@lisheguo lisheguo mentioned this pull request Jul 24, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@erikpr1994 @steipete