myagent-ai 1.5.7 → 1.5.9

package/package.json

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

package/web/api_server.py

@@ -1570,26 +1570,15 @@ class ApiServer:
         pm = self.core.permission_manager
         if not pm:
             return web.json_response({"error": "权限管理器未初始化"}, status=500)
-        from core.permissions import PERMISSION_LABELS, ALL_PERMISSIONS
-        defaults = pm.get_permissions("__defaults__") if hasattr(pm, 'get_permissions') else {}
-        # 直接读取默认配置
-        default_perms = {}
         try:
-            all_perms = pm.get_all_permissions()
-            default_perms = all_perms.get("defaults", {})
-        except Exception:
-            default_perms = {p: True for p in ALL_PERMISSIONS}
-        agents_perms = {}
-        try:
-            agents_perms = all_perms.get("agents", {})
-        except Exception:
-            pass
-        return web.json_response({
-            "defaults": default_perms,
-            "agents": agents_perms,
-            "labels": PERMISSION_LABELS,
-            "all_permissions": ALL_PERMISSIONS,
-        })
+            result = pm.get_config_summary()
+            # 前端期望 labels 键名，映射 permission_labels
+            if "permission_labels" in result and "labels" not in result:
+                result["labels"] = result["permission_labels"]
+        except Exception as e:
+            logger.error(f"获取权限配置失败: {e}")
+            return web.json_response({"error": str(e)}, status=500)
+        return web.json_response(result)
 
     async def handle_set_default_permissions(self, request):
         """PUT /api/permissions/defaults - 更新全局默认权限"""
@@ -1601,7 +1590,7 @@ class ApiServer:
             # data 格式: {"execution": true, "file_read": false, ...}
             if isinstance(data, dict):
                 for perm, value in data.items():
-                    if isinstance(value, bool) and perm in PermissionManager.ALL_PERMISSIONS:
+                    if isinstance(value, bool) and perm in pm.ALL_PERMISSIONS:
                         pm.set_default_permission(perm, value)
             pm.save()
             return web.json_response({"ok": True})
@@ -1616,7 +1605,7 @@ class ApiServer:
         agent = request.match_info["agent"]
         try:
             perms = pm.get_permissions(agent)
-            return web.json_response({"agent": agent, "permissions": perms})
+            return web.json_response({"agent": agent, "permissions": perms.to_dict()})
         except Exception as e:
             return web.json_response({"error": str(e)}, status=500)
 

package/web/ui/index.html

