myagent-ai 1.15.50 → 1.15.52

package/agents/main_agent.py

@@ -6,6 +6,7 @@ agents/main_agent.py - 主 Agent
 from __future__ import annotations
 
 import asyncio
+import json
 import re
 from typing import Any, Callable, Dict, List, Optional
 
@@ -576,6 +577,21 @@ class MainAgent(BaseAgent):
                     content=context.user_message or "请处理上述上下文。"
                 ))
 
+            # [v1.15.52] 保存完整的 LLM 输入消息（system prompt + user message + 工具结果回调）
+            # 用于 Raw 查看器完整回溯 LLM 交互过程
+            if self.memory:
+                _input_parts = []
+                for _msg in messages:
+                    _input_parts.append(f"=== {_msg.role.upper()} ===\n{_msg.content}")
+                _llm_input_text = "\n\n".join(_input_parts)
+                self.memory.add_session(
+                    session_id=context.session_id,
+                    role="system",
+                    content=_llm_input_text,
+                    key="llm_input",
+                    importance=0.3,
+                )
+
             if stream_response and self.llm:
                 response = await self._call_llm_stream(
                     messages, text_delta_callback=text_delta_callback,
@@ -1193,6 +1209,8 @@ class MainAgent(BaseAgent):
                         key="tool_call",
                         importance=0.4,
                     )
+                    # [v1.15.52] 保存完整的工具执行原始结果（不截断，原汁原味）
+                    _raw_result_str = json.dumps(tool_result, ensure_ascii=False, indent=2) if tool_result else str(tool_result)
                     self.memory.add_session(
                         session_id=context.session_id,
                         role="tool",
@@ -1200,6 +1218,14 @@ class MainAgent(BaseAgent):
                         key="tool_result",
                         importance=0.4,
                     )
+                    # 额外保存原始完整 JSON（用于 Raw 查看器完整回溯）
+                    self.memory.add_session(
+                        session_id=context.session_id,
+                        role="tool",
+                        content=f"[{tool_name}] 原始结果 ({_status})\n{truncate_str(_raw_result_str, 45000)}",
+                        key="tool_result_raw",
+                        importance=0.2,
+                    )
 
                 # 任一工具超时 → 立即停止执行剩余工具
                 if _has_timeout:

package/memory/manager.py

@@ -299,7 +299,7 @@ class MemoryManager:
         # 只排除纯内部审计条目，保留 tool_call/tool_result 供前端展示
         sql = """SELECT * FROM memories
                  WHERE session_id = ? AND category = 'session' AND role != ''
-                 AND key NOT IN ('llm_output', 'conversation_insight')
+                 AND key NOT IN ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight')
                  ORDER BY created_at ASC LIMIT ?"""
         rows = conn.execute(sql, (session_id, limit)).fetchall()
         entries = [MemoryEntry.from_row(row) for row in rows]

package/package.json

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

package/web/api_server.py

@@ -2499,14 +2499,14 @@ class ApiServer:
             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 role != '' "
-                "AND key NOT IN ('llm_output', 'conversation_insight') "
+                "AND key NOT IN ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight') "
                 "AND session_id LIKE ? GROUP BY session_id ORDER BY last DESC LIMIT 100",
                 (prefix + "%",)).fetchall()
         else:
             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 role != '' "
-                "AND key NOT IN ('llm_output', 'conversation_insight') "
+                "AND key NOT IN ('llm_output', 'llm_input', 'tool_result_raw', 'conversation_insight') "
                 "GROUP BY session_id ORDER BY last DESC LIMIT 100").fetchall()
         sessions = [{"id": r["session_id"], "messages": r["cnt"], "last": r["last"]} for r in rows]
         # 批量获取自定义会话名称
@@ -2559,7 +2559,7 @@ class ApiServer:
         return web.json_response({**agent_info, "sessions": sessions})
 
     # Internal keys that should not appear in chat history UI
-    _HIDDEN_KEYS = {"llm_output"}
+    _HIDDEN_KEYS = {"llm_output", "llm_input", "tool_result_raw"}
 
     async def handle_get_messages(self, request):
         sid = request.match_info["sid"]

package/web/ui/index.html

