myagent-ai 1.20.0 → 1.20.1

package/agents/main_agent.py

@@ -60,8 +60,8 @@ class MainAgent(BaseAgent):
 <next_step>当 finish=false 时必填，描述下一步计划做什么（简洁明了，1-2句话）。finish=true 时为空。</next_step>
 </output>
 
-事项注意:
-1. toolstocal标签: 可列出所有需要执行的工具调用，可以多个工具。解析器会按顺序执行工具调用，最终全部执行完后，会连同所有结果，回调大语言模型。如果某个工具执行超时了，也会回调回调大模型，让大模型分析为什么超时，改用其他工具。
+注意事项:
+1. toolstocal标签: 尽量一次性列出所有需执行工具调用的，多个"tool""工具调用只要按顺序重复堆叠tool标签即可，解析器会按顺序执行工具调用，最终全部执行完后，会连同所有结果，回调大语言模型。如果某个工具执行超时了，也会回调回调大模型，让大模型分析为什么超时，改用其他工具。如非必要，不要一次仅调用一个工具。
 2. 上下文中的记忆系统说明
 - <automemory>: 系统自动根据你通过 <remember> 保存的记忆和当前用户输入，搜索出的 top10 相关记忆。这些是你过去主动记住的内容（包含时间信息），可供参考。
 - <recall_memory>: 你在上一轮通过 <recall> 指定的记忆搜索结果。系统根据你提供的关键字和时间点搜索了 top5 相关记忆。

package/package.json

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

package/web/api_server.py

@@ -2021,6 +2021,23 @@ window.toggleFullscreen = function() {{
                     "status": "done",
                 })
 
+        # ── 硬上限：任务列表不允许超过 MAX_TASK_ITEMS 条 ──
+        # 系统提示词虽然要求 LLM 精简到 8 条，但 LLM 经常忽略，
+        # 加上 merge 保留 done 项，会导致列表无限增长。
+        # 策略：优先保留未完成项 + 最近完成的项，移除最早的已完成项
+        MAX_TASK_ITEMS = 10
+        if len(merged) > MAX_TASK_ITEMS:
+            # 分离未完成和已完成
+            unfinished = [t for t in merged if t.get("status") != "done"]
+            finished = [t for t in merged if t.get("status") == "done"]
+            # 保留所有未完成项 + 尽可能多的已完成项（保留最新的）
+            remaining = MAX_TASK_ITEMS - len(unfinished)
+            if remaining > 0:
+                finished = finished[-remaining:]  # 保留最近完成的
+            else:
+                finished = []
+            merged = unfinished + finished
+
         return merged
 
     async def handle_get_task_plan(self, request):

package/web/ui/chat/chat_main.js

