Skip to content

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

Merge remote-tracking branch 'origin/main' into feat/group-permissions

Fei241173dfc967f1d9
diff --cc ds-bot/client.js
index c51cdf90,d2f6cb08..9b5e894a
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@@ -11115,9 -11070,10 +11126,10 @@@ function migrateStorage(storage = globa
}
// src/client/member-status.js
-var import_react30 = require("react");
+var import_react31 = require("react");
var NO_WORK = { bots: {}, rooms: {}, approvals: [] };
- var ROWS_MAX = 4;
+ var FACES_MAX = 3;
+ var DOCK_EXIT_MS = 160;
function memberWork(room2, work = NO_WORK) {
const here = work.rooms?.[room2.id] ?? [];
return room2.members.map((id) => {
@@@ -11152,92 -11105,81 +11161,81 @@@ function summaryText(busy)
const doing = first ? `${first.bot.name} · ${workPhrase(first.doing)}…${workers.length > 1 ? ` +${workers.length - 1}` : ""}` : "";
return { waiting, doing };
}
- function Face({ entry, size }) {
+ function dockModel(sessionId, roster, work) {
+ const room2 = roster.roomsById[sessionId];
+ if (room2) {
+ const busy = dockMembers(busyMembers(room2, work, roster));
+ if (busy.length === 0) return null;
+ const { waiting, doing } = summaryText(busy);
+ return {
+ open: { details: room2.id },
+ faces: busy.slice(0, FACES_MAX).map((entry) => ({ id: entry.id, ask: entry.state === "ask", state: workState(entry.doing) })),
+ waiting,
+ doing
+ };
+ }
+ const bot = roster.byId[sessionId];
+ if (!bot || work.bots?.[bot.id] !== void 0 && work.bots[bot.id].roomId === void 0) return null;
+ const groups = botGroupWork(bot.id, work, roster);
+ if (groups.length === 0) return null;
+ const [first] = groups;
+ return {
+ open: { session: first.room.id },
+ faces: [{ id: bot.id, ask: false, state: workState(first.doing) }],
+ waiting: "",
+ doing: `${t("in {name}", { name: first.room.name })} · ${workPhrase(first.doing)}…${groups.length > 1 ? ` +${groups.length - 1}` : ""}`
+ };
+ }
+ function Face({ bot, ask, state }) {
- return (0, import_react30.createElement)(
+ return (0, import_react31.createElement)(
"span",
- { className: "bt-mw-face", "data-ask": entry.state === "ask" || void 0 },
- (0, import_react31.createElement)(BotMark, { bot: entry.bot, size, state: entry.state === "ask" ? "alert" : toolState(entry.doing?.tool ?? "") })
+ { className: "bt-mw-face", "data-ask": ask || void 0 },
- (0, import_react30.createElement)(BotMark, { bot, size: 20, state: ask ? "alert" : state })
++ (0, import_react31.createElement)(BotMark, { bot, size: 20, state: ask ? "alert" : state })
);
}
- function WorkRow({ bot, doing, label, at, now, onOpen }) {
- const text = `${label} · ${workPhrase(doing)}…`;
- const elapsed = typeof at === "number" && now - at >= 6e4 ? elapsedLabel(now - at) : "";
- return (0, import_react31.createElement)(
- "button",
- { type: "button", className: "bt-mw-row", "aria-label": [text, elapsed].filter(Boolean).join(" · "), title: text, onClick: onOpen },
- (0, import_react31.createElement)(BotMark, { bot, size: 22, state: doing?.switching ? "thinking" : toolState(doing?.tool ?? ""), live: true }),
- (0, import_react31.createElement)("span", { className: "bt-mw-row-text" }, (0, import_react31.createElement)(Shimmer, null, text)),
- elapsed ? (0, import_react31.createElement)("span", { className: "bt-mw-row-time" }, `· ${elapsed}`) : null
- );
+ function useFitWidth(inner, key) {
- const [width, setWidth] = (0, import_react30.useState)(null);
- (0, import_react30.useLayoutEffect)(() => {
++ const [width, setWidth] = (0, import_react31.useState)(null);
++ (0, import_react31.useLayoutEffect)(() => {
+ setWidth(key && inner.current ? inner.current.offsetWidth : null);
+ }, [key]);
+ return width;
}
- function SummaryLine({ busy, onOpen }) {
- const { waiting, doing } = summaryText(busy);
+ function MemberDock({ sessionId, useRoster, useWork, actions }) {
+ const roster = useRoster((value) => value);
+ const work = useWork((value) => value);
+ const live = dockModel(sessionId, roster, work);
+ const [kept, leaving] = useLinger(live ? JSON.stringify(live) : null, DOCK_EXIT_MS);
+ const model = kept ? JSON.parse(kept) : null;
- const inner = (0, import_react30.useRef)(null);
++ const inner = (0, import_react31.useRef)(null);
+ const width = useFitWidth(inner, kept);
+ if (!model) return null;
+ const faces = model.faces.map((face) => ({ ...face, bot: roster.byId[face.id] })).filter((face) => face.bot);
+ const label = [model.waiting, model.doing].filter(Boolean).join(" · ");
+ const open = () => model.open.details ? actions.showDetails(model.open.details) : actions.openSession(model.open.session);
- return (0, import_react30.createElement)(
+ return (0, import_react31.createElement)(
"div",
- { className: "bt-event bt-mw-dock" },
+ { className: "bt-mw-dock", "data-leaving": leaving || void 0 },
- (0, import_react30.createElement)(
+ (0, import_react31.createElement)(
"button",
- { type: "button", className: "bt-event-whole bt-mw-line", "aria-label": [waiting, doing].filter(Boolean).join(" · "), onClick: onOpen },
- (0, import_react31.createElement)("span", { className: "bt-mw-stack", "aria-hidden": true }, busy.slice(0, 4).map((entry) => (0, import_react31.createElement)(Face, { key: entry.id, entry, size: 16 }))),
- waiting ? (0, import_react31.createElement)("span", { className: "bt-mw-ask" }, waiting) : null,
- waiting && doing ? (0, import_react31.createElement)("span", { "aria-hidden": true }, "·") : null,
- doing ? (0, import_react31.createElement)("span", { className: "bt-event-name" }, (0, import_react31.createElement)(Shimmer, null, doing)) : null
+ { type: "button", className: "bt-mw-pill", "aria-label": label, onClick: open, disabled: leaving, style: width ? { width } : void 0 },
- (0, import_react30.createElement)(
++ (0, import_react31.createElement)(
+ "span",
+ { ref: inner, className: "bt-mw-pill-in" },
- (0, import_react30.createElement)("span", { className: "bt-mw-faces", "aria-hidden": true }, faces.map((face) => (0, import_react30.createElement)(Face, { key: face.id, ...face }))),
- (0, import_react30.createElement)(
++ (0, import_react31.createElement)("span", { className: "bt-mw-faces", "aria-hidden": true }, faces.map((face) => (0, import_react31.createElement)(Face, { key: face.id, ...face }))),
++ (0, import_react31.createElement)(
+ "span",
+ { key: label, className: "bt-mw-label", "aria-hidden": true },
- model.waiting ? (0, import_react30.createElement)("span", { className: "bt-mw-ask" }, model.waiting) : null,
- model.waiting && model.doing ? (0, import_react30.createElement)("span", { className: "bt-mw-dot" }, "·") : null,
- model.doing ? (0, import_react30.createElement)("span", { className: "bt-mw-doing" }, (0, import_react30.createElement)(Shimmer, null, model.doing)) : null
++ model.waiting ? (0, import_react31.createElement)("span", { className: "bt-mw-ask" }, model.waiting) : null,
++ model.waiting && model.doing ? (0, import_react31.createElement)("span", { className: "bt-mw-dot" }, "·") : null,
++ model.doing ? (0, import_react31.createElement)("span", { className: "bt-mw-doing" }, (0, import_react31.createElement)(Shimmer, null, model.doing)) : null
+ )
+ )
)
);
}
- function MemberDock({ sessionId, useRoster, useWork, actions }) {
- const roster = useRoster((value) => value);
- const work = useWork((value) => value);
- const room2 = roster.roomsById[sessionId];
- const bot = room2 ? void 0 : roster.byId[sessionId];
- const ownChat = bot !== void 0 && work.bots?.[bot.id] !== void 0 && work.bots[bot.id].roomId === void 0;
- const busy = room2 ? busyMembers(room2, work, roster) : [];
- const groups = bot !== void 0 && !ownChat ? botGroupWork(bot.id, work, roster) : [];
- const shown = busy.length > 0 || groups.length > 0;
- const now = useNow2(shown);
- const ref = (0, import_react31.useRef)(null);
- useFlowColumn(ref, shown, sessionId);
- if (!shown) return null;
- if (room2) {
- const { rows, rest } = splitBusy(busy);
- const open = () => actions.showDetails(sessionId);
- return (0, import_react31.createElement)(
- "div",
- { ref, className: "bt-mw-dock-stack" },
- rows.map((entry) => (0, import_react31.createElement)(WorkRow, { key: entry.id, bot: entry.bot, doing: entry.doing, label: entry.bot.name, at: entry.doing.since, now, onOpen: open })),
- rest.length > 0 ? (0, import_react31.createElement)(SummaryLine, { busy: rest, onOpen: open }) : null
- );
- }
- return (0, import_react31.createElement)("div", { ref, className: "bt-mw-dock-stack" }, groups.slice(0, ROWS_MAX).map((item) => (0, import_react31.createElement)(WorkRow, {
- key: item.room.id,
- bot,
- doing: item.doing,
- label: t("in {name}", { name: item.room.name }),
- at: item.since,
- now,
- onOpen: () => actions.openSession(item.room.id)
- })));
- }
- function useFlowColumn(ref, active, key) {
- (0, import_react31.useLayoutEffect)(() => {
- const node = ref.current;
- const flow = document.querySelector("[data-chat-flow]");
- if (!active || !node || !flow) return void 0;
- const place = () => {
- node.style.marginInlineStart = "0px";
- const column = flow.getBoundingClientRect();
- node.style.marginInlineStart = `${Math.round(column.left - node.getBoundingClientRect().left)}px`;
- node.style.width = `${Math.round(column.width)}px`;
- };
- place();
- const observer = new ResizeObserver(place);
- for (const target of [flow, flow.parentElement, node.parentElement]) if (target) observer.observe(target);
- return () => observer.disconnect();
- }, [active, key]);
- }
function useNow2(active) {
- const [now, setNow] = (0, import_react30.useState)(Date.now);
- (0, import_react30.useEffect)(() => {
+ const [now, setNow] = (0, import_react31.useState)(Date.now);
+ (0, import_react31.useEffect)(() => {
if (!active) return void 0;
const timer = setInterval(() => setNow(Date.now()), 3e4);
return () => clearInterval(timer);
@@@ -11270,32 -11212,30 +11268,30 @@@ function ApprovalCard({ approval, bot,
)
);
}
- function MemberWork({ entry, bot, room: room2, roster, actions, now }) {
- const [stopping, setStopping] = (0, import_react31.useState)(false);
- if (entry.state === "ask") {
- return (0, import_react31.createElement)(
- "div",
- { className: "bt-mw-member" },
- (0, import_react31.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_react31.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions }))
- );
- }
- if (entry.state !== "work") return null;
+ function MemberState({ entry, bot, room: room2, roster, now }) {
- if (entry?.state === "ask") return (0, import_react30.createElement)("span", { className: "bt-member-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`);
- if (entry?.state !== "work") return bot.role ? (0, import_react30.createElement)("span", { className: "bt-member-state" }, bot.role) : null;
++ if (entry?.state === "ask") return (0, import_react31.createElement)("span", { className: "bt-member-state bt-mw-ask" }, `${t("Waiting for your approval")}${since(now, entry.approvals[0].at)}`);
++ if (entry?.state !== "work") return bot.role ? (0, import_react31.createElement)("span", { className: "bt-member-state" }, bot.role) : 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_react30.createElement)(
++ return (0, import_react31.createElement)(
+ "span",
+ { className: "bt-member-state" },
- (0, import_react30.createElement)(Shimmer, null, `${workPhrase(entry.doing)}…`),
++ (0, import_react31.createElement)(Shimmer, null, `${workPhrase(entry.doing)}…`),
+ where ? ` ${where}` : "",
+ since(now, entry.doing.since)
+ );
+ }
+ function StopMemberWork({ entry, bot, room: room2, actions }) {
- const [stopping, setStopping] = (0, import_react30.useState)(false);
++ const [stopping, setStopping] = (0, import_react31.useState)(false);
+ if (entry?.state !== "work" || !entry.here) return null;
const stop = () => {
setStopping(true);
void Promise.resolve(actions.stopMemberWork(room2.id, bot.id)).catch((error) => actions.reportError(error, "stop")).finally(() => setStopping(false));
};
- return (0, import_react31.createElement)(
- "div",
- { className: "bt-mw-member" },
- (0, import_react31.createElement)(
- "div",
- { className: "bt-mw-state bt-mw-work" },
- (0, import_react31.createElement)("span", null, (0, import_react31.createElement)(Shimmer, null, `${workPhrase(entry.doing)}…`), where ? ` ${where}` : "", since(now, entry.doing.since)),
- entry.here ? (0, import_react31.createElement)("button", { type: "button", className: "bt-mw-stop", disabled: stopping, onClick: stop }, t("Stop")) : null
- )
- );
- return (0, import_react30.createElement)("button", { type: "button", className: "bt-member-stop", disabled: stopping, "aria-label": `${t("Stop")} · ${bot.name}`, onClick: stop }, t("Stop"));
++ return (0, import_react31.createElement)("button", { type: "button", className: "bt-member-stop", disabled: stopping, "aria-label": `${t("Stop")} · ${bot.name}`, onClick: stop }, t("Stop"));
+ }
+ function MemberApprovals({ entry, bot, actions }) {
+ if (entry?.state !== "ask") return null;
- return (0, import_react30.createElement)("div", { className: "bt-member-cards" }, entry.approvals.map((approval) => (0, import_react30.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })));
++ return (0, import_react31.createElement)("div", { className: "bt-member-cards" }, entry.approvals.map((approval) => (0, import_react31.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })));
}
function useMemberWork(room2, useWork) {
const work = useWork?.((value) => value) ?? NO_WORK;
@@@ -11433,64 -11410,89 +11443,95 @@@ function BrowserCards({ bot, sessionId
);
}
function About({ text, title = "About" }) {
- const [open, setOpen] = (0, import_react31.useState)(false);
+ const [open, setOpen] = (0, import_react32.useState)(false);
const long = text.split("\n").length > 5 || text.length > 240;
- const body = (0, import_react31.useRef)(null);
+ const body = (0, import_react32.useRef)(null);
useMorph(body, open);
- return (0, import_react31.createElement)(
+ return (0, import_react32.createElement)(
"div",
null,
- (0, import_react31.createElement)("div", { className: "bt-section-title" }, t(title)),
- (0, import_react31.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text),
- long ? (0, import_react31.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null
+ (0, import_react32.createElement)("div", { className: "bt-section-title" }, t(title)),
+ (0, import_react32.createElement)("div", { ref: body, className: "bt-about", "data-open": open || void 0 }, text),
+ long ? (0, import_react32.createElement)("button", { type: "button", className: "bt-more", onClick: () => setOpen((value) => !value) }, open ? t("Show less") : t("Show more")) : null
);
}
+ var PILE_MAX = 4;
+ function MemberPile({ room: room2, roster }) {
+ const members = room2.members.map((id) => roster.byId[id]).filter(Boolean);
+ const shown = members.length > PILE_MAX ? members.slice(0, PILE_MAX - 1) : members;
+ const more = members.length - shown.length;
- return (0, import_react31.createElement)(
++ return (0, import_react32.createElement)(
+ "span",
+ { className: "bt-pile", "aria-hidden": true },
- shown.map((bot, index) => (0, import_react31.createElement)("span", { key: bot.id, className: "bt-pile-face", style: { animationDelay: `${index * 40}ms` } }, (0, import_react31.createElement)(BotMark, { bot, size: 44, live: true }))),
- more > 0 ? (0, import_react31.createElement)("span", { key: "more", className: "bt-pile-face bt-pile-more", style: { animationDelay: `${shown.length * 40}ms` } }, `+${more}`) : null
++ shown.map((bot, index) => (0, import_react32.createElement)("span", { key: bot.id, className: "bt-pile-face", style: { animationDelay: `${index * 40}ms` } }, (0, import_react32.createElement)(BotMark, { bot, size: 44, live: true }))),
++ more > 0 ? (0, import_react32.createElement)("span", { key: "more", className: "bt-pile-face bt-pile-more", style: { animationDelay: `${shown.length * 40}ms` } }, `+${more}`) : null
+ );
+ }
+ var markOf = (entry) => entry?.state === "ask" ? "alert" : entry?.state === "work" ? workState(entry.doing) : "idle";
+ function MemberRow({ member, entry, room: room2, roster, actions, now }) {
- return (0, import_react31.createElement)(
++ return (0, import_react32.createElement)(
+ "div",
+ { role: "listitem", className: "bt-member" },
- (0, import_react31.createElement)(
++ (0, import_react32.createElement)(
+ "div",
+ { className: "bt-member-row" },
- (0, import_react31.createElement)(
++ (0, import_react32.createElement)(
+ "button",
+ { type: "button", className: "bt-member-open", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) },
- (0, import_react31.createElement)(BotMark, { bot: member, size: 32, state: markOf(entry) }),
- (0, import_react31.createElement)(
++ (0, import_react32.createElement)(BotMark, { bot: member, size: 32, state: markOf(entry) }),
++ (0, import_react32.createElement)(
+ "span",
+ { className: "bt-member-text" },
- (0, import_react31.createElement)(
++ (0, import_react32.createElement)(
+ "span",
+ { className: "bt-member-line" },
- (0, import_react31.createElement)("span", { className: "bt-member-name" }, member.name),
- room2.admin === member.id ? (0, import_react31.createElement)("span", { className: "bt-tag" }, t("Admin")) : null
++ (0, import_react32.createElement)("span", { className: "bt-member-name" }, member.name),
++ room2.admin === member.id ? (0, import_react32.createElement)("span", { className: "bt-tag" }, t("Admin")) : null
+ ),
- (0, import_react31.createElement)(MemberState, { entry, bot: member, room: room2, roster, now })
++ (0, import_react32.createElement)(MemberState, { entry, bot: member, room: room2, roster, now })
+ )
+ ),
- (0, import_react31.createElement)(StopMemberWork, { entry, bot: member, room: room2, actions })
++ (0, import_react32.createElement)(StopMemberWork, { entry, bot: member, room: room2, actions })
+ ),
- (0, import_react31.createElement)(MemberApprovals, { entry, bot: member, actions })
++ (0, import_react32.createElement)(MemberApprovals, { entry, bot: member, actions })
+ );
+ }
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_react31.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react31.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")),
- (0, import_react31.createElement)(
+ room2.notice ? (0, import_react32.createElement)(About, { key: "notice", title: "Notice", text: room2.notice }) : (0, import_react32.createElement)("button", { key: "notice", type: "button", className: "bt-more", onClick: openSettings }, t("Add a notice in group settings")),
+ (0, import_react32.createElement)(
"div",
{ key: "members" },
- (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })),
- (0, import_react31.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => (0, import_react31.createElement)(MemberRow, {
+ (0, import_react32.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })),
- (0, import_react32.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => {
- const entry = entries2.find((item) => item.id === member.id);
- return (0, import_react32.createElement)(
- "div",
- { key: member.id, role: "listitem" },
- (0, import_react32.createElement)(
- "div",
- { className: "bt-member" },
- (0, import_react32.createElement)(
- "button",
- { type: "button", className: "bt-member-name", title: t("Open {name}'s chat", { name: member.name }), onClick: () => actions.openSession(member.id) },
- (0, import_react32.createElement)(BotAvatar, { bot: member, size: 26, main: isMainOf(roster, member.id), admin: room2.admin === member.id, live: false }),
- (0, import_react32.createElement)("span", null, member.name)
- ),
- room2.admin === member.id ? (0, import_react32.createElement)("span", { className: "bt-chip bt-chip-admin" }, t("Admin")) : null
- ),
- entry ? (0, import_react32.createElement)(MemberWork, { entry, bot: member, room: room2, roster, actions, now }) : null
- );
- }))
++ (0, import_react32.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => (0, import_react32.createElement)(MemberRow, {
+ key: member.id,
+ member,
+ entry: entries2.find((item) => item.id === member.id),
+ room: room2,
+ roster,
+ actions,
+ now
+ })))
),
- (0, import_react31.createElement)(
+ (0, import_react32.createElement)(
"div",
{ key: "mode" },
- (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Who answers")),
- (0, import_react31.createElement)("div", { className: "bt-kv" }, (0, import_react31.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone")))
+ (0, import_react32.createElement)("div", { className: "bt-section-title" }, t("Who answers")),
+ (0, import_react32.createElement)("div", { className: "bt-kv" }, (0, import_react32.createElement)("span", null, t(ROOM_MODES.find(([id]) => id === shownMode(room2, roster))?.[1] ?? "Everyone")))
),
- usage ? (0, import_react31.createElement)(
+ room2.permission ? (0, import_react32.createElement)(
+ "div",
+ { key: "permission" },
+ (0, import_react32.createElement)("div", { className: "bt-section-title" }, t("Permissions")),
+ (0, import_react32.createElement)("div", { className: "bt-kv" }, (0, import_react32.createElement)("span", { className: presetDanger(room2.permission) ? "bt-perm-danger" : void 0 }, presetName(room2.permission, roster.permissions)))
+ ) : null,
+ usage ? (0, import_react32.createElement)(
"div",
{ key: "usage" },
- (0, import_react31.createElement)("div", { className: "bt-section-title" }, t("Usage")),
- (0, import_react31.createElement)("div", { className: "bt-kv" }, (0, import_react31.createElement)("span", null, room2.name), (0, import_react31.createElement)("span", null, usage))
+ (0, import_react32.createElement)("div", { className: "bt-section-title" }, t("Usage")),
+ (0, import_react32.createElement)("div", { className: "bt-kv" }, (0, import_react32.createElement)("span", null, room2.name), (0, import_react32.createElement)("span", null, usage))
) : null
];
}
@@@ -11574,12 -11576,12 +11615,12 @@@ function DetailsDrawer({ sessionId, sta
const subtitle = bot ? bot.role : roomSubtitle(room2, roster);
const tabs = bot ? ["details", "browser"] : ["details"];
return [
- (0, import_react31.createElement)(import_react31.Fragment, { key: "top" }, top),
- (0, import_react31.createElement)(
+ (0, import_react32.createElement)(import_react32.Fragment, { key: "top" }, top),
+ (0, import_react32.createElement)(
"div",
{ key: "id", className: "bt-drawer-id", "data-move": side },
- bot ? (0, import_react32.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react32.createElement)(RoomAvatar, { room: room2, roster, size: 64 }),
- bot ? (0, import_react31.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react31.createElement)(MemberPile, { room: room2, roster }),
- editing ? (0, import_react31.createElement)("input", {
++ bot ? (0, import_react32.createElement)(BotAvatar, { bot, size: 64, state: botState(running, doing, roster.questions?.[part] !== void 0), main: isMainBot, badge: false, gaze: true, pokeable: true }) : (0, import_react32.createElement)(MemberPile, { room: room2, roster }),
+ editing ? (0, import_react32.createElement)("input", {
className: "bt-drawer-name-input",
autoFocus: true,
value: draftName,
@@@ -11598,15 -11600,15 +11639,15 @@@
setDraftName(room2 && !room2.named ? "" : current);
setEditing(true);
} }, current),
- subtitle ? (0, import_react31.createElement)("span", { className: "bt-drawer-role" }, subtitle) : null
+ subtitle ? (0, import_react32.createElement)("span", { className: "bt-drawer-role" }, subtitle) : null
),
- (0, import_react32.createElement)(
- tabs.length > 1 ? (0, import_react31.createElement)(
++ tabs.length > 1 ? (0, import_react32.createElement)(
"div",
{ key: "tabs", ref: glide.box, className: "bt-tabs", role: "tablist", "data-move": side },
- (0, import_react31.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
- tabs.map((key) => (0, import_react31.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key])))
+ (0, import_react32.createElement)("span", { ref: glide.thumb, className: "bt-thumb", "aria-hidden": true }),
+ tabs.map((key) => (0, import_react32.createElement)("button", { key, type: "button", role: "tab", className: "bt-tab", "aria-selected": tab === key, onClick: () => setTab(key) }, t(TAB_LABELS[key])))
- ),
+ ) : null,
- (0, import_react31.createElement)(
+ (0, import_react32.createElement)(
"div",
{ key: `body:${tab}`, className: "bt-drawer-body", "data-move": move },
errorLine,
diff --cc ds-bot/src/client/details-drawer.js
index 1d830096,fc143a9a..b39ed011
--- a/ds-bot/src/client/details-drawer.js
+++ b/ds-bot/src/client/details-drawer.js
@@@ -11,9 -11,8 +11,9 @@@ import { ModelMenu, modelOf } from './m
import { FolderMenu } from './folder-menu.js'
import { MemoryRow } from './memory-panel.js'
import { ScheduleSummary } from './schedules.js'
-import { Segmented, useGlide, useMorph } from './motion.js'
+import { useGlide, useMorph } from './motion.js'
- import { MemberWork, useMemberWork } from './member-status.js'
+ import { MemberApprovals, MemberState, StopMemberWork, useMemberWork, workState } from './member-status.js'
+import { PermissionPicker, presetDanger, presetName } from './permission-picker.js'
import { t } from './i18n.js'
function transcriptOf(list, id, name, hiddenTurns = []) {
@@@ -106,20 -152,11 +136,13 @@@ function GroupOverview({ room, roster,
: 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) => {
- 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', { className: 'bt-members', role: 'list' }, members.map(member => h(MemberRow, {
+ key: member.id, member, entry: entries.find(item => item.id === member.id), room, roster, actions, now,
+ })))),
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')))),
+ room.permission ? h('div', { key: 'permission' }, h('div', { className: 'bt-section-title' }, t('Permissions')),
+ h('div', { className: 'bt-kv' }, h('span', { className: presetDanger(room.permission) ? 'bt-perm-danger' : undefined }, presetName(room.permission, roster.permissions)))) : null,
usage ? h('div', { key: 'usage' }, h('div', { className: 'bt-section-title' }, t('Usage')),
h('div', { className: 'bt-kv' }, h('span', null, room.name), h('span', null, usage))) : null,
]