@@ -354,7 +354,7 @@ function showConfirm(title,msg,onOk){
     <button class="btn btn-ghost" onclick="closeModal()">取消</button></div></div></div>`;
 }
 
-function showPage(page){
+function showPage(page, addHistory){
   closeMobileSidebar();
   currentPage=page;
   document.querySelectorAll('.nav-item').forEach((n,i)=>n.classList.toggle('active',Object.keys(pages)[i]===page));
@@ -363,8 +363,69 @@ function showPage(page){
   if(renderers[page]){
     try{renderers[page]();}catch(e){console.error('Page render error:',e);$('content').innerHTML='<div class="empty" style="color:var(--danger)">页面加载失败: '+escHtml(e.message)+'</div>';}
   }
+  // 记录到浏览器历史
+  if(addHistory!==false){
+    var _sub=window._navSubState||null;
+    var hash=page+(_sub?'~'+_sub:'');
+    history.pushState({page:page,sub:_sub},'','#'+hash);
+  }
+}
+
+// 导航历史系统：记录子页面跳转（如 viewSession、viewSessionRaw）
+// _navHistory: [{page,sub}] 最多6步
+var _navHistory=[];
+var _navSubState=null;
+
+function navigateTo(page, sub, renderFn){
+  // 保存当前状态到历史
+  _navHistory.push({page:currentPage,sub:window._navSubState});
+  if(_navHistory.length>6)_navHistory.shift();
+  currentPage=page;
+  _navSubState=sub;
+  // 更新 URL hash
+  var hash=page+(sub?'~'+sub:'');
+  history.pushState({page:page,sub:sub},'','#'+hash);
+  // 更新导航高亮
+  document.querySelectorAll('.nav-item').forEach((n,i)=>n.classList.toggle('active',Object.keys(pages)[i]===page));
+  // 渲染页面
+  if(renderFn){
+    try{renderFn();}catch(e){console.error('Navigate render error:',e);}
+  }
 }
 
+function goBack(){
+  if(_navHistory.length>0){
+    var prev=_navHistory.pop();
+    currentPage=prev.page;
+    _navSubState=prev.sub;
+    var hash=prev.page+(prev.sub?'~'+prev.sub:'');
+    history.pushState({page:prev.page,sub:prev.sub},'','#'+hash);
+    // 找到对应的渲染函数
+    var renderers={dashboard:renderDashboard,agents:renderAgents,platforms:renderPlatforms,organization:renderOrganization,departments:renderDepartments,sessions:renderSessions,memory:renderMemory,permissions:renderPermissions,llm:renderLLM,system:renderSystem,executor:renderExecutor,skills:renderSkills,files:renderFiles,logs:renderLogs,tasks:renderTasks};
+    if(renderers[prev.page]){
+      try{renderers[prev.page]();}catch(e){}
+    }
+    document.querySelectorAll('.nav-item').forEach((n,i)=>n.classList.toggle('active',Object.keys(pages)[i]===prev.page));
+  }else{
+    // 没有内部历史，尝试浏览器后退
+    history.back();
+  }
+}
+
+// 浏览器前进/后退按钮支持
+window.addEventListener('popstate',function(e){
+  var s=e.state;
+  if(s&&s.page){
+    currentPage=s.page;
+    _navSubState=s.sub||null;
+    document.querySelectorAll('.nav-item').forEach((n,i)=>n.classList.toggle('active',Object.keys(pages)[i]===s.page));
+    var renderers={dashboard:renderDashboard,agents:renderAgents,platforms:renderPlatforms,organization:renderOrganization,departments:renderDepartments,sessions:renderSessions,memory:renderMemory,permissions:renderPermissions,llm:renderLLM,system:renderSystem,executor:renderExecutor,skills:renderSkills,files:renderFiles,logs:renderLogs,tasks:renderTasks};
+    if(renderers[s.page]){
+      try{renderers[s.page]();}catch(e){}
+    }
+  }
+});
+
 // ========== Dashboard ==========
 async function renderDashboard(){
   const s=await api('/api/status');const m=await api('/api/memory/stats');
@@ -933,7 +994,8 @@ async function renderSessions(){
 }
 async function viewSession(sid){
   window._viewSessionSid=sid;window._viewSessionOffset=0;
-  await _loadSessionMessages();
+  _navSubState='view:'+sid;
+  navigateTo('sessions','view:'+sid,_loadSessionMessages);
 }
 async function _loadSessionMessages(){
   const sid=window._viewSessionSid;if(!sid)return;
@@ -977,17 +1039,25 @@ async function _loadSessionMessages(){
   }
   html+='</div>';
   if(hasMore)html+=`<button class="btn btn-ghost mt-8" onclick="window._viewSessionOffset=${offset+100};_loadSessionMessages()">加载更多...</button>`;
-  html+='<div class="flex gap-8 mt-8"><button class="btn btn-ghost" onclick="renderSessions()">返回</button>';
+  html+='<div class="flex gap-8 mt-8"><button class="btn btn-ghost" onclick="goBack()">返回</button>';
   html+=`<button class="btn" style="background:var(--accent);color:#fff" onclick="viewSessionRaw('${escHtml(sid)}')">Raw 原始消息</button>`;
   html+=`<button class="btn btn-primary" onclick="enterSession('${escHtml(sid)}','${escHtml(sid.split('_web_')[0]||'default')}')">在聊天中查看完整记录</button></div>`;
   $('content').innerHTML=html;
 }
 // ========== Raw 原始消息查看 ==========
 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`);
   if(!Array.isArray(msgs)){showToast('加载失败','danger');return}
   // 按时间分组（同秒内合并）
