@hanzo/rooms 0.1.76 → 0.1.77

package/dist/Chat.js

@@ -33,7 +33,7 @@ import { Prose } from "./Prose.js";
 import { useAgent, useAi, useChat, } from "@hanzo/ai/react";
 import { freeCopy, grantConsent, hasConsent, isFree, } from "@hanzo/ai";
 import { ASK, Chat as ChatSurface, Failure, Parts, words } from "@hanzo/ui/chat";
-import { carriedIn, compose, partsOf, said as told, weigh } from "./lib/attach.js";
+import { carriedIn, carrying, compose, partsOf, said as told, weigh } from "./lib/attach.js";
 import { download, dropped, fileOf, pct, readable, refOf, retrieve } from "./lib/files.js";
 import { channel, drop, hold, landed, localOf, spend, take, usePane, useWorkFile } from "./pane.js";
 import { Face, brief as roomBrief, join, roleOf, roomTurn, roster as rosterLine, rosterOf, speakers, speaksOf, voiceOf } from "./cast.js";
@@ -49,7 +49,7 @@ import { app, dev, go } from "./lib/host.js";
 import { useRooms } from "./host.js";
 import { chats, house, paidPlan, paused, setCreditsAfterAllowance, useLimits } from "./lib/limits.js";
 import { LimitedBanner } from "@hanzo/ui/product/LimitedBanner";
-import { RESEARCH, WEB } from "./lib/web.js";
+import { WEB } from "./lib/web.js";
 import { useHydrated } from "./lib/hydrated.js";
 import { base, served } from "./lib/ai.js";
 import { onServed } from "./lib/served.js";
@@ -516,7 +516,17 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
     // What the conversation carries beside its words (@hanzo/build `useCarry`):
     // the skills picked from `+`, what Hanzo remembers and the mode, said at the
     // end of the room's system turn so every request carries them.
-    const carry = useCarry(target, open ?? "", (tab) => go(app(`-/customize/${tab}`)));
+    // What the plugins act on — the draft and the files held for the next message —
+    // read when they act, so it is lent through a ref filled further down.
+    const lent = useRef({ draft: "", setDraft: () => { }, attach: () => { } });
+    const carry = useCarry(target, open ?? "", (tab) => go(app(`-/customize/${tab}`)), {
+        get draft() {
+            return lent.current.draft;
+        },
+        setDraft: (x) => lent.current.setDraft(x),
+        attach: (f) => lent.current.attach(f),
+        go: (href) => (/^https?:/.test(href) ? void window.open(href, "_blank", "noopener,noreferrer") : go(href)),
+    });
     const agentShelf = useAgentShelf();
     // Up to three things worth doing next, from the person's own activity (@hanzo/build).
     const hints = useSuggestions(target);
