Skip to content

fix CallToolResult json marshaling and unmarshaling: need structuredC… #523

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
merged 8 commits into from
Aug 11, 2025
Merged

fix CallToolResult json marshaling and unmarshaling: need structuredC… #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8dd3148
fix CallToolResult json marshaling and unmarshaling: need structuredC…
sunfuze Jul 31, 2025
c18539b
Merge branch 'mark3labs:main' into fix-callresponse-marhsal
sunfuze Aug 1, 2025
1314f4f
golang json use float to store number type
sunfuze Aug 7, 2025
b50c30c
Merge branch 'mark3labs:main' into fix-callresponse-marhsal
sunfuze Aug 8, 2025
0ba984a
fix unittest: use NewMetaFromMap to create Result.Meta
sunfuze Aug 8, 2025
36d32f9
mcptest: add a test case to response stuctured content
sunfuze Aug 8, 2025
6bdac1e
move after TestServerWithTool
sunfuze Aug 8, 2025
d821d49
fix unittest: no need check meta
sunfuze Aug 11, 2025
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
10 changes: 10 additions & 0 deletions mcp/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,11 @@ func (r CallToolResult) MarshalJSON() ([]byte, error) {
}
m["content"] = content

// Marshal StructuredContent if present
if r.StructuredContent != nil {
m["structuredContent"] = r.StructuredContent
}

// Marshal IsError if true
if r.IsError {
m["isError"] = r.IsError
Expand Down Expand Up @@ -526,6 +531,11 @@ func (r *CallToolResult) UnmarshalJSON(data []byte) error {
}
}

// Unmarshal StructuredContent if present
if structured, ok := raw["structuredContent"]; ok {
r.StructuredContent = structured
}

// Unmarshal IsError
if isError, ok := raw["isError"]; ok {
if isErrorBool, ok := isError.(bool); ok {
Expand Down
Loading