bothouse-dsh 0.1.59 → 0.1.61

package/README.en.md

@@ -6,14 +6,16 @@ BotHouse channels inside DeepSeek Harness (DSH): a Discord-style channels page w
 
 ## Install (pick one)
 
-1. **Easiest**: tell DSH "install the plugin bothouse-dsh".
-2. **From the UI**: DSH sidebar "Plugins" → "Add plugin", enter `bothouse-dsh`, click "Install"; then switch bothouse on under "Installed plugins" — "Channels" appears in the sidebar right away, no restart.
+1. **Easiest**: tell DSH "install the plugin bothouse-dsh, pinned to the newest version on npm".
+2. **From the UI**: DSH sidebar "Plugins" → "Add plugin", enter `bothouse-dsh@<newest version on npm>`, click "Install"; then switch bothouse on under "Installed plugins" — "Channels" appears in the sidebar right away, no restart.
 3. **From a terminal**:
 
 ~~~sh
-dsh plugin --profile web add bothouse-dsh
+dsh plugin --profile web add "bothouse-dsh@$(npm view bothouse-dsh version)"
 ~~~
 
+Pin the version: DSH installs plugins with pnpm, and pnpm's supply-chain policy skips very fresh releases, so plain `bothouse-dsh` or `bothouse-dsh@latest` can install a version from days ago. An exact version goes through at once (pnpm records it as an exclusion). Measured 2026-11-08 with pnpm 12.16.1: `bothouse-dsh` resolved to 0.1.57, then the newest release older than a day — 0.1.59 was 19 hours old and 0.1.60 about 30 minutes; `bothouse-dsh@0.1.60` resolved to 0.1.60.
+
 Asked through DSH, "Channels" appears right after the install; installed from the command line while DSH is running, restart DSH once. Then click "Channels" in the sidebar. Team desk, bothouse panel and other computers start off; switch the one you want on under "Plugins → bothouse" and it appears in the sidebar right away. #general already has Whale Girl, running on the model you configured in DSH; nothing else to fill in. @ her to get a reply; tell her "hand this to a workspace: …" and she opens a workspace, does the work and reports back. For more characters or models, use "Add member".
 
 If the terminal install says `pnpm was not found`, run `npm i -g pnpm` first.

package/README.md

@@ -6,14 +6,16 @@
 
 ## 安装（三选一）
 
-1. **最省事**：在 DSH 里对它说「帮我装插件 bothouse-dsh」。
-2. **点界面**：DSH 侧栏「插件」→「添加插件」，填 `bothouse-dsh`，点「安装」；装完在「已安装插件」里把 bothouse 的开关打开，左侧马上出现「频道」，不用重启。
+1. **最省事**：在 DSH 里对它说「帮我装插件 bothouse-dsh，钉到 npm 上最新的版本」。
+2. **点界面**：DSH 侧栏「插件」→「添加插件」，填 `bothouse-dsh@<npm 上最新的版本号>`，点「安装」；装完在「已安装插件」里把 bothouse 的开关打开，左侧马上出现「频道」，不用重启。
 3. **命令行**：
 
 ~~~sh
-dsh plugin --profile web add bothouse-dsh
+dsh plugin --profile web add "bothouse-dsh@$(npm view bothouse-dsh version)"
 ~~~
 
+钉版本：DSH 用 pnpm 装插件，pnpm 的供应链策略会跳过刚发不久的版本，所以写 `bothouse-dsh` 或 `bothouse-dsh@latest` 可能装到几天前的版本；写准版本号会当场放行（pnpm 记一条例外）。2026-11-08 用 pnpm 12.16.1 实测：`bothouse-dsh` 解析到 0.1.57——当时一天前发的那个，0.1.59 才 19 小时、0.1.60 才半小时；写 `bothouse-dsh@0.1.60` 就解析到 0.1.60。
+
 对 DSH 说的装法装完左侧直接出现「频道」；命令行装时 DSH 若正开着，重启一次。然后点左侧「频道」。团队工作台、bothouse 面板、其他电脑默认不在左侧，要用就到「插件 → bothouse」里打开对应那一项，左侧马上出现。#general 里已经有鲸鱼娘，用的是你在 DSH 里配好的那个模型，不用再填任何东西。@鲸鱼娘 就回话；对她说「交给工作区做：……」，她会开工作区干完再交回。想要多角色、多模型，再点「添加成员」。
 
 命令行装时提示 `pnpm was not found`：先 `npm i -g pnpm` 再装。

package/collab/cloudweb.mjs

@@ -55,7 +55,7 @@ const BARE_MENTION = '（只 @ 了你，没写内容：看上面的频道消息
 export const PROGRESS_PREFIX = '__cc_connect_progress_card_v1__:';
 // cancelled (#913): a card whose turn was cut without an outcome — a restarted bridge, a
 // cancelled DSH job. page.html styles it like any other card state.
-const CARD_STATES = { running: '处理中', completed: '已完成', failed: '失败', cancelled: '已取消', aborted: '已打断' };
+const CARD_STATES = { running: '处理中', completed: '已完成', failed: '失败', cancelled: '已取消', aborted: '已打断', stopped: '已停止' };
 const RESERVED_IDS = new Set(['user', 'system']);
 const MAX_NAME = 64;
 

package/collab/desk/index.html

@@ -1360,7 +1360,7 @@ function dispatchBeamOnce(id, from, to) {
   beam(from, bodyRef(to.id, id), 'assign');
 }
 
-function applyTask(ev, animate = true) {
+function applyTask(ev, animate = true, quiet = false) {
   // 实时流上 tasks.mjs 也发 `{type:'task', task:{…}, chat_id, active}`（给聊天面板用的任务对象），
   // 那不是板事件的形态（id/kind/from/to/title，由 gate 的 board.py 写进 board-events.jsonl）。
   // 两种都照画，任务动作会多出一行「— → —」的空记录，实时就和回放对不上了。
@@ -1419,7 +1419,7 @@ function applyTask(ev, animate = true) {
     }
     forgetDispatch(id, S.dispatched);
   }
-  addLog(kind, ts, fromName, toName, header, note);
+  if (!quiet) addLog(kind, ts, fromName, toName, header, note);
   paintAll(animate);
 }
 
@@ -1502,6 +1502,12 @@ async function loadState() {
   renderSeats();
 }
 