@@ -417,10 +417,7 @@ async function openEditAgentModal(path){
         <div class="form-group"><label>头像 Emoji</label><input id="eaEmoji" value="${escHtml(a.avatar_emoji||'')}" ${isSys?'disabled':''}></div>
         <div class="form-group"><label>头像颜色</label><div class="flex gap-8 items-center"><input id="eaColor" value="${escHtml(a.avatar_color||'#6366f1')}" type="color" style="width:48px;height:34px;padding:2px" ${isSys?'disabled':''}><input id="eaColorText" value="${escHtml(a.avatar_color||'#6366f1')}" style="flex:1" oninput="$('eaColor').value=this.value" ${isSys?'disabled':''}></div></div>
       </div>
-      <div class="form-row">
-        <div class="form-group"><label>执行模式</label><select id="eaExecMode" ${isSys?'disabled':''}><option value="sandbox" ${a.execution_mode==='sandbox'?'selected':''}>沙盒 (Docker)</option><option value="local" ${a.execution_mode==='local'?'selected':''}>本机</option></select></div>
-        <div class="form-group"><label>绑定模型</label><select id="eaModelId"><option value="">使用全局默认</option>${modelOpts}</select></div>
-      </div>
+      <div class="form-group"><label>绑定模型</label><select id="eaModelId"><option value="">使用全局默认</option>${modelOpts}</select></div>
       <div class="form-group"><label>备用模型</label><select id="eaBackupModels" multiple style="min-height:60px">${backupOpts}</select><div style="font-size:11px;color:var(--text2);margin-top:4px">按住 Ctrl/Cmd 多选</div></div>
       <div class="form-row">
         <div class="form-group"><label>Agent ID <span style="color:var(--text2)">(只读)</span></label><input id="eaId" value="${escHtml(a.id||'-')}" disabled></div>
@@ -485,7 +482,7 @@ function agentTabSwitch(el,tabId){
 async function doSaveAgent(path){
   const r=await api(`/api/agents/${encodeURIComponent(path)}`,{method:'PUT',body:JSON.stringify({
     description:$('eaDesc').value,avatar_emoji:$('eaEmoji').value,avatar_color:$('eaColorText').value,
-    execution_mode:$('eaExecMode').value,model_id:$('eaModelId').value,
+    model_id:$('eaModelId').value,
     backup_model_ids:Array.from($('eaBackupModels').selectedOptions).map(o=>o.value),
     work_dir:$('eaWorkDir').value,system_prompt:$('eaPrompt').value
   })});
@@ -572,53 +569,91 @@ async function viewSessionMsgs(sid){
 
 async function loadAgentPerms(){
   const path=window._currentEditAgentPath;if(!path)return;
-  const [agentPerms,globalPerms]=await Promise.all([
+  const [agentPerms,globalPerms,agentInfo]=await Promise.all([
     api('/api/permissions/'+encodeURIComponent(path)),
-    api('/api/permissions')
+    api('/api/permissions'),
+    api(`/api/agents/${encodeURIComponent(path)}`)
   ]);
   const perms=globalPerms.all_permissions||[];
   const labels=globalPerms.labels||{};
   const defaults=globalPerms.defaults||{};
   const ap=agentPerms.permissions||{};
-  let html='<h4 style="font-size:14px;color:var(--text2);margin-bottom:12px">Agent 权限配置</h4>';
-  html+='<p style="color:var(--text2);font-size:12px;margin-bottom:16px">为该 Agent 单独配置权限。未设置的项目将使用全局默认值。</p>';
+  const execMode=agentInfo.execution_mode||'sandbox';
+  const isSys=!!agentInfo.system;
+
+  // ── 执行模式卡片 ──
+  let html='<div class="card" style="margin-bottom:16px">';
+  html+='<h3 style="font-size:14px;color:var(--text2);margin-bottom:8px">⚡ 执行环境</h3>';
+  html+='<p style="color:var(--text2);font-size:12px;margin-bottom:12px">选择 Agent 代码执行的运行环境。沙盒模式隔离更安全，本机模式可使用全部本地资源。</p>';
+  html+='<div style="display:flex;gap:12px">';
+  html+=`<label style="flex:1;display:flex;align-items:center;gap:10px;padding:14px 16px;border-radius:var(--radius);border:2px solid ${execMode==='sandbox'?'var(--primary)':'var(--border)'};cursor:pointer;background:${execMode==='sandbox'?'var(--accent-light)':'transparent'};transition:all .15s" onclick="document.getElementById('permExecSandbox').checked=true;updateExecModeUI()">`;
+  html+=`<input type="radio" name="permExecMode" id="permExecSandbox" value="sandbox" ${execMode==='sandbox'?'checked':''} style="display:none">`;
+  html+=`<span style="font-size:28px">🐳</span><div><div style="font-weight:600;font-size:14px">沙盒模式</div><div style="font-size:11px;color:var(--text2);margin-top:2px">Docker 容器隔离，安全受限</div></div></label>`;
+  html+=`<label style="flex:1;display:flex;align-items:center;gap:10px;padding:14px 16px;border-radius:var(--radius);border:2px solid ${execMode==='local'?'var(--primary)':'var(--border)'};cursor:pointer;background:${execMode==='local'?'var(--accent-light)':'transparent'};transition:all .15s" onclick="document.getElementById('permExecLocal').checked=true;updateExecModeUI()">`;
+  html+=`<input type="radio" name="permExecMode" id="permExecLocal" value="local" ${execMode==='local'?'checked':''} style="display:none">`;
+  html+=`<span style="font-size:28px">💻</span><div><div style="font-weight:600;font-size:14px">本机模式</div><div style="font-size:11px;color:var(--text2);margin-top:2px">直接在本机运行，完整权限</div></div></label>`;
+  html+='</div></div>';
+
+  // ── 功能权限卡片 ──
+  html+='<div class="card" style="margin-bottom:16px">';
+  html+='<h3 style="font-size:14px;color:var(--text2);margin-bottom:8px">🔑 功能权限</h3>';
+  html+='<p style="color:var(--text2);font-size:12px;margin-bottom:12px">精细控制 Agent 的各项能力。未设置的项目将使用全局默认值。</p>';
   html+='<div class="grid" style="grid-template-columns:repeat(3,1fr);gap:12px">';
   for(const p of perms){
     const label=labels[p]||p;
     const defVal=defaults[p]!==false;
     const curVal=ap[p]!==undefined?ap[p]:defVal;
     const checked=curVal?'checked':'';
-    const isDefault=ap[p]===undefined?'(默认)':'';
-    html+=`<div class="form-group" style="display:flex;align-items:center;gap:10px"><label style="flex:1;font-weight:500">${label} <span style="color:var(--text3);font-size:11px">${isDefault}</span></label><input type="checkbox" id="agent_perm_${p}" ${checked} style="width:18px;height:18px;cursor:pointer"></div>`;
+    const isDefault=ap[p]===undefined?'<span style=\"color:var(--text3);font-size:11px;margin-left:4px\">(默认)</span>':'';
+    html+=`<div class="form-group" style="display:flex;align-items:center;gap:10px"><label style="flex:1;font-weight:500">${label}${isDefault}</label><input type="checkbox" id="agent_perm_${p}" ${checked} style="width:18px;height:18px;cursor:pointer"></div>`;
   }
+  html+='</div></div>';
+
+  // ── 操作按钮 ──
+  html+='<div class="flex gap-8">';
+  html+='<button class="btn btn-primary" onclick="saveAgentPermsFromTab()">💾 保存全部</button>';
+  html+='<button class="btn btn-ghost" onclick="resetAgentPermsFromTab()">🔄 重置功能权限为默认</button>';
   html+='</div>';
-  html+='<div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="saveAgentPermsFromTab()">保存权限</button>';
-  html+='<button class="btn btn-ghost" onclick="resetAgentPermsFromTab()">重置为默认</button></div>';
   $('atPermsContent').innerHTML=html;
 }
+function updateExecModeUI(){
+  const sandbox=document.getElementById('permExecSandbox');
+  const local=document.getElementById('permExecLocal');
+  if(!sandbox||!local)return;
+  const isLocal=local.checked;
+  [sandbox.parentElement,local.parentElement].forEach(el=>{
+    const radio=el.querySelector('input[type=radio]');
+    if(radio.checked){el.style.borderColor='var(--primary)';el.style.background='var(--accent-light)'}
+    else{el.style.borderColor='var(--border)';el.style.background='transparent'}
+  });
+}
 async function saveAgentPermsFromTab(){
   const path=window._currentEditAgentPath;if(!path)return;
+  // 1. 保存执行模式
+  const execSandbox=document.getElementById('permExecSandbox');
+  const execLocal=document.getElementById('permExecLocal');
+  const newExecMode=(execSandbox&&execSandbox.checked)?'sandbox':((execLocal&&execLocal.checked)?'local':'sandbox');
+  const execR=await api(`/api/agents/${encodeURIComponent(path)}`,{method:'PUT',body:JSON.stringify({execution_mode:newExecMode})});
+  if(execR.error){showToast('执行模式保存失败: '+execR.error,'danger');return}
+
+  // 2. 保存功能权限
   const [agentPerms,globalPerms]=await Promise.all([
     api('/api/permissions/'+encodeURIComponent(path)),
     api('/api/permissions')
   ]);
   const perms=globalPerms.all_permissions||[];
   const defaults=globalPerms.defaults||{};
-  const ap=agentPerms.permissions||{};
   const data={};
   for(const p of perms){
     const el=document.getElementById('agent_perm_'+p);
     if(!el)continue;
     const defVal=defaults[p]!==false;
     const curVal=el.checked;
-    // Only include if different from default
-    if(curVal!==defVal){
-      data[p]=curVal;
-    }
+    if(curVal!==defVal){data[p]=curVal}
   }
   const r=await api('/api/permissions/'+encodeURIComponent(path),{method:'PUT',body:JSON.stringify(data)});
-  if(r.error){showToast(r.error,'danger');return}
-  showToast('Agent 权限已保存','success');
+  if(r.error){showToast('权限保存失败: '+r.error,'danger');return}
+  showToast('权限配置已保存','success');
 }
 async function resetAgentPermsFromTab(){
   const path=window._currentEditAgentPath;if(!path)return;
@@ -821,14 +856,34 @@ async function editAgentPerms(name){
   const labels=_permsCache.labels||{};
   const perms=_permsCache.all_permissions||[];
   const defaults=_permsCache.defaults||{};
-  // 获取当前 agent 权限
+  // 获取当前 agent 权限和 agent 信息（含执行模式）
   let agentPerms={};
+  let agentExecMode='sandbox';
   try{
-    const r=await api('/api/permissions/'+encodeURIComponent(name));
+    const [r,ai]=await Promise.all([
+      api('/api/permissions/'+encodeURIComponent(name)),
+      api('/api/agents/'+encodeURIComponent(name))
+    ]);
     agentPerms=r.permissions||{};
+    agentExecMode=ai.execution_mode||'sandbox';
   }catch(e){agentPerms={...defaults}}
 
-  let html='<h3>编辑 Agent 权限: '+escHtml(name)+'</h3><div class="grid" style="grid-template-columns:repeat(3,1fr);gap:12px">';
+  let html='<h3>编辑 Agent 权限: '+escHtml(name)+'</h3>';
+
+  // 执行模式选择
+  html+='<div style="margin-bottom:16px"><div style="font-size:13px;color:var(--text2);margin-bottom:8px;font-weight:600">⚡ 执行环境</div>';
+  html+='<div style="display:flex;gap:12px">';
+  html+=`<label id="modalExecSandboxLabel" style="flex:1;display:flex;align-items:center;gap:10px;padding:12px 14px;border-radius:var(--radius);border:2px solid ${agentExecMode==='sandbox'?'var(--primary)':'var(--border)'};cursor:pointer;background:${agentExecMode==='sandbox'?'var(--accent-light)':'transparent'};transition:all .15s" onclick="document.getElementById('modalExecSandbox').checked=true;updateModalExecUI()">`;
+  html+=`<input type="radio" name="modalExecMode" id="modalExecSandbox" value="sandbox" ${agentExecMode==='sandbox'?'checked':''} style="display:none">`;
+  html+=`<span style="font-size:24px">🐳</span><div><div style="font-weight:600;font-size:13px">沙盒模式</div><div style="font-size:11px;color:var(--text2)">Docker 容器隔离</div></div></label>`;
+  html+=`<label id="modalExecLocalLabel" style="flex:1;display:flex;align-items:center;gap:10px;padding:12px 14px;border-radius:var(--radius);border:2px solid ${agentExecMode==='local'?'var(--primary)':'var(--border)'};cursor:pointer;background:${agentExecMode==='local'?'var(--accent-light)':'transparent'};transition:all .15s" onclick="document.getElementById('modalExecLocal').checked=true;updateModalExecUI()">`;
+  html+=`<input type="radio" name="modalExecMode" id="modalExecLocal" value="local" ${agentExecMode==='local'?'checked':''} style="display:none">`;
+  html+=`<span style="font-size:24px">💻</span><div><div style="font-weight:600;font-size:13px">本机模式</div><div style="font-size:11px;color:var(--text2)">完整本地权限</div></div></label>`;
+  html+='</div></div>';
+
+  // 功能权限
+  html+='<div style="font-size:13px;color:var(--text2);margin-bottom:8px;font-weight:600">🔑 功能权限</div>';
+  html+='<div class="grid" style="grid-template-columns:repeat(3,1fr);gap:12px">';
   for(const p of perms){
     const label=labels[p]||p;
     const defVal=defaults[p]!==false;
@@ -836,12 +891,33 @@ async function editAgentPerms(name){
     const checked=curVal?'checked':'';
     html+=`<div class="form-group" style="display:flex;align-items:center;gap:10px"><label style="flex:1;font-weight:500">${label}</label><input type="checkbox" id="perm_agent_${p}" ${checked} style="width:18px;height:18px;cursor:pointer"></div>`;
   }
-  html+='</div><div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="saveAgentPerms(\''+escHtml(name)+'\')">保存</button><button class="btn btn-ghost" onclick="renderPermissions()">取消</button></div>';
+  html+='</div><div class="flex gap-8 mt-16"><button class="btn btn-primary" onclick="saveAgentPerms(\''+escHtml(name)+'\')">💾 保存</button><button class="btn btn-ghost" onclick="renderPermissions()">取消</button></div>';
   $('modalContainer').innerHTML='<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()">'+html+'</div></div>';
 }
 
+function updateModalExecUI(){
+  const sandbox=document.getElementById('modalExecSandbox');
+  const local=document.getElementById('modalExecLocal');
+  if(!sandbox||!local)return;
+  [sandbox.parentElement,local.parentElement].forEach(el=>{
+    const radio=el.querySelector('input[type=radio]');
+    if(radio.checked){el.style.borderColor='var(--primary)';el.style.background='var(--accent-light)'}
+    else{el.style.borderColor='var(--border)';el.style.background='transparent'}
+  });
+}
+
 async function saveAgentPerms(name){
   if(!_permsCache)return;
+  // 1. 保存执行模式
+  const modalSandbox=document.getElementById('modalExecSandbox');
+  const modalLocal=document.getElementById('modalExecLocal');
+  if(modalSandbox||modalLocal){
+    const newMode=(modalSandbox&&modalSandbox.checked)?'sandbox':((modalLocal&&modalLocal.checked)?'local':null);
+    if(newMode){
+      await api('/api/agents/'+encodeURIComponent(name),{method:'PUT',body:JSON.stringify({execution_mode:newMode})});
+    }
+  }
+  // 2. 保存功能权限
   const perms=_permsCache.all_permissions||[];
   const data={};
   for(const p of perms){