@columenlabs/lumen-ui 0.1.242 → 0.1.243

package/dist/assistant/settings.js

@@ -174,9 +174,23 @@ function Providers({ client }) {
             return (_jsxs("div", { className: "flex flex-col", children: [_jsx(LumenExpandList, { children: rows.map((p) => (_jsx(OwnProviderKey, { client: client, p: p }, p.id))) }), ownSet && (_jsx(SettingField, { label: "Answers run on", info: "Your own key or plan first, with the shared credits behind it; or the shared credits first.", children: _jsx(LumenSelector, { label: "Answers run on", size: "sm", className: "w-44", value: s.pay, options: [
                                 { value: 'own', label: 'Your own first' },
                                 { value: 'app', label: 'Shared credits first' },
-                            ], onChange: (pay) => void apply('pay', () => client.settings({ pay: pay })) }) })), ownSet && (_jsx(SettingField, { label: "Your keys may spend", info: "On your keys, every provider together.", children: _jsx(CapInput, { label: "Your monthly cap", value: s.caps.own, onSave: (n) => void apply('own', () => client.ownCap(n)) }) })), _jsx(OwnKeyUsage, { client: client, always: ownSet })] }));
+                            ], onChange: (pay) => void apply('pay', () => client.settings({ pay: pay })) }) })), ownSet && (_jsx(SettingField, { label: "Your keys may spend", info: "On your keys, every provider together.", children: _jsx(CapInput, { label: "Your monthly cap", value: s.caps.own, onSave: (n) => void apply('own', () => client.ownCap(n)) }) })), ownSet && _jsx(OwnCapUse, { s: s }), _jsx(OwnKeyUsage, { client: client, always: ownSet })] }));
         } }));
 }
