bothouse-dsh 0.1.46 → 0.1.48

package/collab/plugin.mjs

@@ -4,7 +4,7 @@ import { personaLibrary } from './personas.mjs';
 //   - insert:
 //       - id: conest-collab
 //         name: /abs/path/dsh/collab/plugin.mjs
-//         config: { dataDir, workspacePath, leadFile?, fallbackLead?, botTokenEnv?, ownerName?, rooms?, dshMembers?, maxRelay?, boardDir?, teamStatusDir?, wikiDir? }
+//         config: { dataDir, workspacePath, leadFile?, fallbackLead?, botTokenEnv?, ownerName?, rooms?, dshMembers?, maxRelay?, boardDir?, teamStatusDir?, wikiDir?, bridgeConfig? }
 import { createRequire } from 'node:module';
 import { readFileSync, realpathSync, statSync } from 'node:fs';
 import { isAbsolute, join } from 'node:path';
@@ -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';
@@ -24,8 +24,9 @@ import { LeadState } from './lead-state.mjs';
 import { Attachments, INLINE_IMAGE } from './attachments.mjs';
 import { Later, registerLater } from './later.mjs';
 import { QuotaCooling, quotaDirectory } from './quota-cooling.mjs';
-import { DeskEvents, deskRoute } from './desk.mjs';
+import { DeskEvents, DESK_NAMES_FILE, deskRoute } from './desk.mjs';
 import { wikiGalaxyRoute } from './wiki-galaxy.mjs';
+import { defaultBridgeConfig, panelRoute } from './panel.mjs';
 import { TeamStatus } from './team-status.mjs';
 
 export const name = 'conest-collab';
@@ -93,7 +94,10 @@ export function resolveConfig(config, env = process.env) {
   // Wiki 星河读的 wiki 目录：配置或 CONEST_WIKI_DIR，都没给就是 ~/wiki（只读）。
   const wikiDir = String(c.wikiDir ?? env.CONEST_WIKI_DIR ?? '').trim() || (env.HOME ? join(env.HOME, 'wiki') : undefined);
   if (wikiDir !== undefined && !isAbsolute(wikiDir)) throw Error('conest-collab: wikiDir must be an absolute path');
-  return { dataDir: c.dataDir, workspacePath: c.workspacePath, leadFile, fallbackLead, boardDir, teamStatusDir, wikiDir, rooms, dshMembers: members, maxRelay, botTokenEnv, botToken, ownerName: c.ownerName ?? '我' };
+  // #105 侧栏「bothouse」：读这份主桥配置的 [management] 段，在服务端转发管理面板（令牌不进浏览器）。
+  const bridgeConfig = String(c.bridgeConfig ?? '').trim() || defaultBridgeConfig(env);
+  if (!isAbsolute(bridgeConfig)) throw Error('conest-collab: bridgeConfig must be an absolute path');
+  return { dataDir: c.dataDir, workspacePath: c.workspacePath, leadFile, fallbackLead, boardDir, teamStatusDir, wikiDir, bridgeConfig, rooms, dshMembers: members, maxRelay, botTokenEnv, botToken, ownerName: c.ownerName ?? '我' };
 }
 
 /** Resolve a package from the running DSH installation, never a second copy. */
@@ -232,15 +236,19 @@ 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);
     }
     // #876 P: 回放里的 @ 用 hub 的成员表解析（routable = 真实角色，不含主人）。
-    const deskHandled = deskRoute(req, res, url, { store, boardDir: config.boardDir, members: hub.routable() });
+    const deskHandled = deskRoute(req, res, url, { store, boardDir: config.boardDir, members: hub.routable(), namesFile: join(config.dataDir, DESK_NAMES_FILE) });
     if (deskHandled !== undefined) return deskHandled;
     const galaxyHandled = wikiGalaxyRoute(req, res, url, { wikiDir: config.wikiDir });
     if (galaxyHandled !== undefined) return galaxyHandled;
+    const panelHandled = panelRoute(req, res, url, { bridgeConfig: config.bridgeConfig });
+    if (panelHandled !== undefined) return panelHandled;
     if (path === '/collab' && req.method === 'GET') return text(res, 200, 'text/html; charset=utf-8', PAGE);
     if (path === '/collab/api/personas' && req.method === 'GET') return json(res, 200, personaLibrary(url.searchParams.get('lang') ?? 'zh'));
     if (path === '/collab/api/state' && req.method === 'GET') {
@@ -442,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) {
@@ -453,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);
@@ -629,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.46",
+  "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",