diff --git a/lib/data/models/appconfig_model.g.dart b/lib/data/models/appconfig_model.g.dart
index ffb7f58b8..c4ac4cc90 100644
--- a/lib/data/models/appconfig_model.g.dart
+++ b/lib/data/models/appconfig_model.g.dart
@@ -57,7 +57,7 @@ Map<String, dynamic> _$DBAgentToJson(DBAgent instance) => <String, dynamic>{
 DBMCPServer _$DBMCPServerFromJson(Map<String, dynamic> json) => DBMCPServer(
       servername: json['servername'] as String,
       url: json['url'] as String,
-      tools: json['tools'] as String,
+      tools: json['tools'] as String? ?? '',
     );
 
 Map<String, dynamic> _$DBMCPServerToJson(DBMCPServer instance) =>
diff --git a/lib/modules/agent/views/music_card.dart b/lib/modules/agent/views/music_card.dart
index 75080b65f..27bedf078 100644
--- a/lib/modules/agent/views/music_card.dart
+++ b/lib/modules/agent/views/music_card.dart
@@ -16,6 +16,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
     'artist': singer,
     'coverUrl': image,
   };
+  controller.musicStatus(); //刷新状态
   return Container(
     padding: const EdgeInsets.all(14),
     decoration: BoxDecoration(
@@ -81,7 +82,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
         ),
         Obx(() {
           final isThisPlaying =
-              controller.isPlaying.value && controller.currentUrl.value == url;
+              controller.isPlaying.value && controller.currentId.value == id;
 
           // 只有当前播放的歌曲才显示进度
           final currentProgress =
@@ -97,7 +98,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
             onPlayPause: () async {
               try {
                 if (controller.isPlaying.value) {
-                  if (controller.currentUrl.value == url) {
+                  if (controller.currentId.value == id) {
                     // 当前歌曲正在播放，暂停它
                     await controller.musicPause();
                   } else {
@@ -105,7 +106,7 @@ Widget buildMusicItem(BuildContext context, int id, String name, String url,
                     await controller.musicPlay(song);
                   }
                 } else {
-                  if (controller.currentUrl.value == url) {
+                  if (controller.currentid.value == id) {
                     // 当前歌曲已暂停，恢复播放
                     await controller.musicResume();
                   } else {
diff --git a/lib/modules/music/views/music_playlist_view.dart b/lib/modules/music/views/music_playlist_view.dart
index 127eb5786..1214f6105 100644
--- a/lib/modules/music/views/music_playlist_view.dart
+++ b/lib/modules/music/views/music_playlist_view.dart
@@ -162,7 +162,7 @@ class MusicPlaylistView extends StatelessWidget {
           // 播放按钮
           Obx(() {
             final isThisPlaying =
-                controller.isPlaying.value && controller.currentUrl.value == url;
+                controller.isPlaying.value && controller.currentId.value == url;
             
             // 只有当前播放的歌曲才显示进度
             final currentProgress = isThisPlaying ? controller.progress.value : 0.0;
@@ -177,13 +177,13 @@ class MusicPlaylistView extends StatelessWidget {
               onPlayPause: () async {
                 try {
                   if (controller.isPlaying.value) {
-                    if (controller.currentUrl.value == url) {
+                    if (controller.currentId.value == id) {
                       await controller.musicPause();
                     } else {
                       await controller.musicPlay(song);
                     }
                   } else {
-                    if (controller.currentUrl.value == url) {
+                    if (controller.currentId.value == Id) {
                       await controller.musicResume();
                     } else {
                       await controller.musicPlay(song);