From c2f78082b71b7251dd49a8a93d29bedab412cd1c Mon Sep 17 00:00:00 2001
From: tt-P607 <68868379+tt-P607@users.noreply.github.com>
Date: Sun, 21 Sep 2025 07:22:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(chat):=20=E4=BF=AE=E5=A4=8D=20plan=20execut?=
 =?UTF-8?q?or=20=E5=AF=B9=E5=B5=8C=E5=A5=97=20user=5Finfo=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E7=9A=84=E8=A7=A3=E6=9E=90=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`action_message` 可能以对象或字典的形式出现，且用户信息统一嵌套在 `user_info` 字段下。

旧代码在处理字典格式时，未能正确处理此嵌套结构，导致无法正确解析用户信息。本次修改统一了逻辑，确保在两种情况下都能稳定地从 `user_info` 中提取用户ID和昵称，增强了代码的健壮性。
---
 src/chat/planner_actions/plan_executor.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/chat/planner_actions/plan_executor.py b/src/chat/planner_actions/plan_executor.py
index 009250ccd..e8bf9fdf8 100644
--- a/src/chat/planner_actions/plan_executor.py
+++ b/src/chat/planner_actions/plan_executor.py
@@ -126,7 +126,13 @@ class PlanExecutor:
         try:
             logger.info(f"执行回复动作: {action_info.action_type}, 原因: {action_info.reasoning}")
 
-            if action_info.action_message.user_info.user_id == str(global_config.bot.qq_account):
+            # 获取用户ID - 兼容对象和字典
+            if hasattr(action_info.action_message, "user_info"):
+                user_id = action_info.action_message.user_info.user_id
+            else:
+                user_id = action_info.action_message.get("user_info", {}).get("user_id")
+
+            if user_id == str(global_config.bot.qq_account):
                 logger.warning("尝试回复自己，跳过此动作以防止死循环。")
                 return {
                     "action_type": action_info.action_type,
@@ -246,15 +252,17 @@ class PlanExecutor:
                 return
 
             # 获取用户信息 - 处理对象和字典两种情况
-            if hasattr(action_info.action_message, "user_id"):
+            if hasattr(action_info.action_message, "user_info"):
                 # 对象情况
-                user_id = action_info.action_message.user_id
-                user_name = getattr(action_info.action_message, "user_nickname", user_id) or user_id
-                user_message = getattr(action_info.action_message, "content", "")
+                user_info = action_info.action_message.user_info
+                user_id = user_info.user_id
+                user_name = user_info.user_nickname or user_id
+                user_message = action_info.action_message.content
             else:
                 # 字典情况
-                user_id = action_info.action_message.get("user_id", "")
-                user_name = action_info.action_message.get("user_nickname", user_id) or user_id
+                user_info = action_info.action_message.get("user_info", {})
+                user_id = user_info.get("user_id")
+                user_name = user_info.get("user_nickname") or user_id
                 user_message = action_info.action_message.get("content", "")
 
             if not user_id: