@columenlabs/lumen-ui 0.1.251 → 0.1.253

package/dist/assistant/lumen-assistant.js

@@ -386,9 +386,9 @@ function pathOf(url) {
 /** A web step: a search, its results folded under it, or one page read. */
 function WebStep({ step, live }) {
     const web = step.web ?? {};
-    const results = web.results ?? [];
+    const results = (web.lookup ? web.reads : web.results) ?? [];
     const icon = live ? (_jsx(Spinner, { className: "size-3" })) : !step.ok ? (_jsx(CircleAlertIcon, { className: "size-3.5 shrink-0" })) : web.read ? (_jsx(GlobeIcon, { className: "size-3.5 shrink-0" })) : (_jsx(SearchIcon, { className: "size-3.5 shrink-0" }));
-    const line = (_jsxs(_Fragment, { children: [icon, web.tried ? (_jsxs("span", { className: "truncate", title: web.tried.url, children: ["Could not open ", _jsx("span", { className: "text-foreground", children: hostOf(web.tried.url) })] })) : web.read ? (_jsxs("span", { className: "truncate", title: web.read.title ?? web.read.url, children: ["Read ", _jsx("span", { className: "text-foreground", children: hostOf(web.read.url) }), pathOf(web.read.url) && ` · ${pathOf(web.read.url)}`] })) : (_jsxs("span", { className: "truncate", title: web.query, children: ["Searched the web", web.query ? ': ' : '', web.query && _jsx("span", { className: "text-foreground", children: web.query })] })), !live && !web.read && !web.tried && step.ok && (_jsxs("span", { className: "ml-auto shrink-0 tabular-nums", children: [results.length, " result", results.length === 1 ? '' : 's'] })), step.error && _jsxs("span", { className: "truncate", children: ["\u00B7 ", step.error] })] }));
+    const line = (_jsxs(_Fragment, { children: [icon, web.tried ? (_jsxs("span", { className: "truncate", title: web.tried.url, children: ["Could not open ", _jsx("span", { className: "text-foreground", children: hostOf(web.tried.url) })] })) : web.read ? (_jsxs("span", { className: "truncate", title: web.read.title ?? web.read.url, children: ["Read ", _jsx("span", { className: "text-foreground", children: hostOf(web.read.url) }), pathOf(web.read.url) && ` · ${pathOf(web.read.url)}`] })) : (_jsxs("span", { className: "truncate", title: web.query, children: [web.lookup ? 'Looked up' : 'Searched the web', web.query ? ': ' : '', web.query && _jsx("span", { className: "text-foreground", children: web.query })] })), !live && !web.read && !web.tried && step.ok && (_jsxs("span", { className: "ml-auto shrink-0 tabular-nums", children: [results.length, " ", web.lookup ? 'source' : 'result', results.length === 1 ? '' : 's'] })), step.error && _jsxs("span", { className: "truncate", children: ["\u00B7 ", step.error] })] }));
     const cls = cn('flex min-w-0 items-center gap-1.5 text-xs', step.ok ? 'text-muted-foreground' : 'text-loss');
     if (!results.length)
         return _jsx("p", { className: cls, children: line });
@@ -401,8 +401,10 @@ function turnPages(items) {
         for (const i of list) {
             if (i.kind === 'handoff')
                 walk(i.items);
-            else if (i.kind === 'step' && i.web?.read && !pages.some((p) => p.url === i.web?.read?.url))
-                pages.push(i.web.read);
+            else if (i.kind === 'step')
+                for (const p of i.web?.read ? [i.web.read] : (i.web?.reads ?? []))
+                    if (!pages.some((x) => x.url === p.url))
+                        pages.push(p);
         }
     };
     walk(items);

package/dist/assistant/usage-history.js

@@ -135,20 +135,28 @@ export function OwnKeyUsage({ client, always, usable, }) {
     const left = ownMonth - tagged - removed;
     const untracked = left >= 0.01 ? left : 0;
     const gone = removed >= 0.01 ? removed : 0;
-    const total = sessions.reduce((a, e) => a + (e.own_usd ?? 0), 0) + untracked + gone;
+    // A plan sign-in's calls at API rates (an estimate; the plan charged $0), so plan use counts too.
+    const planRows = now.rows.filter((r) => r.payer === 'own' && !r.free && (r.way === 'plan' || (!r.way && r.usd < 0.0005)));
+    const planListMonth = planRows.reduce((a, r) => a + (r.list_usd ?? 0), 0);
+    const planListEarlier = Math.max(0, planListMonth - now.entries.reduce((a, e) => a + (e.own_plan_usd ?? 0), 0));
+    const keyTotal = sessions.reduce((a, e) => a + (e.own_usd ?? 0), 0) + untracked + gone;
+    const planTotal = sessions.reduce((a, e) => a + (e.own_plan_usd ?? 0), 0);
     const earlier = 'Earlier this month, not per chat';
     const removedText = 'Key not in use now, not counted';
     // Calls a plan sign-in paid: free to the person, so listed by count. A $0 own row from before
     // rows recorded their way is a plan's too (a key call always costs something).
-    const planCalls = now.rows
-        .filter((r) => r.payer === 'own' && !r.free && (r.way === 'plan' || (!r.way && r.usd < 0.0005)))
-        .reduce((a, r) => a + r.calls, 0);
+    const planCalls = planRows.reduce((a, r) => a + r.calls, 0);
     const calls = (n) => (n === 1 ? '1 call' : `${n} calls`);
     // Plan calls no chat or run carries (made before each entry kept its own count).
     const planEarlier = Math.max(0, planCalls - now.entries.reduce((a, e) => a + (e.own_plan_calls ?? 0), 0));
     const planText = `Earlier, ${PLAN_NAME}, ${calls(planEarlier)}`;
     const named = (e) => e.own_plan_calls ? `${e.title} · ${PLAN_NAME}, ${calls(e.own_plan_calls)}` : e.title;
-    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 || gone || planEarlier ? (_jsx(DetailsTable, { head: [
+    const total = keyTotal + planTotal + (planEarlier ? planListEarlier : 0);
+    const anyPlan = planTotal > 0 || (planEarlier > 0 && planListEarlier > 0);
+    // An amount with plan calls in it reads ≈: the plan's part is what API rates would charge.
+    const amount = (key, plan, title) => plan > 0 ? (_jsxs("span", { title: title, children: ["\u2248", usd(key + plan)] }, "a")) : (usd(key));
+    const planTitle = (key, plan) => `${key > 0 ? `${usd(key)} on your key + ` : ''}about ${usd(plan)} at API rates on your ${PLAN_NAME}, which charged $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. A \u2248 amount prices plan calls at API rates; the plan charges $0.", 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 || gone || planEarlier ? (_jsx(DetailsTable, { head: [
                     { label: 'Session', grow: true },
                     { label: 'Date', hideOnPhone: true },
                     { label: 'Amount', right: true },
@@ -158,7 +166,7 @@ export function OwnKeyUsage({ client, always, usable, }) {
                         cells: [
                             _jsx("span", { className: "block truncate", title: named(e), children: named(e) }, "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),
+                            amount(e.own_usd ?? 0, e.own_plan_usd ?? 0, planTitle(e.own_usd ?? 0, e.own_plan_usd ?? 0)),
                         ],
                     })),
                     ...(untracked
@@ -192,10 +200,16 @@ export function OwnKeyUsage({ client, always, usable, }) {
                                 cells: [
                                     _jsx("span", { className: "block truncate text-muted-foreground", title: planText, children: planText }, "n"),
                                     _jsx("span", {}, "t"),
-                                    usd(0),
+                                    amount(0, planListEarlier, planTitle(0, planListEarlier)),
                                 ],
                             },
                         ]
                         : []),
-                ], 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, "."] }))] }));
+                ], foot: [
+                    'Total',
+                    _jsx("span", { className: "max-md:hidden" }, "d"),
+                    anyPlan
+                        ? amount(keyTotal, total - keyTotal, planTitle(keyTotal, total - keyTotal))
+                        : 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.251",
+  "version": "0.1.253",
   "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.251",
+    "@columenlabs/lumen-ui-types": "0.1.253",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "10.0.0",
     "@dnd-kit/utilities": "3.2.2",