Skip to content

new feat: tool annotation #158

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.

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 1 commit into from
Apr 16, 2025
Merged

Conversation

dugenkui03
Copy link
Collaborator

@dugenkui03 dugenkui03 commented Apr 16, 2025

  • Introduce

Tool annotations provide additional metadata about a tool’s behavior, helping clients understand how to present and manage tools. These annotations are hints that describe the nature and impact of a tool, but should not be relied upon for security decisions.

  • Definition, default value and demo
    image
    demo
// A read-only search tool
{
  name: "web_search",
  description: "Search the web for information",
  inputSchema: {
    type: "object",
    properties: {
      query: { type: "string" }
    },
    required: ["query"]
  },
  annotations: {
    title: "Web Search",
    readOnlyHint: true,
    openWorldHint: true
  }
}

Summary by CodeRabbit

  • New Features
    • Tools now include descriptive annotations, such as title and behavioral hints (e.g., read-only, destructive).
  • Tests
    • Updated tests to cover the new tool annotation fields.

Copy link
Contributor

coderabbitai bot commented Apr 16, 2025

Walkthrough

The changes introduce a new ToolAnnotation struct to encapsulate metadata about tools, including a title and four boolean behavioral hints. The Tool struct is extended with an Annotations field of this type. The NewTool constructor is updated to initialize this field with default values. A new functional option WithToolAnnotation() is added to set the annotations on a Tool instance. In the test suite, a Tool instance is updated to include specific annotation metadata. No other logic or control flow is modified.

Changes

Files/Paths Change Summary
mcp/tools.go Added ToolAnnotation struct; extended Tool struct with Annotations field; updated NewTool constructor to initialize default annotations; added WithToolAnnotation() functional option.
server/server_test.go Updated test to set the new Annotations field on a Tool instance with specific annotation metadata for testing.

Tip

⚡💬 Agentic Chat (Pro Plan, General Availability)
  • We're introducing multi-step agentic chat in review comments and issue comments, within and outside of PR's. This feature enhances review and issue discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments and add commits to existing pull requests.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 12df8ba and 67a5a26.

📒 Files selected for processing (2)
  • mcp/tools.go (4 hunks)
  • server/server_test.go (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • server/server_test.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • mcp/tools.go

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🔭 Outside diff range comments (2)
mcp/tools.go (2)

105-106: ⚠️ Potential issue

Missing annotations field in MarshalJSON.

The MarshalJSON method currently doesn't include the new Annotations field when serializing a Tool to JSON. This could lead to the annotations being lost during serialization.

Add the annotations field to the marshaled output:

func (t Tool) MarshalJSON() ([]byte, error) {
	// Create a map to build the JSON structure
	m := make(map[string]interface{}, 3)

	// Add the name and description
	m["name"] = t.Name
	if t.Description != "" {
		m["description"] = t.Description
	}

	// Determine which schema to use
	if t.RawInputSchema != nil {
		if t.InputSchema.Type != "" {
			return nil, fmt.Errorf("tool %s has both InputSchema and RawInputSchema set: %w", t.Name, errToolSchemaConflict)
		}
		m["inputSchema"] = t.RawInputSchema
	} else {
		// Use the structured InputSchema
		m["inputSchema"] = t.InputSchema
	}

+	// Add annotations if they have any non-default values
+	if t.Annotations.Title != "" || t.Annotations.ReadOnlyHint || !t.Annotations.DestructiveHint || 
+	   t.Annotations.IdempotentHint || !t.Annotations.OpenWorldHint {
+		m["annotations"] = t.Annotations
+	}

	return json.Marshal(m)
}

174-180: ⚠️ Potential issue

Missing annotations initialization in NewToolWithRawSchema.

The NewToolWithRawSchema function doesn't initialize the Annotations field with default values like NewTool does, which could lead to inconsistent behavior.

Add the default annotations:

func NewToolWithRawSchema(name, description string, schema json.RawMessage) Tool {
	tool := Tool{
		Name:           name,
		Description:    description,
		RawInputSchema: schema,
+		Annotations: ToolAnnotation{
+			Title:           "",
+			ReadOnlyHint:    false,
+			DestructiveHint: true,
+			IdempotentHint:  false,
+			OpenWorldHint:   true,
+		},
	}

	return tool
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8cdb6c6 and 82e3b7e.

📒 Files selected for processing (2)
  • mcp/tools.go (4 hunks)
  • server/server_test.go (1 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
server/server_test.go (1)
mcp/tools.go (2)
  • ToolAnnotation (114-125)
  • Title (217-221)
🔇 Additional comments (4)
mcp/tools.go (3)

76-77: New field for tool behavior metadata.

The addition of the Annotations field to the Tool struct provides a structured way to describe tool behavior characteristics, enhancing API clients' understanding of tool usage and side effects.


114-125: Well-structured tool annotation type.

The ToolAnnotation struct provides a robust set of behavioral hints that follow industry best practices for describing tool properties:

  • ReadOnlyHint - Safety indicator for tools that don't modify state
  • DestructiveHint - Warning flag for potentially dangerous operations
  • IdempotentHint - Important for retry behavior
  • OpenWorldHint - Indicates external system interaction

The use of omitempty for JSON tags is appropriate for these optional metadata fields.


150-156: Conservative default annotation values.

The default values for tool annotations take a security-first approach by assuming tools are potentially destructive (DestructiveHint: true) and interact with external systems (OpenWorldHint: true) by default.

server/server_test.go (1)

803-809: Test correctly uses the new tool annotations feature.

The test case has been properly updated to set the Annotations field on the test tool. The values configure it as a read-only tool that doesn't perform destructive operations or interact with external systems.

@dugenkui03 dugenkui03 force-pushed the patch-tool-annotation branch from 82e3b7e to 12df8ba Compare April 16, 2025 09:40
@dugenkui03 dugenkui03 force-pushed the patch-tool-annotation branch from 12df8ba to 67a5a26 Compare April 16, 2025 09:43
@ezynda3 ezynda3 merged commit 3fa49a8 into mark3labs:main Apr 16, 2025
2 checks passed
@StarpTech
Copy link
Contributor

Hi @dugenkui03 @ezynda3 quick feedback. For me annotations aren't properly marshaled. I don't see them on the go client.

@dugenkui03
Copy link
Collaborator Author

@StarpTech this will be fixed in #165

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy