Skip to content

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

Move the group stop button into the group details

Fei2411f80c22b9d16a
diff --git a/docs/plans/2026-10-07-group-chat.md b/docs/plans/2026-10-07-group-chat.md
index a3bfd5e0..11044e2a 100644
--- a/docs/plans/2026-10-07-group-chat.md
+++ b/docs/plans/2026-10-07-group-chat.md
@@ -49,7 +49,7 @@
### 审批与状态
- 群里成员的审批请求(例如提权)由 DS Bot 接到群里:输入框上方的状态胶囊列出正在忙的成员,等审批的排在前面;点开群详情可以「允许一次」或「拒绝」。需要审批的成员立刻让出发言。
-- 有成员在本群干活(含等审批)时,状态胶囊旁有一个停止按钮:一次停掉本群正在跑的一轮和每个成员在本群的工作,被停下的成员各在群里留一行「已叫停」;它们在私聊和别的群里的活照常。DSH 自己的停止只停这一轮,轮次放手后还在干活的成员停不到;群详情里仍可以逐个停。
+- 有成员在本群干活(含等审批)时,群详情的成员列表标题旁有一个「全部停止」按钮:一次停掉本群正在跑的一轮和每个成员在本群的工作,被停下的成员各在群里留一行「已叫停」;它们在私聊和别的群里的活照常。DSH 自己的停止只停这一轮,轮次放手后还在干活的成员停不到;群详情里仍可以逐个停。
- 群的工作文件夹和统一权限是群级设置,见 [角色与权限](2026-10-07-roles-and-permissions.md)。
### 群的设置
@@ -88,4 +88,4 @@
- 2026-10-16:去掉 Bot 在一个群里 3 轮和全团队 40 条的上限;要回报的发帖进派活树(#262)。
- 2026-10-18:其他成员也能往自己所在的群发帖,只叫 `@` 点到的成员(#198)。
- 2026-10-22:去掉群里每人每轮、每轮总数和迟到 10 次的上限;Bot 之间接力到群的上限时暂停,用户点「继续」或发言后接着跑,用户的 @ 一定有人回应(#395)。
-- 2026-10-26:状态胶囊旁的停止按钮一次停掉本群的一轮和所有成员在本群的工作(#592)。
+- 2026-10-29:群的停止按钮一次停掉本群的一轮和所有成员在本群的工作,放在群详情的成员列表标题旁,不放在状态胶囊旁(#592,PR #616)。
diff --git a/ds-bot/client.js b/ds-bot/client.js
index 76ba3c94..eb4b652c 100644
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@ -663,6 +663,7 @@ var ZH = {
"Waiting for your approval": "等你批准",
"in its own chat": "在自己的对话里",
"Stop all work in this group": "停止本群的所有工作",
+ "Stop all": "全部停止",
Reject: "拒绝",
"Allow once": "允许一次",
"Couldn't message {name}": "没能给 {name} 发消息",
@@ -3826,9 +3827,6 @@ function ShareIcon() {
function CloseIcon() {
return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M5 5l10 10M15 5L5 15", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round" }));
}
-function StopIcon() {
- return (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", "aria-hidden": true }, (0, import_react3.createElement)("rect", { x: 4, y: 4, width: 12, height: 12, rx: 2.5, fill: "currentColor" }));
-}
var ChevronLeftIcon = () => (0, import_react3.createElement)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M12.5 4.5L7 10l5.5 5.5" }));
var ChevronRightIcon = () => (0, import_react3.createElement)("svg", { width: 14, height: 14, viewBox: "0 0 20 20", fill: "none", stroke: "currentColor", strokeWidth: 1.6, strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": true }, (0, import_react3.createElement)("path", { d: "M7.5 4.5L13 10l-5.5 5.5" }));
var lineIcon = (paths) => function LineIcon() {
@@ -16669,14 +16667,11 @@ function summaryText(busy) {
function dockModel(sessionId, roster, work) {
const room2 = roster.roomsById[sessionId];
if (room2) {
- const all = busyMembers(room2, work, roster);
- const busy = dockMembers(all);
+ const busy = dockMembers(busyMembers(room2, work, roster));
if (busy.length === 0) return null;
const { waiting, doing } = summaryText(busy);
return {
open: { details: room2.id },
- // A member busy only elsewhere is shown here, but its work is not this group's to stop.
- ...all.some((entry) => entry.here) ? { stop: room2.id } : {},
faces: busy.slice(0, FACES_MAX).map((entry) => ({ id: entry.id, ask: entry.state === "ask", state: workState(entry.doing) })),
waiting,
doing
@@ -16708,15 +16703,6 @@ function useFitWidth(inner, key) {
}, [key]);
return width;
}
-function StopRoomWork({ roomId, actions }) {
- const [stopping, setStopping] = (0, import_react42.useState)(false);
- const stop = () => {
- setStopping(true);
- void Promise.resolve(actions.stopRoomWork(roomId)).catch((error) => actions.reportError(error, "stop")).finally(() => setStopping(false));
- };
- const label = t("Stop all work in this group");
- return (0, import_react42.createElement)("button", { type: "button", className: "bt-mw-stop", "aria-label": label, title: label, disabled: stopping, onClick: stop }, (0, import_react42.createElement)(StopIcon));
-}
function MemberDock({ sessionId, useRoster, useWork, actions }) {
const roster = useRoster((value) => value);
const work = useWork((value) => value);
@@ -16733,25 +16719,20 @@ function MemberDock({ sessionId, useRoster, useWork, actions }) {
"div",
{ className: "bt-mw-dock", "data-leaving": leaving || void 0 },
(0, import_react42.createElement)(
- "span",
- { className: "bt-mw-pair", "data-stop": model.stop ? true : void 0 },
+ "button",
+ { type: "button", className: "bt-mw-pill", "aria-label": label, onClick: open, disabled: leaving, style: width ? { width } : void 0 },
(0, import_react42.createElement)(
- "button",
- { type: "button", className: "bt-mw-pill", "aria-label": label, onClick: open, disabled: leaving, style: width ? { width } : void 0 },
+ "span",
+ { ref: inner, className: "bt-mw-pill-in" },
+ (0, import_react42.createElement)("span", { className: "bt-mw-faces", "aria-hidden": true }, faces.map((face) => (0, import_react42.createElement)(Face, { key: face.id, ...face }))),
(0, import_react42.createElement)(
"span",
- { ref: inner, className: "bt-mw-pill-in" },
- (0, import_react42.createElement)("span", { className: "bt-mw-faces", "aria-hidden": true }, faces.map((face) => (0, import_react42.createElement)(Face, { key: face.id, ...face }))),
- (0, import_react42.createElement)(
- "span",
- { key: label, className: "bt-mw-label", "aria-hidden": true },
- model.waiting ? (0, import_react42.createElement)("span", { className: "bt-mw-ask" }, model.waiting) : null,
- model.waiting && model.doing ? (0, import_react42.createElement)("span", { className: "bt-mw-dot" }, "·") : null,
- model.doing ? (0, import_react42.createElement)("span", { className: "bt-mw-doing" }, (0, import_react42.createElement)(Shimmer, null, model.doing)) : null
- )
+ { key: label, className: "bt-mw-label", "aria-hidden": true },
+ model.waiting ? (0, import_react42.createElement)("span", { className: "bt-mw-ask" }, model.waiting) : null,
+ model.waiting && model.doing ? (0, import_react42.createElement)("span", { className: "bt-mw-dot" }, "·") : null,
+ model.doing ? (0, import_react42.createElement)("span", { className: "bt-mw-doing" }, (0, import_react42.createElement)(Shimmer, null, model.doing)) : null
)
- ),
- model.stop ? (0, import_react42.createElement)(StopRoomWork, { roomId: model.stop, actions }) : null
+ )
)
);
}
@@ -16801,6 +16782,16 @@ function StopMemberWork({ entry, bot, room: room2, actions }) {
};
return (0, import_react42.createElement)("button", { type: "button", className: "bt-member-stop", disabled: stopping, "aria-label": `${t("Stop")} · ${bot.name}`, onClick: stop }, t("Stop"));
}
+function StopRoomWork({ room: room2, entries: entries2, actions }) {
+ const [stopping, setStopping] = (0, import_react42.useState)(false);
+ if (!entries2.some((entry) => entry.here)) return null;
+ const stop = () => {
+ setStopping(true);
+ void Promise.resolve(actions.stopRoomWork(room2.id)).catch((error) => actions.reportError(error, "stop")).finally(() => setStopping(false));
+ };
+ const label = t("Stop all work in this group");
+ return (0, import_react42.createElement)("button", { type: "button", className: "bt-soft bt-soft-sm", disabled: stopping, "aria-label": label, title: label, onClick: stop }, t("Stop all"));
+}
function MemberApprovals({ entry, bot, actions }) {
if (entry?.state !== "ask") return null;
return (0, import_react42.createElement)("div", { className: "bt-member-cards" }, entry.approvals.map((approval) => (0, import_react42.createElement)(ApprovalCard, { key: approval.id, approval, bot, actions })));
@@ -16814,13 +16805,7 @@ var MEMBER_CSS = `
.bt-mw-pill{pointer-events:auto;position:relative;display:inline-flex;align-items:center;flex:none;box-sizing:border-box;height:32px;max-width:100%;padding:0;border:0;border-radius:999px;overflow:hidden;background:var(--bt-main);box-shadow:0 0 0 .5px var(--bt-line-2),0 2px 8px -2px rgba(0,0,0,.12);color:var(--bt-ink-2);font:inherit;font-size:13px;line-height:18px;cursor:pointer;animation:bt-mw-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .18s ease-out backwards;transition:background-color .12s ease,${spring(SPRING_SHAPE, "width")},${spring(SPRING_TAP, "scale")}}
.bt-mw-pill:hover{background:color-mix(in srgb,var(--bt-ink) 4%,var(--bt-main))}
.bt-mw-pill:active{scale:.97}
-.bt-mw-dock[data-leaving] .bt-mw-pill,.bt-mw-dock[data-leaving] .bt-mw-stop{animation:bt-mw-out .16s cubic-bezier(.4,0,1,1) forwards;pointer-events:none}
-.bt-mw-pair{position:relative;display:inline-flex;min-width:0;max-width:100%}
-.bt-mw-pair[data-stop]{max-width:calc(100% - 76px)}
-.bt-mw-stop{pointer-events:auto;position:absolute;top:0;left:calc(100% + 6px);display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:0;border-radius:50%;background:var(--bt-main);box-shadow:0 0 0 .5px var(--bt-line-2),0 2px 8px -2px rgba(0,0,0,.12);color:var(--bt-ink-2);cursor:pointer;animation:bt-mw-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .18s ease-out backwards;transition:background-color .12s ease,color .12s ease,${spring(SPRING_TAP, "scale")}}
-.bt-mw-stop:hover:not(:disabled){background:color-mix(in srgb,var(--bt-ink) 4%,var(--bt-main));color:var(--bt-ink)}
-.bt-mw-stop:active:not(:disabled){scale:.9}
-.bt-mw-stop:disabled{opacity:.35;cursor:default}
+.bt-mw-dock[data-leaving] .bt-mw-pill{animation:bt-mw-out .16s cubic-bezier(.4,0,1,1) forwards;pointer-events:none}
.bt-mw-pill-in{display:inline-flex;align-items:center;gap:8px;flex:none;padding:0 13px 0 6px;white-space:nowrap}
.bt-mw-faces{display:inline-flex;align-items:center;flex:none;line-height:0}
.bt-mw-face{position:relative;display:inline-flex;flex:none;border-radius:50%;background:var(--bt-main);box-shadow:0 0 0 2px var(--bt-main);animation:bt-mw-seat .26s cubic-bezier(.34,1.56,.64,1) backwards}
@@ -16837,6 +16822,11 @@ body[data-ds-dark-theme] .bt-mw-ask{color:#f0b84a}
@keyframes bt-mw-seat{from{opacity:0;scale:.6}}
@keyframes bt-mw-swap{from{opacity:0;filter:blur(4px)}}
.bt-members{display:flex;flex-direction:column;gap:2px;margin:0 -8px}
+.bt-members-head{display:flex;align-items:center;justify-content:space-between;gap:8px;margin-bottom:6px}
+.bt-members-head>.bt-section-title{margin:0}
+/* The button hangs over the title's line, so the list below does not move when it appears. */
+.bt-members-head>.bt-soft-sm{margin:-6px 0}
+.bt-members-head>.bt-soft-sm:disabled{opacity:.5;cursor:default}
.bt-member{display:flex;flex-direction:column;border-radius:12px;animation:bt-rise .18s ease-out backwards}
.bt-member-row{display:flex;align-items:center;gap:8px;min-height:48px;padding:0 8px;border-radius:12px;transition:background-color .12s ease}
.bt-member-row:hover{background:var(--bt-hover)}
@@ -16864,7 +16854,7 @@ body[data-ds-dark-theme] .bt-member-state.bt-mw-ask{color:#f0b84a}
.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}
-@media (prefers-reduced-motion:reduce){.bt-mw-pill,.bt-mw-stop,.bt-mw-face,.bt-mw-label,.bt-member,.bt-mw-card{animation:none}.bt-mw-pill{transition:background-color .12s ease}.bt-mw-stop{transition:background-color .12s ease,color .12s ease}}
+@media (prefers-reduced-motion:reduce){.bt-mw-pill,.bt-mw-face,.bt-mw-label,.bt-member,.bt-mw-card{animation:none}.bt-mw-pill{transition:background-color .12s ease}}
`;
// src/client/details-drawer.js
@@ -17052,7 +17042,12 @@ function GroupOverview({ room: room2, roster, actions, usage, useWork, openSetti
(0, import_react43.createElement)(
"div",
{ key: "members" },
- (0, import_react43.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })),
+ (0, import_react43.createElement)(
+ "div",
+ { className: "bt-members-head" },
+ (0, import_react43.createElement)("div", { className: "bt-section-title" }, t("Members · {count}", { count: members.length })),
+ (0, import_react43.createElement)(StopRoomWork, { room: room2, entries: entries2, actions })
+ ),
(0, import_react43.createElement)("div", { className: "bt-members", role: "list" }, members.map((member) => (0, import_react43.createElement)(MemberRow, {
key: member.id,
member,
@@ -17268,7 +17263,7 @@ var GlobeIcon2 = icon(["M10 3a7 7 0 1 0 0 14 7 7 0 0 0 0-14z", "M3 10h14", "M10
var BackIcon = icon(["M12.5 4.5L7 10l5.5 5.5"]);
var ForwardIcon = icon(["M7.5 4.5L13 10l-5.5 5.5"]);
var ReloadIcon = icon(["M15.5 10a5.5 5.5 0 1 1-1.6-3.9", "M15.5 3.5v3.5H12"]);
-var StopIcon2 = icon(["M5.5 5.5l9 9M14.5 5.5l-9 9"]);
+var StopIcon = icon(["M5.5 5.5l9 9M14.5 5.5l-9 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"]);
@@ -17667,7 +17662,7 @@ function BrowserView({ bot, tabId, leaving, landed, actions, useBrowserPages, ho
"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_react44.createElement)(page.loading ? StopIcon2 : ReloadIcon)),
+ }, (0, import_react44.createElement)(page.loading ? StopIcon : ReloadIcon)),
(0, import_react44.createElement)(
"form",
{ className: "bt-browser-address", onSubmit: go, "data-editing": editing || void 0 },
diff --git a/ds-bot/src/client/details-drawer.js b/ds-bot/src/client/details-drawer.js
index cdd9dba5..76c8c048 100644
--- a/ds-bot/src/client/details-drawer.js
+++ b/ds-bot/src/client/details-drawer.js
@@ -13,7 +13,7 @@ import { FolderMenu } from './folder-menu.js'
import { MemoryRow } from './memory-panel.js'
import { ScheduleSummary } from './schedules.js'
import { useGlide, useMorph } from './motion.js'
-import { MemberApprovals, MemberState, StopMemberWork, useMemberWork, workState } from './member-status.js'
+import { MemberApprovals, MemberState, StopMemberWork, StopRoomWork, useMemberWork, workState } from './member-status.js'
import { PermissionPicker, presetDanger, presetName } from './permission-picker.js'
import { t } from './i18n.js'
@@ -158,7 +158,9 @@ function GroupOverview({ room, roster, actions, usage, useWork, openSettings })
? 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-head' },
+ h('div', { className: 'bt-section-title' }, t('Members · {count}', { count: members.length })),
+ h(StopRoomWork, { room, entries, actions })),
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,
})))),
diff --git a/ds-bot/src/client/i18n.js b/ds-bot/src/client/i18n.js
index 7caa86be..7ed74d4a 100644
--- a/ds-bot/src/client/i18n.js
+++ b/ds-bot/src/client/i18n.js
@@ -609,6 +609,7 @@ const ZH = {
'Waiting for your approval': '等你批准',
'in its own chat': '在自己的对话里',
'Stop all work in this group': '停止本群的所有工作',
+ 'Stop all': '全部停止',
Reject: '拒绝',
'Allow once': '允许一次',
"Couldn't message {name}": '没能给 {name} 发消息',
diff --git a/ds-bot/src/client/icons.js b/ds-bot/src/client/icons.js
index 09400e0a..eee56758 100644
--- a/ds-bot/src/client/icons.js
+++ b/ds-bot/src/client/icons.js
@@ -36,9 +36,6 @@ export function ShareIcon() {
export function CloseIcon() {
return h('svg', { width: 16, height: 16, viewBox: '0 0 20 20', 'aria-hidden': true }, h('path', { d: 'M5 5l10 10M15 5L5 15', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round' }))
}
-export function StopIcon() {
- return h('svg', { width: 16, height: 16, viewBox: '0 0 20 20', 'aria-hidden': true }, h('rect', { x: 4, y: 4, width: 12, height: 12, rx: 2.5, fill: 'currentColor' }))
-}
export const ChevronLeftIcon = () => h('svg', { width: 16, height: 16, viewBox: '0 0 20 20', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true }, h('path', { d: 'M12.5 4.5L7 10l5.5 5.5' }))
export const ChevronRightIcon = () => h('svg', { width: 14, height: 14, viewBox: '0 0 20 20', fill: 'none', stroke: 'currentColor', strokeWidth: 1.6, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true }, h('path', { d: 'M7.5 4.5L13 10l-5.5 5.5' }))
diff --git a/ds-bot/src/client/member-status.js b/ds-bot/src/client/member-status.js
index 7ec3b76b..018478e2 100644
--- a/ds-bot/src/client/member-status.js
+++ b/ds-bot/src/client/member-status.js
@@ -1,7 +1,6 @@
import { createElement as h, useLayoutEffect, useRef, useState } from 'react'
import { BotMark, toolState } from './mark.js'
import { Elapsed, Shimmer, workPhrase } from './cells.js'
-import { StopIcon } from './icons.js'
import { SPRING_SHAPE, SPRING_TAP, spring, useLinger } from './motion.js'
import { t } from './i18n.js'
@@ -64,14 +63,11 @@ export function summaryText(busy) {
function dockModel(sessionId, roster, work) {
const room = roster.roomsById[sessionId]
if (room) {
- const all = busyMembers(room, work, roster)
- const busy = dockMembers(all)
+ const busy = dockMembers(busyMembers(room, work, roster))
if (busy.length === 0) return null
const { waiting, doing } = summaryText(busy)
return {
open: { details: room.id },
- // A member busy only elsewhere is shown here, but its work is not this group's to stop.
- ...(all.some(entry => entry.here) ? { stop: room.id } : {}),
faces: busy.slice(0, FACES_MAX).map(entry => ({ id: entry.id, ask: entry.state === 'ask', state: workState(entry.doing) })),
waiting, doing,
}
@@ -103,20 +99,6 @@ function useFitWidth(inner, key) {
return width
}
-// Beside a group's capsule, one press stops everything at work in the group: DSH's own
-// stop reaches only the round, and a member the round moved on from keeps working.
-function StopRoomWork({ roomId, actions }) {
- const [stopping, setStopping] = useState(false)
- const stop = () => {
- setStopping(true)
- void Promise.resolve(actions.stopRoomWork(roomId))
- .catch(error => actions.reportError(error, 'stop'))
- .finally(() => setStopping(false))
- }
- const label = t('Stop all work in this group')
- return h('button', { type: 'button', className: 'bt-mw-stop', 'aria-label': label, title: label, disabled: stopping, onClick: stop }, h(StopIcon))
-}
-
// Above the composer, one capsule for everything at work: it opens the group's details,
// or from a Bot's own chat the group it is at work in.
export function MemberDock({ sessionId, useRoster, useWork, actions }) {
@@ -131,18 +113,14 @@ export function MemberDock({ sessionId, useRoster, useWork, actions }) {
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))
- // The stop button hangs off the capsule's side, so the capsule stays centred; the
- // capsule keeps room for it on both sides, so it never leaves a narrow chat column.
return h('div', { className: 'bt-mw-dock', 'data-leaving': leaving || undefined },
- h('span', { className: 'bt-mw-pair', 'data-stop': model.stop ? true : undefined },
- h('button', { type: 'button', className: 'bt-mw-pill', 'aria-label': label, onClick: open, disabled: leaving, style: width ? { width } : undefined },
- h('span', { ref: inner, className: 'bt-mw-pill-in' },
- h('span', { className: 'bt-mw-faces', 'aria-hidden': true }, faces.map(face => h(Face, { key: face.id, ...face }))),
- h('span', { key: label, className: 'bt-mw-label', 'aria-hidden': true },
- model.waiting ? h('span', { className: 'bt-mw-ask' }, model.waiting) : null,
- model.waiting && model.doing ? h('span', { className: 'bt-mw-dot' }, '·') : null,
- model.doing ? h('span', { className: 'bt-mw-doing' }, h(Shimmer, null, model.doing)) : null))),
- model.stop ? h(StopRoomWork, { roomId: model.stop, actions }) : null))
+ h('button', { type: 'button', className: 'bt-mw-pill', 'aria-label': label, onClick: open, disabled: leaving, style: width ? { width } : undefined },
+ h('span', { ref: inner, className: 'bt-mw-pill-in' },
+ h('span', { className: 'bt-mw-faces', 'aria-hidden': true }, faces.map(face => h(Face, { key: face.id, ...face }))),
+ h('span', { key: label, className: 'bt-mw-label', 'aria-hidden': true },
+ model.waiting ? h('span', { className: 'bt-mw-ask' }, model.waiting) : null,
+ model.waiting && model.doing ? h('span', { className: 'bt-mw-dot' }, '·') : null,
+ model.doing ? h('span', { className: 'bt-mw-doing' }, h(Shimmer, null, model.doing)) : null))))
}
// The clock stays whole at the end; only what comes before it is cut.
@@ -195,6 +173,21 @@ export function StopMemberWork({ entry, bot, room, actions }) {
return h('button', { type: 'button', className: 'bt-member-stop', disabled: stopping, 'aria-label': `${t('Stop')} · ${bot.name}`, onClick: stop }, t('Stop'))
}
+// The group's work stops all at once from its details: DSH's own stop reaches only the
+// round, and a member the round moved on from keeps working.
+export function StopRoomWork({ room, entries, actions }) {
+ const [stopping, setStopping] = useState(false)
+ if (!entries.some(entry => entry.here)) return null
+ const stop = () => {
+ setStopping(true)
+ void Promise.resolve(actions.stopRoomWork(room.id))
+ .catch(error => actions.reportError(error, 'stop'))
+ .finally(() => setStopping(false))
+ }
+ const label = t('Stop all work in this group')
+ return h('button', { type: 'button', className: 'bt-soft bt-soft-sm', disabled: stopping, 'aria-label': label, title: label, onClick: stop }, t('Stop all'))
+}
+
export function MemberApprovals({ entry, bot, actions }) {
if (entry?.state !== 'ask') return null
return h('div', { className: 'bt-member-cards' }, entry.approvals.map(approval => h(ApprovalCard, { key: approval.id, approval, bot, actions })))
@@ -210,13 +203,7 @@ export const MEMBER_CSS = `
.bt-mw-pill{pointer-events:auto;position:relative;display:inline-flex;align-items:center;flex:none;box-sizing:border-box;height:32px;max-width:100%;padding:0;border:0;border-radius:999px;overflow:hidden;background:var(--bt-main);box-shadow:0 0 0 .5px var(--bt-line-2),0 2px 8px -2px rgba(0,0,0,.12);color:var(--bt-ink-2);font:inherit;font-size:13px;line-height:18px;cursor:pointer;animation:bt-mw-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .18s ease-out backwards;transition:background-color .12s ease,${spring(SPRING_SHAPE, 'width')},${spring(SPRING_TAP, 'scale')}}
.bt-mw-pill:hover{background:color-mix(in srgb,var(--bt-ink) 4%,var(--bt-main))}
.bt-mw-pill:active{scale:.97}
-.bt-mw-dock[data-leaving] .bt-mw-pill,.bt-mw-dock[data-leaving] .bt-mw-stop{animation:bt-mw-out .16s cubic-bezier(.4,0,1,1) forwards;pointer-events:none}
-.bt-mw-pair{position:relative;display:inline-flex;min-width:0;max-width:100%}
-.bt-mw-pair[data-stop]{max-width:calc(100% - 76px)}
-.bt-mw-stop{pointer-events:auto;position:absolute;top:0;left:calc(100% + 6px);display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;padding:0;border:0;border-radius:50%;background:var(--bt-main);box-shadow:0 0 0 .5px var(--bt-line-2),0 2px 8px -2px rgba(0,0,0,.12);color:var(--bt-ink-2);cursor:pointer;animation:bt-mw-in ${SPRING_SHAPE.duration}ms ${SPRING_SHAPE.easing} backwards,bt-veil-in .18s ease-out backwards;transition:background-color .12s ease,color .12s ease,${spring(SPRING_TAP, 'scale')}}
-.bt-mw-stop:hover:not(:disabled){background:color-mix(in srgb,var(--bt-ink) 4%,var(--bt-main));color:var(--bt-ink)}
-.bt-mw-stop:active:not(:disabled){scale:.9}
-.bt-mw-stop:disabled{opacity:.35;cursor:default}
+.bt-mw-dock[data-leaving] .bt-mw-pill{animation:bt-mw-out .16s cubic-bezier(.4,0,1,1) forwards;pointer-events:none}
.bt-mw-pill-in{display:inline-flex;align-items:center;gap:8px;flex:none;padding:0 13px 0 6px;white-space:nowrap}
.bt-mw-faces{display:inline-flex;align-items:center;flex:none;line-height:0}
.bt-mw-face{position:relative;display:inline-flex;flex:none;border-radius:50%;background:var(--bt-main);box-shadow:0 0 0 2px var(--bt-main);animation:bt-mw-seat .26s cubic-bezier(.34,1.56,.64,1) backwards}
@@ -233,6 +220,11 @@ body[data-ds-dark-theme] .bt-mw-ask{color:#f0b84a}
@keyframes bt-mw-seat{from{opacity:0;scale:.6}}
@keyframes bt-mw-swap{from{opacity:0;filter:blur(4px)}}
.bt-members{display:flex;flex-direction:column;gap:2px;margin:0 -8px}
+.bt-members-head{display:flex;align-items:center;justify-content:space-between;gap:8px;margin-bottom:6px}
+.bt-members-head>.bt-section-title{margin:0}
+/* The button hangs over the title's line, so the list below does not move when it appears. */
+.bt-members-head>.bt-soft-sm{margin:-6px 0}
+.bt-members-head>.bt-soft-sm:disabled{opacity:.5;cursor:default}
.bt-member{display:flex;flex-direction:column;border-radius:12px;animation:bt-rise .18s ease-out backwards}
.bt-member-row{display:flex;align-items:center;gap:8px;min-height:48px;padding:0 8px;border-radius:12px;transition:background-color .12s ease}
.bt-member-row:hover{background:var(--bt-hover)}
@@ -260,5 +252,5 @@ body[data-ds-dark-theme] .bt-member-state.bt-mw-ask{color:#f0b84a}
.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}
-@media (prefers-reduced-motion:reduce){.bt-mw-pill,.bt-mw-stop,.bt-mw-face,.bt-mw-label,.bt-member,.bt-mw-card{animation:none}.bt-mw-pill{transition:background-color .12s ease}.bt-mw-stop{transition:background-color .12s ease,color .12s ease}}
+@media (prefers-reduced-motion:reduce){.bt-mw-pill,.bt-mw-face,.bt-mw-label,.bt-member,.bt-mw-card{animation:none}.bt-mw-pill{transition:background-color .12s ease}}
`
diff --git a/ds-bot/test/member-status.test.js b/ds-bot/test/member-status.test.js
index 51f5f555..6554d35e 100644
--- a/ds-bot/test/member-status.test.js
+++ b/ds-bot/test/member-status.test.js
@@ -22,7 +22,7 @@ runInNewContext(bundle.outputFiles[0].text, {
return platform[name]
},
})
-const { busyMembers, summaryText, MemberDock, MemberState, StopMemberWork, MEMBER_CSS } = module.exports
+const { busyMembers, summaryText, MemberDock, MemberState, StopMemberWork, StopRoomWork, memberWork } = module.exports
// Values from the bundle's realm compare by content only.
const plain = value => JSON.parse(JSON.stringify(value))
// The dock's capsule in an element tree.
@@ -93,6 +93,35 @@ test('a failed stop is reported and never answers the approval', async () => {
await new Promise(resolve => setImmediate(resolve))
assert.deepEqual(reported, [['connection lost', 'stop']])
})
+// #592: DSH's own stop reaches only the round; a member the round moved on from kept working.
+test('the stop button of a group\'s details stops all work there, and shows only while work is here', async () => {
+ const stopped = []
+ const room = team.roomsById.r1
+ const actions = { stopRoomWork: id => stopped.push(id) }
+ const shown = work => StopRoomWork({ room, entries: memberWork(room, work), actions })
+ const button = shown({ bots: {}, rooms: { r1: [{ botId: 'a', since: 1, tool: 'pwsh' }] }, approvals: [] })
+ assert.equal(button.props['aria-label'], 'Stop all work in this group')
+ button.props.onClick()
+ await Promise.resolve()
+ assert.deepEqual(stopped, ['r1'])
+ // Members busy only in their own chats or in another group have nothing here to stop.
+ assert.equal(shown({ bots: { a: { since: 1, tool: 'pwsh' }, b: { since: 1, roomId: 'r2' } }, rooms: { r2: [{ botId: 'b', since: 1 }] }, approvals: [] }), null)
+ assert.equal(shown({ bots: {}, rooms: { r2: [{ botId: 'a', since: 1 }] }, approvals: [{ botId: 'a', roomId: 'r2', at: 1 }] }), null)
+ // A turn waiting for an approval here still holds its work.
+ assert.ok(shown({ bots: {}, rooms: { r1: [{ botId: 'a', since: 1 }] }, approvals: [{ botId: 'a', roomId: 'r1', at: 1 }] }))
+})
+
+test('a failed stop of a group\'s work is reported', async () => {
+ const reported = []
+ const room = team.roomsById.r1
+ const button = StopRoomWork({ room, entries: memberWork(room, { bots: {}, rooms: { r1: [{ botId: 'a', since: 1 }] }, approvals: [] }), actions: {
+ stopRoomWork: () => Promise.reject(new Error('connection lost')),
+ reportError: (error, action) => reported.push([error.message, action]),
+ } })
+ button.props.onClick()
+ await new Promise(resolve => setImmediate(resolve))
+ assert.deepEqual(reported, [['connection lost', 'stop']])
+})
// The capsule's label and what a click on it asks for.
const dock = (sessionId, work) => {
const calls = []
@@ -114,55 +143,6 @@ test('one capsule names who waits and who works, without the round\'s speaker, a
assert.equal(dock('r1', { bots: {}, rooms: { r1: [{ botId: 'd', since: 1, speaking: true }] }, approvals: [] }), null)
})
-// The stop button beside the capsule, rendered.
-const stopOf = (sessionId, work, actions = {}) => {
- const find = (node) => {
- if (node === null || typeof node !== 'object') return null
- if (node.type?.name === 'StopRoomWork') return node.type(node.props)
- for (const child of node.children) {
- const found = find(child)
- if (found) return found
- }
- return null
- }
- return find(MemberDock({ sessionId, useRoster: pick => pick(team), useWork: pick => pick(work), actions }))
-}
-
-// #592: DSH's own stop reaches only the round; a member the round moved on from kept working.
-test('a stop button beside a group\'s capsule stops all work there, and only there', async () => {
- const stopped = []
- const button = stopOf('r1', { bots: {}, rooms: { r1: [{ botId: 'a', since: 1, tool: 'pwsh' }] }, approvals: [] }, { stopRoomWork: id => stopped.push(id) })
- assert.equal(button.props['aria-label'], 'Stop all work in this group')
- button.props.onClick()
- await Promise.resolve()
- assert.deepEqual(stopped, ['r1'])
- // Members busy only in their own chats or other groups show in the capsule, with nothing here to stop.
- const elsewhere = { bots: { a: { since: 1, tool: 'pwsh' }, b: { since: 1, roomId: 'r2' } }, rooms: { r2: [{ botId: 'b', since: 1 }] }, approvals: [] }
- assert.ok(dock('r1', elsewhere))
- assert.equal(stopOf('r1', elsewhere), null)
- // A Bot's own chat shows its group work, but stopping it belongs to the group.
- assert.equal(stopOf('a', { bots: { a: { since: 1, roomId: 'r1' } }, rooms: { r1: [{ botId: 'a', since: 1 }] }, approvals: [] }), null)
-})
-
-// The button hangs outside the capsule, so in a narrow chat column it would go past the edge.
-test('a group\'s capsule keeps room on both sides for its stop button', () => {
- const pairOf = work => MemberDock({ sessionId: 'r1', useRoster: pick => pick(team), useWork: pick => pick(work), actions: {} }).children[0]
- assert.equal(pairOf({ bots: {}, rooms: { r1: [{ botId: 'a', since: 1 }] }, approvals: [] }).props['data-stop'], true)
- assert.equal(pairOf({ bots: { a: { since: 1, tool: 'pwsh' } }, rooms: {}, approvals: [] }).props['data-stop'], undefined)
- assert.match(MEMBER_CSS, /\.bt-mw-pair\[data-stop\]\{max-width:calc\(100% - 76px\)\}/)
-})
-
-test('a failed stop of a group\'s work is reported', async () => {
- const reported = []
- const button = stopOf('r1', { bots: {}, rooms: { r1: [{ botId: 'a', since: 1 }] }, approvals: [{ botId: 'a', roomId: 'r1', at: 1 }] }, {
- stopRoomWork: () => Promise.reject(new Error('connection lost')),
- reportError: (error, action) => reported.push([error.message, action]),
- })
- button.props.onClick()
- await new Promise(resolve => setImmediate(resolve))
- assert.deepEqual(reported, [['connection lost', 'stop']])
-})
-
test('a Bot\'s own chat shows the groups it is at work in, unless its own chat runs', () => {
const away = { bots: { a: { since: 1, roomId: 'r1', tool: 'pwsh' } }, rooms: { r1: [{ botId: 'a', since: 1, tool: 'pwsh' }], r2: [{ botId: 'a', since: 1 }] }, approvals: [] }
assert.deepEqual(plain(dock('a', away)), { label: 'in Ops · Running shell commands… +1', calls: [['session', 'r1']] })