clawmetry 0.12.415__tar.gz → 0.12.417__tar.gz

{clawmetry-0.12.415/clawmetry.egg-info → clawmetry-0.12.417}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clawmetry
-Version: 0.12.415
+Version: 0.12.417
 Summary: ClawMetry - Real-time observability dashboard for OpenClaw AI agents
 Home-page: https://github.com/vivekchand/clawmetry
 Author: Vivek Chand

{clawmetry-0.12.415 → clawmetry-0.12.417}/clawmetry/static/js/app.js

@@ -1178,7 +1178,7 @@ function switchTab(name) {
   if (name === 'models') loadModelAttribution();
   if (name === 'nemoclaw') { loadNemoClaw(); _startNcApprovalsAutoRefresh(); }
   if (name !== 'nemoclaw') _stopNcApprovalsAutoRefresh();
-  if (name === 'subagents') { loadRunLedger(); loadSubagents(); if (!_subagentsTimer) _subagentsTimer = visibilitySetInterval(function(){ loadRunLedger(); loadSubagents(); }, 5000); }
+  if (name === 'subagents') { loadOrchestration(); loadRunLedger(); loadSubagents(); if (!_subagentsTimer) _subagentsTimer = visibilitySetInterval(function(){ loadOrchestration(); loadRunLedger(); loadSubagents(); }, 5000); }
   if (name !== 'subagents' && _subagentsTimer) { clearInterval(_subagentsTimer); _subagentsTimer = null; }
   if (name === 'swimlane') { loadSwimlane(); if (!_swimlaneTimer) _swimlaneTimer = visibilitySetInterval(loadSwimlane, 3000); }
   if (name !== 'swimlane' && _swimlaneTimer) { clearInterval(_swimlaneTimer); _swimlaneTimer = null; }
@@ -13383,6 +13383,59 @@ function _saToggle(sid) {
   loadSubagents();
 }
 
+async function loadOrchestration() {
+  var el = document.getElementById('orchestration-board');
+  if (!el) return;
+  try {
+    var data = await fetch('/api/orchestration').then(function(r) { return r.json(); });
+    var agents = data.agents || [];
+    var summary = data.summary || {};
+    if (agents.length === 0) { el.innerHTML = ''; return; }
+    var statusColors = {
+      active: '#16a34a', running: '#16a34a', idle: '#d97706',
+      stale: '#6b7280', failed: '#ef4444', paused: '#7c3aed', completed: '#3b82f6'
+    };
+    var html = '<div style="border:1px solid var(--border-primary);border-radius:10px;overflow:hidden;margin-bottom:4px;">';
+    html += '<div style="display:flex;align-items:center;gap:16px;padding:8px 14px;background:var(--bg-secondary);border-bottom:1px solid var(--border-primary);font-size:12px;flex-wrap:wrap;">';
+    html += '<span style="font-weight:700;color:var(--text-primary);font-size:13px;">🤖 Orchestration</span>';
+    html += '<span style="color:var(--text-muted);"><strong style="color:var(--text-primary);">' + (summary.total || 0) + '</strong> agents</span>';
+    if (summary.active) html += '<span style="color:#16a34a;"><strong>' + summary.active + '</strong> active</span>';
+    if (summary.total_cost_usd) {
+      html += '<span style="color:var(--text-muted);">$<strong style="color:var(--text-primary);">' + summary.total_cost_usd.toFixed(4) + '</strong> total cost</span>';
+    }
+    html += '</div>';
+    html += '<div style="display:flex;flex-wrap:wrap;gap:8px;padding:10px;">';
+    agents.forEach(function(a) {
+      var color = statusColors[a.status] || '#6b7280';
+      var glow = (a.status === 'active' || a.status === 'running') ? 'box-shadow:0 0 0 1px ' + color + '40;' : '';
+      var costStr = (a.costUsd > 0) ? '$' + a.costUsd.toFixed(4) : '';
+      var tokens = a.totalTokens >= 1000 ? (a.totalTokens / 1000).toFixed(1) + 'K tok' : (a.totalTokens > 0 ? a.totalTokens + ' tok' : '');
+      var depthBadge = (a.depth > 1) ? '<span style="font-size:9px;background:var(--bg-secondary);border:1px solid var(--border-primary);border-radius:3px;padding:0 4px;color:var(--text-muted);margin-left:4px;">d' + a.depth + '</span>' : '';
+      html += '<div style="flex:0 0 auto;min-width:155px;max-width:215px;border:1px solid var(--border-primary);border-radius:8px;padding:8px 10px;background:var(--bg-card);' + glow + '">';
+      html += '<div style="display:flex;align-items:center;gap:5px;margin-bottom:4px;">';
+      html += '<span style="width:8px;height:8px;border-radius:50%;background:' + color + ';display:inline-block;flex-shrink:0;"></span>';
+      html += '<span style="font-size:12px;font-weight:600;color:var(--text-primary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:1;" title="' + escHtml(a.displayName) + '">' + escHtml(a.displayName) + '</span>';
+      html += depthBadge;
+      html += '</div>';
+      if (a.model && a.model !== 'unknown') {
+        html += '<div style="font-size:10px;color:var(--text-muted);margin-bottom:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + escHtml(a.model) + '</div>';
+      }
+      if (costStr || tokens) {
+        html += '<div style="display:flex;gap:8px;font-size:10px;color:var(--text-faint);">';
+        if (costStr) html += '<span style="color:#16a34a;">' + escHtml(costStr) + '</span>';
+        if (tokens) html += '<span>' + escHtml(tokens) + '</span>';
+        html += '</div>';
+      }
+      html += '</div>';
+    });
+    html += '</div></div>';
+    el.innerHTML = html;
+  } catch(e) {
+    var board = document.getElementById('orchestration-board');
+    if (board) board.innerHTML = '';
+  }
+}
+
 async function controlAgent(key, action) {
   if (action === 'stop') {
     if (!confirm('Stop agent ' + key + '? This will attempt to terminate it via the gateway and cannot be undone.')) return;

{clawmetry-0.12.415 → clawmetry-0.12.417}/clawmetry/sync.py

@@ -1032,6 +1032,39 @@ _HEARTBEAT_PLAN_TO_TIER = {
 }
 
 
+def _sync_auto_update_with_plan(tier: str | None) -> None:
+    """Entitled accounts (Trial / Starter / Pro / Enterprise) keep the node
+    current automatically: enable the opt-in ``auto_update`` flag so the
+    daemon's update-check worker installs new releases (riding the 48h
+    staleness rail). This is what makes "I'm on Pro, the node should just stay
+    current" real without a manual ``pip install -U``.
+
+    Safety: respects an explicit opt-out (``CLAWMETRY_AUTO_UPDATE`` in
+    0/false/no/off), only ever ENABLES (never auto-disables, so a user's manual
+    choice survives a downgrade), and no-ops for free / inactive plans. Best
+    effort — never raises."""
+    try:
+        if not tier or tier == "cloud_free":
+            return
+        _ov = os.environ.get("CLAWMETRY_AUTO_UPDATE", "").strip().lower()
+        if _ov in ("0", "false", "no", "off"):
+            return
+        from routes.update_check import (
+            _get_update_check_config as _gucc,
+            _set_update_check_config as _succ,
+        )
+        cfg = _gucc() or {}
+        if not cfg.get("auto_update"):
+            _succ({"auto_update": True})
+            log.info(
+                "auto-update enabled for entitled plan (%s) — this node will keep "
+                "itself current (48h stability window). Opt out any time with "
+                "CLAWMETRY_AUTO_UPDATE=0.", tier,
+            )
+    except Exception as exc:
+        log.debug("auto-update plan sync skipped: %s", exc)
+
+
 def _persist_cloud_plan_to_disk(plan: str | None, trial_days_left=None) -> None:
     """Mirror the heartbeat plan into ``~/.clawmetry/cloud_plan.json`` so the
     dashboard process (which runs ``clawmetry.entitlements.get_entitlement``)
@@ -1043,6 +1076,8 @@ def _persist_cloud_plan_to_disk(plan: str | None, trial_days_left=None) -> None:
     is removed instead of written, so the resolver falls back to OSS-free
     rather than granting a dead plan."""
     tier = _HEARTBEAT_PLAN_TO_TIER.get(str(plan or "").strip().lower())
+    # Entitled plan → keep this node current automatically (opt-out + 48h rail).
+    _sync_auto_update_with_plan(tier)
     try:
         if tier is None:
             if os.path.isfile(_CLOUD_PLAN_CACHE_PATH):

{clawmetry-0.12.415 → clawmetry-0.12.417}/clawmetry/templates/tabs/subagents.html

@@ -1,8 +1,12 @@
 <div class="page" id="page-subagents">
   <div class="refresh-bar">
     <h2 style="font-size:16px;font-weight:700;color:var(--text-primary);margin:0;flex:1;" data-i18n="app.sub_agents_queue_lanes">🤖 Sub-Agents &amp; Queue Lanes</h2>
-    <button class="refresh-btn" onclick="loadRunLedger();loadSubagents()" data-i18n="app.refresh">↻ Refresh</button>
+    <button class="refresh-btn" onclick="loadOrchestration();loadRunLedger();loadSubagents()" data-i18n="app.refresh">↻ Refresh</button>
   </div>
+  <!-- Orchestration status board: one card per agent with status badge, cost,
+       model tag. Populated by loadOrchestration() from /api/orchestration.
+       Hidden automatically when no agents exist. -->
+  <div id="orchestration-board" style="margin-bottom:12px;"></div>
   <!-- OpenClaw run-ledger lane monitor (cli / cron / subagent) + recent runs.
        Populated by loadRunLedger() from /api/run-ledger. `runtime` is the
        OpenClaw queue lane, so this is the live queue/concurrency view. -->

{clawmetry-0.12.415 → clawmetry-0.12.417/clawmetry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clawmetry
-Version: 0.12.415
+Version: 0.12.417
 Summary: ClawMetry - Real-time observability dashboard for OpenClaw AI agents
 Home-page: https://github.com/vivekchand/clawmetry
 Author: Vivek Chand

{clawmetry-0.12.415 → clawmetry-0.12.417}/dashboard.py

@@ -160,7 +160,7 @@ except ImportError:
     metrics_service_pb2 = None
     trace_service_pb2 = None
 
-__version__ = "0.12.415"
+__version__ = "0.12.417"
 
 # Extensions (Phase 2): import the plugin host now, but defer the actual
 # load_plugins() call until after the Flask app is created below so we can

{clawmetry-0.12.415 → clawmetry-0.12.417}/routes/sessions.py

@@ -2027,6 +2027,7 @@ def _try_local_store_subagents(_rows=None):
             "depth":            int(extra.get("depth") or 1),
             "parent":           r.get("parent_session_id") or extra.get("spawnedBy"),
             "totalTokens":      token_count,
+            "costUsd":          round(float(r.get("cost_usd") or 0.0), 4),
             "runtime":          runtime,
             "runtimeMs":        runtime_ms,
             "startedAt":        spawned_at_ms or updated_at_ms,
@@ -2417,6 +2418,29 @@ def _check_integrity(subagents):
     return violations
 
 
+@bp_sessions.route("/api/orchestration")
+def api_orchestration():
+    """Compact orchestration status board — agent cards with cost and model tags.
+
+    Wraps the subagents DuckDB fast-path (same source as /api/subagents) and
+    adds a per-agent ``costUsd`` field for the status-board panel rendered
+    above the subagent tree. Returns an empty board when the local store is
+    unavailable so the existing tree view still works via its own fallback.
+    """
+    fast = _try_local_store_subagents()
+    agents = (fast or {}).get("subagents", [])
+    counts = (fast or {}).get("counts", {})
+    total_cost_usd = round(sum(a.get("costUsd", 0.0) for a in agents), 4)
+    return jsonify({
+        "agents": agents,
+        "summary": {
+            "total":          counts.get("total", 0),
+            "active":         counts.get("active", 0),
+            "total_cost_usd": total_cost_usd,
+        },
+    })
+
+
 @bp_sessions.route("/api/subagents/integrity")
 def api_subagents_integrity():
     """Validate subagent state-machine: orphans, cycles, duplicate completions.

{clawmetry-0.12.415 → clawmetry-0.12.417}/routes/update_check.py

@@ -223,12 +223,34 @@ def _check_for_update():
 
     _record_update_check(current, latest, update_available, CHANGELOG_URL)
 
+    # Age (hours) of the latest release, for the auto-update staleness rail.
+    # NEVER blocks the banner — only the silent upgrade waits for the release
+    # to have survived a stability window before installing it unattended.
+    _age_h = None
+    try:
+        _files = (data.get("releases", {}) or {}).get(latest) or []
+        _times = [
+            f.get("upload_time_iso_8601") or f.get("upload_time")
+            for f in _files
+            if f.get("upload_time_iso_8601") or f.get("upload_time")
+        ]
+        if _times:
+            from datetime import datetime as _dt, timezone as _tz
+            _t0 = min(
+                _dt.fromisoformat(str(t).replace("Z", "+00:00")) for t in _times
+            )
+            if _t0.tzinfo is None:
+                _t0 = _t0.replace(tzinfo=_tz.utc)
+            _age_h = (_dt.now(_tz.utc) - _t0).total_seconds() / 3600.0
+    except Exception:
+        _age_h = None
+
     # Auto-update: if the user opted in, install the newer release now (no
     # click). Runs in the always-on dashboard server process, so it works
     # with no browser open. Guarded so a pending restart isn't re-triggered.
     if update_available:
         try:
-            _maybe_auto_update(current, latest)
+            _maybe_auto_update(current, latest, _age_h)
         except Exception as exc:
             log.warning("auto-update trigger failed: %s", exc)
 
@@ -246,14 +268,30 @@ def _check_for_update():
 _auto_update_in_progress = False
 
 
-def _maybe_auto_update(current, latest):
-    """Install a newer release automatically when ``auto_update`` is enabled."""
+def _maybe_auto_update(current, latest, age_hours=None):
+    """Install a newer release automatically when ``auto_update`` is enabled.
+
+    Staleness rail: unattended upgrades wait until the release has been on PyPI
+    for at least ``CLAWMETRY_AUTOUPDATE_MIN_AGE_HOURS`` (default 48h), so a node
+    never auto-installs a brand-new (possibly broken) release the instant it
+    publishes. The update banner is unaffected — only the silent upgrade waits.
+    ``age_hours=None`` (age unknown) does not block, preserving prior behaviour.
+    """
     global _auto_update_in_progress
     if _auto_update_in_progress:
         return
     cfg = _get_update_check_config()
     if not cfg.get("auto_update"):
         return
+    try:
+        import os as _os
+        _min_age = float(_os.environ.get("CLAWMETRY_AUTOUPDATE_MIN_AGE_HOURS", "48") or 48)
+    except Exception:
+        _min_age = 48.0
+    if age_hours is not None and age_hours < _min_age:
+        log.info("auto-update: holding v%s (released %.1fh ago < %.0fh stability "
+                 "window) — will install once it ages in", latest, age_hours, _min_age)
+        return
     _auto_update_in_progress = True
     log.info("auto-update: opted in — upgrading clawmetry v%s -> v%s", current, latest)
     try:

{clawmetry-0.12.415 → clawmetry-0.12.417}/tests/test_auto_update.py

@@ -70,3 +70,55 @@ def test_auto_update_in_allowed_config_keys(monkeypatch):
     with app.test_request_context(json={"auto_update": True, "bogus": "x"}):
         uc.api_update_check_config_post()
     assert captured == {"auto_update": True}, "auto_update must pass the allow-list, bogus keys filtered"
+
+
+def test_auto_update_holds_fresh_release(monkeypatch):
+    uc = _uc()
+    calls = []
+    _mock_self_update(monkeypatch, calls)
+    monkeypatch.setattr(uc, "_get_update_check_config", lambda: {"auto_update": True})
+    monkeypatch.setenv("CLAWMETRY_AUTOUPDATE_MIN_AGE_HOURS", "48")
+    # 2h-old release → held (too fresh)
+    uc._maybe_auto_update("0.12.1", "0.12.2", age_hours=2.0)
+    assert calls == [], "must hold a release younger than the stability window"
+    # 72h-old release → installs
+    uc._maybe_auto_update("0.12.1", "0.12.2", age_hours=72.0)
+    assert calls == ["auto"], "must install once the release has aged in"
+
+
+def test_auto_update_unknown_age_does_not_block(monkeypatch):
+    uc = _uc()
+    calls = []
+    _mock_self_update(monkeypatch, calls)
+    monkeypatch.setattr(uc, "_get_update_check_config", lambda: {"auto_update": True})
+    uc._maybe_auto_update("0.12.1", "0.12.2", age_hours=None)
+    assert calls == ["auto"], "unknown age must not block (back-compat)"
+
+
+def test_entitled_plan_enables_auto_update(monkeypatch):
+    import clawmetry.sync as S
+    import routes.update_check as uc
+    state = {"auto_update": False}
+    monkeypatch.setattr(uc, "_get_update_check_config", lambda: dict(state))
+    monkeypatch.setattr(uc, "_set_update_check_config", lambda upd: state.update(upd))
+    monkeypatch.delenv("CLAWMETRY_AUTO_UPDATE", raising=False)
+    # free / inactive → unchanged
+    S._sync_auto_update_with_plan("cloud_free"); assert state["auto_update"] is False
+    S._sync_auto_update_with_plan(None);         assert state["auto_update"] is False
+    # entitled → enabled
+    S._sync_auto_update_with_plan("trial");      assert state["auto_update"] is True
+    S._sync_auto_update_with_plan("cloud_pro");  assert state["auto_update"] is True
+
+
+def test_entitled_plan_respects_optout_and_never_disables(monkeypatch):
+    import clawmetry.sync as S
+    import routes.update_check as uc
+    state = {"auto_update": False}
+    monkeypatch.setattr(uc, "_get_update_check_config", lambda: dict(state))
+    monkeypatch.setattr(uc, "_set_update_check_config", lambda upd: state.update(upd))
+    monkeypatch.setenv("CLAWMETRY_AUTO_UPDATE", "0")
+    S._sync_auto_update_with_plan("cloud_pro");  assert state["auto_update"] is False  # opt-out
+    # never auto-DISABLES a user's manual choice on downgrade
+    monkeypatch.delenv("CLAWMETRY_AUTO_UPDATE", raising=False)
+    state["auto_update"] = True
+    S._sync_auto_update_with_plan("cloud_free"); assert state["auto_update"] is True