myagent-ai 1.15.82 → 1.15.83

package/package.json

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

package/web/api_server.py

@@ -884,7 +884,11 @@ class ApiServer:
 
         agent_path = data.get("agent_path", "default")
         raw_session_id = data.get("session_id", "web_default")
-        session_id = f"{agent_path}_{raw_session_id}"
+        # Avoid double-prefixing: if the session_id already starts with agent_path_, use it directly
+        if raw_session_id.startswith(f"{agent_path}_"):
+            session_id = raw_session_id
+        else:
+            session_id = f"{agent_path}_{raw_session_id}"
         choice = data.get("choice", "queue")  # "continue" (插入后继续) 或 "queue" (排队)
 
         # 检查会话是否正在运行

package/web/ui/chat/chat_main.js

@@ -311,6 +311,11 @@ const StatePersistence = {
     if (savedRpSections) { Object.assign(rpSections, savedRpSections); }
     const savedNodes = StatePersistence.load('expandedNodes', ['default']);
     state.expandedNodes = new Set(savedNodes);
+    // 恢复上次活跃的会话 ID，供 loadSessions() 使用
+    var savedSessionId = StatePersistence.load('activeSessionId', null);
+    if (savedSessionId) {
+      state._pendingSessionRestore = savedSessionId;
+    }
   },
   /** 标记 setup 已完成（避免每次刷新弹出向导） */
   markSetupDone() { StatePersistence.save('setupDone', true); },
@@ -318,7 +323,7 @@ const StatePersistence = {
 };
 
 // ── Init ──
