@columenlabs/lumen-ui 0.1.230 → 0.1.232

package/dist/assistant/copy.js

@@ -72,6 +72,8 @@ function itemMarkdown(i, depth, name) {
             ].join('\n\n');
         case 'advice':
             return `_${i.error ? 'Could not ask' : 'Asked'} ${i.label} for advice._`;
+        case 'fresh':
+            return '_Offered a fresh chat for this._';
         case 'compacted':
             return '_Compacted._';
         case 'stopped':

package/dist/assistant/lumen-assistant.js

@@ -193,9 +193,9 @@ export function LumenAssistant({ client, context, onSettings, keepDays = 30, cha
                             title: c.title,
                             updated_at: new Date(c.at).toISOString(),
                             ...(chatScope && allScopes && c.scope ? { where: chatScope.name?.(c.scope) } : {}),
-                        })) ?? (chats.isFetched ? [] : null), value: chat.chatId ?? undefined, toggle: chatScope && { label: chatScope.label, on: allScopes, onChange: setAllScopes }, note: `Chats are kept ${keepDays} days after their last message.`, onRefresh: () => void chats.refetch(), onOpen: (c) => void chat.open(c.id) }), _jsx(IconButton, { icon: CopyIcon, label: "Copy chat", disabled: !chat.items.length, onClick: () => copyMarkdown(chatMarkdown(chat.title, chat.items, name), 'Chat') }), _jsx(IconButton, { icon: PlusIcon, label: "New chat", disabled: !chat.items.length, onClick: chat.reset }), onClose && (_jsx(IconButton, { icon: XIcon, label: `Close ${s?.name ?? 'assistant'}`, onClick: onClose }))] }), _jsx(AssistantName.Provider, { value: name, children: _jsx(Screen.Provider, { value: controls, children: _jsx(ImageTool.Provider, { value: imageTool ?? null, children: _jsx(Messages, { chat: chat, status: s, onSettings: onSettings, onRetry: (at, user) => chat.retry(at, user, extra()) }) }) }) }), _jsx(LumenComposer, { name: s?.name ?? 'the assistant', busy: chat.busy, queued: chat.queued, queue: chat.queue, canSteer: chat.canSteer, onSteerQueued: chat.steerQueued, onUnqueue: chat.unqueue, disabled: !s || !!s.wait, commands: allCommands, tiers: tiers, sources: allSources, page: context?.label, images: images, modes: modes, onSend: (text, more, how) => chat.send(text, { ...extra(), ...more }, how), onStop: chat.stop }), _jsx(UsageLine, { usage: chat.usage, client: client, spent: s?.spend.usd, compactAt: compactAt })] }));
+                        })) ?? (chats.isFetched ? [] : null), value: chat.chatId ?? undefined, toggle: chatScope && { label: chatScope.label, on: allScopes, onChange: setAllScopes }, note: `Chats are kept ${keepDays} days after their last message.`, onRefresh: () => void chats.refetch(), onOpen: (c) => void chat.open(c.id) }), _jsx(IconButton, { icon: CopyIcon, label: "Copy chat", disabled: !chat.items.length, onClick: () => copyMarkdown(chatMarkdown(chat.title, chat.items, name), 'Chat') }), _jsx(IconButton, { icon: PlusIcon, label: "New chat", disabled: !chat.items.length, onClick: chat.reset }), onClose && (_jsx(IconButton, { icon: XIcon, label: `Close ${s?.name ?? 'assistant'}`, onClick: onClose }))] }), _jsx(AssistantName.Provider, { value: name, children: _jsx(Screen.Provider, { value: controls, children: _jsx(ImageTool.Provider, { value: imageTool ?? null, children: _jsx(Messages, { chat: chat, status: s, onSettings: onSettings, onRetry: (at, user) => chat.retry(at, user, extra()), onFresh: (choice) => chat.fresh(choice, extra()) }) }) }) }), _jsx(LumenComposer, { name: s?.name ?? 'the assistant', busy: chat.busy, queued: chat.queued, queue: chat.queue, canSteer: chat.canSteer, onSteerQueued: chat.steerQueued, onUnqueue: chat.unqueue, disabled: !s || !!s.wait, commands: allCommands, tiers: tiers, sources: allSources, page: context?.label, images: images, modes: modes, onSend: (text, more, how) => chat.send(text, { ...extra(), ...more }, how), onStop: chat.stop }), _jsx(UsageLine, { usage: chat.usage, client: client, spent: s?.spend.usd, compactAt: compactAt })] }));
 }
