Skip to content

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

Show what a group's members are doing

Fei2411cb6dc05b3c95
diff --git a/ds-bot/client.js b/ds-bot/client.js
index 6e6a2f55..40893309 100644
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@ -454,6 +454,15 @@ var ZH = {
"{name} looked up its own chat": "{name} 查看了自己的对话",
"{name} looked up its own chat for “{text}”": "{name} 在自己的对话里查找「{text}」",
"{name} is typing…": "{name} 正在输入…",
+ "{name} didn't answer in time": "{name} 没有及时回应",
+ "{name} paused for your approval": "{name} 停下来等你批准",
+ "{name} is waiting for your approval": "{name} 等你批准",
+ "{first} and {second} are waiting for your approval": "{first}、{second} 等你批准",
+ "{first}, {second} and {count} more are waiting for your approval": "{first}、{second} 等 {total} 个等你批准",
+ "Waiting for your approval": "等你批准",
+ "in its own chat": "在自己的对话里",
+ Reject: "拒绝",
+ "Allow once": "允许一次",
"Couldn't message {name}": "没能给 {name} 发消息",
Messaged: "已发消息给",
"Couldn't stop {name}": "没能叫停 {name}",
@@ -1120,8 +1129,8 @@ function bodyOf(def, paint, flat = false) {
return "";
}
}
-var eyeMarkup = ([cx, cy, w, h30, tilt]) => `<g transform="translate(${cx} ${cy}) rotate(${tilt})"><rect class="bt-eye" x="${-w / 2}" y="${-h30 / 2}" width="${w}" height="${h30}" rx="${w / 2}"/></g>`;
-var happyEyeMarkup = ([cx, cy, w, h30, tilt]) => `<g transform="translate(${cx} ${cy}) rotate(${tilt})"><path class="bt-eye-happy" opacity="0" d="M${-w * 0.62} ${h30 * 0.14}Q0 ${-h30 * 0.42} ${w * 0.62} ${h30 * 0.14}" fill="none" stroke="#000" stroke-width="${w * 0.5}" stroke-linecap="round"/></g>`;
+var eyeMarkup = ([cx, cy, w, h31, tilt]) => `<g transform="translate(${cx} ${cy}) rotate(${tilt})"><rect class="bt-eye" x="${-w / 2}" y="${-h31 / 2}" width="${w}" height="${h31}" rx="${w / 2}"/></g>`;
+var happyEyeMarkup = ([cx, cy, w, h31, tilt]) => `<g transform="translate(${cx} ${cy}) rotate(${tilt})"><path class="bt-eye-happy" opacity="0" d="M${-w * 0.62} ${h31 * 0.14}Q0 ${-h31 * 0.42} ${w * 0.62} ${h31 * 0.14}" fill="none" stroke="#000" stroke-width="${w * 0.5}" stroke-linecap="round"/></g>`;
var maskBox = (size) => `maskUnits="userSpaceOnUse" x="${-size}" y="${-size}" width="${size * 3}" height="${size * 3}"`;
var holes = (def, eyes) => `<rect x="${-def.size}" y="${-def.size}" width="${def.size * 3}" height="${def.size * 3}" fill="#fff"/>${eyes}`;
var MASK_ID = "%MASK%";
@@ -1520,12 +1529,12 @@ function liveSprings(apply2) {
const dt = Math.min(0.5, Math.max(1e-3, (now - last) / 1e3));
last = now;
const steps = Math.ceil(dt * 240);
- const h30 = dt / steps;
+ const h31 = dt / steps;
let moving = false;
for (const value of values.values()) {
for (let index = 0; index < steps; index += 1) {
- value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h30;
- value.x += value.v * h30;
+ value.v += (-value.k * (value.x - value.to) - value.c * value.v) * h31;
+ value.x += value.v * h31;
}
if (Math.abs(value.x - value.to) < 0.05 && Math.abs(value.v) < 1) {
value.x = value.to;
@@ -4149,6 +4158,10 @@ function toolActivity(name, arg, findBot, self2) {
return { label: phrase ? t(phrase) : null, state: toolState(name) };
}
}
+function workPhrase(tool) {
+ if (!tool) return t("Thinking about it");
+ return toolActivity(tool, () => void 0, () => void 0)?.label ?? t("On it");
+}
function useLiveNote(actions, sessionId, id, entry) {
const key = entry ? JSON.stringify(entry) : "";
(0, import_react6.useEffect)(() => {
@@ -4157,7 +4170,7 @@ function useLiveNote(actions, sessionId, id, entry) {
return () => actions.noteLive(sessionId, id, null);
}, [sessionId, id, key]);
}
-function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi }) {
+function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi, useWork }) {
const [live, setLive] = (0, import_react6.useState)({ replies: [], speaking: null });
(0, import_react6.useEffect)(() => {
if (done) return void 0;
@@ -4190,6 +4203,7 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi
}
}
const pending = done || !live.speaking ? [] : [live.speaking];
+ const speakerTool = useWork?.((work) => work.bots?.[live.speaking]?.tool) ?? void 0;
if (replies.length === 0 && pending.length === 0) return null;
const room2 = roster.roomsById[sessionId];
return (0, import_react6.createElement)(
@@ -4218,6 +4232,21 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi
reply.text ? t("{name} looked up its own chat for “{text}”", { name: bot.name, text: reply.text }) : t("{name} looked up its own chat", { name: bot.name })
);
}
+ if (reply.kind === "missed") {
+ return (0, import_react6.createElement)("div", { key: `${reply.botId}-${index}`, className: "bt-event" }, t("{name} didn't answer in time", { name: bot.name }));
+ }
+ if (reply.kind === "approval") {
+ return (0, import_react6.createElement)(
+ "div",
+ { key: `${reply.botId}-${index}`, className: "bt-event" },
+ (0, import_react6.createElement)(
+ "button",
+ { type: "button", className: "bt-event-whole", onClick: () => actions.showDetails(sessionId) },
+ (0, import_react6.createElement)(BotMark, { bot, size: 16 }),
+ (0, import_react6.createElement)("span", { className: "bt-event-name" }, t("{name} paused for your approval", { name: bot.name }))
+ )
+ );
+ }
return (0, import_react6.createElement)(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room: room2, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : void 0, useUi });
}),
pending.map((id) => {
@@ -4226,13 +4255,13 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi
return (0, import_react6.createElement)(
"div",
{ key: `pending-${id}`, className: "bt-activity" },
- (0, import_react6.createElement)(BotMark, { bot, size: 22, state: "thinking" }),
- (0, import_react6.createElement)(Shimmer, null, t("{name} is typing…", { name: bot.name }))
+ (0, import_react6.createElement)(BotMark, { bot, size: 22, state: speakerTool ? toolState(speakerTool) : "thinking" }),
+ (0, import_react6.createElement)(Shimmer, null, speakerTool ? `${bot.name} · ${workPhrase(speakerTool)}…` : t("{name} is typing…", { name: bot.name }))
);
})
);
}
-function ToolCell({ node, sessionId, useRoster, useUi, actions }) {
+function ToolCell({ node, sessionId, useRoster, useUi, useWork, actions }) {
const roster = useRoster((value) => value);
const root = node.data.root;
const done = root.kind === "tool-result";
@@ -4264,7 +4293,7 @@ function ToolCell({ node, sessionId, useRoster, useUi, actions }) {
return done && target ? (0, import_react6.createElement)(EventLine, { prefix: t("Updated"), bots: [target], onOpen: (bot) => actions.openSession(bot.id) }) : null;
}
case "group_relay":
- return (0, import_react6.createElement)(GroupReplies, { sessionId, callId: root.callId, done, content: root.content, roster, actions, useUi });
+ return (0, import_react6.createElement)(GroupReplies, { sessionId, callId: root.callId, done, content: root.content, roster, actions, useUi, useWork });
case "create_group":
case "update_group":
case "delete_group":
@@ -10390,8 +10419,142 @@ function migrateStorage(storage = globalThis.localStorage) {
}
}
-// src/client/details-drawer.js
+// src/client/member-status.js
var import_react28 = require("react");
+var NO_WORK = { bots: {}, approvals: [] };
+function memberWork(room2, work = NO_WORK) {
+ return room2.members.map((id) => {
+ const approvals = (work.approvals ?? []).filter((entry) => entry.botId === id);
+ const doing = work.bots?.[id];
+ return { id, approvals, doing, state: approvals.length > 0 ? "ask" : doing ? "work" : "idle" };
+ });
+}
+function busyMembers(room2, work, roster) {
+ const busy = memberWork(room2, work).filter((entry) => entry.state !== "idle" && roster.byId[entry.id]);
+ return [...busy.filter((entry) => entry.state === "ask"), ...busy.filter((entry) => entry.state === "work")].map((entry) => ({ ...entry, bot: roster.byId[entry.id] }));
+}
+function summaryText(busy) {
+ const asks = busy.filter((entry) => entry.state === "ask");
+ const workers = busy.filter((entry) => entry.state === "work");
+ const names = asks.slice(0, 2).map((entry) => entry.bot.name);
+ const waiting = asks.length === 0 ? "" : asks.length === 1 ? t("{name} is waiting for your approval", { name: names[0] }) : asks.length === 2 ? t("{first} and {second} are waiting for your approval", { first: names[0], second: names[1] }) : t("{first}, {second} and {count} more are waiting for your approval", { first: names[0], second: names[1], count: asks.length - 2, total: asks.length });
+ const first = workers[0];
+ const doing = first ? `${first.bot.name} · ${workPhrase(first.doing.tool)}…${workers.length > 1 ? ` +${workers.length - 1}` : ""}` : "";
+ return { waiting, doing };
+}
+function Face({ entry, size }) {
+ return (0, import_react28.createElement)(
+ "span",
+ { className: "bt-mw-face", "data-ask": entry.state === "ask" || void 0 },
+ (0, import_react28.createElement)(BotMark, { bot: entry.bot, size, state: entry.state === "ask" ? "alert" : toolState(entry.doing?.tool ?? "") })
+ );
+}
+function MemberDock({ sessionId, useRoster, useWork, actions }) {
+ const roster = useRoster((value) => value);
+ const work = useWork((value) => value);
+ const room2 = roster.roomsById[sessionId];
+ if (!room2) return null;
+ const busy = busyMembers(room2, work, roster);
+ if (busy.length === 0) return null;
+ const { waiting, doing } = summaryText(busy);
+ return (0, import_react28.createElement)(
+ "div",
+ { className: "bt-event bt-mw-dock" },
+ (0, import_react28.createElement)(
+ "button",
+ { type: "button", className: "bt-event-whole bt-mw-line", "aria-label": [waiting, doing].filter(Boolean).join(" · "), onClick: () => actions.showDetails(sessionId) },
+ (0, import_react28.createElement)("span", { className: "bt-mw-stack", "aria-hidden": true }, busy.slice(0, 4).map((entry) => (0, import_react28.createElement)(Face, { key: entry.id, entry, size: 16 }))),
+ waiting ? (0, import_react28.createElement)("span", { className: "bt-mw-ask" }, waiting) : null,
+ waiting && doing ? (0, import_react28.createElement)("span", { "aria-hidden": true }, "·") : null,
+ doing ? (0, import_react28.createElement)("span", { className: "bt-event-name" }, (0, import_react28.createElement)(Shimmer, null, doing)) : null
+ )
+ );
+}
+function useNow2(active) {
+ const [now, setNow] = (0, import_react28.useState)(Date.now);
+ (0, import_react28.useEffect)(() => {
+ if (!active) return void 0;
+ const timer = setInterval(() => setNow(Date.now()), 3e4);
+ return () => clearInterval(timer);
+ }, [active]);
+ return now;
+}
+var since = (now, at) => typeof at === "number" && now - at >= 6e4 ? ` · ${elapsedLabel(now - at)}` : "";
+function ApprovalCard({ approval, bot, actions }) {
+ const [busy, setBusy] = (0, import_react28.useState)(false);
+ const answer = (choice) => {
+ setBusy(true);
+ void Promise.resolve(actions.answerApproval(approval.id, choice)).catch((error) => actions.reportError(error, "approval")).finally(() => setBusy(false));
+ };
+ return (0, import_react28.createElement)(
+ "div",
+ { className: "bt-mw-card", role: "group", "aria-label": t("{name} is waiting for your approval", { name: bot.name }) },
+ (0, import_react28.createElement)("div", { className: "bt-mw-tool" }, approval.tool),
+ approval.detail?.text ? (0, import_react28.createElement)("div", { className: "bt-mw-text" }, approval.detail.text) : null,
+ approval.reason ? (0, import_react28.createElement)("div", { className: "bt-mw-reason" }, approval.reason) : null,
+ approval.detail?.code ? (0, import_react28.createElement)("code", { className: "bt-mw-code", title: approval.detail.code }, approval.detail.code) : null,
+ approval.answerable ? (0, import_react28.createElement)(
+ "div",
+ { className: "bt-mw-actions" },
+ (0, import_react28.createElement)("button", { type: "button", className: "bt-q-btn", disabled: busy, onClick: () => answer("reject") }, t("Reject")),
+ (0, import_react28.createElement)("button", { type: "button", className: "bt-q-submit", disabled: busy, onClick: () => answer("allow") }, t("Allow once"))
+ ) : (0, import_react28.createElement)(
+ "div",
+ { className: "bt-mw-actions" },
+ (0, import_react28.createElement)("button", { type: "button", className: "bt-q-btn", onClick: () => actions.openSession(bot.id) }, t("Open {name}'s chat", { name: bot.name }))
+ )
+ );
+}
+function MemberWork({ entry, bot, room: room2, roster, actions, now }) {
+ if (entry.state === "ask") {
+ return (0, import_react28.createElement)(
+ "div",
+ { className: "bt-mw-member" },
+ (0, import_react28.createElement)("div", { className: "bt-mw-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`),
+ entry.approvals.map((approval) => (0, import_react28.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions }))
+ );
+ }
+ if (entry.state !== "work") return null;
+ const where = entry.doing.roomId === room2.id ? "" : entry.doing.roomId ? t("in {name}", { name: roster.roomsById[entry.doing.roomId]?.name ?? t("a group chat") }) : t("in its own chat");
+ return (0, import_react28.createElement)(
+ "div",
+ { className: "bt-mw-member" },
+ (0, import_react28.createElement)("div", { className: "bt-mw-state" }, (0, import_react28.createElement)(Shimmer, null, `${workPhrase(entry.doing.tool)}…`), where ? ` ${where}` : "", since(now, entry.doing.since))
+ );
+}
+function useMemberWork(room2, useWork) {
+ const work = useWork?.((value) => value) ?? NO_WORK;
+ const entries2 = room2 ? memberWork(room2, work) : [];
+ const now = useNow2(entries2.some((entry) => entry.state !== "idle"));
+ return { entries: entries2, now };
+}
+var MEMBER_CSS = `
+.bt-event.bt-mw-dock{margin:0 0 6px;pointer-events:none}
+.bt-mw-dock>button{pointer-events:auto;animation:bt-mw-in .32s cubic-bezier(.23,1,.32,1) backwards}
+.bt-mw-line{gap:6px!important}
+.bt-mw-stack{display:inline-flex;align-items:center;flex:none;line-height:0}
+.bt-mw-stack>*+*{margin-left:-4px}
+.bt-mw-face{position:relative;display:inline-flex;flex:none;border-radius:50%}
+.bt-mw-stack .bt-mw-face{box-shadow:0 0 0 1.5px var(--bt-main,#fff)}
+.bt-mw-face[data-ask]::after{content:"";position:absolute;right:-2px;bottom:-2px;width:7px;height:7px;border-radius:50%;background:#e3a008;box-shadow:0 0 0 1.5px var(--bt-main,#fff)}
+.bt-mw-ask{color:#b7791f;flex:none;white-space:nowrap}
+body[data-ds-dark-theme] .bt-mw-ask{color:#f0b84a}
+.bt-mw-member{padding:0 6px 8px 42px;display:flex;flex-direction:column;gap:6px}
+.bt-mw-state{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-top:-4px}
+.bt-mw-card{display:flex;flex-direction:column;gap:4px;padding:10px 12px;border-radius:12px;background:var(--bt-hover);font-size:12px;line-height:17px;color:var(--bt-ink-2)}
+.bt-mw-tool{font-weight:600;color:var(--bt-ink)}
+.bt-mw-text{color:var(--bt-ink);overflow-wrap:anywhere}
+.bt-mw-reason{overflow-wrap:anywhere;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden}
+.bt-mw-code{display:block;font:11px/16px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:var(--bt-ink);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.bt-mw-actions{display:flex;justify-content:flex-end;gap:6px;margin-top:4px}
+.bt-mw-actions>button{height:28px;padding:0 12px;font-size:12px}
+.bt-mw-actions>button:disabled{opacity:.5;cursor:default}
+@keyframes bt-mw-in{from{opacity:0;transform:translateY(4px)}}
+@media (prefers-reduced-motion:reduce){.bt-mw-dock>button{animation:none}}
+`;
+
+// src/client/details-drawer.js
+var import_react29 = require("react");
function transcriptOf(list, id, name, hiddenTurns = []) {
const outline = list.projectionsBySession?.[id]?.values?.turnOutline ?? list.byId[id]?.projectionValues?.turnOutline;
if (!Array.isArray(outline)) return "";
@@ -10416,10 +10579,10 @@ var EMPTY_TABS = { ids: [], active: null };
var PERMISSION_LABELS = { "read-only": "Read only", "workspace-write": "Workspace", "danger-full-access": "Full access" };
var DANGER = /* @__PURE__ */ new Set(["danger-full-access"]);
function PermissionRow({ bot, roster, actions, run }) {
- const [pending, setPending] = (0, import_react28.useState)(null);
+ const [pending, setPending] = (0, import_react29.useState)(null);
const catalog = roster.permissions;
const saved = bot.permission ?? catalog?.defaultPreset;
- (0, import_react28.useEffect)(() => {
+ (0, import_react29.useEffect)(() => {
if (pending === saved) setPending(null);
}, [pending, saved]);
if (!catalog?.options?.length) return null;
@@ -10429,14 +10592,14 @@ function PermissionRow({ bot, roster, actions, run }) {
setPending(value);
void run(actions.updateBot(bot.id, { permission: value })).catch(() => setPending(null));
};
- return (0, import_react28.createElement)(
+ return (0, import_react29.createElement)(
"div",
{ className: "bt-drawer-permission" },
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t("Permissions")),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Permissions")),
+ (0, import_react29.createElement)(
Segmented,
{ label: t("Permissions"), value: current },
- catalog.options.map((option) => (0, import_react28.createElement)("button", {
+ catalog.options.map((option) => (0, import_react29.createElement)("button", {
key: option.value,
type: "button",
"aria-pressed": option.value === current,
@@ -10450,42 +10613,42 @@ function PermissionRow({ bot, roster, actions, run }) {
function BrowserCards({ bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) {
const state = useBrowserTabs((map) => map[bot.id] ?? EMPTY_TABS);
const pages = useBrowserPages((map) => map);
- (0, import_react28.useEffect)(() => {
+ (0, import_react29.useEffect)(() => {
actions.browserEnsure?.(bot.id);
}, [bot.id]);
if (roster.browser !== true || !actions.browserShow) {
- return (0, import_react28.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app."));
+ return (0, import_react29.createElement)("div", { className: "bt-muted" }, t("The browser is in the DSH Desktop app."));
}
if (state.ids.length === 0) {
- return (0, import_react28.createElement)(
+ return (0, import_react29.createElement)(
"div",
{ className: "bt-browser-empty-mark" },
- (0, import_react28.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }),
- (0, import_react28.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })),
- (0, import_react28.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })),
- (0, import_react28.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser"))
+ (0, import_react29.createElement)(BotMark, { bot, size: 40, state: "idle", live: true }),
+ (0, import_react29.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })),
+ (0, import_react29.createElement)("div", { className: "bt-muted" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name })),
+ (0, import_react29.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => actions.openBrowser(sessionId) }, t("Open browser"))
);
}
- return (0, import_react28.createElement)(
+ return (0, import_react29.createElement)(
"div",
{ className: "bt-bcards" },
state.ids.map((tabId, index) => {
const page = pages[tabId] ?? {};
const label = page.title || shortUrl(page.url) || t("New tab");
- return (0, import_react28.createElement)(
+ return (0, import_react29.createElement)(
"div",
{ key: tabId, className: "bt-bcard", "data-active": state.active === tabId || void 0, style: { animationDelay: `${index * 30}ms` } },
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"button",
{ type: "button", className: "bt-bcard-shot", "aria-label": t("Open {title}", { title: label }), title: page.url, onClick: () => actions.browserPick(sessionId, tabId) },
- page.excerpt ? (0, import_react28.createElement)(
+ page.excerpt ? (0, import_react29.createElement)(
"span",
{ className: "bt-bcard-preview" },
- (0, import_react28.createElement)("span", { className: "bt-bcard-ptitle" }, label),
- (0, import_react28.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt)
- ) : (0, import_react28.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react28.createElement)(GlobeIcon), (0, import_react28.createElement)("span", null, label))
+ (0, import_react29.createElement)("span", { className: "bt-bcard-ptitle" }, label),
+ (0, import_react29.createElement)("span", { className: "bt-bcard-excerpt" }, page.excerpt)
+ ) : (0, import_react29.createElement)("span", { className: "bt-bcard-blank" }, (0, import_react29.createElement)(GlobeIcon), (0, import_react29.createElement)("span", null, label))
),
- (0, import_react28.createElement)("button", {
+ (0, import_react29.createElement)("button", {
type: "button",
className: "bt-bcard-x",
"aria-label": t("Close tab"),
@@ -10494,78 +10657,87 @@ function BrowserCards({ bot, sessionId, roster, actions, useBrowserTabs, useBrow
void actions.browserCloseTab(bot.id, tabId);
}
}, "×"),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ className: "bt-bcard-row" },
- (0, import_react28.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }),
- (0, import_react28.createElement)("span", { className: "bt-bcard-title" }, label),
- page.url ? (0, import_react28.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null
+ (0, import_react29.createElement)(Favicon, { src: page.favicon, className: "bt-bcard-fav" }),
+ (0, import_react29.createElement)("span", { className: "bt-bcard-title" }, label),
+ page.url ? (0, import_react29.createElement)("span", { className: "bt-bcard-host" }, hostOf(page.url)) : null
)
);
}),
- (0, import_react28.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react28.createElement)(PlusIcon), t("New tab"))
+ (0, import_react29.createElement)("button", { type: "button", className: "bt-bcard-new", style: { animationDelay: `${state.ids.length * 30}ms` }, onClick: () => actions.browserNewTab(sessionId) }, (0, import_react29.createElement)(PlusIcon), t("New tab"))
);
}
function About({ text, title = "About" }) {
- const [open, setOpen] = (0, import_react28.useState)(false);
+ const [open, setOpen] = (0, import_react29.useState)(false);
const long = text.split("\n").length > 5 || text.length > 240;
- const body = (0, import_react28.useRef)(null);
+ const body = (0, import_react29.useRef)(null);
useMorph(body, open);
- return (0, import_react28.createElement)(
+ return (0, import_react29.createElement)(
"div",
null,
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t(title)),
- (0, import_react28.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text),
- long ? (0, import_react28.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t(title)),
+ (0, import_react29.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text),
+ long ? (0, import_react29.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null
);
}
-function GroupOverview({ room: room2, roster, actions, usage, openSettings }) {
+function GroupOverview({ room: room2, roster, actions, usage, useWork, openSettings }) {
const members = room2.members.map((id) => roster.byId[id]).filter(Boolean);
+ const { entries: entries2, now } = useMemberWork(room2, useWork);
return [
- room2.notice ? (0, import_react28.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react28.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")),
- (0, import_react28.createElement)(
+ room2.notice ? (0, import_react29.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react29.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")),
+ (0, import_react29.createElement)(
"div",
{ key: "members" },
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })),
- (0, import_react28.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => (0, import_react28.createElement)(
- "div",
- { key: member.id, className: "bt-member", role: "listitem" },
- (0, import_react28.createElement)(
- "button",
- { type: "button", className: "bt-member-name", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) },
- (0, import_react28.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }),
- (0, import_react28.createElement)("span", null, member.name)
- ),
- room2.admin === member.id ? (0, import_react28.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null
- )))
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })),
+ (0, import_react29.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => {
+ const entry = entries2.find((item) => item.id === member.id);
+ return (0, import_react29.createElement)(
+ "div",
+ { key: member.id, role: "listitem" },
+ (0, import_react29.createElement)(
+ "div",
+ { className: "bt-member" },
+ (0, import_react29.createElement)(
+ "button",
+ { type: "button", className: "bt-member-name", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) },
+ (0, import_react29.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }),
+ (0, import_react29.createElement)("span", null, member.name)
+ ),
+ room2.admin === member.id ? (0, import_react29.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null
+ ),
+ entry ? (0, import_react29.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null
+ );
+ }))
),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ key: "mode" },
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t("Who answers")),
- (0, import_react28.createElement)("div", { className: "bt-kv" }, (0, import_react28.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone")))
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Who answers")),
+ (0, import_react29.createElement)("div", { className: "bt-kv" }, (0, import_react29.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone")))
),
- usage ? (0, import_react28.createElement)(
+ usage ? (0, import_react29.createElement)(
"div",
{ key: "usage" },
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t("Usage")),
- (0, import_react28.createElement)("div", { className: "bt-kv" }, (0, import_react28.createElement)("span", null, room2.name), (0, import_react28.createElement)("span", null, usage))
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Usage")),
+ (0, import_react29.createElement)("div", { className: "bt-kv" }, (0, import_react29.createElement)("span", null, room2.name), (0, import_react29.createElement)("span", null, usage))
) : null
];
}
-function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages }) {
+function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) {
const owner = roster.byId[sessionId];
const part = owner ? currentPart(owner) : sessionId;
const isMainBot = isMainOf(roster, owner?.id);
- const [tab, setTab] = (0, import_react28.useState)("details");
+ const [tab, setTab] = (0, import_react29.useState)("details");
const room2 = roster.roomsById[sessionId];
- const [view, setView] = (0, import_react28.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview");
- const [editing, setEditing] = (0, import_react28.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId])));
- const [draftName, setDraftName] = (0, import_react28.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : ""));
- const [copied, setCopied] = (0, import_react28.useState)(false);
- const [error, setError] = (0, import_react28.useState)("");
+ const [view, setView] = (0, import_react29.useState)(startTab === "settings" && (owner || room2) ? "settings" : "overview");
+ const [editing, setEditing] = (0, import_react29.useState)(Boolean(startRenaming && (roster.byId[sessionId] || roster.roomsById[sessionId])));
+ const [draftName, setDraftName] = (0, import_react29.useState)(roster.byId[sessionId]?.name ?? (roster.roomsById[sessionId]?.named ? roster.roomsById[sessionId].name : ""));
+ const [copied, setCopied] = (0, import_react29.useState)(false);
+ const [error, setError] = (0, import_react29.useState)("");
const glide = useGlide(tab);
- const last = (0, import_react28.useRef)({ view, tab, move: void 0 });
+ const last = (0, import_react29.useRef)({ view, tab, move: void 0 });
if (last.current.view !== view) last.current = { view, tab, move: view === "settings" ? "in" : "out" };
else if (last.current.tab !== tab) last.current = { view, tab, move: "tab" };
const move = last.current.move;
@@ -10590,36 +10762,36 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a
setTimeout(() => setCopied(false), 1600);
});
};
- const errorLine = error ? (0, import_react28.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null;
+ const errorLine = error ? (0, import_react29.createElement)("div", { className: "bt-error", role: "alert", style: { padding: 0 } }, error) : null;
if ((bot || room2) && view === "settings") {
return [
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ key: "head", className: "bt-subhead", "data-move": move },
- (0, import_react28.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react28.createElement)(ChevronLeftIcon)),
- (0, import_react28.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")),
- hasStrip ? null : (0, import_react28.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react28.createElement)(CloseIcon))
+ (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back to details"), onClick: () => setView("overview") }, (0, import_react29.createElement)(ChevronLeftIcon)),
+ (0, import_react29.createElement)("span", { className: "bt-subhead-title" }, bot ? t("Settings") : t("Group settings")),
+ hasStrip ? null : (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Close details"), onClick: close }, (0, import_react29.createElement)(CloseIcon))
),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ key: "set-body", className: "bt-drawer-body bt-set-body", "data-move": move },
errorLine,
- bot ? (0, import_react28.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react28.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close })
+ bot ? (0, import_react29.createElement)(BotSettingsForm, { bot, roster, actions, run }) : (0, import_react29.createElement)(GroupSettingsForm, { room: room2, roster, actions, run, onDeleted: close })
)
];
}
- const top = (0, import_react28.createElement)(
+ const top = (0, import_react29.createElement)(
"div",
{ className: "bt-drawer-top", "data-move": side },
- bot || room2 ? (0, import_react28.createElement)("button", { type: "button", className: "bt-round", "aria-label": bot ? t("Edit Bot") : t("Group settings"), title: bot ? t("Edit Bot") : t("Group settings"), "data-info-row": "settings", onClick: () => setView("settings") }, (0, import_react28.createElement)(GearIcon)) : null,
- bot && roster.browser === true && actions.openBrowser ? (0, import_react28.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react28.createElement)(GlobeIcon)) : null,
- bot || room2 ? (0, import_react28.createElement)("button", { type: "button", className: "bt-round", "aria-label": copied ? t("Copied conversation") : t("Share conversation"), title: copied ? t("Copied") : t("Copy conversation as Markdown"), onClick: share }, copied ? (0, import_react28.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react28.createElement)(ShareIcon)) : null,
- hasStrip ? null : (0, import_react28.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react28.createElement)(CloseIcon))
+ bot || room2 ? (0, import_react29.createElement)("button", { type: "button", className: "bt-round", "aria-label": bot ? t("Edit Bot") : t("Group settings"), title: bot ? t("Edit Bot") : t("Group settings"), "data-info-row": "settings", onClick: () => setView("settings") }, (0, import_react29.createElement)(GearIcon)) : null,
+ bot && roster.browser === true && actions.openBrowser ? (0, import_react29.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Open browser"), title: t("Open this Bot's browser"), onClick: () => actions.openBrowser(sessionId) }, (0, import_react29.createElement)(GlobeIcon)) : null,
+ bot || room2 ? (0, import_react29.createElement)("button", { type: "button", className: "bt-round", "aria-label": copied ? t("Copied conversation") : t("Share conversation"), title: copied ? t("Copied") : t("Copy conversation as Markdown"), onClick: share }, copied ? (0, import_react29.createElement)("span", { key: "copied", className: "bt-pop-in" }, "✓") : (0, import_react29.createElement)(ShareIcon)) : null,
+ hasStrip ? null : (0, import_react29.createElement)("button", { type: "button", className: "bt-round", "aria-label": t("Close details"), onClick: close }, (0, import_react29.createElement)(CloseIcon))
);
if (!bot && !room2) {
return [
- (0, import_react28.createElement)(import_react28.Fragment, { key: "top" }, top),
- (0, import_react28.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react28.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team.")))
+ (0, import_react29.createElement)(import_react29.Fragment, { key: "top" }, top),
+ (0, import_react29.createElement)("div", { key: "body", className: "bt-drawer-body" }, (0, import_react29.createElement)("div", { className: "bt-muted" }, t("This conversation is not part of your Bot team.")))
];
}
const current = bot?.name ?? room2.name;
@@ -10633,12 +10805,12 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a
const subtitle = bot ? bot.role : roomSubtitle(room2, roster);
const tabs = bot ? ["details", "browser"] : ["details"];
return [
- (0, import_react28.createElement)(import_react28.Fragment, { key: "top" }, top),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(import_react29.Fragment, { key: "top" }, top),
+ (0, import_react29.createElement)(
"div",
{ key: "id", className: "bt-drawer-id", "data-move": side },
- bot ? (0, import_react28.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react28.createElement)(RoomAvatar, { room: room2, roster, size: 64 }),
- editing ? (0, import_react28.createElement)("input", {
+ bot ? (0, import_react29.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react29.createElement)(RoomAvatar, { room: room2, roster, size: 64 }),
+ editing ? (0, import_react29.createElement)("input", {
className: "bt-drawer-name-input",
autoFocus: true,
value: draftName,
@@ -10653,49 +10825,49 @@ function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, a
setEditing(false);
}
}
- }) : (0, import_react28.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => {
+ }) : (0, import_react29.createElement)("button", { type: "button", className: "bt-drawer-name", "aria-label": t("Rename {name}", { name: current }), title: t("Rename"), onClick: () => {
setDraftName(room2 && !room2.named ? "" : current);
setEditing(true);
} }, current),
- subtitle ? (0, import_react28.createElement)("span", { className: "bt-drawer-role" }, subtitle) : null
+ subtitle ? (0, import_react29.createElement)("span", { className: "bt-drawer-role" }, subtitle) : null
),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ key: "tabs", ref: glide.box, className: "bt-tabs", role: "tablist", "data-move": side },
- (0, import_react28.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
- tabs.map((key) => (0, import_react28.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key])))
+ (0, import_react29.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
+ tabs.map((key) => (0, import_react29.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key])))
),
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ key: `body:${tab}`, className: "bt-drawer-body", "data-move": move },
errorLine,
- room2 && tab === "details" ? (0, import_react28.createElement)(GroupOverview, { room: room2, roster, actions, usage, openSettings: () => setView("settings") }) : null,
+ room2 && tab === "details" ? (0, import_react29.createElement)(GroupOverview, { room: room2, roster, actions, usage, useWork, openSettings: () => setView("settings") }) : null,
bot && tab === "details" ? [
- (0, import_react28.createElement)(
+ (0, import_react29.createElement)(
"div",
{ key: "model", className: "bt-drawer-model" },
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t("Model")),
- (0, import_react28.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }),
- modelOf(bot, roster) ? null : (0, import_react28.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name }))
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Model")),
+ (0, import_react29.createElement)(ModelMenu, { bot, roster, actions, run, wide: true }),
+ modelOf(bot, roster) ? null : (0, import_react29.createElement)("div", { className: "bt-note" }, t("Pick a model and {name} can start.", { name: bot.name }))
),
- (0, import_react28.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }),
- bot.instructions ? (0, import_react28.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react28.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")),
- roster.memory === false ? null : (0, import_react28.createElement)(MemoryRow, { key: "memory", bot, actions }),
- usage ? (0, import_react28.createElement)(
+ (0, import_react29.createElement)(PermissionRow, { key: "permission", bot, roster, actions, run }),
+ bot.instructions ? (0, import_react29.createElement)(About, { key: "about", text: bot.instructions }) : (0, import_react29.createElement)("button", { key: "about", type: "button", className: "bt-more", onClick: () => setView("settings") }, t("Add instructions in Bot settings")),
+ roster.memory === false ? null : (0, import_react29.createElement)(MemoryRow, { key: "memory", bot, actions }),
+ usage ? (0, import_react29.createElement)(
"div",
{ key: "usage" },
- (0, import_react28.createElement)("div", { className: "bt-section-title" }, t("Usage")),
- (0, import_react28.createElement)("div", { className: "bt-kv" }, (0, import_react28.createElement)("span", null, bot.name), (0, import_react28.createElement)("span", null, usage))
+ (0, import_react29.createElement)("div", { className: "bt-section-title" }, t("Usage")),
+ (0, import_react29.createElement)("div", { className: "bt-kv" }, (0, import_react29.createElement)("span", null, bot.name), (0, import_react29.createElement)("span", null, usage))
) : null,
- (0, import_react28.createElement)(ScheduleSummary, { key: "routines", bot, actions })
+ (0, import_react29.createElement)(ScheduleSummary, { key: "routines", bot, actions })
] : null,
- bot && tab === "browser" ? (0, import_react28.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null
+ bot && tab === "browser" ? (0, import_react29.createElement)(BrowserCards, { bot, sessionId, roster, actions, useBrowserTabs, useBrowserPages }) : null
)
];
}
// src/client/browser-pane.js
-var import_react29 = require("react");
+var import_react30 = require("react");
var import_react_dom7 = require("react-dom");
var PANEL_LINGER_MS = 300;
var WIDTH_KEY = STORAGE.browserWidth;
@@ -10710,10 +10882,10 @@ var EMPTY_TABS2 = { ids: [], active: null };
var SPRING_LEAD2 = springEasing(576, 39.4);
var SPRING_TRAIL2 = springEasing(144, 19.7);
var icon = (paths) => function BrowserIcon() {
- return (0, import_react29.createElement)(
+ return (0, import_react30.createElement)(
"svg",
{ width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.5, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true },
- paths.map((d, index) => (0, import_react29.createElement)("path", { key: index, d }))
+ paths.map((d, index) => (0, import_react30.createElement)("path", { key: index, d }))
);
};
var GlobeIcon = icon(["M10 3a7 7 0 1 0 0 14 7 7 0 0 0 0-14z", "M3 10h14", "M10 3c2 2.2 2.9 4.5 2.9 7S12 14.8 10 17c-2-2.2-2.9-4.5-2.9-7S8 5.2 10 3z"]);
@@ -10725,9 +10897,9 @@ var CloseIcon2 = icon(["M5.5 5.5l9 9M14.5 5.5l-9 9"]);
var PlusTabIcon = icon(["M10 5v10M5 10h10"]);
var LockIcon2 = icon(["M6.5 9V7a3.5 3.5 0 0 1 7 0v2", "M5.5 9h9v7h-9z"]);
function Favicon({ src, className }) {
- const [failed, setFailed] = (0, import_react29.useState)(null);
- if (!src || failed === src) return (0, import_react29.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react29.createElement)(GlobeIcon));
- return (0, import_react29.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) });
+ const [failed, setFailed] = (0, import_react30.useState)(null);
+ if (!src || failed === src) return (0, import_react30.createElement)("span", { className: `${className} bt-ptab-globe` }, (0, import_react30.createElement)(GlobeIcon));
+ return (0, import_react30.createElement)("img", { className, src, alt: "", "aria-hidden": true, onError: () => setFailed(src) });
}
var savedWidth = () => {
try {
@@ -10786,11 +10958,11 @@ var reducedMotion2 = () => typeof matchMedia === "function" && matchMedia("(pref
var tabLabel = (page) => page.title || shortAddress(page.url) || t("New tab");
function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions, useBrowserPages }) {
const pages = useBrowserPages((map) => map);
- const wrap = (0, import_react29.useRef)(null);
- const ind = (0, import_react29.useRef)(null);
- const spot = (0, import_react29.useRef)(null);
- const under = (0, import_react29.useRef)(null);
- (0, import_react29.useLayoutEffect)(() => {
+ const wrap = (0, import_react30.useRef)(null);
+ const ind = (0, import_react30.useRef)(null);
+ const spot = (0, import_react30.useRef)(null);
+ const under = (0, import_react30.useRef)(null);
+ (0, import_react30.useLayoutEffect)(() => {
const box = wrap.current;
const capsule = ind.current;
if (!box || !capsule) return void 0;
@@ -10819,7 +10991,7 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions,
trail.cancel();
};
});
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
const box = wrap.current;
if (!box) return void 0;
const observer = new ResizeObserver(() => {
@@ -10833,13 +11005,13 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions,
observer.observe(box);
return () => observer.disconnect();
}, []);
- return (0, import_react29.createElement)(
+ return (0, import_react30.createElement)(
"div",
{ className: "bt-ptabs", role: "tablist", "aria-label": t("Panel tabs") },
- (0, import_react29.createElement)(
+ (0, import_react30.createElement)(
"div",
{ className: "bt-ptabs-in", ref: wrap },
- (0, import_react29.createElement)(
+ (0, import_react30.createElement)(
"button",
{
type: "button",
@@ -10849,13 +11021,13 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions,
title: bot.name,
onClick: () => onView("details")
},
- (0, import_react29.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }),
- view === "details" ? (0, import_react29.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null
+ (0, import_react30.createElement)(BotMark, { bot, size: 20, state: reading ? "searching" : "idle" }),
+ view === "details" ? (0, import_react30.createElement)("span", { className: "bt-ptab-name" }, bot.name) : null
),
ids.map((tabId) => {
const page = pages[tabId] ?? EMPTY_PAGE;
const on = view === "browser" && tabId === active;
- return (0, import_react29.createElement)(
+ return (0, import_react30.createElement)(
"button",
{
key: tabId,
@@ -10876,9 +11048,9 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions,
}
}
},
- (0, import_react29.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }),
- (0, import_react29.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)),
- (0, import_react29.createElement)("span", {
+ (0, import_react30.createElement)(Favicon, { src: page.favicon, className: "bt-ptab-fav" }),
+ (0, import_react30.createElement)("span", { className: "bt-ptab-title" }, tabLabel(page)),
+ (0, import_react30.createElement)("span", {
className: "bt-ptab-x",
role: "button",
"aria-label": t("Close tab"),
@@ -10890,20 +11062,20 @@ function PanelStrip({ bot, subject, view, ids, active, reading, onView, actions,
}, "×")
);
}),
- (0, import_react29.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true })
+ (0, import_react30.createElement)("span", { ref: ind, className: "bt-ptab-ind", "aria-hidden": true })
),
// New tab and Close stay outside the scrolling tabs, so a narrow panel keeps both.
- (0, import_react29.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react29.createElement)(PlusTabIcon)),
- (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react29.createElement)(CloseIcon2))
+ (0, import_react30.createElement)("button", { type: "button", className: "bt-ptab-new", "aria-label": t("New tab"), title: t("New tab"), onClick: () => actions.browserNewTab(subject) }, (0, import_react30.createElement)(PlusTabIcon)),
+ (0, import_react30.createElement)("button", { type: "button", className: "bt-icon-btn bt-ptab-close", "aria-label": t("Close panel"), title: t("Close panel"), onClick: () => actions.closePanel() }, (0, import_react30.createElement)(CloseIcon2))
);
}
function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages }) {
const page = useBrowserPages((pages) => pages[tabId ?? ""]) ?? EMPTY_PAGE;
- const frame = (0, import_react29.useRef)(null);
- const input = (0, import_react29.useRef)(null);
- const [draft, setDraft] = (0, import_react29.useState)(null);
+ const frame = (0, import_react30.useRef)(null);
+ const input = (0, import_react30.useRef)(null);
+ const [draft, setDraft] = (0, import_react30.useState)(null);
const showGuest = landed && !leaving && Boolean(page.url) && !page.error;
- (0, import_react29.useLayoutEffect)(() => {
+ (0, import_react30.useLayoutEffect)(() => {
const element = frame.current;
if (!element || leaving || !tabId) {
void actions.browserShow(null);
@@ -10929,7 +11101,7 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages })
window.removeEventListener("resize", schedule);
};
}, [tabId, showGuest, leaving]);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
setDraft(null);
if (landed && !page.url) input.current?.focus();
}, [tabId, landed]);
@@ -10945,27 +11117,27 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages })
};
const editing = draft !== null;
const secure = /^https:/i.test(page.url);
- return (0, import_react29.createElement)(
+ return (0, import_react30.createElement)(
"div",
{ className: "bt-panel-view bt-panel-browser", "aria-label": t("{name}'s browser", { name: bot.name }) },
- (0, import_react29.createElement)(
+ (0, import_react30.createElement)(
"div",
{ className: "bt-browser-bar" },
- (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react29.createElement)(BackIcon)),
- (0, import_react29.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react29.createElement)(ForwardIcon)),
- (0, import_react29.createElement)("button", {
+ (0, import_react30.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Back"), title: t("Back"), disabled: !page.canGoBack, onClick: () => actions.browserCommand(tabId, "back") }, (0, import_react30.createElement)(BackIcon)),
+ (0, import_react30.createElement)("button", { type: "button", className: "bt-icon-btn", "aria-label": t("Forward"), title: t("Forward"), disabled: !page.canGoForward, onClick: () => actions.browserCommand(tabId, "forward") }, (0, import_react30.createElement)(ForwardIcon)),
+ (0, import_react30.createElement)("button", {
type: "button",
className: "bt-icon-btn",
disabled: !page.url,
"aria-label": page.loading ? t("Stop") : t("Reload"),
title: page.loading ? t("Stop") : t("Reload"),
onClick: () => actions.browserCommand(tabId, page.loading ? "stop" : "reload")
- }, (0, import_react29.createElement)(page.loading ? StopIcon : ReloadIcon)),
- (0, import_react29.createElement)(
+ }, (0, import_react30.createElement)(page.loading ? StopIcon : ReloadIcon)),
+ (0, import_react30.createElement)(
"form",
{ className: "bt-browser-address", onSubmit: go, "data-editing": editing || void 0 },
- (0, import_react29.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react29.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)),
- (0, import_react29.createElement)("input", {
+ (0, import_react30.createElement)("span", { className: "bt-browser-scheme", "aria-hidden": true }, (0, import_react30.createElement)(secure && !editing ? LockIcon2 : GlobeIcon)),
+ (0, import_react30.createElement)("input", {
ref: input,
type: "text",
spellCheck: false,
@@ -10989,71 +11161,71 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages })
}
})
),
- page.loading ? (0, import_react29.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null
+ page.loading ? (0, import_react30.createElement)("span", { className: "bt-browser-progress", "aria-hidden": true }) : null
),
- (0, import_react29.createElement)(
+ (0, import_react30.createElement)(
"div",
{ ref: frame, className: "bt-browser-frame", "data-guest": showGuest || void 0 },
- page.error ? (0, import_react29.createElement)(
+ page.error ? (0, import_react30.createElement)(
"div",
{ className: "bt-browser-empty" },
- (0, import_react29.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")),
- (0, import_react29.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)),
- page.url ? (0, import_react29.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => {
+ (0, import_react30.createElement)("div", { className: "bt-browser-empty-title" }, t("This page didn’t load")),
+ (0, import_react30.createElement)("div", { className: "bt-browser-empty-text" }, t(page.error)),
+ page.url ? (0, import_react30.createElement)("button", { type: "button", className: "bt-browser-retry", onClick: () => {
void actions.browserNavigate(tabId, page.url);
} }, t("Try again")) : null
- ) : !page.url ? (0, import_react29.createElement)(
+ ) : !page.url ? (0, import_react30.createElement)(
"div",
{ className: "bt-browser-empty" },
- (0, import_react29.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }),
- (0, import_react29.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })),
- (0, import_react29.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name }))
+ (0, import_react30.createElement)(BotMark, { bot, size: 48, state: "idle", live: true }),
+ (0, import_react30.createElement)("div", { className: "bt-browser-empty-title" }, t("{name}'s browser", { name: bot.name })),
+ (0, import_react30.createElement)("div", { className: "bt-browser-empty-text" }, t("Open a page here and {name} can read it with you. Logins and cookies stay with {name}; other Bots never see them.", { name: bot.name }))
) : null
)
);
}
-function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages }) {
+function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) {
const bot = roster.byId[pane.id];
const canBrowse = Boolean(bot && roster.browser === true && actions.browserShow);
const view = pane.view === "browser" && canBrowse ? "browser" : "details";
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_react29.useRef)(null);
- const fly = (0, import_react29.useRef)(null);
- const [landed, setLanded] = (0, import_react29.useState)(false);
- const [settling, setSettling] = (0, import_react29.useState)(false);
- const [width, setWidth] = (0, import_react29.useState)(savedWidth);
- const [viewport, setViewport] = (0, import_react29.useState)(() => window.innerWidth);
- const [dragging, setDragging] = (0, import_react29.useState)(false);
- const [resizing, setResizing] = (0, import_react29.useState)(false);
+ const root = (0, import_react30.useRef)(null);
+ const fly = (0, import_react30.useRef)(null);
+ const [landed, setLanded] = (0, import_react30.useState)(false);
+ const [settling, setSettling] = (0, import_react30.useState)(false);
+ const [width, setWidth] = (0, import_react30.useState)(savedWidth);
+ const [viewport, setViewport] = (0, import_react30.useState)(() => window.innerWidth);
+ const [dragging, setDragging] = (0, import_react30.useState)(false);
+ const [resizing, setResizing] = (0, import_react30.useState)(false);
const instant = dragging || resizing;
- const [reading, setReading] = (0, import_react29.useState)(false);
+ const [reading, setReading] = (0, import_react30.useState)(false);
const panelWidth = fitWidth(width ?? (view === "browser" ? DEFAULT_WIDTH : DETAILS_WIDTH), widthRange(view, viewport));
- (0, import_react29.useLayoutEffect)(() => {
+ (0, import_react30.useLayoutEffect)(() => {
if (view === "browser" && width === null) setWidth(DEFAULT_WIDTH);
}, [view, width]);
- (0, import_react29.useLayoutEffect)(() => {
+ (0, import_react30.useLayoutEffect)(() => {
chatRoom.hold(instant);
}, [instant]);
- const [last, setLast] = (0, import_react29.useState)({ view, width: panelWidth });
+ const [last, setLast] = (0, import_react30.useState)({ view, width: panelWidth });
if (last.view !== view || last.width !== panelWidth) {
setLast({ view, width: panelWidth });
if (last.view !== view) setSettling(last.width !== panelWidth && !instant);
}
- const shownView = (0, import_react29.useRef)(view);
- (0, import_react29.useLayoutEffect)(() => {
+ const shownView = (0, import_react30.useRef)(view);
+ (0, import_react30.useLayoutEffect)(() => {
const switched = settling && shownView.current !== view;
shownView.current = view;
if (switched) chatRoom.hold(true);
chatRoom.set(leaving ? null : panelWidth);
if (switched) chatRoom.hold(false);
}, [view, panelWidth, leaving]);
- (0, import_react29.useEffect)(() => () => {
+ (0, import_react30.useEffect)(() => () => {
chatRoom.set(null);
chatRoom.hold(false);
}, []);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
let timer;
const onResize = () => {
setResizing(true);
@@ -11067,28 +11239,28 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu
window.removeEventListener("resize", onResize);
};
}, []);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
if (!settling) return void 0;
const timer = setTimeout(() => setSettling(false), SPRING_SHAPE.duration + 40);
return () => clearTimeout(timer);
}, [settling, view]);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
const timer = setTimeout(() => setLanded(true), 360);
return () => clearTimeout(timer);
}, []);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
if (canBrowse) actions.browserEnsure(bot.id);
}, [bot?.id, canBrowse]);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
if (view === "browser" && (active === null || !tabState.ids.includes(active))) actions.setPanelView("details");
}, [view, active, tabState.ids.length]);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
if (view !== "browser" || leaving) void actions.browserShow?.(null);
}, [view, leaving]);
- (0, import_react29.useEffect)(() => () => {
+ (0, import_react30.useEffect)(() => () => {
void actions.browserShow?.(null);
}, []);
- (0, import_react29.useEffect)(() => {
+ (0, import_react30.useEffect)(() => {
if (!page.readAt || Date.now() - page.readAt > READ_FLASH_MS) return void 0;
setReading(true);
const timer = setTimeout(() => setReading(false), READ_FLASH_MS);
@@ -11125,7 +11297,7 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu
return actions[name](...args);
};
}
- (0, import_react29.useLayoutEffect)(() => {
+ (0, import_react30.useLayoutEffect)(() => {
const move = fly.current;
if (!move) return;
fly.current = null;
@@ -11208,7 +11380,7 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu
for (const name of ends) grip.addEventListener(name, onEnd);
};
const hasStrip = canBrowse && tabState.ids.length > 0;
- return (0, import_react29.createElement)(
+ return (0, import_react30.createElement)(
"aside",
{
ref: root,
@@ -11225,15 +11397,15 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu
if (event.target === event.currentTarget) setLanded(true);
}
},
- leaving ? null : (0, import_react29.createElement)("div", { className: "bt-panel-grip", role: "separator", "aria-orientation": "vertical", "aria-label": t("Resize panel"), onPointerDown: startResize }),
+ leaving ? null : (0, import_react30.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_dom7.createPortal)((0, import_react29.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null,
- hasStrip ? (0, import_react29.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null,
- view === "browser" && bot ? (0, import_react29.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react29.createElement)(
+ dragging ? (0, import_react_dom7.createPortal)((0, import_react30.createElement)("div", { className: "bt-drag-shield", "aria-hidden": true }), document.body) : null,
+ hasStrip ? (0, import_react30.createElement)(PanelStrip, { bot, subject: pane.id, view, ids: tabState.ids, active, reading, onView: switchView, actions: panelActions, useBrowserPages }) : null,
+ view === "browser" && bot ? (0, import_react30.createElement)(BrowserView, { key: `browser:${active}`, bot, tabId: active, leaving, landed: landed && !settling, actions, useBrowserPages }) : (0, import_react30.createElement)(
"div",
{ key: `details:${pane.id}:${pane.renaming ? "rename" : ""}:${pane.tab ?? ""}`, className: "bt-panel-view" },
- (0, import_react29.createElement)(DetailsDrawer, {
+ (0, import_react30.createElement)(DetailsDrawer, {
sessionId: pane.id,
startRenaming: pane.renaming,
startTab: pane.tab,
@@ -11243,6 +11415,7 @@ function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatu
useSessions,
useSessionStatus,
useActivity,
+ useWork,
useBrowserTabs,
useBrowserPages
})
@@ -11329,24 +11502,24 @@ var BROWSER_CSS = `
`;
// src/client/overlays.js
-var import_react30 = require("react");
+var import_react31 = require("react");
var import_react_dom8 = require("react-dom");
var DIALOG_EXIT_MS = 160;
var MENU_EXIT_MS3 = 120;
-function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity, useRegistry, useBrowserPages, useBrowserTabs, useUpdate, actions }) {
+function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity, useWork, useRegistry, useBrowserPages, useBrowserTabs, useUpdate, actions }) {
const roster = useRoster((value) => value);
const ui = useUi((value) => value);
useRegistry((value) => value);
const current = useSessions((list) => Object.values(list.byId).find((session) => (session?.retainedBy?.mainView ?? 0) > 0)?.id ?? null);
- const previous = (0, import_react30.useRef)(current);
- (0, import_react30.useEffect)(() => {
+ const previous = (0, import_react31.useRef)(current);
+ (0, import_react31.useEffect)(() => {
if (previous.current === current) return;
previous.current = current;
if (current) actions.followPanel?.(current);
}, [current]);
const open = ui.details ? { id: ui.details, view: ui.view ?? "details", renaming: ui.renaming, tab: ui.tab } : null;
- const [kept, setKept] = (0, import_react30.useState)(open);
- (0, import_react30.useEffect)(() => {
+ const [kept, setKept] = (0, import_react31.useState)(open);
+ (0, import_react31.useEffect)(() => {
if (open) {
setKept(open);
return void 0;
@@ -11358,17 +11531,17 @@ function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity
const [settings, settingsLeaving] = useLinger(ui.settings, DIALOG_EXIT_MS);
const [memory, memoryLeaving] = useLinger(ui.memory && roster.byId[ui.memory] ? ui.memory : null, DIALOG_EXIT_MS);
const [menu, menuLeaving] = useLinger(ui.menu, MENU_EXIT_MS3);
- return (0, import_react30.createElement)(
- import_react30.Fragment,
+ return (0, import_react31.createElement)(
+ import_react31.Fragment,
null,
- pane ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages }), document.body) : null,
- ui.newChat ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(NewChat, { key: ui.newChat, mode: ui.newChat, roster, actions }), document.body) : null,
- ui.palette ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(CommandPalette, { key: ui.palette.token, start: ui.palette.query, token: ui.palette.token, roster, actions, useSessions }), document.body) : null,
- ui.exchange ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(ExchangeDialog, { pair: ui.exchange, roster, actions }), document.body) : null,
- ui.voice ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(VoiceMode, { key: ui.voice, sessionId: ui.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null,
- menu ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null,
- settings ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null,
- memory && roster.byId[memory] ? (0, import_react_dom8.createPortal)((0, import_react30.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], actions, leaving: memoryLeaving }), document.body) : null
+ pane ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null,
+ ui.newChat ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(NewChat, { key: ui.newChat, mode: ui.newChat, roster, actions }), document.body) : null,
+ ui.palette ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(CommandPalette, { key: ui.palette.token, start: ui.palette.query, token: ui.palette.token, roster, actions, useSessions }), document.body) : null,
+ ui.exchange ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(ExchangeDialog, { pair: ui.exchange, roster, actions }), document.body) : null,
+ ui.voice ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(VoiceMode, { key: ui.voice, sessionId: ui.voice, roster, actions, useSessions, useSessionStatus }), document.body) : null,
+ menu ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(ContextMenu, { key: `${menu.kind ?? ""}:${menu.id}:${menu.x}:${menu.y}`, menu, roster, actions, leaving: menuLeaving }), document.body) : null,
+ settings ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(SettingsDialog, { page: settings.page, id: settings.id, roster, actions, useUpdate, leaving: settingsLeaving }), document.body) : null,
+ memory && roster.byId[memory] ? (0, import_react_dom8.createPortal)((0, import_react31.createElement)(MemoryDialog, { key: memory, bot: roster.byId[memory], actions, leaving: memoryLeaving }), document.body) : null
);
}
@@ -12259,6 +12432,8 @@ function apply(ctx) {
return () => window.removeEventListener("pagehide", onPageHide);
}, "ds-bot: remember visits on page hide");
const activity = createSource({});
+ const work = createSource({ bots: {}, approvals: [] });
+ let workKey = "";
const live = createSource({});
const turnClock = createSource({});
let activityKey = "{}";
@@ -12306,6 +12481,11 @@ function apply(ctx) {
activityKey = nextActivity;
activity.set(value.activity ?? {});
}
+ const nextWork = JSON.stringify(value.work ?? null);
+ if (nextWork !== workKey) {
+ workKey = nextWork;
+ work.set(value.work ?? { bots: {}, approvals: [] });
+ }
noteMemoryNews(value.memoryNews ?? {});
const current = roster.getSnapshot();
if (value.connectors !== void 0 && current.ready && JSON.stringify(value.connectors) !== JSON.stringify(current.connectors ?? [])) {
@@ -12768,6 +12948,7 @@ function apply(ctx) {
send: (sessionId, text) => after(call("send", { sessionId: partFor(sessionId), text })),
answerQuestion: (sessionId, questionId, answer) => after(call("answer-question", { sessionId: partFor(sessionId), questionId, answer })),
dismissQuestion: (sessionId) => after(call("dismiss-question", { sessionId })),
+ answerApproval: (id, choice) => after(call("approval-answer", { id, choice })),
// Values go out in these requests and never come back in a response.
secretSet: (payload) => after(call("secret-set", payload)),
secretAllow: (requestId) => after(call("secret-allow", { requestId })),
@@ -12912,7 +13093,7 @@ function apply(ctx) {
});
const browserPages = browsers?.pages ?? createSource({});
const browserTabs = browsers?.tabs ?? createSource({});
- const face = () => ({ actions, hooks: { roster, ui, activity, memoryNews, registry, turnClock, live, browserPages, browserTabs, surface, update } });
+ const face = () => ({ actions, hooks: { roster, ui, activity, work, memoryNews, registry, turnClock, live, browserPages, browserTabs, surface, update } });
const assistantFace = (sessionId) => {
const binding = ctx.sessions.binding(sessionId);
if (binding === void 0) throw new Error(`ds-bot: unknown session "${sessionId}"`);
@@ -12966,6 +13147,7 @@ function apply(ctx) {
installCompiledStyles(SCHEDULE_CSS, "schedules"),
installCompiledStyles(FEEDBACK_CSS, "feedback"),
installCompiledStyles(ABOUT_CSS, "about"),
+ installCompiledStyles(MEMBER_CSS, "members"),
browsers ? installCompiledStyles(BROWSER_CSS, "browser") : null,
installTheme(),
shadow("sidebar.workspaces", { priority: -10, inject: face }, TeamSidebar),
@@ -13014,6 +13196,7 @@ function apply(ctx) {
priority: -10,
select: (owner) => owner.pendingInteraction?.kind === "question" ? owner.pendingInteraction : null
}, QuestionCard),
+ shadow("conversation.input.dock", { id: "bot-members", order: -120, inject: face }, MemberDock),
shadow("conversation.input.dock", { id: "bot-model", order: -110, inject: face }, ModelChoiceDock),
shadow("conversation.input.dock", { id: "bot-question", order: -100, inject: face }, QuestionDock),
shadow("conversation.input.dock", { id: "bot-secret", order: -90, inject: face }, SecretDock)
diff --git a/ds-bot/src/client/activity-row.js b/ds-bot/src/client/activity-row.js
index 7b281f04..125339b7 100644
--- a/ds-bot/src/client/activity-row.js
+++ b/ds-bot/src/client/activity-row.js
@@ -12,7 +12,7 @@ import { t } from './i18n.js'
const PHRASE_HOLD_MS = 800
const drawPhrase = pool => t(pool[Math.min(pool.length - 1, Math.floor(Math.random() * pool.length))])
-function elapsedLabel(ms) {
+export function elapsedLabel(ms) {
const minutes = Math.floor(ms / 60000)
if (minutes < 60) return `${Math.max(1, minutes)}m`
const hours = Math.floor(minutes / 60)
diff --git a/ds-bot/src/client/browser-pane.js b/ds-bot/src/client/browser-pane.js
index 1cf9b517..81a600df 100644
--- a/ds-bot/src/client/browser-pane.js
+++ b/ds-bot/src/client/browser-pane.js
@@ -282,7 +282,7 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages })
* `{ id, view: 'details'|'browser', renaming, tab }`; `id` is the Session id the
* panel follows. Without the Desktop bridge the browser view never shows.
*/
-export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages }) {
+export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) {
const bot = roster.byId[pane.id]
const canBrowse = Boolean(bot && roster.browser === true && actions.browserShow)
const view = pane.view === 'browser' && canBrowse ? 'browser' : 'details'
@@ -486,7 +486,7 @@ export function BotPanel({ pane, leaving, roster, actions, useSessions, useSessi
: h('div', { key: `details:${pane.id}:${pane.renaming ? 'rename' : ''}:${pane.tab ?? ''}`, className: 'bt-panel-view' },
h(DetailsDrawer, {
sessionId: pane.id, startRenaming: pane.renaming, startTab: pane.tab, hasStrip,
- roster, actions: panelActions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages,
+ roster, actions: panelActions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages,
})))
}
diff --git a/ds-bot/src/client/cells.js b/ds-bot/src/client/cells.js
index 31a7e238..4a33099f 100644
--- a/ds-bot/src/client/cells.js
+++ b/ds-bot/src/client/cells.js
@@ -501,6 +501,12 @@ function toolActivity(name, arg, findBot, self) {
}
}
+// What a Bot busy elsewhere is doing, from its current tool alone.
+export function workPhrase(tool) {
+ if (!tool) return t('Thinking about it')
+ return toolActivity(tool, () => undefined, () => undefined)?.label ?? t('On it')
+}
+
// Transcript rows report what is in flight to the one activity row at the tail.
function useLiveNote(actions, sessionId, id, entry) {
const key = entry ? JSON.stringify(entry) : ''
@@ -511,7 +517,7 @@ function useLiveNote(actions, sessionId, id, entry) {
}, [sessionId, id, key])
}
-function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi }) {
+function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi, useWork }) {
const [live, setLive] = useState({ replies: [], speaking: null })
useEffect(() => {
if (done) return undefined
@@ -535,6 +541,7 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi
}
// Members speak one at a time, so only the current speaker is typing.
const pending = done || !live.speaking ? [] : [live.speaking]
+ const speakerTool = useWork?.(work => work.bots?.[live.speaking]?.tool) ?? undefined
if (replies.length === 0 && pending.length === 0) return null
const room = roster.roomsById[sessionId]
return h('div', { className: 'bt-group-replies' },
@@ -552,18 +559,26 @@ function GroupReplies({ sessionId, callId, done, content, roster, actions, useUi
return h('div', { key: `${reply.botId}-${index}`, className: 'bt-event' },
reply.text ? t('{name} looked up its own chat for “{text}”', { name: bot.name, text: reply.text }) : t('{name} looked up its own chat', { name: bot.name }))
}
+ if (reply.kind === 'missed') {
+ return h('div', { key: `${reply.botId}-${index}`, className: 'bt-event' }, t("{name} didn't answer in time", { name: bot.name }))
+ }
+ if (reply.kind === 'approval') {
+ return h('div', { key: `${reply.botId}-${index}`, className: 'bt-event' },
+ h('button', { type: 'button', className: 'bt-event-whole', onClick: () => actions.showDetails(sessionId) },
+ h(BotMark, { bot, size: 16 }), h('span', { className: 'bt-event-name' }, t('{name} paused for your approval', { name: bot.name }))))
+ }
return h(GroupMessage, { key: `${reply.botId}-${index}`, bot, text: reply.text, room, roster, actions, msgKey: callId ? `${sessionId}:${callId}:${index}` : undefined, useUi })
}),
pending.map((id) => {
const bot = roster.byId[id]
if (!bot) return null
return h('div', { key: `pending-${id}`, className: 'bt-activity' },
- h(BotMark, { bot: bot, size: 22, state: 'thinking' }),
- h(Shimmer, null, t('{name} is typing…', { name: bot.name })))
+ h(BotMark, { bot: bot, size: 22, state: speakerTool ? toolState(speakerTool) : 'thinking' }),
+ h(Shimmer, null, speakerTool ? `${bot.name} · ${workPhrase(speakerTool)}…` : t('{name} is typing…', { name: bot.name })))
}))
}
-export function ToolCell({ node, sessionId, useRoster, useUi, actions }) {
+export function ToolCell({ node, sessionId, useRoster, useUi, useWork, actions }) {
const roster = useRoster(value => value)
const root = node.data.root
const done = root.kind === 'tool-result'
@@ -596,7 +611,7 @@ export function ToolCell({ node, sessionId, useRoster, useUi, actions }) {
return done && target ? h(EventLine, { prefix: t('Updated'), bots: [target], onOpen: bot => actions.openSession(bot.id) }) : null
}
case 'group_relay':
- return h(GroupReplies, { sessionId, callId: root.callId, done, content: root.content, roster, actions, useUi })
+ return h(GroupReplies, { sessionId, callId: root.callId, done, content: root.content, roster, actions, useUi, useWork })
case 'create_group':
case 'update_group':
case 'delete_group':
diff --git a/ds-bot/src/client/details-drawer.js b/ds-bot/src/client/details-drawer.js
index 2011b04c..ecea8166 100644
--- a/ds-bot/src/client/details-drawer.js
+++ b/ds-bot/src/client/details-drawer.js
@@ -11,6 +11,7 @@ import { ModelMenu, modelOf } from './model-menu.js'
import { MemoryRow } from './memory-panel.js'
import { ScheduleSummary } from './schedules.js'
import { Segmented, useGlide, useMorph } from './motion.js'
+import { MemberWork, useMemberWork } from './member-status.js'
import { t } from './i18n.js'
function transcriptOf(list, id, name, hiddenTurns = []) {
@@ -111,19 +112,25 @@ function About({ text, title = 'About' }) {
// A group's overview: what members read, who is in it, and who answers. Changes are
// made in its settings.
-function GroupOverview({ room, roster, actions, usage, openSettings }) {
+function GroupOverview({ room, roster, actions, usage, useWork, openSettings }) {
const members = room.members.map(id => roster.byId[id]).filter(Boolean)
+ const { entries, now } = useMemberWork(room, useWork)
return [
room.notice
? h(About, { key: 'notice', title: 'Notice', text: room.notice })
: h('button', { key: 'notice', type: 'button', className: 'bt-more', onClick: openSettings }, t('Add a notice in group settings')),
h('div', { key: 'members' },
h('div', { className: 'bt-section-title' }, t('Members · {count}', { count: members.length })),
- h('div', { className: 'bt-members', role: 'list' }, members.map(member => h('div', { key: member.id, className: 'bt-member', role: 'listitem' },
- h('button', { type: 'button', className: 'bt-member-name', title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) },
- h(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room.admin === member.id, live: false }),
- h('span', null, member.name)),
- room.admin === member.id ? h('span', { className: 'bt-chip bt-chip-admin' }, t('Admin')) : null)))),
+ h('div', { className: 'bt-members', role: 'list' }, members.map((member) => {
+ const entry = entries.find(item => item.id === member.id)
+ return h('div', { key: member.id, role: 'listitem' },
+ h('div', { className: 'bt-member' },
+ h('button', { type: 'button', className: 'bt-member-name', title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) },
+ h(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room.admin === member.id, live: false }),
+ h('span', null, member.name)),
+ room.admin === member.id ? h('span', { className: 'bt-chip bt-chip-admin' }, t('Admin')) : null),
+ entry ? h(MemberWork, { entry, bot: member, room, roster, actions, now }) : null)
+ }))),
h('div', { key: 'mode' }, h('div', { className: 'bt-section-title' }, t('Who answers')),
h('div', { className: 'bt-kv' }, h('span', null, t(ROOM_MODES.find(([id]) => id === shownMode(room, roster))?.[1] ?? 'Everyone')))),
usage ? h('div', { key: 'usage' }, h('div', { className: 'bt-section-title' }, t('Usage')),
@@ -131,7 +138,7 @@ function GroupOverview({ room, roster, actions, usage, openSettings }) {
]
}
-export function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages }) {
+export function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }) {
const owner = roster.byId[sessionId]
const part = owner ? currentPart(owner) : sessionId
const isMainBot = isMainOf(roster, owner?.id)
@@ -219,7 +226,7 @@ export function DetailsDrawer({ sessionId, startRenaming, startTab, hasStrip, ro
tabs.map(key => h('button', { key, type: 'button', role: 'tab', className: 'bt-tab', 'aria-selected': tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key])))),
h('div', { key: `body:${tab}`, className: 'bt-drawer-body', 'data-move': move },
errorLine,
- room && tab === 'details' ? h(GroupOverview, { room, roster, actions, usage, openSettings: () => setView('settings') }) : null,
+ room && tab === 'details' ? h(GroupOverview, { room, roster, actions, usage, useWork, openSettings: () => setView('settings') }) : null,
bot && tab === 'details' ? [
h('div', { key: 'model', className: 'bt-drawer-model' },
h('div', { className: 'bt-section-title' }, t('Model')),
diff --git a/ds-bot/src/client/i18n.js b/ds-bot/src/client/i18n.js
index b652c855..28307a76 100644
--- a/ds-bot/src/client/i18n.js
+++ b/ds-bot/src/client/i18n.js
@@ -408,6 +408,15 @@ const ZH = {
'{name} looked up its own chat': '{name} 查看了自己的对话',
'{name} looked up its own chat for “{text}”': '{name} 在自己的对话里查找「{text}」',
'{name} is typing…': '{name} 正在输入…',
+ "{name} didn't answer in time": '{name} 没有及时回应',
+ '{name} paused for your approval': '{name} 停下来等你批准',
+ '{name} is waiting for your approval': '{name} 等你批准',
+ '{first} and {second} are waiting for your approval': '{first}、{second} 等你批准',
+ '{first}, {second} and {count} more are waiting for your approval': '{first}、{second} 等 {total} 个等你批准',
+ 'Waiting for your approval': '等你批准',
+ 'in its own chat': '在自己的对话里',
+ Reject: '拒绝',
+ 'Allow once': '允许一次',
"Couldn't message {name}": '没能给 {name} 发消息',
Messaged: '已发消息给',
"Couldn't stop {name}": '没能叫停 {name}',
diff --git a/ds-bot/src/client/index.js b/ds-bot/src/client/index.js
index c92bf0b4..f5d7f77c 100644
--- a/ds-bot/src/client/index.js
+++ b/ds-bot/src/client/index.js
@@ -30,6 +30,7 @@ import { installLocale, language } from './i18n.js'
import { noteClientError, quietly } from './diagnostics.js'
import { ErrorToast, FEEDBACK_CSS } from './feedback.js'
import { ABOUT_CSS } from './about.js'
+import { MEMBER_CSS, MemberDock } from './member-status.js'
export const inject = ['sessions', 'uiWorkspace', 'uiConversation', 'slots', 'theme', 'layout', 'configForms']
@@ -87,6 +88,9 @@ export function apply(ctx) {
return () => window.removeEventListener('pagehide', onPageHide)
}, 'ds-bot: remember visits on page hide')
const activity = createSource({})
+ // Per Bot, the turn it runs and its tool; and the approvals waiting for the user.
+ const work = createSource({ bots: {}, approvals: [] })
+ let workKey = ''
// Per Session, what its transcript has in flight (running tools, a streaming reply).
const live = createSource({})
// Per Session, the first visible time and the end time of each turn the transcript
@@ -128,6 +132,8 @@ export function apply(ctx) {
applied = order
const nextActivity = JSON.stringify(value.activity ?? {})
if (nextActivity !== activityKey) { activityKey = nextActivity; activity.set(value.activity ?? {}) }
+ const nextWork = JSON.stringify(value.work ?? null)
+ if (nextWork !== workKey) { workKey = nextWork; work.set(value.work ?? { bots: {}, approvals: [] }) }
noteMemoryNews(value.memoryNews ?? {})
const current = roster.getSnapshot()
// Connector states change without a new revision, so they come with every answer.
@@ -530,6 +536,7 @@ export function apply(ctx) {
send: (sessionId, text) => after(call('send', { sessionId: partFor(sessionId), text })),
answerQuestion: (sessionId, questionId, answer) => after(call('answer-question', { sessionId: partFor(sessionId), questionId, answer })),
dismissQuestion: sessionId => after(call('dismiss-question', { sessionId })),
+ answerApproval: (id, choice) => after(call('approval-answer', { id, choice })),
// Values go out in these requests and never come back in a response.
secretSet: payload => after(call('secret-set', payload)),
secretAllow: requestId => after(call('secret-allow', { requestId })),
@@ -679,7 +686,7 @@ export function apply(ctx) {
})
const browserPages = browsers?.pages ?? createSource({})
const browserTabs = browsers?.tabs ?? createSource({})
- const face = () => ({ actions, hooks: { roster, ui, activity, memoryNews, registry, turnClock, live, browserPages, browserTabs, surface, update } })
+ const face = () => ({ actions, hooks: { roster, ui, activity, work, memoryNews, registry, turnClock, live, browserPages, browserTabs, surface, update } })
const assistantFace = (sessionId) => {
const binding = ctx.sessions.binding(sessionId)
if (binding === undefined) throw new Error(`ds-bot: unknown session "${sessionId}"`)
@@ -741,6 +748,7 @@ export function apply(ctx) {
installCompiledStyles(SCHEDULE_CSS, 'schedules'),
installCompiledStyles(FEEDBACK_CSS, 'feedback'),
installCompiledStyles(ABOUT_CSS, 'about'),
+ installCompiledStyles(MEMBER_CSS, 'members'),
browsers ? installCompiledStyles(BROWSER_CSS, 'browser') : null,
installTheme(),
shadow('sidebar.workspaces', { priority: -10, inject: face }, TeamSidebar),
@@ -789,6 +797,7 @@ export function apply(ctx) {
priority: -10,
select: owner => (owner.pendingInteraction?.kind === 'question' ? owner.pendingInteraction : null),
}, QuestionCard),
+ shadow('conversation.input.dock', { id: 'bot-members', order: -120, inject: face }, MemberDock),
shadow('conversation.input.dock', { id: 'bot-model', order: -110, inject: face }, ModelChoiceDock),
shadow('conversation.input.dock', { id: 'bot-question', order: -100, inject: face }, QuestionDock),
shadow('conversation.input.dock', { id: 'bot-secret', order: -90, inject: face }, SecretDock),
diff --git a/ds-bot/src/client/member-status.js b/ds-bot/src/client/member-status.js
new file mode 100644
index 00000000..9a88a0f8
--- /dev/null
+++ b/ds-bot/src/client/member-status.js
@@ -0,0 +1,142 @@
+import { createElement as h, useEffect, useState } from 'react'
+import { BotMark, toolState } from './mark.js'
+import { Shimmer, workPhrase } from './cells.js'
+import { elapsedLabel } from './activity-row.js'
+import { t } from './i18n.js'
+
+// -------------------------------------------------------------------------
+// What a group's members are doing: a line above the composer while any of them is
+// busy, in any of their chats, and the same per member in the details panel, where
+// the approvals their group turns wait on are answered.
+
+const NO_WORK = { bots: {}, approvals: [] }
+
+export function memberWork(room, work = NO_WORK) {
+ return room.members.map((id) => {
+ const approvals = (work.approvals ?? []).filter(entry => entry.botId === id)
+ const doing = work.bots?.[id]
+ return { id, approvals, doing, state: approvals.length > 0 ? 'ask' : doing ? 'work' : 'idle' }
+ })
+}
+
+// The busy members, those waiting for an approval first.
+export function busyMembers(room, work, roster) {
+ const busy = memberWork(room, work).filter(entry => entry.state !== 'idle' && roster.byId[entry.id])
+ return [...busy.filter(entry => entry.state === 'ask'), ...busy.filter(entry => entry.state === 'work')]
+ .map(entry => ({ ...entry, bot: roster.byId[entry.id] }))
+}
+
+export function summaryText(busy) {
+ const asks = busy.filter(entry => entry.state === 'ask')
+ const workers = busy.filter(entry => entry.state === 'work')
+ const names = asks.slice(0, 2).map(entry => entry.bot.name)
+ const waiting = asks.length === 0 ? ''
+ : asks.length === 1 ? t('{name} is waiting for your approval', { name: names[0] })
+ : asks.length === 2 ? t('{first} and {second} are waiting for your approval', { first: names[0], second: names[1] })
+ : t('{first}, {second} and {count} more are waiting for your approval', { first: names[0], second: names[1], count: asks.length - 2, total: asks.length })
+ const first = workers[0]
+ const doing = first ? `${first.bot.name} · ${workPhrase(first.doing.tool)}…${workers.length > 1 ? ` +${workers.length - 1}` : ''}` : ''
+ return { waiting, doing }
+}
+
+function Face({ entry, size }) {
+ return h('span', { className: 'bt-mw-face', 'data-ask': entry.state === 'ask' || undefined },
+ h(BotMark, { bot: entry.bot, size, state: entry.state === 'ask' ? 'alert' : toolState(entry.doing?.tool ?? '') }))
+}
+
+// The line above a group's composer; it opens the details panel.
+export function MemberDock({ sessionId, useRoster, useWork, actions }) {
+ const roster = useRoster(value => value)
+ const work = useWork(value => value)
+ const room = roster.roomsById[sessionId]
+ if (!room) return null
+ const busy = busyMembers(room, work, roster)
+ if (busy.length === 0) return null
+ const { waiting, doing } = summaryText(busy)
+ return h('div', { className: 'bt-event bt-mw-dock' },
+ h('button', { type: 'button', className: 'bt-event-whole bt-mw-line', 'aria-label': [waiting, doing].filter(Boolean).join(' · '), onClick: () => actions.showDetails(sessionId) },
+ h('span', { className: 'bt-mw-stack', 'aria-hidden': true }, busy.slice(0, 4).map(entry => h(Face, { key: entry.id, entry, size: 16 }))),
+ waiting ? h('span', { className: 'bt-mw-ask' }, waiting) : null,
+ waiting && doing ? h('span', { 'aria-hidden': true }, '·') : null,
+ doing ? h('span', { className: 'bt-event-name' }, h(Shimmer, null, doing)) : null))
+}
+
+function useNow(active) {
+ const [now, setNow] = useState(Date.now)
+ useEffect(() => {
+ if (!active) return undefined
+ const timer = setInterval(() => setNow(Date.now()), 30000)
+ return () => clearInterval(timer)
+ }, [active])
+ return now
+}
+
+const since = (now, at) => (typeof at === 'number' && now - at >= 60000 ? ` · ${elapsedLabel(now - at)}` : '')
+
+function ApprovalCard({ approval, bot, actions }) {
+ const [busy, setBusy] = useState(false)
+ const answer = (choice) => {
+ setBusy(true)
+ void Promise.resolve(actions.answerApproval(approval.id, choice))
+ .catch(error => actions.reportError(error, 'approval'))
+ .finally(() => setBusy(false))
+ }
+ return h('div', { className: 'bt-mw-card', role: 'group', 'aria-label': t('{name} is waiting for your approval', { name: bot.name }) },
+ h('div', { className: 'bt-mw-tool' }, approval.tool),
+ approval.detail?.text ? h('div', { className: 'bt-mw-text' }, approval.detail.text) : null,
+ approval.reason ? h('div', { className: 'bt-mw-reason' }, approval.reason) : null,
+ approval.detail?.code ? h('code', { className: 'bt-mw-code', title: approval.detail.code }, approval.detail.code) : null,
+ approval.answerable
+ ? h('div', { className: 'bt-mw-actions' },
+ h('button', { type: 'button', className: 'bt-q-btn', disabled: busy, onClick: () => answer('reject') }, t('Reject')),
+ h('button', { type: 'button', className: 'bt-q-submit', disabled: busy, onClick: () => answer('allow') }, t('Allow once')))
+ : h('div', { className: 'bt-mw-actions' },
+ h('button', { type: 'button', className: 'bt-q-btn', onClick: () => actions.openSession(bot.id) }, t("Open {name}'s chat", { name: bot.name }))))
+}
+
+// Under a member's row in the group's details: what it is doing, and where.
+export function MemberWork({ entry, bot, room, roster, actions, now }) {
+ if (entry.state === 'ask') {
+ return h('div', { className: 'bt-mw-member' },
+ h('div', { className: 'bt-mw-state bt-mw-ask' }, `${t('Waiting for your approval')}${since(now, entry.approvals[0].at)}`),
+ entry.approvals.map(approval => h(ApprovalCard, { key: approval.id, approval, bot, actions })))
+ }
+ if (entry.state !== 'work') return null
+ const where = entry.doing.roomId === room.id ? ''
+ : entry.doing.roomId ? t('in {name}', { name: roster.roomsById[entry.doing.roomId]?.name ?? t('a group chat') })
+ : t('in its own chat')
+ return h('div', { className: 'bt-mw-member' },
+ h('div', { className: 'bt-mw-state' }, h(Shimmer, null, `${workPhrase(entry.doing.tool)}…`), where ? ` ${where}` : '', since(now, entry.doing.since)))
+}
+
+export function useMemberWork(room, useWork) {
+ const work = useWork?.(value => value) ?? NO_WORK
+ const entries = room ? memberWork(room, work) : []
+ const now = useNow(entries.some(entry => entry.state !== 'idle'))
+ return { entries, now }
+}
+
+export const MEMBER_CSS = `
+.bt-event.bt-mw-dock{margin:0 0 6px;pointer-events:none}
+.bt-mw-dock>button{pointer-events:auto;animation:bt-mw-in .32s cubic-bezier(.23,1,.32,1) backwards}
+.bt-mw-line{gap:6px!important}
+.bt-mw-stack{display:inline-flex;align-items:center;flex:none;line-height:0}
+.bt-mw-stack>*+*{margin-left:-4px}
+.bt-mw-face{position:relative;display:inline-flex;flex:none;border-radius:50%}
+.bt-mw-stack .bt-mw-face{box-shadow:0 0 0 1.5px var(--bt-main,#fff)}
+.bt-mw-face[data-ask]::after{content:"";position:absolute;right:-2px;bottom:-2px;width:7px;height:7px;border-radius:50%;background:#e3a008;box-shadow:0 0 0 1.5px var(--bt-main,#fff)}
+.bt-mw-ask{color:#b7791f;flex:none;white-space:nowrap}
+body[data-ds-dark-theme] .bt-mw-ask{color:#f0b84a}
+.bt-mw-member{padding:0 6px 8px 42px;display:flex;flex-direction:column;gap:6px}
+.bt-mw-state{font-size:12px;line-height:16px;color:var(--bt-ink-2);margin-top:-4px}
+.bt-mw-card{display:flex;flex-direction:column;gap:4px;padding:10px 12px;border-radius:12px;background:var(--bt-hover);font-size:12px;line-height:17px;color:var(--bt-ink-2)}
+.bt-mw-tool{font-weight:600;color:var(--bt-ink)}
+.bt-mw-text{color:var(--bt-ink);overflow-wrap:anywhere}
+.bt-mw-reason{overflow-wrap:anywhere;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden}
+.bt-mw-code{display:block;font:11px/16px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:var(--bt-ink);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.bt-mw-actions{display:flex;justify-content:flex-end;gap:6px;margin-top:4px}
+.bt-mw-actions>button{height:28px;padding:0 12px;font-size:12px}
+.bt-mw-actions>button:disabled{opacity:.5;cursor:default}
+@keyframes bt-mw-in{from{opacity:0;transform:translateY(4px)}}
+@media (prefers-reduced-motion:reduce){.bt-mw-dock>button{animation:none}}
+`
diff --git a/ds-bot/src/client/overlays.js b/ds-bot/src/client/overlays.js
index b37f132d..3c27a956 100644
--- a/ds-bot/src/client/overlays.js
+++ b/ds-bot/src/client/overlays.js
@@ -14,7 +14,7 @@ import { useLinger } from './motion.js'
const DIALOG_EXIT_MS = 160
const MENU_EXIT_MS = 120
-export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity, useRegistry, useBrowserPages, useBrowserTabs, useUpdate, actions }) {
+export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useActivity, useWork, useRegistry, useBrowserPages, useBrowserTabs, useUpdate, actions }) {
const roster = useRoster(value => value)
const ui = useUi(value => value)
useRegistry(value => value)
@@ -39,7 +39,7 @@ export function Overlays({ useRoster, useUi, useSessions, useSessionStatus, useA
const [memory, memoryLeaving] = useLinger(ui.memory && roster.byId[ui.memory] ? ui.memory : null, DIALOG_EXIT_MS)
const [menu, menuLeaving] = useLinger(ui.menu, MENU_EXIT_MS)
return h(Fragment, null,
- pane ? createPortal(h(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useBrowserTabs, useBrowserPages }), document.body) : null,
+ pane ? createPortal(h(BotPanel, { pane, leaving: open === null, roster, actions, useSessions, useSessionStatus, useActivity, useWork, useBrowserTabs, useBrowserPages }), document.body) : null,
ui.newChat ? createPortal(h(NewChat, { key: ui.newChat, mode: ui.newChat, roster, actions }), document.body) : null,
ui.palette ? createPortal(h(CommandPalette, { key: ui.palette.token, start: ui.palette.query, token: ui.palette.token, roster, actions, useSessions }), document.body) : null,
ui.exchange ? createPortal(h(ExchangeDialog, { pair: ui.exchange, roster, actions }), document.body) : null,
diff --git a/ds-bot/test/member-status.test.js b/ds-bot/test/member-status.test.js
new file mode 100644
index 00000000..2c1f9572
--- /dev/null
+++ b/ds-bot/test/member-status.test.js
@@ -0,0 +1,43 @@
+import assert from 'node:assert/strict'
+import { test } from 'node:test'
+import { fileURLToPath } from 'node:url'
+import { runInNewContext } from 'node:vm'
+import { build } from 'esbuild'
+
+const bundle = await build({
+ entryPoints: [fileURLToPath(new URL('../src/client/member-status.js', import.meta.url))],
+ bundle: true, format: 'cjs', platform: 'node', write: false,
+ external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'],
+})
+const module = { exports: {} }
+runInNewContext(bundle.outputFiles[0].text, {
+ module, exports: module.exports,
+ require: (name) => {
+ const platform = {
+ react: { createElement: (type, props, ...children) => ({ type, props: props ?? {}, children: children.flat(Infinity) }), useState: initial => [initial, () => {}], useEffect: () => {}, useRef: initial => ({ current: initial }), useLayoutEffect: () => {}, Fragment: 'fragment' },
+ 'react-dom': {},
+ '@deepseek-ai/dsh-client-ui-primitives': {},
+ }
+ if (!(name in platform)) throw new Error(`no platform module ${name}`)
+ return platform[name]
+ },
+})
+const { busyMembers, summaryText } = module.exports
+// Values from the bundle's realm compare by content only.
+const plain = value => JSON.parse(JSON.stringify(value))
+
+test('the members line names who waits for an approval first, then who is at work', () => {
+ const names = { a: 'Anvil', b: 'Flint', c: 'Prism', d: 'Quill', e: 'King', f: 'Comet' }
+ const roster = { byId: Object.fromEntries(Object.entries(names).map(([id, name]) => [id, { id, name }])) }
+ const room = { members: ['e', 'd', 'a', 'b', 'c', 'f'] }
+ const work = {
+ bots: { d: { since: 1, tool: 'edit' }, a: { since: 1, tool: 'pwsh' }, f: { since: 1 } },
+ approvals: [{ botId: 'a' }, { botId: 'b' }, { botId: 'c' }],
+ }
+ const busy = busyMembers(room, work, roster)
+ assert.deepEqual(plain(busy.map(entry => [entry.bot.name, entry.state])), [['Anvil', 'ask'], ['Flint', 'ask'], ['Prism', 'ask'], ['Quill', 'work'], ['Comet', 'work']])
+ assert.deepEqual(plain(summaryText(busy)), { waiting: 'Anvil, Flint and 1 more are waiting for your approval', doing: 'Quill · Writing changes… +1' })
+ assert.deepEqual(plain(summaryText(busy.slice(1, 3))), { waiting: 'Flint and Prism are waiting for your approval', doing: '' })
+ assert.deepEqual(plain(summaryText(busy.slice(4))), { waiting: '', doing: 'Comet · Thinking about it…' })
+ assert.equal(busyMembers(room, { bots: {}, approvals: [] }, roster).length, 0)
+})