-function initChat() {
+async function initChat() {
   // Initialize theme
   initTheme();
   // Restore persisted UI state
@@ -333,8 +338,6 @@ function initChat() {
   if (urlMode === 'chat' || urlMode === 'exec') {
     state.chatMode = urlMode;
   }
-  // agent 参数先暂存，等 loadAgents() 完成后校验是否存在
-  state._pendingUrlAgent = urlAgent;
 
   // Popout mode: hide sidebar, collapse agent panel, update title
   if (isPopout) {
@@ -347,9 +350,7 @@ function initChat() {
     if (agentPanel) agentPanel.classList.add('collapsed');
     const agentToggle = document.getElementById('agentToggle');
     if (agentToggle) agentToggle.style.display = 'none';
-    // Update page title with agent name
-    const agentObj = findAgentByPath(urlAgent);
-    document.title = (agentObj ? agentObj.name : urlAgent || 'MyAgent') + ' - MyAgent';
+    // Update page title with agent name (after agents load)
   }
 
   // Apply restored state to DOM
@@ -357,7 +358,6 @@ function initChat() {
   if (panel) panel.classList.toggle('collapsed', !state.agentPanelOpen);
   if (state.chatMode === 'exec') setMode('exec');
   loadModels();
-  loadAgents();
   loadStatus();
   loadChatVersion();
   fetchGroups();
@@ -380,49 +380,53 @@ function initChat() {
     loadTaskPlan();
   }
 
-  // 如果 URL 指定了 agent 或 session，等 agent 列表加载后自动选中
-  // 注意：loadSessions() 内部会检查 URL session 参数并自动恢复
+  // 页面卸载前保存 UI 状态（包括活跃 session）
+  window.addEventListener('beforeunload', function() {
+    StatePersistence.saveUIState();
+  });
+
+  // ── 核心：先等待 loadAgents 完成（内含 loadSessions），再做 agent/session 选择 ──
+  // 这样避免了 setTimeout 竞态条件导致 sendMessage 和 selectAgent 互相干扰
+  await loadAgents();
+
+  // loadAgents 完成后，agent 列表和 sessions 已加载完毕
+  // 现在可以安全地做 agent/session 选择（不会再和 sendMessage 竞态）
+  if (isPopout) {
+    const agentObj = findAgentByPath(urlAgent);
+    document.title = (agentObj ? agentObj.name : urlAgent || 'MyAgent') + ' - MyAgent';
+  }
+
   if (urlAgent) {
-    setTimeout(function() {
-      // 校验 agent 是否真实存在，不存在则回退 default
-      var resolved = urlAgent;
-      if (!findAgentByPath(resolved)) {
-        console.warn('URL agent not found, fallback to default:', resolved);
-        resolved = 'default';
-      }
+    // URL 指定了 agent，校验后切换
+    var resolved = urlAgent;
+    if (!findAgentByPath(resolved)) {
+      console.warn('URL agent not found, fallback to default:', resolved);
+      resolved = 'default';
+    }
+    if (resolved !== state.activeAgent) {
       selectAgent(resolved);
-    }, 500);
+    }
   } else if (urlSession) {
     // 只有 session 没有 agent，尝试从 session ID 推断 agent
     const targetAgent = urlSession.split('_web_')[0] || 'default';
-    setTimeout(function() {
-      if (!findAgentByPath(targetAgent)) {
-        console.warn('Session-inferred agent not found, fallback to default:', targetAgent);
-        selectAgent('default');
-      } else {
-        selectAgent(targetAgent);
-      }
-    }, 500);
+    var target = targetAgent;
+    if (!findAgentByPath(target)) {
+      console.warn('Session-inferred agent not found, fallback to default:', target);
+      target = 'default';
+    }
+    if (target !== state.activeAgent) {
+      selectAgent(target);
+    }
+    // 如果 agent 已一致，loadSessions 内部已通过 URL session 参数自动恢复了
   } else {
-    // URL 中没有 session 参数，尝试从 localStorage 恢复上次的会话
-    var savedSessionId = StatePersistence.load('activeSessionId', null);
+    // URL 中没有 agent/session 参数，尝试从 localStorage 恢复上次的会话
     var savedSessionAgent = StatePersistence.load('activeSessionAgent', null);
-    if (savedSessionId && savedSessionAgent) {
-      // 确保 agent 一致，然后延迟等待 loadSessions() 完成后恢复
-      state._pendingSessionRestore = savedSessionId;
-      if (savedSessionAgent !== state.activeAgent) {
-        setTimeout(function() {
-          selectAgent(savedSessionAgent);
-        }, 500);
-      }
-      // 如果 agent 已经一致，loadSessions() 内部会自动处理
+    if (savedSessionAgent && savedSessionAgent !== state.activeAgent) {
+      // agent 不一致，需要切换（loadSessions 内部已通过 _pendingSessionRestore 处理 session 恢复）
+      selectAgent(savedSessionAgent);
     }
+    // 如果 agent 一致，loadSessions() 内部已通过 _pendingSessionRestore 自动处理了
   }
-
-  // 页面卸载前保存 UI 状态（包括活跃 session）
-  window.addEventListener('beforeunload', function() {
-    StatePersistence.saveUIState();
-  });
 }
 
 // Run init: if DOMContentLoaded already fired (dynamic script load), run immediately

package/web/ui/chat/flow_engine.js

@@ -1382,6 +1382,7 @@ async function sendMessage(opts) {
     let allExecEvents = [];  // All exec events (for summary panel at bottom)
     let msgIdx = state.messages.length;
     let sessionIdReceived = sessionId;
+    let sessionIdOriginal = sessionId;  // 保存前端原始 ID，用于后端返回不同 ID 时的回退查找
     let fullThought = '';
     let _isV2Mode = false;   // Track whether V2 structured output events are received
     let _v2RawXml = '';      // In V2 mode, accumulate raw XML from text_delta separately
@@ -1857,8 +1858,11 @@ async function sendMessage(opts) {
       state.sessions.unshift(existing);
     } else {
       // 防御：后端返回的 sessionIdReceived 和前端的不一致时，
-      // 找到当前 activeSessionId 的条目，更新其 ID 而非创建新条目
-      var localIdx = state.sessions.findIndex(s => s.id === state.activeSessionId);
+      // 优先用前端原始 ID 查找，再用 activeSessionId 查找
+      var localIdx = state.sessions.findIndex(s => s.id === sessionIdOriginal);
+      if (localIdx < 0) {
+        localIdx = state.sessions.findIndex(s => s.id === state.activeSessionId);
+      }
       if (localIdx >= 0) {
         var localEntry = state.sessions[localIdx];
         localEntry.id = sessionIdReceived;
@@ -1869,6 +1873,7 @@ async function sendMessage(opts) {
         state.sessions.unshift(localEntry);
         console.warn('[sendMessage] Session ID mismatch, updated local entry:', sessionIdReceived);
       } else {
+        // 真正的新会话（本地列表中不存在）
         state.sessions.unshift({ id: sessionIdReceived, name: formatSessionName(sessionIdReceived), messages: 2, last: new Date().toISOString() });
       }
     }