myagent-ai 1.10.7 → 1.10.8

package/agents/main_agent.py

@@ -453,9 +453,9 @@ class MainAgent(BaseAgent):
             except Exception as e:
                 logger.warning(f"[{task_id}] 加载历史对话失败: {e}")
 
-        # 保存用户消息到短期记忆
+        # 保存用户消息到会话记忆
         if self.memory:
-            self.memory.add_short_term(
+            self.memory.add_session(
                 session_id=context.session_id,
                 role="user",
                 content=context.user_message,
@@ -551,9 +551,9 @@ class MainAgent(BaseAgent):
             llm_raw = response.content
             logger.debug(f"[{task_id}] LLM 输出 (前500字): {llm_raw[:500]}")
 
-            # 保存 LLM 原始输出到短期记忆（用于回溯和审计）
+            # 保存 LLM 原始输出到会话记忆（用于回溯和审计）
             if self.memory:
-                self.memory.add_short_term(
+                self.memory.add_session(
                     session_id=context.session_id,
                     role="assistant",
                     content=llm_raw,
@@ -588,7 +588,7 @@ class MainAgent(BaseAgent):
                     context.working_memory["final_response"] = final_text
                     await self._emit_v2_event("v2_reasoning", {"content": final_text}, stream_callback)
                     if self.memory:
-                        self.memory.add_short_term(
+                        self.memory.add_session(
                             session_id=context.session_id,
                             role="assistant",
                             content=final_text,
@@ -601,7 +601,7 @@ class MainAgent(BaseAgent):
                     context.working_memory["final_response"] = final_text
                     await self._emit_v2_event("v2_reasoning", {"content": final_text}, stream_callback)
                     if self.memory:
-                        self.memory.add_short_term(
+                        self.memory.add_session(
                             session_id=context.session_id,
                             role="assistant",
                             content=final_text,
@@ -741,7 +741,7 @@ class MainAgent(BaseAgent):
                     stream_callback,
                 )
                 if self.memory:
-                    self.memory.add_short_term(
+                    self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
                         content=parsed.ask_user,
@@ -758,7 +758,7 @@ class MainAgent(BaseAgent):
                     context.working_memory["final_response"] = final_text
                     await self._emit_v2_event("v2_reasoning", {"content": truncate_str(final_text, 3000)}, stream_callback)
                     if self.memory:
-                        self.memory.add_short_term(
+                        self.memory.add_session(
                             session_id=context.session_id,
                             role="assistant",
                             content=final_text,
@@ -770,7 +770,7 @@ class MainAgent(BaseAgent):
                     context.working_memory["final_response"] = final_text
                     await self._emit_v2_event("v2_reasoning", {"content": truncate_str(final_text, 3000)}, stream_callback)
                     if self.memory:
-                        self.memory.add_short_term(
+                        self.memory.add_session(
                             session_id=context.session_id,
                             role="assistant",
                             content=final_text,
@@ -1006,16 +1006,16 @@ class MainAgent(BaseAgent):
                     content=f"[工具 {tool_name} 执行完成] {'成功' if tool_result.get('success') else '失败'}",
                 ))
 
-                # 保存工具调用到短期记忆
+                # 保存工具调用到会话记忆
                 if self.memory:
-                    self.memory.add_short_term(
+                    self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
                         content=f"调用工具: {tool_name}\n参数: {truncate_str(parms, 1000)}",
                         key="tool_call",
                         importance=0.4,
                     )
-                    self.memory.add_short_term(
+                    self.memory.add_session(
                         session_id=context.session_id,
                         role="tool",
                         content=f"[{tool_name}] {'成功' if tool_result.get('success') else '失败'}\n{truncate_str(output_str, 5000)}",
@@ -1048,7 +1048,7 @@ class MainAgent(BaseAgent):
                 context.working_memory["final_response"] = final_text
                 await self._emit_v2_event("v2_reasoning", {"content": truncate_str(final_text, 3000)}, stream_callback)
                 if self.memory:
-                    self.memory.add_short_term(
+                    self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
                         content=final_text,
@@ -1075,7 +1075,7 @@ class MainAgent(BaseAgent):
                 context.working_memory["final_response"] = final_text
                 await self._emit_v2_event("v2_reasoning", {"content": truncate_str(final_text, 3000)}, stream_callback)
                 if self.memory:
-                    self.memory.add_short_term(
+                    self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
                         content=final_text,
@@ -1084,14 +1084,14 @@ class MainAgent(BaseAgent):
 
             logger.info(f"[{task_id}] finish=false 且 need_callback=true，回调 LLM...")
 
-            # 回调前，保存当前轮次的 LLM 输出到短期记忆
+            # 回调前，保存当前轮次的 LLM 输出到会话记忆
             # 这样每轮工具调用都有对应的 assistant 消息记录
             if self.memory:
                 _round_items = _v2_reasoning_collected[_reasoning_len_before_round:]
                 if _round_items:
                     _round_output = "\n".join(_round_items)
                     if _round_output.strip():
-                        self.memory.add_short_term(
+                        self.memory.add_session(
                             session_id=context.session_id,
                             role="assistant",
                             content=_round_output,
@@ -1102,7 +1102,7 @@ class MainAgent(BaseAgent):
             if self.memory and _v2_reasoning_collected:
                 _fallback_text = "\n".join(_v2_reasoning_collected)
                 if _fallback_text.strip():
-                    self.memory.add_short_term(
+                    self.memory.add_session(
                         session_id=context.session_id,
                         role="assistant",
                         content=_fallback_text,

package/agents/memory_agent.py

@@ -116,7 +116,7 @@ class MemoryAgent(BaseAgent):
                 )
 
         # 修剪旧消息
-        max_msgs = self.config.memory.max_short_term
+        max_msgs = self.config.memory.max_session
         self.memory.prune_conversation(session_id, max_msgs)
 
         logger.debug(f"对话已保存到会话记忆 (session={session_id})")
@@ -162,7 +162,7 @@ class MemoryAgent(BaseAgent):
         if not self.memory:
             return
 
-        entries = self.memory.get_working(session_id)
+        entries = self.memory._query(session_id=session_id, category="session", limit=100)
         context.working_memory["task_progress"] = [
             {"key": e.key, "content": e.content, "metadata": e.metadata}
             for e in entries

package/config.py

@@ -50,11 +50,6 @@ class MemoryConfig:
     auto_summarize: bool = True        # 自动总结开关
     summarize_threshold: int = 20      # 触发总结的对话轮数
 
-    # 兼容旧配置名
-    @property
-    def max_short_term(self) -> int:
-        return self.max_session
-
 
 @dataclass
 class ExecutorConfig:

package/memory/manager.py

@@ -6,10 +6,6 @@ memory/manager.py - 记忆管理器
   - 会话记忆 (session): 当前会话的对话上下文和任务进度，仅本 session 可检索
 
 所有记忆通过 session_id 隔离，全局记忆可跨会话检索。
-
-向后兼容:
-  旧 API (add_short_term, add_working, add_long_term) 仍然可用，
-  内部自动映射到新的 session / global 分类。
 """
 from __future__ import annotations
 
@@ -95,23 +91,13 @@ class MemoryManager:
       - session (会话记忆): 对话上下文 + 任务进度，按 session_id 隔离
       - global  (全局记忆): 跨会话持久知识，所有 session 可检索
 
-    向后兼容:
-      旧方法 add_short_term / add_working / add_long_term 仍可正常使用，
-      内部自动映射到 session / global 分类。
-      旧分类值 short_term、working、long_term 在查询时自动包含。
-
     使用示例:
         mm = MemoryManager(db_path="~/.myagent/data/memory.db")
         mm.initialize()
 
-        # 新 API
         mm.add_session("s1", role="user", content="帮我创建一个Python项目")
         mm.add_global(content="偏好使用Python, TypeScript")
 
-        # 旧 API (仍然可用)
-        mm.add_short_term("s1", "user", "帮我创建一个Python项目")
-        mm.add_long_term("user_prefs", "coding_style", "偏好使用Python, TypeScript")
-
         # 查询对话历史
         history = mm.get_conversation("s1")
 
@@ -183,29 +169,6 @@ class MemoryManager:
             self._local.conn.close()
             self._local.conn = None
 
-    # ==========================================================================
-    # 分类映射 (向后兼容)
-    # ==========================================================================
-
-    def _normalize_category(self, category: str) -> str:
-        """Map old category values to new ones:
-        short_term, working → session
-        long_term → global
-        """
-        _MAP = {"short_term": "session", "working": "session", "long_term": "global"}
-        return _MAP.get(category, category)
-
-    def _expand_category(self, category: str) -> list:
-        """Expand category for SQL IN clause (backward compat):
-        "session" → ["session", "short_term", "working"]
-        "global" → ["global", "long_term"]
-        """
-        if category == "session":
-            return ["session", "short_term", "working"]
-        elif category == "global":
-            return ["global", "long_term"]
-        return [category]
-
     # ==========================================================================
     # 基础 CRUD
     # ==========================================================================
@@ -252,10 +215,8 @@ class MemoryManager:
             conditions.append("session_id = ?")
             params.append(session_id)
         if category:
-            expanded = self._expand_category(category)
-            placeholders = ",".join("?" for _ in expanded)
-            conditions.append(f"category IN ({placeholders})")
-            params.extend(expanded)
+            conditions.append("category = ?")
+            params.append(category)
         if key:
             conditions.append("key = ?")
             params.append(key)
@@ -323,58 +284,13 @@ class MemoryManager:
         )
         return self._insert(entry)
 
-    # --- 兼容别名 ---
-    def add_short_term(self, session_id, role, content, key="", importance=0.5) -> str:
-        """[兼容] → add_session()"""
-        return self.add_session(session_id=session_id, role=role, content=content, key=key, importance=importance)
-
-    def add_working(self, session_id, key, content, metadata=None) -> str:
-        """[兼容] → add_session()"""
-        return self.add_session(session_id=session_id, key=key, content=content, importance=0.7, metadata=metadata or {})
-
-    def get_working(self, session_id, key="") -> List[MemoryEntry]:
-        """[兼容] 获取会话记忆中 key 非空的条目"""
-        conn = self._get_conn()
-        cats = self._expand_category("session")
-        placeholders = ",".join("?" for _ in cats)
-        conditions = [f"session_id = ?", f"category IN ({placeholders})", "key != ''"]
-        params = [session_id] + cats
-        if key:
-            conditions.append("key = ?")
-            params.append(key)
-        where = " AND ".join(conditions)
-        sql = f"SELECT * FROM memories WHERE {where} ORDER BY created_at DESC LIMIT 100"
-        rows = conn.execute(sql, params).fetchall()
-        return [MemoryEntry.from_row(row) for row in rows]
-
-    def update_working(self, memory_id, content, **updates):
-        """[兼容] → _update_content()"""
-        self._update_content(memory_id, content, **updates)
-
-    def clear_working(self, session_id) -> int:
-        """[兼容] 清空会话记忆中 key 非空的条目"""
-        conn = self._get_conn()
-        cats = self._expand_category("session")
-        placeholders = ",".join("?" for _ in cats)
-        params = [session_id] + cats
-        cursor = conn.execute(
-            f"DELETE FROM memories WHERE session_id = ? AND category IN ({placeholders}) AND key != ''",
-            params,
-        )
-        conn.commit()
-        return cursor.rowcount
-
     def get_conversation(self, session_id, limit=500, include_roles=None) -> List[MemoryEntry]:
-        """获取对话历史（搜索 session 分类中 role 非空的条目，兼容旧 short_term 数据）"""
+        """获取对话历史（session 分类中 role 非空的条目）"""
         conn = self._get_conn()
-        cats = self._expand_category("session")
-        placeholders = ",".join("?" for _ in cats)
-        conditions = ["session_id = ?", f"category IN ({placeholders})", "role != ''"]
-        params = [session_id] + cats
-        where = " AND ".join(conditions)
-        sql = f"SELECT * FROM memories WHERE {where} ORDER BY created_at ASC LIMIT ?"
-        params.append(limit)
-        rows = conn.execute(sql, params).fetchall()
+        sql = """SELECT * FROM memories 
+                 WHERE session_id = ? AND category = 'session' AND role != ''
+                 ORDER BY created_at ASC LIMIT ?"""
+        rows = conn.execute(sql, (session_id, limit)).fetchall()
         entries = [MemoryEntry.from_row(row) for row in rows]
         if include_roles:
             entries = [e for e in entries if e.role in include_roles]
@@ -403,14 +319,7 @@ class MemoryManager:
 
     def clear_conversation(self, session_id) -> int:
         """清空会话对话历史"""
-        count = self._delete(session_id, category="session")
-        # 兼容旧数据
-        for old_cat in ("short_term", "working"):
-            try:
-                count += self._delete(session_id, category=old_cat)
-            except Exception:
-                pass
-        return count
+        return self._delete(session_id, category="session")
 
     def delete_session(self, session_id: str) -> int:
         """删除会话的所有记忆（对话、工作记忆、长期记忆等），彻底删除该会话"""
@@ -504,11 +413,6 @@ class MemoryManager:
         )
         return self._insert(entry)
 
-    # --- 兼容别名 ---
-    def add_long_term(self, session_id="global", key="", content="", summary="", importance=0.7, metadata=None) -> str:
-        """[兼容] → add_global()"""
-        return self.add_global(session_id=session_id, key=key, content=content, summary=summary, importance=importance, metadata=metadata)
-
     def find_duplicate_memory(
         self,
         content: str,
@@ -535,10 +439,8 @@ class MemoryManager:
             return None  # 空内容不查重
 
         conn = self._get_conn()
-        cats = self._expand_category("global")
-        placeholders = ",".join("?" for _ in cats)
-        conditions = [f"category IN ({placeholders})"]
-        params: list = list(cats)
+        conditions = ["category = 'global'"]
+        params: list = []
 
         if session_id:
             conditions.append("session_id = ?")
@@ -633,13 +535,11 @@ class MemoryManager:
             return True
         return False
 
-    def get_long_term(self, session_id="global", key="", limit=50) -> List[MemoryEntry]:
+    def get_global_memories(self, session_id="global", key="", limit=50) -> List[MemoryEntry]:
         """获取全局记忆"""
         conn = self._get_conn()
-        cats = self._expand_category("global")
-        placeholders = ",".join("?" for _ in cats)
-        conditions = ["category IN (%s)" % placeholders]
-        params = list(cats)
+        conditions = ["category = 'global'"]
+        params: list = []
         if session_id:
             conditions.insert(0, "session_id = ?")
             params.insert(0, session_id)
@@ -654,15 +554,15 @@ class MemoryManager:
 
     def get_preferences(self, session_id: str = "global") -> List[MemoryEntry]:
         """获取用户偏好"""
-        return self.get_long_term(session_id, key="user_pref")
+        return self.get_global_memories(session_id, key="user_pref")
 
     def get_experience(self, session_id: str = "global") -> List[MemoryEntry]:
         """获取技能经验"""
-        return self.get_long_term(session_id, key="skill_experience")
+        return self.get_global_memories(session_id, key="skill_experience")
 
     def get_task_summaries(self, session_id: str = "global") -> List[MemoryEntry]:
         """获取历史任务总结"""
-        return self.get_long_term(session_id, key="task_summary")
+        return self.get_global_memories(session_id, key="task_summary")
 
     # ==========================================================================
     # 记忆搜索
@@ -812,10 +712,8 @@ class MemoryManager:
             conditions.append("session_id = ?")
             params.append(session_id)
         if category:
-            expanded = self._expand_category(category)
-            placeholders = ",".join("?" for _ in expanded)
-            conditions.append(f"category IN ({placeholders})")
-            params.extend(expanded)
+            conditions.append("category = ?")
+            params.append(category)
 
         # 过滤过期
         conditions.append("(expires_at = '' OR expires_at > ?)")
@@ -959,7 +857,7 @@ class MemoryManager:
         original_count: int = 0,
     ) -> str:
         """保存对话总结为全局记忆"""
-        return self.add_long_term(
+        return self.add_global(
             session_id=session_id,
             key="conversation_summary",
             content=summary,
@@ -985,7 +883,7 @@ class MemoryManager:
         session_id: str = "global",
     ):
         """记录错误模式及修复方案"""
-        self.add_long_term(
+        self.add_global(
             session_id=session_id,
             key="error_pattern",
             content=f"错误: {error}\n修复: {fix}",
@@ -1002,22 +900,17 @@ class MemoryManager:
         conn = self._get_conn()
         stats = {}
         for cat in ("session", "global"):
-            cats = self._expand_category(cat)
-            placeholders = ",".join("?" for _ in cats)
             row = conn.execute(
-                f"SELECT COUNT(*) as cnt FROM memories WHERE category IN ({placeholders})",
-                cats,
+                "SELECT COUNT(*) as cnt FROM memories WHERE category = ?",
+                (cat,),
             ).fetchone()
             stats[f"{cat}_count"] = row["cnt"]
-
         total = conn.execute("SELECT COUNT(*) as cnt FROM memories").fetchone()
         stats["total_count"] = total["cnt"]
-
         sessions = conn.execute(
             "SELECT COUNT(DISTINCT session_id) as cnt FROM memories"
         ).fetchone()
         stats["distinct_sessions"] = sessions["cnt"]
-
         return stats
 
     def cleanup_expired(self) -> int:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.10.7",
+  "version": "1.10.8",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -278,8 +278,8 @@ class ApiServer:
         r.add_get("/api/session/status", self.handle_session_status_query)  # query param version
         r.add_get("/api/memory/stats", self.handle_memory_stats)
         r.add_get("/api/memory/search", self.handle_memory_search)
-        r.add_get("/api/memory/long-term", self.handle_list_long_term)
-        r.add_delete("/api/memory/long-term/{mid}", self.handle_delete_long_term)
+        r.add_get("/api/memory/list", self.handle_memory_list)
+        r.add_delete("/api/memory/{mid}", self.handle_delete_memory)
         r.add_post("/api/memory/cleanup", self.handle_memory_cleanup)
         # 权限管理
         r.add_get("/api/permissions", self.handle_get_permissions)
@@ -551,7 +551,7 @@ class ApiServer:
                 response = await self.core.process_message(clean_message, session_id)
 
             # 记忆保存已由 MainAgent._process_inner() 完成，此处不再重复保存
-            # （MainAgent 内部会保存 user + assistant 消息到短期记忆）
+            # （MainAgent 内部会保存 user + assistant 消息到会话记忆）
 
             # ── 收集执行事件（供前端展示命令执行过程） ──
             exec_events = []
@@ -795,11 +795,11 @@ class ApiServer:
                             # 使用已累积的结果（如果有）
                             saved = result_store.get("full_response", "")
                             if saved:
-                                self.core.memory.add_short_term(
+                                self.core.memory.add_session(
                                     session_id=session_id, role="assistant", content=saved,
                                 )
                             else:
-                                self.core.memory.add_short_term(
+                                self.core.memory.add_session(
                                     session_id=session_id, role="assistant",
                                     content=f"⚠️ [执行异常] {str(e)[:200]}",
                                 )
@@ -1647,7 +1647,7 @@ class ApiServer:
         if self.core.memory:
             rows = self.core.memory._get_conn().execute(
                 "SELECT session_id, COUNT(*) as cnt FROM memories "
-                "WHERE category IN ('session', 'short_term', 'working') GROUP BY session_id").fetchall()
+                "WHERE category = 'session' GROUP BY session_id").fetchall()
             session_counts = {}
             for r in rows:
                 sid = r["session_id"]
@@ -1667,7 +1667,7 @@ class ApiServer:
         if self.core.memory:
             rows = self.core.memory._get_conn().execute(
                 "SELECT session_id, COUNT(*) as cnt FROM memories "
-                "WHERE category IN ('session', 'short_term', 'working') GROUP BY session_id").fetchall()
+                "WHERE category = 'session' GROUP BY session_id").fetchall()
             session_counts = {}
             for r in rows:
                 sid = r["session_id"]
@@ -2301,12 +2301,12 @@ class ApiServer:
             prefix = f"{agent}_"
             rows = self.core.memory._get_conn().execute(
                 "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-                "WHERE category IN ('session', 'short_term', 'working') AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
+                "WHERE category = 'session' AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
                 (prefix + "%",)).fetchall()
         else:
             rows = self.core.memory._get_conn().execute(
                 "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-                "WHERE category IN ('session', 'short_term', 'working') GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
+                "WHERE category = 'session' GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
         sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
         # 批量获取自定义会话名称
         sids = [s["id"] for s in sessions]
@@ -2319,9 +2319,9 @@ class ApiServer:
             preview_rows = conn.execute(
                 f"SELECT m1.session_id, m1.content FROM memories m1 "
                 f"INNER JOIN (SELECT session_id, MAX(created_at) as max_t FROM memories "
-                f"WHERE session_id IN ({placeholders}) AND role='user' AND category IN ('session', 'short_term', 'working') "
+                f"WHERE session_id IN ({placeholders}) AND role='user' AND category = 'session' "
                 f"GROUP BY session_id) m2 ON m1.session_id = m2.session_id AND m1.created_at = m2.max_t "
-                f"WHERE m1.role='user' AND m1.category IN ('session', 'short_term', 'working')",
+                f"WHERE m1.role='user' AND m1.category = 'session'",
                 sids
             ).fetchall()
             for pr in preview_rows:
@@ -2339,7 +2339,7 @@ class ApiServer:
         prefix = f"{name}_"
         rows = self.core.memory._get_conn().execute(
             "SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories "
-            "WHERE category IN ('session', 'short_term', 'working') AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
+            "WHERE category = 'session' AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
             (prefix + "%",)).fetchall()
         sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
         # 批量获取自定义会话名称
@@ -2473,11 +2473,12 @@ class ApiServer:
             "role": e.role, "session_id": e.session_id, "created_at": e.created_at,
         } for e in results])
 
-    async def handle_list_long_term(self, request):
+    async def handle_memory_list(self, request):
         if not self.core.memory: return web.json_response([])
         cat = request.query.get("category", "global")
         limit = int(request.query.get("limit", "50"))
-        entries = self.core.memory._query(category=cat, limit=limit, order_by="created_at DESC")
+        session_id = request.query.get("session_id", "")
+        entries = self.core.memory._query(category=cat, session_id=session_id, limit=limit, order_by="created_at DESC")
         return web.json_response([{
             "id": e.id, "key": e.key, "content": e.content[:500],
             "summary": e.summary, "importance": e.importance,
@@ -2485,7 +2486,7 @@ class ApiServer:
             "session_id": e.session_id, "created_at": e.created_at,
         } for e in entries])
 
-    async def handle_delete_long_term(self, request):
+    async def handle_delete_memory(self, request):
         if self.core.memory:
             self.core.memory._get_conn().execute("DELETE FROM memories WHERE id=?", (request.match_info["mid"],))
             self.core.memory._get_conn().commit()
@@ -3256,7 +3257,7 @@ class ApiServer:
         """使用流式LLM调用处理消息，支持完整的agent循环（工具调用/操作执行）+ 实时流式输出
 
         核心改进:
-        - 每轮迭代结束后增量保存已流式输出的文本到短期记忆（即使客户端断开也不丢失）
+        - 每轮迭代结束后增量保存已流式输出的文本到会话记忆（即使客户端断开也不丢失）
         - 使用 frequency_penalty 减少大模型重复输出
         - 最终保存时使用累积文本而非 final_response，确保完整内容不丢失
 
@@ -3390,11 +3391,11 @@ class ApiServer:
                 recent = agent.memory.get_conversation(session_id, limit=3)
                 _has_assistant = any(e.role == "assistant" for e in recent)
                 if not _has_assistant and final_response and final_response.strip():
-                    agent.memory.add_short_term(
+                    agent.memory.add_session(
                         session_id=session_id, role="assistant", content=final_response,
                     )
 
-            # ── 保存工具调用过程到短期记忆（V2 路由） ──
+            # ── 保存工具调用过程到会话记忆（V2 路由） ──
             if agent.memory and agent._execution_events:
                 try:
                     from core.utils import truncate_str
@@ -3424,7 +3425,7 @@ class ApiServer:
                             pass  # code_result is duplicate of code_exec with final status
                     if tool_summary_parts:
                         exec_log = "\n".join(tool_summary_parts)
-                        agent.memory.add_short_term(
+                        agent.memory.add_session(
                             session_id=session_id,
                             role="tool",
                             content=exec_log,
@@ -3782,7 +3783,7 @@ class ApiServer:
                         if accumulated_text and len(accumulated_text) > _saved_text_length:
                             new_save_text = accumulated_text[_saved_text_length:]
                             if new_save_text.strip():
-                                agent.memory.add_short_term(
+                                agent.memory.add_session(
                                     session_id=session_id, role="assistant", content=new_save_text,
                                 )
                                 _saved_text_length = len(accumulated_text)
@@ -3932,7 +3933,7 @@ class ApiServer:
                         if accumulated_text and len(accumulated_text) > _saved_text_length:
                             new_save_text = accumulated_text[_saved_text_length:]
                             if new_save_text.strip():
-                                agent.memory.add_short_term(
+                                agent.memory.add_session(
                                     session_id=session_id, role="assistant", content=new_save_text,
                                 )
                                 _saved_text_length = len(accumulated_text)
@@ -3956,7 +3957,7 @@ class ApiServer:
                 if agent.memory and content and len(content) > _saved_text_length:
                     new_save_text = content[_saved_text_length:]
                     if new_save_text.strip():
-                        agent.memory.add_short_term(
+                        agent.memory.add_session(
                             session_id=session_id, role="assistant", content=new_save_text,
                         )
                         _saved_text_length = len(content)
@@ -3976,14 +3977,14 @@ class ApiServer:
         if agent.memory and saved_response and len(saved_response) > _saved_text_length:
             new_text = saved_response[_saved_text_length:]
             if new_text.strip():
-                agent.memory.add_short_term(
+                agent.memory.add_session(
                     session_id=session_id, role="assistant", content=new_text,
                 )
                 _saved_text_length = len(saved_response)
         elif agent.memory and not saved_response:
-            agent.memory.add_short_term(session_id=session_id, role="assistant", content="(执行完成，无文本回复)")
+            agent.memory.add_session(session_id=session_id, role="assistant", content="(执行完成，无文本回复)")
 
-        # ── 保存工具调用过程到短期记忆（供历史记录查看） ──
+        # ── 保存工具调用过程到会话记忆（供历史记录查看） ──
         if agent.memory and agent._execution_events:
             try:
                 from core.utils import truncate_str
@@ -4013,7 +4014,7 @@ class ApiServer:
                         pass  # code_result is duplicate of code_exec with final status
                 if tool_summary_parts:
                     exec_log = "\n".join(tool_summary_parts)
-                    agent.memory.add_short_term(
+                    agent.memory.add_session(
                         session_id=session_id,
                         role="tool",
                         content=exec_log,

package/web/ui/chat/chat_main.js

@@ -2047,7 +2047,7 @@ function _renderMessagesInner() {
           <div class="capability"><span class="cap-icon">💻</span> 代码编写与执行</div>
           <div class="capability"><span class="cap-icon">🔍</span> 网络搜索与阅读</div>
           <div class="capability"><span class="cap-icon">📁</span> 文件管理与操作</div>
-          <div class="capability"><span class="cap-icon">🧠</span> 长期记忆系统</div>
+          <div class="capability"><span class="cap-icon">🧠</span> 全局记忆系统</div>
           <div class="capability"><span class="cap-icon">🌐</span> 多平台接入</div>
           <div class="capability"><span class="cap-icon">🛠️</span> 系统命令执行</div>
         </div>

package/web/ui/chat/middle_chat.html

@@ -44,7 +44,7 @@
             <div class="capability"><span class="cap-icon">💻</span> 代码编写与执行</div>
             <div class="capability"><span class="cap-icon">🔍</span> 网络搜索与阅读</div>
             <div class="capability"><span class="cap-icon">📁</span> 文件管理与操作</div>
-            <div class="capability"><span class="cap-icon">🧠</span> 长期记忆系统</div>
+            <div class="capability"><span class="cap-icon">🧠</span> 全局记忆系统</div>
             <div class="capability"><span class="cap-icon">🌐</span> 多平台接入</div>
             <div class="capability"><span class="cap-icon">🛠️</span> 系统命令执行</div>
           </div>

package/web/ui/index.html

@@ -346,9 +346,8 @@ async function renderDashboard(){
     <div class="stat"><div class="label">已注册技能</div><div class="value">${s.skills||0}</div></div>
     <div class="stat"><div class="label">会话数</div><div class="value">${m.session_count||0}</div></div>
     <div class="stat"><div class="label">任务队列</div><div class="value">${s.queue?.total_submitted||0} 提交</div></div>
-    <div class="stat"><div class="label">短期记忆</div><div class="value">${m.short_term_count||0}</div></div>
-    <div class="stat"><div class="label">工作记忆</div><div class="value">${m.working_count||0}</div></div>
-    <div class="stat"><div class="label">长期记忆</div><div class="value">${m.long_term_count||0}</div></div>
+    <div class="stat"><div class="label">会话记忆</div><div class="value">${m.session_count||0}</div></div>
+    <div class="stat"><div class="label">全局记忆</div><div class="value">${m.global_count||0}</div></div>
   </div>`;
 }
 
@@ -913,13 +912,13 @@ function enterSession(sid,agentName){
 }
 
 // ========== Memory ==========
-let _memCategory='long_term';
+let _memCategory='global';
 async function renderMemory(){
   let stats={},lt=[];
   try{stats=await api('/api/memory/stats')}catch(e){stats={error:e.message}}
-  try{lt=await api('/api/memory/long-term?category='+encodeURIComponent(_memCategory))}catch(e){lt=[]}
+  try{lt=await api('/api/memory/list?category='+encodeURIComponent(_memCategory))}catch(e){lt=[]}
   if(stats.error){$('content').innerHTML='<div class="empty" style="color:var(--danger)">记忆系统异常: '+escHtml(stats.error)+'</div>';return}
-  const cats=[{k:'short_term',l:'短期记忆'},{k:'working',l:'工作记忆'},{k:'long_term',l:'长期记忆'}];
+  const cats=[{k:'global',l:'全局记忆'},{k:'session',l:'会话记忆'}];
   let tabHtml='<div class="flex gap-8 mb-8">';
   for(const c of cats){
     const active=c.k===_memCategory?'btn-primary':'btn-ghost';
@@ -927,22 +926,19 @@ async function renderMemory(){
     tabHtml+=`<button class="btn ${active}" onclick="_memCategory='${c.k}';renderMemory()">${c.l} (${count})</button>`;
   }
   tabHtml+='</div>';
-  let html=`<div class="grid" style="grid-template-columns:repeat(4,1fr);margin-bottom:16px">
+  let html=`<div class="grid" style="grid-template-columns:repeat(3,1fr);margin-bottom:16px">
     <div class="stat"><div class="label">总计</div><div class="value">${stats.total_count||0}</div></div>
-    <div class="stat"><div class="label">短期</div><div class="value">${stats.short_term_count||0}</div></div>
-    <div class="stat"><div class="label">工作</div><div class="value">${stats.working_count||0}</div></div>
-    <div class="stat"><div class="label">长期</div><div class="value">${stats.long_term_count||0}</div></div></div>`;
+    <div class="stat"><div class="label">全局记忆</div><div class="value">${stats.global_count||0}</div></div>
+    <div class="stat"><div class="label">会话记忆</div><div class="value">${stats.session_count||0}</div></div></div>`;
   html+=tabHtml;
   html+='<div class="flex gap-8 mb-16"><input id="memSearch" placeholder="搜索记忆..." onkeydown="if(event.key===\'Enter\')searchMemory()" style="max-width:400px"><button class="btn btn-primary" onclick="searchMemory()">搜索</button><button class="btn btn-ghost" onclick="cleanupMemory()">清理过期</button></div>';
   if(lt&&lt.length){
-    const isShortTerm=_memCategory==='short_term';
-    const showSession=isShortTerm;
-    const showRole=isShortTerm;
+    const isSession=_memCategory==='session';
     let thHtml='<tr>';
     thHtml+='<th>Key</th><th>内容</th>';
-    if(showRole)thHtml+='<th>角色</th>';
-    if(showSession)thHtml+='<th>会话</th>';
-    if(!isShortTerm)thHtml+='<th>重要性</th>';
+    thHtml+='<th>角色</th>';
+    thHtml+='<th>会话</th>';
+    if(!isSession)thHtml+='<th>重要性</th>';
     thHtml+='<th></th></tr>';
     html+='<table>'+thHtml;
     for(const e of lt){
@@ -952,14 +948,14 @@ async function renderMemory(){
       if(content.length>300)contentPreview+=`<span style="color:var(--text3)">... (${content.length}字)</span>`;
       html+='<tr><td style="white-space:nowrap;max-width:120px;overflow:hidden;text-overflow:ellipsis">'+escHtml(e.key||e.role||'-')+'</td>';
       html+='<td style="max-width:600px;word-break:break-word;font-size:13px">'+contentPreview+'</td>';
-      if(showRole)html+='<td style="white-space:nowrap">'+escHtml(e.role||'')+'</td>';
-      if(showSession)html+='<td style="white-space:nowrap;max-width:140px;overflow:hidden;text-overflow:ellipsis;font-size:12px;color:var(--text3)" title="'+escHtml(e.session_id||'')+'">'+escHtml((e.session_id||'').split('_web_')[0])+'</td>';
-      if(!isShortTerm)html+='<td>'+(e.importance!=null?e.importance.toFixed(2):'')+'</td>';
+      html+='<td style="white-space:nowrap">'+escHtml(e.role||'')+'</td>';
+      html+='<td style="white-space:nowrap;max-width:140px;overflow:hidden;text-overflow:ellipsis;font-size:12px;color:var(--text3)" title="'+escHtml(e.session_id||'')+'">'+escHtml((e.session_id||'').split('_web_')[0])+'</td>';
+      if(!isSession)html+='<td>'+(e.importance!=null?e.importance.toFixed(2):'')+'</td>';
       html+='<td><button class="btn btn-sm btn-danger" onclick="deleteMemory(\''+e.id+'\')">删除</button></td></tr>';
     }
     html+='</table>';
   }else{
-    html+='<div class="empty">暂无'+(_memCategory==='short_term'?'短期':_memCategory==='working'?'工作':'长期')+'记忆</div>';
+    html+='<div class="empty">暂无'+(_memCategory==='session'?'会话':'全局')+'记忆</div>';
   }
   $('content').innerHTML=html;
 }
@@ -979,7 +975,7 @@ async function searchMemory(){
   }
   html+='<button class="btn btn-ghost mt-8" onclick="renderMemory()">返回</button>';$('content').innerHTML=html;
 }
-async function deleteMemory(id){await api(`/api/memory/long-term/${id}`,{method:'DELETE'});renderMemory()}
+async function deleteMemory(id){await api(`/api/memory/${id}`,{method:'DELETE'});renderMemory()}
 async function cleanupMemory(){const r=await api('/api/memory/cleanup',{method:'POST'});showToast('清理了 '+(r.cleaned||0)+' 条','success');renderMemory()}
 
 // ========== 权限管理 ==========
@@ -1985,7 +1981,7 @@ async function sysLoadPreview(){
       lines.push('<span class="key">执行引擎:</span> '+escHtml(c.executor.execution_mode||'local')+' | Timeout: '+(c.executor.timeout||300)+'s');
     }
     if(c.memory){
-      lines.push('<span class="key">记忆:</span> 短期 '+(c.memory.max_short_term||50)+' 轮 | 自动总结: '+(c.memory.auto_summarize?'开':'关'));
+      lines.push('<span class="key">记忆:</span> 会话 '+(c.memory.max_session||50)+' 轮 | 自动总结: '+(c.memory.auto_summarize?'开':'关'));
     }
     if(c.agent){
       lines.push('<span class="key">Agent:</span> 最大迭代 '+(c.agent.max_iterations||30)+' | 并行 '+(c.agent.max_parallel||3));