@yemi33/minions 0.1.2454 → 0.1.2455

package/dashboard/js/render-other.js

@@ -702,13 +702,97 @@ function _formatTrackedCost(value, available) {
   return '$' + (Number(value) || 0).toFixed(2);
 }
 
+// Registry of NON-USD runtime-reported billable units (W-msdcgitc). Generic so a
+// future adapter can surface its own unit without touching call sites; the
+// display layer keys off typed `m.billableUnit` metadata, never a runtime name.
+var BILLABLE_UNIT_META = {
+  premiumRequests: { abbrev: 'req', label: 'premium requests', tileLabel: 'Premium Requests' },
+};
+
+function _billableBucket(m, unit) {
+  return (m && m.billableUnits && m.billableUnits[unit]) || null;
+}
+
+function _formatBillableUnitValue(unit, value) {
+  var meta = BILLABLE_UNIT_META[unit];
+  var abbr = meta ? meta.abbrev : unit;
+  var n = Number(value) || 0;
+  var num = Number.isInteger(n) ? String(n) : n.toFixed(1);
+  return num + ' ' + abbr;
+}
+
+function _hasReportedBillableUnits(m) {
+  if (!m || !m.billableUnits) return false;
+  for (var u in m.billableUnits) {
+    var b = m.billableUnits[u];
+    if (b && (b.reported || 0) > 0) return true;
+  }
+  return false;
+}
+
+function _firstReportedBillableUnit(m) {
+  if (!m || !m.billableUnits) return null;
+  for (var u2 in m.billableUnits) {
+    var b2 = m.billableUnits[u2];
+    if (b2 && (b2.reported || 0) > 0) return u2;
+  }
+  return null;
+}
+
+// Primary consumption cell for an agent row — the SAME UI position where a
+// USD-billed runtime shows dollar cost. For 'usd' runtimes this is unchanged
+// dollar rendering; for a native-unit runtime (e.g. Copilot premium requests)
+// it shows the authoritative reported count, and 'N/A' when the CLI never
+// reported the unit (distinct from a genuine reported 0). Switches on typed
+// metadata (m.billableUnit), never the runtime name.
+function _formatPrimaryUsage(m) {
+  var unit = m.billableUnit || 'usd';
+  if (unit === 'usd') {
+    return _formatTrackedCost(m.totalCostUsd, m.costTracking !== false);
+  }
+  var bucket = _billableBucket(m, unit);
+  if (!bucket || (bucket.reported || 0) === 0) return 'N/A';
+  return _formatBillableUnitValue(unit, bucket.total || 0);
+}
+
+function _formatPrimaryPerTask(m, tasks) {
+  var unit = m.billableUnit || 'usd';
+  if (unit === 'usd') {
+    var costAvailable = m.costTracking !== false;
+    return tasks > 0 ? _formatTrackedCost((m.totalCostUsd || 0) / tasks, costAvailable) : '-';
+  }
+  var bucket = _billableBucket(m, unit);
+  if (!bucket || (bucket.reported || 0) === 0) return 'N/A';
+  return tasks > 0 ? _formatBillableUnitValue(unit, (bucket.total || 0) / tasks) : '-';
+}
+
+// Primary consumption cell for an _engine category row (CC/doc-chat/…). USD wins
+// when present; otherwise a reported native billable unit (e.g. Copilot premium
+// requests for a Copilot-driven Command Center) renders in the SAME position,
+// and 'N/A' when neither is reported. Typed off the data, never a runtime name.
+function _formatEnginePrimaryUsage(e) {
+  if ((e.costUsd || 0) > 0) return _formatTrackedCost(e.costUsd, true);
+  var unit = _firstReportedBillableUnit(e);
+  if (unit) return _formatBillableUnitValue(unit, e.billableUnits[unit].total || 0);
+  return 'N/A';
+}
+
+function _formatEnginePrimaryPerCall(e, calls) {
+  if (calls <= 0) return '-';
+  if ((e.costUsd || 0) > 0) return _formatTrackedCost((e.costUsd || 0) / calls, true);
+  var unit = _firstReportedBillableUnit(e);
+  if (unit) return _formatBillableUnitValue(unit, (e.billableUnits[unit].total || 0) / calls);
+  return 'N/A';
+}
+
 function _usageExists(m) {
   return !!((m.totalCostUsd || 0)
     || (m.totalInputTokens || 0)
     || (m.totalOutputTokens || 0)
     || (m.totalCacheRead || 0)
     || (m.tasksCompleted || 0)
-    || (m.tasksErrored || 0));
+    || (m.tasksErrored || 0)
+    || _hasReportedBillableUnits(m));
 }
 
 function renderTokenUsage(metrics) {
@@ -737,7 +821,15 @@ function renderTokenUsage(metrics) {
   const totalOutput = agentOutput + engineOutput;
   const totalCache = agentCache + engineCache;
 
-  if (totalCost === 0 && Object.keys(daily).length === 0) {
+  // Show the empty state only when there is genuinely no usage of ANY kind.
+  // Keying solely off USD cost + daily (the original guard) would wrongly hide a
+  // zero-USD fleet that still reported token usage or a native billable unit such
+  // as Copilot premium requests (W-msdcgitc). `_usageExists` already folds tokens,
+  // tasks, cost, and reported billable units.
+  const _anyAgentUsage = agents.some(([, m]) => _usageExists(m));
+  const _anyEngineUsage = engineCalls > 0 || engineCost > 0
+    || Object.values(engine).some(e => _hasReportedBillableUnits(e));
+  if (!_anyAgentUsage && !_anyEngineUsage && Object.keys(daily).length === 0) {
     el.innerHTML = '<p class="empty">No usage data yet. Token tracking starts on next agent completion.</p>';
     return;
   }
@@ -753,6 +845,37 @@ function renderTokenUsage(metrics) {
   html += '<div class="token-tile"><div class="token-tile-label">Output Tokens</div><div class="token-tile-value">' + fmtTokens(totalOutput) + '</div></div>';
   html += '<div class="token-tile"><div class="token-tile-label">Cache Reads</div><div class="token-tile-value">' + fmtTokens(totalCache) + '</div></div>';
 
+  // Non-USD runtime-reported billable units (e.g. Copilot premium requests),
+  // aggregated across agents + engine categories (excluding the agent-dispatch
+  // mirror so agent premium requests aren't double-counted). Driven by typed
+  // usage metadata (W-msdcgitc). Unreported (CLI never exposed the unit) renders
+  // 'N/A', distinct from a genuine reported 0.
+  var billableAgg = {};
+  var _foldBillable = function(src) {
+    if (!src || !src.billableUnits) return;
+    for (var fu in src.billableUnits) {
+      var fb = src.billableUnits[fu]; if (!fb) continue;
+      var t = billableAgg[fu] || { total: 0, reported: 0, unavailable: 0 };
+      t.total += fb.total || 0; t.reported += fb.reported || 0; t.unavailable += fb.unavailable || 0;
+      billableAgg[fu] = t;
+    }
+  };
+  for (const [, bm] of agents) _foldBillable(bm);
+  for (const ek in engine) {
+    if (ek === 'agent-dispatch' || ek.startsWith('test-') || ek.startsWith('_test')) continue;
+    _foldBillable(engine[ek]);
+  }
+  for (var bu in billableAgg) {
+    var bb = billableAgg[bu];
+    var bmeta = BILLABLE_UNIT_META[bu] || { tileLabel: bu, label: bu, abbrev: bu };
+    var breported = (bb.reported || 0) > 0;
+    var bval = breported ? _formatBillableUnitValue(bu, bb.total || 0) : 'N/A';
+    var bsub = breported
+      ? (bb.unavailable > 0 ? bb.unavailable + ' run(s) without data' : 'authoritative ' + bmeta.label)
+      : 'not reported by CLI';
+    html += '<div class="token-tile"><div class="token-tile-label">' + escHtml(bmeta.tileLabel) + '</div><div class="token-tile-value">' + escHtml(bval) + '</div><div class="token-tile-sub">' + escHtml(bsub) + '</div></div>';
+  }
+
   // Today's cost
   const today = new Date().toISOString().slice(0, 10);
   const todayData = daily[today];
@@ -787,7 +910,7 @@ function renderTokenUsage(metrics) {
   var tempAgents = agents.filter(function(a) { return a[0].startsWith('temp-'); });
   var tokenRows = permAgents.slice();
   if (tempAgents.length > 0) {
-    var tempMerged = { totalCostUsd: 0, totalInputTokens: 0, totalOutputTokens: 0, totalCacheRead: 0, tasksCompleted: 0, tasksErrored: 0, model: '', costTracking: true };
+    var tempMerged = { totalCostUsd: 0, totalInputTokens: 0, totalOutputTokens: 0, totalCacheRead: 0, tasksCompleted: 0, tasksErrored: 0, model: '', costTracking: true, billableUnit: 'usd', billableUnits: {} };
     for (var ti = 0; ti < tempAgents.length; ti++) {
       var tm = tempAgents[ti][1];
       tempMerged.totalCostUsd += tm.totalCostUsd || 0;
@@ -798,26 +921,37 @@ function renderTokenUsage(metrics) {
       tempMerged.tasksErrored += tm.tasksErrored || 0;
       if (tm.costTracking === false) tempMerged.costTracking = false;
       if (!tempMerged.model && tm.model) tempMerged.model = tm.model;
+      // Carry the native billable unit forward (temp agents share the fleet
+      // default runtime) and merge reported billable buckets so a Copilot temp
+      // fleet still surfaces premium requests.
+      if (tm.billableUnit && tm.billableUnit !== 'usd') tempMerged.billableUnit = tm.billableUnit;
+      if (tm.billableUnits) {
+        for (var bku in tm.billableUnits) {
+          var sbk = tm.billableUnits[bku]; if (!sbk) continue;
+          var dbk = tempMerged.billableUnits[bku] || { total: 0, reported: 0, unavailable: 0 };
+          dbk.total += sbk.total || 0; dbk.reported += sbk.reported || 0; dbk.unavailable += sbk.unavailable || 0;
+          tempMerged.billableUnits[bku] = dbk;
+        }
+      }
     }
     tokenRows.push(['Temp Agents (' + tempAgents.length + ')', tempMerged]);
   }
   var agentsWithUsage = tokenRows.filter(function(a) { return _usageExists(a[1]); });
   if (agentsWithUsage.length > 0) {
     html += '<div style="font-size:var(--text-sm);color:var(--muted);margin:12px 0 4px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px">Agent Usage</div>';
-    html += '<table class="token-agent-table"><thead><tr><th style="width:20%">Agent</th><th style="width:10%">Model</th><th style="width:14%">Cost</th><th style="width:14%">Input</th><th style="width:14%">Output</th><th style="width:14%">Cache</th><th style="width:14%">$/task</th></tr></thead><tbody>';
+    html += '<table class="token-agent-table"><thead><tr><th style="width:20%">Agent</th><th style="width:10%">Model</th><th style="width:14%">Usage</th><th style="width:14%">Input</th><th style="width:14%">Output</th><th style="width:14%">Cache</th><th style="width:14%">Per Task</th></tr></thead><tbody>';
     for (const [id, m] of agentsWithUsage.sort((a, b) => (b[1].totalCostUsd || 0) - (a[1].totalCostUsd || 0))) {
       const tasks = (m.tasksCompleted || 0) + (m.tasksErrored || 0);
-      const costAvailable = m.costTracking !== false;
-      const perTask = tasks > 0 ? _formatTrackedCost((m.totalCostUsd || 0) / tasks, costAvailable) : '-';
+      const perTask = _formatPrimaryPerTask(m, tasks);
       const modelLabel = (m.model || '').replace(/^claude-/, '').replace(/\[.*\]$/, '') || '-';
       html += '<tr>' +
         '<td style="font-weight:600">' + escHtml(id) + '</td>' +
         '<td style="color:var(--muted);font-size:var(--text-sm)">' + escHtml(modelLabel) + '</td>' +
-        '<td>' + _formatTrackedCost(m.totalCostUsd, costAvailable) + '</td>' +
+        '<td>' + escHtml(_formatPrimaryUsage(m)) + '</td>' +
         '<td>' + fmtTokens(m.totalInputTokens || 0) + '</td>' +
         '<td>' + fmtTokens(m.totalOutputTokens || 0) + '</td>' +
         '<td>' + fmtTokens(m.totalCacheRead || 0) + '</td>' +
-        '<td style="color:var(--muted)">' + perTask + '</td>' +
+        '<td style="color:var(--muted)">' + escHtml(perTask) + '</td>' +
       '</tr>';
     }
     html += '</tbody></table>';
@@ -828,14 +962,14 @@ function renderTokenUsage(metrics) {
   if (engineEntries.length > 0) {
     const labels = { 'consolidation': 'Consolidation', 'command-center': 'Command Center', 'doc-chat': 'Doc Chat', 'kb-sweep': 'KB Sweep', 'schedule-parse': 'Schedule Parse' };
     html += '<div style="font-size:var(--text-sm);color:var(--muted);margin:12px 0 4px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px">Engine Usage</div>';
-    html += '<table class="token-agent-table"><thead><tr><th style="width:20%">Operation</th><th style="width:10%">Calls</th><th style="width:14%">Cost</th><th style="width:14%">Input</th><th style="width:14%">Output</th><th style="width:14%">Cache</th><th style="width:14%">$/call</th></tr></thead><tbody>';
+    html += '<table class="token-agent-table"><thead><tr><th style="width:20%">Operation</th><th style="width:10%">Calls</th><th style="width:14%">Usage</th><th style="width:14%">Input</th><th style="width:14%">Output</th><th style="width:14%">Cache</th><th style="width:14%">Per Call</th></tr></thead><tbody>';
     for (const [cat, e] of engineEntries.sort((a, b) => (b[1].costUsd || 0) - (a[1].costUsd || 0))) {
-      const costAvailable = (e.costUsd || 0) > 0;
-      const perCall = (e.calls || 0) > 0 ? _formatTrackedCost((e.costUsd || 0) / e.calls, costAvailable) : '-';
+      const calls = e.calls || 0;
+      const perCall = _formatEnginePrimaryPerCall(e, calls);
       html += '<tr>' +
         '<td style="font-weight:600">' + escHtml(labels[cat] || cat) + '</td>' +
         '<td>' + (e.calls || 0) + '</td>' +
-        '<td>' + _formatTrackedCost(e.costUsd, costAvailable) + '</td>' +
+        '<td>' + escHtml(_formatEnginePrimaryUsage(e)) + '</td>' +
         '<td>' + fmtTokens(e.inputTokens || 0) + '</td>' +
         '<td>' + fmtTokens(e.outputTokens || 0) + '</td>' +
         '<td>' + fmtTokens(e.cacheRead || 0) + '</td>' +
@@ -1129,7 +1263,7 @@ function renderHarnessDiagnostics(diag) {
   }
 }
 
-window.MinionsOther = { renderProjects, optimisticallyAddProject, projectChipRemove, renderMcpServers, renderCommands, renderHarnessDiagnostics, renderMetrics, renderLlmPerf, renderTokenUsage, _aggregateEngineUsageForTokenTile, _formatTrackedCost, openScanProjectsModal };
+window.MinionsOther = { renderProjects, optimisticallyAddProject, projectChipRemove, renderMcpServers, renderCommands, renderHarnessDiagnostics, renderMetrics, renderLlmPerf, renderTokenUsage, _aggregateEngineUsageForTokenTile, _formatTrackedCost, _formatPrimaryUsage, _formatPrimaryPerTask, _formatBillableUnitValue, openScanProjectsModal };
 
 // ─── keep_processes panel (W-mp68q6ke0010de68) ─────────────────────────────
 // Polls /api/keep-processes every refresh (engine page only) and renders a

package/dashboard/js/render-prd.js

@@ -317,8 +317,9 @@ function renderPrdProgress(prog) {
     const wi = wiById[workItemId] || wiById[i.id];
     const wiAgent = wi?.dispatched_to ? (agentData.find(a => a.id === wi.dispatched_to) || {}) : null;
     const wiLabel = _renderPrdWorkItemIdBadge(wi ? wi.id : workItemId, i.id);
-    const agentLabel = wiAgent ? '<span style="font-size:var(--text-sm);color:var(--muted)" title="' + escHtml(wiAgent.name || wi.dispatched_to) + '">' +
-      (wiAgent.emoji || '') + ' ' + escHtml(wiAgent.name || wi.dispatched_to) + '</span>' : '';
+    const wiAgentIdentity = { id: wi?.dispatched_to, name: wiAgent && wiAgent.name };
+    const agentLabel = wiAgent ? '<span style="font-size:var(--text-sm);color:var(--muted)" title="' + escHtml(MinionsAgentIdentity.displayName(wiAgentIdentity)) + '">' +
+      (wiAgent.emoji || '') + ' ' + MinionsAgentIdentity.nameWithBadgeHtml(wiAgentIdentity) + '</span>' : '';
 
     // Branch label — show the target branch for this item
     const wiBranch = wi ? (wi.branch || wi.featureBranch || (wi._artifacts && wi._artifacts.branch) || '') : '';
@@ -382,7 +383,7 @@ function renderPrdProgress(prog) {
               statusBadge(c.status) +
               '<span style="color:var(--muted);font-size:var(--text-sm)">' + escHtml(c.id) + '</span>' +
               '<span style="flex:1">' + escHtml((c.title || '').replace('Implement: ', '').slice(0, 60)) + '</span>' +
-              (childAgent ? '<span style="font-size:var(--text-sm);color:var(--muted)">' + (childAgent.emoji || '') + ' ' + escHtml(childAgent.name || c.dispatched_to) + '</span>' : '') +
+              (childAgent ? '<span style="font-size:var(--text-sm);color:var(--muted)">' + (childAgent.emoji || '') + ' ' + MinionsAgentIdentity.nameWithBadgeHtml({ id: c.dispatched_to, name: childAgent.name }) + '</span>' : '') +
             '</div>';
           }).join('') +
         '</div>';
@@ -589,7 +590,7 @@ function renderPrdProgress(prog) {
         const wiForCard = wi[workItemId] || wi[i.id];
         const agentId = wiForCard?.dispatched_to || '';
         const agentInfo = agentId ? (agentData.find(a => a.id === agentId) || {}) : null;
-        const agentDisplay = agentInfo ? (agentInfo.emoji || '') + ' ' + escHtml(agentInfo.name || agentId) : (agentId ? escHtml(agentId) : '');
+        const agentDisplay = agentInfo ? (agentInfo.emoji || '') + ' ' + MinionsAgentIdentity.nameWithBadgeHtml({ id: agentId, name: agentInfo.name }) : (agentId ? MinionsAgentIdentity.nameWithBadgeHtml({ id: agentId }) : '');
         const deps = (i.depends_on || []).join(', ');
         const wipAnim = i.status === 'in-progress' ? 'animation:prdWipPulse 2s infinite;' : '';
         const wiIdBadge = _renderPrdWorkItemIdBadge(wiForCard ? wiForCard.id : workItemId, i.id, '8px', '1px 4px');
@@ -951,7 +952,7 @@ async function prdItemEdit(source, itemId) {
       '<div style="display:flex;align-items:center;gap:8px;margin-bottom:6px">' +
         (wi ? '<a href="#" onclick="event.preventDefault();event.stopPropagation();openWorkItemDetail(\'' + escHtml(wi.id) + '\',\'' + escHtml(wi._source || '') + '\')" title="Open ' + escHtml(wi.id) + ' detail" style="font-size:var(--text-base);font-weight:700;color:' + statusColor + ';text-decoration:none;cursor:pointer" onmouseover="this.style.textDecoration=\'underline\'" onmouseout="this.style.textDecoration=\'none\'">' + statusLabel + ' &rarr;</a>' : '<span style="font-size:var(--text-base);font-weight:700;color:' + statusColor + '">' + statusLabel + '</span>') +
         typePillHtml +
-        (agent ? '<span style="font-size:var(--text-base);color:var(--muted)">by ' + escHtml(agent) + '</span>' : '') +
+        (agent ? '<span style="font-size:var(--text-base);color:var(--muted)">by ' + MinionsAgentIdentity.nameWithBadgeHtml({ id: agent }) + '</span>' : '') +
         (completedAt ? '<span style="font-size:var(--text-sm);color:var(--muted)">' + escHtml(completedAt.slice(0, 16).replace('T', ' ')) + '</span>' : '') +
       '</div>' +
       (prLinks ? '<div style="font-size:var(--text-base);margin-bottom:6px">PR: ' + prLinks + '</div>' : '') +

package/dashboard/js/render-prs.js

@@ -656,7 +656,7 @@ function _renderPrDetail(pr) {
       author = '<div><strong style="color:var(--muted);font-size:var(--text-base)">Author:</strong> <span style="color:var(--muted)">Unknown</span></div>';
     }
   }
-  const agent = pr.agent ? '<div><strong style="color:var(--muted);font-size:var(--text-base)">Minions agent:</strong> ' + escapeHtml(String(pr.agent)) + '</div>' : '';
+  const agent = pr.agent ? '<div><strong style="color:var(--muted);font-size:var(--text-base)">Minions agent:</strong> ' + MinionsAgentIdentity.nameWithBadgeHtml({ id: String(pr.agent) }) + '</div>' : '';
   const branch = pr.branch ? '<div><strong style="color:var(--muted);font-size:var(--text-base)">Branch:</strong> <code>' + escapeHtml(String(pr.branch)) + '</code></div>' : '';
   const created = pr.created ? '<div><strong style="color:var(--muted);font-size:var(--text-base)">Created:</strong> ' + escapeHtml(String(pr.created)) + '</div>' : '';
   const project = pr._project ? '<div><strong style="color:var(--muted);font-size:var(--text-base)">Project:</strong> ' + escapeHtml(String(pr._project)) + '</div>' : '';