bothouse-dsh 0.1.47 → 0.1.49

package/collab/panel.mjs

@@ -89,7 +89,16 @@ function sendNotice(res, status, reason) {
  * @returns {string}
  */
 export function rewritePanelHTML(html, prefix = PANEL_PREFIX) {
-  const head = `<base href="${prefix}/" />\n    <meta name="bothouse-auth" content="proxy" />`;
+  // The page may itself sit under another proxy's prefix: the bridge management server mounts
+  // the whole DSH site at /dsh/ (core/management_dsh_proxy.go) and strips it before DSH sees the
+  // request, so this route cannot know it. A fixed <base href="/collab/panel/"> then sends the
+  // panel's scripts to the management server's own /collab/panel/..., which answers with its
+  // index.html, and the frame stays blank. The inline script moves <base> to wherever the page
+  // was actually loaded from, before any asset URL is resolved (it runs ahead of the panel's
+  // module scripts, and basePath.ts reads document.baseURI only when they run).
+  const mount = JSON.stringify(`${prefix}/`).replace(/</g, '\\u003c');
+  const fix = `<script>(()=>{const m=${mount},p=location.pathname,i=p.indexOf(m);if(i>0)document.querySelector("base").setAttribute("href",p.slice(0,i)+m)})()</script>`;
+  const head = `<base href="${prefix}/" />${fix}\n    <meta name="bothouse-auth" content="proxy" />`;
   if (/<base\s[^>]*>/i.test(html)) return html.replace(/<base\s[^>]*>/i, head);
   return html.replace(/<head(\s[^>]*)?>/i, m => `${m}\n    ${head}`);
 }

package/collab/plugin.mjs

@@ -4,19 +4,21 @@ 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?, bridgeConfig? }
+//         config: { dataDir, workspacePath, leadFile?, fallbackLead?, botTokenEnv?, botPort?, 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';
 import { pathToFileURL } from 'node:url';
 import { Store, CollabError, publicMessage } from './store.mjs';
+import { startBotPort } from './bot-port.mjs';
 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 { MemorySources } from './memory-sources.mjs';
 import { avatarImage, checkAvatar } from './avatars.mjs';
 import { AvatarUploads } from './avatar-uploads.mjs';
 import { handler as clisHandler } from './clis.mjs';