@@ -716,7 +726,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
         // world, in any language, is answered from what the web says now and streams.
         params: {
             reasoning_effort: mind.effort,
-            ...(!anonymous && house(rowOf(model)?.family) ? { tools: carry.gear.gear.research ? [...WEB, RESEARCH] : WEB } : {}),
+            ...(!anonymous && house(rowOf(model)?.family) ? { tools: WEB } : {}),
         },
         ...(open ? { thread: open } : {}),
         onError: (e) => {
@@ -854,6 +864,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
     // read from it for the question.
     const { held: files, refused: turnedAway } = usePane(at);
     const via = useMemo(() => ({ api: ai, org: anonymous ? null : org() }), [ai, anonymous]);
+    lent.current = { draft, setDraft, attach: (f) => void hold(at, f, via) };
     // "Use in Chat" from the Library: `?attach=<item>` holds it for the next message.
     useAttach(at, via);
     // "Schedule this": the prompt the dialog opens on, or null while it is shut.
@@ -1140,15 +1151,55 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
      * while; past it the turn says the file is not readable yet rather than
      * answering as though it had been read.
      */
+    // WHAT THE PLUGINS THAT ARE ON ADD, asked just before a message goes: words
+    // the model reads with it (carried in the turn's own block, as files are), or
+    // an answer of the plugin's own, drawn as the reply without asking a model.
+    const [prepWrong, setPrepWrong] = useState(null);
+    const answered = (text, reply) => {
+        apply.current((held) => [
+            ...held,
+            { id: `u-${Date.now()}`, role: "user", content: text },
+            { id: `a-${Date.now()}`, role: "assistant", content: reply },
+        ]);
+        if (!anonymous)
+            void ai.threads
+                .record([{ role: "user", content: text }, { role: "assistant", content: reply }], open ?? undefined)
+                .then((id) => (!open && id ? reopen(id) : undefined))
+                .catch(() => { });
+    };
     const submit = () => {
         const text = draft.trim();
         if (preparing || (!text && !files.length))
             return;
+        if (!carry.preparing)
+            return deliver(text, "");
+        setDraft("");
+        setPrepWrong(null);
+        void (async () => {
+            setPreparing("Preparing");
+            try {
+                // The files held for this message, as bytes, for a plugin that reads them (PDF).
+                const bytes = await Promise.all(files.filter((h) => h.href).map(async (h) => new File([await (await fetch(h.href)).blob()], h.name, { type: h.type })));
+                const got = await carry.prep({ text, files: bytes, thread: open ?? "" }, new AbortController().signal);
+                if (got.reply && !got.system)
+                    return answered(text, got.reply);
+                deliver(text, got.system ?? "");
+            }
+            catch (e) {
+                setPrepWrong(e instanceof Error ? e.message : String(e));
+                setDraft(text);
+            }
+            finally {
+                setPreparing(null);
+            }
+        })();
+    };
+    const deliver = (text, extra) => {
         const holding = files.slice();
         const earlier = carriedIn(chat.messages);
         if (!holding.length && !earlier.length) {
             setDraft("");
-            guarded(text);
+            guarded(extra ? carrying(text, extra) : text);
             return;
         }
         setDraft("");
@@ -1163,7 +1214,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
                 const all = [...attached, ...reused];
                 if (!all.length) {
                     if (text)
-                        guarded(text);
+                        guarded(extra ? carrying(text, extra) : text);
                     else
                         setDraft(text);
                     return;
@@ -1180,7 +1231,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
                 }
                 if (!grounds?.passages.length)
                     why = why ?? unread(now);
-                guarded(compose(text, { attached, reused }, grounds, why, partly(now)));
+                guarded(compose(text, { attached, reused }, grounds, why, partly(now), extra));
             }
             finally {
                 setPreparing(null);
@@ -1257,7 +1308,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
     // just typed left the screen, and the first thing a stranger saw of the
     // product was a page about training data. The room stays; the sheet sits on
     // top of it, and the question is still there behind it.
-    const consent = asking === null ? null : (_jsx(Consent, { question: asking, onAgree: () => {
+    const consent = asking === null ? null : (_jsx(Consent, { question: told(asking).text, onAgree: () => {
             const s = store();
             // Nothing to persist into is not a reason to refuse the turn the
             // reader just agreed to; it means the question is asked again next
@@ -1426,7 +1477,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
                     },
                     // WHAT GOES WITH THE MESSAGE, above the frame and at its width: the
                     // pause and its ways past, one chip a file, and talk mode's words.
-                    head: files.length || turnedAway || preparing || talk.open || talk.refusal || pause ? (_jsxs(_Fragment, { children: [banner ? (_jsx(LimitedBanner, { message: banner.message, actions: banner.actions, onAction: act, onUsage: () => showSettings("usage") })) : null, actWrong ? (_jsx(Text, { role: "alert", "data-slot": "limited-banner-wrong", fontSize: "$2", color: BAD, children: actWrong })) : null, files.length ? (_jsx(XStack, { gap: "$1.5", flexWrap: "wrap", role: "list", "aria-label": "Attached files", "data-slot": "composer-attached", children: files.map((one) => (_jsx(HeldChip, { one: one, onOpen: openFile, onRemove: () => drop(at, one.id), onSave: anonymous ? undefined : (url, id) => keepOne(url, id, one.name, one.type) }, one.id))) })) : null, preparing ? (_jsxs(Text, { role: "status", "aria-live": "polite", "data-slot": "composer-preparing", fontSize: "$2", color: "$soft", children: [preparing, "\u2026"] })) : null, turnedAway ? (_jsx(Text, { role: "alert", fontSize: "$2", color: BAD, children: turnedAway })) : null, talk.open || talk.refusal ? (_jsx(Text, { role: "status", "aria-live": "polite", "data-slot": "composer-talk-reply", fontSize: "$2", color: talk.refusal ? BAD : "$soft", children: talk.refusal
+                    head: files.length || turnedAway || prepWrong || preparing || talk.open || talk.refusal || pause ? (_jsxs(_Fragment, { children: [banner ? (_jsx(LimitedBanner, { message: banner.message, actions: banner.actions, onAction: act, onUsage: () => showSettings("usage") })) : null, actWrong ? (_jsx(Text, { role: "alert", "data-slot": "limited-banner-wrong", fontSize: "$2", color: BAD, children: actWrong })) : null, files.length ? (_jsx(XStack, { gap: "$1.5", flexWrap: "wrap", role: "list", "aria-label": "Attached files", "data-slot": "composer-attached", children: files.map((one) => (_jsx(HeldChip, { one: one, onOpen: openFile, onRemove: () => drop(at, one.id), onSave: anonymous ? undefined : (url, id) => keepOne(url, id, one.name, one.type) }, one.id))) })) : null, preparing ? (_jsxs(Text, { role: "status", "aria-live": "polite", "data-slot": "composer-preparing", fontSize: "$2", color: "$soft", children: [preparing, "\u2026"] })) : null, turnedAway || prepWrong ? (_jsx(Text, { role: "alert", fontSize: "$2", color: BAD, children: turnedAway || prepWrong })) : null, talk.open || talk.refusal ? (_jsx(Text, { role: "status", "aria-live": "polite", "data-slot": "composer-talk-reply", fontSize: "$2", color: talk.refusal ? BAD : "$soft", children: talk.refusal
                                     ? worded(talk.refusal)
                                     : talk.reply
                                         ? `Hanzo: ${talk.reply}`
@@ -1441,6 +1492,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
                             upload: () => take(at, via),
                             agents: agentShelf,
                             skills: carry.skills,
+                            plugins: carry.plugins,
                             research: { on: carry.gear.gear.research, set: (on) => carry.gear.set({ research: on }) },
                             memory: { on: carry.gear.gear.memory, set: (on) => carry.gear.set({ memory: on }) },
                         },
@@ -1455,6 +1507,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
                         ...(anonymous ? [] : carry.on),
                     ],
                     slash: anonymous ? undefined : carry.skills,
+                    at: anonymous ? undefined : carry.plugins,
                     mode: anonymous ? null : { value: carry.gear.gear.mode, set: (m) => carry.gear.set({ mode: m }) },
                     // The model, the effort and the mode under the frame (@hanzo/build).
                     mind,
@@ -1466,7 +1519,7 @@ function Thread({ placeholder = message(), initial, anonymous = false, heading,
                     talk,
                     // While nothing has been said: what is worth doing next.
                     below: said.length === 0 && !anonymous ? _jsx(Suggestions, { rows: hints.rows, onPick: setDraft, onDismiss: hints.dismiss }) : undefined,
-                }) }), _jsx(AgentMaker, {}), isFree(model) ? (_jsx(XStack, { items: "center", justify: "center", py: "$1", px: "$3", borderTopWidth: 1, borderColor: "$borderColor", bg: "$background", children: _jsxs(Text, { fontSize: "$1", color: "$soft", children: ["Free chat is data-shared to train models. ", _jsx(Anchor, { href: site("/privacy"), fontSize: "$1", color: "$ink", children: "Privacy" })] }) })) : null, consent, _jsx(Upgrade, { ask: ask, onClose: () => setAsk(null) })] }));
+                }) }), _jsx(AgentMaker, {}), carry.dialog, isFree(model) ? (_jsx(XStack, { items: "center", justify: "center", py: "$1", px: "$3", borderTopWidth: 1, borderColor: "$borderColor", bg: "$background", children: _jsxs(Text, { fontSize: "$1", color: "$soft", children: ["Free chat is data-shared to train models. ", _jsx(Anchor, { href: site("/privacy"), fontSize: "$1", color: "$ink", children: "Privacy" })] }) })) : null, consent, _jsx(Upgrade, { ask: ask, onClose: () => setAsk(null) })] }));
 }
 /** The agreement free asks for, in @hanzo/ai's words so every surface says one thing. */
 function Consent({ question, onAgree, onCancel, }) {

package/dist/lib/attach.d.ts

@@ -28,7 +28,14 @@ export declare function weigh(bytes: number): string;
  * stored without indexing, or the read failed — so the model says so rather
  * than answering as though it had read the files.
  */
-export declare function compose(text: string, carried: Carried, grounds: Grounds | null, why?: string, partial?: string): string;
+export declare function compose(text: string, carried: Carried, grounds: Grounds | null, why?: string, partial?: string, extra?: string): string;
+/**
+ * The message as sent with what a plugin found for it (research, a PDF's text):
+ * the words, then the same block files ride in, holding no files, so it is
+ * drawn as the words alone and `lookup` reads the turn as carried, never
+ * searching it a second time.
+ */
+export declare function carrying(text: string, extra: string): string;
 /** A turn read back: the words a person wrote, and the files it carried. */
 export interface Said {
     text: string;

package/dist/lib/attach.js

@@ -38,7 +38,7 @@ const inert = (s) => s.split(CLOSE).join('</workspace files>');
  * stored without indexing, or the read failed — so the model says so rather
  * than answering as though it had read the files.
  */
-export function compose(text, carried, grounds, why, partial) {
+export function compose(text, carried, grounds, why, partial, extra) {
     const words = text.trim();
     const all = [...carried.attached, ...carried.reused];
     if (!all.length)
@@ -62,10 +62,23 @@ export function compose(text, carried, grounds, why, partial) {
     else {
         lines.push(`No passages could be read from them${why ? ` (${why})` : ''}: say so, and answer only what you can without them.`);
     }
+    if (extra)
+        lines.push('', inert(extra));
     lines.push(CLOSE);
     const block = lines.join('\n');
     return words ? `${words}\n\n${block}` : block;
 }
+/**
+ * The message as sent with what a plugin found for it (research, a PDF's text):
+ * the words, then the same block files ride in, holding no files, so it is
+ * drawn as the words alone and `lookup` reads the turn as carried, never
+ * searching it a second time.
+ */
+export function carrying(text, extra) {
+    const words = text.trim();
+    const block = [OPEN, JSON.stringify({ attached: [], reused: [] }), inert(extra), CLOSE].join('\n');
+    return words ? `${words}\n\n${block}` : block;
+}
 /** Takes the files block back off a turn, for drawing. */
 export function said(content) {
     const at = content.startsWith(`${OPEN}\n`) ? 0 : content.lastIndexOf(`\n${OPEN}\n`);

package/dist/lib/web.d.ts

@@ -37,12 +37,6 @@
 import { type ChatCompletionTool } from '@hanzo/ai';
 /** Pages a turn that names them reads. */
 export declare const PAGES = 3;
-/**
- * Research: beside `WEB`, a turn that carries this reads deeper — ten results
- * listed, five pages read — whatever its shape, and the model is asked for a
- * report that cites them.
- */
-export declare const RESEARCH: ChatCompletionTool;
 /** The two tools that mark a turn as one that may use the web. */
 export declare const WEB: ChatCompletionTool[];
 /**

package/dist/lib/web.js

@@ -41,9 +41,6 @@ export const PAGES = 3;
 /** Results a search lists, and how many of them it reads. */
 const LISTED = 6;
 const READ = 2;
-/** What Research lists and reads instead. */
-const DEEP_LISTED = 10;
-const DEEP_READ = 5;
 /** Characters of a page a search quotes, and a named page quotes. */
 const PAGE_CHARS = 3500;
 const CRAWL_CHARS = 6000;
@@ -56,21 +53,6 @@ const GATE = 8192;
 const SEARCH_MS = 20_000;
 const SKIM_MS = 10_000;
 const READ_MS = 25_000;
-/**
- * Research: beside `WEB`, a turn that carries this reads deeper — ten results
- * listed, five pages read — whatever its shape, and the model is asked for a
- * report that cites them.
- */
-export const RESEARCH = {
-    type: 'function',
-    function: {
-        name: 'research',
-        description: 'Research the question in depth on the live web and answer with a cited report.',
-        parameters: { type: 'object', properties: {}, required: [] },
-    },
-};
-/** The word a Research turn's model is given. */
-const REPORT = 'Research mode: answer with a detailed report — a short direct answer first, then the evidence under headings — citing each claim with the numbered sources above as [n](url). Say plainly where the sources disagree or fall short.';
 /** The two tools that mark a turn as one that may use the web. */
 export const WEB = [
     {
@@ -545,7 +527,7 @@ function pointed(text) {
 /** What the model is told of a page it was not given. */
 const withheld = (url) => `The person's message names ${label(url)}. It was not opened: opening an address like it can sign in, confirm, unsubscribe or spend a one-time link for them.`;
 /** Runs one search: the results, best first, and the text of the best pages. */
-async function search(call, q, lang, now, deep = false) {
+async function search(call, q, lang, now) {
     let found;
     try {
         found = await call('/v1/websearch', lang ? { q, language: lang } : { q }, SEARCH_MS);
@@ -554,11 +536,11 @@ async function search(call, q, lang, now, deep = false) {
         return unavailable(e);
     }
     const words = keywords(q);
-    const ranked = rank(found?.results ?? [], words).slice(0, deep ? DEEP_LISTED : LISTED);
+    const ranked = rank(found?.results ?? [], words).slice(0, LISTED);
     const head = `Web search for "${q}", ${stamp(now)}.`;
     if (!ranked.length)
         return `${head}\nNothing was found.`;
-    const pages = await Promise.all(ranked.slice(0, deep ? DEEP_READ : READ).map((r) => call('/v1/crawl', { url: r.url }, SKIM_MS)
+    const pages = await Promise.all(ranked.slice(0, READ).map((r) => call('/v1/crawl', { url: r.url }, SKIM_MS)
         .then((d) => (d?.success ? excerpt(d.data?.markdown ?? '', words, PAGE_CHARS) : ''))
         .catch(() => '')));
     const items = ranked.map((r, i) => {
@@ -581,19 +563,6 @@ async function read(call, url, words) {
         return `Could not read ${url}: ${e instanceof Error ? e.message : String(e)}.`;
     }
 }
-/** A Research turn is looked up whatever its shape: its own words, searched. Files and pictures still stay home. */
-function forced(messages, spoken) {
-    const last = messages.at(-1);
-    if (last?.role !== 'user')
-        return null;
-    const { text: said, carried } = told(textOf(last.content));
-    if (carried || pictured(last.content))
-        return null;
-    const plain = spell(said.trim().slice(0, GATE)).trim();
-    if (!plain)
-        return null;
-    return { pages: [], held: [], q: plain.slice(0, QUERY), lang: language(plain, spoken), about: keywords(plain) };
-}
 /**
  * The lookup the last turn needs, or null. A short follow-up ("and in
  * Moscow?") is read with the question before it, the way the person meant it.
@@ -698,8 +667,7 @@ export function researched(base, clock = () => new Date(), spoken = reader) {
         if (!asked.stream || !Array.isArray(asked.messages) || !WEB.every((t) => names.has(t.function.name)))
             return base(input, init);
         const { tools: _tools, tool_choice: _choice, ...bare } = asked;
-        const deep = names.has(RESEARCH.function.name);
-        const look = lookup(asked.messages, spoken()) ?? (deep ? forced(asked.messages, spoken()) : null);
+        const look = lookup(asked.messages, spoken());
         if (!look)
             return base(input, { ...init, body: JSON.stringify(bare) });
         // The reader's stop, and the stream's own cancel, end every request below.
@@ -727,10 +695,10 @@ export function researched(base, clock = () => new Date(), spoken = reader) {
         };
         const found = (await Promise.all([
             ...look.pages.map((u) => read(call, u, look.about)),
-            ...(look.q ? [search(call, look.q, look.lang, now, deep)] : []),
+            ...(look.q ? [search(call, look.q, look.lang, now)] : []),
             ...look.held.map(async (u) => withheld(u)),
         ])).join('\n\n');
-        const messages = primed(asked.messages, found, now, deep ? REPORT : '');
+        const messages = primed(asked.messages, found, now);
         const first = await send(messages);
         if (!streams(first))
             return first;
@@ -741,7 +709,7 @@ export function researched(base, clock = () => new Date(), spoken = reader) {
                     // results: asked once more, it answers. One that failed is not asked again.
                     const { said, failed } = await relay(first, out);
                     if (!said.trim() && !failed) {
-                        const again = await send(primed(asked.messages, found, now, deep ? `${REPORT}\n\n${SILENT}` : SILENT));
+                        const again = await send(primed(asked.messages, found, now, SILENT));
                         if (streams(again))
                             await relay(again, out);
                         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/rooms",
-  "version": "0.1.76",
+  "version": "0.1.77",
   "description": "The workspace rooms — Home, Chat, Inbox, Contacts, Meet, Cal, Drive, Board, Work, Bots — and the frame that holds them, once, for every Hanzo surface.",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
   "peerDependencies": {
     "@hanzo/ai": ">=0.6.23",
     "@hanzo/appearance": ">=0.2.6",
-    "@hanzo/build": ">=0.2.63",
+    "@hanzo/build": ">=0.2.64",
     "@hanzo/composer": ">=0.2.0",
     "@hanzo/event": ">=0.3.56",
     "@hanzo/gui": "^8.3.5",
@@ -67,7 +67,7 @@
   "devDependencies": {
     "@hanzo/ai": "0.6.23",
     "@hanzo/appearance": "0.2.8",
-    "@hanzo/build": "0.2.63",
+    "@hanzo/build": "0.2.64",
     "@hanzo/composer": "0.2.0",
     "@hanzo/design": "0.5.34",
     "@hanzo/event": "0.3.56",