Merge branch 'mark3labs:main' into main

Author: kagezhao

examples/everything/main.go

@@ -32,25 +32,25 @@ func NewMCPServer() *server.MCPServer {
 
 	hooks := &server.Hooks{}
 
-	hooks.AddBeforeAny(func(id any, method mcp.MCPMethod, message any) {
+	hooks.AddBeforeAny(func(ctx context.Context, id any, method mcp.MCPMethod, message any) {
 		fmt.Printf("beforeAny: %s, %v, %v\n", method, id, message)
 	})
-	hooks.AddOnSuccess(func(id any, method mcp.MCPMethod, message any, result any) {
+	hooks.AddOnSuccess(func(ctx context.Context, id any, method mcp.MCPMethod, message any, result any) {
 		fmt.Printf("onSuccess: %s, %v, %v, %v\n", method, id, message, result)
 	})
-	hooks.AddOnError(func(id any, method mcp.MCPMethod, message any, err error) {
+	hooks.AddOnError(func(ctx context.Context, id any, method mcp.MCPMethod, message any, err error) {
 		fmt.Printf("onError: %s, %v, %v, %v\n", method, id, message, err)
 	})
-	hooks.AddBeforeInitialize(func(id any, message *mcp.InitializeRequest) {
+	hooks.AddBeforeInitialize(func(ctx context.Context, id any, message *mcp.InitializeRequest) {
 		fmt.Printf("beforeInitialize: %v, %v\n", id, message)
 	})
-	hooks.AddAfterInitialize(func(id any, message *mcp.InitializeRequest, result *mcp.InitializeResult) {
+	hooks.AddAfterInitialize(func(ctx context.Context, id any, message *mcp.InitializeRequest, result *mcp.InitializeResult) {
 		fmt.Printf("afterInitialize: %v, %v, %v\n", id, message, result)
 	})
-	hooks.AddAfterCallTool(func(id any, message *mcp.CallToolRequest, result *mcp.CallToolResult) {
+	hooks.AddAfterCallTool(func(ctx context.Context, id any, message *mcp.CallToolRequest, result *mcp.CallToolResult) {
 		fmt.Printf("afterCallTool: %v, %v, %v\n", id, message, result)
 	})
-	hooks.AddBeforeCallTool(func(id any, message *mcp.CallToolRequest) {
+	hooks.AddBeforeCallTool(func(ctx context.Context, id any, message *mcp.CallToolRequest) {
 		fmt.Printf("beforeCallTool: %v, %v\n", id, message)
 	})
 

mcp/tools.go

@@ -305,11 +305,7 @@ func WithBoolean(name string, opts ...PropertyOption) ToolOption {
 		// Remove required from property schema and add to InputSchema.required
 		if required, ok := schema["required"].(bool); ok && required {
 			delete(schema, "required")
-			if t.InputSchema.Required == nil {
-				t.InputSchema.Required = []string{name}
-			} else {
-				t.InputSchema.Required = append(t.InputSchema.Required, name)
-			}
+			t.InputSchema.Required = append(t.InputSchema.Required, name)
 		}
 
 		t.InputSchema.Properties[name] = schema
@@ -331,11 +327,7 @@ func WithNumber(name string, opts ...PropertyOption) ToolOption {
 		// Remove required from property schema and add to InputSchema.required
 		if required, ok := schema["required"].(bool); ok && required {
 			delete(schema, "required")
-			if t.InputSchema.Required == nil {
-				t.InputSchema.Required = []string{name}
-			} else {
-				t.InputSchema.Required = append(t.InputSchema.Required, name)
-			}
+			t.InputSchema.Required = append(t.InputSchema.Required, name)
 		}
 
 		t.InputSchema.Properties[name] = schema
@@ -357,11 +349,7 @@ func WithString(name string, opts ...PropertyOption) ToolOption {
 		// Remove required from property schema and add to InputSchema.required
 		if required, ok := schema["required"].(bool); ok && required {
 			delete(schema, "required")
-			if t.InputSchema.Required == nil {
-				t.InputSchema.Required = []string{name}
-			} else {
-				t.InputSchema.Required = append(t.InputSchema.Required, name)
-			}
+			t.InputSchema.Required = append(t.InputSchema.Required, name)
 		}
 
 		t.InputSchema.Properties[name] = schema
@@ -384,11 +372,7 @@ func WithObject(name string, opts ...PropertyOption) ToolOption {
 		// Remove required from property schema and add to InputSchema.required
 		if required, ok := schema["required"].(bool); ok && required {
 			delete(schema, "required")
-			if t.InputSchema.Required == nil {
-				t.InputSchema.Required = []string{name}
-			} else {
-				t.InputSchema.Required = append(t.InputSchema.Required, name)
-			}
+			t.InputSchema.Required = append(t.InputSchema.Required, name)
 		}
 
 		t.InputSchema.Properties[name] = schema
@@ -410,11 +394,7 @@ func WithArray(name string, opts ...PropertyOption) ToolOption {
 		// Remove required from property schema and add to InputSchema.required
 		if required, ok := schema["required"].(bool); ok && required {
 			delete(schema, "required")
-			if t.InputSchema.Required == nil {
-				t.InputSchema.Required = []string{name}
-			} else {
-				t.InputSchema.Required = append(t.InputSchema.Required, name)
-			}
+			t.InputSchema.Required = append(t.InputSchema.Required, name)
 		}
 
 		t.InputSchema.Properties[name] = schema