+// 刷新/第一次打开时进行中的任务要从板上补回来，否则工位和「进行中」要等下一个事件才对。
+async function loadDeskState() {
+  const data = await api(ROOT + '/collab/api/desk/state');
+  for (const ev of data.tasks ?? []) applyTask({ ...ev, type: 'task' }, false, true);
+}
+
 function connectLive() {
   disconnectLive();
   const es = new EventSource(ROOT + '/collab/api/events');
@@ -1554,11 +1560,15 @@ async function goLive() {
   setConn('wait', '连接中');
   try {
     await loadState();
-    connectLive();
   } catch (error) {
     setConn('err', '连接失败');
     toast(`加载失败：${error.message}`);
+    return;
   }
+  try {
+    await loadDeskState();
+  } catch { /* 进行中的任务补不回来，不影响实时事件 */ }
+  connectLive();
 }
 const R = (S.replay = { events: [], idx: 0, playing: false, speed: 4, timer: null, loaded: false });
 

package/collab/desk.mjs

@@ -125,6 +125,19 @@ export function deskReplay({ store, boardDir, from, to, members = [] }) {
   return { from: new Date(fromMs).toISOString(), to: new Date(toMs).toISOString(), events: kept.map(m => m.event) };
 }
 
+/**
+ * 现在还在进行中的任务：按任务 id 取最后一条板事件，最后一条是 created/assigned 就算在做。
+ * 页面刷新或第一次打开时用它把工位上的任务和「进行中」计数补回来，不必等下一个事件。
+ */
+export function deskActiveTasks({ boardDir }) {
+  const last = new Map();
+  for (const entry of readBoardEvents(boardDir)) {
+    const id = String(entry.id ?? '').trim();
+    if (id && entry.kind) last.set(id, entry);
+  }
+  return [...last.values()].filter(entry => entry.kind === 'created' || entry.kind === 'assigned');
+}
+
 /** 桌面页：C 路提供的 dsh/collab/desk/index.html；还没落地时给一个能看事件流的占位页。 */
 export function deskPage() {
   try { return readFileSync(new URL('./desk/index.html', import.meta.url), 'utf8'); } catch { return PLACEHOLDER_PAGE; }
@@ -177,9 +190,13 @@ async function namesRoute(req, res, namesFile) {
   }
 }
 
-/** /collab/desk、/collab/api/desk/replay、/collab/api/desk/names；返回 true（或 Promise）表示已处理，未匹配返回 undefined。 */
+/** /collab/desk、/collab/api/desk/replay、/collab/api/desk/state、/collab/api/desk/names；返回 true（或 Promise）表示已处理，未匹配返回 undefined。 */
 export function deskRoute(req, res, url, { store, boardDir, members = [], namesFile } = {}) {
   if (url.pathname.replace(/\/+$/, '') === '/collab/api/desk/names' && (req.method === 'GET' || req.method === 'PUT')) return namesRoute(req, res, namesFile);
+  if (url.pathname.replace(/\/+$/, '') === '/collab/api/desk/state' && req.method === 'GET') {
+    sendJson(res, 200, { tasks: deskActiveTasks({ boardDir }) });
+    return true;
+  }
   if (url.pathname.replace(/\/+$/, '') !== '/collab/desk' && url.pathname.replace(/\/+$/, '') !== '/collab/api/desk/replay') return undefined;
   if (req.method !== 'GET') return undefined;
   if (url.pathname.replace(/\/+$/, '') === '/collab/desk') {

package/collab/dsh-member.mjs

@@ -308,6 +308,7 @@ export class TurnProgress {
     this.id = undefined;
     this.queued = false;
     this.ended = false;
+    this.interrupted = false;
   }
 
   call(callId, name, args) {
@@ -346,10 +347,15 @@ export class TurnProgress {
   end(state) {
     if (this.ended) return;
     this.ended = true;
+    // The owner withdrew the trigger, so this turn was stopped by hand, not broken: its card says 已停止.
+    if (this.interrupted) state = 'stopped';
     // Only a turn that had events has a card to close.
     if (this.steps > 0 || this.items.length > 0) this.write(state);
   }
 
+  /** The owner withdrew the trigger message (#148): the card must not read as a failure. */
+  interrupt() { this.interrupted = true; }
+
   write(state) {
     const body = progressCardOf({ agent: this.member.name, state, steps: this.steps, elapsed_sec: Math.floor((this.now() - this.started) / 1000), items: this.items });
     if (this.id === undefined) {
@@ -517,6 +523,7 @@ export class DshMembers {
       this.approvals.expireWhere(p => p.meta?.sessionId === job.session_id);
       if (w.turn === undefined && agent.inbox.remove(job.input_id)) continue;
       this.watching.delete(job.session_id);
+      w.progress?.interrupt?.();
       w.resolve(INTERRUPTED);
       agent.cancel({ kind: 'user' }, { keepInbox: true });
       stopped.push(job.member_id);
@@ -597,7 +604,7 @@ export class DshMembers {
     const answered = this.approvals.answerByText(msg);
     const hit = mentions(msg.text, this.hub.routableIn(msg.room_id));
     const only = this.hub.replyRoute(msg);
-    const leadID = this.hub.primaryIn(msg.room_id)?.id;
+    const leadID = this.hub.defaultReplyIn(msg.room_id)?.id;
     const leadTarget = msg.author_kind === 'user' && leadID !== undefined && target === undefined && only === null && hit.size === 0;
     const visible = new Set(this.hub.routableIn(msg.room_id).map(m => m.id));
     const targets = [...this.config.keys()].filter(id => !this.hub.quota?.cooling(id) && visible.has(id) && id !== msg.author && !answered.has(id) && (!target || target === id)

package/collab/hub.mjs

@@ -48,9 +48,8 @@ export class Hub {
     return member !== undefined && member.kind !== 'human' ? member : undefined;
   }
 
-  /** Channel selection, inherited by workspaces; only unset channels use the legacy global choice. */
+  /** Channel primary for delegation; unset channels retain the selected global role. */
   primaryIn(roomId) {
-    // #1023: in a private chat the one agent answers every owner message, @ or not.
     const dm = this.store.dmMember?.(roomId);
     if (dm !== undefined) return this.routableIn(roomId).find(m => m.id === dm);
     const id = this.store.leadId(roomId);
@@ -58,7 +57,18 @@ export class Hub {
     return member && this.routableIn(roomId).some(m => m.id === member.id) ? member : undefined;
   }
 
-  /** UI-only fallback; callers that route messages must use selectedPrimaryMember(). */
+  /** Default replies are channel-local and do not change delegation authority. */
+  defaultReplyIn(roomId) {
+    // #1023: in a private chat the one agent answers every owner message, @ or not.
+    const dm = this.store.dmMember?.(roomId);
+    if (dm !== undefined) return this.routableIn(roomId).find(m => m.id === dm);
+    const id = this.store.leadId(roomId);
+    const members = this.routableIn(roomId);
+    if (id === null) return members.length === 1 ? members[0] : undefined;
+    return members.find(member => member.id === id);
+  }
+
+  /** UI-only fallback; message routing uses defaultReplyIn(), delegation uses primaryIn(). */
   primaryMember() {
     const fallback = this.fallbackLead === '' ? undefined : this.members.get(this.fallbackLead);
     return this.selectedPrimaryMember() ?? (fallback?.kind !== 'human' ? fallback : undefined);
@@ -68,6 +78,8 @@ export class Hub {
     if (member.avatar?.startsWith('upload:')) member.avatarVersion = Math.random().toString(36).slice(2);
     this.members.set(member.id, member);
     this.emit({ type: 'members', members: this.memberView() });
+    // Membership determines an unset channel's effective primary, including its workspaces.
+    this.emit({ type: 'rooms', rooms: this.store.roomsView() });
   }
 
   removeMember(id) {
@@ -76,6 +88,7 @@ export class Hub {
     for (const room of this.thinking.keys()) this.setThinking(room, id, false);
     for (const room of [...this.queued.keys()]) this.setQueue(room, id, []);
     this.emit({ type: 'members', members: this.memberView() });
+    this.emit({ type: 'rooms', rooms: this.store.roomsView() });
   }
 
   setOnline(id, online) {
@@ -283,7 +296,7 @@ export class Hub {
 
   emit(event) {
     if (event.type === 'rooms') event = { ...event, rooms: event.rooms.map(room => ({ ...room,
-      lead_id: this.store.leadId(room.id), effective_lead_id: this.primaryIn(room.id)?.id ?? null,
+      lead_id: this.store.leadId(room.id), effective_lead_id: this.defaultReplyIn(room.id)?.id ?? null,
       workspace_path: this.store.workspacePath(room.id, this.workspacePath),
     })) };
     for (const s of this.subscribers) {

package/collab/page.html

@@ -247,6 +247,8 @@
      被 40px 的头像列宽挤成一字一行（#112）。 */
   .msg.cont .avatar { visibility: hidden; }
   .msg.cont .head { display: none; }
+  /* 正文列固定落在第二列，即使头像被隐藏也不会顶到第一列。 */
+  .msg > :not(.avatar) { grid-column: 2; min-width: 0; }
   .msg .stamp {
     display: none;
     position: absolute;
@@ -330,12 +332,14 @@
   .card[data-state="completed"] { --card-accent: var(--ok); --card-tint: rgba(35, 165, 90, .16); --card-text: #7ee2a8; }
   .card[data-state="failed"] { --card-accent: var(--danger); --card-tint: rgba(242, 63, 67, .16); --card-text: #ff9a9c; }
   .card[data-state="cancelled"] { --card-accent: var(--muted); --card-tint: rgba(127, 127, 127, .14); --card-text: var(--muted); }
+  .card[data-state="stopped"] { --card-accent: var(--muted); --card-tint: rgba(127, 127, 127, .14); --card-text: var(--muted); }
   @media (prefers-color-scheme: light) {
     .card { --card-text: #3b46b8; --card-tint: rgba(74, 85, 214, .12); }
     .card[data-state="running"] { --card-text: #6d4a00; --card-tint: rgba(240, 178, 50, .18); }
     .card[data-state="completed"] { --card-text: #146c3a; --card-tint: rgba(26, 127, 67, .12); }
     .card[data-state="failed"] { --card-text: #a52327; --card-tint: rgba(194, 43, 47, .12); }
     .card[data-state="cancelled"] { --card-text: #545861; --card-tint: rgba(84, 88, 97, .12); }
+    .card[data-state="stopped"] { --card-text: #545861; --card-tint: rgba(84, 88, 97, .12); }
   }
   .card-head { display: flex; align-items: center; gap: var(--sp-2); flex-wrap: wrap; }
   .card .title { font-weight: 600; font-size: var(--fs-sm); color: var(--text-strong); }
@@ -650,7 +654,7 @@ const el = (tag, cls, text) => { const n = document.createElement(tag); if (cls)
 const palette = ['#4F46E5', '#B45309', '#0F766E']; // taste-skill-ignore 靛蓝为 design-spec 唯一强调色（用户标杆），按 SKILL.md 已有品牌条款保留
 const color = id => palette[[...id].reduce((h, c) => (h * 31 + c.charCodeAt(0)) >>> 0, 7) % palette.length];
 const kindLabel = { dsh: 'DSH', bot: 'Agent', human: '' };
-const cardStateLabel = { pending: '待确认', running: '进行中', completed: '已完成', failed: '失败', cancelled: '已取消' };
+const cardStateLabel = { pending: '待确认', running: '进行中', completed: '已完成', failed: '失败', cancelled: '已取消', stopped: '已停止', retried: '已重试' };
 // 5 分钟：同一人连续发言合并头像与昵称的窗口，沿用 Discord 的习惯（交接要求「按同一人连续发言分组」）
 const GROUP_WINDOW_MS = 5 * 60 * 1000;
 // 768px 是 U2 交接里定的窄屏阈值
@@ -1026,6 +1030,26 @@ function messageNode(m) {
       }
       card.append(bar);
     }
+    // 与原生频道页共用重试接口；后端把已受理的失败卡更新成 retried。
+    if (meta.state === 'failed') {
+      const bar = el('div', 'actions');
+      const retry = el('button', '', '重试');
+      retry.type = 'button';
+      retry.onclick = async () => {
+        retry.disabled = true;
+        retry.textContent = '重试中…';
+        try {
+          await api(`${ROOT}/collab/api/messages/${m.id}/retry`, { method: 'POST' });
+          retry.textContent = '已重试';
+        } catch (err) {
+          retry.disabled = false;
+          retry.textContent = '重试';
+          alert('重试失败：' + err.message);
+        }
+      };
+      bar.append(retry);
+      card.append(bar);
+    }
     col.append(card);
   } else if (m.text) col.append(renderBody(m.text, 'body'));
   if (Array.isArray(m.attachments) && m.attachments.length) col.append(attachmentList(m.attachments));
@@ -1131,6 +1155,9 @@ function upsert(m) {
     const after = [...log.children].find(n => n.dataset.id != null && Number(n.dataset.id) > m.id);
     log.insertBefore(messageNode(m), after || null);
   }
+  // 「还没有消息」只是打开空频道时的占位：第一条消息（本地发的、SSE 推来的、重连补来的）一到就得收起，
+  // 否则它会一直压在真实消息上面，直到手动切换频道或刷新。
+  log.querySelector('.state.empty')?.remove();
   regroup();
   followBottom(log, stick);
 }
@@ -1151,7 +1178,43 @@ function showState(kind, title, detail, retry) {
   return box;
 }
 
+// 来源：openRoom 原有每次读取 100 条；向上分页沿用同一页大小。
+const HISTORY_LIMIT = 100;
+let historyPage;
+
+async function loadOlder() {
+  const page = historyPage;
+  if (!page || page.loading || !page.more) return;
+  page.loading = true;
+  const log = $('log');
+  log.querySelector('.history-error')?.remove();
+  try {
+    const { messages } = await api(`${ROOT}/collab/api/rooms/${page.room}/messages?before=${page.before}&limit=${HISTORY_LIMIT}`);
+    if (historyPage !== page) return;
+    const oldHeight = log.scrollHeight;
+    const oldTop = log.scrollTop;
+    messages.forEach(upsert);
+    if (messages.length) page.before = messages[0].id;
+    page.more = messages.length === HISTORY_LIMIT;
+    log.scrollTop = oldTop + log.scrollHeight - oldHeight;
+  } catch (err) {
+    if (historyPage !== page) return;
+    const retry = el('button', 'btn history-error', '历史加载失败，点击重试');
+    retry.type = 'button';
+    retry.title = err.message;
+    retry.onclick = () => loadOlder();
+    log.prepend(retry);
+  } finally {
+    page.loading = false;
+  }
+}
+
+$('log').addEventListener('scroll', () => {
+  if ($('log').scrollTop === 0) void loadOlder();
+}, { passive: true });
+
 async function openRoom(id) {
+  const page = historyPage = { room: id, before: undefined, more: false, loading: true };
   state.room = id; state.synced = 0;
   $('log').replaceChildren(showState('loading', '正在加载消息…'));
   $('log').setAttribute('aria-busy', 'true');
@@ -1161,11 +1224,14 @@ async function openRoom(id) {
     const setting = await api(`${ROOT}/collab/api/rooms/${id}/mode`);
     state.mode = setting.dispatch_mode;
     renderRooms(); renderMembers();
-    const { messages } = await api(`${ROOT}/collab/api/rooms/${id}/messages?limit=100`);
-    if (state.room !== id) return;
+    const { messages } = await api(`${ROOT}/collab/api/rooms/${id}/messages?limit=${HISTORY_LIMIT}`);
+    if (historyPage !== page) return;
     const log = $('log');
     log.querySelector('.state')?.remove();
     messages.forEach(upsert);
+    page.before = messages[0]?.id;
+    page.more = messages.length === HISTORY_LIMIT;
+    page.loading = false;
     state.synced = messages.length ? messages[messages.length - 1].id : 0;
     if (!log.querySelector('.msg')) log.append(showState('empty', '还没有消息', ''));
     $('log').setAttribute('aria-busy', 'false');
@@ -1173,7 +1239,7 @@ async function openRoom(id) {
     stuck = true;
     $('log').scrollTop = $('log').scrollHeight;
   } catch (err) {
-    if (state.room !== id) return;
+    if (historyPage !== page) return;
     $('log').replaceChildren(showState('error', '加载失败', err.message, () => openRoom(id)));
     $('log').setAttribute('aria-busy', 'false');
   }

package/collab/plugin.mjs

@@ -346,7 +346,7 @@ export async function apply(ctx, rawConfig) {
     if (path === '/collab/api/state' && req.method === 'GET') {
       return json(res, 200, { me: OWNER, lead_id: hub.selectedPrimaryMember()?.id ?? null,
         effective_lead_id: hub.primaryMember()?.id ?? null,
-        rooms: store.roomsView().map(r => ({ ...r, lead_id: store.leadId(r.id), effective_lead_id: hub.primaryIn(r.id)?.id ?? null,
+        rooms: store.roomsView().map(r => ({ ...r, lead_id: store.leadId(r.id), effective_lead_id: hub.defaultReplyIn(r.id)?.id ?? null,
           workspace_path: store.workspacePath(r.id, config.workspacePath) })), members: hub.memberView(),
         thinking: Object.fromEntries([...hub.thinking].map(([k, v]) => [k, [...v]])),
         queued: Object.fromEntries([...hub.queued.keys()].map(r => [r, hub.queueView(r)])),
@@ -573,7 +573,7 @@ export function roomSettingsRoute(req, res, path, { store, hub, dsh, workspacePa
   if (match === null) return undefined;
   const roomId = Number(match[1]);
   if (store.room(roomId) === undefined) return Promise.resolve(json(res, 404, { error: '频道不存在' }));
-  const view = () => ({ lead_id: store.leadId(roomId), effective_lead_id: hub.primaryIn(roomId)?.id ?? null,
+  const view = () => ({ lead_id: store.leadId(roomId), effective_lead_id: hub.defaultReplyIn(roomId)?.id ?? null,
     workspace_path: store.workspacePath(roomId, workspacePath), max_relay: store.relaySetting(roomId).max_relay });
   if (match[2] === 'renew' && req.method === 'POST') {
     return withBody(req, res, async () => ({ members: await dsh.renewRoom(roomId) }), false);

package/collab/quota-cooling.mjs

@@ -108,7 +108,7 @@ export class QuotaCooling {
       if (!quota.cooling_until && !state.until) continue;
       if (!this.cooling(member.id)) {
         for (const [room, lead] of Object.entries(state.leads ?? {})) {
-          if (this.hub.primaryIn(Number(room))?.id === lead.to) {
+          if (this.hub.defaultReplyIn(Number(room))?.id === lead.to) {
             this.hub.store.setLead(Number(room), member.id);
             this.notice(Number(room), `${member.id}-${state.until}-restore-${room}`, `${member.name} 额度恢复，主角色已切回。`);
           }
@@ -124,7 +124,7 @@ export class QuotaCooling {
       const key = `${member.id}-${state.until}`;
       const reserved = new Set(Object.values(state.transfers).filter(t => !t.woken).map(t => t.to));
       for (const room of this.hub.store.rooms().filter(r => r.kind !== 'workspace')) {
-        if (state.leads[room.id] || this.hub.primaryIn(room.id)?.id !== member.id) continue;
+        if (state.leads[room.id] || this.hub.defaultReplyIn(room.id)?.id !== member.id) continue;
         const target = this.candidate(room.id, '', member.id, reserved);
         if (!target) continue;
         state.leads[room.id] = { to: target.id, woken: false };
@@ -135,8 +135,8 @@ export class QuotaCooling {
       for (const [room, lead] of Object.entries(state.leads)) {
         if (lead.woken || this.cooling(lead.to)) continue;
         // Replay a crash between persisting intent and changing the selection.
-        if (this.hub.primaryIn(Number(room))?.id === member.id) this.hub.store.setLead(Number(room), lead.to);
-        if (this.hub.primaryIn(Number(room))?.id !== lead.to) continue;
+        if (this.hub.defaultReplyIn(Number(room))?.id === member.id) this.hub.store.setLead(Number(room), lead.to);
+        if (this.hub.defaultReplyIn(Number(room))?.id !== lead.to) continue;
         const msg = this.notice(Number(room), `${key}-lead-${room}`, `${member.name} 额度冷却，主角色交给 ${this.tasks.nameOf(lead.to)}。请接着推进未完成任务。`);
         if (this.wake(lead.to, msg)) { lead.woken = true; this.save(member.id, state, true); }
       }

package/collab/roster.mjs

@@ -208,7 +208,7 @@ export class Roster {
     this.avatars?.remove(id);
     this.store.removeMember(id);
     // #176: a dead id must not linger as a channel's primary role.
-    for (const roomId of this.store.clearLeadOf(id)) this.hub.emit({ type: 'room-settings', room_id: this.store.settingsRoom(roomId), lead_id: null, effective_lead_id: this.hub.primaryIn(roomId)?.id ?? null });
+    for (const roomId of this.store.clearLeadOf(id)) this.hub.emit({ type: 'room-settings', room_id: this.store.settingsRoom(roomId), lead_id: null, effective_lead_id: this.hub.defaultReplyIn(roomId)?.id ?? null });
     this.dsh.dropMember(id);
   }
 
@@ -248,11 +248,15 @@ export class Roster {
       throw new CollabError('invalid', `name must be 1-${MAX_NAME} characters without spaces (except Claude Code), @ or <>`);
     }
     const rooms = input?.rooms ?? [];
-    if (!Array.isArray(rooms) || rooms.some(id => !Number.isSafeInteger(id) || this.store.room(id)?.kind !== 'chat')) {
+    // A private chat holds exactly its one member (hub.membersInRoom), so listing it here would
+    // store a membership the room never honours: the extra member shows nowhere, cannot be
+    // dispatched to, and the add-member dialog is the only thing that creates it.
+    if (!Array.isArray(rooms) || rooms.some(id => !Number.isSafeInteger(id) || this.store.room(id)?.kind !== 'chat' || this.store.dmMember(id) !== undefined)) {
       throw new CollabError('invalid', 'rooms must contain existing chat channel ids');
     }
     const clash = this.hub.memberList().find(m => m.id !== selfId && (!rooms.length || !m.rooms?.length || rooms.some(id => m.rooms.includes(id))) && (m.name.toLowerCase() === name.toLowerCase() || m.id.toLowerCase() === name.toLowerCase()));
-    if (clash !== undefined) throw new CollabError('conflict', `name ${name} is already used by ${clash.name}`);
+    // #366: 这条会原样显示在成员对话框的错误条里，和同页的成员名校验一样说中文。
+    if (clash !== undefined) throw new CollabError('conflict', `名字 ${name} 已被 ${clash.name} 使用`);
     const persona = String(input?.persona ?? '');
     if (persona.length > MAX_PERSONA) throw new CollabError('invalid', `persona exceeds ${MAX_PERSONA} characters`);
     let avatar;

package/collab/store.mjs

@@ -393,19 +393,21 @@ export class Store {
    * workspace is addressed, so a duplicate or a workspace-shaped name is refused with 'conflict'.
    */
   checkRoomName(name, selfId) {
-    if (new RegExp(`^${WORKSPACE_PREFIX}\\d+$`).test(name)) throw new CollabError('conflict', `channel name ${name} is reserved for workspaces`);
+    // #366: 这两句会原样显示在客户端改名/新建对话框的错误条里，因此和同页其它校验一样说中文。
+    if (new RegExp(`^${WORKSPACE_PREFIX}\\d+$`).test(name)) throw new CollabError('conflict', `${name} 是工作区保留名，换个名字`);
     // A private chat is named after its member and listed with its avatar, so it does not clash.
     const clash = this.rooms().find(r => r.id !== selfId && r.kind === 'chat' && r.dm_member == null && r.name.toLowerCase() === name.toLowerCase());
-    if (clash !== undefined) throw new CollabError('conflict', `channel name ${name} is already in use`);
+    if (clash !== undefined) throw new CollabError('conflict', `频道名 ${name} 已被占用`);
   }
   /** Rename the channel without changing any room, message or session identity. */
   renameRoom(id, name) {
     if (typeof name !== 'string' || !name || name.length > 32 || /\s/.test(name)) {
-      throw new CollabError('invalid', 'room name must be 1-32 characters without spaces');
+      throw new CollabError('invalid', '频道名 1–32 个字符，且不能有空格');
     }
     const room = this.room(id);
-    if (room === undefined) throw new CollabError('room-missing', `room ${id} does not exist`);
-    if (room.kind === 'workspace') throw new CollabError('invalid', 'workspace names cannot be changed');
+    if (room === undefined) throw new CollabError('room-missing', `频道 ${id} 不存在`);
+    // 工作区名是系统分配的（工作区<n>），改名会和一个地址撞名，所以服务端直接拒绝。
+    if (room.kind === 'workspace') throw new CollabError('invalid', '工作区名称由系统分配，不能修改');
     this.checkRoomName(name, id);
     return this.db.prepare('UPDATE rooms SET name = ? WHERE id = ? RETURNING id, name, kind, parent_id').get(name, id);
   }
@@ -878,6 +880,11 @@ export function publicMessage(row, store) {
     id: row.id, room_id: row.room_id, author_kind: row.author_kind, author: row.author, name: row.name,
     text: row.text, created_at: row.created_at, card: row.card, from_turn: row.from_turn,
     ...(row.edited_at != null ? { edited_at: row.edited_at } : {}),
+    // #1355: one message keeps its id for life; revision moves on every in-place edit or
+    // commit (changed_at), so a consumer can tell an update from a new message. `draft`
+    // marks a streamed reply that has not settled yet.
+    revision: row.changed_at ?? row.created_at,
+    ...(row.draft ? { draft: true } : {}),
   };
   const quote = store?.quote(row);
   if (quote !== undefined) out.reply_to = quote;

package/collab/team-mode-rules.md

@@ -1,12 +1,12 @@
 [团队模式规矩 — 每个角色都适用]
-- 频道分两种：聊天频道（用户在这里聊天、被提问、看阶段结果）和它下面的工作区（干活的地方）。
+- 频道分两种：聊天频道（用户聊天、看结果）和它下面的工作区（干活）。
 - 多步骤的活先开公开任务卡（先发 --kind start）；闲聊、问答不开。
 - 聊天频道要保持畅通，大活交工作区：预计超过 10 分钟，或要改代码、跑测试、等命令的，谁接活谁这一轮写交接（副手被直接点名也一样）（至少写「用户原话」「总目标」「范围」三节和参照实现，范围每项写一行「改：…」；被退回按列出的一次补齐），跑 `ws-handoff <交接文件> "<任务>"`，不在聊天频道自己做；它不算开子 agent，不用另问用户；交出就结束本轮，不在本轮等或查进度，结果由工作区 [report] 转回。工作区里接到的活自己做。DSH 频道调 POST /collab/api/rooms/{聊天频道 id}/workspaces。一个工作区同一时间只做一件活，满 4 个就排队。
 - 聊天频道里对真人说人话：讲场景、短段落，默认不用表格、不贴代码，细节进子话题。
 - 同团队同平台成员在新频道默认可派；团队外成员才请用户发 `/bind <队友项目名>`，机器人自己发的 /bind 不生效。
 - 在工作区里要问用户或交结果：最后一条回复第一行写 [ask] 或 [report] 加 #任务板编号和「背景：」，再一行做了什么，再一行「要你做的：」，再一行「我加的：」（用户原话里没有、你加的设定，没有写「无」）；这四段贴到聊天频道，不写编号、代号、路径、表格；之后是细节，进子话题。截图用 ws-up --image 推；文字进度不推。
 - 发 [ask] 后工作区让出、会话清空，用户回复后系统找空工作区带交接文件和答复接着做；交回最终 [report] 后系统自动标完成、清空会话、放回工作区。
-- 一个工作区同一时间只归一个聊天频道；挑空着的，都占着就新建。所有聊天频道共用同一组工作区1..n。
+- 聊天频道共用工作区1..n，各同时只归一个，挑空的，都占着就新建；用户要新频道用 `bothouse channel create <名字>`，不自己调 Discord API。
 - 收口（每小时合结果、发汇报）时，没收完、这一小时也没在动的活由收口的人当场暂停（`board pause <编号>`）：它让出工作区，那里没别的活就放回池子、清空会话；恢复时重新交活，先用空着的工作区。
 - 会缩小或改变用户原话范围的决定（砍功能、换方向等），以及用户原话里没有、你拿不准的设定，不要自己定：在工作区用 [ask] 转到聊天频道问用户，等答复再做；等的时候先做不受影响的部分。主角色拿不准也一样，在聊天频道直接问用户。
 - 转话必须指定哪个工作区，不默认发给最后一个。