@monoes/monomindcli 2.9.21 → 2.9.23

package/dist/src/ui/dashboard.html

@@ -2098,6 +2098,9 @@ select.pb-cfg-inp { padding: 4px 7px; cursor: pointer; }
             <button class="odt-btn secondary" data-tab="costs"        onclick="v2SwitchOrgTab('costs')">Costs</button>
             <button class="odt-btn secondary" data-tab="config"        onclick="v2SwitchOrgTab('config')">Config</button>
             <button class="odt-btn secondary" data-tab="files"        onclick="v2SwitchOrgTab('files')">Files</button>
+            <button class="odt-btn secondary" data-tab="approvals"    onclick="v2SwitchOrgTab('approvals')">Approvals</button>
+            <button class="odt-btn secondary" data-tab="budgets"      onclick="v2SwitchOrgTab('budgets')">Budgets</button>
+            <button class="odt-btn secondary" data-tab="decisions"    onclick="v2SwitchOrgTab('decisions')">Decisions</button>
           </div>
           <div id="org-detail-body">
             <div class="odt-pane active" id="odt-chart"></div>
@@ -2108,6 +2111,9 @@ select.pb-cfg-inp { padding: 4px 7px; cursor: pointer; }
             <div class="odt-pane" id="odt-costs"></div>
             <div class="odt-pane" id="odt-config" style="overflow-y:auto"></div>
             <div class="odt-pane" id="odt-files" style="overflow-y:auto"></div>
+            <div class="odt-pane" id="odt-approvals"></div>
+            <div class="odt-pane" id="odt-budgets"></div>
+            <div class="odt-pane" id="odt-decisions"></div>
           </div>
         </div>
           <div id="org-copy-dialog" style="display:none;position:absolute;inset:0;background:rgba(0,0,0,0.72);z-index:90;align-items:center;justify-content:center">
@@ -2604,6 +2610,9 @@ function refreshCurrent() {
   renderView(currentView);
 }
 
+// Project paths may be Windows ('\') or POSIX ('/') — split on either.
+function baseName(p) { return String(p || '').split(/[\\/]/).filter(Boolean).pop() || ''; }
+
 // ── init ───────────────────────────────────────────────────
 async function init() {
   try {
@@ -2613,7 +2622,9 @@ async function init() {
     gitUser = gu;
     document.getElementById('sb-user').textContent = gu.name || gu.email || '—';
     document.getElementById('sb-path').textContent = DIR;
-    document.getElementById('sb-proj').textContent = DIR.split('/').filter(Boolean).pop() || '—';
+    const sbProjEl = document.getElementById('sb-proj');
+    sbProjEl.textContent = baseName(DIR) || '—';
+    sbProjEl.title = DIR;
     _showNavProjectCtx(DIR);
   } catch (_) {}
   // deep-link: ?sess=<id>&proj=<path>
@@ -2644,7 +2655,9 @@ async function init() {
       }
     } catch (_) {}
     DIR = projParam;
-    document.getElementById('sb-proj').textContent = DIR.split('/').filter(Boolean).pop() || '—';
+    const sbProjEl2 = document.getElementById('sb-proj');
+    sbProjEl2.textContent = baseName(DIR) || '—';
+    sbProjEl2.title = DIR;
     document.getElementById('sb-path').textContent = DIR;
     _showNavProjectCtx(DIR);
   }
