myagent-ai 1.23.23 → 1.23.25

package/memory/manager.py

@@ -318,12 +318,18 @@ class MemoryManager:
         return entries
 
     def get_conversation_all(self, session_id, limit=5000) -> List[MemoryEntry]:
-        """获取全量对话历史（包含所有内部条目），用于完整回溯。"""
+        """获取全量对话历史（包含所有内部条目），用于完整回溯。limit=0 表示无限制。"""
         conn = self._get_conn()
-        sql = """SELECT * FROM memories
-                 WHERE session_id = ? AND category = 'session' AND role != ''
-                 ORDER BY created_at ASC, rowid ASC LIMIT ?"""
-        rows = conn.execute(sql, (session_id, limit)).fetchall()
+        if limit and limit > 0:
+            sql = """SELECT * FROM memories
+                     WHERE session_id = ? AND category = 'session' AND role != ''
+                     ORDER BY created_at ASC, rowid ASC LIMIT ?"""
+            rows = conn.execute(sql, (session_id, limit)).fetchall()
+        else:
+            sql = """SELECT * FROM memories
+                     WHERE session_id = ? AND category = 'session' AND role != ''
+                     ORDER BY created_at ASC, rowid ASC"""
+            rows = conn.execute(sql, (session_id,)).fetchall()
         return [MemoryEntry.from_row(row) for row in rows]
 
     def search_by_time_range(

package/package.json

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

package/web/api_server.py

@@ -4269,9 +4269,9 @@ window.addEventListener('beforeunload', function() {{
         sid = request.match_info["sid"]
         if not self.core.memory:
             return web.json_response([])
-        limit = min(int(request.query.get("limit", 5000)), 5000)
+        limit = int(request.query.get("limit", 0))
         offset = int(request.query.get("offset", 0))
-        entries = self.core.memory.get_conversation_all(sid, limit=limit + offset)
+        entries = self.core.memory.get_conversation_all(sid, limit=limit + offset if limit else 0)
         entries = entries[offset:]
         return web.json_response([{
             "role": e.role, "content": e.content, "time": e.created_at,
@@ -4285,9 +4285,9 @@ window.addEventListener('beforeunload', function() {{
             return web.json_response([])
         if not self.core.memory:
             return web.json_response([])
-        limit = min(int(request.query.get("limit", 5000)), 5000)
+        limit = int(request.query.get("limit", 0))
         offset = int(request.query.get("offset", 0))
-        entries = self.core.memory.get_conversation_all(sid, limit=limit + offset)
+        entries = self.core.memory.get_conversation_all(sid, limit=limit + offset if limit else 0)
         entries = entries[offset:]
         return web.json_response([{
             "role": e.role, "content": e.content, "time": e.created_at,

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

@@ -67,24 +67,28 @@ async function _loadSessionMessages(){
   $('content').innerHTML=html;
 }
 // ========== Raw 原始消息查看 ==========
+// [v1.23.23] 缓存全量消息供最大化使用
+var _rawMsgsCache=[];
 async function viewSessionRaw(sid){
   window._viewSessionSid=sid;
   _navSubState='raw:'+sid;
-  // 不用 navigateTo 因为需要先 fetch 数据再渲染，直接记录历史后继续
   _navHistory.push({page:currentPage,sub:window._navSubState});
   if(_navHistory.length>6)_navHistory.shift();
   var hash='sessions'+'~raw:'+sid;
   history.pushState({page:'sessions',sub:'raw:'+sid},'','#'+hash);
 
-  const msgs=await api(`/api/session/raw?sid=${encodeURIComponent(sid)}&limit=5000`);
+  const msgs=await api(`/api/session/raw?sid=${encodeURIComponent(sid)}`);
   if(!Array.isArray(msgs)){showToast('加载失败','danger');return}
-  // 按时间分组（同秒内合并）
+  _rawMsgsCache=msgs;
+  _renderRawView(msgs,sid);
+}
+
+function _renderRawView(msgs,sid){
   const keyLabelMap={'llm_output':'LLM 输出','llm_input':'LLM 输入','tool_call':'工具调用','tool_result':'工具结果','tool_result_raw':'工具原始数据','reasoning':'推理过程','conversation_insight':'会话洞察','':'对话','llm_request':'LLM 请求'};
   let html=`<h3 style="margin-bottom:12px">Raw: ${escHtml(sid)} <span class="badge badge-blue">${msgs.length} 条</span></h3>`;
   // 筛选按钮
   html+=`<div style="margin-bottom:10px;display:flex;gap:6px;flex-wrap:wrap" id="rawFilterBar">`;
   html+=`<button class="btn btn-sm" style="background:var(--accent);color:#fff" data-filter="all" onclick="rawFilter('all',this)">全部</button>`;
-  // 收集所有 key 类型
   const keys=[...new Set(msgs.map(m=>m.key||''))];
   for(const k of keys){
     const label=keyLabelMap[k]||k||'对话';
@@ -120,20 +124,57 @@ async function viewSessionRaw(sid){
     html+=`<span><span style="color:var(--text);font-weight:600">${escHtml(role)}</span>`;
     if(keyLabel)html+=` <span class="badge badge-blue" style="font-size:10px">${escHtml(keyLabel)}</span>`;
     html+=`</span>`;
-    html+=`<span>${escHtml(time)} <span style="margin-left:4px;opacity:0.5">${content.length}字符</span></span>`;
+    html+=`<span>${escHtml(time)} <span style="margin-left:4px;opacity:0.5">${content.length}字符</span>`;
+    html+=` <span style="margin-left:8px;opacity:0.4;cursor:pointer" onclick="event.stopPropagation();rawMaximize(${i})" title="最大化查看">&#x2921;</span>`;
+    html+=`</span>`;
     html+=`</div>`;
     html+=`<div id="${mid}" class="raw-body" style="padding:4px 10px 8px;font-size:12px;white-space:pre-wrap;word-break:break-all;color:var(--text2);max-height:400px;overflow-y:auto;transition:max-height 0.2s">`;
-    html+=escHtml(content.length>8000?content.slice(0,8000)+'\n... (共'+content.length+'字符)':content);
-    if(content.length>8000)html+=`<button class="btn btn-sm btn-ghost" style="margin-top:4px;font-size:10px" onclick="event.stopPropagation();this.parentElement.textContent=this.dataset.full;this.remove()" data-full="${escHtml(content).replace(/"/g,'&quot;')}">展开全部 (${content.length}字符)</button>`;
+    // [v1.23.23] 不截断，全量显示
+    html+=escHtml(content);
     html+=`</div></div>`;
   }
   html+=`</div>`;
   html+=`<div class="flex gap-8 mt-8"><button class="btn btn-ghost" onclick="goBack()">返回查看</button>`;
   html+=`<button class="btn btn-ghost" onclick="goBack()">返回会话列表</button></div>`;
   $('content').innerHTML=html;
-  // 生成时间索引
   _buildTimeNav(msgs);
 }
+
+// [v1.23.23] 最大化查看单条 raw 消息（全屏覆盖，ESC 关闭）
+function rawMaximize(idx){
+  if(!_rawMsgsCache||!_rawMsgsCache[idx])return;
+  const m=_rawMsgsCache[idx];
+  const content=m.content||'';
+  const role=m.role||'?';
+  const key=m.key||'';
+  const time=(m.time||'').slice(0,19);
+  const keyLabelMap={'llm_output':'LLM 输出','llm_input':'LLM 输入','tool_call':'工具调用','tool_result':'工具结果','tool_result_raw':'工具原始数据','reasoning':'推理过程','conversation_insight':'会话洞察','':'对话','llm_request':'LLM 请求'};
+  const keyLabel=keyLabelMap[key]||key||'对话';
+  const overlay=document.createElement('div');
+  overlay.id='rawMaxOverlay';
+  overlay.style.cssText='position:fixed;inset:0;z-index:300;background:rgba(0,0,0,.75);display:flex;flex-direction:column;padding:12px';
+  overlay.innerHTML=`<div style="display:flex;justify-content:space-between;align-items:center;padding:8px 16px;background:var(--surface);border:1px solid var(--border);border-radius:8px 8px 0 0;flex-shrink:0">
+    <div><span style="font-weight:700;color:var(--text)">${escHtml(role)}</span> <span class="badge badge-blue" style="font-size:10px">${escHtml(keyLabel)}</span> <span style="font-size:12px;color:var(--text3);margin-left:8px">${escHtml(time)}</span> <span style="font-size:11px;color:var(--text3);margin-left:4px">${content.length} 字符</span></div>
+    <div style="display:flex;gap:8px">
+      <button class="btn btn-sm btn-ghost" onclick="rawMaxCopy(${idx})">复制</button>
+      <button class="btn btn-sm btn-ghost" onclick="rawMaxClose()">关闭 (ESC)</button>
+    </div>
+  </div>
+  <pre id="rawMaxContent" style="flex:1;overflow:auto;background:var(--bg);border:1px solid var(--border);border-top:none;border-radius:0 0 8px 8px;padding:16px;font-size:13px;line-height:1.6;white-space:pre-wrap;word-break:break-all;color:var(--text);margin:0;font-family:'Cascadia Code',Consolas,monospace">${escHtml(content)}</pre>`;
+  document.body.appendChild(overlay);
+  overlay.addEventListener('keydown',function(e){if(e.key==='Escape')rawMaxClose()});
+  overlay.focus();
+}
+// 全局 ESC 监听（overlay 可能没获得焦点）
+document.addEventListener('keydown',function(e){if(e.key==='Escape'&&document.getElementById('rawMaxOverlay'))rawMaxClose()});
+function rawMaxClose(){
+  var el=document.getElementById('rawMaxOverlay');
+  if(el)el.remove();
+}
+function rawMaxCopy(idx){
+  if(!_rawMsgsCache||!_rawMsgsCache[idx])return;
+  navigator.clipboard.writeText(_rawMsgsCache[idx].content||'').then(()=>showToast('已复制','success')).catch(()=>showToast('复制失败','danger'));
+}
 function rawFilter(key,btn){
   const items=document.querySelectorAll('.raw-item');
   for(const item of items){

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);