fix: use helper functions

Author: pottekkat

client/inprocess_test.go

@@ -22,13 +22,11 @@ func TestInProcessMCPClient(t *testing.T) {
 		"test-tool",
 		mcp.WithDescription("Test tool"),
 		mcp.WithString("parameter-1", mcp.Description("A string tool parameter")),
-		mcp.WithToolAnnotation(
-			"Test Tool Annotation Title",
-			true,
-			false,
-			true,
-			false,
-		),
+		mcp.WithTitleAnnotation("Test Tool Annotation Title"),
+		mcp.WithReadOnlyHintAnnotation(true),
+		mcp.WithDestructiveHintAnnotation(false),
+		mcp.WithIdempotentHintAnnotation(true),
+		mcp.WithOpenWorldHintAnnotation(false),
 	), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{

client/sse_test.go

@@ -26,13 +26,11 @@ func TestSSEMCPClient(t *testing.T) {
 		"test-tool",
 		mcp.WithDescription("Test tool"),
 		mcp.WithString("parameter-1", mcp.Description("A string tool parameter")),
-		mcp.WithToolAnnotation(
-			"Test Tool Annotation Title",
-			true,
-			false,
-			true,
-			false,
-		),
+		mcp.WithTitleAnnotation("Test Tool Annotation Title"),
+		mcp.WithReadOnlyHintAnnotation(true),
+		mcp.WithDestructiveHintAnnotation(false),
+		mcp.WithIdempotentHintAnnotation(true),
+		mcp.WithOpenWorldHintAnnotation(false),
 	), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{

mcp/tools.go

@@ -208,18 +208,49 @@ func WithDescription(description string) ToolOption {
 }
 
 // WithToolAnnotation adds optional hints about the Tool.
-func WithToolAnnotation(
-	title string,
-	readOnlyHint, destructiveHint, idempotentHint, openWorldHint bool,
-) ToolOption {
+func WithToolAnnotation(annotation ToolAnnotation) ToolOption {
 	return func(t *Tool) {
-		t.Annotations = ToolAnnotation{
-			Title:           title,
-			ReadOnlyHint:    &readOnlyHint,
-			DestructiveHint: &destructiveHint,
-			IdempotentHint:  &idempotentHint,
-			OpenWorldHint:   &openWorldHint,
-		}
+		t.Annotations = annotation
+	}
+}
+
+// WithTitleAnnotation sets the Title field of the Tool's Annotations.
+// It provides a human-readable title for the tool.
+func WithTitleAnnotation(title string) ToolOption {
+	return func(t *Tool) {
+		t.Annotations.Title = title
+	}
+}
+
+// WithReadOnlyHintAnnotation sets the ReadOnlyHint field of the Tool's Annotations.
+// If true, it indicates the tool does not modify its environment.
+func WithReadOnlyHintAnnotation(value bool) ToolOption {
+	return func(t *Tool) {
+		t.Annotations.ReadOnlyHint = &value
+	}
+}
+
+// WithDestructiveHintAnnotation sets the DestructiveHint field of the Tool's Annotations.
+// If true, it indicates the tool may perform destructive updates.
+func WithDestructiveHintAnnotation(value bool) ToolOption {
+	return func(t *Tool) {
+		t.Annotations.DestructiveHint = &value
+	}
+}
+
+// WithIdempotentHintAnnotation sets the IdempotentHint field of the Tool's Annotations.
+// If true, it indicates repeated calls with the same arguments have no additional effect.
+func WithIdempotentHintAnnotation(value bool) ToolOption {
+	return func(t *Tool) {
+		t.Annotations.IdempotentHint = &value
+	}
+}
+
+// WithOpenWorldHintAnnotation sets the OpenWorldHint field of the Tool's Annotations.
+// If true, it indicates the tool interacts with external entities.
+func WithOpenWorldHintAnnotation(value bool) ToolOption {
+	return func(t *Tool) {
+		t.Annotations.OpenWorldHint = &value
 	}
 }