Fix McpTask double-wrapping when tool returns its own task

Fix McpTask double-wrapping when tool returns its own task #2636