@@ -28,6 +30,8 @@ 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';
+import { ALIVE_EVERY_MS, PairClient, PairHost, PairListener, PAIR_PORT, REMOTE_OWNER, hostHandler, isLoopback, pairApiRoute, remoteProxyRoute, tailnetAddress } from './pairing.mjs';
+import { homedir, hostname } from 'node:os';
 
 export const name = 'conest-collab';
 export const inject = [
@@ -36,6 +40,8 @@ export const inject = [
 ];
 
 const PAGE = readFileSync(new URL('./page.html', import.meta.url), 'utf8');
+// #131: 「其他电脑」page — pair this DSH with another one by a one-time number.
+const DEVICES_PAGE = readFileSync(new URL('./devices.html', import.meta.url), 'utf8');
 const MAX_BODY = 256 * 1024;
 // #144: a message POST may carry base64 attachments. Same cap as the bot WebSocket
 // maxPayload below (8 MiB), so a message that is accepted here still fits in the frame
@@ -79,7 +85,11 @@ export function resolveConfig(config, env = process.env) {
   if (!Number.isSafeInteger(maxRelay) || maxRelay < 0) throw Error('conest-collab: maxRelay must be a non-negative integer');
   const botTokenEnv = c.botTokenEnv ?? 'CONEST_COLLAB_BOT_TOKEN';
   const botToken = env[botTokenEnv] ?? '';
-  const leadFile = c.leadFile ?? join(env.BOTHOUSE_DATA_DIR ?? join(env.HOME ?? '.', '.bothouse'), 'lead.json');
+  // #142 桌面版宿主端口每次随机：给一个固定端口另开 bot 接入（bot-port.mjs）。配置或 CONEST_COLLAB_BOT_PORT，都没给就不开。
+  const botPortRaw = c.botPort ?? (String(env.CONEST_COLLAB_BOT_PORT ?? '').trim() || undefined);
+  const botPort = botPortRaw === undefined ? undefined : Number(botPortRaw);
+  if (botPort !== undefined && !(Number.isSafeInteger(botPort) && botPort > 0 && botPort < 65536)) throw Error('conest-collab: botPort must be a TCP port number');
+  const leadFile = c.leadFile ?? join(env.BOTHOUSE_DATA_DIR ?? join(env.HOME || homedir(), '.bothouse'), 'lead.json');
   if (!isAbsolute(leadFile)) throw Error('conest-collab: leadFile must be an absolute path');
   const fallbackLead = String(c.fallbackLead ?? env.CONEST_FALLBACK_LEAD ?? '').trim();
   // #876: board events sit next to board.jsonl; BOARD_DIR is the same switch gate/board.py reads,
@@ -97,7 +107,7 @@ export function resolveConfig(config, env = process.env) {
   // #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 ?? '我' };
+  return { dataDir: c.dataDir, workspacePath: c.workspacePath, leadFile, fallbackLead, boardDir, teamStatusDir, wikiDir, bridgeConfig, rooms, dshMembers: members, maxRelay, botTokenEnv, botToken, botPort, ownerName: c.ownerName ?? '我' };
 }
 
 /** Resolve a package from the running DSH installation, never a second copy. */
@@ -132,6 +142,7 @@ export async function apply(ctx, rawConfig) {
   store.migrateMemberRooms();
   const leadState = new LeadState(config.leadFile, ctx.logger);
   const hub = new Hub(store, ctx.logger, leadState, config.fallbackLead);
+  hub.memorySources = new MemorySources({ logger: ctx.logger }); // #1020 回复的记忆来源
   hub.workspacePath = config.workspacePath;
   hub.teamExit = new TeamExit(hub);
   hub.setMember({ id: OWNER, name: config.ownerName, kind: 'human', online: true });
@@ -179,24 +190,47 @@ export async function apply(ctx, rawConfig) {
   teamStatus?.start();
   if (!config.botToken) ctx.logger.warn(`conest-collab: ${config.botTokenEnv} is unset; cc-connect bots cannot connect`);
 
-  const owner = req => ctx.connection.requestRejection(req) === undefined;
+  // #131: a request the tailnet pairing listener authenticated with a device credential acts as
+  // the owner; everything else still needs this DSH's own sign-in.
+  const owner = req => req[REMOTE_OWNER] === true || ctx.connection.requestRejection(req) === undefined;
+  // Test-only overrides (same-machine two-instance check): address and port of the pairing listener.
+  const pairAddr = String(process.env.CONEST_COLLAB_PAIR_ADDR ?? '').trim();
+  const pairPort = Number(process.env.CONEST_COLLAB_PAIR_PORT) || PAIR_PORT;
+  const pairHost = new PairHost({ file: join(config.dataDir, 'pair-devices.json') });
+  const pairClient = new PairClient({ file: join(config.dataDir, 'pair-links.json'), port: pairPort });
+  const pairListener = new PairListener({
+    host: pairHost, port: pairPort, logger: ctx.logger,
+    address: pairAddr === '' ? () => tailnetAddress() : async () => pairAddr,
+    handler: hostHandler({ host: pairHost, name: hostname(), route: (req, res) => browserRoute(req, res), allowLoopback: isLoopback(pairAddr) }),
+  });
+  if (pairHost.list().length > 0) pairListener.ensure().catch(err => ctx.logger.warn('conest-collab: pairing listener: %s', err.message));
+  // 来源：码有效期按分钟计（pairing.mjs CODE_TTL_MS），每分钟收一次没人用的配对监听。
+  const pairSweep = setInterval(() => { pairListener.settle().catch(() => {}); }, 60_000);
+  pairSweep.unref?.();
+  // 「直到我断开」: drop links whose DSH window stopped beating (same cadence as the beat).
+  const aliveSweep = setInterval(() => { pairClient.sweep().catch(() => {}); }, ALIVE_EVERY_MS);
+  aliveSweep.unref?.();
   const wss = new WebSocketServer({ noServer: true, maxPayload: BOT_WS_MAX_PAYLOAD });
   const streams = new Set();
 
   ctx.effect(() => ctx.webServer.register({ kind: 'prefix', path: '/collab', handler: (req, res) => browserRoute(req, res) }), 'conest-collab: /collab');
   ctx.effect(() => ctx.webServer.register({ kind: 'prefix', path: '/api/rooms', handler: (req, res) => historyRoute(req, res) }), 'conest-collab: /api/rooms');
-  ctx.effect(() => ctx.webServer.registerUpgrade({
-    path: WS_PATH,
-    handler: (req, socket, head) => {
-      const url = new URL(req.url ?? '/', 'http://collab.invalid');
-      later.origin ??= localOrigin(req);
-      if (!gateway.authorized(req, url)) {
-        socket.end('HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 0\r\n\r\n');
-        return;
-      }
-      wss.handleUpgrade(req, socket, head, ws => gateway.accept(ws, url));
-    },
-  }), 'conest-collab: cloud-web upgrade');
+  const botUpgrade = (req, socket, head) => {
+    const url = new URL(req.url ?? '/', 'http://collab.invalid');
+    later.origin ??= localOrigin(req);
+    if (!gateway.authorized(req, url)) {
+      socket.end('HTTP/1.1 401 Unauthorized\r\nConnection: close\r\nContent-Length: 0\r\n\r\n');
+      return;
+    }
+    wss.handleUpgrade(req, socket, head, ws => gateway.accept(ws, url));
+  };
+  ctx.effect(() => ctx.webServer.registerUpgrade({ path: WS_PATH, handler: botUpgrade }), 'conest-collab: cloud-web upgrade');
+  if (config.botPort !== undefined && config.botToken) {
+    const listening = startBotPort({ port: config.botPort, path: WS_PATH, upgrade: botUpgrade, history: (req, res) => historyRoute(req, res), logger: ctx.logger })
+      .then(l => { ctx.logger.info('conest-collab: bot port 127.0.0.1:%d', l.port); return l; },
+        err => { ctx.logger.warn('conest-collab: bot port %d not opened: %s', config.botPort, err.message); return undefined; });
+    ctx.effect(() => async () => { (await listening)?.close(); }, 'conest-collab: bot port');
+  }
   ctx.effect(() => async () => {
     teamStatus?.stop();
     desk.stop();
@@ -204,6 +238,9 @@ export async function apply(ctx, rawConfig) {
     later.close();
     tasks.close();
     gateway.closeAll();
+    clearInterval(pairSweep);
+    clearInterval(aliveSweep);
+    await pairListener.close();
     for (const end of streams) end();
     wss.close();
     // Drain DSH jobs first: a job still awaiting its Agent must not touch a closed store.
@@ -229,13 +266,16 @@ export async function apply(ctx, rawConfig) {
   async function browserRoute(req, res) {
     const url = new URL(req.url ?? '/', 'http://collab.invalid');
     const path = url.pathname.replace(/\/+$/, '');
-    later.origin ??= localOrigin(req);
+    // A paired device reaches us on the tailnet listener; ticket URLs stay on this machine's own origin.
+    if (!req[REMOTE_OWNER]) later.origin ??= localOrigin(req);
     const scheduled = laterRoute(req, res, url, { hub, gateway, owner, later });
     if (scheduled !== undefined) return scheduled;
     const routed = tasksRoute(req, res, url, { tasks, gateway, owner });
     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);
@@ -247,6 +287,14 @@ export async function apply(ctx, rawConfig) {
     if (galaxyHandled !== undefined) return galaxyHandled;
     const panelHandled = panelRoute(req, res, url, { bridgeConfig: config.bridgeConfig });
     if (panelHandled !== undefined) return panelHandled;
+    // #131: pairing (this machine lets others in) and remote links (this machine drives others).
+    if (!req[REMOTE_OWNER]) {
+      if (path === '/collab/devices' && req.method === 'GET') return text(res, 200, 'text/html; charset=utf-8', DEVICES_PAGE);
+      const paired = pairApiRoute(req, res, url, { host: pairHost, client: pairClient, listener: pairListener });
+      if (paired !== undefined) return paired;
+      const remote = remoteProxyRoute(req, res, url, { client: pairClient });
+      if (remote !== undefined) return remote;
+    }
     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') {
@@ -254,7 +302,8 @@ export async function apply(ctx, rawConfig) {
         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,
           workspace_path: store.workspacePath(r.id, config.workspacePath) })), members: hub.memberView(),
-        thinking: Object.fromEntries([...hub.thinking].map(([k, v]) => [k, [...v]])) });
+        thinking: Object.fromEntries([...hub.thinking].map(([k, v]) => [k, [...v]])),
+        queued: Object.fromEntries([...hub.queued.keys()].map(r => [r, hub.queueView(r)])) });
     }
     if (path === '/collab/api/events' && req.method === 'GET') return events(req, res);
     if (path === '/collab/api/lead' && req.method === 'GET') {
@@ -407,6 +456,17 @@ export async function apply(ctx, rawConfig) {
         return { room };
       });
     }
+    // #1023: open (or reopen) the private chat with one agent member.
+    if (path === '/collab/api/dms' && req.method === 'POST') {
+      return withBody(req, res, (body) => {
+        const id = String(body?.member ?? '');
+        const member = hub.members.get(id);
+        if (member === undefined || member.kind === 'human') throw new CollabError('invalid', 'member must be an agent in this channel list');
+        const room = store.openDm(id, member.name);
+        hub.emit({ type: 'rooms', rooms: store.roomsView() });
+        return { room };
+      });
+    }
     if (path === '/collab/api/members' && req.method === 'POST') {
       return withBody(req, res, async body => ({ member: await roster.create(body) }));
     }
@@ -448,7 +508,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 +522,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 +698,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. */
@@ -665,9 +796,14 @@ export function parseRange(header, size) {
 
 /** Serves a stored attachment; honours single byte ranges so iOS Safari can play audio. */
 export function sendAttachment(req, res, row, bytes) {
-  const headers = { 'content-type': row.mime, 'accept-ranges': 'bytes',
-    'content-disposition': `${INLINE_IMAGE.test(row.mime) ? 'inline' : 'attachment'}; filename*=UTF-8''${encodeURIComponent(row.name)}`,
-    'x-content-type-options': 'nosniff', 'cache-control': 'private, max-age=86400' };
+  // #1023: a delivered web page (`?view=page`) opens inline for the delivery card's frame. The CSP
+  // sandbox gives it an opaque origin even when opened in its own tab, so its scripts never act
+  // with the owner's sign-in on this origin.
+  const page = /[?&]view=page(?:&|$)/.test(req.url ?? '') && (/^text\/html\b/i.test(row.mime) || /\.html?$/i.test(row.name));
+  const headers = { 'content-type': page ? 'text/html; charset=utf-8' : row.mime, 'accept-ranges': 'bytes',
+    'content-disposition': `${page || INLINE_IMAGE.test(row.mime) ? 'inline' : 'attachment'}; filename*=UTF-8''${encodeURIComponent(row.name)}`,
+    'x-content-type-options': 'nosniff', 'cache-control': 'private, max-age=86400',
+    ...(page ? { 'content-security-policy': 'sandbox allow-scripts allow-forms allow-popups allow-modals' } : {}) };
   const range = parseRange(req.headers?.range, bytes.length);
   if (range === null) {
     res.writeHead(416, { ...headers, 'content-range': `bytes */${bytes.length}`, 'content-length': 0 });

package/collab/roster.mjs

@@ -64,6 +64,11 @@ export class Roster {
    * as UI members, once: names already in the channel are skipped, then the file becomes *.imported.json with
    * each role's member id (the new one, or the one already holding the name), so bothouse names the role's wiki
    * after the id the member really has (bridge core/setup_dsh_wiki.go). Returns the names added.
+   * A default-named role (name_customized false) reuses a DSH member a former run made for it — same CLI,
+   * still automatic, named the role's name or name-N — so re-running the wizard does not add Codex-2, Codex-3…
+   * (11-05 Windows report); the one named exactly the role's name goes first, then the oldest. Each member
+   * serves one role per run, so two default Codex roles still get two members. The imported entry carries the
+   * member's real name, which the bridge writes into gate-team.json and lead.json.
    */
   async importWizard(path, logger) {
     if (!existsSync(path)) return [];
@@ -76,19 +81,22 @@ export class Roster {
     }
     const added = [];
     const imported = [];
+    const claimed = new Set();
     for (const m of Array.isArray(members) ? members : []) {
       const name = String(m?.name ?? '').trim();
-      const same = this.hub.memberList().find(x => x.name.toLowerCase() === name.toLowerCase());
-      // A default-named role may become Codex-2 when Codex is already there; custom and legacy
-      // names stay idempotent (a re-import must not duplicate them).
-      if (same !== undefined && m?.name_customized !== false) {
-        imported.push({ ...m, id: same.id });
+      // Custom and legacy names stay idempotent by name (a re-import must not duplicate them).
+      const same = m?.name_customized === false ? this.reusableWizardMember(name, m?.cli, claimed)
+        : this.hub.memberList().find(x => x.name.toLowerCase() === name.toLowerCase());
+      if (same !== undefined) {
+        claimed.add(same.id);
+        imported.push({ ...m, name: same.name, id: same.id });
         continue;
       }
       try {
         const avatar = m?.avatar && ['orange', 'whale', 'dragon', 'rainbow', 'lanxi'].includes(m.avatar) ? m.avatar : undefined;
         const member = await this.create({ name, persona: m?.persona ?? '', ...(m?.cli ? { cli: m.cli } : {}), ...(m?.name_customized === undefined ? {} : { nameCustomized: Boolean(m.name_customized) }), ...(avatar ? { avatar } : {}) });
-        imported.push({ ...m, id: member.id });
+        claimed.add(member.id);
+        imported.push({ ...m, name: member.name, id: member.id });
         added.push(member.name);
       } catch (error) {
         imported.push(m);
@@ -100,6 +108,19 @@ export class Roster {
     return added;
   }
 
+  /** A UI member an earlier wizard run made for the default-named role `name` (see importWizard), or undefined. */
+  reusableWizardMember(name, cli, claimed) {
+    const stem = name.toLowerCase();
+    // The exact name is the same role whatever its flag says: members seeded on the plugin's first start
+    // (seedDefaults) and those made before name_customized was stored carry none, and skipping them
+    // made every re-run add 鲸鱼娘-2 / DSH-2. A suffixed name (Codex-2) is reused only when it is marked automatic.
+    const fits = this.store.members().filter(r => r.source === 'ui' && !claimed.has(r.id) && (r.cli ?? '') === (cli ?? '')
+      && (r.name.toLowerCase() === stem
+        || (r.name_customized != null && !Boolean(r.name_customized) && r.name.toLowerCase().replace(/-\d+$/, '') === stem)));
+    const pick = fits.find(r => r.name.toLowerCase() === stem) ?? fits[0];
+    return pick === undefined ? undefined : rowToMember(pick);
+  }
+
   /**
    * Plugin-only installs (`dsh plugin add bothouse-dsh`) have no setup wizard: on the very first start,
    * with no member ever stored, add one preset role (鲸鱼娘) as a DSH member on DSH's own default model, so

package/collab/store.mjs

@@ -56,6 +56,10 @@ const COLUMNS = [
   ['rooms', 'claim_seq', 'INTEGER NOT NULL DEFAULT 0'],
   ['rooms', 'workspace_path', 'TEXT'], // Optional chat directory; workspace rooms inherit their current parent.
   ['messages', 'edited_at', 'REAL'], // v11 (#148): when the owner last edited their own message; NULL if never.
+  // #1020 (no version bump, so an older build still opens the file): JSON list of the memory entries a reply used ({id, ref, page, title}); NULL when none.
+  ['messages', 'memories', 'TEXT'],
+  // #1023 (no version bump): a private chat is a chat room with exactly one agent member; NULL for every other room.
+  ['rooms', 'dm_member', 'TEXT'],
   // #597 G34: when a role last changed the row in place (a streamed draft growing, a progress card
   // edited, the draft committed); NULL if never. The task watch counts it as progress (Tasks.progressed).
   ['messages', 'changed_at', 'REAL'],
@@ -90,6 +94,7 @@ export class Store {
     this.q = {
       room: this.db.prepare('SELECT id, name, kind, parent_id FROM rooms WHERE id = ?'),
       rooms: this.db.prepare('SELECT id, name, kind, parent_id FROM rooms ORDER BY id'),
+      dms: this.db.prepare('SELECT id, dm_member FROM rooms WHERE dm_member IS NOT NULL'),
       children: this.db.prepare("SELECT id, name FROM rooms WHERE kind = 'workspace' AND parent_id = ? ORDER BY id"),
       // A new workspace is claimed with no task yet (claim_task 0): its first task is the handoff.
       createWorkspace: this.db.prepare(`INSERT INTO rooms (id, name, kind, parent_id, claim_task, claim_bridge, claim_at)
@@ -104,6 +109,7 @@ export class Store {
       byId: this.db.prepare('SELECT * FROM messages WHERE id = ? AND deleted = 0'),
       edit: this.db.prepare('UPDATE messages SET text = ?, card = ?, changed_at = ? WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 RETURNING *'),
       commit: this.db.prepare('UPDATE messages SET text = ?, from_turn = ?, attachments = ?, draft = 0, changed_at = ? WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 AND card IS NULL AND draft = 1 RETURNING *'),
+      setMemories: this.db.prepare('UPDATE messages SET memories = ? WHERE id = ? RETURNING *'),
       editUser: this.db.prepare(`UPDATE messages SET text = ?, edited_at = ? WHERE id = ? AND author_kind = 'user' AND author = ?
         AND deleted = 0 AND draft = 0 AND card IS NULL RETURNING *`),
       del: this.db.prepare('UPDATE messages SET deleted = 1 WHERE id = ? AND author_kind = ? AND author = ? AND deleted = 0 RETURNING *'),
@@ -121,6 +127,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 = ?'),
@@ -382,6 +392,24 @@ export class Store {
     this.ensureRoomSettings(room.id);
     return room;
   }
+  /**
+   * #1023: the private chat with one agent member — its existing room, or a new chat room whose
+   * only agent is that member (Hub.membersInRoom). Same room every time, so the session carries on.
+   */
+  openDm(memberId, name) {
+    if (typeof memberId !== 'string' || memberId === '') throw new CollabError('invalid', 'member id required');
+    const room = this.transaction(() => {
+      const found = this.db.prepare('SELECT id FROM rooms WHERE dm_member = ? ORDER BY id LIMIT 1').get(memberId);
+      if (found !== undefined) return { ...this.q.room.get(found.id), dm_member: memberId };
+      const created = this.q.createRoom.get(String(name || memberId).replace(/\s+/g, '').slice(0, 32) || memberId);
+      this.db.prepare('UPDATE rooms SET dm_member = ? WHERE id = ?').run(memberId, created.id);
+      return { ...created, dm_member: memberId };
+    });
+    this.ensureRoomSettings(room.id);
+    return room;
+  }
+  /** #1023: the agent member a private chat room is with; undefined for every other room. */
+  dmMember(roomId) { return this.db.prepare('SELECT dm_member FROM rooms WHERE id = ?').get(roomId)?.dm_member ?? undefined; }
   /**
    * Give a chat channel its next workspace: the lowest-numbered free 工作区<k> of the shared
    * pool (released by any chat channel after its last task) if there is one, else a new
@@ -623,7 +651,11 @@ export class Store {
     return saved || this.q.workspacePath.get(roomId)?.path || fallback;
   }
   room(id) { return this.q.room.get(id); }
-  rooms() { return this.q.rooms.all(); }
+  rooms() {
+    // #1023: only a private chat carries dm_member, so every other room keeps its old shape.
+    const dms = new Map(this.q.dms.all().map(r => [r.id, r.dm_member]));
+    return this.q.rooms.all().map(r => (dms.has(r.id) ? { ...r, dm_member: dms.get(r.id) } : r));
+  }
   /** Return stale, empty claims to the pool without taking bridge or paused work. */
   releaseIdleWorkspaces() {
     const idle = this.db.prepare(`SELECT id FROM rooms WHERE kind = 'workspace' AND free = 0
@@ -672,6 +704,9 @@ export class Store {
 
   message(id) { return this.q.byId.get(id); }
 
+  /** #1020: record the memory entries a reply used; returns the updated row. */
+  setMemories(id, items) { return this.q.setMemories.get(items?.length ? JSON.stringify(items) : null, id); }
+
   /**
    * What a reply quotes: undefined for a plain message; `{ id, deleted: true }`
    * when the original is gone (no author or text leaks); else id, author, and
@@ -721,6 +756,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) {
@@ -794,9 +833,17 @@ export function publicMessage(row, store) {
   if (quote !== undefined) out.reply_to = quote;
   const attachments = messageAttachments(row);
   if (attachments.length) out.attachments = attachments;
+  const memories = messageMemories(row);
+  if (memories.length) out.memories = memories;
   return out;
 }
 
+/** #1020: the memory entries a reply used ([] when none or unreadable). */
+export function messageMemories(row) {
+  if (!row?.memories) return [];
+  try { const list = JSON.parse(row.memories); return Array.isArray(list) ? list : []; } catch { return []; }
+}
+
 /** #144: the uploaded files a message carries ([] when none or unreadable). */
 export function messageAttachments(row) {
   if (!row?.attachments) return [];