fix: update webchat persona handling to avoid default assignment for None

astrbot/core/astr_agent_run_util.py

@@ -54,14 +54,6 @@ async def run_agent(
                     return
                 if resp.type == "tool_call_result":
                     msg_chain = resp.data["chain"]
-
-                    astr_event.trace.record(
-                        "agent_tool_result",
-                        tool_result=msg_chain.get_plain_text(
-                            with_other_comps_mark=True
-                        ),
-                    )
-
                     if msg_chain.type == "tool_direct_result":
                         # tool_direct_result 用于标记 llm tool 需要直接发送给用户的内容
                         await astr_event.send(msg_chain)
@@ -75,22 +67,12 @@ async def run_agent(
                         # 用来标记流式响应需要分节
                         yield MessageChain(chain=[], type="break")
 
-                    tool_info = None
-
-                    if resp.data["chain"].chain:
-                        json_comp = resp.data["chain"].chain[0]
-                        if isinstance(json_comp, Json):
-                            tool_info = json_comp.data
-                        astr_event.trace.record(
-                            "agent_tool_call",
-                            tool_name=tool_info if tool_info else "unknown",
-                        )
-
                     if astr_event.get_platform_name() == "webchat":
                         await astr_event.send(resp.data["chain"])
                     elif show_tool_use:
-                        if tool_info:
-                            m = f"🔨 调用工具: {tool_info.get('name', 'unknown')}"
+                        json_comp = resp.data["chain"].chain[0]
+                        if isinstance(json_comp, Json):
+                            m = f"🔨 调用工具: {json_comp.data.get('name')}"
                         else:
                             m = "🔨 调用工具..."
                         chain = MessageChain(type="tool_call").message(m)

astrbot/core/astr_main_agent.py

@@ -19,7 +19,6 @@ from astrbot.core.astr_agent_hooks import MAIN_AGENT_HOOKS
 from astrbot.core.astr_agent_run_util import AgentRunner
 from astrbot.core.astr_agent_tool_exec import FunctionToolExecutor
 from astrbot.core.astr_main_agent_resources import (
-    CHATUI_EXTRA_PROMPT,
     CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT,
     EXECUTE_SHELL_TOOL,
     FILE_DOWNLOAD_TOOL,
@@ -259,6 +258,8 @@ async def _ensure_persona_and_skills(
         return
 
     # get persona ID
+
+    # 1. from session service config - highest priority
     persona_id = (
         await sp.get_async(
             scope="umo",
@@ -269,14 +270,15 @@ async def _ensure_persona_and_skills(
     ).get("persona_id")
 
     if not persona_id:
-        persona_id = req.conversation.persona_id or cfg.get("default_personality")
-        if persona_id is None or persona_id != "[%None]":
-            default_persona = plugin_context.persona_manager.selected_default_persona_v3
-            if default_persona:
-                persona_id = default_persona["name"]
-                if event.get_platform_name() == "webchat":
-                    persona_id = "_chatui_default_"
-                    req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
+        # 2. from conversation setting - second priority
+        persona_id = req.conversation.persona_id
+
+        if persona_id == "[%None]":
+            # explicitly set to no persona
+            pass
+        elif persona_id is None:
+            # 3. from config default persona setting - last priority
+            persona_id = cfg.get("default_personality")
 
     persona = next(
         builtins.filter(
@@ -291,6 +293,11 @@ async def _ensure_persona_and_skills(
             req.system_prompt += f"\n# Persona Instructions\n\n{prompt}\n"
         if begin_dialogs := copy.deepcopy(persona.get("_begin_dialogs_processed")):
             req.contexts[:0] = begin_dialogs
+    else:
+        # special handling for webchat persona
+        if event.get_platform_name() == "webchat" and persona_id != "[%None]":
+            persona_id = "_chatui_default_"
+            req.system_prompt += CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT
 
     # Inject skills prompt
     skills_cfg = cfg.get("skills", {})
@@ -931,7 +938,6 @@ async def build_main_agent(
 
     if event.get_platform_name() == "webchat":
         asyncio.create_task(_handle_webchat(event, req, provider))
-        req.system_prompt += f"\n{CHATUI_EXTRA_PROMPT}\n"
 
     if req.func_tool and req.func_tool.tools:
         tool_prompt = (

astrbot/core/astr_main_agent_resources.py

@@ -78,9 +78,6 @@ CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT = (
     "You listen more than you speak, respect uncertainty, avoid forcing quick conclusions or grand narratives, "
     "and prefer clear, restrained language over unnecessary emotional embellishment. At your core, you value "
     "empathy, clarity, autonomy, and meaning, favoring steady, sustainable progress over judgment or dramatic leaps."
-)
-
-CHATUI_EXTRA_PROMPT = (
     'When you answered, you need to add a follow up question / summarization but do not add "Follow up" words. '
     "Such as, user asked you to generate codes, you can add: Do you need me to run these codes for you?"
 )

astrbot/core/config/default.py

@@ -202,7 +202,6 @@ DEFAULT_CONFIG = {
     "log_file_enable": False,
     "log_file_path": "logs/astrbot.log",
     "log_file_max_mb": 20,
-    "trace_enable": False,
     "trace_log_enable": False,
     "trace_log_path": "logs/astrbot.trace.log",
     "trace_log_max_mb": 20,

astrbot/core/event_bus.py

@@ -54,6 +54,7 @@ class EventBus:
             event (AstrMessageEvent): 事件对象
 
         """
+        event.trace.record("event_dispatch", config_name=conf_name)
         # 如果有发送者名称: [平台名] 发送者名称/发送者ID: 消息概要
         if event.get_sender_name():
             logger.info(

astrbot/core/message/message_event_result.py

@@ -9,7 +9,6 @@ from astrbot.core.message.components import (
     AtAll,
     BaseMessageComponent,
     Image,
-    Json,
     Plain,
 )
 
@@ -118,26 +117,9 @@ class MessageChain:
         self.use_t2i_ = use_t2i
         return self
 
-    def get_plain_text(self, with_other_comps_mark: bool = False) -> str:
-        """获取纯文本消息。这个方法将获取 chain 中所有 Plain 组件的文本并拼接成一条消息。空格分隔。
-
-        Args:
-            with_other_comps_mark (bool): 是否在纯文本中标记其他组件的位置
-        """
-        if not with_other_comps_mark:
-            return " ".join(
-                [comp.text for comp in self.chain if isinstance(comp, Plain)]
-            )
-        else:
-            texts = []
-            for comp in self.chain:
-                if isinstance(comp, Plain):
-                    texts.append(comp.text)
-                elif isinstance(comp, Json):
-                    texts.append(f"{comp.data}")
-                else:
-                    texts.append(f"[{comp.__class__.__name__}]")
-            return " ".join(texts)
+    def get_plain_text(self) -> str:
+        """获取纯文本消息。这个方法将获取 chain 中所有 Plain 组件的文本并拼接成一条消息。空格分隔。"""
+        return " ".join([comp.text for comp in self.chain if isinstance(comp, Plain)])
 
     def squash_plain(self):
         """将消息链中的所有 Plain 消息段聚合到第一个 Plain 消息段中。"""

astrbot/core/pipeline/scheduler.py

@@ -85,4 +85,6 @@ class PipelineScheduler:
         if isinstance(event, WebChatMessageEvent | WecomAIBotMessageEvent):
             await event.send(None)
 
+        event.trace.record("event_end")
+
         logger.debug("pipeline 执行完毕。")

astrbot/core/platform/astr_message_event.py

@@ -73,6 +73,9 @@ class AstrMessageEvent(abc.ABC):
         self.span = self.trace
         """事件级 TraceSpan(别名: span)"""
 
+        self.trace.record("umo", umo=self.unified_msg_origin)
+        self.trace.record("event_created", created_at=self.created_at)
+
         self._has_send_oper = False
         """在此次事件中是否有过至少一次发送消息的操作"""
         self.call_llm = False

astrbot/core/utils/trace.py

@@ -50,10 +50,6 @@ class TraceSpan:
         self.started_at = time.time()
 
     def record(self, action: str, **fields: Any) -> None:
-        # Check if trace recording is enabled
-        if not astrbot_config.get("trace_enable", True):
-            return
-
         payload = {
             "type": "trace",
             "level": "TRACE",

astrbot/dashboard/routes/log.py

@@ -31,16 +31,6 @@ class LogRoute(Route):
             view_func=self.log_history,
             methods=["GET"],
         )
-        self.app.add_url_rule(
-            "/api/trace/settings",
-            view_func=self.get_trace_settings,
-            methods=["GET"],
-        )
-        self.app.add_url_rule(
-            "/api/trace/settings",
-            view_func=self.update_trace_settings,
-            methods=["POST"],
-        )
 
     async def _replay_cached_logs(
         self, last_event_id: str
@@ -116,29 +106,3 @@ class LogRoute(Route):
         except Exception as e:
             logger.error(f"获取日志历史失败: {e}")
             return Response().error(f"获取日志历史失败: {e}").__dict__
-
-    async def get_trace_settings(self):
-        """获取 Trace 设置"""
-        try:
-            trace_enable = self.config.get("trace_enable", True)
-            return Response().ok(data={"trace_enable": trace_enable}).__dict__
-        except Exception as e:
-            logger.error(f"获取 Trace 设置失败: {e}")
-            return Response().error(f"获取 Trace 设置失败: {e}").__dict__
-
-    async def update_trace_settings(self):
-        """更新 Trace 设置"""
-        try:
-            data = await request.json
-            if data is None:
-                return Response().error("请求数据为空").__dict__
-
-            trace_enable = data.get("trace_enable")
-            if trace_enable is not None:
-                self.config["trace_enable"] = bool(trace_enable)
-                self.config.save_config()
-
-            return Response().ok(message="Trace 设置已更新").__dict__
-        except Exception as e:
-            logger.error(f"更新 Trace 设置失败: {e}")
-            return Response().error(f"更新 Trace 设置失败: {e}").__dict__

dashboard/src/i18n/locales/en-US/features/trace.json

@@ -3,8 +3,5 @@
   "autoScroll": {
     "enabled": "Auto-scroll: On",
     "disabled": "Auto-scroll: Off"
-  },
-  "hint": "Currently only recording partial model call paths from AstrBot main Agent. More coverage will be added.",
-  "recording": "Recording",
-  "paused": "Paused"
+  }
 }

dashboard/src/i18n/locales/zh-CN/features/trace.json

@@ -3,8 +3,5 @@
   "autoScroll": {
     "enabled": "自动滚动：开",
     "disabled": "自动滚动：关"
-  },
-  "hint": "当前仅记录部分 AstrBot 主 Agent 的模型调用路径，后续会不断完善。",
-  "recording": "记录中",
-  "paused": "已暂停"
+  }
 }

dashboard/src/views/TracePage.vue

@@ -1,72 +1,13 @@
 <script setup>
 import TraceDisplayer from '@/components/shared/TraceDisplayer.vue';
 import { useModuleI18n } from '@/i18n/composables';
-import { ref, onMounted } from 'vue';
-import axios from 'axios';
 
 const { tm } = useModuleI18n('features/trace');
-
-const traceEnabled = ref(true);
-const loading = ref(false);
-const traceDisplayerKey = ref(0);
-
-const fetchTraceSettings = async () => {
-  try {
-    const res = await axios.get('/api/trace/settings');
-    if (res.data?.status === 'ok') {
-      traceEnabled.value = res.data.data?.trace_enable ?? true;
-    }
-  } catch (err) {
-    console.error('Failed to fetch trace settings:', err);
-  }
-};
-
-const updateTraceSettings = async () => {
-  loading.value = true;
-  try {
-    await axios.post('/api/trace/settings', {
-      trace_enable: traceEnabled.value
-    });
-    // Refresh the TraceDisplayer component to reconnect SSE
-    traceDisplayerKey.value += 1;
-  } catch (err) {
-    console.error('Failed to update trace settings:', err);
-  } finally {
-    loading.value = false;
-  }
-};
-
-onMounted(() => {
-  fetchTraceSettings();
-});
 </script>
 
 <template>
-  <div style="height: 100%; display: flex; flex-direction: column;">
-    <div class="trace-header">
-      <div class="trace-info">
-        <v-icon size="small" color="info" class="mr-2">mdi-information-outline</v-icon>
-        <span class="trace-hint">{{ tm('hint') }}</span>
-      </div>
-      <div class="trace-controls">
-        <v-switch
-          v-model="traceEnabled"
-          :loading="loading"
-          :disabled="loading"
-          color="primary"
-          hide-details
-          density="compact"
-          @update:model-value="updateTraceSettings"
-        >
-          <template #label>
-            <span class="switch-label">{{ traceEnabled ? tm('recording') : tm('paused') }}</span>
-          </template>
-        </v-switch>
-      </div>
-    </div>
-    <div style="flex: 1; min-height: 0;">
-      <TraceDisplayer :key="traceDisplayerKey" />
-    </div>
+  <div style="height: 100%;">
+    <TraceDisplayer />
   </div>
 </template>
 
@@ -78,38 +19,3 @@ export default {
   }
 };
 </script>
-
-<style scoped>
-.trace-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 12px 16px;
-  background: rgba(59, 130, 246, 0.05);
-  border-bottom: 1px solid rgba(59, 130, 246, 0.1);
-  border-radius: 8px 8px 0 0;
-  margin-bottom: 8px;
-}
-
-.trace-info {
-  display: flex;
-  align-items: center;
-}
-
-.trace-hint {
-  font-size: 13px;
-  color: #6b7280;
-}
-
-.trace-controls {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.switch-label {
-  font-size: 13px;
-  color: #4b5563;
-  white-space: nowrap;
-}
-</style>