feat(i18n): update session management translations and improve provider configuration handling

- Updated English and Chinese translations for session management, including "Unified Message Origin" and "Follow Config".
- Enhanced provider configuration options to include "Follow Config" as a selectable item.
- Removed unused clear buttons and refactored provider configuration saving logic to handle updates and deletions more efficiently.

astrbot/core/agent/mcp_client.py

@@ -345,6 +345,9 @@ class MCPClient:
 
     async def cleanup(self):
         """Clean up resources including old exit stacks from reconnections"""
+        # Set running_event first to unblock any waiting tasks
+        self.running_event.set()
+
         # Close current exit stack
         try:
             await self.exit_stack.aclose()
@@ -356,9 +359,6 @@ class MCPClient:
         # Just clear the list to release references
         self._old_exit_stacks.clear()
 
-        # Set running_event first to unblock any waiting tasks
-        self.running_event.set()
-
 
 class MCPTool(FunctionTool, Generic[TContext]):
     """A function tool that calls an MCP service."""

astrbot/core/config/default.py

@@ -4,7 +4,7 @@ import os
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.7.0"
+VERSION = "4.6.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 # 默认配置

astrbot/core/provider/manager.py

@@ -1,7 +1,7 @@
 import asyncio
 import traceback
 
-from astrbot.core import astrbot_config, logger, sp
+from astrbot.core import logger, sp
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.db import BaseDatabase
 
@@ -24,7 +24,6 @@ class ProviderManager:
         db_helper: BaseDatabase,
         persona_mgr: PersonaManager,
     ):
-        self.reload_lock = asyncio.Lock()
         self.persona_mgr = persona_mgr
         self.acm = acm
         config = acm.confs["default"]
@@ -227,7 +226,6 @@ class ProviderManager:
 
     async def load_provider(self, provider_config: dict):
         if not provider_config["enable"]:
-            logger.info(f"Provider {provider_config['id']} is disabled, skipping")
             return
         if provider_config.get("provider_type", "") == "agent_runner":
             return
@@ -436,46 +434,40 @@ class ProviderManager:
             )
 
     async def reload(self, provider_config: dict):
-        async with self.reload_lock:
-            await self.terminate_provider(provider_config["id"])
-            if provider_config["enable"]:
-                await self.load_provider(provider_config)
+        await self.terminate_provider(provider_config["id"])
+        if provider_config["enable"]:
+            await self.load_provider(provider_config)
 
-            # 和配置文件保持同步
-            self.providers_config = astrbot_config["provider"]
-            config_ids = [provider["id"] for provider in self.providers_config]
-            logger.info(f"providers in user's config: {config_ids}")
-            for key in list(self.inst_map.keys()):
-                if key not in config_ids:
-                    await self.terminate_provider(key)
+        # 和配置文件保持同步
+        config_ids = [provider["id"] for provider in self.providers_config]
+        logger.debug(f"providers in user's config: {config_ids}")
+        for key in list(self.inst_map.keys()):
+            if key not in config_ids:
+                await self.terminate_provider(key)
 
-            if len(self.provider_insts) == 0:
-                self.curr_provider_inst = None
-            elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
-                self.curr_provider_inst = self.provider_insts[0]
-                logger.info(
-                    f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
-                )
+        if len(self.provider_insts) == 0:
+            self.curr_provider_inst = None
+        elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
+            self.curr_provider_inst = self.provider_insts[0]
+            logger.info(
+                f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
+            )
 
-            if len(self.stt_provider_insts) == 0:
-                self.curr_stt_provider_inst = None
-            elif (
-                self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0
-            ):
-                self.curr_stt_provider_inst = self.stt_provider_insts[0]
-                logger.info(
-                    f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
-                )
+        if len(self.stt_provider_insts) == 0:
+            self.curr_stt_provider_inst = None
+        elif self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0:
+            self.curr_stt_provider_inst = self.stt_provider_insts[0]
+            logger.info(
+                f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
+            )
 
-            if len(self.tts_provider_insts) == 0:
-                self.curr_tts_provider_inst = None
-            elif (
-                self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0
-            ):
-                self.curr_tts_provider_inst = self.tts_provider_insts[0]
-                logger.info(
-                    f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
-                )
+        if len(self.tts_provider_insts) == 0:
+            self.curr_tts_provider_inst = None
+        elif self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0:
+            self.curr_tts_provider_inst = self.tts_provider_insts[0]
+            logger.info(
+                f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
+            )
 
     def get_insts(self):
         return self.provider_insts

changelogs/v4.7.0.md

