taodeng/ocm
1
0
Fork 0
mirror of https://github.com/dtzp555-max/ocm.git synced 2026-07-19 09:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: agents side-by-side layout + main workspace display (v0.6.5)

Browse Source 
- Main agents displayed horizontally side-by-side (flex row)
- Sub-agents drop below their respective parent agent
- Main agent now shows defaults.workspace path
- All agents get "View Files" button regardless of root/sub status

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
taodeng
2026-02-26 21:04:48 +00:00
co-authored by Claude Opus 4.6
parent 8eb9801f0f
commit c6150d117b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openclaw-manager.js
+11 -5
View File
@@ -345,6 +345,7 @@ async function handleApi(req, res, urlObj, body) {
const defaults = cfg.agents?.defaults || {}; const defaults = cfg.agents?.defaults || {};
const bindings = cfg.bindings || []; const bindings = cfg.bindings || [];
const groups = cfg.channels?.telegram?.groups || {}; const groups = cfg.channels?.telegram?.groups || {};
const defaultWorkspace = defaults.workspace || null;
const enriched = list.map(a => { const enriched = list.map(a => {
const binding = bindings.find(b => b.agentId === a.id && b.match?.peer?.kind === 'group'); const binding = bindings.find(b => b.agentId === a.id && b.match?.peer?.kind === 'group');
const groupId = binding?.match?.peer?.id || null; const groupId = binding?.match?.peer?.id || null;
@@ -356,7 +357,9 @@ async function handleApi(req, res, urlObj, body) {
// For sub-agents (with peer match), find which accountId they belong to // For sub-agents (with peer match), find which accountId they belong to
const parentBinding = bindings.find(b => b.agentId === a.id && b.match?.accountId); const parentBinding = bindings.find(b => b.agentId === a.id && b.match?.accountId);
const parentAccountId = parentBinding?.match?.accountId || null; const parentAccountId = parentBinding?.match?.accountId || null;
return { ...a, groupId, requireMention: groupId ? (groups[groupId]?.requireMention ?? true) : null, // Workspace: explicit per-agent, or defaults.workspace for main
const workspace = a.workspace || (a.id === 'main' ? 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 };
}); });
res.writeHead(200); res.writeHead(200);
@@ -1472,7 +1475,9 @@ main { padding:20px; max-width:1280px; margin:0 auto; }
/* Agents layout — buttons top, tree below */ /* Agents layout — buttons top, tree below */
.agents-top-btns { display:flex; gap:10px; justify-content:center; margin-bottom:18px; } .agents-top-btns { display:flex; gap:10px; justify-content:center; margin-bottom:18px; }
.agents-tree-wrap { max-width:720px; margin:0 auto; overflow-y:auto; } .agents-tree-wrap { max-width:900px; margin:0 auto; overflow-y:auto; }
.agents-roots { display:flex; gap:16px; flex-wrap:wrap; }
.agents-roots > .agent-tree-root { flex:1; min-width:320px; }
/* Add form */ /* Add form */
.add-form { background:var(--surface); border:1px solid var(--border); border-radius:12px; padding:16px; } .add-form { background:var(--surface); border:1px solid var(--border); border-radius:12px; padding:16px; }
@@ -2667,15 +2672,15 @@ function renderAgents() {
h += '<div class="tree-actions">'; h += '<div class="tree-actions">';
h += '<select class="inline-sel" id="msel-' + a.id + '">' + buildModelOpts(a.effectiveModel !== t('agents.noModel') ? a.effectiveModel : '__default__') + '</select>'; h += '<select class="inline-sel" id="msel-' + a.id + '">' + buildModelOpts(a.effectiveModel !== t('agents.noModel') ? a.effectiveModel : '__default__') + '</select>';
h += '<button class="btn-secondary" data-action="saveModel" data-id="' + esc(a.id) + '">' + t('agents.saveModel') + '</button>'; h += '<button class="btn-secondary" data-action="saveModel" data-id="' + esc(a.id) + '">' + t('agents.saveModel') + '</button>';
if (a.workspace || !isRoot) h += '<button class="btn-secondary" data-action="viewWs" data-id="' + esc(a.id) + '">' + t('agents.viewFiles') + '</button>'; h += '<button class="btn-secondary" data-action="viewWs" data-id="' + esc(a.id) + '">' + t('agents.viewFiles') + '</button>';
if (a.id !== 'main') h += '<button class="btn-danger" data-action="delAgent" data-id="' + esc(a.id) + '" data-name="' + esc(a.name || a.id) + '">' + t('btn.delete') + '</button>'; if (a.id !== 'main') h += '<button class="btn-danger" data-action="delAgent" data-id="' + esc(a.id) + '" data-name="' + esc(a.name || a.id) + '">' + t('btn.delete') + '</button>';
h += '</div></div>'; h += '</div></div>';
return h; return h;
} }
let html = ''; let html = '<div class="agents-roots">';
// Render each root with its children // Render each root with its children, side by side
roots.forEach(root => { roots.forEach(root => {
const children = subsByRoot[root.id] || []; const children = subsByRoot[root.id] || [];
html += '<div class="agent-tree-root">'; html += '<div class="agent-tree-root">';
@@ -2698,6 +2703,7 @@ function renderAgents() {
html += '</div>'; html += '</div>';
}); });
html += '</div>';
el.innerHTML = html; el.innerHTML = html;
// Event delegation for agent tree buttons // Event delegation for agent tree buttons