Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

Merge remote-tracking branch 'origin/main' into fix/codex-image-usage

[._.]/ Adam Eivy5869d42fa7aa
diff --cc client/src/pages/UsagePage.jsx
index bed85749e4,2c3155f9c6..9dc4917b74
--- a/client/src/pages/UsagePage.jsx
+++ b/client/src/pages/UsagePage.jsx
@@@ -23,8 -23,24 +23,25 @@@ import { USAGE_PERIOD_OPTIONS, DEFAULT_
const BACKFILL_EVENTS = ['usage-backfill:updated'];
+const IMAGE_USAGE_EVENTS = ['image-gen:completed'];
+ function joinAnd(parts) {
+ if (parts.length <= 1) return parts[0] || '';
+ if (parts.length === 2) return `${parts[0]} and ${parts[1]}`;
+ return `${parts.slice(0, -1).join(', ')}, and ${parts.at(-1)}`;
+ }
+
+ /** What Reconcile now added to the Grok ledger. Absent until that job finishes. */
+ function grokRepairLine(grok) {
+ if (!grok) return '';
+ const parts = [];
+ if (grok.turns) parts.push(`${formatCount(grok.turns)} long-context turn${grok.turns === 1 ? '' : 's'}`);
+ if (grok.images) parts.push(`${formatCount(grok.images)} image${grok.images === 1 ? '' : 's'}`);
+ if (grok.videos) parts.push(`${formatCount(grok.videos)} video${grok.videos === 1 ? '' : 's'}`);
+ const added = parts.length ? `Added ${joinAnd(parts)}.` : 'Grok usage was already recorded.';
+ return grok.note ? `${added} ${grok.note}` : added;
+ }
+
// A subscription is one account across every federated instance, but each
// instance can only read its own CLI's panel. When peers have contributed a
// reading, say so on the card and name them — the meters are the freshest