Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Merge remote-tracking branch 'origin/dev' into feat/407-btw

Fei24110b10e23fa0d9
diff --cc docs/plans/README.md
index fe3de5d8,294ed9c2..8429b188
--- a/docs/plans/README.md
+++ b/docs/plans/README.md
@@@ -46,4 -46,4 +46,5 @@@
| [桌面应用](2026-10-16-desktop-app.md) | 壳、引擎和界面怎么分;锁定的 DSH 版本、独立的数据位置、首次启动和导入、插件怎么兼容 DSH、安装和更新 |
| [Bot 之间派活](2026-10-16-bot-handoffs.md) | Bot 看得到对方的状态;没读的消息合成一条;派活树:下面的活交回后才往上交,不许发给在等结果的 Bot;不设总量和链长上限 |
| [Bot 视图](2026-10-20-widget-views.md) | Bot 在聊天里画结构化的视图卡:固定组件目录的 JSON 蓝图,自己渲染;提问卡回路的泛化 |
+| [旁路问答(btw)](2026-10-21-btw.md) | 人顺带问一句:以与会话同构的请求做一次不执行工具的回答,不打断、不进模型可见历史;Bot 之间的 `ask_bot` 另行提案 |
+ | [消息布局和宽度](2026-10-22-message-layout.md) | 气泡 / 平铺两种布局;平铺时 Bot 的话带头像、名字、时间;气泡宽度和平铺正文宽度各用一个滑块,按正文列的百分比调 |
diff --cc ds-bot/client.js
index 9e78b08f,f5de521c..6c3ac644
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -5468,23 -5086,30 +5600,30 @@@ function Bubbles({ texts: texts2, roste
function Bubble({ text, index, roster, selfId, actions, sessionId, msgKey, mentions, fold, picked, live, lead, whole }) {
const { shown, folded, control } = useFold(text, { limit: fold, whole, live });
const key = msgKey ? `${msgKey}:${index}` : void 0;
- const body = (0, import_react9.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels2(), variant: "compact", fileMentions: mentions });
- const row = (0, import_react9.useRef)(null);
- const [toolsOpen, setToolsOpen] = (0, import_react9.useState)(false);
+ const body = (0, import_react10.createElement)(import_dsh_client_ui_primitives.MarkdownText, { text: linkMentions(shown, roster.bots, selfId), streaming: live, labels: mdLabels3(), variant: "compact", fileMentions: mentions });
++ const row = (0, import_react10.useRef)(null);
++ const [toolsOpen, setToolsOpen] = (0, import_react10.useState)(false);
+ useDismiss(toolsOpen, () => setToolsOpen(false), [row]);
+ const tapTools = (event) => {
+ if (!noHover() || event.target instanceof Element && event.target.closest("a,button,input,textarea,select,pre,code,[role=button],[role=link]")) return;
+ setToolsOpen((value) => !value);
+ };
- return (0, import_react9.createElement)(
+ return (0, import_react10.createElement)(
"div",
- { className: "bt-msg" },
+ { ref: row, className: "bt-msg", onClick: tapTools },
- (0, import_react9.createElement)(
+ (0, import_react10.createElement)(
"div",
{ className: "bt-msg-line" },
lead,
- (0, import_react9.createElement)(
+ (0, import_react10.createElement)(
"div",
{ className: "bt-bubble", "data-folded": folded || void 0 },
- control ? (0, import_react9.createElement)("div", { className: "bt-fold-body" }, body) : body,
+ control ? (0, import_react10.createElement)("div", { className: "bt-fold-body" }, body) : body,
control
),
- live ? null : (0, import_react10.createElement)(MessageTools, { text: folded ? text : shown, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions })
- live ? null : (0, import_react9.createElement)(MessageTools, { text: folded ? text : shown, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions, open: toolsOpen })
++ live ? null : (0, import_react10.createElement)(MessageTools, { text: folded ? text : shown, name: roster.byId[selfId]?.name ?? t("Bot"), sessionId, react: key ? (emoji) => actions.toggleReaction(msgKey, index, emoji) : void 0, actions, open: toolsOpen })
),
- picked.length ? (0, import_react9.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react9.createElement)("button", {
+ picked.length ? (0, import_react10.createElement)("div", { className: "bt-reacts" }, picked.map((emoji) => (0, import_react10.createElement)("button", {
key: emoji,
type: "button",
className: "bt-react",
@@@ -5494,8 -5119,9 +5633,9 @@@
);
}
var REACTIONS = ["👍", "❤️", "😂", "😮", "😢", "🙏"];
+ var STRIP_HALF = (REACTIONS.length * 34 + 10) / 2 + 8;
function useDismiss(open, close, refs) {
- (0, import_react9.useEffect)(() => {
+ (0, import_react10.useEffect)(() => {
if (!open) return void 0;
const onDown = (event) => {
if (refs.some((ref) => ref.current?.contains(event.target))) return;
@@@ -5515,12 -5143,12 +5657,12 @@@
};
}, [open]);
}
- function MessageTools({ text, name, sessionId, react, actions }) {
+ function MessageTools({ text, name, sessionId, react, actions, open: tapped }) {
- const [panel, setPanel] = (0, import_react9.useState)(null);
- const [copied, setCopied] = (0, import_react9.useState)(false);
- const tools = (0, import_react9.useRef)(null);
- const pop = (0, import_react9.useRef)(null);
+ const [panel, setPanel] = (0, import_react10.useState)(null);
- const [place, setPlace] = (0, import_react10.useState)(null);
+ const [copied, setCopied] = (0, import_react10.useState)(false);
+ const tools = (0, import_react10.useRef)(null);
+ const pop = (0, import_react10.useRef)(null);
+ const tick = useViewport();
const close = () => setPanel(null);
useDismiss(panel !== null, close, [tools, pop]);
const open = (kind, event) => {
@@@ -5528,11 -5156,14 +5670,14 @@@
close();
return;
}
- const rect = event.currentTarget.getBoundingClientRect();
- const below = rect.bottom + 220 < window.innerHeight;
- setPlace(kind === "react" ? { left: rect.left + rect.width / 2, top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.min(rect.left, window.innerWidth - 208), ...below ? { top: rect.bottom + 4 } : { bottom: window.innerHeight - rect.top + 4, "--bt-origin": "bottom left" } });
- setPanel(kind);
+ setPanel({ kind, node: event.currentTarget });
};
- const place = (0, import_react9.useMemo)(() => {
++ const place = (0, import_react10.useMemo)(() => {
+ if (!panel) return null;
+ const rect = panel.node.getBoundingClientRect();
+ const below = rect.bottom + 220 < viewBottom();
+ return panel.kind === "react" ? { left: Math.min(Math.max(rect.left + rect.width / 2, STRIP_HALF), window.innerWidth - STRIP_HALF), top: rect.top - 6, "--bt-origin": "bottom center" } : { left: Math.min(rect.left, window.innerWidth - 208), ...below ? { top: rect.bottom + 4 } : { bottom: viewBottom() - rect.top + 4, "--bt-origin": "bottom left" } };
+ }, [panel, tick]);
const copy2 = () => {
void navigator.clipboard?.writeText(text).then(() => {
setCopied(true);
@@@ -5545,25 -5176,25 +5690,25 @@@
link.click();
setTimeout(() => URL.revokeObjectURL(url), 1e3);
};
- const item = (label, Icon, run) => (0, import_react9.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => {
+ const item = (label, Icon, run) => (0, import_react10.createElement)("button", { key: label, type: "button", role: "menuitem", onClick: () => {
close();
run();
- } }, (0, import_react9.createElement)(Icon), label);
- return (0, import_react9.createElement)(
+ } }, (0, import_react10.createElement)(Icon), label);
+ return (0, import_react10.createElement)(
"div",
- { ref: tools, className: "bt-tools", "data-open": panel !== null || void 0 },
- react ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel === "react", onClick: (event) => open("react", event) }, (0, import_react10.createElement)(SmileIcon)) : null,
+ { ref: tools, className: "bt-tools", "data-open": panel !== null || tapped || void 0 },
- react ? (0, import_react9.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel?.kind === "react", onClick: (event) => open("react", event) }, (0, import_react9.createElement)(SmileIcon)) : null,
- sessionId ? (0, import_react9.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: () => actions.quote(sessionId, text) }, (0, import_react9.createElement)(ReplyIcon)) : null,
- (0, import_react9.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel?.kind === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react9.createElement)(CheckIcon) : (0, import_react9.createElement)(DotsIcon)),
- panel?.kind === "react" ? (0, import_react_dom.createPortal)((0, import_react9.createElement)(
++ react ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Add reaction"), title: t("Add reaction"), "aria-expanded": panel?.kind === "react", onClick: (event) => open("react", event) }, (0, import_react10.createElement)(SmileIcon)) : null,
+ sessionId ? (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("Reply"), title: t("Reply"), onClick: () => actions.quote(sessionId, text) }, (0, import_react10.createElement)(ReplyIcon)) : null,
- (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react10.createElement)(CheckIcon) : (0, import_react10.createElement)(DotsIcon)),
- panel === "react" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)(
++ (0, import_react10.createElement)("button", { type: "button", className: "bt-tool", "aria-label": t("More message actions"), title: t("More"), "aria-haspopup": "menu", "aria-expanded": panel?.kind === "more", onClick: (event) => open("more", event) }, copied ? (0, import_react10.createElement)(CheckIcon) : (0, import_react10.createElement)(DotsIcon)),
++ panel?.kind === "react" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)(
"div",
{ ref: pop, className: "bt-react-strip", role: "menu", "aria-label": t("Reactions"), style: place },
- REACTIONS.map((emoji) => (0, import_react9.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => {
+ REACTIONS.map((emoji) => (0, import_react10.createElement)("button", { key: emoji, type: "button", role: "menuitem", "aria-label": emoji, onClick: () => {
close();
react(emoji);
} }, emoji))
), document.body) : null,
- panel === "more" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)(
- panel?.kind === "more" ? (0, import_react_dom.createPortal)((0, import_react9.createElement)(
++ panel?.kind === "more" ? (0, import_react_dom.createPortal)((0, import_react10.createElement)(
"div",
{ ref: pop, className: "bt-menu", role: "menu", "aria-label": t("Message actions"), style: place },
item(t("Copy"), CopyIcon, copy2),
@@@ -5665,8 -5296,10 +5810,10 @@@ function AssistantCell({ node, groupPar
const relays = relayPart(data, groupPart) ? relaysBefore(contexts, steps, data) : [];
if (texts2.length === 0 && !reasoning && relays.length === 0) return null;
const selfId = roster.byId[sessionId]?.id ?? sessionId;
+ const speaker = layoutOf(roster.prefs) === "flat" ? roster.byId[sessionId] : void 0;
+ const head = speaker !== void 0 && opensReply(steps, data) && (reasoning !== "" || texts2.length > 0 && !(groupPart === "response" && turnReasoning(steps, data) !== ""));
- return (0, import_react9.createElement)(
- import_react9.Fragment,
+ return (0, import_react10.createElement)(
+ import_react10.Fragment,
null,
relays.map((relay) => {
const source = relay.source;
@@@ -5681,7 -5314,8 +5828,8 @@@
whole: true
});
}),
- head ? (0, import_react9.createElement)(SpeakerHead, { bot: speaker, time: data.time }) : null,
- reasoning ? (0, import_react9.createElement)(ThinkingRow, {
++ head ? (0, import_react10.createElement)(SpeakerHead, { bot: speaker, time: data.time }) : null,
+ reasoning ? (0, import_react10.createElement)(ThinkingRow, {
text: reasoning,
live: thinking !== void 0,
viewKey: `${sessionId}:${data.turn}`,
@@@ -5717,27 -5351,38 +5865,38 @@@ function EventLine({ prefix, bots, join
bot.name
));
});
- return (0, import_react9.createElement)("div", { className: "bt-event" }, parts);
+ return (0, import_react10.createElement)("div", { className: "bt-event" }, parts);
}
+ function SpeakerHead({ bot, time }) {
- return (0, import_react9.createElement)(
++ return (0, import_react10.createElement)(
+ "div",
+ { className: "bt-group-name" },
- (0, import_react9.createElement)("span", { className: "bt-lead" }, (0, import_react9.createElement)(BotMark, { bot, size: 22 })),
++ (0, import_react10.createElement)("span", { className: "bt-lead" }, (0, import_react10.createElement)(BotMark, { bot, size: 22 })),
+ bot.name,
- Number.isFinite(time) ? (0, import_react9.createElement)("span", { className: "bt-group-time", title: clockLabel(time) }, messageClock(time)) : null
++ Number.isFinite(time) ? (0, import_react10.createElement)("span", { className: "bt-group-time", title: clockLabel(time) }, messageClock(time)) : null
+ );
+ }
function GroupMessage({ bot, text, texts: texts2 = [text], room: room2, roster, actions, msgKey, useUi, whole, time, duration }) {
- const lead = (0, import_react9.createElement)(
+ const lead = (0, import_react10.createElement)(
"button",
{ type: "button", className: "bt-lead", "aria-label": t("Open {name}'s chat", { name: bot.name }), onClick: () => actions.openSession(bot.id) },
- (0, import_react9.createElement)(BotMark, { bot, size: 22 })
+ (0, import_react10.createElement)(BotMark, { bot, size: 22 })
);
+ const flat = layoutOf(roster.prefs) === "flat";
const took = Number.isFinite(duration) ? elapsedLabel(duration) : void 0;
- return (0, import_react9.createElement)(
+ return (0, import_react10.createElement)(
"div",
{ className: "bt-group-msg" },
- (0, import_react9.createElement)(
+ (0, import_react10.createElement)(
"span",
- { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } },
+ { className: "bt-group-name", style: flat ? void 0 : { color: inkText(colorOf(bot)) } },
+ flat ? lead : null,
bot.name,
- room2?.admin === bot.id ? (0, import_react9.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null,
- Number.isFinite(time) ? (0, import_react9.createElement)("span", { className: "bt-group-time", title: clockLabel(time) }, messageClock(time)) : null,
- took ? (0, import_react9.createElement)("span", { className: "bt-group-took", title: t("Ran for {duration}", { duration: took }) }, took) : null
+ room2?.admin === bot.id ? (0, import_react10.createElement)("span", { className: "bt-group-role" }, t("Admin")) : null,
+ Number.isFinite(time) ? (0, import_react10.createElement)("span", { className: "bt-group-time", title: clockLabel(time) }, messageClock(time)) : null,
+ took ? (0, import_react10.createElement)("span", { className: "bt-group-took", title: t("Ran for {duration}", { duration: took }) }, took) : null
),
- (0, import_react10.createElement)(Bubbles, { texts: texts2, roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead, whole })
- (0, import_react9.createElement)(Bubbles, { texts: texts2, roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead: flat ? null : lead, whole })
++ (0, import_react10.createElement)(Bubbles, { texts: texts2, roster, selfId: bot.id, actions, sessionId: room2?.id, msgKey, useUi, lead: flat ? null : lead, whole })
);
}
function stackReplies(replies) {
@@@ -5891,20 -5519,24 +6050,26 @@@ function ChatRows({ items, sessionId, r
function chatRow(row, key, { sessionId, selfId, roster, actions, useUi }) {
switch (row.kind) {
case "divider":
- return (0, import_react9.createElement)(PartLine, { key, time: row.time });
+ return (0, import_react10.createElement)(PartLine, { key, time: row.time });
case "user":
- return (0, import_react9.createElement)(EarlierUser, { key, row });
+ return (0, import_react10.createElement)(EarlierUser, { key, row });
case "answer":
- return (0, import_react9.createElement)(AnsweredReply, { key, node: { data: row } });
+ return (0, import_react10.createElement)(AnsweredReply, { key, node: { data: row } });
- case "bot":
- return (0, import_react10.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
+ // A display-only view replays from the blueprint the host kept on the call.
+ case "view":
- return (0, import_react9.createElement)(WidgetCell, { key, sessionId, callId: row.callId, args: { text: (name) => name === "title" ? row.title : void 0, value: (name) => name === "view" ? row.view : void 0 }, done: true, isError: false, roster, actions });
++ return (0, import_react10.createElement)(WidgetCell, { key, sessionId, callId: row.callId, args: { text: (name) => name === "title" ? row.title : void 0, value: (name) => name === "view" ? row.view : void 0 }, done: true, isError: false, roster, actions });
+ case "bot": {
- const bubbles = (0, import_react9.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
++ const bubbles = (0, import_react10.createElement)(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : void 0, msgKey: useUi ? `${sessionId}:${row.time}` : void 0, useUi, fold: FOLD_HUGE });
+ const speaker = layoutOf(roster.prefs) === "flat" ? roster.byId[selfId] : void 0;
- return speaker ? (0, import_react9.createElement)(import_react9.Fragment, { key }, (0, import_react9.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;
++ return speaker ? (0, import_react10.createElement)(import_react10.Fragment, { key }, (0, import_react10.createElement)(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles;
+ }
+ case "btw":
+ return (0, import_react10.createElement)(BtwCardView, { key, card: row.card, actions });
case "event": {
- if (row.role === "report") return (0, import_react9.createElement)(GroupEvent, { key, prefix: t("Replies from"), room: roster.roomsById[row.roomId], name: t("a group chat"), roster, actions });
+ if (row.role === "report") return (0, import_react10.createElement)(GroupEvent, { key, prefix: t("Replies from"), room: roster.roomsById[row.roomId], name: t("a group chat"), roster, actions });
const other = roster.byId[row.botId] ?? { id: row.botId, name: row.name ?? t("a Bot"), color: "gray" };
const prefix = { stopped: t("Stopped by"), reply: t("Reply from") }[row.role] ?? t("Message from");
- return (0, import_react9.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {
+ return (0, import_react10.createElement)(EventLine, { key, prefix, bots: [other], onOpen: () => {
if (selfId && other.id) actions.openExchange(selfId, other.id);
}, whole: true });
}
@@@ -6221,23 -5853,31 +6386,31 @@@ function GroupReplies({ sessionId, call
);
}
if (reply.kind === "missed") {
- return (0, import_react9.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name }));
+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name }));
}
+ if (reply.kind === "paused") {
- return (0, import_react9.createElement)(
++ return (0, import_react10.createElement)(
+ "div",
+ { key: `paused-${index}`, className: "bt-event" },
- (0, import_react9.createElement)("span", null, t("Paused after {count} Bot relays. Waiting: {names}", { count: reply.count, names: (reply.names ?? []).join(t(" and ")) })),
- room2?.paused?.length > 0 ? (0, import_react9.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.continueRoom(sessionId) }, t("Continue")) : null
++ (0, import_react10.createElement)("span", null, t("Paused after {count} Bot relays. Waiting: {names}", { count: reply.count, names: (reply.names ?? []).join(t(" and ")) })),
++ room2?.paused?.length > 0 ? (0, import_react10.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.continueRoom(sessionId) }, t("Continue")) : null
+ );
+ }
if (reply.kind === "resumed") {
- return (0, import_react9.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name }));
+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart and picked its work back up", { name: bot.name }));
}
if (reply.kind === "cut") {
- return (0, import_react9.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name }));
+ return (0, import_react10.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} was cut off by a restart again and stopped", { name: bot.name }));
}
if (reply.kind === "approval" || reply.kind === "working") {
- return (0, import_react9.createElement)(
+ return (0, import_react10.createElement)(
"div",
{ key: `${reply.botId}-${index}`, className: "bt-event" },
- (0, import_react9.createElement)(
+ (0, import_react10.createElement)(
"button",
{ type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) },
- (0, import_react9.createElement)(BotMark, { bot, size: 16 }),
- (0, import_react9.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name }))
+ (0, import_react10.createElement)(BotMark, { bot, size: 16 }),
+ (0, import_react10.createElement)("span", { className: "bt-event-name" }, t(reply.kind === "working" ? "{name} started on it" : "{name} paused for your approval", { name: bot.name }))
)
);
}
@@@ -6388,9 -6028,19 +6561,19 @@@ var import_react11 = require("react")
var import_react_dom2 = require("react-dom");
var PHRASE_HOLD_MS = 800;
var drawPhrase = (pool) => t(pool[Math.min(pool.length - 1, Math.floor(Math.random() * pool.length))]);
+ var rowVisible = ({ running, streaming, tools, relaying, bot, room: room2 }) => running && (!streaming || tools.length > 0) && !relaying && (bot !== void 0 || room2 !== void 0);
+ var mountMissed = false;
+ function findHost() {
+ const node = document.querySelector("[data-chat-flow] [data-chat-running]") ?? document.querySelector("[data-chat-flow]");
+ if (node === null && !mountMissed) {
+ mountMissed = true;
+ noteClientError("activity row", new Error("[data-chat-flow] not found"));
+ }
+ return node;
+ }
function useRunningHost(active) {
- const [host, setHost] = (0, import_react10.useState)(null);
- (0, import_react10.useEffect)(() => {
+ const [host, setHost] = (0, import_react11.useState)(null);
+ (0, import_react11.useEffect)(() => {
if (!active) {
setHost(null);
return void 0;
@@@ -6475,9 -6127,9 +6660,9 @@@ function ActivityIndicator({ sessionId
const streaming = entries2.some((entry) => entry.text);
const tools = entries2.filter((entry) => !entry.text).sort((a, b) => a.at - b.at);
const relaying = tools.some((entry) => entry.relay);
- const visible = running && !streaming && !relaying && (bot !== void 0 || room2 !== void 0);
+ const visible = rowVisible({ running, streaming, tools, relaying, bot, room: room2 });
const tool = tools.at(-1);
- const inputRef = (0, import_react10.useRef)(0);
+ const inputRef = (0, import_react11.useRef)(0);
const inputAt = Math.max(inputRef.current, pendingInput);
inputRef.current = inputAt;
const want = !visible ? null : inputAt > (tool?.at ?? 0) ? { key: `input:${inputAt}`, pool: PHRASES.thinking, state: "thinking" } : tool ? { key: tool.label ? `tool:${tool.label}` : "working", label: tool.label, pool: PHRASES.working, state: tool.state ?? "working" } : { key: "thinking", pool: PHRASES.thinking, state: "thinking" };
@@@ -6566,7 -6218,8 +6751,8 @@@ var useApproval = (useWork, match) => u
var useGroupWork = (useWork, pick2) => useWork ? useWork((work) => JSON.stringify(pick2(work.rooms ?? {}))) : "[]";
var workKeys = (text) => JSON.parse(text);
var doingOf = ({ tool, said, note, target, switching }) => ({ tool, said, note, target, switching });
-var workLine = (lead, doing, more) => (0, import_react11.createElement)(Shimmer, null, `${lead} · ${workPhrase(doing)}…${more > 0 ? ` +${more}` : ""}`);
-var doingLine = (doing) => (0, import_react11.createElement)(Shimmer, null, `${workPhrase(doing)}…`);
+var workLine = (lead, doing, more) => (0, import_react12.createElement)(Shimmer, null, `${lead} · ${workPhrase(doing)}…${more > 0 ? ` +${more}` : ""}`);
++var doingLine = (doing) => (0, import_react12.createElement)(Shimmer, null, `${workPhrase(doing)}…`);
var waitingFor = (roster, waits) => {
const names = [...(waits?.bots ?? []).map((id) => roster.byId[id]?.name), ...(waits?.rooms ?? []).map((id) => roster.roomsById[id]?.name)].filter(Boolean);
return names.length === 0 ? "" : t("Waiting for {names}", { names: names.join(t(" and ")) });
@@@ -6627,15 -6281,15 +6814,15 @@@ function BotRow({ bot, roster, actions
onClick: () => actions.openSession(id),
onContextMenu
},
- (0, import_react11.createElement)(BotAvatar, { bot, size: 36, state, main }),
- pinned && !wide ? (0, import_react11.createElement)(PinMark) : null,
- wide ? (0, import_react11.createElement)(
+ (0, import_react12.createElement)(BotAvatar, { bot, size: 36, state, main }),
+ pinned && !wide ? (0, import_react12.createElement)(PinMark) : null,
+ wide ? (0, import_react12.createElement)(
"span",
{ className: "bt-row-body" },
- (0, import_react11.createElement)("span", { className: "bt-row-name" }, (0, import_react11.createElement)("span", { className: "bt-row-title" }, bot.name), pinned ? (0, import_react11.createElement)(PinMark) : null),
- runningLine ? (0, import_react11.createElement)("span", { className: "bt-row-preview" }, runningLine) : awayLine ? (0, import_react11.createElement)("span", { className: "bt-row-preview" }, awayLine) : waitsFor ? (0, import_react11.createElement)("span", { className: "bt-row-preview" }, waitsFor) : preview ? (0, import_react11.createElement)("span", { className: "bt-row-preview" }, preview) : null
+ (0, import_react12.createElement)("span", { className: "bt-row-name" }, (0, import_react12.createElement)("span", { className: "bt-row-title" }, bot.name), pinned ? (0, import_react12.createElement)(PinMark) : null),
- awayLine ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, awayLine) : waitsFor ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, waitsFor) : preview ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, preview) : null
++ runningLine ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, runningLine) : awayLine ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, awayLine) : waitsFor ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, waitsFor) : preview ? (0, import_react12.createElement)("span", { className: "bt-row-preview" }, preview) : null
) : null,
- wide && unread && !active ? (0, import_react11.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null
+ wide && unread && !active ? (0, import_react12.createElement)("span", { className: "bt-unread", "aria-hidden": true }) : null
);
}
function RoomRow({ room: room2, roster, actions, useSessions, useSessionStatus, useSessionRetainInfo, useWork, wide, marked }) {
@@@ -6949,11 -6603,13 +7136,13 @@@ function UpdateButton({ useUpdate, acti
const dshRow = showsDshRow(dsh, update?.app);
if (!update?.available && !dshRow && phase === "idle" && dshPhase === "idle") return null;
const cloudPhase = phase === "installing" || dshPhase === "installing" ? "installing" : phase !== "idle" ? phase : dshPhase;
- const toggle = () => {
+ const tick = useViewport();
- (0, import_react11.useLayoutEffect)(() => {
++ (0, import_react12.useLayoutEffect)(() => {
+ if (!open) return;
const rect = button.current?.getBoundingClientRect();
if (rect) setBox({ left: Math.max(8, Math.min(rect.left, window.innerWidth - 288)), top: rect.bottom + 6 });
- setOpen((value) => !value);
- };
+ }, [open, tick]);
+ const toggle = () => setOpen((value) => !value);
const start = () => {
setError("");
void actions.installUpdate().catch((failure) => setError(hostText(failure?.message ?? String(failure))));
@@@ -7101,9 -6757,12 +7290,12 @@@ function pressSettingsShortcut()
metaKey: held.has("meta")
}));
}
+ var NO_SUBSCRIBE = () => () => {
+ };
+ var NO_SNAPSHOT = () => null;
function AccountLauncher({ seat = true, settingsOpen, openSettings, openOnboarding, actions }) {
- const [open, setOpen] = (0, import_react11.useState)(false);
- (0, import_react11.useLayoutEffect)(() => {
+ const [open, setOpen] = (0, import_react12.useState)(false);
+ (0, import_react12.useLayoutEffect)(() => {
if (!seat) return void 0;
actions.seatAccount(true);
return () => actions.seatAccount(false);
@@@ -7147,11 -6806,60 +7339,60 @@@
window.removeEventListener("keydown", onKey, true);
};
}, [open]);
- const toggle = () => {
+ const signIn = actions.signInEntry?.() ?? null;
- const ops = (0, import_react11.useMemo)(() => signIn?.inject?.() ?? {}, [signIn]);
++ const ops = (0, import_react12.useMemo)(() => signIn?.inject?.() ?? {}, [signIn]);
+ const accountSource = ops.hooks?.account;
- const account = (0, import_react11.useSyncExternalStore)(accountSource?.subscribe ?? NO_SUBSCRIBE, accountSource ? () => accountSource.getSnapshot() : NO_SNAPSHOT);
++ const account = (0, import_react12.useSyncExternalStore)(accountSource?.subscribe ?? NO_SUBSCRIBE, accountSource ? () => accountSource.getSnapshot() : NO_SNAPSHOT);
+ const signedIn = signIn !== null && typeof ops.signOut === "function" && account?.view?.status === "credential-stored";
+ const accountT = actions.accountT?.() ?? ((key) => key);
- const [confirm, setConfirm] = (0, import_react11.useState)(null);
- const [busy, setBusy] = (0, import_react11.useState)(false);
- const [signOutError, setSignOutError] = (0, import_react11.useState)("");
++ const [confirm, setConfirm] = (0, import_react12.useState)(null);
++ const [busy, setBusy] = (0, import_react12.useState)(false);
++ const [signOutError, setSignOutError] = (0, import_react12.useState)("");
+ const askSignOut = async () => {
+ setSignOutError("");
+ let state = "none";
+ try {
+ if (await ops.hasRunningAccountTasks?.()) state = "running";
+ } catch {
+ state = "unknown";
+ }
+ setConfirm(state);
+ };
+ const cancelSignOut = () => {
+ setConfirm(null);
+ setSignOutError("");
+ };
+ const runSignOut = async () => {
+ setBusy(true);
+ setSignOutError("");
+ try {
+ await ops.signOut();
+ setConfirm(null);
+ setOpen(false);
+ } catch (error) {
+ setSignOutError(String(error?.message ?? error));
+ } finally {
+ setBusy(false);
+ }
+ };
+ const tick = useViewport();
+ const anchor = () => {
const rect = button.current?.getBoundingClientRect();
- if (rect) setBox({ left: rect.left, bottom: window.innerHeight - rect.top + 5 });
+ if (rect) setBox({ left: rect.left, bottom: viewBottom() - rect.top + 5 });
+ };
- (0, import_react11.useLayoutEffect)(() => {
++ (0, import_react12.useLayoutEffect)(() => {
+ if (open) anchor();
+ }, [open, tick]);
+ const toggle = () => {
+ if (!open) anchor();
setOpen((value) => !value);
};
- (0, import_react11.useEffect)(() => {
++ (0, import_react12.useEffect)(() => {
+ if (open) return;
+ setConfirm(null);
+ setSignOutError("");
+ setBusy(false);
+ }, [open]);
const groups = [
[
[t("Usage"), GaugeIcon, () => actions.openSettings("usage")],
@@@ -7163,30 -6871,44 +7404,44 @@@
[t("Switch to classic Agent mode"), SwitchIcon, () => actions.setSurface("agent")]
]
];
+ if (signedIn) groups.push([[accountT("signOut"), SignOutIcon, askSignOut, void 0, true]]);
- return (0, import_react11.createElement)(
- import_react11.Fragment,
+ return (0, import_react12.createElement)(
+ import_react12.Fragment,
null,
- (0, import_react11.createElement)(
+ (0, import_react12.createElement)(
"button",
{ ref: button, type: "button", className: "bt-account", "aria-label": t("Account"), "aria-haspopup": "menu", "aria-expanded": open, onClick: toggle },
- (0, import_react11.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react11.createElement)(BotMark, { look: MAIN_LOOK, size: 24 }))
+ (0, import_react12.createElement)("span", { className: "bt-you", "aria-hidden": true }, (0, import_react12.createElement)(BotMark, { look: MAIN_LOOK, size: 24 }))
),
- open && box ? (0, import_react_dom3.createPortal)((0, import_react11.createElement)(
+ open && box ? (0, import_react_dom3.createPortal)((0, import_react12.createElement)(
"div",
{ className: "bt-menu bt-menu-up bt-account-menu", role: "menu", "aria-label": t("Account"), style: box },
- groups.map((group, index) => (0, import_react12.createElement)(
- confirm !== null ? (0, import_react11.createElement)(
++ confirm !== null ? (0, import_react12.createElement)(
+ "div",
+ { className: "bt-confirm", role: "alertdialog", "aria-label": accountT("signOut") },
- (0, import_react11.createElement)("p", { className: "bt-confirm-text" }, accountT(confirm === "running" ? "signOutRunningDescription" : confirm === "unknown" ? "signOutUnknownDescription" : "signOutDescription")),
- signOutError !== "" ? (0, import_react11.createElement)("p", { className: "bt-confirm-error", role: "alert" }, signOutError) : null,
- (0, import_react11.createElement)(
++ (0, import_react12.createElement)("p", { className: "bt-confirm-text" }, accountT(confirm === "running" ? "signOutRunningDescription" : confirm === "unknown" ? "signOutUnknownDescription" : "signOutDescription")),
++ signOutError !== "" ? (0, import_react12.createElement)("p", { className: "bt-confirm-error", role: "alert" }, signOutError) : null,
++ (0, import_react12.createElement)(
+ "div",
+ { className: "bt-confirm-row" },
- (0, import_react11.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: cancelSignOut }, t("Cancel")),
- (0, import_react11.createElement)("button", { type: "button", className: "bt-confirm-go", disabled: busy, onClick: () => {
++ (0, import_react12.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: cancelSignOut }, t("Cancel")),
++ (0, import_react12.createElement)("button", { type: "button", className: "bt-confirm-go", disabled: busy, onClick: () => {
+ void runSignOut();
+ } }, accountT("signOut"))
+ )
- ) : groups.map((group, index) => (0, import_react11.createElement)(
- import_react11.Fragment,
++ ) : groups.map((group, index) => (0, import_react12.createElement)(
+ import_react12.Fragment,
{ key: index },
- index > 0 ? (0, import_react11.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null,
- group.map(([label, Icon, run, hint, stay]) => (0, import_react11.createElement)("button", {
+ index > 0 ? (0, import_react12.createElement)("div", { className: "bt-menu-sep", role: "separator" }) : null,
- group.map(([label, Icon, run, hint]) => (0, import_react12.createElement)("button", {
++ group.map(([label, Icon, run, hint, stay]) => (0, import_react12.createElement)("button", {
key: label,
type: "button",
role: "menuitem",
onClick: () => {
- setOpen(false);
+ if (stay !== true) setOpen(false);
void Promise.resolve(run()).catch((error) => actions.reportError(error, "menu"));
}
- }, (0, import_react11.createElement)(Icon), (0, import_react11.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react11.createElement)("span", { className: "bt-menu-hint" }, hint) : null))
+ }, (0, import_react12.createElement)(Icon), (0, import_react12.createElement)("span", { className: "bt-menu-label" }, label), hint ? (0, import_react12.createElement)("span", { className: "bt-menu-hint" }, hint) : null))
))
), document.body) : null
);
@@@ -7241,12 -6963,20 +7496,20 @@@ var RETURN_CSS =
.bt-return-name{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
`;
function BrandMark({ size = 24 }) {
- return (0, import_react11.createElement)("span", { className: "bt-brand-whale" }, (0, import_react11.createElement)(BotMark, { look: MAIN_LOOK, size }));
+ return (0, import_react12.createElement)("span", { className: "bt-brand-whale" }, (0, import_react12.createElement)(BotMark, { look: MAIN_LOOK, size }));
}
function BrandName() {
- return (0, import_react11.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, "DS Bot");
+ return (0, import_react12.createElement)("span", { style: { fontWeight: 600, fontSize: 14 } }, "DS Bot");
}
var SIDEBAR_CSS = `
+ .bt-confirm{width:260px;max-width:72vw;padding:10px 12px 12px;display:flex;flex-direction:column;gap:10px}
+ .bt-confirm-text{margin:0;font-size:13px;line-height:19px;color:var(--bt-ink-2)}
+ .bt-confirm-error{margin:0;font-size:12px;line-height:17px;color:var(--bt-danger);overflow-wrap:anywhere}
+ .bt-confirm-row{display:flex;justify-content:flex-end;gap:8px}
+ .bt-menu .bt-confirm button{width:auto;min-height:0}
+ .bt-confirm-go{height:28px;padding:0 14px;border:0;border-radius:999px;background:var(--bt-accent);color:var(--bt-accent-ink);font:inherit;font-size:13px;font-weight:500;cursor:pointer;transition:opacity .12s ease}
+ .bt-confirm-go:hover:not(:disabled){opacity:.9}
+ .bt-confirm-go:disabled{opacity:.6;cursor:default}
.bt-side-top .bt-brand{cursor:default;padding-left:6px}
.bt-side-top .bt-brand:hover{background:none}
.bt-brand .bt-mark{flex:none}
@@@ -7649,11 -7383,12 +7916,12 @@@ function menuIcons(roster)
}
function ComposerPlus({ sessionId, inputActions, useRoster, actions }) {
const roster = useRoster((value) => value);
- const [open, setOpen] = (0, import_react13.useState)(null);
+ const [open, setOpen] = (0, import_react14.useState)(null);
const [shown, leaving] = useLinger(open, 120);
- const button = (0, import_react13.useRef)(null);
- const menu = (0, import_react13.useRef)(null);
+ const button = (0, import_react14.useRef)(null);
+ const menu = (0, import_react14.useRef)(null);
+ const tick = useViewport();
- (0, import_react13.useEffect)(() => {
+ (0, import_react14.useEffect)(() => {
if (!open) return void 0;
const onDown = (event) => {
if (![button.current, menu.current].some((node) => node?.contains(event.target))) setOpen(null);
@@@ -7695,10 -7429,15 +7962,15 @@@
actions.referenceChat(sessionId, inputActions?.captureInsertion?.());
};
const canReference = typeof inputActions?.captureInsertion === "function" && actions.canReferenceChat();
- const place = (0, import_react13.useMemo)(() => {
++ const place = (0, import_react14.useMemo)(() => {
+ if (!shown || !button.current) return null;
+ const rect = button.current.getBoundingClientRect();
+ return { left: rect.left, bottom: viewBottom() - rect.top + 8 };
+ }, [shown, open, tick]);
- return (0, import_react13.createElement)(
- import_react13.Fragment,
+ return (0, import_react14.createElement)(
+ import_react14.Fragment,
null,
- (0, import_react13.createElement)("button", {
+ (0, import_react14.createElement)("button", {
ref: button,
type: "button",
className: "bt-plus",
@@@ -7716,12 -7455,12 +7988,12 @@@
className: "bt-menu bt-menu-up bt-plus-menu",
role: "menu",
"aria-label": t("Add"),
- style: { left: shown.left, bottom: shown.bottom },
+ style: place ?? {},
"data-leaving": leaving || void 0
},
- shown.files ? (0, import_react13.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react13.createElement)(PaperclipIcon), (0, import_react13.createElement)("span", { className: "bt-menu-label" }, t("Add files"))) : null,
- canReference ? (0, import_react13.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react13.createElement)(ChatsIcon), (0, import_react13.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : null,
- (0, import_react13.createElement)("button", { type: "button", role: "menuitem", onClick: schedule }, (0, import_react13.createElement)(ClockIcon), (0, import_react13.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task")))
+ shown.files ? (0, import_react14.createElement)("button", { type: "button", role: "menuitem", onClick: attach }, (0, import_react14.createElement)(PaperclipIcon), (0, import_react14.createElement)("span", { className: "bt-menu-label" }, t("Add files"))) : null,
+ canReference ? (0, import_react14.createElement)("button", { type: "button", role: "menuitem", onMouseDown: keepComposerFocus, onClick: reference }, (0, import_react14.createElement)(ChatsIcon), (0, import_react14.createElement)("span", { className: "bt-menu-label" }, t("Reference a chat"))) : null,
+ (0, import_react14.createElement)("button", { type: "button", role: "menuitem", onClick: schedule }, (0, import_react14.createElement)(ClockIcon), (0, import_react14.createElement)("span", { className: "bt-menu-label" }, t("Scheduled task")))
), document.body) : null
);
}
@@@ -8425,14 -8164,19 +8697,19 @@@ function ModelRows({ roster, current, o
))
));
}
-var Caret = () => (0, import_react16.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react16.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" }));
+var Caret = () => (0, import_react17.createElement)("svg", { className: "bt-model-caret", width: 12, height: 12, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.8, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react17.createElement)("path", { d: "M5.5 8l4.5 4.5L14.5 8" }));
function useAnchoredMenu() {
- const [anchor, setAnchor] = (0, import_react16.useState)(null);
- const [place, setPlace] = (0, import_react16.useState)(null);
++ const [anchor, setAnchor] = (0, import_react17.useState)(null);
+ const [place, setPlace] = (0, import_react17.useState)(null);
const [shownPlace, leaving] = useLinger(place, MENU_EXIT_MS);
- const button = (0, import_react16.useRef)(null);
- const menu = (0, import_react16.useRef)(null);
+ const button = (0, import_react17.useRef)(null);
+ const menu = (0, import_react17.useRef)(null);
- const close = () => setPlace(null);
+ const tick = useViewport();
+ const close = () => {
+ setAnchor(null);
+ setPlace(null);
+ };
- (0, import_react16.useEffect)(() => {
+ (0, import_react17.useEffect)(() => {
if (place === null) return void 0;
const onDown = (event) => {
if (menu.current?.contains(event.target) || button.current?.contains(event.target)) return;
@@@ -8457,7 -8201,9 +8734,9 @@@
window.removeEventListener("scroll", onScroll, true);
};
}, [place]);
- const open = () => {
+ const open = () => setAnchor({});
- (0, import_react16.useLayoutEffect)(() => {
++ (0, import_react17.useLayoutEffect)(() => {
+ if (anchor === null || !button.current) return;
const rect = button.current.getBoundingClientRect();
const width = Math.max(240, rect.width);
const left = Math.max(8, Math.min(rect.right - width, window.innerWidth - width - 8));
@@@ -10637,24 -10391,25 +10924,25 @@@ function ExchangeDialog({ pair, roster
}, [pair[0], pair[1]]);
const left = roster.byId[pair[0]];
const right = roster.byId[pair[1]];
+ const flat = layoutOf(roster.prefs) === "flat";
let lastDay = 0;
const paneLeft = usePaneLeft();
- return (0, import_react24.createElement)(
+ return (0, import_react25.createElement)(
"div",
{ className: "bt-pane bt-exchange", style: { left: paneLeft }, "data-leaving": leaving || void 0 },
- (0, import_react24.createElement)(
+ (0, import_react25.createElement)(
"div",
{ className: "bt-dialog", role: "dialog", "aria-label": t("Bot exchange") },
- (0, import_react24.createElement)("div", { className: "bt-head" }, (0, import_react24.createElement)(
+ (0, import_react25.createElement)("div", { className: "bt-head" }, (0, import_react25.createElement)(
"span",
{ className: "bt-pill", style: { cursor: "default" } },
- left ? (0, import_react24.createElement)(BotMark, { bot: left, size: 22 }) : null,
+ left ? (0, import_react25.createElement)(BotMark, { bot: left, size: 22 }) : null,
left?.name ?? "?",
- (0, import_react24.createElement)("span", { className: "bt-swap" }, "⇄"),
- right ? (0, import_react24.createElement)(BotMark, { bot: right, size: 22 }) : null,
+ (0, import_react25.createElement)("span", { className: "bt-swap" }, "⇄"),
+ right ? (0, import_react25.createElement)(BotMark, { bot: right, size: 22 }) : null,
right?.name ?? "?"
)),
- (0, import_react24.createElement)(
+ (0, import_react25.createElement)(
"div",
{ ref: log, className: "bt-dialog-log", role: "log", "aria-label": t("Bot exchange transcript"), onScroll: (event) => {
const node = event.currentTarget;
@@@ -10665,15 -10420,16 +10953,16 @@@
const showDay = entry.time - lastDay > 30 * 60 * 1e3;
lastDay = entry.time;
const whole = entry.length === void 0 ? void 0 : { length: entry.length, load: () => actions.exchangeText(entry.id) };
- const lead = (0, import_react24.createElement)("span", { className: "bt-lead" }, (0, import_react24.createElement)(BotMark, { bot, size: 22 }));
- return (0, import_react24.createElement)(
- import_react24.Fragment,
++ const lead = (0, import_react25.createElement)("span", { className: "bt-lead" }, (0, import_react25.createElement)(BotMark, { bot, size: 22 }));
+ return (0, import_react25.createElement)(
+ import_react25.Fragment,
{ key: entry.id },
- showDay ? (0, import_react24.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null,
- (0, import_react24.createElement)(
+ showDay ? (0, import_react25.createElement)("time", { className: "bt-time" }, dayLabel(entry.time)) : null,
+ (0, import_react25.createElement)(
"div",
{ className: "bt-group-msg" },
- (0, import_react25.createElement)("span", { className: "bt-group-name", style: { color: inkText(colorOf(bot)) } }, bot.name),
- (0, import_react25.createElement)(Bubbles, { texts: [stripLongNote(entry.text)], roster, selfId: bot.id, actions, whole, lead: (0, import_react25.createElement)("span", { className: "bt-lead" }, (0, import_react25.createElement)(BotMark, { bot, size: 22 })) })
- (0, import_react24.createElement)("span", { className: "bt-group-name", style: flat ? void 0 : { color: inkText(colorOf(bot)) } }, flat ? lead : null, bot.name),
- (0, import_react24.createElement)(Bubbles, { texts: [stripLongNote(entry.text)], roster, selfId: bot.id, actions, whole, lead: flat ? null : lead })
++ (0, import_react25.createElement)("span", { className: "bt-group-name", style: flat ? void 0 : { color: inkText(colorOf(bot)) } }, flat ? lead : null, bot.name),
++ (0, import_react25.createElement)(Bubbles, { texts: [stripLongNote(entry.text)], roster, selfId: bot.id, actions, whole, lead: flat ? null : lead })
)
);
})
@@@ -11009,6 -10765,44 +11298,44 @@@ function roomSubtitle(room2, roster)
const admin = roster.byId[room2.admin];
return [t("{count} members", { count: room2.members.length }), admin ? t("Admin {name}", { name: admin.name }) : t("No admin")].join(" · ");
}
+ function RelayLimitRow({ room: room2, update }) {
- const [draft, setDraft] = (0, import_react27.useState)(room2.relayLimit ?? "");
- (0, import_react27.useEffect)(() => setDraft(room2.relayLimit ?? ""), [room2.relayLimit]);
++ const [draft, setDraft] = (0, import_react28.useState)(room2.relayLimit ?? "");
++ (0, import_react28.useEffect)(() => setDraft(room2.relayLimit ?? ""), [room2.relayLimit]);
+ const save = () => {
+ const text = String(draft).trim();
+ if (text === "") {
+ if (room2.relayLimit !== void 0) update({ relayLimit: null });
+ return;
+ }
+ const limit = Number(text);
+ if (!Number.isInteger(limit) || limit < 1 || limit > 200 || limit === room2.relayLimit) {
+ setDraft(room2.relayLimit ?? "");
+ return;
+ }
+ update({ relayLimit: limit });
+ };
- return (0, import_react27.createElement)(
++ return (0, import_react28.createElement)(
+ Row,
+ { label: t("Pause Bot relays after"), hint: t("Counted since your last message in this group.") },
- (0, import_react27.createElement)("input", {
++ (0, import_react28.createElement)("input", {
+ className: "bt-bs-input bt-bs-num",
+ type: "number",
+ min: 1,
+ max: 200,
+ placeholder: String(room2.relayLimitDefault ?? ""),
+ value: draft,
+ "aria-label": t("Pause Bot relays after"),
+ onChange: (event) => setDraft(event.target.value),
+ onBlur: save,
+ onKeyDown: (event) => {
+ if (event.key === "Enter") {
+ event.preventDefault();
+ event.currentTarget.blur();
+ }
+ }
+ })
+ );
+ }
function GroupPermission({ room: room2, catalog, update }) {
if (!catalog?.options?.length) return null;
const shared2 = room2.permission !== void 0;
@@@ -11099,21 -10893,22 +11426,22 @@@ function GroupSettingsForm({ room: room
if (mode !== id) void update({ mode: id });
}
}, t(label)))),
- (0, import_react27.createElement)("span", { key: mode, className: "bt-set-hint bt-veil" }, `${t(modeHint)} ${t("@mentions always pick who answers.")}`)
+ (0, import_react28.createElement)("span", { key: mode, className: "bt-set-hint bt-veil" }, `${t(modeHint)} ${t("@mentions always pick who answers.")}`)
- )
+ ),
- (0, import_react27.createElement)(RelayLimitRow, { room: room2, update })
++ (0, import_react28.createElement)(RelayLimitRow, { room: room2, update })
),
- (0, import_react27.createElement)(
+ (0, import_react28.createElement)(
Card,
{ title: t("Working folder") },
- (0, import_react27.createElement)(
+ (0, import_react28.createElement)(
"div",
{ className: "bt-set-row bt-bs-row" },
- (0, import_react27.createElement)("span", { className: "bt-set-copy" }, (0, import_react27.createElement)("span", { className: "bt-bs-label" }, t("Folder"))),
- (0, import_react27.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) })
+ (0, import_react28.createElement)("span", { className: "bt-set-copy" }, (0, import_react28.createElement)("span", { className: "bt-bs-label" }, t("Folder"))),
+ (0, import_react28.createElement)(FolderMenu, { value: room2.workDir, group: true, actions, run, onPick: (workDir) => update({ workDir }) })
)
),
- (0, import_react27.createElement)(GroupPermission, { room: room2, catalog: roster.permissions, update }),
- (0, import_react27.createElement)(
+ (0, import_react28.createElement)(GroupPermission, { room: room2, catalog: roster.permissions, update }),
+ (0, import_react28.createElement)(
Card,
{ title: t("Members · {count}", { count: members.length }) },
members.map((member) => {
@@@ -11642,19 -11437,19 +11970,19 @@@ function Row2({ kind, glyph, name, sub
title: t("{tokens} tokens · {calls} calls", { tokens: full(sum.total), calls: full(sum.calls) }),
...onClick ? { type: "button", onClick } : {}
},
- glyph ? (0, import_react28.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null,
- (0, import_react28.createElement)(
+ glyph ? (0, import_react29.createElement)("span", { className: "bt-us-row-glyph" }, glyph) : null,
+ (0, import_react29.createElement)(
"span",
{ className: "bt-us-row-body" },
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"span",
{ className: "bt-us-row-line" },
- (0, import_react28.createElement)("span", { className: "bt-us-row-name" }, name),
- sub ? (0, import_react28.createElement)("span", { className: "bt-us-row-sub" }, sub) : null
+ (0, import_react29.createElement)("span", { className: "bt-us-row-name" }, name),
+ sub ? (0, import_react29.createElement)("span", { className: "bt-us-row-sub" }, sub) : null
),
- (0, import_react28.createElement)("span", { className: "bt-us-track" }, (0, import_react28.createElement)("span", { style: { width: `${width}%`, background: fill2 } }))
+ (0, import_react29.createElement)("span", { className: "bt-us-track" }, (0, import_react29.createElement)("span", { style: { width: `${width}%`, background: fill2 } }))
),
- (0, import_react29.createElement)("span", { className: "bt-us-row-num" }, (0, import_react29.createElement)("b", null, compact(sum.total)), (0, import_react29.createElement)("small", null, `${percent(sum.total, whole)}%`))
- (0, import_react28.createElement)("span", { className: "bt-us-row-num" }, (0, import_react28.createElement)("b", null, compact(sum.total)), (0, import_react28.createElement)("small", null, `${percent2(sum.total, whole)}%`))
++ (0, import_react29.createElement)("span", { className: "bt-us-row-num" }, (0, import_react29.createElement)("b", null, compact(sum.total)), (0, import_react29.createElement)("small", null, `${percent2(sum.total, whole)}%`))
);
}
function ListCard({ title, count, index, children }) {
@@@ -11667,31 -11462,31 +11995,31 @@@
}
function Profile({ face, share, range }) {
const arc = Math.max(0, Math.min(1, share)) * RING;
- return (0, import_react28.createElement)(
+ return (0, import_react29.createElement)(
"section",
{ className: "bt-us-profile" },
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"span",
{ className: "bt-us-ring" },
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"svg",
{ viewBox: "0 0 96 96", "aria-hidden": true },
- face.stops ? (0, import_react28.createElement)("defs", null, (0, import_react28.createElement)(
+ face.stops ? (0, import_react29.createElement)("defs", null, (0, import_react29.createElement)(
"linearGradient",
{ id: "bt-us-ring-paint", x1: 0, y1: 1, x2: 1, y2: 0 },
- face.stops.map(([offset, color]) => (0, import_react28.createElement)("stop", { key: offset, offset, stopColor: color }))
+ face.stops.map(([offset, color]) => (0, import_react29.createElement)("stop", { key: offset, offset, stopColor: color }))
)) : null,
- (0, import_react28.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }),
- arc > 0 ? (0, import_react28.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING}` } }) : null
+ (0, import_react29.createElement)("circle", { className: "bt-us-ring-track", cx: 48, cy: 48, r: RING_R }),
+ arc > 0 ? (0, import_react29.createElement)("circle", { className: "bt-us-ring-arc", cx: 48, cy: 48, r: RING_R, style: { stroke: face.stops ? "url(#bt-us-ring-paint)" : face.paint, strokeDasharray: `${arc} ${RING}` } }) : null
),
- (0, import_react28.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64))
+ (0, import_react29.createElement)("span", { className: "bt-us-ring-face" }, face.glyph(64))
),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ className: "bt-us-profile-copy" },
- (0, import_react28.createElement)("h3", null, face.name),
- face.sub ? (0, import_react28.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null,
- (0, import_react28.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent2(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent2(share, 1), range: rangeLabel(range.id) }))
+ (0, import_react29.createElement)("h3", null, face.name),
+ face.sub ? (0, import_react29.createElement)("span", { className: "bt-us-profile-sub" }, face.sub) : null,
- (0, import_react29.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent(share, 1), range: rangeLabel(range.id) }))
++ (0, import_react29.createElement)("span", { className: "bt-us-profile-share" }, range.from ? t("{share}% of all usage from {span}", { share: percent2(share, 1), span: spanText(range.from, range.to) }) : t("{share}% of all usage in the last {range}", { share: percent2(share, 1), range: rangeLabel(range.id) }))
)
);
}
@@@ -12964,16 -12774,59 +13307,59 @@@ var capitalize2 = (word) => word[0].toU
var SETTINGS_PAGES = [["general", "General"], ["models", "Models"], ["bots", "Bots"], ["groups", "Group chats"], ["connectors", "Connectors"], ["capabilities", "Capabilities"], ["schedules", "Scheduled tasks"], ["usage", "Usage"], ["secrets", "Secrets"], ["feedback", "Feedback"], ["about", "About DS Bot"]];
var PAGE_ICONS = { ...SETTINGS_ICONS, models: SlidersIcon, connectors: ConnectorIcon, capabilities: PlugIcon, schedules: ClockIcon, secrets: KeyIcon, feedback: FeedbackIcon, about: InfoIcon };
function SetSection({ title, className = "", children }) {
- return (0, import_react33.createElement)("section", { className: `bt-set-section ${className}`.trim() }, (0, import_react33.createElement)("h3", null, title), (0, import_react33.createElement)("div", { className: "bt-set-card" }, children));
+ return (0, import_react34.createElement)("section", { className: `bt-set-section ${className}`.trim() }, (0, import_react34.createElement)("h3", null, title), (0, import_react34.createElement)("div", { className: "bt-set-card" }, children));
}
function SetRow({ label, hint, children }) {
- return (0, import_react33.createElement)(
+ return (0, import_react34.createElement)(
"div",
{ className: "bt-set-row" },
- (0, import_react33.createElement)("div", { className: "bt-set-copy" }, (0, import_react33.createElement)("span", null, label), hint ? (0, import_react33.createElement)("span", { className: "bt-set-hint" }, hint) : null),
- children ? (0, import_react33.createElement)("div", { className: "bt-set-control" }, children) : null
+ (0, import_react34.createElement)("div", { className: "bt-set-copy" }, (0, import_react34.createElement)("span", null, label), hint ? (0, import_react34.createElement)("span", { className: "bt-set-hint" }, hint) : null),
+ children ? (0, import_react34.createElement)("div", { className: "bt-set-control" }, children) : null
);
}
+ var LAYOUTS = [["bubble", "Bubble"], ["flat", "Flat"]];
+ function Choice({ label, value, options, pick: pick2 }) {
- return (0, import_react33.createElement)(Segmented, { label, value, className: "bt-look-seg" }, options.map(([id, text]) => (0, import_react33.createElement)("button", {
++ return (0, import_react34.createElement)(Segmented, { label, value, className: "bt-look-seg" }, options.map(([id, text]) => (0, import_react34.createElement)("button", {
+ key: id,
+ type: "button",
+ "aria-pressed": value === id,
+ onClick: () => {
+ if (value !== id) pick2(id);
+ }
+ }, t(text))));
+ }
+ function WidthSlider({ label, value, save }) {
- const [width, setWidth] = (0, import_react33.useState)(value);
- const pending = (0, import_react33.useRef)(null);
- const timer = (0, import_react33.useRef)(0);
- const saveRef = (0, import_react33.useRef)(save);
++ const [width, setWidth] = (0, import_react34.useState)(value);
++ const pending = (0, import_react34.useRef)(null);
++ const timer = (0, import_react34.useRef)(0);
++ const saveRef = (0, import_react34.useRef)(save);
+ saveRef.current = save;
- (0, import_react33.useEffect)(() => {
++ (0, import_react34.useEffect)(() => {
+ if (pending.current === null) setWidth(value);
+ }, [value]);
+ const flush = () => {
+ const next = pending.current;
+ pending.current = null;
+ if (next !== null) saveRef.current(next);
+ };
- (0, import_react33.useEffect)(() => () => {
++ (0, import_react34.useEffect)(() => () => {
+ clearTimeout(timer.current);
+ flush();
+ }, []);
+ const pick2 = (next) => {
+ setWidth(next);
+ pending.current = next;
+ clearTimeout(timer.current);
+ timer.current = setTimeout(flush, 350);
+ };
+ const { min, max, step } = MESSAGE_WIDTH;
- return (0, import_react33.createElement)(
++ return (0, import_react34.createElement)(
+ "div",
+ { className: "bt-range", style: { "--bt-fill": `${(width - min) / (max - min) * 100}%` } },
- (0, import_react33.createElement)("input", { type: "range", min, max, step, value: width, "aria-label": label, "aria-valuetext": `${width}%`, onChange: (event) => pick2(Number(event.target.value)) }),
- (0, import_react33.createElement)("output", null, `${width}%`)
++ (0, import_react34.createElement)("input", { type: "range", min, max, step, value: width, "aria-label": label, "aria-valuetext": `${width}%`, onChange: (event) => pick2(Number(event.target.value)) }),
++ (0, import_react34.createElement)("output", null, `${width}%`)
+ );
+ }
function GeneralPage({ roster, actions, run }) {
const prefs = roster.prefs ?? {};
const themes = allThemes();
@@@ -13016,24 -12869,28 +13402,28 @@@
style: { background: INKS[ink][0] },
onClick: () => run(actions.setPrefs({ accent: INKS[ink][0] }))
})),
- (0, import_react33.createElement)(
+ (0, import_react34.createElement)(
"label",
{ className: "bt-swatch bt-swatch-custom", title: t("Custom accent"), "data-on": Boolean(prefs.accent) && !ACCENT_INKS.some((ink) => INKS[ink][0] === prefs.accent) },
- (0, import_react33.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) })
+ (0, import_react34.createElement)("input", { type: "color", value: custom, "aria-label": t("Custom accent"), onChange: (event) => pickCustom(event.target.value) })
)
)
- )
+ ),
- (0, import_react33.createElement)(SetRow, { label: t("Message layout") }, (0, import_react33.createElement)(Choice, { label: t("Message layout"), value: layoutOf(prefs), options: LAYOUTS, pick: (id) => run(actions.setPrefs({ layout: id })) })),
++ (0, import_react34.createElement)(SetRow, { label: t("Message layout") }, (0, import_react34.createElement)(Choice, { label: t("Message layout"), value: layoutOf(prefs), options: LAYOUTS, pick: (id) => run(actions.setPrefs({ layout: id })) })),
+ // The flat layout's text has a width of its own; the bubble width stays for the user's messages.
- layoutOf(prefs) === "flat" ? (0, import_react33.createElement)(SetRow, { label: t("Text width") }, (0, import_react33.createElement)(WidthSlider, { label: t("Text width"), value: flatWidthOf(prefs), save: (flatWidth) => run(actions.setPrefs({ flatWidth })) })) : null,
- (0, import_react33.createElement)(SetRow, { label: t("Bubble width") }, (0, import_react33.createElement)(WidthSlider, { label: t("Bubble width"), value: widthOf(prefs), save: (width) => run(actions.setPrefs({ width })) }))
++ layoutOf(prefs) === "flat" ? (0, import_react34.createElement)(SetRow, { label: t("Text width") }, (0, import_react34.createElement)(WidthSlider, { label: t("Text width"), value: flatWidthOf(prefs), save: (flatWidth) => run(actions.setPrefs({ flatWidth })) })) : null,
++ (0, import_react34.createElement)(SetRow, { label: t("Bubble width") }, (0, import_react34.createElement)(WidthSlider, { label: t("Bubble width"), value: widthOf(prefs), save: (width) => run(actions.setPrefs({ width })) }))
),
- actions.setSurface ? (0, import_react33.createElement)(
+ actions.setSurface ? (0, import_react34.createElement)(
SetSection,
{ key: "mode", title: t("Mode") },
- (0, import_react33.createElement)(
+ (0, import_react34.createElement)(
SetRow,
{ label: t("Classic Agent mode") },
- (0, import_react33.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.setSurface("agent") }, t("Switch"))
+ (0, import_react34.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", onClick: () => actions.setSurface("agent") }, t("Switch"))
)
) : null,
- (0, import_react33.createElement)(LocationsSection, { key: "places", actions, run })
+ (0, import_react34.createElement)(LocationsSection, { key: "places", actions, run })
];
}
function LocationsSection({ actions, run }) {
@@@ -13303,14 -13160,15 +13693,15 @@@ function ContextMenu({ menu, roster, ac
window.addEventListener("mousedown", onDown);
return () => window.removeEventListener("mousedown", onDown);
}, []);
- const ref = (0, import_react34.useRef)(null);
- const [place, setPlace] = (0, import_react34.useState)({ left: menu.x, top: menu.y });
+ const ref = (0, import_react35.useRef)(null);
+ const [place, setPlace] = (0, import_react35.useState)({ left: menu.x, top: menu.y });
+ const tick = useViewport();
- (0, import_react34.useLayoutEffect)(() => {
+ (0, import_react35.useLayoutEffect)(() => {
const box = ref.current?.getBoundingClientRect();
if (!box) return;
- setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) });
- }, [menu.x, menu.y]);
+ setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, viewBottom() - box.height - 8)) });
+ }, [menu.x, menu.y, tick]);
- if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react34.createElement)(AgentMenu, { menu, roster, actions, leaving });
+ if (menu.kind === "agent" || menu.kind === "agent-session") return (0, import_react35.createElement)(AgentMenu, { menu, roster, actions, leaving });
const bot = roster.byId[menu.id];
const room2 = roster.roomsById[menu.id];
const entry = bot ?? room2;
@@@ -13362,13 -13220,14 +13753,14 @@@
);
}
function AgentMenu({ menu, roster, actions, leaving }) {
- const ref = (0, import_react34.useRef)(null);
- const [place, setPlace] = (0, import_react34.useState)({ left: menu.x, top: menu.y });
+ const ref = (0, import_react35.useRef)(null);
+ const [place, setPlace] = (0, import_react35.useState)({ left: menu.x, top: menu.y });
+ const tick = useViewport();
- (0, import_react34.useLayoutEffect)(() => {
+ (0, import_react35.useLayoutEffect)(() => {
const box = ref.current?.getBoundingClientRect();
if (!box) return;
- setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, window.innerHeight - box.height - 8)) });
- }, [menu.x, menu.y]);
+ setPlace({ left: Math.max(8, Math.min(menu.x, window.innerWidth - box.width - 8)), top: Math.max(8, Math.min(menu.y, viewBottom() - box.height - 8)) });
+ }, [menu.x, menu.y, tick]);
const agent = roster.agentsById[menu.kind === "agent" ? menu.id : menu.agentId];
if (agent === void 0) return null;
const groups = menu.kind === "agent" ? [
@@@ -14307,24 -14168,25 +14701,25 @@@ function BotPanel({ pane, leaving, rost
const tabState = useBrowserTabs((map) => bot ? map[bot.id] ?? EMPTY_TABS2 : EMPTY_TABS2);
const active = tabState.active;
const page = useBrowserPages((pages) => (active ? pages[active] : null) ?? EMPTY_PAGE);
- const root = (0, import_react37.useRef)(null);
- const fly = (0, import_react37.useRef)(null);
- const [landed, setLanded] = (0, import_react37.useState)(false);
- const [settling, setSettling] = (0, import_react37.useState)(false);
- const [width, setWidth] = (0, import_react37.useState)(savedWidth);
- const [viewport, setViewport] = (0, import_react37.useState)(() => window.innerWidth);
- const [dragging, setDragging] = (0, import_react37.useState)(false);
- const [resizing, setResizing] = (0, import_react37.useState)(false);
+ const root = (0, import_react38.useRef)(null);
+ const fly = (0, import_react38.useRef)(null);
+ const [landed, setLanded] = (0, import_react38.useState)(false);
+ const [settling, setSettling] = (0, import_react38.useState)(false);
+ const [width, setWidth] = (0, import_react38.useState)(savedWidth);
+ const [viewport, setViewport] = (0, import_react38.useState)(() => window.innerWidth);
+ const [dragging, setDragging] = (0, import_react38.useState)(false);
+ const [resizing, setResizing] = (0, import_react38.useState)(false);
const instant = dragging || resizing;
- const [reading, setReading] = (0, import_react37.useState)(false);
+ const [reading, setReading] = (0, import_react38.useState)(false);
+ const overlay = overlayAt(view, viewport);
const panelWidth = fitWidth(width ?? (view === "browser" ? DEFAULT_WIDTH : DETAILS_WIDTH), widthRange(view, viewport));
- (0, import_react37.useLayoutEffect)(() => {
+ (0, import_react38.useLayoutEffect)(() => {
if (view === "browser" && width === null) setWidth(DEFAULT_WIDTH);
}, [view, width]);
- (0, import_react37.useLayoutEffect)(() => {
+ (0, import_react38.useLayoutEffect)(() => {
chatRoom.hold(instant);
}, [instant]);
- const [last, setLast] = (0, import_react37.useState)({ view, width: panelWidth });
+ const [last, setLast] = (0, import_react38.useState)({ view, width: panelWidth });
if (last.view !== view || last.width !== panelWidth) {
setLast({ view, width: panelWidth });
if (last.view !== view) setSettling(last.width !== panelWidth && !instant);
@@@ -14334,10 -14196,10 +14729,10 @@@
const switched = settling && shownView.current !== view;
shownView.current = view;
if (switched) chatRoom.hold(true);
- chatRoom.set(leaving ? null : panelWidth);
+ chatRoom.set(leaving || overlay ? null : panelWidth);
if (switched) chatRoom.hold(false);
- }, [view, panelWidth, leaving]);
+ }, [view, panelWidth, leaving, overlay]);
- (0, import_react37.useEffect)(() => () => {
+ (0, import_react38.useEffect)(() => () => {
chatRoom.set(null);
chatRoom.hold(false);
}, []);
@@@ -14513,15 -14376,15 +14909,15 @@@
if (event.target === event.currentTarget) setLanded(true);
}
},
- leaving ? null : (0, import_react38.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }),
- leaving || overlay ? null : (0, import_react37.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }),
++ leaving || overlay ? null : (0, import_react38.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }),
// Over the whole window while dragging: the cursor stays a resize cursor and the
// pages underneath (the chat, the guest) see no pointer.
- dragging ? (0, import_react_dom8.createPortal)((0, import_react37.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null,
- hasStrip ? (0, import_react37.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null,
- view === "browser" && bot ? (0, import_react37.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react37.createElement)(
+ dragging ? (0, import_react_dom8.createPortal)((0, import_react38.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null,
+ hasStrip ? (0, import_react38.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null,
+ view === "browser" && bot ? (0, import_react38.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react38.createElement)(
"div",
{ key: `details:${pane.id}:${pane.renaming ? "rename" : ""}:${pane.tab ?? ""}`, className: "bt-panel-view" },
- (0, import_react37.createElement)(DetailsDrawer, {
+ (0, import_react38.createElement)(DetailsDrawer, {
sessionId: pane.id,
startRenaming: pane.renaming,
startTab: pane.tab,
@@@ -15568,25 -15441,43 +15974,43 @@@ function UserMessageCell({ node, sessio
const steering = node.kind === "steering";
const groupTime = roster.roomsById?.[sessionId] && Number.isFinite(data.time) ? messageClock(data.time) : void 0;
const { shown, folded, control } = useFold(text, { markdown: false });
- const body = (0, import_react39.createElement)(UserText, { text: shown, bots: mentionableBots(roster, sessionId), referenceLabels, skillNames: data.skillNames ?? [], references, actions });
- const row = (0, import_react39.useRef)(null);
- const [toolsOpen, setToolsOpen] = (0, import_react39.useState)(false);
- (0, import_react39.useEffect)(() => {
+ const body = (0, import_react40.createElement)(UserText, { text: shown, bots: mentionableBots(roster, sessionId), referenceLabels, skillNames: data.skillNames ?? [], references, actions });
++ const row = (0, import_react40.useRef)(null);
++ const [toolsOpen, setToolsOpen] = (0, import_react40.useState)(false);
++ (0, import_react40.useEffect)(() => {
+ if (!toolsOpen) return void 0;
+ const onDown = (event) => {
+ if (!row.current?.contains(event.target)) setToolsOpen(false);
+ };
+ window.addEventListener("mousedown", onDown);
+ window.addEventListener("touchstart", onDown);
+ return () => {
+ window.removeEventListener("mousedown", onDown);
+ window.removeEventListener("touchstart", onDown);
+ };
+ }, [toolsOpen]);
+ const tapTools = (event) => {
+ if (!noHover() || event.target instanceof Element && event.target.closest("a,button,input,textarea,select,pre,code,[role=button],[role=link]")) return;
+ setToolsOpen((value) => !value);
+ };
- return (0, import_react39.createElement)(
+ return (0, import_react40.createElement)(
"div",
- { className: "bt-umsg", "data-steering": steering || void 0 },
+ { ref: row, className: "bt-umsg", "data-steering": steering || void 0 },
- (0, import_react39.createElement)(
+ (0, import_react40.createElement)(
"div",
{ className: "bt-ustack" },
- attachments.length > 0 ? (0, import_react39.createElement)(Attachments, { attachments, renderMessageImages }) : null,
- text !== "" || rest.length > 0 ? (0, import_react39.createElement)(
+ attachments.length > 0 ? (0, import_react40.createElement)(Attachments, { attachments, renderMessageImages }) : null,
+ text !== "" || rest.length > 0 ? (0, import_react40.createElement)(
"div",
- { className: "bt-ubody", title: clock3(data.time), "data-folded": folded || void 0 },
+ { className: "bt-ubody", title: clock3(data.time), "data-folded": folded || void 0, onClick: tapTools },
- control ? (0, import_react39.createElement)("div", { className: "bt-fold-body" }, body) : body,
+ control ? (0, import_react40.createElement)("div", { className: "bt-fold-body" }, body) : body,
control,
- rest.map((block, index) => ui.JsonBlock ? (0, import_react39.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null)
+ rest.map((block, index) => ui.JsonBlock ? (0, import_react40.createElement)(ui.JsonBlock, { key: index, label: t("Content"), payload: block }) : null)
) : null,
- referenceLabels.length > 0 ? (0, import_react39.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null,
- groupTime ? (0, import_react39.createElement)("div", { className: "bt-utime", title: clockLabel(data.time) }, groupTime) : null
+ referenceLabels.length > 0 ? (0, import_react40.createElement)("div", { className: "bt-urefs" }, t("Referenced {labels}", { labels: referenceLabels.join(t(", ")) })) : null,
+ groupTime ? (0, import_react40.createElement)("div", { className: "bt-utime", title: clockLabel(data.time) }, groupTime) : null
),
- text === "" ? null : (0, import_react40.createElement)("div", { className: "bt-utools" }, (0, import_react40.createElement)(CopyButton, { text }))
- text === "" ? null : (0, import_react39.createElement)("div", { className: "bt-utools", "data-open": toolsOpen || void 0 }, (0, import_react39.createElement)(CopyButton, { text }))
++ text === "" ? null : (0, import_react40.createElement)("div", { className: "bt-utools", "data-open": toolsOpen || void 0 }, (0, import_react40.createElement)(CopyButton, { text }))
);
}
var USER_MESSAGE_CSS = `
diff --cc ds-bot/src/client/cells.js
index 6973047e,514a896f..1d9b4ec9
--- a/ds-bot/src/client/cells.js
+++ b/ds-bot/src/client/cells.js
@@@ -11,11 -11,11 +11,13 @@@ import { SecretToolCell } from './secre
import { t } from './i18n.js'
import { call } from './api.js'
import { failureLabel } from './diagnostics.js'
- import { turnReasoning, thinkingStep } from './turn-reasoning.js'
+ import { turnReasoning, thinkingStep, opensReply } from './turn-reasoning.js'
import { FOLD_AT, FOLD_HUGE, stripLongNote, useFold } from './fold.js'
+ import { noHover, useViewport, viewBottom } from './motion.js'
import { heldCardKey } from './sources.js'
+import { BtwCardView } from './btw.js'
+import { earlierPartCards, partIndexOf, withBtwRows } from './btw-model.js'
+ import { layoutOf } from './themes.js'
export { clockLabel }
@@@ -436,8 -451,13 +471,14 @@@ function chatRow(row, key, { sessionId
case 'divider': return h(PartLine, { key, time: row.time })
case 'user': return h(EarlierUser, { key, row })
case 'answer': return h(AnsweredReply, { key, node: { data: row } })
- case 'bot': return h(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : undefined, msgKey: useUi ? `${sessionId}:${row.time}` : undefined, useUi, fold: FOLD_HUGE })
+ // A display-only view replays from the blueprint the host kept on the call.
+ case 'view': return h(WidgetCell, { key, sessionId, callId: row.callId, args: { text: name => name === 'title' ? row.title : undefined, value: name => name === 'view' ? row.view : undefined }, done: true, isError: false, roster, actions })
+ case 'bot': {
+ const bubbles = h(Bubbles, { key, texts: row.texts, roster, selfId, actions, sessionId: useUi ? sessionId : undefined, msgKey: useUi ? `${sessionId}:${row.time}` : undefined, useUi, fold: FOLD_HUGE })
+ const speaker = layoutOf(roster.prefs) === 'flat' ? roster.byId[selfId] : undefined
+ return speaker ? h(Fragment, { key }, h(SpeakerHead, { bot: speaker, time: row.time }), bubbles) : bubbles
+ }
+ case 'btw': return h(BtwCardView, { key, card: row.card, actions })
case 'event': {
if (row.role === 'report') return h(GroupEvent, { key, prefix: t('Replies from'), room: roster.roomsById[row.roomId], name: t('a group chat'), roster, actions })
const other = roster.byId[row.botId] ?? { id: row.botId, name: row.name ?? t('a Bot'), color: 'gray' }
diff --cc ds-bot/src/host/channel.js
index 529854ca,90ce7f4c..adc49ddc
--- a/ds-bot/src/host/channel.js
+++ b/ds-bot/src/host/channel.js
@@@ -1,8 -1,8 +1,9 @@@
// Client channel: the team view the browser renders, and the POST /api/bot endpoints.
import { randomUUID } from 'node:crypto'
import { createUserMessage } from '@deepseek-ai/dsh-llm'
+import { install as installBtw } from './btw.js'
import { questionReply, viewReply } from './parts.js'
+ import { defaultRelayLimit } from './groups.js'
import { validateViewAnswer } from '../shared/views.js'
import { COLORS, EXTRA_COLORS, ROUTE } from './constants.js'