From 0338f599cec76ca0c8d3f16ad5a0e971c754704c Mon Sep 17 00:00:00 2001
From: Tao <dtzp555@gmail.com>
Date: Tue, 17 Mar 2026 20:33:03 +1000
Subject: [PATCH] fix: improve agent tree ordering and parent inference

Root agents with their own bot (hasOwnBot) now sort to the top of the
agent tree alongside main. Agents listed in a parent's
subagents.allowAgents are automatically inferred as children even
without an explicit parentAgentId or Telegram binding.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 openclaw-manager.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/openclaw-manager.js b/openclaw-manager.js
index 70002ea..cb09178 100644
--- a/openclaw-manager.js
+++ b/openclaw-manager.js
@@ -428,6 +428,12 @@ async function handleApi(req, res, urlObj, body) {
     );
     // For main agent without explicit binding, infer its accountId from first unclaimed telegram account
     const mainInferredAccountId = telegramAccounts.find(a => !claimedAccounts.has(a)) || telegramAccounts[0] || null;
+    // Build map: agentId -> parentAgentId inferred from subagents.allowAgents
+    const allowAgentsParentMap = {};
+    list.forEach(parent => {
+      const allowed = parent.subagents?.allowAgents || [];
+      allowed.forEach(childId => { if (!allowAgentsParentMap[childId]) allowAgentsParentMap[childId] = parent.id; });
+    });
     const enriched = list.map(a => {
       const binding = bindings.find(b => b.agentId === a.id && b.match?.peer?.kind === 'group');
       const groupId = binding?.match?.peer?.id || null;
@@ -457,7 +463,9 @@ 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, parentAgentId: a.parentAgentId || null, bindings: (bindings||[]).filter(b=>b.agentId===a.id).map(b=>({
+        effectiveModel: modelVal || defaults.model?.primary || '默认', hasOwnBot, accountId, parentAccountId,
+        parentAgentId: a.parentAgentId || (!hasOwnBot ? allowAgentsParentMap[a.id] : null) || null,
+        bindings: (bindings||[]).filter(b=>b.agentId===a.id).map(b=>({
         idx: bindings.indexOf(b),
         channel: b.match?.channel || '',
         accountId: b.match?.accountId || '',
@@ -3361,7 +3369,7 @@ function renderAgents() {
     }
   });
 
-  const roots=[]; const childrenByRoot={}; const orphans=[];
+  const roots=[]; const childrenByRoot={};
   (S.agents||[]).forEach(a=>{
     const pid = a.parentAgentId || a._inferParentAgentId || '';
     if(pid && byId[pid]){
@@ -3370,6 +3378,12 @@ function renderAgents() {
       roots.push(a);
     }
   });
+  // Sort roots: agents with own bot first (main always first among those), then orphans
+  roots.sort((a,b)=>{
+    if(a.id==='main') return -1; if(b.id==='main') return 1;
+    if(a.hasOwnBot && !b.hasOwnBot) return -1; if(!a.hasOwnBot && b.hasOwnBot) return 1;
+    return (a.name||a.id).localeCompare(b.name||b.id);
+  });
 
   function fmtBinding(b){
     const ch = (b.channel||'').toLowerCase();