-function Messages({ chat, status, onSettings, onRetry, }) {
+function Messages({ chat, status, onSettings, onRetry, onFresh, }) {
     const end = useRef(null);
     const box = useRef(null);
     const count = JSON.stringify(chat.items).length;
@@ -214,7 +214,7 @@ function Messages({ chat, status, onSettings, onRetry, }) {
                                     status.allowance &&
                                     status.allowance.request?.status !== 'open'
                                     ? 'Request more'
-                                    : 'Open Settings' }))] })] })), chat.loading ? (_jsxs("p", { className: "flex items-center gap-2 text-muted-foreground text-sm", children: [_jsx(Spinner, {}), " Loading the chat\u2026"] })) : chat.items.length === 0 && !status?.wait ? (_jsxs("p", { className: "pt-8 text-center text-muted-foreground text-sm", children: ["Ask ", status?.name ?? 'the assistant', " anything."] })) : (_jsx(TierNames.Provider, { value: (id) => status?.tiers.find((t) => t.id === id)?.label ?? id, children: _jsx(UndoWrite.Provider, { value: chat.undo, children: _jsx(RetryTurn.Provider, { value: chat.busy || status?.wait ? null : onRetry, children: _jsx(Items, { items: chat.items, onSettle: chat.settle, busy: chat.busy, turns: true }) }) }) })), chat.busy && !chat.items.some(isLive) && (_jsxs("p", { className: "flex items-center gap-2 py-1 text-muted-foreground text-sm", children: [_jsx(Spinner, {}), " Thinking\u2026"] })), _jsx("div", { ref: end })] }));
+                                    : 'Open Settings' }))] })] })), chat.loading ? (_jsxs("p", { className: "flex items-center gap-2 text-muted-foreground text-sm", children: [_jsx(Spinner, {}), " Loading the chat\u2026"] })) : chat.items.length === 0 && !status?.wait ? (_jsxs("p", { className: "pt-8 text-center text-muted-foreground text-sm", children: ["Ask ", status?.name ?? 'the assistant', " anything."] })) : (_jsx(TierNames.Provider, { value: (id) => status?.tiers.find((t) => t.id === id)?.label ?? id, children: _jsx(UndoWrite.Provider, { value: chat.undo, children: _jsx(RetryTurn.Provider, { value: chat.busy || status?.wait ? null : onRetry, children: _jsx(FreshChoice.Provider, { value: chat.busy ? null : onFresh, children: _jsx(Items, { items: chat.items, onSettle: chat.settle, busy: chat.busy, turns: true }) }) }) }) })), chat.busy && !chat.items.some(isLive) && (_jsxs("p", { className: "flex items-center gap-2 py-1 text-muted-foreground text-sm", children: [_jsx(Spinner, {}), " Thinking\u2026"] })), _jsx("div", { ref: end })] }));
 }
 const isLive = (i) => !!i.live || (i.kind === 'handoff' && i.items.some(isLive));
 const WAIT = {
@@ -243,6 +243,16 @@ const TierNames = createContext((id) => id);
 /** The app's image tool (`LumenAssistant` `imageTool`). */
 const ImageTool = createContext(null);
 const UndoWrite = createContext(null);
+/** Answers the fresh-chat card; null while an answer runs. */
+const FreshChoice = createContext(null);
+/**
+ * The app asks before answering: the message above starts new work and this chat is long, so a
+ * fresh chat answers it faster and for less. ＋ takes it there, × keeps it here.
+ */
+function FreshCard() {
+    const choose = useContext(FreshChoice);
+    return (_jsxs("div", { "data-slot": "assistant-fresh", className: "flex min-w-0 items-center gap-2 rounded-lg border bg-card py-2 pr-2 pl-3 text-sm", children: [_jsx("span", { className: "min-w-0 flex-1", children: "This looks like new work. Start a fresh chat for it?" }), choose && (_jsxs("span", { className: "flex shrink-0 gap-1", children: [_jsx(IconButton, { icon: XIcon, label: "Keep it in this chat", onClick: () => choose('stay') }), _jsx(IconButton, { icon: PlusIcon, label: "New chat with this message", variant: "default", onClick: () => choose('new') })] }))] }));
+}
 /** Sends a failed turn again; null while it can't (an answer runs, nobody can pay). */
 const RetryTurn = createContext(null);
 /** Where a turn's unretried error sits in the chat, when the turn starts with a message. */
@@ -310,6 +320,8 @@ function Item({ item, onSettle, busy, }) {
                             : `Asked ${item.label}`] }));
         case 'compacted':
             return _jsx(Rule, { children: "Compacted: earlier messages are sent as a summary" });
