myagent-ai 1.32.6 → 1.32.8

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

@@ -35,8 +35,8 @@ logger = get_logger("myagent.memory")
 class MemoryEntry:
     """记忆条目"""
     id: str = field(default_factory=lambda: generate_id("mem"))
-    session_id: str = "default"
-    agent_id: int = 0                  # 所属agent ID（数字ID，从1开始，0表示未分配）
+    session_id: str = ""
+    agent_id: int = 1                  # 所属agent ID（数字ID，从1开始，1=全权Agent）
     category: str = "session"         # session | global
     key: str = ""                    # 检索键/标签
     content: str = ""                # 记忆内容
@@ -66,7 +66,7 @@ class MemoryEntry:
         return cls(
             id=row["id"],
             session_id=row["session_id"],
-            agent_id=int(dict(row).get("agent_id", 0) or 0),
+            agent_id=int(dict(row).get("agent_id", 1) or 1),
             category=row["category"],
             key=row["key"],
             content=row["content"],
@@ -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 '',
@@ -207,7 +207,8 @@ class MemoryManager:
                 return cursor.lastrowid
         except Exception as e:
             logger.error(f"获取 agent ID 失败: {e}")
-            return 0
+            # 返回 1 作为兜底（全权Agent），避免 agent_id=0 导致数据归属不明
+            return 1
 
     def register_agent(self, agent_name: str) -> int:
         """注册新 agent，返回分配的 ID"""
@@ -333,7 +334,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.8",
   "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）
@@ -2191,7 +2189,7 @@ window.addEventListener('beforeunload', function() {{
             """后台任务：即使 SSE 断开也完整执行并保存结果"""
             logger.info(f"[{session_id}] _run_stream_task 开始执行")
             # [v1.32.2] 安全修复: 定义 agent_id，避免 except 块中引用时 NameError
-            _stream_agent_id = self.core.memory.get_agent_id(agent_path) if self.core.memory and agent_path else 0
+            _stream_agent_id = self.core.memory.get_agent_id(agent_path) if self.core.memory and agent_path else 1
             try:
                 agent_cfg = self._read_agent_config(agent_path)
                 model_chain = self._build_model_chain(agent_cfg, agent_path)
@@ -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,34 +4326,22 @@ 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 精确过滤
-            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，精确过滤
+            target_aid = self.core.memory.get_agent_id(agent)
+            # 统一使用 agent_id 精确匹配
+            rows = conn.execute(
+                f"""SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last,
+                   agent_id 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,)).fetchall()
         else:
             # [v1.27.2] 无 agent 过滤时也返回 agent_id，供后台管理页面使用
             rows = conn.execute(
                 f"SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last, "
-                f"MAX(CASE WHEN agent_id > 0 THEN agent_id ELSE NULL END) as raw_agent_id FROM memories "
+                f"agent_id as raw_agent_id FROM memories "
                 f"WHERE category = 'session' AND role != '' "
                 f"AND key NOT IN {_hidden} "
                 f"GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
@@ -4369,7 +4354,7 @@ window.addEventListener('beforeunload', function() {{
                 agent_name = _agent_id_map.get(int(raw_aid), "")
             sessions.append({"id": r["session_id"], "messages": r["cnt"], "last": r["last"],
                           "agent_id": agent_name,  # 返回 agent 名称（非数字 ID）
-                          "agent_db_id": (int(raw_aid) if raw_aid is not None else 0),  # 数字 ID 供 URL 使用
+                          "agent_db_id": int(raw_aid),  # 数字 ID 供 URL 使用
                           "display_name": "", "preview": ""})
         # 批量获取自定义会话名称
         sids = [s["id"] for s in sessions]
@@ -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
@@ -6390,7 +6363,7 @@ window.addEventListener('beforeunload', function() {{
                 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():
-                    _fallback_agent_id = context.metadata.get("agent_db_id", 0)
+                    _fallback_agent_id = context.metadata.get("agent_db_id", 1)
                     agent.memory.add_session(agent_id=_fallback_agent_id,
                         session_id=session_id, role="assistant", content=final_response,
                     )

package/web/ui/admin/admin-agents.js

@@ -556,10 +556,18 @@ function confirmDeleteAgent(path,name){
   });
 }
 
-// 直接以执行模式打开与指定 Agent 的对话
-// [v1.27.2] 使用 a 参数（UrlCodec 编码），不再明文暴露 agent 路径
+// 直接以执行模式打开与指定 Agent 的对话（使用 aid 数字 ID）
 function chatWithAgent(path){
-  window.location.href='/ui/chat/chat_container.html?mode=exec&a='+UrlCodec.encode(path);
+  // 查找该 agent 的数字 ID
+  var _aid = null;
+  if (typeof allAgentsCache !== 'undefined' && Array.isArray(allAgentsCache)) {
+    for (var i = 0; i < allAgentsCache.length; i++) {
+      if (allAgentsCache[i].path === path) { _aid = allAgentsCache[i].aid; break; }
+    }
+  }
+  var url = '/ui/chat/chat_container.html?mode=exec';
+  if (_aid) url += '&aid=' + _aid;
+  window.location.href = url;
 }
 
 if (typeof window._adminRenderers === 'undefined') window._adminRenderers = {};

package/web/ui/admin/admin-core.js

@@ -158,26 +158,26 @@ document.getElementById('adminSidebar')?.addEventListener('click',function(e){
 loadVersion();
 setTimeout(()=>checkUpdate(false),30000);
 
-// [v1.23.81] 返回聊天：通过纯数字 session ID 恢复群聊（不再传递 group_id）
+// 返回聊天：通过 aid（数字 agent ID）和 session 参数恢复
 (function(){
   function _buildReturnUrl(){
     var params=new URLSearchParams(window.location.search);
     var base='/ui/chat/chat_container.html';
-    // 从 URL 参数中恢复聊天状态
-    var agent=params.get('from_agent');
+    // 从 URL 参数中恢复聊天状态（统一使用 aid 数字 ID）
+    var aid=params.get('from_aid');
     var session=params.get('from_session');
-    // [v1.23.81] 群聊纯数字 session ID（优先级最高，覆盖 ?s= 个人会话参数）
-    var groupSession=params.get('from_group_session');
+    // 群聊纯数字 session ID（优先级最高，覆盖 ?s= 个人会话参数）
+    var groupSession=params.get('from_g');
     var mode=params.get('from_mode');
     var parts=[];
     // 如果有群聊 session，用 ?g= 参数（纯数字 ID）
     if(groupSession && /^[0-9]+$/.test(groupSession)){
       parts.push('g='+groupSession);
-      if(agent)parts.push('a='+encodeURIComponent(agent));
+      if(aid)parts.push('aid='+aid);
       if(mode)parts.push('mode='+encodeURIComponent(mode));
     } else {
       // 个人聊天模式
-      if(agent)parts.push('a='+encodeURIComponent(agent));
+      if(aid)parts.push('aid='+aid);
       if(mode)parts.push('mode='+encodeURIComponent(mode));
       if(session)parts.push('s='+encodeURIComponent(session));
     }

package/web/ui/chat/chat_main.js

@@ -86,19 +86,20 @@ function closeMobileAgentPanel() {
   if (overlay) overlay.classList.remove('active');
 }
 
-// [v1.23.81] 跳转后台管理：携带当前聊天上下文（agent、session、群聊session ID），以便"返回聊天"正确恢复
+// 跳转后台管理：携带当前聊天上下文（aid数字ID、session、群聊ID），以便"返回聊天"正确恢复
 function goToAdmin() {
   var params = new URLSearchParams();
   var page = 'dashboard';
-  // 传递当前聊天状态，供"返回聊天"恢复
-  if (state.activeAgent) params.set('from_agent', state.activeAgent);
+  // 传递当前聊天状态，供"返回聊天"恢复（统一使用 aid 数字 ID）
+  var _curAgentObj = findAgentByPath(state.activeAgent);
+  if (_curAgentObj && _curAgentObj.aid) params.set('from_aid', _curAgentObj.aid);
   if (state.chatMode) params.set('from_mode', state.chatMode);
   if (state.activeSessionId && currentView !== 'group') params.set('from_session', state.activeSessionId);
-  // [v1.23.81] 传递群聊纯数字 session ID（从 URL 读取），而非 JS 变量
+  // 传递群聊纯数字 session ID（从 URL 读取）
   if (typeof currentView !== 'undefined' && currentView === 'group') {
     var urlP = new URLSearchParams(window.location.search);
     var gSession = urlP.get('g');
-    if (gSession) params.set('from_group_session', gSession);
+    if (gSession) params.set('from_g', gSession);
   }
   // 保留原始 ?page= 参数
   var origParams = new URLSearchParams(window.location.search);
@@ -356,10 +357,7 @@ const StatePersistence = {
     if (savedSessionId) {
       state._pendingSessionRestore = savedSessionId;
     }
-    // [v1.23.81] 不再从 localStorage 恢复群聊状态（统一由 URL ?g= 参数恢复）
-    // 仅保留兼容处理：如果旧版遗留了 localStorage 群聊状态，清除它
-    StatePersistence.remove('currentView');
-    StatePersistence.remove('currentGroupId');
+    // 群聊状态统一由 URL ?g= 参数恢复，不从 localStorage 恢复
   },
   /** 标记 setup 已完成（避免每次刷新弹出向导） */
   markSetupDone() { StatePersistence.save('setupDone', true); },
@@ -376,19 +374,13 @@ async function initChat() {
   initAttachmentUI();
 
   // URL 参数处理: ?aid=数字ID&mode=exec&s=编码session&g=群聊ID&popout=1
-  // [v1.27.2] 使用 aid（数字 agent ID）代替明文 agent 名字
   const urlParams = new URLSearchParams(window.location.search);
   const urlAid = parseInt(urlParams.get('aid') || '', 10) || 0;
-  // 兼容旧格式 ?a= 编码 或 ?agent= 明文
-  const urlAgentLegacy = UrlCodec.decode(urlParams.get('a') || '') || UrlCodec.decode(urlParams.get('agent') || '');
   const urlMode = urlParams.get('mode');
-  const urlSession = UrlCodec.decode(urlParams.get('s') || '') || UrlCodec.decode(urlParams.get('session') || '');
+  const urlSession = UrlCodec.decode(urlParams.get('s') || '');
   const isPopout = urlParams.get('popout') === '1';
-  // [v1.23.81] 群聊纯数字 session ID（?g= 参数，优先级最高）
+  // 群聊纯数字 session ID（?g= 参数，优先级最高）
   const urlGroupSession = urlParams.get('g') || '';
-  // 兼容旧版 ?group= 参数（从后台管理返回时的旧格式）
-  const urlGroupSessionLegacy = urlParams.get('from_group_session') || '';
-  const _effectiveGroupSession = urlGroupSession || urlGroupSessionLegacy;
   if (urlMode === 'chat' || urlMode === 'exec') {
     state.chatMode = urlMode;
   }
@@ -473,26 +465,11 @@ async function initChat() {
   state.agentsFlat.forEach(function(a) {
     if (a.aid) _aidToPath[a.aid] = a.path;
   });
-  // 从 URL 解析 agent: 优先 aid（数字），兼容 a/agent（编码/明文）
+  // 从 URL 解析 agent: 仅支持 aid（数字 agent ID）
   var urlAgent = '';
   if (urlAid && _aidToPath[urlAid]) {
     urlAgent = _aidToPath[urlAid];
-  } else if (urlAgentLegacy) {
-    urlAgent = urlAgentLegacy;
   }
-  // 清理 URL 中的旧格式参数（agent/a/session），统一使用 aid/s
-  try {
-    var _cleanUrl = new URL(window.location.href);
-    _cleanUrl.searchParams.delete('agent');
-    _cleanUrl.searchParams.delete('a');
-    _cleanUrl.searchParams.delete('session');
-    if (urlAgent && !urlAid) {
-      // 如果没有 aid 但有旧格式 agent，添加 aid
-      var _agentObj = findAgentByPath(urlAgent);
-      if (_agentObj && _agentObj.aid) _cleanUrl.searchParams.set('aid', _agentObj.aid);
-    }
-    window.history.replaceState({}, '', _cleanUrl.toString());
-  } catch (_) {}
 
   if (isPopout) {
     const agentObj = findAgentByPath(urlAgent);
@@ -520,12 +497,12 @@ async function initChat() {
   }
 
   // 如果 URL 中有 ?g= 纯数字 session ID，优先恢复群聊
-  if (_effectiveGroupSession && /^[0-9]+$/.test(_effectiveGroupSession)) {
+  if (urlGroupSession && /^[0-9]+$/.test(urlGroupSession)) {
     if (urlAgent && urlAgent !== state.activeAgent) {
       state.activeAgent = urlAgent;
       StatePersistence.save('activeAgent', urlAgent);
     }
-    _restoreGroupBySession(_effectiveGroupSession);
+    _restoreGroupBySession(urlGroupSession);
   } else if (urlAgent) {
     var resolved = urlAgent;
     if (!findAgentByPath(resolved)) {
@@ -536,17 +513,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 +1790,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 +1813,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 +1887,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 +1911,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);
@@ -2678,40 +2636,18 @@ async function loadSessions() {
     // 优先级: URL session 参数 > localStorage 持久化的 session > 最新 session
     // [fix] 所有候选 session ID 必须属于当前 agent 的会话列表，防止错乱到其它 agent 的历史对话
     const urlParams = new URLSearchParams(window.location.search);
-    const urlSession = UrlCodec.decode(urlParams.get('s') || '') || UrlCodec.decode(urlParams.get('session') || '');
+    const urlSession = UrlCodec.decode(urlParams.get('s') || '');
     var targetSessionId = null;
 
     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) {
@@ -3039,10 +2975,6 @@ async function selectSession(id) {
   try {
     const url = new URL(window.location.href);
     url.searchParams.set('s', UrlCodec.encode(id));
-    // 移除旧格式参数
-    url.searchParams.delete('a');
-    url.searchParams.delete('agent');
-    url.searchParams.delete('session');
     // 设置 aid（数字 agent ID）
     var _selAgentObj = findAgentByPath(state.activeAgent);
     if (_selAgentObj && _selAgentObj.aid) {

package/web/ui/chat/flow_engine.js

@@ -2502,7 +2502,7 @@ async function handleInjectChoice(choice) {
   clearDraft();
 
   try {
-    const rawSid = state.activeSessionId ? state.activeSessionId.replace(`${state.activeAgent}_`, '') : 'web_default';
+    const rawSid = state.activeSessionId || 'web_default';
     const resp = await fetch('/api/chat/inject', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },

package/web/ui/chat/groupchat.js

@@ -255,8 +255,9 @@ async function selectGroup(gid) {
       var sessionId = sessionData.sid;
       // 用群聊专用 ?g= 参数更新 URL（不刷新页面），纯数字 session ID
       var newUrl = '/ui/chat/chat_container.html?g=' + sessionId;
-      if (typeof state !== 'undefined' && state.activeAgent) {
-        newUrl += '&a=' + encodeURIComponent(state.activeAgent);
+      var _grpAgentObj = (typeof findAgentByPath === 'function') ? findAgentByPath(state.activeAgent) : null;
+      if (_grpAgentObj && _grpAgentObj.aid) {
+        newUrl += '&aid=' + _grpAgentObj.aid;
       }
       window.history.replaceState({groupSession: sessionId, groupId: gid}, '', newUrl);
     }
@@ -344,13 +345,14 @@ function exitGroupChat() {
   currentView = 'chat';
   currentGroupId = null;
   groupMessages = [];
-  // [v1.23.81] 清除群聊 ?g= session URL，恢复普通聊天 URL
+  // 清除群聊 ?g= session URL，恢复普通聊天 URL（统一使用 aid 数字 ID）
   var cleanUrl = '/ui/chat/chat_container.html';
-  if (typeof state !== 'undefined' && state.activeAgent && state.activeAgent !== (typeof findMasterAgentPath === 'function' ? findMasterAgentPath() : '1')) {
-    cleanUrl += '?a=' + encodeURIComponent(state.activeAgent);
+  var _exitAgentObj = (typeof findAgentByPath === 'function') ? findAgentByPath(state.activeAgent) : null;
+  if (_exitAgentObj && _exitAgentObj.aid) {
+    cleanUrl += '?aid=' + _exitAgentObj.aid;
   }
   if (typeof state !== 'undefined' && state.activeSessionId && state.activeSessionId !== '__new__') {
-    cleanUrl += (cleanUrl.indexOf('?') >= 0 ? '&' : '?') + 's=' + encodeURIComponent(state.activeSessionId);
+    cleanUrl += (cleanUrl.indexOf('?') >= 0 ? '&' : '?') + 's=' + UrlCodec.encode(state.activeSessionId);
   }
   window.history.replaceState({}, '', cleanUrl);
   // 清除群聊 localStorage 持久化状态
@@ -456,8 +458,9 @@ function startPrivateChatFromGroup(agentPath) {
     StatePersistence.remove('currentGroupId');
     // 清除群聊 URL 中的 ?g= 参数
     var cleanUrl = '/ui/chat/chat_container.html';
-    if (typeof state !== 'undefined' && agentPath && agentPath !== (typeof findMasterAgentPath === 'function' ? findMasterAgentPath() : '1')) {
-      cleanUrl += '?a=' + encodeURIComponent(agentPath);
+    var _memAgentObj = (typeof findAgentByPath === 'function') ? findAgentByPath(agentPath) : null;
+    if (_memAgentObj && _memAgentObj.aid) {
+      cleanUrl += '?aid=' + _memAgentObj.aid;
     }
     window.history.replaceState({}, '', cleanUrl);
     // 让 selectAgent 处理完整的私聊切换