myagent-ai 1.32.6 → 1.32.7

package/agents/main_agent.py

@@ -221,7 +221,7 @@ class MainAgent(BaseAgent):
             try:
                 self.agent_id = self.memory.get_agent_id(self.name)
             except Exception:
-                self.agent_id = 0
+                self.agent_id = 1
 
     def init_context_builder(self, memory_manager=None, skill_registry=None, knowledge_base_dir=None, context_window=None):
         """初始化 Context Builder（在系统启动后调用，注入依赖）"""

package/memory/manager.py

@@ -147,14 +147,14 @@ class MemoryManager:
         from datetime import datetime as _dt
         from core.utils import get_config_tz
         now = _dt.now(get_config_tz()).strftime("%Y-%m-%d %H:%M:%S")
-        conn.execute("INSERT OR IGNORE INTO agents (id, name, created_at) VALUES (1, 'default', ?)", (now,))
+        conn.execute("INSERT OR IGNORE INTO agents (id, name, created_at) VALUES (1, '1', ?)", (now,))
 
         # 创建 memories 表
         conn.executescript("""
             CREATE TABLE IF NOT EXISTS memories (
                 id TEXT PRIMARY KEY,
                 session_id TEXT NOT NULL,
-                agent_id INTEGER NOT NULL DEFAULT 0,
+                agent_id INTEGER NOT NULL DEFAULT 1,
                 category TEXT NOT NULL,
                 key TEXT DEFAULT '',
                 content TEXT DEFAULT '',
@@ -333,7 +333,7 @@ class MemoryManager:
     # 会话记忆 (session) — 对话上下文 + 任务进度
     # ==========================================================================
 
-    def add_session(self, session_id, agent_id=0, role="", content="", key="", importance=0.5, metadata=None) -> str:
+    def add_session(self, session_id, agent_id=1, role="", content="", key="", importance=0.5, metadata=None) -> str:
         """添加会话记忆。内容不包含时间前缀，时间仅存于 created_at 和 metadata。"""
         from datetime import datetime as _dt
         from core.utils import get_config_tz

package/package.json

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

package/web/api_server.py

@@ -1896,8 +1896,7 @@ window.addEventListener('beforeunload', function() {{
         agent_path = data.get("agent_path", agent_name)
         # 获取数字 agent_id
         agent_id = self.core.memory.get_agent_id(agent_path)
-        # 统一使用 sid 作为会话标识（兼容旧字段 session_id）
-        session_id = data.get("sid", "") or data.get("session_id", "") or "web_default"
+        session_id = data.get("sid", "") or data.get("session_id", "")
         chat_mode = data.get("mode", "")  # "exec" = 执行模式
         escalated = data.get("escalated", False)  # 临时提权到 local
 
@@ -2056,8 +2055,7 @@ window.addEventListener('beforeunload', function() {{
             return web.Response(text="data: " + json.dumps({"error": "message is required"}) + "\n\n", content_type="text/event-stream")
 
         agent_path = data.get("agent_path", data.get("agent_name", "1")) or "1"
-        # 统一使用 sid 作为会话标识（兼容旧字段 session_id）
-        session_id = data.get("sid", "") or data.get("session_id", "") or "web_default"
+        session_id = data.get("sid", "") or data.get("session_id", "")
         chat_mode = data.get("mode", "")
         escalated = data.get("escalated", False)
         voice_text = data.get("voice_text", "").strip()  # 语音转文字原始文本（用于 usersays_correct）
@@ -2449,8 +2447,7 @@ window.addEventListener('beforeunload', function() {{
             return web.json_response({"error": "message is required"}, status=400)
 
         agent_path = data.get("agent_path", "1") or "1"
-        # 统一使用 sid 作为会话标识（兼容旧字段 session_id）
-        session_id = data.get("sid", "") or data.get("session_id", "web_default")
+        session_id = data.get("sid", "") or data.get("session_id", "")
         choice = data.get("choice", "queue")  # "continue" (插入后继续) 或 "queue" (排队)
 
         # 检查会话是否正在运行
@@ -3834,12 +3831,12 @@ window.addEventListener('beforeunload', function() {{
             # 清理该 Agent 相关的会话和记忆数据
             if self.core.memory:
                 try:
-                    # 删除相关会话 (session_id 格式: agent_session_xxx 或 agent_web_xxx)
+                    # 删除该 agent 的所有会话（通过 agent_id 精确匹配）
                     conn = self.core.memory._get_conn()
-                    like_pattern = f"{path}%"
+                    target_aid = self.core.memory.get_agent_id(path)
                     rows = conn.execute(
-                        "SELECT DISTINCT session_id FROM memories WHERE session_id LIKE ?",
-                        (like_pattern,),
+                        "SELECT DISTINCT session_id FROM memories WHERE agent_id = ?",
+                        (target_aid,),
                     ).fetchall()
                     for row in rows:
                         sid = row["session_id"]
@@ -4329,29 +4326,17 @@ window.addEventListener('beforeunload', function() {{
         _hidden = '(' + ','.join(["'llm_output'", "'llm_input'", "'tool_result_raw'", "'conversation_insight'"]) + ')'
         # 只统计用户可见的消息数（排除 llm_output 和 conversation_insight）
         if agent:
-            # [v1.27.2] 先将 agent 路径转为数字 ID，用数字 ID 精确过滤
+            # 将 agent 路径转为数字 ID，精确过滤
             target_aid = self.core.memory.get_agent_id(agent) if agent else 0
-            # [v1.32.4] 兼容旧路径 "default" 和新路径 "1"，两者都指全权Agent
-            if agent == "1" or agent == "default":
-                # default agent: agent_id=0（未分配）或 agent_id=1（default 的数字 ID）或 旧格式
-                rows = conn.execute(
-                    f"""SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last,
-                       MAX(CASE WHEN agent_id > 1 THEN agent_id ELSE NULL END) as raw_agent_id FROM memories 
-                       WHERE category = 'session' AND role != '' 
-                       AND key NOT IN {_hidden}
-                       AND (agent_id = 0 OR agent_id = ? OR session_id = 'web_default' OR session_id LIKE 'sess_%')
-                       GROUP BY session_id ORDER BY last DESC LIMIT 100""",
-                    (target_aid,)).fetchall()
-            else:
-                # 其他 agent: agent_id=数字ID 或 session_id 前缀匹配（旧数据）
-                rows = conn.execute(
-                    f"""SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last,
-                       MAX(CASE WHEN agent_id != ? THEN agent_id ELSE NULL END) as raw_agent_id FROM memories 
-                       WHERE category = 'session' AND role != '' 
-                       AND key NOT IN {_hidden}
-                       AND (agent_id = ? OR session_id LIKE ?)
-                       GROUP BY session_id ORDER BY last DESC LIMIT 100""",
-                    (target_aid, target_aid, f"{agent}_%")).fetchall()
+            # 统一使用 agent_id 精确匹配，不再兼容旧数据
+            rows = conn.execute(
+                f"""SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last,
+                   MAX(CASE WHEN agent_id != ? THEN agent_id ELSE NULL END) as raw_agent_id FROM memories
+                   WHERE category = 'session' AND role != ''
+                   AND key NOT IN {_hidden}
+                   AND agent_id = ?
+                   GROUP BY session_id ORDER BY last DESC LIMIT 100""",
+                (target_aid, target_aid)).fetchall()
         else:
             # [v1.27.2] 无 agent 过滤时也返回 agent_id，供后台管理页面使用
             rows = conn.execute(
@@ -4399,25 +4384,13 @@ window.addEventListener('beforeunload', function() {{
         name = request.match_info["name"]
         if not self.core.memory:
             return web.json_response({"agent": name, "sessions": []})
-        # [v1.27.2] 使用数字 agent_id 精确过滤，同时兼容旧数据
+        # 使用数字 agent_id 精确过滤
         target_aid = self.core.memory.get_agent_id(name)
-        # [v1.32.4] 兼容旧路径 "default" 和新路径 "1"
-        if name == "1" or name == "default":
-            # default agent: agent_id=0 或 agent_id=1 或 旧格式
-            rows = self.core.memory._get_conn().execute(
-                """SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories 
-                   WHERE category = 'session' 
-                   AND (agent_id = 0 OR agent_id = ? OR session_id = 'web_default' OR session_id LIKE 'sess_%')
-                   GROUP BY session_id ORDER BY last DESC LIMIT 100""",
-                (target_aid,)).fetchall()
-        else:
-            # 其他 agent: agent_id=数字ID 或 session_id 前缀匹配（旧数据）
-            rows = self.core.memory._get_conn().execute(
-                """SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories 
-                   WHERE category = 'session' 
-                   AND (agent_id = ? OR session_id LIKE ?)
-                   GROUP BY session_id ORDER BY last DESC LIMIT 100""",
-                (target_aid, f"{name}_%")).fetchall()
+        rows = self.core.memory._get_conn().execute(
+            """SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories
+               WHERE category = 'session' AND agent_id = ?
+               GROUP BY session_id ORDER BY last DESC LIMIT 100""",
+            (target_aid,)).fetchall()
         sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
         # 批量获取自定义会话名称
         sids = [s["id"] for s in sessions]
@@ -6140,7 +6113,7 @@ window.addEventListener('beforeunload', function() {{
         context.metadata["user_voice_text"] = voice_text  # 语音输入原始文本（用于 usersays_correct）
 
         # [v1.28] 传入正确的 agent_db_id，确保 V2 路径保存会话时使用正确的 agent_id
-        agent_id = 0  # [v1.32.2] 安全修复: 定义 agent_id，避免后续引用时 NameError
+        agent_id = 1  # 默认为全权Agent
         if agent_path and self.core.memory:
             agent_id = self.core.memory.get_agent_id(agent_path)
             context.metadata["agent_db_id"] = agent_id

package/web/ui/chat/chat_main.js

@@ -536,17 +536,8 @@ async function initChat() {
       selectAgent(resolved);
     }
   } else if (urlSession) {
-    // 只有 session 没有 agent，尝试从 session ID 推断 agent（兼容旧格式 agent_web_xxx）
-    var targetAgent = findMasterAgentPath();
-    if (urlSession.indexOf('_web_') >= 0) {
-      targetAgent = urlSession.split('_web_')[0] || findMasterAgentPath();
-    }
-    // 新格式 sess_xxx 无法推断 agent，回退 master
-    var target = targetAgent;
-    if (!findAgentByPath(target)) {
-      console.warn('Session-inferred agent not found, fallback to master:', target);
-      target = findMasterAgentPath();
-    }
+    // 只有 session 没有 agent，回退 master agent
+    var target = findMasterAgentPath();
     if (target !== state.activeAgent) {
       selectAgent(target);
     }
@@ -1822,26 +1813,17 @@ function findAgentByPath(path) {
   return state.agentsFlat.find(function(a) { return a.path === path; });
 }
 
-// [v1.32.4] 查找系统级 Agent 的路径（兼容旧路径 'default'/'配置助手' 和新路径 '1'/'2'）
+// [v1.32.7] 查找系统级 Agent 的路径
 function findMasterAgentPath() {
-  // 优先按新路径 "1"，兼容旧路径 "default"，再按 system 标志+名称兜底
-  var a = state.agentsFlat.find(function(x) { return x.path === '1'; })
-    || state.agentsFlat.find(function(x) { return x.path === 'default'; })
-    || state.agentsFlat.find(function(x) { return x.system && x.name === '全权Agent'; })
-    || state.agentsFlat.find(function(x) { return x.system; });
-  return a ? a.path : 'default';
+  var a = state.agentsFlat.find(function(x) { return x.path === '1'; });
+  return a ? a.path : '1';
 }
 function findHelperAgentPath() {
-  var a = state.agentsFlat.find(function(x) { return x.path === '2'; })
-    || state.agentsFlat.find(function(x) { return x.path === '配置助手'; })
-    || state.agentsFlat.find(function(x) { return x.system && x.name === '配置助手'; })
-    || null;
+  var a = state.agentsFlat.find(function(x) { return x.path === '2'; });
   return a ? a.path : null;
 }
 function isSystemAgentPath(path) {
-  var mp = findMasterAgentPath();
-  var hp = findHelperAgentPath();
-  return path === mp || (hp !== null && path === hp);
+  return path === '1' || path === '2';
 }
 
 function getActiveAgentObj() {
@@ -1854,8 +1836,7 @@ async function loadAgents() {
     state.agentTree = treeData || [];
     state.agentsFlat = flattenTree(state.agentTree, 0, null);
 
-    // [v1.32.4] 兼容旧路径：如果后端没有 path='default' 的 agent，不创建合成的 fake agent
-    // 而是依赖 findMasterAgentPath() 来正确解析 master agent 路径
+    // 使用 findMasterAgentPath() 解析 master agent 路径
     var _masterPath = findMasterAgentPath();
 
     for (var i = 0; i < state.agentsFlat.length; i++) {
@@ -1929,7 +1910,7 @@ function renderRightPanelSections() {
 function renderMasterAgentCard() {
   var el = document.getElementById('rpMasterAgent');
   if (!el) return;
-  // [v1.32.4] 使用 findMasterAgentPath() 兼容旧路径 'default' 和新路径 '1'
+  // 使用 findMasterAgentPath() 获取 master agent 路径
   var masterPath = findMasterAgentPath();
   var agent = findAgentByPath(masterPath);
   var isActive = state.activeAgent === masterPath;
@@ -1953,7 +1934,7 @@ function renderMasterAgentCard() {
 function renderHelperAgentCard() {
   var el = document.getElementById('rpHelperAgent');
   if (!el) return;
-  // [v1.32.4] 使用 findHelperAgentPath() 兼容旧路径 '配置助手' 和新路径 '2'
+  // 使用 findHelperAgentPath() 获取 helper agent 路径
   var helperPath = findHelperAgentPath();
   if (!helperPath) { el.innerHTML = ''; return; }  // 无配置助手则不渲染
   var agent = findAgentByPath(helperPath);
@@ -2684,34 +2665,12 @@ async function loadSessions() {
     if (urlSession && state.sessions.some(s => s.id === urlSession)) {
       // URL 指定了有效的 session ID，直接选中（刷新恢复）
       targetSessionId = urlSession;
-    } else if (urlSession) {
-      // [v1.23.24] 前缀匹配 fallback：前端生成的临时 ID 与后端 canonical ID 可能不同
-      // 例如前端 "default_web_20250101120000" 后端实际为 "default_web_20250101120000_a1b2c3"
-      var prefixMatch = state.sessions.find(function(s) {
-        return s.id.startsWith(urlSession) || urlSession.startsWith(s.id);
-      });
-      if (prefixMatch) {
-        targetSessionId = prefixMatch.id;
-        // 更新 URL 为 canonical ID，避免下次刷新再走 fallback
-        try {
-          var _fixUrl = new URL(window.location.href);
-          _fixUrl.searchParams.set('s', UrlCodec.encode(prefixMatch.id));
-          window.history.replaceState({}, '', _fixUrl.toString());
-        } catch (_) {}
-      }
     }
     if (!targetSessionId && state._pendingSessionRestore && state.sessions.some(s => s.id === state._pendingSessionRestore)) {
       // 从 localStorage 恢复的 session（beforeunload 触发的保存）
       targetSessionId = state._pendingSessionRestore;
       state._pendingSessionRestore = null;  // 清除，防止重复恢复
     } else if (!targetSessionId && state._pendingSessionRestore) {
-      // [v1.23.24] localStorage 恢复的 ID 也不匹配，尝试前缀匹配
-      var lsPrefixMatch = state.sessions.find(function(s) {
-        return s.id.startsWith(state._pendingSessionRestore) || state._pendingSessionRestore.startsWith(s.id);
-      });
-      if (lsPrefixMatch) {
-        targetSessionId = lsPrefixMatch.id;
-      }
       state._pendingSessionRestore = null;
     }
     if (!targetSessionId && !state.activeSessionId && state.sessions.length > 0) {