From c3976108a9d006f9aa791b6036b1100cc3e7a7bf Mon Sep 17 00:00:00 2001 From: Tao Date: Sun, 1 Mar 2026 20:26:11 +1000 Subject: [PATCH] feat: Agents wizard for Telegram/Discord + OCM header version --- README.md | 6 + openclaw-manager.js | 476 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 383 insertions(+), 99 deletions(-) diff --git a/README.md b/README.md index 6283d8f..c840da2 100644 --- a/README.md +++ b/README.md @@ -206,3 +206,9 @@ bash start.sh --dir /path/to/.openclaw --port 8080 ```json { "dir": "~/.openclaw" } ``` + + +## Discord (thread-first) notes + +- Recommended: keep top-level agents in dedicated channels, and bind sub-agents to **threads** (one thread per task). +- To switch a Telegram group / Discord thread binding: go to **Routing** → remove the old binding → add a new binding with the new ID/link. diff --git a/openclaw-manager.js b/openclaw-manager.js index fd82b5f..f667c8b 100644 --- a/openclaw-manager.js +++ b/openclaw-manager.js @@ -423,7 +423,13 @@ async function handleApi(req, res, urlObj, body) { // Workspace: explicit per-agent, or defaults.workspace for main const workspace = a.workspace || (isMain ? defaultWorkspace : null); return { ...a, workspace, groupId, requireMention: groupId ? (groups[groupId]?.requireMention ?? true) : null, - effectiveModel: modelVal || defaults.model?.primary || '默认', hasOwnBot, accountId, parentAccountId }; + effectiveModel: modelVal || defaults.model?.primary || '默认', hasOwnBot, accountId, parentAccountId, parentAgentId: a.parentAgentId || null, bindings: (bindings||[]).filter(b=>b.agentId===a.id).map(b=>({ + idx: bindings.indexOf(b), + channel: b.match?.channel || '', + accountId: b.match?.accountId || '', + peerKind: b.match?.peer?.kind || '', + peerId: b.match?.peer?.id || '' + })) }; }); res.writeHead(200); res.end(JSON.stringify({ agents: enriched, defaults })); @@ -508,6 +514,143 @@ async function handleApi(req, res, urlObj, body) { return; } + // POST /api/agents/discord — create top-level Discord agent (single bot, channel binding) + if (method === 'POST' && pathname === '/api/agents/discord') { + const { agentId, name, workspaceFolder, model, purpose, personality, guildId, channelId } = body; + if (!agentId || !/^[a-zA-Z0-9_-]+$/.test(agentId)) { + res.writeHead(400); res.end(JSON.stringify({ error: 'Agent ID must contain only alphanumeric characters, underscores, or dashes' })); return; + } + if (!name || !name.trim()) { res.writeHead(400); res.end(JSON.stringify({ error: 'Name is required' })); return; } + const folder = (workspaceFolder || agentId).trim(); + if (!folder) { res.writeHead(400); res.end(JSON.stringify({ error: 'Workspace folder is required' })); return; } + if (!channelId || !String(channelId).trim().match(/^\d+$/)) { res.writeHead(400); res.end(JSON.stringify({ error: 'Discord channelId is required' })); return; } + const gid = (guildId || '').trim(); + + const cfg = await readConfig(); + if (cfg.agents?.list?.some(a => a.id === agentId)) { + res.writeHead(400); res.end(JSON.stringify({ error: `Agent ID \"${agentId}\" already exists` })); return; + } + // Prevent workspace reuse + const wsAlias = `~/.openclaw/workspaces/${folder}`; + if (cfg.agents?.list?.some(a => (a.workspace||'').endsWith(`/workspaces/${folder}`) || a.workspace === wsAlias)) { + res.writeHead(400); res.end(JSON.stringify({ error: `Workspace folder \"${folder}\" is already used by another agent` })); return; + } + + if (!cfg.agents) cfg.agents = { defaults: {}, list: [] }; + if (!cfg.agents.list) cfg.agents.list = []; + + const wsPath = path.join(OPENCLAW_DIR, 'workspaces', folder); + const agentEntry = { id: agentId, name: name || agentId, workspace: wsAlias }; + if (model && model !== '__default__') agentEntry.model = { primary: model }; + cfg.agents.list.push(agentEntry); + + if (!cfg.bindings) cfg.bindings = []; + cfg.bindings.unshift({ agentId, match: { channel: 'discord', peer: { kind: 'channel', id: String(channelId).trim() } } }); + + if (!cfg.channels) cfg.channels = {}; + if (!cfg.channels.discord) cfg.channels.discord = {}; + cfg.channels.discord.enabled = true; + if (gid) { + if (!cfg.channels.discord.guilds) cfg.channels.discord.guilds = {}; + if (!cfg.channels.discord.guilds[gid]) cfg.channels.discord.guilds[gid] = {}; + if (!cfg.channels.discord.guilds[gid].channels) cfg.channels.discord.guilds[gid].channels = {}; + cfg.channels.discord.guilds[gid].channels[String(channelId).trim()] = { allow: true, requireMention: false }; + if (cfg.channels.discord.guilds[gid].requireMention === undefined) cfg.channels.discord.guilds[gid].requireMention = false; + } + + const bakPath = await writeConfig(cfg, 'create'); + + await fsp.mkdir(wsPath, { recursive: true }); + await fsp.mkdir(path.join(wsPath, 'memory'), { recursive: true }); + await fsp.writeFile(path.join(wsPath, 'SOUL.md'), generateSoulMd(name || agentId, purpose || '', personality || ''), 'utf8'); + await fsp.writeFile(path.join(wsPath, 'MEMORY.md'), generateMemoryMd(name || agentId, ''), 'utf8'); + + const agentRuntimeDir = path.join(OPENCLAW_DIR, 'agents', agentId); + await fsp.mkdir(agentRuntimeDir, { recursive: true }); + await fsp.mkdir(path.join(agentRuntimeDir, 'sessions'), { recursive: true }); + + res.writeHead(200); + res.end(JSON.stringify({ ok: true, agentId, workspacePath: wsPath, configBackup: bakPath, + notes: [ + 'Discord agent created (single Discord bot)', + 'Channel binding added', + 'Workspace + runtime directories created', + 'Configuration updated and backed up', + 'Restart gateway to apply: openclaw gateway restart' + ] + })); + return; + } + + // POST /api/agents/discord-sub — create Discord sub-agent (thread-only binding, grouping under parentAgentId) + if (method === 'POST' && pathname === '/api/agents/discord-sub') { + const { agentId, displayName, workspaceFolder, model, purpose, personality, initialMemory, parentAgentId, guildId, threadId } = body; + if (!agentId || !/^[a-zA-Z0-9_-]+$/.test(agentId)) { + res.writeHead(400); res.end(JSON.stringify({ error: 'Agent ID must contain only alphanumeric characters, underscores, or dashes' })); return; + } + if (!parentAgentId || !String(parentAgentId).trim()) { + res.writeHead(400); res.end(JSON.stringify({ error: 'Parent Agent ID is required' })); return; + } + if (!threadId || !String(threadId).trim().match(/^\d+$/)) { + res.writeHead(400); res.end(JSON.stringify({ error: 'Discord threadId is required' })); return; + } + const gid = (guildId || '').trim(); + + const cfg = await readConfig(); + const parentAgent = cfg.agents?.list?.find(a => a.id === parentAgentId); + if (!parentAgent) { res.writeHead(404); res.end(JSON.stringify({ error: `Parent agent \"${parentAgentId}\" does not exist` })); return; } + if (cfg.agents?.list?.some(a => a.id === agentId)) { res.writeHead(400); res.end(JSON.stringify({ error: `Agent ID \"${agentId}\" already exists` })); return; } + + const folder = (workspaceFolder || agentId).trim(); + const wsAlias = `~/.openclaw/workspaces/${folder}`; + if (cfg.agents?.list?.some(a => (a.workspace||'').endsWith(`/workspaces/${folder}`) || a.workspace === wsAlias)) { + res.writeHead(400); res.end(JSON.stringify({ error: `Workspace folder \"${folder}\" is already used by another agent` })); return; + } + + const wsPath = path.join(OPENCLAW_DIR, 'workspaces', folder); + const agentEntry = { id: agentId, name: displayName || agentId, workspace: wsAlias, parentAgentId: String(parentAgentId).trim() }; + if (model && model !== '__default__') agentEntry.model = { primary: model }; + cfg.agents.list.push(agentEntry); + + if (!cfg.bindings) cfg.bindings = []; + cfg.bindings.unshift({ agentId, match: { channel: 'discord', peer: { kind: 'channel', id: String(threadId).trim() } } }); + + if (!cfg.channels) cfg.channels = {}; + if (!cfg.channels.discord) cfg.channels.discord = {}; + cfg.channels.discord.enabled = true; + if (gid) { + if (!cfg.channels.discord.guilds) cfg.channels.discord.guilds = {}; + if (!cfg.channels.discord.guilds[gid]) cfg.channels.discord.guilds[gid] = {}; + if (!cfg.channels.discord.guilds[gid].channels) cfg.channels.discord.guilds[gid].channels = {}; + cfg.channels.discord.guilds[gid].channels[String(threadId).trim()] = { allow: true, requireMention: false }; + if (cfg.channels.discord.guilds[gid].requireMention === undefined) cfg.channels.discord.guilds[gid].requireMention = false; + } + + const bakPath = await writeConfig(cfg, 'create'); + + await fsp.mkdir(wsPath, { recursive: true }); + await fsp.mkdir(path.join(wsPath, 'memory'), { recursive: true }); + const name = displayName || agentId; + await fsp.writeFile(path.join(wsPath, 'SOUL.md'), generateSoulMd(name, purpose || '', personality || ''), 'utf8'); + await fsp.writeFile(path.join(wsPath, 'MEMORY.md'), generateMemoryMd(name, initialMemory || ''), 'utf8'); + + const agentRuntimeDir = path.join(OPENCLAW_DIR, 'agents', agentId); + await fsp.mkdir(agentRuntimeDir, { recursive: true }); + await fsp.mkdir(path.join(agentRuntimeDir, 'sessions'), { recursive: true }); + + res.writeHead(200); + res.end(JSON.stringify({ ok: true, agentId, workspacePath: wsPath, configBackup: bakPath, + notes: [ + 'Discord sub-agent created (thread-only binding)', + 'Workspace + runtime directories created', + 'Configuration updated and backed up', + 'Restart gateway to apply: openclaw gateway restart' + ] + })); + return; + } + + // POST /api/agents — create sub-agent (shares parent bot) if (method === 'POST' && pathname === '/api/agents') { const { agentId, displayName, groupId, workspaceFolder, model, purpose, personality, initialMemory, parentAgentId, telegramUserId } = body; @@ -537,7 +680,7 @@ async function handleApi(req, res, urlObj, body) { const folder = workspaceFolder || agentId; const wsPath = path.join(OPENCLAW_DIR, 'workspaces', folder); const wsAlias= `~/.openclaw/workspaces/${folder}`; - const agentEntry = { id: agentId, name: displayName || agentId, workspace: wsAlias }; + const agentEntry = { id: agentId, name: displayName || agentId, workspace: wsAlias, parentAgentId: String(parentAgentId).trim() }; if (model && model !== '__default__') agentEntry.model = { primary: model }; cfg.agents.list.push(agentEntry); // Binding uses parent's accountId @@ -1821,6 +1964,7 @@ const MAIN_HTML_BODY = String.raw`
v-- + ocm v--
⚠️ @@ -2281,6 +2425,7 @@ const I18N = { 'tab.stats':'📊 Stats','tab.cron':'⏰ Cron', 'agents.title':'Agents','agents.new':'＋ 新建 Subagent', 'channels.title':'路由绑定','channels.add':'＋ 添加绑定','channels.hint':'用于高级路由管理：维护 Agent 与频道/群组绑定及优先级顺序。日常增减 Agent 请在 Agents 页面操作。', + 'channels.removeHint':'如果需要更换 Telegram 群或 Discord thread：请先在本页删除旧绑定，然后用新的 ID 重新绑定。也可用于修正绑定错误、群重建（ID 变化）、重复/冲突或临时断开路由。', 'channels.filterLabel':'Agent','channels.filterAll':'全部 Agent','channels.emptyFiltered':'当前 Agent 下暂无绑定', 'channels.countSuffix':'条绑定','channels.collapse':'折叠','channels.expand':'展开', 'models.title':'模型管理','models.primary':'默认主模型','models.fallback':'Fallback 链', @@ -2401,7 +2546,7 @@ const I18N = { 'tab.agents':'🤖 Agents','tab.channels':'🧭 Routing','tab.models':'🧠 Models & Auth','tab.auth':'🔑 Auth', 'tab.stats':'📊 Stats','tab.cron':'⏰ Cron', 'agents.title':'Agents','agents.new':'＋ New Subagent', - 'channels.title':'Routing Bindings','channels.add':'＋ Add Binding','channels.hint':'Advanced routing rules for agent-channel/group bindings and priority order. Use Agents page for daily add/remove workflows.','channels.removeHint':'When to use Remove binding: wrong agent/chat, group recreated (new id), duplicates/conflicts, decommission a sub-agent, or temporarily disconnect routing for safety.', + 'channels.title':'Routing Bindings','channels.add':'＋ Add Binding','channels.hint':'Advanced routing rules for agent-channel/group bindings and priority order. Use Agents page for daily add/remove workflows.','channels.removeHint':'When to use Remove binding: if you need to switch to a new Telegram group / Discord thread, remove the old binding here, then add a new binding with the new ID. Also use this for wrong bindings, recreated groups (new id), duplicates/conflicts, decommissioning, or temporary disconnect.', 'channels.filterLabel':'Agent','channels.filterAll':'All Agents','channels.emptyFiltered':'No bindings for selected agent', 'channels.countSuffix':'bindings','channels.collapse':'Collapse','channels.expand':'Expand', 'models.title':'Model Management','models.primary':'Default Primary Model','models.fallback':'Fallback Chain', @@ -2594,6 +2739,7 @@ async function checkStatus(){ setDot('ok'); document.getElementById('statusTxt').textContent = r.dir.replace(/.*[/\\\\]/,'.../')+' · v'+r.version; document.getElementById('versionBadge').textContent = 'v'+r.version; + const ov=document.getElementById('ocmVersionBadge'); if(ov) ov.textContent='ocm v'+(r.ocmVersion||'--'); }catch{ setDot('err'); document.getElementById('statusTxt').textContent='无法读取配置'; } } @@ -2755,24 +2901,50 @@ function buildAddAgentForm() { const modelOpts = buildModelOpts('__default__'); return '
' + '

' + t('agents.addAgentTitle') + '

' + - '
' + t('guide.title') + '
    ' + - '
  1. ' + t('guide.agent.s1') + '
    2. ' + - '
  2. ' + t('guide.agent.s2') + '
    3. ' + - '
  3. ' + t('guide.agent.s3') + '
    4. ' + - '
  4. ' + t('guide.agent.s4') + '
    5. ' + + '
    ' + + '
    ' + + + '
    ' + t('guide.title') + '
      ' + + '
    1. ' + t('guide.agent.s1') + '
      2. ' + + '
    2. ' + t('guide.agent.s2') + '
      3. ' + + '
    3. ' + t('guide.agent.s3') + '
      4. ' + + '
    4. ' + t('guide.agent.s4') + '
      5. ' + '
    ' + - '
    ' + - '' + + + '' + + + '
    ' + + '
    ' + + '' + + '
    ' + '
    ' + - '
    ' + - '' + - 'Alphanumeric, underscore, or dash only
    ' + - '
    ' + - '' + + + '
    ' + + '
    ' + + '' + + 'Alphanumeric, underscore, or dash only
    ' + + '
    ' + + '' + + '
    ' + '
    ' + - '
    ' + - '' + + + '
    ' + + '' + + 'Each agent must have its own workspace for isolated SOUL/MEMORY.
    ' + + + '' + + '
    ' + '' + '
    ' + @@ -2787,76 +2959,144 @@ function buildAddAgentForm() { '
    '; } -function buildAddSubForm() { - // Build parent agent dropdown (agents with their own bot) + +function toggleAddAgentChannel(ch){ + const tg=document.getElementById('fa-sec-telegram'); + const dg=document.getElementById('fa-sec-discord'); + const gT=document.getElementById('fa-guide-telegram'); + const gD=document.getElementById('fa-guide-discord'); + if(tg) tg.style.display = (ch==='telegram')?'block':'none'; + if(dg) dg.style.display = (ch==='discord')?'block':'none'; + if(gT) gT.style.display = (ch==='telegram')?'block':'none'; + if(gD) gD.style.display = (ch==='discord')?'block':'none'; +} +function buildAddSubForm(function buildAddSubForm() { const cfg = S.agents || []; - const botAgents = cfg.filter(a => a.hasOwnBot); + // Parent agent dropdown (all agents as potential parent for grouping) let parentOpts = ''; - if (botAgents.length === 0) { - parentOpts = ''; - } else { - botAgents.forEach(a => { - parentOpts += ''; - }); - } + if (cfg.length === 0) parentOpts = ''; + else cfg.forEach(a=>{ parentOpts += ''; }); + const modelOpts = buildModelOpts('__default__'); return '
    ' + '

    ' + t('agents.addSubTitle') + '

    ' + - '
    ' + t('guide.title') + '
      ' + - '
    1. ' + t('guide.sub.s1') + '
      2. ' + - '
    2. ' + t('guide.sub.s2') + '
      3. ' + - '
    3. ' + t('guide.sub.s3') + '
      4. ' + - '
    4. ' + t('guide.sub.s4') + '
      5. ' + - '
    5. ' + t('guide.sub.s5') + '
      6. ' + + '
      ' + + '' + + '
      ' + + + '
      ' + t('guide.title') + '
        ' + + '
      1. ' + t('guide.sub.s1') + '
        2. ' + + '
      2. ' + t('guide.sub.s2') + '
        3. ' + + '
      3. ' + t('guide.sub.s3') + '
        4. ' + + '
      4. ' + t('guide.sub.s4') + '
        5. ' + + '
      5. ' + t('guide.sub.s5') + '
        6. ' + '
      ' + '
      ' + t('guide.sub.warn') + '
      ' + '
      ' + + + '' + + '
      ' + - '
      ' + - '
      ' + - '' + - '' + t('wiz.groupHint') + '
      ' + - '
      ' + - '' + - '' + t('wiz.telegramIdHint') + '
      ' + + '' + + 'Used for grouping only (Discord sub-agents do not share bots).' + + '
    ' + + + '
    ' + + '
    ' + + '' + + '' + t('wiz.groupHint') + '' + + '
    ' + + '
    ' + + '' + + '' + t('wiz.telegramIdHint') + '' + + '
    ' + + '
    ' + + + '' + + '
    ' + - '
    ' + - '
    ' + - '
    ' + - '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '' + + 'Each sub-agent must have its own workspace for isolated SOUL/MEMORY.' + + '
    ' + + '
    ' + - '
    ' + + '
' + '
' + - '
' + + '
' + '
' + - '
' + + '' + '
' + - '
' + + '' + + '
' + - '' + - '' + + '' + + '' + '
'; } +function toggleAddSubChannel(ch){ + const tg=document.getElementById('fs-sec-telegram'); + const dg=document.getElementById('fs-sec-discord'); + const gT=document.getElementById('fs-guide-telegram'); + const gD=document.getElementById('fs-guide-discord'); + if(tg) tg.style.display = (ch==='telegram')?'block':'none'; + if(dg) dg.style.display = (ch==='discord')?'block':'none'; + if(gT) gT.style.display = (ch==='telegram')?'block':'none'; + if(gD) gD.style.display = (ch==='discord')?'block':'none'; +} + // ── Submit Add Agent (with own bot) ────────────────────────── async function submitAddAgent() { - const token = document.getElementById('fa-token').value.trim(); + const channel = (document.getElementById('fa-channel')?.value||'telegram').trim(); const agentId = document.getElementById('fa-agentid').value.trim(); const name = document.getElementById('fa-name').value.trim(); - const workspace = document.getElementById('fa-workspace').value.trim(); + const workspace = (document.getElementById('fa-workspace').value.trim() || agentId); const model = document.getElementById('fa-model').value; const purpose = (document.getElementById('fa-purpose')?.value||'').trim(); const personality = (document.getElementById('fa-soul')?.value||'').trim(); - if (!token) { toast(t('agents.errToken'), 'err'); return; } + if (!agentId) { toast('Agent ID is required', 'err'); return; } if (!/^[a-zA-Z0-9_-]+$/.test(agentId)) { toast('Agent ID must contain only alphanumeric characters, underscores, or dashes', 'err'); return; } if (!name) { toast(t('agents.errName'), 'err'); return; } - if (!workspace) { toast('Workspace name is required', 'err'); return; } + if (!workspace) { toast('Workspace folder is required', 'err'); return; } + try { - const payload = { botToken: token, agentId, name, workspace, model: model === '__default__' ? '' : model, purpose, personality }; - const r = await api('POST', '/api/agents/bot', payload); + if (channel === 'telegram') { + const token = document.getElementById('fa-token').value.trim(); + if (!token) { toast(t('agents.errToken'), 'err'); return; } + const payload = { botToken: token, agentId, name, workspace, model: model === '__default__' ? '' : model, purpose, personality }; + await api('POST', '/api/agents/bot', payload); + } else { + const link = (document.getElementById('fa-discord-link')?.value||'').trim(); + const parsed = parseDiscordLinkOrId(link); + if (!parsed) { toast('Discord channel link/ID is required', 'err'); return; } + const payload = { agentId, name, workspaceFolder: workspace, model: model === '__default__' ? '' : model, purpose, personality, + guildId: parsed.guildId, channelId: parsed.channelId }; + await api('POST', '/api/agents/discord', payload); + } toast('Agent created successfully', 'ok'); - closePopover(); + clearAddForm(); showRestartBanner(); await loadAll(); } catch (e) { @@ -2866,25 +3106,39 @@ async function submitAddAgent() { // ── Submit Add Sub-Agent ──────────────────────────────────── async function submitAddSub() { + const channel = (document.getElementById('fs-channel')?.value||'telegram').trim(); const parentAgentId = document.getElementById('fs-parent').value.trim(); - const groupId = document.getElementById('fs-gid').value.trim(); - const telegramUserId = (document.getElementById('fs-tgid')?.value||'').trim(); const agentId = document.getElementById('fs-aid').value.trim(); const displayName = document.getElementById('fs-name').value.trim(); + const workspaceFolder = (document.getElementById('fs-workspace')?.value||'').trim() || agentId; const model = document.getElementById('fs-model').value; const purpose = document.getElementById('fs-purpose').value.trim(); const personality = document.getElementById('fs-soul').value.trim(); const initialMemory = document.getElementById('fs-mem').value.trim(); + if (!parentAgentId) { toast('Parent Agent is required', 'err'); return; } - if (!groupId) { toast(t('wiz.errGroupId'), 'err'); return; } if (!agentId) { toast(t('wiz.errAgentId'), 'err'); return; } if (!/^[a-zA-Z0-9_-]+$/.test(agentId)) { toast(t('wiz.errIdFormat'), 'err'); return; } - if (telegramUserId && !/^\\d+$/.test(telegramUserId)) { toast('Telegram User ID must be a number', 'err'); return; } + if (!workspaceFolder) { toast('Workspace folder is required', 'err'); return; } + try { - const r = await api('POST', '/api/agents', { parentAgentId, agentId, displayName: displayName || agentId, groupId, workspaceFolder: agentId, model: model === '__default__' ? '' : model, purpose, personality, initialMemory, telegramUserId }); - if (r.error) { toast(r.error, 'err'); return; } + if (channel === 'telegram') { + const groupId = document.getElementById('fs-gid').value.trim(); + const telegramUserId = (document.getElementById('fs-tgid')?.value||'').trim(); + if (!groupId) { toast(t('wiz.errGroupId'), 'err'); return; } + if (telegramUserId && !/^\d+$/.test(telegramUserId)) { toast('Telegram User ID must be a number', 'err'); return; } + await api('POST', '/api/agents', { parentAgentId, agentId, displayName: displayName || agentId, groupId, + workspaceFolder, model: model === '__default__' ? '' : model, purpose, personality, initialMemory, telegramUserId }); + } else { + const link = (document.getElementById('fs-discord-link')?.value||'').trim(); + const parsed = parseDiscordLinkOrId(link); + if (!parsed) { toast('Discord thread link/ID is required', 'err'); return; } + await api('POST', '/api/agents/discord-sub', { parentAgentId, agentId, displayName: displayName || agentId, + workspaceFolder, model: model === '__default__' ? '' : model, purpose, personality, initialMemory, + guildId: parsed.guildId, threadId: parsed.channelId }); + } toast(t('wiz.created'), 'ok'); - document.getElementById('addFormArea').innerHTML = ''; + clearAddForm(); showRestartBanner(); await loadAll(); } catch (e) { toast(e.message, 'err'); } @@ -2895,39 +3149,59 @@ function renderAgents() { const el = document.getElementById('agentTree'); if (!S.agents.length) { el.innerHTML = '
' + t('agents.empty') + '
'; return; } - // Build tree: each hasOwnBot agent is a root, others are sub-agents grouped by parentAccountId - const roots = S.agents.filter(a => a.hasOwnBot); - const subs = S.agents.filter(a => !a.hasOwnBot); + // Build grouping: prefer explicit parentAgentId; fallback to telegram bot-root grouping. + const byId = {}; (S.agents||[]).forEach(a=>{ byId[a.id]=a; }); - // Map accountId -> root agent for sub-agent grouping - const rootByAccount = {}; - roots.forEach(a => { if (a.accountId) rootByAccount[a.accountId] = a; }); - - // Group subs under their parent - const subsByRoot = {}; - const orphanSubs = []; - subs.forEach(a => { - const parentAcct = a.parentAccountId; - if (parentAcct && rootByAccount[parentAcct]) { - const rootId = rootByAccount[parentAcct].id; - if (!subsByRoot[rootId]) subsByRoot[rootId] = []; - subsByRoot[rootId].push(a); - } else { - orphanSubs.push(a); + // infer parentAgentId for legacy telegram sub-agents if missing + const accountToRootId = {}; + (S.agents||[]).forEach(a=>{ if(a.hasOwnBot && a.accountId) accountToRootId[a.accountId]=a.id; }); + (S.agents||[]).forEach(a=>{ + if(!a.parentAgentId && !a.hasOwnBot && a.parentAccountId && accountToRootId[a.parentAccountId]){ + a._inferParentAgentId = accountToRootId[a.parentAccountId]; } }); + const roots=[]; const childrenByRoot={}; const orphans=[]; + (S.agents||[]).forEach(a=>{ + const pid = a.parentAgentId || a._inferParentAgentId || ''; + if(pid && byId[pid]){ + (childrenByRoot[pid] ||= []).push(a); + } else { + roots.push(a); + } + }); + + function fmtBinding(b){ + const ch = (b.channel||'').toLowerCase(); + const peer = b.peerId ? String(b.peerId) : ''; + const acct = b.accountId ? String(b.accountId) : ''; + if(ch==='telegram'){ + if(peer) return 'TG '+esc(peer)+''; + if(acct) return 'TG Bot '+esc(acct)+''; + } + if(ch==='discord'){ + if(peer) return 'Discord '+esc(peer)+''; + } + return ''+esc(ch||'bind')+''; + } + + function bindingsLine(a){ + const arr = (a.bindings||[]).filter(x=>x.peerId||x.accountId); + if(!arr.length) return ''; + return '
🔗 '+arr.map(fmtBinding).join(' · ')+'
'; + } + function agentCard(a, isRoot) { let h = ''; - const icon = isRoot ? '🤖' : '📱'; + const icon = isRoot ? '🤖' : '🧩'; const cls = isRoot ? 'tree-main' : 'tree-child'; h += '
'; h += '
' + icon + ' ' + esc(a.name || a.id); - if (isRoot) h += ' ' + (a.id === 'main' ? t('agents.main') : 'Bot') + ''; - if (a.groupId) h += ' ' + esc(a.groupId) + ''; + if (a.id === 'main') h += ' ' + t('agents.main') + ''; h += '
'; h += '
🧠 ' + esc(a.effectiveModel) + '
'; if (a.workspace) h += '
📁 ' + esc(a.workspace) + '
'; + h += bindingsLine(a); h += '
'; h += ''; h += ''; @@ -2938,34 +3212,23 @@ function renderAgents() { } let html = '
'; - - // Render each root with its children, side by side roots.forEach(root => { - const children = subsByRoot[root.id] || []; + const children = childrenByRoot[root.id] || []; html += '
'; html += agentCard(root, true); if (children.length) { const treeId = 'tree-' + root.id; html += '
'; - html += ''; + html += ''; html += '
'; children.forEach(c => { html += agentCard(c, false); }); html += '
'; } html += '
'; }); - - // Orphan subs (no matching root — edge case) - orphanSubs.forEach(a => { - html += '
'; - html += agentCard(a, false); - html += '
'; - }); - html += '
'; el.innerHTML = html; - // Event delegation for agent tree buttons el.onclick = function(ev) { const btn = ev.target.closest('[data-action]'); if (!btn) return; @@ -2977,7 +3240,7 @@ function renderAgents() { }; } -function toggleTree(treeId, btn) { +function toggleTreeunction toggleTree(treeId, btn) { const el = document.getElementById(treeId); if (!el) return; el.classList.toggle('collapsed'); @@ -4105,6 +4368,21 @@ function assertBrowserScriptSyntax(name, scriptText) { ); } } + + +function parseDiscordLinkOrId(input){ + const raw=(input||'').trim(); + if(!raw) return null; + // URL form: https://discord.com/channels// + const m = raw.match(/discord(?:app)?\.com\/channels\/(\d+)\/(\d+)/i); + if(m) return { guildId: m[1], channelId: m[2] }; + // Accept plain numeric id + if(/^\d+$/.test(raw)) return { guildId: '', channelId: raw }; + // Accept channel: + const m2 = raw.match(/^channel:(\d+)$/i); + if(m2) return { guildId: '', channelId: m2[1] }; + return null; +} assertBrowserScriptSyntax('main-html-script', MAIN_HTML_SCRIPT); // ── HTTP 服务器 ───────────────────────────────────────────────