@@ -1,18 +0,0 @@
-## What's Changed
-
-重构：
-- 将 Dify、Coze、阿里云百炼应用等 LLMOps 提供商迁移到 Agent 执行器层，理清和本地 Agent 执行器的边界
-- 将「会话管理」功能重构为「自定义规则」功能，理清和多配置文件功能的边界。详见：[自定义规则](https://docs.astrbot.app/use/custom-rules.html)
-
-优化：
-- Dify、阿里云百炼应用支持流式输出
-- 防止分段回复正则表达式解析错误导致消息不发送
-- 群聊上下文感知记录 At 信息
-- 优化模型提供商页面的测试提供商功能
-
-新增：
-- 支持在配置文件页面快速测试对话
-- 为配置文件配置项内容添加国际化支持
-
-修复：
-- 在更新 MCP Server 配置后，MCP 无法正常重启的问题

dashboard/src/components/chat/Chat.vue

@@ -84,7 +84,7 @@
                         v-model:prompt="prompt"
                         :stagedImagesUrl="stagedImagesUrl"
                         :stagedAudioUrl="stagedAudioUrl"
-                        :disabled="isStreaming"
+                        :disabled="isStreaming || isConvRunning"
                         :enableStreaming="enableStreaming"
                         :isRecording="isRecording"
                         :session-id="currSessionId || null"

dashboard/src/components/chat/StandaloneChat.vue

@@ -22,7 +22,7 @@
                         v-model:prompt="prompt"
                         :stagedImagesUrl="stagedImagesUrl"
                         :stagedAudioUrl="stagedAudioUrl"
-                        :disabled="isStreaming"
+                        :disabled="isStreaming || isConvRunning"
                         :enableStreaming="enableStreaming"
                         :isRecording="isRecording"
                         :session-id="currSessionId || null"

dashboard/src/layouts/full/vertical-sidebar/sidebarItem.ts

@@ -69,7 +69,7 @@ const sidebarItem: menu[] = [
       },
       {
         title: 'core.navigation.sessionManagement',
-        icon: 'mdi-pencil-ruler',
+        icon: 'mdi-account-group',
         to: '/session-management'
       },
       {

dashboard/src/views/ProviderPage.vue

@@ -69,25 +69,6 @@
                     :loading="isProviderTesting(provider.id)" @toggle-enabled="providerStatusChange"
                     :bglogo="getProviderIcon(provider.provider)" @delete="deleteProvider" @edit="configExistingProvider"
                     @copy="copyProvider" :show-copy-button="true">
-                    <template #item-details="{ item }">
-                      <!-- 测试状态 chip -->
-                      <v-tooltip v-if="getProviderStatus(item.id)" location="top" max-width="300">
-                        <template v-slot:activator="{ props }">
-                          <v-chip v-bind="props" :color="getStatusColor(getProviderStatus(item.id).status)" size="small">
-                            <v-icon start size="small">
-                              {{ getProviderStatus(item.id).status === 'available' ? 'mdi-check-circle' :
-                                getProviderStatus(item.id).status === 'unavailable' ? 'mdi-alert-circle' :
-                                  'mdi-clock-outline' }}
-                            </v-icon>
-                            {{ getStatusText(getProviderStatus(item.id).status) }}
-                          </v-chip>
-                        </template>
-                        <span v-if="getProviderStatus(item.id).status === 'unavailable'">
-                          {{ getProviderStatus(item.id).error }}
-                        </span>
-                        <span v-else>{{ getStatusText(getProviderStatus(item.id).status) }}</span>
-                      </v-tooltip>
-                    </template>
                     <template #actions="{ item }">
                       <v-btn style="z-index: 100000;" variant="tonal" color="info" rounded="xl" size="small"
                         :loading="isProviderTesting(item.id)" @click="testSingleProvider(item)">
@@ -115,38 +96,73 @@
                 :loading="isProviderTesting(provider.id)" @toggle-enabled="providerStatusChange"
                 :bglogo="getProviderIcon(provider.provider)" @delete="deleteProvider" @edit="configExistingProvider"
                 @copy="copyProvider" :show-copy-button="true">
-
-                <template #item-details="{ item }">
-                  <!-- 测试状态 chip -->
-                  <v-tooltip v-if="getProviderStatus(item.id)" location="top" max-width="300">
-                    <template v-slot:activator="{ props }">
-                      <v-chip v-bind="props" :color="getStatusColor(getProviderStatus(item.id).status)" size="small">
-                        <v-icon start size="small">
-                          {{ getProviderStatus(item.id).status === 'available' ? 'mdi-check-circle' :
-                            getProviderStatus(item.id).status === 'unavailable' ? 'mdi-alert-circle' :
-                              'mdi-clock-outline' }}
-                        </v-icon>
-                        {{ getStatusText(getProviderStatus(item.id).status) }}
-                      </v-chip>
-                    </template>
-                    <span v-if="getProviderStatus(item.id).status === 'unavailable'">
-                      {{ getProviderStatus(item.id).error }}
-                    </span>
-                    <span v-else>{{ getStatusText(getProviderStatus(item.id).status) }}</span>
-                  </v-tooltip>
-                </template>
                 <template #actions="{ item }">
                   <v-btn style="z-index: 100000;" variant="tonal" color="info" rounded="xl" size="small"
                     :loading="isProviderTesting(item.id)" @click="testSingleProvider(item)">
                     {{ tm('availability.test') }}
                   </v-btn>
                 </template>
+                <template v-slot:details="{ item }">
+                </template>
               </item-card>
             </v-col>
           </v-row>
         </template>
       </div>
 
+      <!-- 供应商状态部分 -->
+      <v-card elevation="0" class="mt-4">
+        <v-card-title class="d-flex align-center py-3 px-4">
+          <v-icon class="me-2">mdi-heart-pulse</v-icon>
+          <span class="text-h4">{{ tm('availability.title') }}</span>
+          <v-spacer></v-spacer>
+          <v-btn color="primary" variant="tonal" :loading="testingProviders.length > 0" @click="fetchProviderStatus">
+            <v-icon left>mdi-refresh</v-icon>
+            {{ tm('availability.refresh') }}
+          </v-btn>
+          <v-btn variant="text" color="primary" @click="showStatus = !showStatus" style="margin-left: 8px;">
+            {{ showStatus ? tm('logs.collapse') : tm('logs.expand') }}
+            <v-icon>{{ showStatus ? 'mdi-chevron-up' : 'mdi-chevron-down' }}</v-icon>
+          </v-btn>
+        </v-card-title>
+
+        <v-expand-transition>
+          <v-card-text class="pa-0" v-if="showStatus">
+            <v-card-text class="px-4 py-3">
+              <v-alert v-if="providerStatuses.length === 0" type="info" variant="tonal">
+                {{ tm('availability.noData') }}
+              </v-alert>
+
+              <v-container v-else class="pa-0">
+                <v-row>
+                  <v-col v-for="status in providerStatuses" :key="status.id" cols="12" sm="6" md="4">
+                    <v-card variant="outlined" class="status-card" :class="`status-${status.status}`">
+                      <v-card-item>
+                        <v-icon v-if="status.status === 'available'" color="success"
+                          class="me-2">mdi-check-circle</v-icon>
+                        <v-icon v-else-if="status.status === 'unavailable'" color="error"
+                          class="me-2">mdi-alert-circle</v-icon>
+                        <v-progress-circular v-else-if="status.status === 'pending'" indeterminate color="primary"
+                          size="20" width="2" class="me-2"></v-progress-circular>
+
+                        <span class="font-weight-bold">{{ status.id }}</span>
+
+                        <v-chip :color="getStatusColor(status.status)" size="small" class="ml-2">
+                          {{ getStatusText(status.status) }}
+                        </v-chip>
+                      </v-card-item>
+                      <v-card-text v-if="status.status === 'unavailable'" class="text-caption text-medium-emphasis">
+                        <span class="font-weight-bold">{{ tm('availability.errorMessage') }}:</span> {{ status.error }}
+                      </v-card-text>
+                    </v-card>
+                  </v-col>
+                </v-row>
+              </v-container>
+            </v-card-text>
+          </v-card-text>
+        </v-expand-transition>
+      </v-card>
+
       <!-- 日志部分 -->
       <v-card elevation="0" class="mt-4">
         <v-card-title class="d-flex align-center py-3 px-4">
@@ -735,14 +751,11 @@ export default {
       return this.testingProviders.includes(providerId);
     },
 
-    getProviderStatus(providerId) {
-      return this.providerStatuses.find(s => s.id === providerId);
-    },
-
     async testSingleProvider(provider) {
       if (this.isProviderTesting(provider.id)) return;
 
       this.testingProviders.push(provider.id);
+      this.showStatus = true; // 自动展开状态部分
 
       // 更新UI为pending状态
       const statusIndex = this.providerStatuses.findIndex(s => s.id === provider.id);

dashboard/src/views/SessionManagementPage.vue

@@ -4,8 +4,7 @@
       <v-card flat>
         <v-card-title class="d-flex align-center py-3 px-4">
           <span class="text-h4">{{ tm('customRules.title') }}</span>
-          <v-btn icon="mdi-information-outline" size="small" variant="text" href="https://astrbot.app/use/custom-rules.html" target="_blank"></v-btn>
-          <v-chip size="small" class="ml-1">{{ totalItems }} {{ tm('customRules.rulesCount') }}</v-chip>
+          <v-chip size="small" class="ml-2">{{ totalItems }} {{ tm('customRules.rulesCount') }}</v-chip>
           <v-row class="me-4 ms-4" dense>
             <v-text-field v-model="searchQuery" prepend-inner-icon="mdi-magnify" :label="tm('search.placeholder')"
               hide-details clearable variant="solo-filled" flat class="me-4" density="compact"></v-text-field>
@@ -29,8 +28,8 @@
         <v-card-text class="pa-0">
           <v-data-table-server :headers="headers" :items="filteredRulesList" :loading="loading"
             :items-length="totalItems" v-model:items-per-page="itemsPerPage" v-model:page="currentPage"
-            @update:options="onTableOptionsUpdate" class="elevation-0" style="font-size: 12px;" v-model="selectedItems"
-            show-select item-value="umo" return-object>
+            @update:options="onTableOptionsUpdate" class="elevation-0" style="font-size: 12px;"
+            v-model="selectedItems" show-select item-value="umo" return-object>
 
             <!-- UMO 信息 -->
             <template v-slot:item.umo_info="{ item }">
@@ -41,8 +40,7 @@
                   </v-chip>
                   <span class="text-truncate" style="max-width: 300px;">{{ item.umo }}</span>
                   <div class="d-flex align-center" v-if="item.rules?.session_service_config?.custom_name || true">
-                    <span class="ml-2" style="color: gray; font-size: 10px;"
-                      v-if="item.rules?.session_service_config?.custom_name">
+                    <span class="ml-2" style="color: gray; font-size: 10px;" v-if="item.rules?.session_service_config?.custom_name">
                       ({{ item.rules?.session_service_config?.custom_name }})
                     </span>
                     <v-btn icon size="x-small" variant="text" class="ml-1" @click.stop="openQuickEditName(item)">
@@ -259,7 +257,7 @@
             <v-spacer></v-spacer>
             <v-btn variant="text" @click="deleteDialog = false">{{ tm('buttons.cancel') }}</v-btn>
             <v-btn color="error" variant="tonal" @click="deleteAllRules" :loading="deleting">{{ tm('buttons.delete')
-            }}</v-btn>
+              }}</v-btn>
           </v-card-actions>
         </v-card>
       </v-dialog>

packages/astrbot/long_term_memory.py

@@ -6,7 +6,7 @@ from collections import defaultdict
 from astrbot import logger
 from astrbot.api import star
 from astrbot.api.event import AstrMessageEvent
-from astrbot.api.message_components import At, Image, Plain
+from astrbot.api.message_components import Image, Plain
 from astrbot.api.platform import MessageType
 from astrbot.api.provider import Provider, ProviderRequest
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
@@ -142,8 +142,6 @@ class LongTermMemory:
                             logger.error(f"获取图片描述失败: {e}")
                     else:
                         parts.append(" [Image]")
-                elif isinstance(comp, At):
-                    parts.append(f" [At: {comp.name}]")
 
             final_message = "".join(parts)
             logger.debug(f"ltm | {event.unified_msg_origin} | {final_message}")

packages/astrbot/process_llm_request.py

@@ -41,6 +41,7 @@ class ProcessLLMRequest:
                 if default_persona:
                     persona_id = default_persona["name"]
 
+
         persona = next(
             builtins.filter(
                 lambda persona: persona["name"] == persona_id,

packages/session_controller/main.py

@@ -14,7 +14,7 @@ from astrbot.core.utils.session_waiter import (
 )
 
 
-class Main(Star):
+class Waiter(Star):
     """会话控制"""
 
     def __init__(self, context: Context):

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "AstrBot"
-version = "4.7.0"
+version = "4.6.1"
 description = "Easy-to-use multi-platform LLM chatbot and development framework"
 readme = "README.md"
 requires-python = ">=3.10"

tests/test_dashboard.py

@@ -21,17 +21,7 @@ async def core_lifecycle_td(tmp_path_factory):
     log_broker = LogBroker()
     core_lifecycle = AstrBotCoreLifecycle(log_broker, db)
     await core_lifecycle.initialize()
-    try:
-        yield core_lifecycle
-    finally:
-        # 优先停止核心生命周期以释放资源（包括关闭 MCP 等后台任务）
-        try:
-            _stop_res = core_lifecycle.stop()
-            if asyncio.iscoroutine(_stop_res):
-                await _stop_res
-        except Exception:
-            # 停止过程中如有异常，不影响后续清理
-            pass
+    return core_lifecycle
 
 
 @pytest.fixture(scope="module")

tests/test_plugin_manager.py

@@ -39,7 +39,6 @@ def plugin_manager_pm(tmp_path):
     message_history_manager = MagicMock()
     persona_manager = MagicMock()
     astrbot_config_mgr = MagicMock()
-    knowledge_base_manager = MagicMock()
 
     star_context = Context(
         event_queue,
@@ -51,7 +50,6 @@ def plugin_manager_pm(tmp_path):
         message_history_manager,
         persona_manager,
         astrbot_config_mgr,
-        knowledge_base_manager=knowledge_base_manager,
     )
 
     # Create the PluginManager instance