From 73d174bc4ae2543f71c3f824204e0472b494b175 Mon Sep 17 00:00:00 2001
From: Sakura-RanChen <1908198662@qq.com>
Date: Thu, 19 Mar 2026 16:18:30 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=98=9F=E5=88=97?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=97=B6=E9=9F=B3=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/handle/sendAudioHandle.py |  2 ++
 .../core/utils/audioRateController.py              | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/main/xiaozhi-server/core/handle/sendAudioHandle.py b/main/xiaozhi-server/core/handle/sendAudioHandle.py
index 63a2411c..21cda9e6 100644
--- a/main/xiaozhi-server/core/handle/sendAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/sendAudioHandle.py
@@ -280,6 +280,8 @@ async def send_tts_message(conn: "ConnectionHandler", state, text=None):
             await sendAudio(conn, audios)
         # 等待所有音频包发送完成
         await _wait_for_audio_completion(conn)
+        # 停止音频发送循环
+        conn.audio_rate_controller.stop_sending()
         # 清除服务端讲话状态
         conn.clearSpeakStatus()
 
diff --git a/main/xiaozhi-server/core/utils/audioRateController.py b/main/xiaozhi-server/core/utils/audioRateController.py
index 01d71b05..29e203f2 100644
--- a/main/xiaozhi-server/core/utils/audioRateController.py
+++ b/main/xiaozhi-server/core/utils/audioRateController.py
@@ -43,6 +43,14 @@ class AudioRateController:
 
     def add_audio(self, opus_packet):
         """添加音频包到队列"""
+        # 如果队列之前为空，需要调整时间戳以保持播放时间连续
+        # 这样工具调用等待期间，新加入的音频不会提前播放
+        if len(self.queue) == 0 and self.play_position > 0:
+            self.start_timestamp = time.monotonic() - (self.play_position / 1000)
+            self.logger.bind(tag=TAG).debug(
+                f"队列从空恢复，重置时间戳，当前播放位置: {self.play_position}ms"
+            )
+
         self.queue.append(("audio", opus_packet))
         # 相关事件处理
         self.queue_empty_event.clear()
