@columenlabs/lumen-ui 0.1.242 → 0.1.244

package/README.md

@@ -59,7 +59,7 @@ Use `createDeskQueryClient()` for the app's TanStack Query client: data stays fr
 
 ## What's inside
 
-**Frame.** `LumenShell` (sidebar with icons-only collapse and a drawer on phone, header, status bar, Settings, profile menu, ⌘K Find), `LumenAppSwitcher` and `LumenSuiteSwitcher` (groups, apps on other sites, a list read from an address), `WhatsNew` (release notes in a drawer), `TasksButton` and `TasksProvider` (background work in the header), `NotificationsSettings`, `McpSettings`, sign-in screens (`LumenAuthStage`, `LumenSecondStep`, `LumenSignInMethods`, `LumenBackupCodes`, `LumenBotCheck` for Cloudflare Turnstile, `authErrorText` for errors in plain words), `StatusHealth`, `LumenBoundary` (keeps a crash inside its card), `LumenPageState` (loading, empty and error), `lumenToast`.
+**Frame.** `LumenShell` (sidebar with icons-only collapse and a drawer on phone, header, status bar, Settings, profile menu, ⌘K Find; `LumenFinder` mounts Find on its own for an app that draws its own frame, with commands from `useLumenFinderRows`), `LumenAppSwitcher` and `LumenSuiteSwitcher` (groups, apps on other sites, a list read from an address), `WhatsNew` (release notes in a drawer), `TasksButton` and `TasksProvider` (background work in the header), `NotificationsSettings`, `McpSettings`, sign-in screens (`LumenAuthStage`, `LumenSecondStep`, `LumenSignInMethods`, `LumenBackupCodes`, `LumenBotCheck` for Cloudflare Turnstile, `authErrorText` for errors in plain words), `StatusHealth`, `LumenBoundary` (keeps a crash inside its card), `LumenPageState` (loading, empty and error), `lumenToast`.
 
 **Pages and views.** `LumenLayout` (a page of cards from one view config: filter, tiles, widgets; Edit layout and Edit widget when you pass `onConfigChange`; a card with `header: false` is its body alone), `LumenGrid` (the 6-column grid under it), `LumenView` and `LumenViewCard` (a table that filters, groups, pivots and totals the rows you load), `LumenTable`, `LumenTokenizedFilter`, `LumenWidget` and `LumenSavedWidget` (the frame every card sits in, with its link square and controls), `LumenCard` (one number and its lines), `LumenPager`, `DetailsTable`, `LumenTree`, `LumenCalendar` (events by month, week or agenda, in a time zone), `LumenBoard` (items in columns by stage), `useAppView` (a page whose layout each person can change and reset).
 

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/dist/index.d.ts

@@ -117,6 +117,6 @@ export { LumenChart, type LumenChartOptions, type MineIndicators, SymbolChartPro
 export { SymbolSheetProvider } from './symbol-sheet.js';
 export { useSymbolSheet } from './symbol-sheet-context.js';
 export { NoteLine, type NoteLineProps } from './note-line.js';
-export { type LumenFinderConfig, type LumenFinderPageType, type LumenFinderRow, type LumenFinderScope, LumenFinderButton, useLumenFinder, useLumenFinderRows, useOpenLumenFinder, } from './lumen-finder.js';
+export { type LumenFinderConfig, type LumenFinderPageType, type LumenFinderRow, type LumenFinderScope, LumenFinder, LumenFinderButton, useLumenFinder, useLumenFinderRows, useOpenLumenFinder, } from './lumen-finder.js';
 export { type AssistantChat, LumenAssistantButton, LumenAssistantChats, LumenAssistantPanel, assistantOpen, tabState, useAssistantHotkey, } from './assistant-panel.js';
 export { LumenTree, LumenTreeItem, type LumenTreeItemProps, type LumenTreeProps, useLumenTree, } from './lumen-tree.js';

package/dist/index.js

@@ -124,6 +124,6 @@ export { LumenChart, SymbolChartProvider, useLumenChart, useSymbolChart, } from
 export { SymbolSheetProvider } from './symbol-sheet.js';
 export { useSymbolSheet } from './symbol-sheet-context.js';
 export { NoteLine } from './note-line.js';
-export { LumenFinderButton, useLumenFinder, useLumenFinderRows, useOpenLumenFinder, } from './lumen-finder.js';
+export { LumenFinder, LumenFinderButton, useLumenFinder, useLumenFinderRows, useOpenLumenFinder, } from './lumen-finder.js';
 export { LumenAssistantButton, LumenAssistantChats, LumenAssistantPanel, assistantOpen, tabState, useAssistantHotkey, } from './assistant-panel.js';
 export { LumenTree, LumenTreeItem, useLumenTree, } from './lumen-tree.js';

package/dist/lumen-finder.d.ts

@@ -46,7 +46,11 @@ export declare function useLumenFinderRows(rows: LumenFinderRow[] | null): void;
 type Icon = ComponentType<{
     className?: string;
 }>;
-/** Find for the shell: ⌘K, the rows apps add and the dialog. LumenShell mounts it. */
+/**
+ * Find: ⌘K, the rows apps add and the dialog. LumenShell mounts it; an app that draws its own frame
+ * (a full-screen editor) mounts it around its screen instead and adds its commands with
+ * `useLumenFinderRows`. No router is needed there: rows run, or follow plain links.
+ */
 export declare function LumenFinder({ app, settings, openSettings, config, children, }: {
     app: string;
     settings: {

package/dist/lumen-finder.js

@@ -162,7 +162,11 @@ function useShellRows(open, query, settings, openSettings, app, pageTypes, setti
         ]
         : base, [base, assistant, q]);
 }
-/** Find for the shell: ⌘K, the rows apps add and the dialog. LumenShell mounts it. */
+/**
+ * Find: ⌘K, the rows apps add and the dialog. LumenShell mounts it; an app that draws its own frame
+ * (a full-screen editor) mounts it around its screen instead and adds its commands with
+ * `useLumenFinderRows`. No router is needed there: rows run, or follow plain links.
+ */
 export function LumenFinder({ app, settings, openSettings, config, children, }) {
     const pageTypes = config?.pageTypes ?? NO_TYPES;
     const settingsScope = config?.settingsScope ?? 'Settings';
@@ -218,7 +222,9 @@ export function LumenFinder({ app, settings, openSettings, config, children, })
 }
 function FinderDialog({ app, open, onOpenChange, query, onQuery, scope, onScope, scopes, placeholder, groups, }) {
     const mobile = useIsMobile();
-    const router = useRouter();
+    // Optional: an app without TanStack Router (a single-screen tool) still gets Find; its rows run or
+    // go by plain links.
+    const router = useRouter({ warn: false });
     const list = useRef(null);
     const input = useRef(null);
     // Focus without scrolling: on a phone iOS pans the page to a focused field as the keyboard opens,
@@ -241,8 +247,8 @@ function FinderDialog({ app, open, onOpenChange, query, onQuery, scope, onScope,
             return;
         const outside = /^https?:/.test(r.href);
         if (tab)
-            window.open(outside ? r.href : router.history.createHref(r.href), '_blank');
-        else if (outside)
+            window.open(outside || !router ? r.href : router.history.createHref(r.href), '_blank');
+        else if (outside || !router)
             window.location.assign(r.href);
         else
             void router.navigate({ href: r.href });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@columenlabs/lumen-ui",
-  "version": "0.1.242",
+  "version": "0.1.244",
   "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.244",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "10.0.0",
     "@dnd-kit/utilities": "3.2.2",