myagent-ai 1.31.1 → 1.31.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/web/api_server.py +184 -9
- package/web/ui/admin/admin-core.js +1 -1
- package/web/ui/admin/admin-sites.js +317 -0
- package/web/ui/admin/admin-skills.js +4 -0
- package/web/ui/index.html +2 -0
- package/worklog.md +24 -0
package/package.json
CHANGED
package/web/api_server.py
CHANGED
|
@@ -224,6 +224,9 @@ class ApiServer:
|
|
|
224
224
|
self._model_chain_lock = asyncio.Lock()
|
|
225
225
|
self._setup_routes()
|
|
226
226
|
self._runner: Optional[web.AppRunner] = None
|
|
227
|
+
# [v1.31.1] Agent 初始化锁:防止并发请求重复创建全权Agent和配置助手
|
|
228
|
+
self._agents_initialized = False
|
|
229
|
+
self._agents_init_lock = asyncio.Lock()
|
|
227
230
|
|
|
228
231
|
# ── 统一热更新辅助方法 ──
|
|
229
232
|
def _hot_reload_llm(self):
|
|
@@ -492,6 +495,16 @@ class ApiServer:
|
|
|
492
495
|
r.add_get(r"/api/departments/{path:[\w%/-]+}", self.handle_get_dept)
|
|
493
496
|
r.add_put(r"/api/departments/{path:[\w%/-]+}", self.handle_update_dept)
|
|
494
497
|
r.add_delete(r"/api/departments/{path:[\w%/-]+}", self.handle_delete_dept)
|
|
498
|
+
# ── 网站管理 (SiteRegistry) ──
|
|
499
|
+
r.add_get("/api/sites", self.handle_list_sites)
|
|
500
|
+
r.add_get("/api/sites/categories", self.handle_site_categories)
|
|
501
|
+
r.add_get("/api/sites/{name}", self.handle_get_site)
|
|
502
|
+
r.add_post("/api/sites", self.handle_add_site)
|
|
503
|
+
r.add_put("/api/sites/{name}", self.handle_update_site)
|
|
504
|
+
r.add_delete("/api/sites/{name}", self.handle_remove_site)
|
|
505
|
+
r.add_post("/api/sites/{name}/init-profile", self.handle_init_site_profile)
|
|
506
|
+
r.add_get("/api/sites/profiles", self.handle_list_profiles)
|
|
507
|
+
r.add_delete("/api/sites/profiles/{name}", self.handle_delete_profile)
|
|
495
508
|
# ── 任务持久化 ──
|
|
496
509
|
r.add_get("/api/tasks", self.handle_list_tasks)
|
|
497
510
|
r.add_post("/api/tasks/{task_id}/retry", self.handle_retry_task)
|
|
@@ -3169,8 +3182,26 @@ window.addEventListener('beforeunload', function() {{
|
|
|
3169
3182
|
"""根据 agent ID 返回目录 (aid 如 '1', '2')"""
|
|
3170
3183
|
return self._agents_dir() / aid
|
|
3171
3184
|
|
|
3185
|
+
async def _ensure_agents_initialized(self):
|
|
3186
|
+
"""[v1.31.1] 异步安全地确保系统 Agent 只创建一次。
|
|
3187
|
+
|
|
3188
|
+
使用 asyncio.Lock 防止并发请求导致重复创建。
|
|
3189
|
+
"""
|
|
3190
|
+
if self._agents_initialized:
|
|
3191
|
+
return
|
|
3192
|
+
async with self._agents_init_lock:
|
|
3193
|
+
if self._agents_initialized:
|
|
3194
|
+
return
|
|
3195
|
+
self._ensure_default_agent()
|
|
3196
|
+
self._agents_initialized = True
|
|
3197
|
+
logger.info("系统 Agent 初始化完成(全权Agent + 配置助手)")
|
|
3198
|
+
|
|
3172
3199
|
def _ensure_default_agent(self):
|
|
3173
|
-
"""确保默认 agent 存在(ID=1,名为「全权Agent」,目录名=1)
|
|
3200
|
+
"""确保默认 agent 存在(ID=1,名为「全权Agent」,目录名=1)
|
|
3201
|
+
|
|
3202
|
+
[v1.31.1] 改为内部方法,由 _ensure_agents_initialized 统一调用。
|
|
3203
|
+
不再由各个 API handler 单独调用,防止并发重复创建。
|
|
3204
|
+
"""
|
|
3174
3205
|
aid = "1"
|
|
3175
3206
|
ad = self._agent_dir(aid)
|
|
3176
3207
|
if not (ad / "config.json").exists():
|
|
@@ -3417,7 +3448,7 @@ window.addEventListener('beforeunload', function() {{
|
|
|
3417
3448
|
|
|
3418
3449
|
async def handle_list_agents(self, request):
|
|
3419
3450
|
"""GET /api/agents - 返回扁平 agent 列表(系统 agent 排在最前)"""
|
|
3420
|
-
self.
|
|
3451
|
+
await self._ensure_agents_initialized()
|
|
3421
3452
|
agents = self._scan_agents_flat()
|
|
3422
3453
|
# 统计会话数
|
|
3423
3454
|
if self.core.memory:
|
|
@@ -3437,7 +3468,7 @@ window.addEventListener('beforeunload', function() {{
|
|
|
3437
3468
|
|
|
3438
3469
|
async def handle_agents_tree(self, request):
|
|
3439
3470
|
"""GET /api/agents/tree - 返回树形结构(系统 agent 排在最前)"""
|
|
3440
|
-
self.
|
|
3471
|
+
await self._ensure_agents_initialized()
|
|
3441
3472
|
agents_flat = self._scan_agents_flat()
|
|
3442
3473
|
# 统计会话数
|
|
3443
3474
|
if self.core.memory:
|
|
@@ -3461,7 +3492,7 @@ window.addEventListener('beforeunload', function() {{
|
|
|
3461
3492
|
|
|
3462
3493
|
async def handle_create_agent(self, request):
|
|
3463
3494
|
"""POST /api/agents - 创建顶级 agent"""
|
|
3464
|
-
self.
|
|
3495
|
+
await self._ensure_agents_initialized()
|
|
3465
3496
|
data = await request.json()
|
|
3466
3497
|
name = data.get("name", "").strip()
|
|
3467
3498
|
if not name:
|
|
@@ -3534,7 +3565,7 @@ window.addEventListener('beforeunload', function() {{
|
|
|
3534
3565
|
async def handle_create_child(self, request):
|
|
3535
3566
|
"""POST /api/agents/{parent}/children - 创建子 agent"""
|
|
3536
3567
|
parent_path = request.match_info["name"]
|
|
3537
|
-
self.
|
|
3568
|
+
await self._ensure_agents_initialized()
|
|
3538
3569
|
|
|
3539
3570
|
parent_cfg = self._read_agent_config(parent_path)
|
|
3540
3571
|
if not parent_cfg:
|
|
@@ -5025,6 +5056,150 @@ window.addEventListener('beforeunload', function() {{
|
|
|
5025
5056
|
if isinstance(disabled, list):
|
|
5026
5057
|
self.core.skill_registry.disabled_skills = set(disabled)
|
|
5027
5058
|
|
|
5059
|
+
# --- Site Management (v1.31.1) ---
|
|
5060
|
+
|
|
5061
|
+
def _get_site_registry(self):
|
|
5062
|
+
"""获取 SiteRegistry 单例(懒加载)"""
|
|
5063
|
+
if not hasattr(self, '_site_registry'):
|
|
5064
|
+
from core.site_registry import get_site_registry
|
|
5065
|
+
self._site_registry = get_site_registry()
|
|
5066
|
+
return self._site_registry
|
|
5067
|
+
|
|
5068
|
+
def _get_browser_profile_manager(self):
|
|
5069
|
+
"""获取 BrowserProfileManager 单例(懒加载)"""
|
|
5070
|
+
if not hasattr(self, '_browser_profile_mgr'):
|
|
5071
|
+
from core.browser_profile import get_browser_profile_manager
|
|
5072
|
+
self._browser_profile_mgr = get_browser_profile_manager()
|
|
5073
|
+
return self._browser_profile_mgr
|
|
5074
|
+
|
|
5075
|
+
async def handle_list_sites(self, request):
|
|
5076
|
+
"""GET /api/sites - 列出所有网站(支持 ?category=xxx 筛选)"""
|
|
5077
|
+
reg = self._get_site_registry()
|
|
5078
|
+
category = request.query.get("category", "")
|
|
5079
|
+
sites = reg.list_sites(category=category)
|
|
5080
|
+
summary = reg.to_summary()
|
|
5081
|
+
return web.json_response({
|
|
5082
|
+
"sites": sites,
|
|
5083
|
+
"summary": {
|
|
5084
|
+
"total": summary["total"],
|
|
5085
|
+
"builtin_count": summary["builtin_count"],
|
|
5086
|
+
"custom_count": summary["custom_count"],
|
|
5087
|
+
},
|
|
5088
|
+
})
|
|
5089
|
+
|
|
5090
|
+
async def handle_site_categories(self, request):
|
|
5091
|
+
"""GET /api/sites/categories - 获取分类统计"""
|
|
5092
|
+
reg = self._get_site_registry()
|
|
5093
|
+
cats = reg.get_categories()
|
|
5094
|
+
return web.json_response(cats)
|
|
5095
|
+
|
|
5096
|
+
async def handle_get_site(self, request):
|
|
5097
|
+
"""GET /api/sites/{name} - 获取单个网站详情"""
|
|
5098
|
+
name = request.match_info["name"]
|
|
5099
|
+
reg = self._get_site_registry()
|
|
5100
|
+
site = reg.get_site(name)
|
|
5101
|
+
if not site:
|
|
5102
|
+
return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
|
|
5103
|
+
# 附加 Profile 信息
|
|
5104
|
+
from core.browser_profile import get_browser_profile_manager
|
|
5105
|
+
mgr = get_browser_profile_manager()
|
|
5106
|
+
profile = mgr.get_profile(name)
|
|
5107
|
+
site["profile"] = profile.to_dict()
|
|
5108
|
+
return web.json_response(site)
|
|
5109
|
+
|
|
5110
|
+
async def handle_add_site(self, request):
|
|
5111
|
+
"""POST /api/sites - 添加自定义网站"""
|
|
5112
|
+
try:
|
|
5113
|
+
data = await request.json()
|
|
5114
|
+
except Exception:
|
|
5115
|
+
return web.json_response({"error": "无效的 JSON 请求体"}, status=400)
|
|
5116
|
+
|
|
5117
|
+
name = data.get("name", "").strip().lower().replace(" ", "_")
|
|
5118
|
+
if not name:
|
|
5119
|
+
return web.json_response({"error": "网站名称不能为空"}, status=400)
|
|
5120
|
+
if not all(c.isalnum() or c in "_-" for c in name):
|
|
5121
|
+
return web.json_response({"error": "网站名称只能包含字母、数字、下划线和连字符"}, status=400)
|
|
5122
|
+
|
|
5123
|
+
reg = self._get_site_registry()
|
|
5124
|
+
try:
|
|
5125
|
+
site = reg.add_site(data)
|
|
5126
|
+
return web.json_response({"ok": True, "site": site})
|
|
5127
|
+
except ValueError as e:
|
|
5128
|
+
return web.json_response({"error": str(e)}, status=400)
|
|
5129
|
+
except Exception as e:
|
|
5130
|
+
logger.error(f"添加网站失败: {e}")
|
|
5131
|
+
return web.json_response({"error": f"添加网站失败: {e}"}, status=500)
|
|
5132
|
+
|
|
5133
|
+
async def handle_update_site(self, request):
|
|
5134
|
+
"""PUT /api/sites/{name} - 更新网站配置"""
|
|
5135
|
+
name = request.match_info["name"]
|
|
5136
|
+
try:
|
|
5137
|
+
data = await request.json()
|
|
5138
|
+
except Exception:
|
|
5139
|
+
return web.json_response({"error": "无效的 JSON 请求体"}, status=400)
|
|
5140
|
+
|
|
5141
|
+
reg = self._get_site_registry()
|
|
5142
|
+
# 只允许更新部分字段
|
|
5143
|
+
allowed = {"display_name", "category", "login_url", "detect_url", "home_url",
|
|
5144
|
+
"urls", "tips", "enabled"}
|
|
5145
|
+
updates = {k: v for k, v in data.items() if k in allowed}
|
|
5146
|
+
|
|
5147
|
+
if not updates:
|
|
5148
|
+
return web.json_response({"error": "没有可更新的字段"}, status=400)
|
|
5149
|
+
|
|
5150
|
+
site = reg.update_site(name, updates)
|
|
5151
|
+
if not site:
|
|
5152
|
+
return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
|
|
5153
|
+
return web.json_response({"ok": True, "site": site})
|
|
5154
|
+
|
|
5155
|
+
async def handle_remove_site(self, request):
|
|
5156
|
+
"""DELETE /api/sites/{name} - 删除自定义网站"""
|
|
5157
|
+
name = request.match_info["name"]
|
|
5158
|
+
reg = self._get_site_registry()
|
|
5159
|
+
ok = reg.remove_site(name)
|
|
5160
|
+
if not ok:
|
|
5161
|
+
return web.json_response({"error": f"无法删除网站 '{name}'(内置网站不可删除)"}, status=400)
|
|
5162
|
+
# 同时删除 Profile
|
|
5163
|
+
from core.browser_profile import get_browser_profile_manager
|
|
5164
|
+
mgr = get_browser_profile_manager()
|
|
5165
|
+
mgr.delete_profile(name)
|
|
5166
|
+
return web.json_response({"ok": True})
|
|
5167
|
+
|
|
5168
|
+
async def handle_init_site_profile(self, request):
|
|
5169
|
+
"""POST /api/sites/{name}/init-profile - 初始化网站浏览器 Profile"""
|
|
5170
|
+
name = request.match_info["name"]
|
|
5171
|
+
reg = self._get_site_registry()
|
|
5172
|
+
site = reg.get_site(name)
|
|
5173
|
+
if not site:
|
|
5174
|
+
return web.json_response({"error": f"网站 '{name}' 不存在"}, status=404)
|
|
5175
|
+
try:
|
|
5176
|
+
initialized = reg.init_profiles([name])
|
|
5177
|
+
return web.json_response({"ok": True, "initialized": initialized})
|
|
5178
|
+
except Exception as e:
|
|
5179
|
+
logger.error(f"初始化 Profile 失败 ({name}): {e}")
|
|
5180
|
+
return web.json_response({"error": f"初始化失败: {e}"}, status=500)
|
|
5181
|
+
|
|
5182
|
+
async def handle_list_profiles(self, request):
|
|
5183
|
+
"""GET /api/sites/profiles - 列出所有已初始化的浏览器 Profile"""
|
|
5184
|
+
from core.browser_profile import get_browser_profile_manager
|
|
5185
|
+
mgr = get_browser_profile_manager()
|
|
5186
|
+
profiles = mgr.list_profiles()
|
|
5187
|
+
total_size = mgr.get_total_size_mb()
|
|
5188
|
+
return web.json_response({
|
|
5189
|
+
"profiles": profiles,
|
|
5190
|
+
"total_size_mb": round(total_size, 2),
|
|
5191
|
+
})
|
|
5192
|
+
|
|
5193
|
+
async def handle_delete_profile(self, request):
|
|
5194
|
+
"""DELETE /api/sites/profiles/{name} - 删除浏览器 Profile"""
|
|
5195
|
+
name = request.match_info["name"]
|
|
5196
|
+
from core.browser_profile import get_browser_profile_manager
|
|
5197
|
+
mgr = get_browser_profile_manager()
|
|
5198
|
+
ok = mgr.delete_profile(name)
|
|
5199
|
+
if not ok:
|
|
5200
|
+
return web.json_response({"error": f"Profile '{name}' 不存在或删除失败"}, status=404)
|
|
5201
|
+
return web.json_response({"ok": True})
|
|
5202
|
+
|
|
5028
5203
|
# --- Workdir ---
|
|
5029
5204
|
async def handle_get_workdir(self, request):
|
|
5030
5205
|
return web.json_response({"path": str(self.core.config_mgr.data_dir / "workspace")})
|
|
@@ -7059,8 +7234,8 @@ window.addEventListener('beforeunload', function() {{
|
|
|
7059
7234
|
config = self.core.config
|
|
7060
7235
|
# 检查是否已配置有效的 LLM API Key
|
|
7061
7236
|
needs_setup = not config.llm.api_key
|
|
7062
|
-
#
|
|
7063
|
-
self.
|
|
7237
|
+
# 确保系统 Agent 已初始化(使用异步锁防重复)
|
|
7238
|
+
await self._ensure_agents_initialized()
|
|
7064
7239
|
helper_exists = (self._agent_dir("2") / "config.json").exists()
|
|
7065
7240
|
return web.json_response({
|
|
7066
7241
|
"needs_setup": needs_setup,
|
|
@@ -7073,8 +7248,8 @@ window.addEventListener('beforeunload', function() {{
|
|
|
7073
7248
|
|
|
7074
7249
|
async def handle_setup_complete(self, request):
|
|
7075
7250
|
"""POST /api/setup/complete - 标记首次设置完成"""
|
|
7076
|
-
#
|
|
7077
|
-
self.
|
|
7251
|
+
# 确保系统 Agent 已初始化
|
|
7252
|
+
await self._ensure_agents_initialized()
|
|
7078
7253
|
return web.json_response({"ok": True})
|
|
7079
7254
|
|
|
7080
7255
|
# ── 自动更新管理 ──
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* ── admin-core.js — Shared infrastructure (loaded FIRST) ── */
|
|
2
2
|
|
|
3
3
|
const API='';
|
|
4
|
-
const pages={dashboard:'📊 仪表盘',agents:'🤖 Agent 管理',platforms:'🌐 聊天平台',organization:'🏢 组织管理',departments:'🏛 部门管理',agentchat:'💬 私聊记录',sessions:'📋 会话管理',memory:'🧠 记忆管理',permissions:'🔑 权限管理',llm:'🧬 大模型设置',system:'⚙️ 系统配置',executor:'🔧 执行引擎',skills:'🛠 技能管理',files:'📁 工作目录',logs:'📜 查看日志',tasks:'📌 任务记录'};
|
|
4
|
+
const pages={dashboard:'📊 仪表盘',agents:'🤖 Agent 管理',platforms:'🌐 聊天平台',organization:'🏢 组织管理',departments:'🏛 部门管理',agentchat:'💬 私聊记录',sessions:'📋 会话管理',memory:'🧠 记忆管理',permissions:'🔑 权限管理',llm:'🧬 大模型设置',system:'⚙️ 系统配置',executor:'🔧 执行引擎',sites:'🌐 网站管理',skills:'🛠 技能管理',files:'📁 工作目录',logs:'📜 查看日志',tasks:'📌 任务记录'};
|
|
5
5
|
let currentPage='dashboard';
|
|
6
6
|
let allAgentsCache=[];
|
|
7
7
|
let allModelsCache=[];
|
|
@@ -0,0 +1,317 @@
|
|
|
1
|
+
// ========== Site Management ==========
|
|
2
|
+
// [v1.31.1] 网站注册/浏览器Profile统一管理
|
|
3
|
+
|
|
4
|
+
const SITE_CAT_ICONS = {
|
|
5
|
+
email: '\u{1F4E7}', social: '\u{1F4AC}', cloud: '\u2601\uFE0F',
|
|
6
|
+
ai_chat: '\u{1F916}', dev: '\u{1F6E0}\uFE0F', content: '\u{1F3AC}', custom: '\u2699\uFE0F'
|
|
7
|
+
};
|
|
8
|
+
const SITE_CAT_LABELS = {
|
|
9
|
+
email: '\u90AE\u7BB1\u670D\u52A1', social: '\u793E\u4EA4\u5A92\u4F53', cloud: '\u4E91\u670D\u52A1',
|
|
10
|
+
ai_chat: 'AI \u5BF9\u8BDD', dev: '\u5F00\u53D1\u5DE5\u5177', content: '\u5185\u5BB9\u5E73\u53F0', custom: '\u81EA\u5B9A\u4E49'
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
let _sitesFilter = '';
|
|
14
|
+
let _sitesProfileView = false;
|
|
15
|
+
|
|
16
|
+
async function renderSites() {
|
|
17
|
+
_sitesProfileView = false;
|
|
18
|
+
$('content').setAttribute('data-page', 'sites');
|
|
19
|
+
const r = await api('/api/sites');
|
|
20
|
+
if (r.error) {
|
|
21
|
+
$('content').innerHTML = '<div class="empty" style="color:var(--danger)">加载失败: ' + escHtml(r.error) + '</div>';
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const sites = r.sites || [];
|
|
26
|
+
const summary = r.summary || {};
|
|
27
|
+
const profiles = await api('/api/sites/profiles').catch(function() { return { profiles: [], total_size_mb: 0 }; });
|
|
28
|
+
|
|
29
|
+
// Group by category
|
|
30
|
+
const groups = {};
|
|
31
|
+
for (const s of sites) {
|
|
32
|
+
const cat = s.category || 'custom';
|
|
33
|
+
if (!groups[cat]) groups[cat] = [];
|
|
34
|
+
groups[cat].push(s);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
let html = '<div class="flex justify-between items-center mb-16 flex-wrap gap-8">' +
|
|
38
|
+
'<div style="color:var(--text2);font-size:13px">' +
|
|
39
|
+
'共 <strong>' + sites.length + '</strong> 个网站' +
|
|
40
|
+
' (内置' + (summary.builtin_count || 0) +
|
|
41
|
+
' · 自定义' + (summary.custom_count || 0) + ')' +
|
|
42
|
+
' · Profile ' + (profiles.profiles || []).length + ' 个' +
|
|
43
|
+
' (' + (profiles.total_size_mb || 0) + ' MB)' +
|
|
44
|
+
'</div>' +
|
|
45
|
+
'<div class="flex gap-8">' +
|
|
46
|
+
'<input id="siteSearch" placeholder="搜索网站..." style="width:200px" oninput="filterSites()">' +
|
|
47
|
+
'<button class="btn btn-primary btn-sm" onclick="showAddSiteModal()">+ 添加网站</button>' +
|
|
48
|
+
'<button class="btn btn-ghost btn-sm" onclick="initAllProfiles()">初始化所有 Profile</button>' +
|
|
49
|
+
'</div></div>';
|
|
50
|
+
|
|
51
|
+
// Render each category group
|
|
52
|
+
for (const [cat, catSites] of Object.entries(groups)) {
|
|
53
|
+
const icon = SITE_CAT_ICONS[cat] || '\u{1F310}';
|
|
54
|
+
const label = SITE_CAT_LABELS[cat] || cat;
|
|
55
|
+
html += '<div class="card" style="padding:0;overflow:hidden;margin-bottom:16px">' +
|
|
56
|
+
'<h3 style="padding:12px 16px;margin:0;display:flex;align-items:center;gap:8px">' +
|
|
57
|
+
'<span>' + icon + '</span> ' + label +
|
|
58
|
+
' <span class="badge badge-blue">' + catSites.length + '</span></h3>';
|
|
59
|
+
for (const s of catSites) {
|
|
60
|
+
html += siteRowHtml(s);
|
|
61
|
+
}
|
|
62
|
+
html += '</div>';
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
if (!sites.length) html += '<div class="empty">暂无网站,点击"添加网站"开始配置</div>';
|
|
66
|
+
|
|
67
|
+
$('content').innerHTML = html;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function siteRowHtml(s) {
|
|
71
|
+
const isBuiltin = s.is_builtin;
|
|
72
|
+
const isCustom = s.is_custom;
|
|
73
|
+
const hasProfile = s.has_profile;
|
|
74
|
+
const name = escHtml(s.name || '');
|
|
75
|
+
const displayName = escHtml(s.display_name || s.name || '');
|
|
76
|
+
const loginUrl = escHtml(s.login_url || '');
|
|
77
|
+
const typeTag = isBuiltin ? '<span class="badge badge-blue">内置</span>' :
|
|
78
|
+
isCustom ? '<span class="badge badge-green">自定义</span>' : '';
|
|
79
|
+
const profileTag = hasProfile ? '<span class="badge badge-green">已登录</span>' :
|
|
80
|
+
'<span class="badge badge-yellow">未登录</span>';
|
|
81
|
+
|
|
82
|
+
let actions = '';
|
|
83
|
+
actions += '<button class="btn btn-sm btn-ghost" onclick="viewSiteDetail(\'' + name + '\')">详情</button>';
|
|
84
|
+
if (!isBuiltin) {
|
|
85
|
+
actions += '<button class="btn btn-sm btn-ghost" onclick="editSiteModal(\'' + name + '\')">编辑</button>';
|
|
86
|
+
actions += '<button class="btn btn-sm btn-ghost" style="color:var(--danger)" onclick="removeSite(\'' + name + '\')">删除</button>';
|
|
87
|
+
}
|
|
88
|
+
if (hasProfile) {
|
|
89
|
+
actions += '<button class="btn btn-sm btn-ghost" style="color:var(--warn)" onclick="deleteSiteProfile(\'' + name + '\')">清除登录</button>';
|
|
90
|
+
} else {
|
|
91
|
+
actions += '<button class="btn btn-sm btn-ghost" onclick="initSiteProfile(\'' + name + '\')">Profile</button>';
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
return '<div class="skill-row" data-name="' + name + '" data-desc="' + escHtml(s.display_name || '') + '">' +
|
|
95
|
+
'<div style="flex-shrink:0;width:36px;text-align:center;font-size:18px">' +
|
|
96
|
+
(SITE_CAT_ICONS[s.category] || '\u{1F310}') + '</div>' +
|
|
97
|
+
'<div class="skill-info">' +
|
|
98
|
+
'<div class="skill-name">' + displayName + ' ' + typeTag + ' ' + profileTag + '</div>' +
|
|
99
|
+
'<div class="skill-desc">' + (loginUrl ? '<code style="font-size:11px;color:var(--accent)">' + loginUrl + '</code> ' : '') +
|
|
100
|
+
escHtml(s.home_url || '') + '</div>' +
|
|
101
|
+
'</div>' +
|
|
102
|
+
'<div class="flex gap-8 items-center" style="flex-shrink:0">' + actions + '</div></div>';
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
function filterSites() {
|
|
106
|
+
const q = ($('siteSearch')?.value || '').toLowerCase();
|
|
107
|
+
document.querySelectorAll('#content .skill-row').forEach(function(el) {
|
|
108
|
+
var n = (el.dataset.name || '').toLowerCase();
|
|
109
|
+
var d = (el.dataset.desc || '').toLowerCase();
|
|
110
|
+
el.style.display = (n.includes(q) || d.includes(q)) ? '' : 'none';
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
// ── View Site Detail ──
|
|
115
|
+
async function viewSiteDetail(name) {
|
|
116
|
+
var s = await api('/api/sites/' + encodeURIComponent(name));
|
|
117
|
+
if (s.error) { showToast(s.error, 'danger'); return; }
|
|
118
|
+
|
|
119
|
+
var tipsHtml = '';
|
|
120
|
+
if (s.tips && s.tips.length) {
|
|
121
|
+
tipsHtml = '<div class="form-group"><label>使用提示</label><ul style="font-size:12px;color:var(--text2);padding-left:20px">';
|
|
122
|
+
for (var t of s.tips) tipsHtml += '<li style="margin-bottom:4px">' + escHtml(t) + '</li>';
|
|
123
|
+
tipsHtml += '</ul></div>';
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
var urlsHtml = '';
|
|
127
|
+
if (s.urls && Object.keys(s.urls).length) {
|
|
128
|
+
urlsHtml = '<div class="form-group"><label>常用链接</label><div class="table-wrap"><table>' +
|
|
129
|
+
'<tr><th>名称</th><th>URL</th></tr>';
|
|
130
|
+
for (var k in s.urls) {
|
|
131
|
+
urlsHtml += '<tr><td>' + escHtml(k) + '</td><td><code style="font-size:12px;word-break:break-all">' + escHtml(s.urls[k]) + '</code></td></tr>';
|
|
132
|
+
}
|
|
133
|
+
urlsHtml += '</table></div></div>';
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
var profileInfo = '';
|
|
137
|
+
if (s.profile) {
|
|
138
|
+
var p = s.profile;
|
|
139
|
+
profileInfo = '<div class="form-group"><label>浏览器 Profile</label>' +
|
|
140
|
+
'<div style="font-size:13px;color:var(--text)">' +
|
|
141
|
+
'状态: ' + (p.initialized ? '<span class="badge badge-green">已初始化</span>' : '<span class="badge badge-yellow">未初始化</span>') +
|
|
142
|
+
' · 大小: ' + (p.size_mb || 0) + ' MB' +
|
|
143
|
+
' · Cookie: ' + (p.has_cookies ? '<span class="badge badge-green">有</span>' : '<span class="badge badge-red">无</span>') +
|
|
144
|
+
'</div></div>';
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
var html = '<h3>' + escHtml(s.display_name || s.name) + '</h3>' +
|
|
148
|
+
'<div class="form-row">' +
|
|
149
|
+
'<div class="form-group"><label>网站名称</label><div><code>' + escHtml(s.name) + '</code></div></div>' +
|
|
150
|
+
'<div class="form-group"><label>分类</label><div>' + escHtml(SITE_CAT_LABELS[s.category] || s.category) + '</div></div>' +
|
|
151
|
+
'</div>' +
|
|
152
|
+
'<div class="form-row">' +
|
|
153
|
+
'<div class="form-group"><label>类型</label><div>' + (s.is_builtin ? '<span class="badge badge-blue">内置</span>' : '<span class="badge badge-green">自定义</span>') + '</div></div>' +
|
|
154
|
+
'</div>' +
|
|
155
|
+
'<div class="form-group"><label>登录页</label><div><a href="' + escHtml(s.login_url || '') + '" target="_blank" style="color:var(--accent)">' + escHtml(s.login_url || '-') + '</a></div></div>' +
|
|
156
|
+
'<div class="form-group"><label>首页</label><div><a href="' + escHtml(s.home_url || '') + '" target="_blank" style="color:var(--accent)">' + escHtml(s.home_url || '-') + '</a></div></div>' +
|
|
157
|
+
'<div class="form-group"><label>登录检测</label><div><code style="font-size:12px">' + escHtml(s.detect_url || '-') + '</code></div></div>' +
|
|
158
|
+
urlsHtml + tipsHtml + profileInfo +
|
|
159
|
+
'<div class="flex gap-8 mt-16">' +
|
|
160
|
+
'<button class="btn btn-ghost" onclick="closeModal()">关闭</button>' +
|
|
161
|
+
(!s.is_builtin ? '<button class="btn btn-primary" onclick="closeModal();editSiteModal(\'' + escHtml(s.name) + '\')">编辑</button>' : '') +
|
|
162
|
+
'<button class="btn btn-ghost" onclick="initSiteProfile(\'' + escHtml(s.name) + '\');closeModal()">初始化 Profile</button>' +
|
|
163
|
+
'</div>';
|
|
164
|
+
|
|
165
|
+
$('modalContainer').innerHTML = '<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:600px">' + html + '</div></div>';
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
// ── Add Site Modal ──
|
|
169
|
+
function showAddSiteModal() {
|
|
170
|
+
var html = '<h3>添加自定义网站</h3>' +
|
|
171
|
+
'<div class="form-group"><label>网站名称 (英文标识)</label>' +
|
|
172
|
+
'<input id="siteFormName" placeholder="例如: my_website"></div>' +
|
|
173
|
+
'<div class="form-group"><label>显示名称</label>' +
|
|
174
|
+
'<input id="siteFormDisplay" placeholder="例如: 我的网站"></div>' +
|
|
175
|
+
'<div class="form-group"><label>分类</label>' +
|
|
176
|
+
'<select id="siteFormCategory">' +
|
|
177
|
+
'<option value="custom">自定义</option>' +
|
|
178
|
+
'<option value="email">邮箱服务</option>' +
|
|
179
|
+
'<option value="social">社交媒体</option>' +
|
|
180
|
+
'<option value="cloud">云服务</option>' +
|
|
181
|
+
'<option value="ai_chat">AI 对话</option>' +
|
|
182
|
+
'<option value="dev">开发工具</option>' +
|
|
183
|
+
'<option value="content">内容平台</option>' +
|
|
184
|
+
'</select></div>' +
|
|
185
|
+
'<div class="form-group"><label>登录页 URL</label>' +
|
|
186
|
+
'<input id="siteFormLoginUrl" placeholder="https://example.com/login"></div>' +
|
|
187
|
+
'<div class="form-group"><label>首页 URL</label>' +
|
|
188
|
+
'<input id="siteFormHomeUrl" placeholder="https://example.com/dashboard"></div>' +
|
|
189
|
+
'<div class="form-group"><label>登录检测 URL</label>' +
|
|
190
|
+
'<input id="siteFormDetectUrl" placeholder="https://example.com/dashboard"></div>' +
|
|
191
|
+
'<div class="flex gap-8 mt-16">' +
|
|
192
|
+
'<button class="btn btn-primary" onclick="doAddSite()">添加</button>' +
|
|
193
|
+
'<button class="btn btn-ghost" onclick="closeModal()">取消</button>' +
|
|
194
|
+
'</div>';
|
|
195
|
+
|
|
196
|
+
$('modalContainer').innerHTML = '<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:500px">' + html + '</div></div>';
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
async function doAddSite() {
|
|
200
|
+
var name = ($('siteFormName')?.value || '').trim().toLowerCase().replace(/\s+/g, '_');
|
|
201
|
+
if (!name) { showToast('网站名称不能为空', 'danger'); return; }
|
|
202
|
+
if (!/^[a-z0-9_-]+$/.test(name)) { showToast('网站名称只能包含小写字母、数字、下划线和连字符', 'danger'); return; }
|
|
203
|
+
|
|
204
|
+
var data = {
|
|
205
|
+
name: name,
|
|
206
|
+
display_name: $('siteFormDisplay')?.value || name,
|
|
207
|
+
category: $('siteFormCategory')?.value || 'custom',
|
|
208
|
+
login_url: $('siteFormLoginUrl')?.value || '',
|
|
209
|
+
home_url: $('siteFormHomeUrl')?.value || '',
|
|
210
|
+
detect_url: $('siteFormDetectUrl')?.value || '',
|
|
211
|
+
};
|
|
212
|
+
|
|
213
|
+
var r = await api('/api/sites', { method: 'POST', body: JSON.stringify(data) });
|
|
214
|
+
if (r.error) { showToast(r.error, 'danger'); return; }
|
|
215
|
+
showToast('已添加网站: ' + name, 'success');
|
|
216
|
+
closeModal();
|
|
217
|
+
renderSites();
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
// ── Edit Site Modal ──
|
|
221
|
+
async function editSiteModal(name) {
|
|
222
|
+
var s = await api('/api/sites/' + encodeURIComponent(name));
|
|
223
|
+
if (s.error) { showToast(s.error, 'danger'); return; }
|
|
224
|
+
|
|
225
|
+
var html = '<h3>编辑网站: ' + escHtml(s.display_name || s.name) + '</h3>' +
|
|
226
|
+
'<div class="form-group"><label>网站名称</label>' +
|
|
227
|
+
'<input value="' + escHtml(s.name) + '" disabled style="opacity:0.6"></div>' +
|
|
228
|
+
'<div class="form-group"><label>显示名称</label>' +
|
|
229
|
+
'<input id="editSiteDisplay" value="' + escHtml(s.display_name || '') + '"></div>' +
|
|
230
|
+
'<div class="form-group"><label>分类</label>' +
|
|
231
|
+
'<select id="editSiteCategory">' +
|
|
232
|
+
'<option value="custom"' + (s.category === 'custom' ? ' selected' : '') + '>自定义</option>' +
|
|
233
|
+
'<option value="email"' + (s.category === 'email' ? ' selected' : '') + '>邮箱服务</option>' +
|
|
234
|
+
'<option value="social"' + (s.category === 'social' ? ' selected' : '') + '>社交媒体</option>' +
|
|
235
|
+
'<option value="cloud"' + (s.category === 'cloud' ? ' selected' : '') + '>云服务</option>' +
|
|
236
|
+
'<option value="ai_chat"' + (s.category === 'ai_chat' ? ' selected' : '') + '>AI 对话</option>' +
|
|
237
|
+
'<option value="dev"' + (s.category === 'dev' ? ' selected' : '') + '>开发工具</option>' +
|
|
238
|
+
'<option value="content"' + (s.category === 'content' ? ' selected' : '') + '>内容平台</option>' +
|
|
239
|
+
'</select></div>' +
|
|
240
|
+
'<div class="form-group"><label>登录页 URL</label>' +
|
|
241
|
+
'<input id="editSiteLoginUrl" value="' + escHtml(s.login_url || '') + '"></div>' +
|
|
242
|
+
'<div class="form-group"><label>首页 URL</label>' +
|
|
243
|
+
'<input id="editSiteHomeUrl" value="' + escHtml(s.home_url || '') + '"></div>' +
|
|
244
|
+
'<div class="form-group"><label>登录检测 URL</label>' +
|
|
245
|
+
'<input id="editSiteDetectUrl" value="' + escHtml(s.detect_url || '') + '"></div>' +
|
|
246
|
+
'<div class="flex gap-8 mt-16">' +
|
|
247
|
+
'<button class="btn btn-primary" onclick="doUpdateSite(\'' + escHtml(s.name) + '\')">保存</button>' +
|
|
248
|
+
'<button class="btn btn-ghost" onclick="closeModal()">取消</button>' +
|
|
249
|
+
'</div>';
|
|
250
|
+
|
|
251
|
+
$('modalContainer').innerHTML = '<div class="modal-overlay" onclick="closeModal()"><div class="modal" onclick="event.stopPropagation()" style="max-width:500px">' + html + '</div></div>';
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
async function doUpdateSite(name) {
|
|
255
|
+
var data = {
|
|
256
|
+
display_name: $('editSiteDisplay')?.value || '',
|
|
257
|
+
category: $('editSiteCategory')?.value || 'custom',
|
|
258
|
+
login_url: $('editSiteLoginUrl')?.value || '',
|
|
259
|
+
home_url: $('editSiteHomeUrl')?.value || '',
|
|
260
|
+
detect_url: $('editSiteDetectUrl')?.value || '',
|
|
261
|
+
};
|
|
262
|
+
|
|
263
|
+
var r = await api('/api/sites/' + encodeURIComponent(name), { method: 'PUT', body: JSON.stringify(data) });
|
|
264
|
+
if (r.error) { showToast(r.error, 'danger'); return; }
|
|
265
|
+
showToast('已更新网站: ' + name, 'success');
|
|
266
|
+
closeModal();
|
|
267
|
+
renderSites();
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
// ── Remove Site ──
|
|
271
|
+
function removeSite(name) {
|
|
272
|
+
showConfirm('删除网站', '确定要删除网站 "' + name + '" 吗?将同时删除浏览器 Profile。', function() {
|
|
273
|
+
return api('/api/sites/' + encodeURIComponent(name), { method: 'DELETE' }).then(function(r) {
|
|
274
|
+
if (r.error) { showToast(r.error, 'danger'); return; }
|
|
275
|
+
showToast('已删除: ' + name, 'success');
|
|
276
|
+
renderSites();
|
|
277
|
+
});
|
|
278
|
+
});
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
// ── Profile Management ──
|
|
282
|
+
async function initSiteProfile(name) {
|
|
283
|
+
var r = await api('/api/sites/' + encodeURIComponent(name) + '/init-profile', { method: 'POST' });
|
|
284
|
+
if (r.error) { showToast(r.error, 'danger'); return; }
|
|
285
|
+
showToast('Profile 已初始化: ' + name, 'success');
|
|
286
|
+
renderSites();
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
async function initAllProfiles() {
|
|
290
|
+
showToast('正在初始化所有 Profile...', 'info');
|
|
291
|
+
var r = await api('/api/sites');
|
|
292
|
+
if (r.error) { showToast(r.error, 'danger'); return; }
|
|
293
|
+
var names = (r.sites || []).map(function(s) { return s.name; });
|
|
294
|
+
var count = 0;
|
|
295
|
+
for (var i = 0; i < names.length; i++) {
|
|
296
|
+
try {
|
|
297
|
+
var pr = await api('/api/sites/' + encodeURIComponent(names[i]) + '/init-profile', { method: 'POST' });
|
|
298
|
+
if (pr.ok) count++;
|
|
299
|
+
} catch (e) { /* skip */ }
|
|
300
|
+
}
|
|
301
|
+
showToast('已初始化 ' + count + ' 个 Profile', 'success');
|
|
302
|
+
renderSites();
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
async function deleteSiteProfile(name) {
|
|
306
|
+
showConfirm('清除登录状态', '确定要删除 "' + name + '" 的浏览器 Profile 吗?这将清除登录状态和 Cookie。', function() {
|
|
307
|
+
return api('/api/sites/profiles/' + encodeURIComponent(name), { method: 'DELETE' }).then(function(r) {
|
|
308
|
+
if (r.error) { showToast(r.error, 'danger'); return; }
|
|
309
|
+
showToast('Profile 已删除: ' + name, 'success');
|
|
310
|
+
renderSites();
|
|
311
|
+
});
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
// Register renderer
|
|
316
|
+
if (typeof window._adminRenderers === 'undefined') window._adminRenderers = {};
|
|
317
|
+
window._adminRenderers['sites'] = renderSites;
|
|
@@ -5,6 +5,10 @@ const CLI_CAT_LABELS={perception:'感知',search:'搜索',file:'文件操作',do
|
|
|
5
5
|
|
|
6
6
|
async function renderSkills(){
|
|
7
7
|
const cats=await api('/api/skills?view=categorized');
|
|
8
|
+
if(cats.error){
|
|
9
|
+
$('content').innerHTML='<div class="empty" style="color:var(--danger)">加载失败: '+escHtml(cats.error)+'</div>';
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
8
12
|
const bt=cats.builtin_tools||[];
|
|
9
13
|
const cc=cats.cli_commands||[];
|
|
10
14
|
const ps=cats.python_skills||[];
|
package/web/ui/index.html
CHANGED
|
@@ -328,6 +328,7 @@ tr:hover{background:var(--surface2)}
|
|
|
328
328
|
<div class="nav-item" data-tooltip="大模型设置" data-page="llm"><span class="icon">🧬</span><span class="icon-text">大模型设置</span></div>
|
|
329
329
|
<div class="nav-item" data-tooltip="系统配置" data-page="system"><span class="icon">⚙️</span><span class="icon-text">系统配置</span></div>
|
|
330
330
|
<div class="nav-item" data-tooltip="执行引擎" data-page="executor"><span class="icon">🔧</span><span class="icon-text">执行引擎</span></div>
|
|
331
|
+
<div class="nav-item" data-tooltip="网站管理" data-page="sites"><span class="icon">🌐</span><span class="icon-text">网站管理</span></div>
|
|
331
332
|
<div class="nav-item" data-tooltip="技能管理" data-page="skills"><span class="icon">🛠</span><span class="icon-text">技能管理</span></div>
|
|
332
333
|
<div class="nav-item" data-tooltip="工作目录" data-page="files"><span class="icon">📁</span><span class="icon-text">工作目录</span></div>
|
|
333
334
|
<div class="nav-item" data-tooltip="查看日志" data-page="logs"><span class="icon">📜</span><span class="icon-text">查看日志</span></div>
|
|
@@ -358,6 +359,7 @@ tr:hover{background:var(--surface2)}
|
|
|
358
359
|
<script src="admin/admin-permissions.js"></script>
|
|
359
360
|
<script src="admin/admin-llm.js"></script>
|
|
360
361
|
<script src="admin/admin-executor.js"></script>
|
|
362
|
+
<script src="admin/admin-sites.js"></script>
|
|
361
363
|
<script src="admin/admin-skills.js"></script>
|
|
362
364
|
<script src="admin/admin-files.js"></script>
|
|
363
365
|
<script src="admin/admin-logs.js"></script>
|
package/worklog.md
CHANGED
|
@@ -396,3 +396,27 @@ Work Log:
|
|
|
396
396
|
- 查询优化:将LIKE前缀查询改为=精确匹配agent_id
|
|
397
397
|
- 向后兼容:同时支持新旧两种格式的session_id
|
|
398
398
|
|
|
399
|
+
---
|
|
400
|
+
Task ID: 1
|
|
401
|
+
Agent: main
|
|
402
|
+
Task: 修复 myagent-ai v1.31.0 中的多个关键漏洞
|
|
403
|
+
|
|
404
|
+
Work Log:
|
|
405
|
+
- 全面审计 browser_stealth.py、main.py、core/browser_profile.py、core/site_registry.py
|
|
406
|
+
- 发现 8 个漏洞(3 个高危、3 个中危、2 个低危)
|
|
407
|
+
- 修复 browser_stealth.py: time.sleep(1) → await asyncio.sleep(1)
|
|
408
|
+
- 修复 browser_stealth.py: _detect_browser 增加 macOS/Windows 路径
|
|
409
|
+
- 修复 browser_stealth.py: get_stealth_browser 清理崩溃实例并重建
|
|
410
|
+
- 修复 main.py: _running_service 在 __init__ 初始化
|
|
411
|
+
- 修复 main.py: shutdown() 关闭所有 stealth 浏览器
|
|
412
|
+
- 修复 main.py: 会话锁 TOCTOU 竞争条件
|
|
413
|
+
- 修复 main.py: 会话锁内存泄漏(_cleanup_session_locks)
|
|
414
|
+
- 修复 main.py: Unicode Ideographic Space 填充问题
|
|
415
|
+
- 修复 main.py: xdpyinfo 分辨率解析过于宽松
|
|
416
|
+
- 版本升级 v1.31.0 → v1.31.1
|
|
417
|
+
- GitHub 推送成功,npm 发布成功
|
|
418
|
+
|
|
419
|
+
Stage Summary:
|
|
420
|
+
- 修复了 8 个漏洞,涵盖事件循环阻塞、属性未初始化、资源泄漏、竞态条件、跨平台兼容性等
|
|
421
|
+
- 已发布 myagent-ai@1.31.1 到 npm 和 GitHub
|
|
422
|
+
|