bothouse-dsh 0.1.59 → 0.1.60

package/collab/dsh-member.mjs

@@ -597,7 +597,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

@@ -1026,6 +1026,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));
@@ -1151,7 +1171,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 +1217,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 +1232,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);
   }
 
@@ -252,7 +252,8 @@ export class Roster {
       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);
   }

package/node_modules/bothouse-dsh-channels/client.js

@@ -1,4 +1,4 @@
-// dsh-client-source-sha256: bf3c01b19e0ed8f9d15a02ad7d7e9e9684db4fcbf32f43ba251b220ff57aca56
+// dsh-client-source-sha256: def898ca7c3b5cbc9806630df8269a00d441300d83397256c948bcbf8313e7f7
 // dsh-style-sha256: f6a6de6373a2ead4c3a965e58c158c16626e49a16b91d2d568b35b19fcfdb95a
 window.__ModuleLoader__.load({
  id: "bothouse-dsh-channels",
@@ -20541,13 +20541,13 @@ function ChannelSettingsDialog({ room, members, effectiveLead, renameRoom, setDi
 	const [name, setName] = (0, react.useState)(room.name);
 	const [mode, setMode] = (0, react.useState)(room.dispatch_mode ?? "mixed");
 	const [relay, setRelay] = (0, react.useState)(String(room.max_relay ?? RELAY_CAP_MIN));
-	const [lead, setLeadDraft] = (0, react.useState)(effectiveLead);
+	const [lead, setLeadDraft] = (0, react.useState)(room.lead_id === void 0 ? effectiveLead : room.lead_id ?? "");
 	const [directory, setDirectory] = (0, react.useState)(room.workspace_path ?? "");
 	const [saved, setSaved] = (0, react.useState)({
 		name: room.name,
 		mode: room.dispatch_mode ?? "mixed",
 		relay: String(room.max_relay ?? RELAY_CAP_MIN),
-		lead: effectiveLead,
+		lead: room.lead_id === void 0 ? effectiveLead : room.lead_id ?? "",
 		directory: room.workspace_path ?? ""
 	});
 	const [saving, setSaving] = (0, react.useState)({});
@@ -20776,7 +20776,6 @@ function ChannelSettingsDialog({ room, members, effectiveLead, renameRoom, setDi
 										},
 										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
 											value: "",
-											disabled: true,
 											children: t("leadNone")
 										}), members.filter((member) => member.kind !== "human").map((member) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
 											value: member.id,
@@ -24431,7 +24430,7 @@ const zh = {
 	dispatchTeam: "完全团队 — 交给团队成员协作",
 	dispatchMixed: "混合 — 按任务选择模型与成员",
 	lead: "主角色",
-	leadNone: "未选择（按原配置）",
+	leadNone: "未选择（单成员自动接话，多成员不接话）",
 	durSeconds: "{n} 秒",
 	durMinutes: "{n} 分钟",
 	durHours: "{h} 小时 {m} 分",
@@ -24715,7 +24714,7 @@ const en = {
 	taskReviewReason: "Reason for rework (required)",
 	taskReviewSubmit: "Submit rework",
 	lead: "Primary role",
-	leadNone: "Not selected (use the default)",
+	leadNone: "No selection (one member replies; multiple stay quiet)",
 	durSeconds: "{n}s",
 	durMinutes: "{n} min",
 	durHours: "{h} h {m} min",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bothouse-dsh",
-  "version": "0.1.59",
+  "version": "0.1.60",
   "description": "BotHouse channels for DeepSeek Harness: Discord-style rooms where DSH models and local CLIs (Claude Code, Codex, Gemini) are members",
   "type": "module",
   "main": "./collab/plugin.mjs",