@@ -1998,9 +1998,45 @@ function newChat() {
 var _sessionPollTimers = {};
 function _pollSessionCompletion(sessionId) {
   if (_sessionPollTimers[sessionId]) clearInterval(_sessionPollTimers[sessionId]);
+  var _lastMsgCount = state.messages.length;
   _sessionPollTimers[sessionId] = setInterval(async function() {
     try {
       const data = await api('/api/session/status?sid=' + encodeURIComponent(sessionId));
+      // 每次轮询都重新加载消息，实时显示执行过程中产生的中间输出
+      try {
+        const msgs = await api('/api/session/messages?sid=' + encodeURIComponent(sessionId) + '&limit=500');
+        if (Array.isArray(msgs) && msgs.length > 0) {
+          var loaded = msgs.filter(function(m) {
+            return m && (m.role === 'user' || m.role === 'assistant' || m.role === 'tool');
+          }).map(function(m) {
+            var content = (m.content != null) ? String(m.content) : '';
+            var mkey = (m.key || '').toLowerCase();
+            if (m.role === 'assistant' && mkey !== 'tool_call' && mkey !== 'reasoning' && content && content.trim().startsWith('<')) {
+              content = (typeof _stripXmlTags === 'function') ? _stripXmlTags(content) : content;
+            }
+            var mapped = {
+              role: m.role || 'assistant',
+              content: content,
+              time: m.time || m.created_at || '',
+              key: m.key || '',
+            };
+            if (m.images && m.images.length > 0) mapped.images = m.images;
+            if (m.files && m.files.length > 0) mapped.files = m.files;
+            return mapped;
+          });
+          var newMsgs = groupHistoryMessages(loaded);
+          if (newMsgs.length !== _lastMsgCount) {
+            // 只在有新消息时才重新渲染，避免闪烁
+            state.messages = newMsgs;
+            _lastMsgCount = newMsgs.length;
+            renderMessages();
+            // 自动滚动到底部，显示最新输出
+            var mi = document.getElementById('messagesInner');
+            if (mi) mi.scrollTop = mi.scrollHeight;
+          }
+        }
+      } catch (_) {}
+
       if (!data.running || data.done) {
         clearInterval(_sessionPollTimers[sessionId]);
         delete _sessionPollTimers[sessionId];
@@ -2009,7 +2045,7 @@ function _pollSessionCompletion(sessionId) {
         document.getElementById('sendBtn').style.display = '';
         document.getElementById('sendBtn').disabled = !document.getElementById('userInput').value.trim();
         document.getElementById('stopBtn').style.display = 'none';
-        // 重新加载消息以获取完整内容
+        // 最终重新加载消息以获取完整内容
         await selectSession(sessionId);
         if (data.error) {
           toast('⚠️ 后台任务完成但出错: ' + data.error, 'error');
@@ -2681,17 +2717,17 @@ function _renderMessagesInner() {
       </details>`;
     })() : '';
     const _isSpeakingThis = ttsManager && ttsManager.isPlaying && ttsManager.currentMsgIndex === i;
-    const actionBtns = (!isUser && msg.content) ? `
+    const actionBtns = msg.content ? `
       <div class="msg-actions">
         <button class="msg-action-btn" onclick="copyMessage(${i})" title="复制">
           <svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg>
-        </button>
+        </button>${!isUser ? `
         <button class="msg-action-btn${_isSpeakingThis ? ' tts-speaking' : ''}" onclick="speakMessage(${i})" title="${_isSpeakingThis ? '停止朗读' : '朗读'}">
           ${_isSpeakingThis
             ? '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"/><line x1="23" y1="9" x2="17" y2="15"/><line x1="17" y1="9" x2="23" y2="15"/></svg>'
             : '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"/><path d="M19.07 4.93a10 10 0 0 1 0 14.14"/><path d="M15.54 8.46a5 5 0 0 1 0 7.07"/></svg>'
           }
-        </button>
+        </button>` : ''}
       </div>` : '';
     const ttsIndicator = _isSpeakingThis ?
       ' <span class="tts-playing-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"/><path d="M15.54 8.46a5 5 0 0 1 0 7.07"/></svg></span>' : '';

package/web/ui/chat/flow_engine.js

@@ -1620,6 +1620,15 @@ async function sendMessage(opts) {
             // 任务列表 JSON 直推更新（exec 模式）
             // 如果已收到 finish 标签，忽略后续 task_list_update，防止覆盖已清空的任务列表
             if (evt.tasks && Array.isArray(evt.tasks) && !_finishReceived) {
+              // 前端安全上限：防止服务端限制失效时列表无限增长
+              if (evt.tasks.length > 15) {
+                var unfinished = evt.tasks.filter(function(t) { return t.status !== 'done'; });
+                var finished = evt.tasks.filter(function(t) { return t.status === 'done'; });
+                var remaining = 15 - unfinished.length;
+                if (remaining > 0) finished = finished.slice(-remaining);
+                else finished = [];
+                evt.tasks = unfinished.concat(finished);
+              }
               state.taskItems = evt.tasks;
               renderTaskList();
               var panel = document.getElementById('taskPanel');

package/web/ui/index.html

@@ -274,6 +274,25 @@ tr:hover{background:var(--surface2)}
   /* 任务表格优化 */
   .table-wrap table{min-width:auto}
   .table-wrap td[style*="max-width:300px"]{max-width:150px!important;white-space:normal!important;word-break:break-all}
+  /* ── 会话管理移动端：隐藏"最后活动"列，操作按钮堆叠 ── */
+  #content[data-page="sessions"] .table-wrap th:nth-child(4),
+  #content[data-page="sessions"] .table-wrap td:nth-child(4){display:none}
+  #content[data-page="sessions"] .table-wrap td:last-child{white-space:normal;min-width:auto}
+  #content[data-page="sessions"] .table-wrap td:last-child .btn{display:inline-block;margin:2px}
+  /* ── 任务记录移动端：隐藏"来源"列，操作按钮堆叠 ── */
+  #content[data-page="tasks"] .table-wrap th:nth-child(3),
+  #content[data-page="tasks"] .table-wrap td:nth-child(3){display:none}
+  #content[data-page="tasks"] .table-wrap td:last-child{white-space:normal;min-width:auto}
+  #content[data-page="tasks"] .table-wrap td:last-child .btn{display:inline-block;margin:2px}
+  /* ── 会话查看：消息气泡在窄屏撑满宽度 ── */
+  .msg-bubble-wrap{max-width:75%}
+  #content[data-page="sessions"] .msg-bubble-wrap{max-width:88%!important}
+  /* ── 任务计划卡片移动端堆叠 ── */
+  .card .flex.justify-between{flex-direction:column;align-items:flex-start;gap:6px}
+  /* ── 时间索引自适应换行 ── */
+  .raw-time-nav{display:flex;flex-wrap:wrap;align-items:center;gap:4px 8px;margin-bottom:8px}
+  .raw-time-link{color:var(--accent);text-decoration:none;font-size:12px;padding:2px 6px;border-radius:4px;background:var(--surface2);white-space:nowrap;transition:background .15s}
+  .raw-time-link:hover{background:var(--accent);color:#fff}
 }
 @media(max-width:480px){
   .content{padding:12px}
@@ -287,6 +306,12 @@ tr:hover{background:var(--surface2)}
   .form-group{margin-bottom:10px}
   .form-group label{font-size:12px}
   .raw-collapsed{max-height:0 !important;padding:0 10px !important;overflow:hidden}
+  /* ── 480px：任务表进一步精简，隐藏任务ID列 ── */
+  #content[data-page="tasks"] .table-wrap th:nth-child(1),
+  #content[data-page="tasks"] .table-wrap td:nth-child(1){display:none}
+  /* ── 480px：会话表隐藏 Agent 列 ── */
+  #content[data-page="sessions"] .table-wrap th:nth-child(2),
+  #content[data-page="sessions"] .table-wrap td:nth-child(2){display:none}
 }
 </style>
 </head>
@@ -443,6 +468,7 @@ function showConfirm(title,msg,onOk){
 function showPage(page, addHistory){
   closeMobileSidebar();
   currentPage=page;
+  $('content').setAttribute('data-page',page);
   document.querySelectorAll('.nav-item').forEach((n,i)=>n.classList.toggle('active',Object.keys(pages)[i]===page));
   $('pageTitle').textContent=pages[page]||page;
   const 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};
@@ -468,6 +494,7 @@ function navigateTo(page, sub, renderFn){
   if(_navHistory.length>6)_navHistory.shift();
   currentPage=page;
   _navSubState=sub;
+  $('content').setAttribute('data-page',page);
   // 更新 URL hash
   var hash=page+(sub?'~'+sub:'');
   history.pushState({page:page,sub:sub},'','#'+hash);
@@ -1073,7 +1100,7 @@ async function viewSessionMsgs(sid){
       const displayContent=content.length>500?content.slice(0,500)+'...':content;
       html+=`<div style="margin:8px 0;display:flex;gap:8px;${align}">`;
       if(!isUser)html+=`<div style="flex-shrink:0;font-size:16px;margin-top:2px">${avatar}</div>`;
-      html+=`<div style="max-width:75%;min-width:0"><div style="font-size:11px;color:var(--text3);margin-bottom:2px">${isUser?'用户':'助手'} <span style="margin-left:4px">${time}</span></div><div style="background:${bg};color:${fg};padding:10px 14px;border-radius:var(--radius);font-size:13px;line-height:1.6;white-space:pre-wrap;word-break:break-word">${escHtml(displayContent)}</div></div>`;
+      html+=`<div class="msg-bubble-wrap" style="min-width:0"><div style="font-size:11px;color:var(--text3);margin-bottom:2px">${isUser?'用户':'助手'} <span style="margin-left:4px">${time}</span></div><div style="background:${bg};color:${fg};padding:10px 14px;border-radius:var(--radius);font-size:13px;line-height:1.6;white-space:pre-wrap;word-break:break-word">${escHtml(displayContent)}</div></div>`;
       if(isUser)html+=`<div style="flex-shrink:0;font-size:16px;margin-top:2px">${avatar}</div>`;
       html+=`</div>`;
     }
@@ -1311,7 +1338,7 @@ async function _loadSessionMessages(){
       const displayContent=long?content.slice(0,500)+'... (共'+content.length+'字符)':content;
       html+=`<div style="margin:8px 0;display:flex;gap:8px;${isUser?'flex-direction:row-reverse':''}">`;
       html+=`<div style="flex-shrink:0;font-size:16px;margin-top:2px">${avatar}</div>`;
-      html+=`<div style="max-width:75%;min-width:0"><div style="font-size:11px;color:var(--text3);margin-bottom:2px;${isUser?'text-align:right':''}">${isUser?'用户':'助手'} <span style="margin-left:4px">${time}</span></div>`;
+      html+=`<div class="msg-bubble-wrap" style="min-width:0"><div style="font-size:11px;color:var(--text3);margin-bottom:2px;${isUser?'text-align:right':''}">${isUser?'用户':'助手'} <span style="margin-left:4px">${time}</span></div>`;
       html+=`<div style="background:${bg};color:${fg};padding:10px 14px;border-radius:var(--radius);font-size:13px;line-height:1.6;white-space:pre-wrap;word-break:break-word">${escHtml(displayContent)}</div>`;
       if(long)html+=`<button class="btn btn-sm btn-ghost" style="margin-top:4px;font-size:11px" onclick="this.previousElementSibling.textContent=this.dataset.full;this.remove()" data-full="${escHtml(content).replace(/"/g,'&quot;')}">展开全部 (${content.length}字符)</button>`;
       html+=`</div></div>`;
@@ -1351,7 +1378,7 @@ async function viewSessionRaw(sid){
   }
   html+=`</div>`;
   // 时间索引导航
-  html+=`<div style="margin-bottom:8px;font-size:12px;color:var(--text3)" id="rawTimeNav"></div>`;
+  html+=`<div class="raw-time-nav" id="rawTimeNav"></div>`;
   // 消息列表
   html+=`<div style="max-height:65vh;overflow-y:auto;font-family:monospace" id="rawMsgList">`;
   for(let i=0;i<msgs.length;i++){
@@ -1419,9 +1446,9 @@ function _buildTimeNav(msgs){
   }
   const times=Object.keys(minutes);
   if(times.length<=1)return;
-  let navHtml='时间索引: ';
+  let navHtml='<span style="color:var(--text3);font-size:12px">时间索引:</span> ';
   for(const t of times){
-    navHtml+=`<a href="javascript:void(0)" style="color:var(--accent);margin-right:8px;text-decoration:none" onclick="document.querySelectorAll('.raw-item')[${minutes[t][0]}].scrollIntoView({behavior:'smooth',block:'center'})">${escHtml(t.slice(11))}</a>`;
+    navHtml+=`<a href="javascript:void(0)" class="raw-time-link" onclick="document.querySelectorAll('.raw-item')[${minutes[t][0]}].scrollIntoView({behavior:'smooth',block:'center'})">${escHtml(t.slice(11))}</a>`;
   }
   nav.innerHTML=navHtml;
 }