@@ -2702,11 +2715,13 @@ async function apiFetch(url, timeout = 15000) {
 
 // ── project switching ──────────────────────────────────────
 function _showNavProjectCtx(path) {
-  const projName = (path || '').split('/').filter(Boolean).pop() || '';
+  const projName = baseName(path);
   const ctx = document.getElementById('nav-project-ctx');
   const hint = document.getElementById('nav-no-proj-hint');
   if (projName) {
-    document.getElementById('nav-proj-name').textContent = projName;
+    const nameEl = document.getElementById('nav-proj-name');
+    nameEl.textContent = projName;
+    nameEl.title = path;
     ctx.classList.add('visible');
     hint.style.display = 'none';
   } else {
@@ -2728,7 +2743,9 @@ function switchProject(path) {
   _mgLoaded = false;
   _mgGraph = null;
   window._mgRealTotals = null;
-  document.getElementById('sb-proj').textContent = path.split('/').filter(Boolean).pop() || '—';
+  const sbProjEl3 = document.getElementById('sb-proj');
+  sbProjEl3.textContent = baseName(path) || '—';
+  sbProjEl3.title = path;
   document.getElementById('sb-path').textContent = path;
   _showNavProjectCtx(path);
   viewRendered = {};
@@ -5863,6 +5880,7 @@ function v2RenderOrgTab(tab) {
   else if (tab === 'routines')  v2RenderOrgRoutines();
   else if (tab === 'myissues')  v2RenderOrgMyIssues();
   else if (tab === 'budgets')   v2RenderOrgBudgets();
+  else if (tab === 'decisions') v2RenderOrgDecisions();
   else if (tab === 'plugins')   v2RenderOrgPlugins();
   else if (tab === 'charts')       v2RenderOrgCharts();
   else if (tab === 'projects')     v2RenderOrgProjects();
@@ -5975,13 +5993,22 @@ function v2RenderOrgChart() {
   const colorOf = (role, idx) => COLORS[_v2OrgIsLeader(role) ? 0 : (idx % (COLORS.length - 1)) + 1];
 
   // ── auto-generate edges ───────────────────────────────
+  // Prefer each role's actual reports_to over a flat leader fan-out — a
+  // multi-level org (specialist -> team lead -> director) should connect to
+  // its real manager, not skip straight to the top boss.
   let comms = Array.isArray(d.communication) ? [...d.communication] : [];
   if (!comms.length && roles.length > 1) {
     const _lr0 = roles.find(_v2OrgIsLeader) || roles[0];
-    comms = roles.filter(r => r.id !== _lr0.id).flatMap(r => [
-      { from: _lr0.id, to: r.id, type: 'command' },
-      { from: r.id, to: _lr0.id, type: 'report' },
-    ]);
+    const _roleIds = new Set(roles.map(r => r.id));
+    comms = roles.filter(r => r.id !== _lr0.id).flatMap(r => {
+      const parentId = (r.reports_to && r.reports_to !== r.id && _roleIds.has(r.reports_to))
+        ? r.reports_to
+        : _lr0.id;
+      return [
+        { from: parentId, to: r.id, type: 'command' },
+        { from: r.id, to: parentId, type: 'report' },
+      ];
+    });
   }
 
   // ── layout positions ──────────────────────────────────
@@ -6518,7 +6545,7 @@ const _v2AvatarKnown = new Set([
   'security-architect','security-auditor','threat-detection','input-validator',
   'path-validator','safe-executor','hierarchical-coord','mesh-coordinator',
   'adaptive-coordinator','collective-coord','queen-coordinator','worker-specialist',
-  'byzantine-coord','raft-manager','gossip-coordinator','crdt-synchronizer',
+  'byzantine-coord','raft-manager',
   'quorum-manager','consensus-coordinator','perf-analyzer','benchmarker',
   'task-orchestrator','memory-coordinator','load-balancer','resource-allocator',
   'pr-manager','code-review-swarm','issue-tracker','release-manager','repo-architect',
@@ -7171,6 +7198,62 @@ async function orgApprovalAction(id, action) {
   } catch (e) { showToast('Error', e.message, 'err'); }
 }
 
+// ── DECISIONS ──────────────────────────────────────────────
+let _v2DecisionsCache = [];
+let _v2DecisionsStatusFilter = 'all';
+let _v2DecisionsRoleFilter = 'all';
+
+async function v2RenderOrgDecisions() {
+  const el = document.getElementById('odt-decisions');
+  if (!el || !_v2SelOrg) return;
+  const _rendOrg = _v2SelOrg;
+  el.innerHTML = '<div class="loading-txt">Loading…</div>';
+  try {
+    const _enc = encodeURIComponent(_rendOrg);
+    const data = await fetch(`/api/org/${_enc}/gates${DIR ? '?dir=' + encodeURIComponent(DIR) : ''}`).then(r => r.ok ? r.json() : { gates: [] }).catch(() => ({ gates: [] }));
+    if (_v2SelOrg !== _rendOrg) return;
+    _v2DecisionsCache = Array.isArray(data) ? data : (data.gates || []);
+    _v2DecisionsStatusFilter = 'all';
+    _v2DecisionsRoleFilter = 'all';
+    v2RenderDecisionsTable();
+  } catch (e) { el.innerHTML = '<div class="empty">Failed: ' + esc(e.message) + '</div>'; }
+}
+
+function v2RenderDecisionsTable() {
+  const el = document.getElementById('odt-decisions');
+  if (!el) return;
+  const gates = _v2DecisionsCache;
+  const roles = [...new Set(gates.map(g => g.roleId || '—'))].sort();
+  const filtered = gates.filter(g =>
+    (_v2DecisionsStatusFilter === 'all' || (g.status || 'pending') === _v2DecisionsStatusFilter) &&
+    (_v2DecisionsRoleFilter === 'all' || (g.roleId || '—') === _v2DecisionsRoleFilter)
+  );
+  const filterBar = `<div style="display:flex;gap:10px;margin-bottom:10px">
+    <select class="filter-input" style="width:auto" onchange="_v2DecisionsStatusFilter=this.value;v2RenderDecisionsTable()">
+      ${['all', 'pending', 'approved', 'rejected'].map(s => `<option value="${s}" ${_v2DecisionsStatusFilter===s?'selected':''}>${s === 'all' ? 'All statuses' : s}</option>`).join('')}
+    </select>
+    <select class="filter-input" style="width:auto" onchange="_v2DecisionsRoleFilter=this.value;v2RenderDecisionsTable()">
+      <option value="all" ${_v2DecisionsRoleFilter==='all'?'selected':''}>All roles</option>
+      ${roles.map(r => `<option value="${esc(r)}" ${_v2DecisionsRoleFilter===r?'selected':''}>${esc(r)}</option>`).join('')}
+    </select>
+  </div>`;
+  if (!filtered.length) { el.innerHTML = filterBar + '<div class="empty">No decision gates match</div>'; return; }
+  el.innerHTML = filterBar + `<table style="width:100%;border-collapse:collapse;font-size:12px">
+    <thead><tr style="color:var(--text-xs);text-align:left">
+      <th style="padding:6px 8px">Role</th><th>Gate</th><th>Status</th><th>Resolution</th><th>Date</th>
+    </tr></thead><tbody>` +
+    filtered.slice(0, 100).map(g => {
+      const cls = g.status === 'approved' ? 'on' : g.status === 'rejected' ? 'warn' : '';
+      return `<tr style="border-top:1px solid var(--border)">
+        <td style="padding:6px 8px;color:var(--text-hi)">${esc(g.roleId || '—')}</td>
+        <td style="padding:6px 8px;color:var(--text-lo);max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${esc(g.description || '')}">${esc(g.name || '—')}</td>
+        <td style="padding:6px 8px"><span class="ss-pill ${cls}">${esc(g.status || 'pending')}</span></td>
+        <td style="padding:6px 8px;color:var(--text-lo);max-width:180px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">${esc(g.resolution || '—')}</td>
+        <td style="padding:6px 8px;color:var(--text-xs);font-size:11px;font-family:var(--mono)">${relTime(g.resolvedAt || g.createdAt)}</td>
+      </tr>`;
+    }).join('') + '</tbody></table>';
+}
+
 // ── SECRETS ────────────────────────────────────────────────
 async function v2RenderOrgSecrets() {
   const el = document.getElementById('odt-secrets');

package/dist/src/ui/data/agent-avatars.html

@@ -144,18 +144,6 @@
     <span>Raft Manager</span>
     <span class="cat-badge">consensus</span>
   </div>
-  <div class="card" data-label="gossip coordinator" data-cat="consensus"
-    onclick="copy('gossip-coordinator')">
-    <img src="avatars/gossip-coordinator.svg" alt="Gossip Coordinator" loading="lazy"/>
-    <span>Gossip Coordinator</span>
-    <span class="cat-badge">consensus</span>
-  </div>
-  <div class="card" data-label="crdt synchronizer" data-cat="consensus"
-    onclick="copy('crdt-synchronizer')">
-    <img src="avatars/crdt-synchronizer.svg" alt="CRDT Synchronizer" loading="lazy"/>
-    <span>CRDT Synchronizer</span>
-    <span class="cat-badge">consensus</span>
-  </div>
   <div class="card" data-label="quorum manager" data-cat="consensus"
     onclick="copy('quorum-manager')">
     <img src="avatars/quorum-manager.svg" alt="Quorum Manager" loading="lazy"/>

package/dist/src/ui/data/agent-avatars.json

@@ -101,7 +101,7 @@
     {
       "id": "hierarchical-coord",
       "label": "Hierarchical Coord.",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "🏛️",
       "file": "avatars/hierarchical-coord.svg",
       "index": 12
@@ -109,7 +109,7 @@
     {
       "id": "mesh-coordinator",
       "label": "Mesh Coordinator",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "🕸️",
       "file": "avatars/mesh-coordinator.svg",
       "index": 13
@@ -117,7 +117,7 @@
     {
       "id": "adaptive-coordinator",
       "label": "Adaptive Coordinator",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "🔄",
       "file": "avatars/adaptive-coordinator.svg",
       "index": 14
@@ -125,7 +125,7 @@
     {
       "id": "collective-coord",
       "label": "Collective Intel.",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "🧠",
       "file": "avatars/collective-coord.svg",
       "index": 15
@@ -133,7 +133,7 @@
     {
       "id": "queen-coordinator",
       "label": "Queen Coordinator",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "👑",
       "file": "avatars/queen-coordinator.svg",
       "index": 16
@@ -141,7 +141,7 @@
     {
       "id": "worker-specialist",
       "label": "Worker Specialist",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "⚙️",
       "file": "avatars/worker-specialist.svg",
       "index": 17
@@ -162,22 +162,6 @@
       "file": "avatars/raft-manager.svg",
       "index": 19
     },
-    {
-      "id": "gossip-coordinator",
-      "label": "Gossip Coordinator",
-      "category": "consensus",
-      "icon": "💬",
-      "file": "avatars/gossip-coordinator.svg",
-      "index": 20
-    },
-    {
-      "id": "crdt-synchronizer",
-      "label": "CRDT Synchronizer",
-      "category": "consensus",
-      "icon": "🔗",
-      "file": "avatars/crdt-synchronizer.svg",
-      "index": 21
-    },
     {
       "id": "quorum-manager",
       "label": "Quorum Manager",
@@ -251,11 +235,11 @@
       "index": 30
     },
     {
-      "id": "code-review-swarm",
-      "label": "Code Review Swarm",
+      "id": "monoswarm-code-review",
+      "label": "Monoswarm Code Review",
       "category": "github",
       "icon": "👁️",
-      "file": "avatars/code-review-swarm.svg",
+      "file": "avatars/monoswarm-code-review.svg",
       "index": 31
     },
     {
@@ -949,7 +933,7 @@
     {
       "id": "scout-explorer",
       "label": "Scout Explorer",
-      "category": "swarm",
+      "category": "monoswarm",
       "icon": "🧭",
       "file": "avatars/scout-explorer.svg",
       "index": 118

package/dist/src/ui/orgs.html

@@ -1406,7 +1406,14 @@ function renderTab(tab) {
 function renderChart() {
   const d = orgDetailData;
   const roles = Array.isArray(d.roles) ? d.roles : [];
-  const comms = Array.isArray(d.communication) ? d.communication : [];
+  // Structural report lines come straight from each role's reports_to (the
+  // authoritative chain also shown in the Roles tab) — declared communication
+  // edges (command/feedback/handoff busses) don't reflect who actually reports
+  // to whom, e.g. a hierarchical topology's queen commanding every worker directly.
+  const reportEdges = roles
+    .filter(r => r.reports_to && r.reports_to !== r.id)
+    .map(r => ({ from: r.id, to: r.reports_to, type: 'report' }));
+  const comms = reportEdges.concat(Array.isArray(d.communication) ? d.communication : []);
   const running = !!(allOrgs.find(o => o.name === selectedOrg) || {}).running;
 
   // Meta bar

package/dist/src/ui/routes-org.mjs

@@ -230,8 +230,11 @@ if (req.method === 'GET' && /^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/activity$/i.
     if (cfg) {
       const createdMs = cfg.created_at ? Date.parse(cfg.created_at) : null;
       if (createdMs) events.push({ type: 'org:create', ts: createdMs, msg: String(cfg.goal || 'Org created').slice(0, 80) });
-      (cfg.roles || []).forEach((r, i) => {
-        events.push({ type: 'role:defined', ts: createdMs ? createdMs + (i + 1) * 1000 : null, role: r.title || r.id, msg: r.agent_type || '' });
+      // Roles are defined atomically at org creation — there is no per-role
+      // timestamp in the config, so every role:defined event uses the org's
+      // real created_at instead of a fabricated per-index offset.
+      (cfg.roles || []).forEach((r) => {
+        events.push({ type: 'role:defined', ts: createdMs, role: r.title || r.id, msg: r.agent_type || '' });
       });
     }
     const goals = readJ(path.join(orgsDir, `${orgName}-goals.json`));
@@ -308,10 +311,30 @@ if (req.method === 'GET' && /^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/adapters$/i.
       let defaultAdapter = 'claude-sonnet-4-6';
       try { defaultAdapter = JSON.parse(fs.readFileSync(orgFile, 'utf8'))?.run_config?.ceo_adapter || defaultAdapter; } catch(_) {}
       res.writeHead(200, { 'Content-Type': 'application/json', ...(corsOrigin ? { 'Access-Control-Allow-Origin': corsOrigin } : {}) });
+      // This list mirrors the runtimes orgrt/daemon.ts actually registers
+      // (resolveRunner()'s if-chain + the ClaudeAgentRunner default it falls
+      // through to) rather than an independent, hand-maintained catalog — a
+      // standalone 'gemini-local' entry used to be advertised here even
+      // though no runner is ever registered for it (autoRuntimeFromProvider
+      // has no 'gemini' case, so a role requesting it silently falls back to
+      // Claude — see daemon.ts#startOrg's fail-fast warning). Gemini is only
+      // actually reachable via the 'vercel' runtime (vendor: 'google') or via
+      // 'antigravity' (Google-account CLI), both listed below. 'http' maps to
+      // provider.kind === 'base-url' (ANTHROPIC_BASE_URL + optional auth
+      // token) — a real, usable path, not disabled.
       res.end(JSON.stringify({ default_adapter: defaultAdapter, adapters: [
         { type: 'claude-local', label: 'Claude (local CLI)', source: 'built-in', disabled: false, modelsCount: 3 },
-        { type: 'gemini-local', label: 'Gemini (local)', source: 'built-in', disabled: false, modelsCount: 1 },
-        { type: 'http', label: 'HTTP Adapter', source: 'built-in', disabled: true, modelsCount: 0 },
+        { type: 'codex-local', label: 'Codex CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'antigravity', label: 'Antigravity (Google CLI)', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'grok', label: 'Grok CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'qwen', label: 'Qwen CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'crush', label: 'Crush CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'copilot', label: 'GitHub Copilot CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'pi', label: 'Pi CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'opencode', label: 'OpenCode CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'kimicode', label: 'KimiCode CLI', source: 'built-in', disabled: false, modelsCount: 1 },
+        { type: 'vercel', label: 'Vercel AI SDK (multi-vendor, incl. Gemini/OpenAI)', source: 'built-in', disabled: false, modelsCount: 14 },
+        { type: 'http', label: 'Custom HTTP (base-url provider)', source: 'built-in', disabled: false, modelsCount: 0 },
       ]}));
       return true;
     }
@@ -878,6 +901,32 @@ if (req.method === 'GET' && url.match(/^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/ap
   return true;
 }
 
+// GET /api/org/:name/gates — decision gate log (read-only explorer; resolving stays
+// CLI-only via `org gate-approve`/`gate-reject`, which needs the daemon's
+// x-monomind-cred auth header for live delivery — out of scope for a read-only view)
+if (req.method === 'GET' && url.match(/^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/gates(\?.*)?$/i)) {
+  try {
+    const orgName = decodeURIComponent(url.split('/')[3].split('?')[0]);
+    if (orgName.length > 64 || !/^[a-z0-9][a-z0-9_-]*$/i.test(orgName)) { res.writeHead(400); res.end('Invalid org name'); return true; }
+    const _gatesQs = new URL(req.url, 'http://localhost').searchParams;
+    const base = path.join(path.resolve(_gatesQs.get('dir') || ctx.projectDir || process.cwd()), '.monomind', 'orgs');
+    const readJsonSafe = (f) => { try { return JSON.parse(fs.readFileSync(f, 'utf8')); } catch(_) { return null; } };
+    const data = readJsonSafe(path.join(base, orgName, 'gates.json')) || { gates: [] };
+    const gates = (data.gates || [])
+      .sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0))
+      .map(g => ({
+        id: g.id, name: g.name, description: g.description, roleId: g.roleId,
+        status: g.status || 'pending', createdAt: g.createdAt || null,
+        resolvedBy: g.resolvedBy || null, resolvedAt: g.resolvedAt || null,
+        resolution: g.resolution || null,
+      }));
+    const pending = gates.filter(g => g.status === 'pending').length;
+    res.writeHead(200, { 'Content-Type': 'application/json', ...(corsOrigin ? { 'Access-Control-Allow-Origin': corsOrigin } : {}) });
+    res.end(JSON.stringify({ gates, pending }));
+  } catch(_) { res.writeHead(500); res.end('{"gates":[],"pending":0}'); }
+  return true;
+}
+
 // GET /api/questions?dir=<ctx.projectDir> — list ask_human questions (pending and
 // answered) for every org in one project. Mirrors the existing -approvals.json
 // sidecar convention, but reads this feature's .monomind/orgs/<org>/questions.json
@@ -1109,13 +1158,29 @@ if (req.method === 'GET' && url.match(/^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/bu
         total_cost_usd: s.total_cost_usd || 0,
       }));
     } catch(_) {}
-    // Scan org run jsonl files for agent:usage events (fallback when state.json has no token data)
+    // Scan org run jsonl files for usage events (fallback when state.json has no token data).
+    // Two event-type variants show up here in practice and must BOTH be matched, each with its
+    // own field mapping — matching only one silently drops real v2 cost data from the UI:
+    //  - 'agent:usage': flattened { role, tokens_in, tokens_out, cost_usd } (legacy/direct writers).
+    //  - 'org:usage': orgrt's actual forwarded shape (attachForwarder's translate() default case
+    //    for a raw OrgBus 'usage' event) — { from, data: { tokens, cost_usd } }. orgrt never emits
+    //    'agent:usage' itself, so scanning for that alone means this fallback never fires for real runs.
     const _hasTokenData = agents.some(a => a.tokens_in > 0 || a.tokens_out > 0 || a.total_cost_usd > 0);
     if (!_hasTokenData) {
       try {
         const _runsDir = path.join(base, orgName, 'runs');
         if (fs.existsSync(_runsDir)) {
           const _usageByRole = {};
+          const _bump = (role, tokensIn, tokensOut, tokensTotal, costUsd) => {
+            if (!role) return;
+            role = String(role).trim();
+            if (!role) return;
+            if (!_usageByRole[role]) _usageByRole[role] = { tokens_in: 0, tokens_out: 0, tokens_used: 0, total_cost_usd: 0 };
+            _usageByRole[role].tokens_in += tokensIn;
+            _usageByRole[role].tokens_out += tokensOut;
+            _usageByRole[role].tokens_used += tokensIn + tokensOut + tokensTotal;
+            _usageByRole[role].total_cost_usd += costUsd;
+          };
           for (const f of fs.readdirSync(_runsDir)) {
             if (!f.endsWith('.jsonl') || f.startsWith('._')) continue;
             const lines = fs.readFileSync(path.join(_runsDir, f), 'utf8').split('\n').filter(Boolean);
@@ -1123,11 +1188,9 @@ if (req.method === 'GET' && url.match(/^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/bu
               try {
                 const ev = JSON.parse(l);
                 if (ev.type === 'agent:usage' && ev.role) {
-                  const role = String(ev.role).trim();
-                  if (!_usageByRole[role]) _usageByRole[role] = { tokens_in: 0, tokens_out: 0, total_cost_usd: 0 };
-                  _usageByRole[role].tokens_in += Number(ev.tokens_in) || 0;
-                  _usageByRole[role].tokens_out += Number(ev.tokens_out) || 0;
-                  _usageByRole[role].total_cost_usd += Number(ev.cost_usd) || 0;
+                  _bump(ev.role, Number(ev.tokens_in) || 0, Number(ev.tokens_out) || 0, 0, Number(ev.cost_usd) || 0);
+                } else if (ev.type === 'org:usage' && ev.from) {
+                  _bump(ev.from, 0, 0, Number(ev.data?.tokens) || 0, Number(ev.data?.cost_usd) || 0);
                 }
               } catch(_) {}
             }
@@ -1136,7 +1199,13 @@ if (req.method === 'GET' && url.match(/^\/api\/org\/[a-z0-9][a-z0-9_-]{0,63}\/bu
             // Merge usage into agents list; preserve role titles
             agents = agents.map(a => {
               const u = _usageByRole[a.id] || {};
-              return { ...a, tokens_in: u.tokens_in || 0, tokens_out: u.tokens_out || 0, total_cost_usd: u.total_cost_usd || 0 };
+              return {
+                ...a,
+                tokens_in: u.tokens_in || 0,
+                tokens_out: u.tokens_out || 0,
+                tokens_used: u.tokens_used || ((u.tokens_in || 0) + (u.tokens_out || 0)),
+                total_cost_usd: u.total_cost_usd || 0,
+              };
             });
             // Add any roles that appeared in events but aren't in config
             for (const [role, u] of Object.entries(_usageByRole)) {
@@ -2172,21 +2241,21 @@ if (req.method === 'POST' && url === '/api/knowledge/search') {
   return true;
 }
 
-// GET /api/mastermind/metrics — aggregate system metrics from token-summary and swarm-activity
+// GET /api/mastermind/metrics — aggregate system metrics from token-summary and monoswarm-activity
 if (req.method === 'GET' && url === '/api/mastermind/metrics') {
   try {
     const base = path.join(ctx.projectDir || process.cwd(), '.monomind', 'metrics');
-    let tokens = {}, swarm = {}, events = [];
+    let tokens = {}, monoswarm = {}, events = [];
     try { tokens = JSON.parse(fs.readFileSync(path.join(base, 'token-summary.json'), 'utf8')); } catch(_) {}
-    try { swarm  = JSON.parse(fs.readFileSync(path.join(base, 'swarm-activity.json'), 'utf8')); } catch(_) {}
+    try { monoswarm = JSON.parse(fs.readFileSync(path.join(base, 'monoswarm-activity.json'), 'utf8')); } catch(_) {}
     try {
       const evPath = path.join(ctx.projectDir || process.cwd(), 'data', 'mastermind-events.jsonl');
       const lines = fs.readFileSync(evPath, 'utf8').split('\n').filter(l => l.trim()).slice(-20);
       events = lines.map(l => { try { return JSON.parse(l); } catch(_) { return null; } }).filter(Boolean);
     } catch(_) {}
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ tokens, swarm, recentEvents: events }));
-  } catch(_) { res.writeHead(500); res.end('{"tokens":{},"swarm":{},"recentEvents":[]}'); }
+    res.end(JSON.stringify({ tokens, monoswarm, recentEvents: events }));
+  } catch(_) { res.writeHead(500); res.end('{"tokens":{},"monoswarm":{},"recentEvents":[]}'); }
   return true;
 }