+/**
+ * How much of the person's own monthly cap is used: the same spend rows the cap is checked
+ * against, so this and the switch to shared credits never disagree.
+ */
+function OwnCapUse({ s }) {
+    const used = s.spend.rows
+        .filter((r) => r.payer === 'own' && !r.free)
+        .reduce((a, r) => a + r.usd, 0);
+    const cap = s.caps.own;
+    const full = cap > 0 && used >= cap;
+    return (_jsx(SettingField, { label: "Used this month", info: full
+            ? 'Your cap is used up, so the shared credits pay until next month or until you raise the cap.'
+            : 'What your own keys and plan have spent this month, against your cap.', children: _jsxs("div", { className: "flex w-56 min-w-0 flex-col gap-1", children: [_jsx(ShareMeter, { value: cap > 0 ? used / cap : 1, label: `${usd(used)} of ${usd(cap)}`, wide: true }), full && _jsx("span", { className: "text-muted-foreground text-xs", children: "Cap reached: credits pay" })] }) }));
+}
 /** One provider's shared key, which an admin sets for everyone. */
 function SharedProviderKey({ client, p }) {
     const { apply, refresh } = useApply(client);

package/dist/assistant/usage-history.js

@@ -119,17 +119,39 @@ export function OwnKeyUsage({ client, always }) {
     const sessions = all
         .filter((e) => e.at >= since && !seen.has(e.id) && seen.add(e.id))
         .sort((a, b) => b.at - a.at);
-    const total = sessions.reduce((a, e) => a + (e.own_usd ?? 0), 0);
-    return (_jsxs("div", { className: "flex flex-col gap-2 border-t border-border/60 pb-3 first:border-t-0", children: [_jsx(SettingField, { label: "Spent on your keys", info: "Each chat and run your own key or plan paid for, by its last use.", className: "border-t-0", end: _jsx(ToggleGroup, { type: "single", variant: "outline", size: "sm", spacing: 0, value: range, "aria-label": "Range", onValueChange: (v) => v && setRange(v), children: OWN_RANGES.map((r) => (_jsx(ToggleGroupItem, { value: r.id, "aria-label": `Last ${r.id}`, children: r.id }, r.id))) }) }), sessions.length ? (_jsx(DetailsTable, { head: [
+    // This month's own spend that no chat or run carries (spent before per-chat tracking), so the
+    // table never reads "nothing" while the cap's own numbers say otherwise.
+    const tagged = now.entries.reduce((a, e) => a + (e.own_usd ?? 0), 0);
+    const ownMonth = now.rows
+        .filter((r) => r.payer === 'own' && !r.free)
+        .reduce((a, r) => a + r.usd, 0);
+    const untracked = ownMonth - tagged >= 0.01 ? ownMonth - tagged : 0;
+    const total = sessions.reduce((a, e) => a + (e.own_usd ?? 0), 0) + untracked;
+    const earlier = 'Earlier this month, not per chat';
+    return (_jsxs("div", { className: "flex flex-col gap-2 border-t border-border/60 pb-3 first:border-t-0", children: [_jsx(SettingField, { label: "Spent on your keys", info: "Each chat and run your own key or plan paid for, by its last use.", className: "border-t-0", end: _jsx(ToggleGroup, { type: "single", variant: "outline", size: "sm", spacing: 0, value: range, "aria-label": "Range", onValueChange: (v) => v && setRange(v), children: OWN_RANGES.map((r) => (_jsx(ToggleGroupItem, { value: r.id, "aria-label": `Last ${r.id}`, children: r.id }, r.id))) }) }), sessions.length || untracked ? (_jsx(DetailsTable, { head: [
                     { label: 'Session', grow: true },
                     { label: 'Date', hideOnPhone: true },
                     { label: 'Amount', right: true },
-                ], rows: sessions.map((e) => ({
-                    key: e.id,
-                    cells: [
-                        _jsx("span", { className: "block truncate", title: e.title, children: e.title }, "n"),
-                        _jsx("time", { dateTime: new Date(e.at).toISOString(), title: new Date(e.at).toLocaleString(), children: when(e.at) }, "t"),
-                        usd(e.own_usd ?? 0),
-                    ],
-                })), foot: ['Total', _jsx("span", { className: "max-md:hidden" }, "d"), usd(total)] })) : (_jsxs("p", { className: "text-muted-foreground text-sm", children: ["Nothing spent on your keys in the last ", range, "."] }))] }));
+                ], rows: [
+                    ...sessions.map((e) => ({
+                        key: e.id,
+                        cells: [
+                            _jsx("span", { className: "block truncate", title: e.title, children: e.title }, "n"),
+                            _jsx("time", { dateTime: new Date(e.at).toISOString(), title: new Date(e.at).toLocaleString(), children: when(e.at) }, "t"),
+                            usd(e.own_usd ?? 0),
+                        ],
+                    })),
+                    ...(untracked
+                        ? [
+                            {
+                                key: 'earlier',
+                                cells: [
+                                    _jsx("span", { className: "block truncate text-muted-foreground", title: earlier, children: earlier }, "n"),
+                                    _jsx("span", {}, "t"),
+                                    usd(untracked),
+                                ],
+                            },
+                        ]
+                        : []),
+                ], foot: ['Total', _jsx("span", { className: "max-md:hidden" }, "d"), usd(total)] })) : (_jsxs("p", { className: "text-muted-foreground text-sm", children: ["Nothing spent on your keys in the last ", range, "."] }))] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@columenlabs/lumen-ui",
-  "version": "0.1.242",
+  "version": "0.1.243",
   "description": "Lumen: shared React components (frame, views, widgets, charts, drawers).",
   "license": "MIT",
   "type": "module",
@@ -49,7 +49,7 @@
     "@codemirror/lang-javascript": "6.2.5",
     "@codemirror/lang-json": "6.0.2",
     "@codemirror/lang-sql": "6.10.0",
-    "@columenlabs/lumen-ui-types": "0.1.242",
+    "@columenlabs/lumen-ui-types": "0.1.243",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "10.0.0",
     "@dnd-kit/utilities": "3.2.2",