-  const keyLabelMap={'llm_output':'LLM 输出','tool_call':'工具调用','tool_result':'工具结果','reasoning':'推理过程','conversation_insight':'会话洞察','':'对话','llm_request':'LLM 请求'};
+  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">`;
@@ -1014,9 +1084,11 @@ async function viewSessionRaw(sid){
     // 颜色标识
     let borderColor='var(--border)';
     let bgColor='var(--surface)';
-    if(key==='llm_output'){borderColor='#e6a817';bgColor='#1a1700'}
+    if(key==='llm_input'){borderColor='#06b6d4';bgColor='#001a1f'}
+    else if(key==='llm_output'){borderColor='#e6a817';bgColor='#1a1700'}
     else if(key==='tool_call'){borderColor='#3b82f6';bgColor='#001029'}
     else if(key==='tool_result'){borderColor='#22c55e';bgColor='#001a0d'}
+    else if(key==='tool_result_raw'){borderColor='#10b981';bgColor='#001510'}
     else if(key==='reasoning'){borderColor='#a855f7';bgColor='#0d0020'}
     else if(role==='user'){borderColor='var(--primary)';bgColor='var(--surface)'}
     else if(role==='assistant'){borderColor='#6b7280';bgColor='var(--surface2)'}
@@ -1034,8 +1106,8 @@ async function viewSessionRaw(sid){
     html+=`</div></div>`;
   }
   html+=`</div>`;
-  html+=`<div class="flex gap-8 mt-8"><button class="btn btn-ghost" onclick="viewSession('${escHtml(sid)}')">返回查看</button>`;
-  html+=`<button class="btn btn-ghost" onclick="renderSessions()">返回会话列表</button></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);
@@ -1141,7 +1213,7 @@ async function searchMemory(){
   }else{
     html+='<div class="empty">未找到匹配的记忆</div>';
   }
-  html+='<button class="btn btn-ghost mt-8" onclick="renderMemory()">返回</button>';$('content').innerHTML=html;
+  html+='<button class="btn btn-ghost mt-8" onclick="goBack()">返回</button>';$('content').innerHTML=html;
 }
 async function deleteMemory(id){await api(`/api/memory/${id}`,{method:'DELETE'});renderMemory()}
 async function cleanupMemory(){const r=await api('/api/memory/cleanup',{method:'POST'});showToast('清理了 '+(r.cleaned||0)+' 条','success');renderMemory()}
@@ -2066,9 +2138,22 @@ async function sysLoadPreview(){
 
 // Init
 (function(){
-  var params=new URLSearchParams(window.location.search);
-  var page=params.get('page')||'dashboard';
-  if(pages[page])showPage(page);else showPage('dashboard');
+  var hash=window.location.hash.slice(1)||'';
+  var page=hash?hash.split('~')[0]:'';
+  var sub=hash?hash.slice(page.length+1):'';
+  // 兼容旧 URL query param ?page=xxx
+  if(!page){
+    var params=new URLSearchParams(window.location.search);
+    page=params.get('page')||'dashboard';
+  }
+  if(sub)_navSubState=sub;
+  if(pages[page]){
+    history.replaceState({page:page,sub:sub||null},'','#'+page+(sub?'~'+sub:''));
+    showPage(page,false);
+  }else{
+    history.replaceState({page:'dashboard',sub:null},'','#dashboard');
+    showPage('dashboard',false);
+  }
 })();
 setInterval(()=>{api('/api/status').catch(()=>{})},30000);