bothouse-dsh 0.1.47 → 0.1.48

package/collab/dsh-member.mjs

@@ -26,7 +26,7 @@ export function teamModeRules(mode = DEFAULT_DISPATCH_MODE) {
 /** #597 G24: the open-workspace command, for the selected primary role only, never in bridge prompts. */
 export function workspaceHint(hub, later, memberId, roomId) {
   if (!later?.workspaceInstructions || hub?.primaryIn?.(roomId)?.id !== memberId) return '';
-  return later.workspaceInstructions(memberId, roomId);
+  return later.workspaceInstructions(memberId, roomId) + (later.teamInstructions?.(memberId, roomId) ?? '');
 }
 /**
  * #597 G24: DSH members have no bridge session, so the shared line about `bothouse workspace new` /
@@ -201,6 +201,9 @@ export function friendlyFailure(raw) {
   const text = String(raw);
   if (/no.{0,12}(api.?key|key)|missing.{0,12}(key|credential)|api.?key.{0,12}(missing|not set|required)|未配置.*key/i.test(text)) return '还没有配置模型的 API Key，请先去配置模型。';
   if (/model.{0,30}(not found|unavailable|not available|unsupported)|unknown model|模型.*不可用|404/i.test(text)) return '这个模型暂时不可用，请检查模型名称或换一个模型。';
+  // An unreachable provider is a setting or network problem. Echoing the transport wording
+  // ("Connection error.") behind "请检查配置" told the user nothing about which setting to fix.
+  if (/connection error|econnrefused|econnreset|enotfound|etimedout|eai_again|fetch failed|socket hang up|network ?(error|request failed)|timed out|timeout/i.test(text)) return '连不上模型服务：中转站地址或网络不通。请检查设置里的模型地址和 Key，或换一个中转站再试。';
   if (/login|log.?in|auth|unauthorized|401|未登录/i.test(text)) return '模型或 CLI 还没有登录，或登录已过期。请先登录后再试。';
   if (/exit|ENOENT|spawn|没有输出文字/i.test(text)) return '本机 CLI 未能正常运行或已退出，请检查安装和登录状态。';
   // A Host older than this plugin has no scope lease on its preset registry, so no member can be
@@ -863,6 +866,24 @@ export class DshMembers {
     if (this.closed) return;
     const job = this.store.job(jobId);
     if (job === undefined || !this.store.finishJob(jobId, state)) return;
+    // A restart is not a configuration problem: the member is healthy and only the turn it was
+    // running is lost, so it takes a retry button and leaves the member online. Reporting it as
+    // "成员出错 / 去配置模型" also cooled the provider quota for what was a process restart.
+    if (state === 'interrupted') {
+      this.hub.setError(job.member_id, undefined);
+      this.hub.post(job.room_id, {
+        authorKind: 'system', author: 'system', name: 'system', text: String(notice), clientKey: `dsh-job-${jobId}-${state}-${Date.now()}`,
+        card: JSON.stringify({
+          title: '被中断',
+          state: 'failed',
+          action: 'retry',
+          job_id: jobId,
+          member_id: job.member_id,
+          trigger_id: job.trigger_id,
+        }),
+      });
+      return;
+    }
     this.hub.quota?.observe(job.member_id, job.room_id, { error: String(notice) });
     const error = friendlyFailure(notice);
     this.hub.setError(job.member_id, error);

package/collab/later.mjs

@@ -104,6 +104,18 @@ export class Later {
     const curl = `curl -sS -X POST ${quote(url)} -H 'content-type: application/json' -H ${quote(`X-Later-Ticket: ${ticket}`)} -d '{"title":"任务标题","owner":"接活人id（省略=你自己）","reason":"交接说明"}'`;
     return `\n【开工作区】整块活要交出去时，建工作区=这一条，任务和十分钟看门会自动开，不要另调 /tasks（它不认票据）。${local}或等价的接口 POST /collab/api/rooms/${room}/workspaces：\n${curl}\n一步建好工作区、开任务、挂十分钟看门并叫醒接活人；不要再在频道里 @ 同一件活。返回不是 200 就把返回原样告诉用户，不要悄悄自己做。工作区里的接活人是新会话，只看得到交接说明：里面要写清用户原话、参照的现成实现、以哪个分支为底、验收标准。\n`;
   }
+  /**
+   * 一句话拉团队 (user 11-04): how the primary role builds a channel of new roles in one call.
+   * Primary-only like workspaceInstructions (dsh-member.mjs workspaceHint).
+   */
+  teamInstructions(member, room) {
+    const quote = value => "'" + String(value).replaceAll("'", "'\\''") + "'";
+    const ticket = this.ticket(member, room);
+    const json = '{"channel":"小团队","model":"模型id（用户没说就省略=DSH默认模型）","members":[{"name":"写手","persona":"你是写手，负责写和改博客文章。"},{"name":"程序员","persona":"你是程序员，负责写代码和审代码。"}]}';
+    const local = this.origin ? `本机命令（改 JSON 里的内容）：\n${quote(process.execPath)} ${quote(fileURLToPath(import.meta.url))} team ${quote(this.origin)} ${quote(ticket)} ${quote(json)}\n` : '';
+    const url = `${this.origin ?? 'http://<本机 DSH 地址>'}/collab/api/rooms/${room}/team`;
+    return `\n【建团队】用户要你建几个角色、拉个群/频道时，一条就建好：新频道、每个角色（名字、人设、模型），你是新频道的主角色。${local}或 POST ${url}（头 X-Later-Ticket: ${ticket}，JSON 同上）。名字不带空格和 @；人设一两句写清分工；用户说了模型就填 model（如 deepseek-v4.1-flash），没说就省略。返回不是 200 就把返回原样告诉用户。建好后告诉用户频道名、每个角色和模型，问要不要丢个题目试跑。\n`;
+  }
   tick() {
     for (const row of this.db.prepare('SELECT * FROM member_later WHERE announced = 0').all()) {
       this.hub.post(row.room_id, { authorKind: 'system', author: 'system', name: '回查登记',
@@ -134,6 +146,15 @@ if (process.argv[1] === fileURLToPath(import.meta.url) && process.argv[2] === 'w
   const body = await res.text();
   if (!res.ok) { console.error(`workspace: ${res.status} ${body}`); process.exit(1); }
   console.log(body);
+} else if (process.argv[1] === fileURLToPath(import.meta.url) && process.argv[2] === 'team') {
+  const [origin, ticket, spec] = process.argv.slice(3);
+  const room = ticketClaims(ticket)?.r;
+  if (!origin || !Number.isSafeInteger(room) || !spec) { console.error('usage: later.mjs team <origin> <ticket> \'{"channel":"…","model":"…","members":[{"name":"…","persona":"…"}]}\''); process.exit(2); }
+  const res = await fetch(new URL(`/collab/api/rooms/${room}/team`, origin), { method: 'POST',
+    headers: { 'content-type': 'application/json', 'x-later-ticket': ticket }, body: spec });
+  const body = await res.text();
+  if (!res.ok) { console.error(`team: ${res.status} ${body}`); process.exit(1); }
+  console.log(body);
 } else if (process.argv[1] === fileURLToPath(import.meta.url)) {
   const [origin, ticket, delay, title, todo] = process.argv.slice(2);
   const room = ticketClaims(ticket)?.r;

package/collab/page.html

@@ -258,6 +258,27 @@
     font-variant-numeric: tabular-nums;
   }
   .msg.cont:hover .stamp { display: block; }
+  /* 自己的消息：悬停时右上角出现「撤回」，撤回会连同这条消息发起的回答一起停下。 */
+  .msg .ops {
+    position: absolute;
+    top: 2px;
+    right: max(var(--pad-x), env(safe-area-inset-right));
+    display: none;
+    gap: 4px;
+  }
+  .msg:hover .ops, .msg:focus-within .ops { display: flex; }
+  .msg .ops button {
+    font: inherit;
+    font-size: var(--fs-xs);
+    line-height: 1.4;
+    color: var(--muted);
+    background: var(--surface);
+    border: 1px solid var(--line);
+    border-radius: var(--r-sm);
+    padding: 1px 6px;
+    cursor: pointer;
+  }
+  .msg .ops button:hover { color: var(--text-strong); background: var(--hover); }
 
   .avatar {
     width: var(--avatar);
@@ -644,6 +665,21 @@ function messageNode(m) {
     col.append(card);
   } else col.append(el('div', 'body', m.text));
   row.append(col);
+  // 自己发的普通消息：悬停出现「撤回」。撤回后后端广播 deleted，这一行随之消失；
+  // 这条消息触发的回答也会一起停下（后端 recall 会取消对应 turn）。
+  if (!system && !m.card && m.author === state.me) {
+    const ops = el('div', 'ops');
+    const b = el('button', '', '撤回');
+    b.type = 'button';
+    b.title = '撤回这条消息（正在进行的回答也会停下）';
+    b.onclick = async () => {
+      if (!confirm('撤回这条消息？正在进行的回答也会停下。')) return;
+      try { await api(`${ROOT}/collab/api/messages/${m.id}`, { method: 'DELETE' }); }
+      catch (err) { alert('撤回失败：' + err.message); }
+    };
+    ops.append(b);
+    row.append(ops);
+  }
   return row;
 }
 

package/collab/plugin.mjs

@@ -14,7 +14,7 @@ import { Hub } from './hub.mjs';
 import { TeamExit } from './team-exit.mjs';
 import { CloudWebGateway, WS_PATH } from './cloudweb.mjs';
 import { DshMembers } from './dsh-member.mjs';
-import { Roster } from './roster.mjs';
+import { Roster, rowToMember } from './roster.mjs';
 import { Tasks, WORKING } from './tasks.mjs';
 import { createCliMember } from './cli-member.mjs';
 import { avatarImage, checkAvatar } from './avatars.mjs';
@@ -236,6 +236,8 @@ export async function apply(ctx, rawConfig) {
     if (routed !== undefined) return routed;
     const opened = workspacesRoute(req, res, url, { store, hub, gateway, owner, later, tasks, dsh });
     if (opened !== undefined) return opened;
+    const team = teamRoute(req, res, url, { store, hub, later, roster });
+    if (team !== undefined) return team;
     if (!owner(req)) {
       if ((path === '/collab' || path === '/collab/desk' || path === '/collab/wiki-galaxy') && req.method === 'GET') return text(res, 401, 'text/plain; charset=utf-8', '请先在同一个浏览器打开 DSH 网页登录，再回到 /collab。');
       return refuse(req, res);
@@ -448,7 +450,10 @@ export function roomSettingsRoute(req, res, path, { store, hub, dsh, workspacePa
   if (req.method === 'GET') return Promise.resolve(json(res, 200, view()));
   if (req.method !== 'PATCH') return undefined;
   return withBody(req, res, body => {
-    if (body?.lead_id !== undefined && body.lead_id !== null && !hub.routableIn(roomId).some(m => m.id === body.lead_id)) {
+    // The settings dialog's「未选择（按原配置）」option sends the select's empty value: clear the
+    // channel's own choice so the primary falls back to the instance-wide one, exactly like null.
+    const leadId = body?.lead_id === '' ? null : body?.lead_id;
+    if (leadId !== undefined && leadId !== null && !hub.routableIn(roomId).some(m => m.id === leadId)) {
       throw new CollabError('invalid', '请选择本频道的主角色');
     }
     if (body?.workspace_path !== undefined) {
@@ -459,7 +464,7 @@ export function roomSettingsRoute(req, res, path, { store, hub, dsh, workspacePa
       if (!stat.isDirectory()) throw new CollabError('invalid', '工作目录必须是目录，不能是文件');
     }
     store.transaction(() => {
-      if (body?.lead_id !== undefined) store.setLead(roomId, body.lead_id);
+      if (leadId !== undefined) store.setLead(roomId, leadId);
       if (body?.workspace_path !== undefined) store.setWorkspacePath(roomId, body.workspace_path, workspacePath);
       // #445: 6–20 only; an invalid value rolls the whole PATCH back.
       if (body?.max_relay !== undefined) store.setMaxRelay(roomId, body.max_relay);
@@ -635,6 +640,74 @@ function ticketWorkspace(req, res, roomId, { store, hub, gateway, later, tasks,
   });
 }
 
+/**
+ * 一句话拉团队 (user 11-04: DSH 用户一句话拉单模型多角色): the primary role of a channel, with its
+ * (member, room) later ticket, creates a new chat channel and its roles in one call.
+ *   POST /collab/api/rooms/{id}/team  { channel, members: [{ name, persona?, model? }], model? }
+ * model is a model id ("deepseek-v4.1-flash") or "provider/model"; absent = DSH's default model.
+ * The new roles join only the new channel; the caller becomes its primary role and joins it too.
+ */
+export function teamRoute(req, res, url, { store, hub, later, roster }) {
+  const m = /^\/collab\/api\/rooms\/(\d+)\/team\/?$/.exec(url.pathname);
+  if (m === null || req.method !== 'POST') return undefined;
+  const claims = req.headers['x-later-ticket'] === undefined ? undefined : later?.verify(req.headers['x-later-ticket']);
+  if (!claims) return Promise.resolve(json(res, 401, { error: 'unauthorized' }));
+  const roomId = Number(m[1]);
+  if (claims.room !== roomId) return Promise.resolve(json(res, 403, { error: 'ticket is for another room' }));
+  if (hub.primaryIn(roomId)?.id !== claims.member) return Promise.resolve(json(res, 403, { error: 'only the primary role builds teams' }));
+  return withBody(req, res, async body => buildTeam(body, claims.member, { store, hub, roster }));
+}
+
+const TEAM_AVATARS = ['orange', 'dragon', 'rainbow', 'lanxi', 'whale'];
+const MAX_TEAM = 8;
+
+/** Find a model by id or provider/id among DSH's routes; undefined input = DSH default (no model on the member). */
+export async function resolveTeamModel(roster, wanted) {
+  const want = String(wanted ?? '').trim();
+  if (!want) return undefined;
+  const routes = await roster.models();
+  const slash = want.indexOf('/');
+  for (const route of routes) {
+    for (const model of route.models) {
+      const exact = slash > 0 && route.provider === want.slice(0, slash) && model.id === want.slice(slash + 1);
+      if (exact || model.id.toLowerCase() === want.toLowerCase()) return { provider: route.provider, model: model.id };
+    }
+  }
+  const known = routes.flatMap(r => r.models.map(x => x.id)).slice(0, 20).join(', ') || '（DSH 没报出可用模型）';
+  throw new CollabError('invalid', `模型 ${want} 在 DSH 里找不到；可用：${known}`);
+}
+
+export async function buildTeam(body, leadId, { store, hub, roster }) {
+  const channel = String(body?.channel ?? '').trim().replace(/^#/, '');
+  if (!channel || channel.length > 32 || /\s/.test(channel)) throw new CollabError('invalid', 'channel must be 1-32 characters without spaces');
+  const wanted = Array.isArray(body?.members) ? body.members : [];
+  if (wanted.length === 0 || wanted.length > MAX_TEAM) throw new CollabError('invalid', `members must list 1-${MAX_TEAM} roles`);
+  const names = wanted.map(x => String(x?.name ?? '').trim());
+  if (names.some(n => !n) || new Set(names.map(n => n.toLowerCase())).size !== names.length) throw new CollabError('invalid', 'every role needs a distinct name');
+  const shared = await resolveTeamModel(roster, body?.model);
+  const models = [];
+  for (const x of wanted) models.push(x?.model === undefined || x?.model === '' ? shared : await resolveTeamModel(roster, x.model));
+  // Check every role before anything is written, so a bad name leaves no half-built channel behind.
+  for (const [i, x] of wanted.entries()) await roster.validate({ name: names[i], persona: String(x?.persona ?? ''), avatar: TEAM_AVATARS[i % TEAM_AVATARS.length] });
+  const room = store.createRoom(channel);
+  const created = [];
+  for (const [i, x] of wanted.entries()) {
+    const model = models[i];
+    created.push(await roster.create({ name: names[i], persona: String(x?.persona ?? ''), rooms: [room.id], avatar: TEAM_AVATARS[i % TEAM_AVATARS.length], ...(model ? { model } : {}) }));
+  }
+  const lead = store.member(leadId);
+  if (lead?.source === 'ui' && lead.rooms && lead.rooms !== '[]') {
+    await roster.update(leadId, { ...rowToMember(lead), rooms: [...JSON.parse(lead.rooms), room.id] });
+  }
+  store.setLead(room.id, leadId);
+  hub.emit({ type: 'rooms', rooms: store.roomsView() });
+  const label = model => (model ? model.model : 'DSH 默认模型');
+  const leadName = hub.members.get(leadId)?.name ?? leadId;
+  hub.post(room.id, { authorKind: 'system', author: 'system', name: '建团队',
+    text: `【已建团队】${leadName} 拉好了 #${channel}：${created.map((c, i) => `${c.name}（${label(models[i])}）`).join('、')}。${leadName} 是本频道主角色，直接在这里说需求。` });
+  return { room, lead: leadId, members: created.map((c, i) => ({ id: c.id, name: c.name, model: label(models[i]) })) };
+}
+
 const ERROR_STATUS = { 'room-missing': 404, 'member-missing': 404, 'task-missing': 404, conflict: 409, 'read-only': 403, forbidden: 403, offline: 503, 'member-busy': 409 };
 
 /** Parse a JSON body (unless `parse` is false), run fn, and map CollabError codes to HTTP statuses. */

package/collab/store.mjs

@@ -121,6 +121,10 @@ export class Store {
         AND draft = 1 AND deleted = 0 AND card IS NULL`),
       authorDrafts: this.db.prepare(`SELECT * FROM messages WHERE author_kind = ? AND author = ?
         AND draft = 1 AND deleted = 0 AND card IS NULL ORDER BY id`),
+      // #913: every live card row one author posted, in every room. A restarted bridge
+      // holds no handle on them, so they must be found without a message window.
+      authorCards: this.db.prepare(`SELECT * FROM messages WHERE author_kind = ? AND author = ?
+        AND card IS NOT NULL AND deleted = 0 ORDER BY id`),
       addJob: this.db.prepare(`INSERT INTO jobs (member_id, room_id, trigger_id, state, created_at)
         VALUES (?, ?, ?, 'pending', ?) ON CONFLICT(member_id, trigger_id) DO NOTHING RETURNING *`),
       job: this.db.prepare('SELECT * FROM jobs WHERE id = ?'),
@@ -721,6 +725,10 @@ export class Store {
     // WebSocket close events may arrive after plugin teardown has closed SQLite.
     return this.closed ? [] : this.q.authorDrafts.all(authorKind, author);
   }
+  /** Every live progress-card row one author posted (#913), oldest first. */
+  authorCards(authorKind, author) {
+    return this.closed ? [] : this.q.authorCards.all(authorKind, author);
+  }
 
   /** Up to `limit` messages before `beforeId` (exclusive), oldest first. */
   page(roomId, beforeId, limit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bothouse-dsh",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "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",