Skip to content

fix: treat null MCP resource args as empty #8917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tibo-openai merged 1 commit into from
Jan 9, 2026
Merged

fix: treat null MCP resource args as empty #8917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions codex-rs/core/src/tools/handlers/mcp_resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,9 +640,14 @@ fn parse_arguments(raw_args: &str) -> Result<Option<Value>, FunctionCallError> {
if raw_args.trim().is_empty() {
Ok(None)
} else {
serde_json::from_str(raw_args).map(Some).map_err(|err| {
let value: Value = serde_json::from_str(raw_args).map_err(|err| {
FunctionCallError::RespondToModel(format!("failed to parse function arguments: {err}"))
})
})?;
if value.is_null() {
Ok(None)
} else {
Ok(Some(value))
}
}
}

Expand Down Expand Up @@ -769,6 +774,11 @@ mod tests {
"expected None for empty arguments"
);

assert!(
parse_arguments("null").unwrap().is_none(),
"expected None for null arguments"
);

let value = parse_arguments(r#"{"server":"figma"}"#)
.expect("parse json")
.expect("value present");
Expand Down
Loading