myagent-ai 1.23.24 → 1.23.25

package/package.json

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

package/web/ui/chat/chat_main.js

@@ -1943,11 +1943,37 @@ async function loadSessions() {
   if (urlSession && state.sessions.some(s => s.id === urlSession)) {
     // URL 指定了有效的 session ID，直接选中（刷新恢复）
     targetSessionId = urlSession;
-  } else if (state._pendingSessionRestore && state.sessions.some(s => s.id === state._pendingSessionRestore)) {
+  } 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('session', 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 (!state.activeSessionId && state.sessions.length > 0) {
+  } 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) {
     // 默认选中最新 session
     targetSessionId = state.sessions[0].id;
   }

package/web/ui/chat/flow_engine.js

@@ -1467,9 +1467,22 @@ async function sendMessage(opts) {
     return;
   }
 
+  // [v1.23.24] 立即锁定发送状态，防止竞态导致重复发送
+  // 原因：await checkLargeText() 会 yield 到事件循环，此时 isGenerating 仍为 false
+  // 如果用户再次按 Enter 或点击发送按钮，guard 检查通过，导致重复发送
+  state.isGenerating = true;
+  document.getElementById('sendBtn').style.display = 'none';
+  document.getElementById('stopBtn').style.display = '';
+
   // ── 大文本检测：超过阈值时弹出处理对话框 ──
   var blocked = await checkLargeText(text);
-  if (blocked) return;
+  if (blocked) {
+    // 用户取消了大文本发送，释放锁
+    state.isGenerating = false;
+    document.getElementById('sendBtn').style.display = '';
+    document.getElementById('stopBtn').style.display = 'none';
+    return;
+  }
 
   // Create session if needed (incorporate agent name)
   let sessionId = state.activeSessionId;
@@ -1546,12 +1559,9 @@ async function sendMessage(opts) {
   _userScrollLocked = false;
   scrollToBottom(true);
 
-  // Show typing
-  state.isGenerating = true;
+  // Show typing (isGenerating 和按钮切换已在函数顶部提前设置)
   showTypingIndicator();
   scrollToBottom(true);
-  document.getElementById('sendBtn').style.display = 'none';
-  document.getElementById('stopBtn').style.display = '';
 
   // Start execution progress polling (in exec mode)
   if (state.chatMode === 'exec') {
@@ -1640,6 +1650,15 @@ async function sendMessage(opts) {
             sessionIdReceived = evt.session_id;
             // Sync the actual session ID (backend may prefix with agent_path)
             state.activeSessionId = evt.session_id;
+            // [v1.23.24] 同步本地 sessions 列表中的 ID（前端生成的临时 ID → 后端 canonical ID）
+            if (sessionIdOriginal && sessionIdOriginal !== evt.session_id) {
+              var _sesIdx = state.sessions.findIndex(function(s) { return s.id === sessionIdOriginal; });
+              if (_sesIdx >= 0) {
+                state.sessions[_sesIdx].id = evt.session_id;
+                state.agentSessions[state.activeAgent] = [...state.sessions];
+                renderSessions();
+              }
+            }
             // ── 更新 URL 参数（后端返回的 session ID 可能与前端不同） ──
             try {
               const _url = new URL(window.location.href);