fix(agents): skip tool calls without valid name on model switch by guang384 · Pull Request #43985 · openclaw/openclaw

guang384 · 2026-03-12T11:26:55Z

Summary

Problem

When switching between models (e.g., Gemini → Grok → Gemini), the context may contain function_response entries that were valid for the previous model but cause errors for Gemini API with:

INVALID_ARGUMENT: Name cannot be empty
GenerateContentRequest.contents[N].parts[0].function_response.name: Name cannot be empty

Root Cause

When switching models mid-session, the conversation history contains tool calls from the previous model. These may have different format requirements. Gemini API requires function_response.name to be non-empty, but other models may allow empty names.

Solution

Skip tool calls without valid name during message conversion in convertMessagesToInputItems(). This prevents the INVALID_ARGUMENT error from Gemini API.

Test

Configure Gemini Latest Flash
Switch to Grok mid-session
Switch back to Gemini Latest Flash
Send a message - should work without error

Fixes openclaw#43930 When switching between models (e.g., Gemini → Grok → Gemini), the context may contain function_response entries that were valid for the previous model but cause errors for Gemini API with 'Name cannot be empty'. This fix skips tool calls without valid name during message conversion, preventing the INVALID_ARGUMENT error from Gemini API. Related to PR openclaw#41173 which added stripRuntimeModelState() for session reset, but model switching is a different scenario that needs separate handling.

greptile-apps · 2026-03-12T11:29:33Z

Greptile Summary

This PR correctly completes the fix for the INVALID_ARGUMENT: Name cannot be empty Gemini error during model switches by addressing all three gaps identified in previous review rounds: orphaned function_call_output entries, the unreachable !callId guard, and missing regression tests.

Key changes:

Introduces a skippedCallIds: Map<string, boolean> in convertMessagesToInputItems() that records whether a given callId had a valid function_call emitted (true) or was skipped due to an empty name (false)
When a toolResult is processed, any callId mapped to false causes the corresponding function_call_output to be suppressed, eliminating the previously-orphaned entry
The delete on skip plus true-overwrite on valid emission correctly handles the edge case where the same callId is reused (first skipped, then valid) without blocking the legitimate output
Two focused tests are added: one for the empty-name function_call drop, and one verifying the paired function_call_output is also suppressed

Confidence Score: 4/5

Safe to merge — correctly suppresses both the function_call and its paired function_call_output for empty-name tool calls, with regression tests covering the core scenario.
The logic is sound across all traced cases (skipped call, valid call, ID reuse). All three issues raised in previous review threads are addressed. The one minor observation is that skippedCallIds.set(callId, true) for valid calls stores entries that are never evaluated on the true branch (since the only guard is === false), making those entries functionally inert — but this causes no behavioral difference and adds negligible overhead. No regressions are introduced for existing paths.
No files require special attention.

_{Last reviewed commit: 5be87be}

src/agents/openai-ws-stream.ts

guang384 · 2026-03-17T00:27:16Z

@codex review

chatgpt-codex-connector · 2026-03-17T00:32:12Z

Codex Review: Didn't find any major issues. 🎉

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

guang384 · 2026-03-17T00:40:47Z

@greptileai review

src/agents/openai-ws-stream.ts

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c1aaed1cdc

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/agents/openai-ws-stream.ts

guang384 · 2026-03-17T00:59:38Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1b9c24fd39

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/agents/openai-ws-stream.ts

src/agents/openai-ws-stream.test.ts

guang384 · 2026-03-17T01:17:34Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 557d3e9d91

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/agents/openai-ws-stream.ts

…id calls

guang384 · 2026-03-17T01:27:34Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 22c1c66023

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/agents/openai-ws-stream.ts

guang384 · 2026-03-17T01:40:08Z

@codex review

chatgpt-codex-connector · 2026-03-17T01:44:25Z

Codex Review: Didn't find any major issues. Can't wait for the next one!

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

guang384 · 2026-03-17T01:53:23Z

@greptileai review

openclaw-barnacle bot added agents Agent runtime and tooling size: XS labels Mar 12, 2026

greptile-apps bot reviewed Mar 12, 2026

View reviewed changes

src/agents/openai-ws-stream.ts Show resolved Hide resolved

This comment was marked as spam.

Sign in to view

fix: skip function_call_output with empty callId

9a9223f

greptile-apps bot reviewed Mar 17, 2026

View reviewed changes

src/agents/openai-ws-stream.ts Outdated Show resolved Hide resolved

src/agents/openai-ws-stream.ts Show resolved Hide resolved

guang384 added 2 commits March 17, 2026 08:46

fix: track skipped callIds to prevent orphaned function_call_output

8a906aa

test: add regression tests for empty name tool calls

c1aaed1

chatgpt-codex-connector bot reviewed Mar 17, 2026

View reviewed changes

src/agents/openai-ws-stream.ts Outdated Show resolved Hide resolved

fix: initialize skippedCallIds set

1b9c24f

chatgpt-codex-connector bot reviewed Mar 17, 2026

View reviewed changes

src/agents/openai-ws-stream.ts Outdated Show resolved Hide resolved

src/agents/openai-ws-stream.test.ts Outdated Show resolved Hide resolved

guang384 added 2 commits March 17, 2026 09:07

fix: hoist skippedCallIds to function scope

17e9ad4

fix: use correct role 'toolResult' in test

557d3e9

chatgpt-codex-connector bot reviewed Mar 17, 2026

View reviewed changes

src/agents/openai-ws-stream.ts Outdated Show resolved Hide resolved

fix: consume skippedCallId after matching to avoid blocking later val…

22c1c66

…id calls

chatgpt-codex-connector bot reviewed Mar 17, 2026

View reviewed changes

src/agents/openai-ws-stream.ts Outdated Show resolved Hide resolved

fix: use Map to track callId with function_call status

5be87be

Uh oh!

Conversation

guang384 commented Mar 12, 2026

Summary

Problem

Root Cause

Solution

Related

Test

Uh oh!

greptile-apps bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 4/5

Uh oh!

Uh oh!

This comment was marked as spam.

guang384 commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 17, 2026

Uh oh!

guang384 commented Mar 17, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

guang384 commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

guang384 commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

guang384 commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

guang384 commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 17, 2026

Uh oh!

guang384 commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

greptile-apps bot commented Mar 12, 2026 •

edited

Loading