+        case 'fresh':
+            return _jsx(FreshCard, {});
         case 'stopped':
             return _jsx(Rule, { children: item.reason === 'cap' ? "Stopped at this month's spend cap" : 'Stopped' });
         case 'error':

package/dist/assistant/settings.js

@@ -121,7 +121,8 @@ const mark = (label) => _jsx(ConnectionLogo, { text: label.charAt(0) });
 function OwnProviderKey({ client, p }) {
     const { apply, refresh } = useApply(client);
     const ways = [];
-    if (p.signin === 'chatgpt')
+    const may = (w) => !p.own_ways || p.own_ways.includes(w);
+    if (p.signin === 'chatgpt' && (may('plan') || p.plan?.set))
         ways.push({
             id: 'plan',
             label: 'ChatGPT plan',
@@ -138,27 +139,37 @@ function OwnProviderKey({ client, p }) {
             removeText: 'Your API key, if you set one, runs from then on.',
             removeLabel: 'Sign out',
         });
-    ways.push({
-        id: 'key',
-        label: 'API key',
-        icon: KeyRoundIcon,
-        info: `Your own ${p.label} key, billed by ${p.label}.`,
-        set: p.own.set,
-        ident: p.own.hint,
-        test: wayTest(p.own),
-        fields: [{ id: 'key', label: `${p.label} API key`, secret: true, prefix: p.prefix }],
-        getUrl: p.keys_url,
-        onSave: (v) => apply(`own:${p.id}`, () => client.ownKey(p.id, v.key ?? ''), 'Key saved'),
-        onTest: () => client.testOwnKey(p.id, 'key').finally(refresh),
-        onRemove: () => apply(`own:${p.id}`, () => client.ownKey(p.id, null), 'Key removed'),
-        removeTitle: `Remove your ${p.label} key?`,
-    });
+    if (may('key') || p.own.set)
+        ways.push({
+            id: 'key',
+            label: 'API key',
+            icon: KeyRoundIcon,
+            info: `Your own ${p.label} key, billed by ${p.label}.`,
+            set: p.own.set,
+            ident: p.own.hint,
+            test: wayTest(p.own),
+            fields: [{ id: 'key', label: `${p.label} API key`, secret: true, prefix: p.prefix }],
+            getUrl: p.keys_url,
+            onSave: (v) => apply(`own:${p.id}`, () => client.ownKey(p.id, v.key ?? ''), 'Key saved'),
+            onTest: () => client.testOwnKey(p.id, 'key').finally(refresh),
+            onRemove: () => apply(`own:${p.id}`, () => client.ownKey(p.id, null), 'Key removed'),
+            removeTitle: `Remove your ${p.label} key?`,
+        });
     return (_jsx(LumenConnection, { id: p.id, name: p.label, logo: mark(p.label), ways: ways, use: p.use, onUse: (use) => apply(`use:${p.id}`, () => client.settings({ own_use: { [p.id]: use } })) }));
 }
 /** A person's own keys, one row a provider, and what they may spend on them. */
 function Providers({ client }) {
     const { apply } = useApply(client);
-    return (_jsx(WithStatus, { client: client, children: (s) => (_jsxs("div", { className: "flex flex-col", children: [_jsx(LumenExpandList, { children: s.providers.map((p) => (_jsx(OwnProviderKey, { client: client, p: p }, p.id))) }), s.providers.some((p) => p.own.set || p.plan?.set) && (_jsx(Row, { 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)) }) }))] })) }));
+    return (_jsx(WithStatus, { client: client, children: (s) => {
+            // A provider the app gives this person no way of their own on shows no row, unless one is
+            // still set (so it can be removed).
+            const rows = s.providers.filter((p) => !p.own_ways || p.own_ways.length > 0 || p.own.set || p.plan?.set);
+            const ownSet = rows.some((p) => p.own.set || p.plan?.set);
+            return (_jsxs("div", { className: "flex flex-col", children: [_jsx(LumenExpandList, { children: rows.map((p) => (_jsx(OwnProviderKey, { client: client, p: p }, p.id))) }), ownSet && (_jsx(Row, { 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(Row, { 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)) }) }))] }));
+        } }));
 }
 /** One provider's shared key, which an admin sets for everyone. */
 function SharedProviderKey({ client, p }) {

package/dist/assistant/use-assistant-chat.d.ts

@@ -52,6 +52,11 @@ export interface AssistantChatState {
     undo: (step: StepItem) => Promise<void>;
     /** A screen call ended in the browser: shown on its chip, and sent with the next message. */
     screenEnded: (outcome: AssistantScreenOutcome) => void;
+    /**
+     * Answers the fresh-chat card (`fresh` item): `new` sends its message in a new chat, `stay`
+     * sends it here again, kept in this chat.
+     */
+    fresh: (choice: 'new' | 'stay', extra?: Extra) => void;
 }
 /** A copy of the items with one event applied (hand-off sections copied too). */
 export declare function applyEvent(prev: LiveItem[], e: AssistantEvent): LiveItem[];

package/dist/assistant/use-assistant-chat.js

@@ -33,6 +33,19 @@ function keepOutcomes(m) {
 }
 let queuedSeq = 0;
 const queuedId = () => `q${++queuedSeq}`;
+/** What a sent message carried besides its words, to send it again (Retry, a fresh chat). */
+function resendOf(user) {
+    const images = (user.images ?? []).flatMap((src) => {
+        const m = /^data:([^;]+);base64,(.*)$/.exec(src);
+        return m ? [{ media_type: m[1], data: m[2] }] : [];
+    });
+    return {
+        ...(user.refs?.length ? { refs: user.refs } : {}),
+        ...(user.quote ? { quote: user.quote } : {}),
+        ...(user.tier ? { tier: user.tier } : {}),
+        ...(images.length ? { images } : {}),
+    };
+}
 /** Where an event lands: the chat, or the last hand-off section when it came from inside one. */
 function sinkOf(items, handoff) {
     if (!handoff)
@@ -119,6 +132,9 @@ export function applyEvent(prev, e) {
         case 'compacted':
             items.push({ kind: 'compacted' });
             break;
+        case 'fresh':
+            items.push({ kind: 'fresh' });
+            break;
         case 'stopped':
             items.push({ kind: 'stopped', ...(e.data.reason ? { reason: e.data.reason } : {}) });
             break;
@@ -305,17 +321,34 @@ export function useAssistantChat(client) {
         if (abort.current)
             return;
         setItems((p) => p.map((x, i) => (i === at && x.kind === 'error' ? { ...x, retried: true } : x)));
-        const images = (user.images ?? []).flatMap((src) => {
-            const m = /^data:([^;]+);base64,(.*)$/.exec(src);
-            return m ? [{ media_type: m[1], data: m[2] }] : [];
-        });
-        void run(user.text, {
-            ...extra,
-            ...(user.refs?.length ? { refs: user.refs } : {}),
-            ...(user.quote ? { quote: user.quote } : {}),
-            ...(user.tier ? { tier: user.tier } : {}),
-            ...(images.length ? { images } : {}),
-        }, true);
+        void run(user.text, { ...extra, ...resendOf(user) }, true);
+    }, [run]);
+    const itemsRef = useRef([]);
+    itemsRef.current = items;
+    const fresh = useCallback((choice, extra) => {
+        if (abort.current)
+            return;
+        const list = itemsRef.current;
+        const card = list.findLastIndex((i) => i.kind === 'fresh');
+        const at = list.findLastIndex((i, n) => n < card && i.kind === 'user');
+        const user = list[at];
+        if (card < 0 || user?.kind !== 'user')
+            return;
+        if (choice === 'new') {
+            // A new chat, as New chat makes one, and the message is its first.
+            setQueue([]);
+            setChatId(null);
+            idRef.current = null;
+            setTitle('');
+            setItems([]);
+            setUsage(null);
+            void run(user.text, { ...extra, ...resendOf(user) });
+        }
+        else {
+            // The message goes again in its place, without the card.
+            setItems((p) => p.slice(0, at));
+            void run(user.text, { ...extra, ...resendOf(user), stay: true });
+        }
     }, [run]);
     const steerQueued = useCallback((id) => {
         const m = queueRef.current.find((x) => x.id === id && !x.steering);
@@ -424,5 +457,6 @@ export function useAssistantChat(client) {
         settle,
         undo,
         screenEnded,
+        fresh,
     };
 }

package/package.json

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