myagent-ai 1.32.5 → 1.32.6

package/package.json

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

package/web/api_server.py

@@ -4331,7 +4331,8 @@ window.addEventListener('beforeunload', function() {{
         if agent:
             # [v1.27.2] 先将 agent 路径转为数字 ID，用数字 ID 精确过滤
             target_aid = self.core.memory.get_agent_id(agent) if agent else 0
-            if agent == "1":
+            # [v1.32.4] 兼容旧路径 "default" 和新路径 "1"，两者都指全权Agent
+            if agent == "1" or agent == "default":
                 # default agent: agent_id=0（未分配）或 agent_id=1（default 的数字 ID）或 旧格式
                 rows = conn.execute(
                     f"""SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last,
@@ -4400,7 +4401,8 @@ window.addEventListener('beforeunload', function() {{
             return web.json_response({"agent": name, "sessions": []})
         # [v1.27.2] 使用数字 agent_id 精确过滤，同时兼容旧数据
         target_aid = self.core.memory.get_agent_id(name)
-        if name == "1":
+        # [v1.32.4] 兼容旧路径 "default" 和新路径 "1"
+        if name == "1" or name == "default":
             # default agent: agent_id=0 或 agent_id=1 或 旧格式
             rows = self.core.memory._get_conn().execute(
                 """SELECT DISTINCT session_id, COUNT(*) as cnt, MAX(created_at) as last FROM memories 

package/web/ui/chat/chat_main.js

@@ -150,7 +150,7 @@ function popoutChat() {
   const h = Math.min(720, screen.height - 100);
   const left = Math.round((screen.width - w) / 2);
   const top = Math.round((screen.height - h) / 2);
-  window.open(popoutUrl, 'myagent_popout_' + (state.activeAgent || 'default'), 'width=' + w + ',height=' + h + ',left=' + left + ',top=' + top + ',menubar=no,toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes');
+  window.open(popoutUrl, 'myagent_popout_' + (state.activeAgent || '1'), 'width=' + w + ',height=' + h + ',left=' + left + ',top=' + top + ',menubar=no,toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes');
 }
 
 // Override toggleAgentPanel for mobile (deferred since function is defined later)
@@ -227,11 +227,11 @@ const state = {
   // ── Agent state (层级体系) ──
   agentTree: [],         // 树形结构 [{path, name, children: [...], ...}]
   agentsFlat: [],        // 扁平列表 [{path, name, parent, depth, ...}]
-  activeAgent: 'default',
+  activeAgent: '1',
   agentPanelOpen: true,
   agentSessions: {},     // {agentPath: [{id, name, messages, last}]}
   agentDetails: {},      // {agentPath: {soul, identity, model, ...}}
-  expandedNodes: new Set(['default']),  // 树形展开状态
+  expandedNodes: new Set(['1']),  // 树形展开状态
   modelsLibrary: [],     // 模型库 [{id, name, provider, model, base_url, enabled, has_api_key, ...}]
   // ── Message queue during generation ──
   pendingMessages: [],   // 待发送的消息队列 [{text, time}]
@@ -330,7 +330,7 @@ const StatePersistence = {
     // 持久化当前活跃会话ID，用于页面刷新后恢复
     if (state.activeSessionId && state.activeSessionId !== '__new__') {
       StatePersistence.save('activeSessionId', state.activeSessionId);
-      StatePersistence.save('activeSessionAgent', state.activeAgent || 'default');
+      StatePersistence.save('activeSessionAgent', state.activeAgent || '1');
     }
     // 持久化当前会话的滚动位置（立即保存，不防抖）
     if (typeof saveScrollPosition === 'function') {
@@ -344,12 +344,12 @@ const StatePersistence = {
   },
   /** 恢复 UI 状态 */
   restoreUIState() {
-    state.activeAgent = StatePersistence.load('activeAgent', 'default');
+    state.activeAgent = StatePersistence.load('activeAgent', '1');
     state.chatMode = StatePersistence.load('chatMode', 'exec');
     state.agentPanelOpen = StatePersistence.load('agentPanelOpen', true);
     var savedRpSections = StatePersistence.load('rpSections');
     if (savedRpSections) { Object.assign(rpSections, savedRpSections); }
-    const savedNodes = StatePersistence.load('expandedNodes', ['default']);
+    const savedNodes = StatePersistence.load('expandedNodes', ['1']);
     state.expandedNodes = new Set(savedNodes);
     // 恢复上次活跃的会话 ID，供 loadSessions() 使用
     var savedSessionId = StatePersistence.load('activeSessionId', null);
@@ -529,23 +529,23 @@ async function initChat() {
   } else if (urlAgent) {
     var resolved = urlAgent;
     if (!findAgentByPath(resolved)) {
-      console.warn('URL agent not found, fallback to default:', resolved);
-      resolved = 'default';
+      console.warn('URL agent not found, fallback to master:', resolved);
+      resolved = findMasterAgentPath();
     }
     if (resolved !== state.activeAgent) {
       selectAgent(resolved);
     }
   } else if (urlSession) {
     // 只有 session 没有 agent，尝试从 session ID 推断 agent（兼容旧格式 agent_web_xxx）
-    var targetAgent = 'default';
+    var targetAgent = findMasterAgentPath();
     if (urlSession.indexOf('_web_') >= 0) {
-      targetAgent = urlSession.split('_web_')[0] || 'default';
+      targetAgent = urlSession.split('_web_')[0] || findMasterAgentPath();
     }
-    // 新格式 sess_xxx 无法推断 agent，回退 default
+    // 新格式 sess_xxx 无法推断 agent，回退 master
     var target = targetAgent;
     if (!findAgentByPath(target)) {
-      console.warn('Session-inferred agent not found, fallback to default:', target);
-      target = 'default';
+      console.warn('Session-inferred agent not found, fallback to master:', target);
+      target = findMasterAgentPath();
     }
     if (target !== state.activeAgent) {
       selectAgent(target);
@@ -835,7 +835,7 @@ function hasTaskListChanged() {
 
 async function loadTaskPlan() {
   try {
-    var agent = state.activeAgent || 'default';
+    var agent = state.activeAgent || '1';
     var session = state.activeSessionId || '';
     var url = '/api/task-plan?agent=' + encodeURIComponent(agent);
     if (session) url += '&session=' + encodeURIComponent(session);
@@ -906,7 +906,7 @@ async function toggleTaskDone(idx) {
     t.done = !t.done;
   }
   try {
-    var agent = state.activeAgent || 'default';
+    var agent = state.activeAgent || '1';
     var session = state.activeSessionId || '';
     await api('/api/task-plan', {
       method: 'PUT',
@@ -931,7 +931,7 @@ async function addTaskItem() {
   if (!text) return;
   input.value = '';
   try {
-    var agent = state.activeAgent || 'default';
+    var agent = state.activeAgent || '1';
     var session = state.activeSessionId || '';
     var data = await api('/api/task-plan', {
       method: 'POST',
@@ -948,7 +948,7 @@ async function addTaskItem() {
 async function deleteTaskItem(idx) {
  if (idx < 0 || idx >= state.taskItems.length) return;
   try {
-    var agent = state.activeAgent || 'default';
+    var agent = state.activeAgent || '1';
     var session = state.activeSessionId || '';
     var url = '/api/task-plan/' + idx + '?agent=' + encodeURIComponent(agent);
     if (session) url += '&session=' + encodeURIComponent(session);
@@ -1822,6 +1822,28 @@ function findAgentByPath(path) {
   return state.agentsFlat.find(function(a) { return a.path === path; });
 }
 
+// [v1.32.4] 查找系统级 Agent 的路径（兼容旧路径 'default'/'配置助手' 和新路径 '1'/'2'）
+function findMasterAgentPath() {
+  // 优先按新路径 "1"，兼容旧路径 "default"，再按 system 标志+名称兜底
+  var a = state.agentsFlat.find(function(x) { return x.path === '1'; })
+    || state.agentsFlat.find(function(x) { return x.path === 'default'; })
+    || state.agentsFlat.find(function(x) { return x.system && x.name === '全权Agent'; })
+    || state.agentsFlat.find(function(x) { return x.system; });
+  return a ? a.path : 'default';
+}
+function findHelperAgentPath() {
+  var a = state.agentsFlat.find(function(x) { return x.path === '2'; })
+    || state.agentsFlat.find(function(x) { return x.path === '配置助手'; })
+    || state.agentsFlat.find(function(x) { return x.system && x.name === '配置助手'; })
+    || null;
+  return a ? a.path : null;
+}
+function isSystemAgentPath(path) {
+  var mp = findMasterAgentPath();
+  var hp = findHelperAgentPath();
+  return path === mp || (hp !== null && path === hp);
+}
+
 function getActiveAgentObj() {
   return findAgentByPath(state.activeAgent);
 }
@@ -1832,18 +1854,16 @@ async function loadAgents() {
     state.agentTree = treeData || [];
     state.agentsFlat = flattenTree(state.agentTree, 0, null);
 
-    if (!state.agentsFlat.find(function(a) { return a.path === 'default'; })) {
-      var defAgent = {path:'default', name:'default', depth:0, parent:null, description:'默认助手', avatar_emoji:'🤖', execution_mode:'local', avatar_color:getAgentColorClass('default'), session_count:0};
-      state.agentsFlat.unshift(defAgent);
-      state.agentTree.unshift(Object.assign({}, defAgent, {children:[]}));
-    }
+    // [v1.32.4] 兼容旧路径：如果后端没有 path='default' 的 agent，不创建合成的 fake agent
+    // 而是依赖 findMasterAgentPath() 来正确解析 master agent 路径
+    var _masterPath = findMasterAgentPath();
 
     for (var i = 0; i < state.agentsFlat.length; i++) {
       state.expandedNodes.add(state.agentsFlat[i].path);
     }
 
     if (!state.activeAgent || !findAgentByPath(state.activeAgent)) {
-      state.activeAgent = 'default';
+      state.activeAgent = _masterPath;
     }
 
     renderAgentTree();
@@ -1852,10 +1872,10 @@ async function loadAgents() {
     await loadSessions();
     loadAllAgentSessions(); // fire-and-forget, will update recent agents
   } catch (e) {
-    var defAgent = {path:'default', name:'default', depth:0, parent:null, description:'默认助手', avatar_emoji:'🤖', execution_mode:'local', avatar_color:getAgentColorClass('default'), session_count:0};
+    var defAgent = {path:'1', name:'全权Agent', depth:0, parent:null, description:'全权Agent - 拥有完整权限的本地助手', avatar_emoji:'🤖', execution_mode:'local', system:true, avatar_color:getAgentColorClass('全权Agent'), session_count:0};
     state.agentsFlat = [defAgent];
     state.agentTree = [Object.assign({}, defAgent, {children:[]})];
-    state.activeAgent = 'default';
+    state.activeAgent = '1';
     renderAgentTree();
     updateActiveAgentBadge();
     updateExecModeUI();
@@ -1909,18 +1929,20 @@ function renderRightPanelSections() {
 function renderMasterAgentCard() {
   var el = document.getElementById('rpMasterAgent');
   if (!el) return;
-  var agent = findAgentByPath('default');
-  var isActive = state.activeAgent === 'default';
+  // [v1.32.4] 使用 findMasterAgentPath() 兼容旧路径 'default' 和新路径 '1'
+  var masterPath = findMasterAgentPath();
+  var agent = findAgentByPath(masterPath);
+  var isActive = state.activeAgent === masterPath;
   var name = agent ? agent.name : '全权Agent';
   var emoji = agent ? (agent.avatar_emoji || '🛡️') : '🛡️';
   var desc = agent ? (agent.description || '拥有完整权限的本地助手') : '拥有完整权限的本地助手';
   var color = agent ? (agent.avatar_color || 'linear-gradient(135deg,#6366f1,#8b5cf6)') : 'linear-gradient(135deg,#6366f1,#8b5cf6)';
   var bgStyle = color.includes('gradient') ? 'background:' + color : '';
-  var bgClass = color.includes('gradient') ? '' : getAgentColorClass('default');
+  var bgClass = color.includes('gradient') ? '' : getAgentColorClass(masterPath);
   // [v1.20.9] 修复: avatar_image 不为空时显示图片，onerror 回退到 emoji
   var avatarContent = (agent && agent.avatar_image) ? '<img src="' + escapeHtml(agent.avatar_image) + '" style="width:100%;height:100%;object-fit:cover;border-radius:12px" onerror="this.outerHTML=\'' + escapeHtml(emoji) + '\'">' : emoji;
 
-  el.innerHTML = '<div class="rp-master-card ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'default\')">'
+  el.innerHTML = '<div class="rp-master-card ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'' + escapeHtml(masterPath) + '\')">'
     + '<div class="rp-master-avatar ' + bgClass + '" style="' + bgStyle + '">' + avatarContent + '</div>'
     + '<div class="rp-master-info">'
     + '<div class="rp-master-name">' + escapeHtml(name) + '</div>'
@@ -1931,8 +1953,11 @@ function renderMasterAgentCard() {
 function renderHelperAgentCard() {
   var el = document.getElementById('rpHelperAgent');
   if (!el) return;
-  var agent = findAgentByPath('配置助手');
-  var isActive = state.activeAgent === '配置助手';
+  // [v1.32.4] 使用 findHelperAgentPath() 兼容旧路径 '配置助手' 和新路径 '2'
+  var helperPath = findHelperAgentPath();
+  if (!helperPath) { el.innerHTML = ''; return; }  // 无配置助手则不渲染
+  var agent = findAgentByPath(helperPath);
+  var isActive = state.activeAgent === helperPath;
   var name = agent ? agent.name : '配置助手';
   var emoji = agent ? (agent.avatar_emoji || '🛡️') : '🛡️';
   var desc = agent ? (agent.description || '智能配置助手') : '智能配置助手';
@@ -1945,7 +1970,7 @@ function renderHelperAgentCard() {
     avatarContent = emoji;
   }
 
-  el.innerHTML = '<div class="rp-helper-card ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'配置助手\')">'
+  el.innerHTML = '<div class="rp-helper-card ' + (isActive ? 'active' : '') + '" onclick="selectAgent(\'' + escapeHtml(helperPath) + '\')">'
     + '<div class="rp-helper-avatar" style="' + (avatarImage ? 'background:transparent' : '') + '">' + avatarContent + '</div>'
     + '<div class="rp-master-info">'
     + '<div class="rp-master-name" style="font-size:13px">' + escapeHtml(name) + '</div>'
@@ -1962,7 +1987,7 @@ async function renderRecentAgents() {
   var recentAgents = [];
 
   for (var key in state.agentSessions) {
-    if (key === 'default' || key === '配置助手') continue;
+    if (isSystemAgentPath(key)) continue;
     var sessions = state.agentSessions[key];
     if (sessions && sessions.length > 0) {
       var agent = findAgentByPath(key);
@@ -2168,10 +2193,10 @@ function quickChatAgent(agentPath) {
 }
 
 async function selectAgent(agentPath) {
-  // 安全校验：agent 必须在已加载的列表中存在，否则回退 default
+  // 安全校验：agent 必须在已加载的列表中存在，否则回退 master agent
   if (!findAgentByPath(agentPath)) {
-    console.warn('selectAgent: agent not found, fallback to default:', agentPath);
-    agentPath = 'default';
+    console.warn('selectAgent: agent not found, fallback to master:', agentPath);
+    agentPath = findMasterAgentPath();
   }
   // 从群聊视图切换回个人聊天视图
   if (currentView === 'group') {
@@ -2575,7 +2600,7 @@ async function saveAgentModal(editPath, parentPath) {
 }
 
 async function deleteAgent(agentPath) {
-  if (agentPath === 'default') { toast('不能删除默认 Agent', 'error'); return; }
+  if (agentPath === findMasterAgentPath()) { toast('不能删除默认 Agent', 'error'); return; }
   var msg = '确定删除 Agent "' + agentPath + '" 吗？\n\n删除后将同时清理：\n  📁 工作目录及所有文件\n  💬 该 Agent 的所有会话历史\n  🧠 相关记忆数据\n  🔗 所有子 Agent\n\n⚠️ 此操作不可撤销！';
   if (!confirm(msg)) return;
   try {
@@ -2583,7 +2608,7 @@ async function deleteAgent(agentPath) {
     toast('Agent 已删除', 'success');
     closeAgentModal();
     if (state.activeAgent === agentPath || state.activeAgent.startsWith(agentPath + '/')) {
-      state.activeAgent = 'default';
+      state.activeAgent = findMasterAgentPath();
     }
     await loadAgents();
   } catch (e) {
@@ -5120,7 +5145,8 @@ function skipSetup() {
   StatePersistence.markSetupDone();
   try { api('/api/setup/complete', { method: 'POST' }); } catch(e) {}
   // 自动切换到配置助手 Agent
-  selectAgent('配置助手');
+  var _helperPath = findHelperAgentPath();
+  if (_helperPath) selectAgent(_helperPath);
 }
 
 function renderSetupDots() {

package/web/ui/chat/flow_engine.js

@@ -7,7 +7,7 @@
 // ── 输入框草稿持久化（按 agent + session 维度保存，刷新页面不丢失） ──
 var _draftTimer = null;
 function _draftKey() {
-  return 'myagent_draft_' + (state.activeAgent || 'default') + '_' + (state.activeSessionId || '__new__');
+  return 'myagent_draft_' + (state.activeAgent || '1') + '_' + (state.activeSessionId || '__new__');
 }
 function saveDraft() {
   if (_draftTimer) clearTimeout(_draftTimer);
@@ -128,7 +128,7 @@ async function confirmLargeTextAction() {
   var text = _pendingLargeText;
   if (text === null || idx === null) return;
 
-  var agentPath = state.activeAgent || 'default';
+  var agentPath = state.activeAgent || '1';
 
   if (idx === 0) {
     // 导入知识库

package/web/ui/chat/groupchat.js

@@ -346,7 +346,7 @@ function exitGroupChat() {
   groupMessages = [];
   // [v1.23.81] 清除群聊 ?g= session URL，恢复普通聊天 URL
   var cleanUrl = '/ui/chat/chat_container.html';
-  if (typeof state !== 'undefined' && state.activeAgent && state.activeAgent !== 'default') {
+  if (typeof state !== 'undefined' && state.activeAgent && state.activeAgent !== (typeof findMasterAgentPath === 'function' ? findMasterAgentPath() : '1')) {
     cleanUrl += '?a=' + encodeURIComponent(state.activeAgent);
   }
   if (typeof state !== 'undefined' && state.activeSessionId && state.activeSessionId !== '__new__') {
@@ -456,7 +456,7 @@ function startPrivateChatFromGroup(agentPath) {
     StatePersistence.remove('currentGroupId');
     // 清除群聊 URL 中的 ?g= 参数
     var cleanUrl = '/ui/chat/chat_container.html';
-    if (typeof state !== 'undefined' && agentPath && agentPath !== 'default') {
+    if (typeof state !== 'undefined' && agentPath && agentPath !== (typeof findMasterAgentPath === 'function' ? findMasterAgentPath() : '1')) {
       cleanUrl += '?a=' + encodeURIComponent(agentPath);
     }
     window.history.replaceState({}, '', cleanUrl);