@@ -55,6 +63,12 @@ class AudioRateController:
         Args:
             message_callback: 消息发送回调函数 async def()
         """
+        if len(self.queue) == 0 and self.play_position > 0:
+            self.start_timestamp = time.monotonic() - (self.play_position / 1000)
+            self.logger.bind(tag=TAG).debug(
+                f"队列从空恢复，重置时间戳，当前播放位置: {self.play_position}ms"
+            )
+
         self.queue.append(("message", message_callback))
         # 相关事件处理
         self.queue_empty_event.clear()

From 52f5859b1fcc5ec91f6b9787c32cca5f772b2717 Mon Sep 17 00:00:00 2001
From: zhuoqinglian <1035449612@qq.com>
Date: Thu, 19 Mar 2026 17:56:27 +0800
Subject: [PATCH 2/7] =?UTF-8?q?update:=20mobile=20=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E4=BD=93=E7=AE=A1=E7=90=86=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-mobile/src/i18n/de.ts            |  6 +--
 main/manager-mobile/src/i18n/en.ts            |  2 +-
 main/manager-mobile/src/i18n/pt_BR.ts         |  2 +-
 main/manager-mobile/src/i18n/vi.ts            |  2 +-
 main/manager-mobile/src/pages/agent/edit.vue  | 10 +++++
 main/manager-mobile/src/pages/agent/tools.vue | 12 ++++--
 .../src/pages/voiceprint/index.vue            | 38 ++++++++++++++-----
 7 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/main/manager-mobile/src/i18n/de.ts b/main/manager-mobile/src/i18n/de.ts
index aa048248..0a409adb 100644
--- a/main/manager-mobile/src/i18n/de.ts
+++ b/main/manager-mobile/src/i18n/de.ts
@@ -85,7 +85,7 @@ export default {
     'agent.chatHistory': 'Chat-Verlauf',
     'agent.voiceprintManagement': 'Stimmabdruckverwaltung',
     'agent.editTitle': 'Agent bearbeiten',
-    'agent.toolsTitle': 'Funktionen bearbeiten',
+    'agent.toolsTitle': 'Bearbeiten',
     'agent.voiceActivityDetection': 'Sprachaktivitätserkennung',
     'agent.speechRecognition': 'Spracherkennung',
     'agent.largeLanguageModel': 'Großes Sprachmodell',
@@ -116,7 +116,7 @@ export default {
     'agent.tts': 'Text-zu-Sprache',
     'agent.voiceprint': 'Agenten-Stimme',
     'agent.plugins': 'Plugins',
-    'agent.editFunctions': 'Funktionen bearbeiten',
+    'agent.editFunctions': 'Bearbeiten',
     'agent.historyMemory': 'Verlaufsspeicher',
     'agent.memoryContent': 'Speicherinhalt',
     'agent.saving': 'Wird gespeichert...',
@@ -371,7 +371,7 @@ export default {
     'agent.tools.mcpAccessPoint': 'MCP-Zugangspunkt',
     'agent.tools.copy': 'Kopieren',
     'agent.tools.noTools': 'Keine Werkzeuge verfügbar',
-    'agent.tools.parameterConfig': 'Parameterkonfiguration',
+    'agent.tools.parameterConfig': 'Konfig',
     'agent.tools.noParamsNeeded': 'Keine Parameter benötigt',
     'agent.tools.pleaseInput': 'Bitte eingeben',
     'agent.tools.inputOneItemPerLine': 'Ein Element pro Zeile eingeben',
diff --git a/main/manager-mobile/src/i18n/en.ts b/main/manager-mobile/src/i18n/en.ts
index f0fe4c14..af1dddc6 100644
--- a/main/manager-mobile/src/i18n/en.ts
+++ b/main/manager-mobile/src/i18n/en.ts
@@ -371,7 +371,7 @@ export default {
   'agent.tools.mcpAccessPoint': 'MCP Access Point',
   'agent.tools.copy': 'Copy',
   'agent.tools.noTools': 'No tools available',
-  'agent.tools.parameterConfig': 'Parameter Configuration',
+  'agent.tools.parameterConfig': 'Param Config',
   'agent.tools.noParamsNeeded': 'No parameters needed',
   'agent.tools.pleaseInput': 'Please input',
   'agent.tools.inputOneItemPerLine': 'Input one item per line',
diff --git a/main/manager-mobile/src/i18n/pt_BR.ts b/main/manager-mobile/src/i18n/pt_BR.ts
index 2901583b..b8bc979f 100644
--- a/main/manager-mobile/src/i18n/pt_BR.ts
+++ b/main/manager-mobile/src/i18n/pt_BR.ts
@@ -371,7 +371,7 @@ export default {
   'agent.tools.mcpAccessPoint': 'Ponto de Acesso MCP',
   'agent.tools.copy': 'Copiar',
   'agent.tools.noTools': 'Nenhuma ferramenta disponível',
-  'agent.tools.parameterConfig': 'Configuração de Parâmetros',
+  'agent.tools.parameterConfig': 'Configuração',
   'agent.tools.noParamsNeeded': 'Nenhum parâmetro necessário',
   'agent.tools.pleaseInput': 'Por favor, insira',
   'agent.tools.inputOneItemPerLine': 'Insira um item por linha',
diff --git a/main/manager-mobile/src/i18n/vi.ts b/main/manager-mobile/src/i18n/vi.ts
index e9406afe..cbb790f7 100644
--- a/main/manager-mobile/src/i18n/vi.ts
+++ b/main/manager-mobile/src/i18n/vi.ts
@@ -371,7 +371,7 @@ export default {
     'agent.tools.mcpAccessPoint': 'Điểm truy cập MCP',
     'agent.tools.copy': 'Sao chép',
     'agent.tools.noTools': 'Không có công cụ nào',
-    'agent.tools.parameterConfig': 'Cấu hình tham số',
+    'agent.tools.parameterConfig': 'Cấu hình',
     'agent.tools.noParamsNeeded': 'Không cần tham số',
     'agent.tools.pleaseInput': 'Vui lòng nhập',
     'agent.tools.inputOneItemPerLine': 'Nhập một mục mỗi dòng',
diff --git a/main/manager-mobile/src/pages/agent/edit.vue b/main/manager-mobile/src/pages/agent/edit.vue
index 93e715ca..112a48a2 100644
--- a/main/manager-mobile/src/pages/agent/edit.vue
+++ b/main/manager-mobile/src/pages/agent/edit.vue
@@ -1006,6 +1006,7 @@ onMounted(async () => {
     <wd-action-sheet
       v-model="pickerShow.tts"
       :actions="modelOptions.TTS && modelOptions.TTS.map(item => ({ name: item.modelName, value: item.id }))"
+      class="custom-sheet-tts"
       @close="onPickerCancel('tts')"
       @select="({ item }) => onPickerConfirm('tts', item.value, item.name)"
     />
@@ -1059,4 +1060,13 @@ onMounted(async () => {
     background: transparent !important;
   }
 }
+::v-deep .custom-sheet-tts {
+  .wd-action-sheet {
+    padding: 8px 0 !important;
+    overflow: hidden;
+  }
+  .wd-action-sheet__actions {
+    padding: 0 !important;
+  }
+}
 </style>
diff --git a/main/manager-mobile/src/pages/agent/tools.vue b/main/manager-mobile/src/pages/agent/tools.vue
index ab0b595b..fb47deae 100644
--- a/main/manager-mobile/src/pages/agent/tools.vue
+++ b/main/manager-mobile/src/pages/agent/tools.vue
@@ -311,7 +311,7 @@ onMounted(async () => {
                 v-if="notSelectedList.length === 0"
                 class="h-[400rpx] flex items-center justify-center"
               >
-                <wd-status-tip image="content" tip="{{ t('agent.tools.noMorePlugins') }}" />
+                <wd-status-tip image="content" :tip="t('agent.tools.noMorePlugins')" />
               </view>
               <view v-else class="p-[20rpx] space-y-[20rpx]">
                 <view
@@ -347,7 +347,7 @@ onMounted(async () => {
                 v-if="selectedList.length === 0"
                 class="h-[400rpx] flex items-center justify-center"
               >
-                <wd-status-tip image="content" tip="{{ t('agent.tools.pleaseSelectPlugin') }}" />
+                <wd-status-tip image="content" :tip="t('agent.tools.pleaseSelectPlugin')" />
               </view>
               <view v-else class="p-[20rpx] space-y-[20rpx]">
                 <view
@@ -445,7 +445,7 @@ onMounted(async () => {
     <!-- 参数编辑弹窗 -->
     <wd-action-sheet
       v-model="showParamDialog"
-      :title="`${t('agent.tools.paramConfiguration')} - ${currentFunction?.name || ''}`"
+      :title="`${t('agent.tools.parameterConfig')} - ${currentFunction?.name || ''}`"
       custom-header-class="h-[75vh]"
       @close="closeParamEdit"
     >
@@ -586,3 +586,9 @@ onMounted(async () => {
     </wd-action-sheet>
   </view>
 </template>
+
+<style scoped lang="scss">
+::v-deep .wd-action-sheet__header {
+  padding-right: 30rpx;
+}
+</style>
diff --git a/main/manager-mobile/src/pages/voiceprint/index.vue b/main/manager-mobile/src/pages/voiceprint/index.vue
index e0917c98..a00711a5 100644
--- a/main/manager-mobile/src/pages/voiceprint/index.vue
+++ b/main/manager-mobile/src/pages/voiceprint/index.vue
@@ -460,8 +460,11 @@ defineExpose({
       <view class="p-[32rpx]">
         <!-- 声纹向量选择 -->
         <view class="mb-[32rpx]">
-          <text class="mb-[16rpx] block text-[28rpx] text-red font-medium">
-            * {{ t('voiceprint.voiceVector') }}
+          <text class="mb-[16rpx] block text-[28rpx] text-[#232338] font-medium">
+            <text class="text-red">
+              *
+            </text>
+            {{ t('voiceprint.voiceVector') }}
           </text>
           <view
             class="flex cursor-pointer items-center justify-between border-[1rpx] border-[#eeeeee] rounded-[12rpx] bg-[#f5f7fb] p-[20rpx] transition-all duration-300 active:bg-[#eef3ff]"
@@ -479,8 +482,11 @@ defineExpose({
 
         <!-- 姓名 -->
         <view class="mb-[32rpx]">
-          <text class="mb-[16rpx] block text-[28rpx] text-red font-medium">
-            * {{ t('voiceprint.name') }}
+          <text class="mb-[16rpx] block text-[28rpx] text-[#232338] font-medium">
+            <text class="text-red">
+              *
+            </text>
+            {{ t('voiceprint.name') }}
           </text>
           <input
             v-model="addForm.sourceName"
@@ -491,8 +497,11 @@ defineExpose({
 
         <!-- 描述 -->
         <view>
-          <text class="mb-[16rpx] block text-[28rpx] text-red font-medium">
-            * {{ t('voiceprint.description') }}
+          <text class="mb-[16rpx] block text-[28rpx] text-[#232338] font-medium">
+            <text class="text-red">
+              *
+            </text>
+            {{ t('voiceprint.description') }}
           </text>
           <textarea
             v-model="addForm.introduce" :maxlength="100" :placeholder="t('voiceprint.pleaseInputDescription')"
@@ -521,7 +530,7 @@ defineExpose({
     safe-area-inset-bottom
   >
     <view>
-      <view class="w-full flex items-center justify-between border-b-[2rpx] border-[#eeeeee] p-[32rpx_32rpx_24rpx]">
+      <view class="box-border w-full flex items-center justify-between border-b-[2rpx] border-[#eeeeee] p-[32rpx_32rpx_24rpx]">
         <text class="w-full text-center text-[32rpx] text-[#232338] font-semibold">
           {{ t('voiceprint.editSpeaker') }}
         </text>
@@ -531,7 +540,10 @@ defineExpose({
         <!-- 声纹向量选择 -->
         <view class="mb-[32rpx]">
           <text class="mb-[16rpx] block text-[28rpx] text-[#232338] font-medium">
-            * {{ t('voiceprint.voiceVector') }}
+            <text class="text-red">
+              *
+            </text>
+            {{ t('voiceprint.voiceVector') }}
           </text>
           <view
             class="flex cursor-pointer items-center justify-between border-[1rpx] border-[#eeeeee] rounded-[12rpx] bg-[#f5f7fb] p-[20rpx] transition-all duration-300 active:bg-[#eef3ff]"
@@ -550,7 +562,10 @@ defineExpose({
         <!-- 姓名 -->
         <view class="mb-[32rpx]">
           <text class="mb-[16rpx] block text-[28rpx] text-[#232338] font-medium">
-            * {{ t('voiceprint.name') }}
+            <text class="text-red">
+              *
+            </text>
+            {{ t('voiceprint.name') }}
           </text>
           <input
             v-model="editForm.sourceName"
@@ -562,7 +577,10 @@ defineExpose({
         <!-- 描述 -->
         <view>
           <text class="mb-[16rpx] block text-[28rpx] text-[#232338] font-medium">
-            * {{ t('voiceprint.description') }}
+            <text class="text-red">
+              *
+            </text>
+            {{ t('voiceprint.description') }}
           </text>
           <textarea
             v-model="editForm.introduce" :maxlength="100" :placeholder="t('voiceprint.pleaseInputDescription')"

From 7732b7b1b9732c84ae657838b045e1ea4d693815 Mon Sep 17 00:00:00 2001
From: zhuoqinglian <1035449612@qq.com>
Date: Fri, 20 Mar 2026 14:42:47 +0800
Subject: [PATCH 3/7] =?UTF-8?q?update:=20mobile=20=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-mobile/src/pages/login/index.vue |  5 +++--
 main/manager-mobile/src/store/user.ts         | 22 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/main/manager-mobile/src/pages/login/index.vue b/main/manager-mobile/src/pages/login/index.vue
index 4a83d710..adaf5fb3 100644
--- a/main/manager-mobile/src/pages/login/index.vue
+++ b/main/manager-mobile/src/pages/login/index.vue
@@ -15,7 +15,7 @@ import { computed, onMounted, ref } from 'vue'
 import { login } from '@/api/auth'
 // 导入国际化相关功能
 import { changeLanguage, getCurrentLanguage, getSupportedLanguages, initI18n, t } from '@/i18n'
-import { useConfigStore } from '@/store'
+import { useConfigStore, useUserStore } from '@/store'
 // 导入SM2加密工具
 import { getEnvBaseUrl, sm2Encrypt } from '@/utils'
 import { toast } from '@/utils/toast'
@@ -61,6 +61,7 @@ const loginType = ref<'username' | 'mobile'>('username')
 
 // 获取配置store
 const configStore = useConfigStore()
+const userStore = useUserStore()
 
 // 区号选择相关
 const showAreaCodeSheet = ref(false)
@@ -227,6 +228,7 @@ async function handleLogin() {
     const response = await login(loginData)
     // 存储token
     uni.setStorageSync('token', JSON.stringify(response))
+    await userStore.getUserInfo()
 
     toast.success(t('message.loginSuccess'))
 
@@ -581,7 +583,6 @@ onMounted(async () => {
 
       .input-wrapper {
         position: relative;
-        background: #f8f9fa;
         border-radius: 16rpx;
         padding: 20rpx 16rpx;
         border: 2rpx solid #e9ecef;
diff --git a/main/manager-mobile/src/store/user.ts b/main/manager-mobile/src/store/user.ts
index 1e19f34b..a062fcc5 100644
--- a/main/manager-mobile/src/store/user.ts
+++ b/main/manager-mobile/src/store/user.ts
@@ -19,7 +19,7 @@ const userInfoState: UserInfo & { avatar?: string, token?: string } = {
 }
 
 export const useUserStore = defineStore(
-  'user',
+  'userInfo',
   () => {
     // 定义用户信息
     const userInfo = ref<UserInfo & { avatar?: string, token?: string }>({ ...userInfoState })
@@ -51,16 +51,8 @@ export const useUserStore = defineStore(
      */
     const getUserInfo = async () => {
       const userData = await _getUserInfo()
-      const authInfo = JSON.parse(uni.getStorageSync('token') || '{}')
-      const userInfoWithExtras = {
-        ...userData,
-        avatar: userInfoState.avatar,
-        token: authInfo.token || '',
-      }
-      setUserInfo(userInfoWithExtras)
-      uni.setStorageSync('userInfo', userInfoWithExtras)
-      // TODO 这里可以增加获取用户路由的方法 根据用户的角色动态生成路由
-      return userInfoWithExtras
+      setUserInfo(userData)
+      return userData
     }
     /**
      * 退出登录 并 删除用户信息
@@ -79,6 +71,12 @@ export const useUserStore = defineStore(
     }
   },
   {
-    persist: true,
+    persist: {
+      key: 'userInfo',
+      serializer: {
+        serialize: state => JSON.stringify(state.userInfo),
+        deserialize: value => ({ userInfo: JSON.parse(value) }),
+      },
+    },
   },
 )

From 2a49f0804c9c5e971ed60459f85badc19c6eba2b Mon Sep 17 00:00:00 2001
From: rainv123 <2148537152@qq.com>
Date: Mon, 23 Mar 2026 16:17:38 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E4=BB=85=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95(mem=5Freport=5Fon?=
 =?UTF-8?q?ly)=E8=AE=B0=E5=BF=86=E4=BE=9B=E5=BA=94=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/common/constant/Constant.java     |  5 ++++
 .../impl/AgentChatSummaryServiceImpl.java     | 26 ++++++++++++-------
 .../impl/ModelProviderServiceImpl.java        |  1 +
 .../resources/db/changelog/202603231036.sql   |  6 +++++
 .../db/changelog/db.changelog-master.yaml     |  7 +++++
 main/xiaozhi-server/core/connection.py        |  4 +--
 .../memory/mem_report_only/mem_report_only.py | 20 ++++++++++++++
 7 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202603231036.sql
 create mode 100644 main/xiaozhi-server/core/providers/memory/mem_report_only/mem_report_only.py

diff --git a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
index 8a9e4fba..b438fec1 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
@@ -151,6 +151,11 @@ public interface Constant {
      */
     String MEMORY_NO_MEM = "Memory_nomem";
 
+    /**
+     * 仅上报聊天记录（不总结记忆）
+     */
+    String MEMORY_MEM_REPORT_ONLY = "Memory_mem_report_only";
+
     /**
      * 火山引擎双声道语音克隆
      */
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java
index 38fef94b..26e601ec 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import lombok.RequiredArgsConstructor;
+import xiaozhi.common.constant.Constant;
 import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
 import xiaozhi.modules.agent.dto.AgentChatSummaryDTO;
 import xiaozhi.modules.agent.dto.AgentMemoryDTO;
@@ -90,21 +91,28 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
     @Override
     public boolean generateAndSaveChatSummary(String sessionId) {
         try {
-            // 1. 生成总结
-            AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
-            if (!summaryDTO.isSuccess()) {
-                log.info("生成总结失败: {}", summaryDTO.getErrorMessage());
-                return false;
-            }
-
-            // 2. 获取设备信息（通过会话关联的设备）
+            // 1. 获取设备信息（通过会话关联的设备）
             DeviceEntity device = getDeviceBySessionId(sessionId);
             if (device == null) {
                 log.info("未找到与会话 {} 关联的设备", sessionId);
                 return false;
             }
 
-            // 3. 更新智能体记忆
+            // 2. 检查记忆模型类型，如果是仅上报聊天记录模式则跳过总结
+            String memModelId = agentService.getAgentById(device.getAgentId()).getMemModelId();
+            if (memModelId != null && memModelId.equals(Constant.MEMORY_MEM_REPORT_ONLY)) {
+                log.info("会话 {} 使用仅上报聊天记录模式，跳过记忆总结", sessionId);
+                return true;
+            }
+
+            // 3. 生成总结
+            AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
+            if (!summaryDTO.isSuccess()) {
+                log.info("生成总结失败: {}", summaryDTO.getErrorMessage());
+                return false;
+            }
+
+            // 4. 更新智能体记忆
             AgentMemoryDTO memoryDTO = new AgentMemoryDTO();
             memoryDTO.setSummaryMemory(summaryDTO.getSummary());
 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
index 049387c3..fe6df77f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
@@ -95,6 +95,7 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
 
         QueryWrapper<ModelProviderEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("model_type", StringUtils.isBlank(modelType) ? "" : modelType);
+        queryWrapper.orderByAsc("sort");
         List<ModelProviderEntity> providerEntities = modelProviderDao.selectList(queryWrapper);
         return ConvertUtils.sourceToTarget(providerEntities, ModelProviderDTO.class);
     }
diff --git a/main/manager-api/src/main/resources/db/changelog/202603231036.sql b/main/manager-api/src/main/resources/db/changelog/202603231036.sql
new file mode 100644
index 00000000..686b9b44
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202603231036.sql
@@ -0,0 +1,6 @@
+
+delete from `ai_model_provider` where `id` = 'SYSTEM_Memory_mem_report_only';
+delete from `ai_model_config` where `id` = 'Memory_mem_report_only';
+
+INSERT INTO `ai_model_provider` VALUES ('SYSTEM_Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', '[]', 4, 1, NOW(), 1, NOW());
+INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index efdf68d4..0a30c341 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -571,3 +571,10 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202603111131.sql
+  - changeSet:
+      id: 202603231036
+      author: rainv123
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202603231036.sql
\ No newline at end of file
diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index c60c1a4a..90c9704e 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -751,8 +751,8 @@ class ConnectionHandler:
         memory_type = self.config["Memory"][self.config["selected_module"]["Memory"]][
             "type"
         ]
-        # 如果使用 nomen，直接返回
-        if memory_type == "nomem":
+        # 如果使用 nomen 或 mem_report_only，直接返回
+        if memory_type == "nomem" or memory_type == "mem_report_only":
             return
         # 使用 mem_local_short 模式
         elif memory_type == "mem_local_short":
diff --git a/main/xiaozhi-server/core/providers/memory/mem_report_only/mem_report_only.py b/main/xiaozhi-server/core/providers/memory/mem_report_only/mem_report_only.py
new file mode 100644
index 00000000..2fd1fdff
--- /dev/null
+++ b/main/xiaozhi-server/core/providers/memory/mem_report_only/mem_report_only.py
@@ -0,0 +1,20 @@
+"""
+仅上报聊天记录，不进行记忆总结
+"""
+
+from ..base import MemoryProviderBase, logger
+
+TAG = __name__
+
+
+class MemoryProvider(MemoryProviderBase):
+    def __init__(self, config, summary_memory=None):
+        super().__init__(config)
+
+    async def save_memory(self, msgs, session_id=None):
+        logger.bind(tag=TAG).debug("mem_report_only mode: No memory saving or summarization is performed.")
+        return None
+
+    async def query_memory(self, query: str) -> str:
+        logger.bind(tag=TAG).debug("mem_report_only mode: No memory query is performed.")
+        return ""
\ No newline at end of file

From 6d89ae1c6682cc6e8482d3f436372e8ba9cf7c10 Mon Sep 17 00:00:00 2001
From: rainv123 <2148537152@qq.com>
Date: Mon, 23 Mar 2026 16:58:51 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BB=85=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=A8=A1=E5=9E=8B=E8=AF=B4=E6=98=8E=E5=92=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BF=86=E6=A8=A1=E5=9E=8B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/model/service/impl/ModelConfigServiceImpl.java    | 3 ++-
 .../modules/model/service/impl/ModelProviderServiceImpl.java  | 3 ++-
 .../db/changelog/{202603231036.sql => 202603231037.sql}       | 3 ++-
 .../src/main/resources/db/changelog/db.changelog-master.yaml  | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename main/manager-api/src/main/resources/db/changelog/{202603231036.sql => 202603231037.sql} (73%)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
index 24bdb751..a49ce69c 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
@@ -57,7 +57,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                         .eq("model_type", modelType)
                         .eq("is_enabled", 1)
                         .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
-                        .select("id", "model_name"));
+                        .select("id", "model_name")
+                        .orderByAsc("sort"));
         return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
     }
 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
index fe6df77f..85cc85b5 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
@@ -148,7 +148,8 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
         UserDetail user = SecurityUser.getUser();
         modelProviderDTO.setUpdater(user.getId());
         modelProviderDTO.setUpdateDate(new Date());
-        if (modelProviderDao.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
+        if (modelProviderDao
+                .updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
             throw new RenException(ErrorCode.UPDATE_DATA_FAILED);
         }
         return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
diff --git a/main/manager-api/src/main/resources/db/changelog/202603231036.sql b/main/manager-api/src/main/resources/db/changelog/202603231037.sql
similarity index 73%
rename from main/manager-api/src/main/resources/db/changelog/202603231036.sql
rename to main/manager-api/src/main/resources/db/changelog/202603231037.sql
index 686b9b44..5ae1ce2a 100644
--- a/main/manager-api/src/main/resources/db/changelog/202603231036.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202603231037.sql
@@ -1,6 +1,7 @@
+-- 新增仅上报聊天记录记忆模型供应器
 
 delete from `ai_model_provider` where `id` = 'SYSTEM_Memory_mem_report_only';
 delete from `ai_model_config` where `id` = 'Memory_mem_report_only';
 
 INSERT INTO `ai_model_provider` VALUES ('SYSTEM_Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', '[]', 4, 1, NOW(), 1, NOW());
-INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
\ No newline at end of file
+INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, '仅上报聊天记录，不总结记忆', 3, NULL, NULL, NULL, NULL);
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 0a30c341..f84fdd9d 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -572,9 +572,9 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/202603111131.sql
   - changeSet:
-      id: 202603231036
+      id: 202603231037
       author: rainv123
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202603231036.sql
\ No newline at end of file
+            path: classpath:db/changelog/202603231037.sql

From 1a6d9d7490a3a862b9e30335037cd3909b7d56ce Mon Sep 17 00:00:00 2001
From: rainv123 <2148537152@qq.com>
Date: Tue, 24 Mar 2026 09:49:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E4=BD=93=E9=85=8D=E7=BD=AE=E5=8F=98=E6=9B=B4=E6=97=B6=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E9=9F=B3=E9=A2=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/modules/agent/service/impl/AgentServiceImpl.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index 22029ec5..746330ca 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -410,9 +410,6 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
             // 删除所有记录
             agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, true);
             existingEntity.setSummaryMemory("");
-        } else if (existingEntity.getChatHistoryConf() != null && existingEntity.getChatHistoryConf() == 1) {
-            // 删除音频数据
-            agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, false);
         }
 
         // 更新上下文源配置

From 87f9ab7bb4a27826d7d6d69f2a1f4b7f6a645fc0 Mon Sep 17 00:00:00 2001
From: wengzh <107969742+milieyo@users.noreply.github.com>
Date: Tue, 24 Mar 2026 11:05:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?Revert=20"fix:=E4=BF=AE=E5=A4=8D=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E4=BD=93=E8=AE=B0=E5=BF=86=E6=A8=A1=E5=9E=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=98=E6=9B=B4=E6=97=B6=E9=94=99=E8=AF=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8E=86=E5=8F=B2=E8=81=8A=E5=A4=A9=E9=9F=B3=E9=A2=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/modules/agent/service/impl/AgentServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index 746330ca..22029ec5 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -410,6 +410,9 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
             // 删除所有记录
             agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, true);
             existingEntity.setSummaryMemory("");
+        } else if (existingEntity.getChatHistoryConf() != null && existingEntity.getChatHistoryConf() == 1) {
+            // 删除音频数据
+            agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, false);
         }
 
         // 更新上下文源配置