bothouse-dsh 0.1.48 → 0.1.49

package/collab/bot-port.mjs

@@ -0,0 +1,30 @@
+// 固定的 bot 接入端口（#142）。DSH 桌面版启动时把 Web 宿主端口写死成 0（每次随机，见
+// DeepSeek Harness.app dsh-desktop-host main() 的 "--port","0"），主桥的 cloud_web 无法配置固定地址。
+// 配了 botPort 时，插件另开一个只听 127.0.0.1 的小监听，只转两样东西：cloud-web 握手
+// （WS_PATH，与宿主上同一个处理函数、同一口令）和离线补历史 /api/rooms/…；其余一律 404。
+import { createServer } from 'node:http';
+
+/**
+ * @param {{ port: number, path: string, upgrade: Function, history: Function, logger?: any }} options
+ * @returns {Promise<{ port: number, close: () => Promise<void> }>}
+ */
+export function startBotPort({ port, path, upgrade, history, logger }) {
+  const server = createServer((req, res) => {
+    const p = new URL(req.url ?? '/', 'http://collab.invalid').pathname;
+    if (p === '/api/rooms' || p.startsWith('/api/rooms/')) return history(req, res);
+    res.writeHead(404, { 'content-type': 'application/json' }).end('{"error":"not found"}');
+  });
+  server.on('upgrade', (req, socket, head) => {
+    const p = new URL(req.url ?? '/', 'http://collab.invalid').pathname;
+    if (p !== path) { socket.end('HTTP/1.1 404 Not Found\r\nConnection: close\r\nContent-Length: 0\r\n\r\n'); return; }
+    upgrade(req, socket, head);
+  });
+  return new Promise((resolve, reject) => {
+    server.once('error', reject);
+    server.listen(port, '127.0.0.1', () => {
+      server.off('error', reject);
+      server.on('error', err => logger?.warn?.('conest-collab: bot port: %s', err.message));
+      resolve({ port: server.address().port, close: () => new Promise(done => { server.closeAllConnections?.(); server.close(() => done()); }) });
+    });
+  });
+}

package/collab/cli-member.mjs

@@ -104,6 +104,9 @@ export class CliMember {
       cwd: this.cwd,
       stdio: ['pipe', 'pipe', 'inherit'],
       env: { ...cleanEnv(), ...this.extraEnv },
+      // Windows: `gemini` / `npx` are npm .cmd shims, which only start through a shell (spawn without
+      // one gives ENOENT, and EINVAL for a .cmd path). Args here are fixed names and flags, no spaces.
+      shell: process.platform === 'win32' && cmd !== process.execPath,
     })
     this.proc = proc
     const client = this._client()

package/collab/clis.mjs

@@ -3,11 +3,18 @@
 import { execFile } from 'node:child_process';
 import { CLIS } from './roster.mjs';
 
-/** Default lookup: `which <name>` → absolute path, or undefined when absent. */
-export function which(name) {
+/**
+ * Default lookup: `which <name>` → absolute path, or undefined when absent. Windows has no `which`:
+ * `where.exe` lists every match (CRLF), including npm's extensionless sh shim next to the .cmd, so the
+ * first one Windows can start (PATHEXT) is taken.
+ */
+export function which(name, platform = process.platform) {
+  const win = platform === 'win32';
   return new Promise((resolve) => {
-    execFile('which', [name], (error, stdout) => {
-      const path = String(stdout ?? '').trim().split('\n')[0];
+    execFile(win ? 'where.exe' : 'which', [name], (error, stdout) => {
+      const lines = String(stdout ?? '').split(/\r?\n/).map(l => l.trim()).filter(Boolean);
+      const exts = String(process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD').toLowerCase().split(';').filter(Boolean);
+      const path = win ? (lines.find(l => exts.some(e => l.toLowerCase().endsWith(e))) ?? lines[0]) : lines[0];
       resolve(error || !path ? undefined : path);
     });
   });

package/collab/cloudweb.mjs

@@ -16,7 +16,7 @@ export const WS_PATH = '/cloud-web/ws';
 // a `buttons` frame (bridge platform/cloud-web SendWithButtons) instead of plain
 // text (#120); cards are not declared, so cc-connect degrades them to text
 // (bridge docs/cloud-web.md "Handshake").
-export const CAPABILITIES = ['text', 'reconstruct_reply', 'typing', 'preview', 'update_message', 'delete_message', 'reply_in_place', 'buttons', 'tasks', 'dispatch_mode'];
+export const CAPABILITIES = ['text', 'reconstruct_reply', 'typing', 'preview', 'update_message', 'delete_message', 'reply_in_place', 'buttons', 'tasks', 'dispatch_mode', 'queue'];
 // Permission decisions the Channel page and text replies may send. Values are the
 // button data cc-connect's sendPermissionPrompt uses (bridge core/engine.go).
 /**
@@ -60,6 +60,12 @@ const MAX_NAME = 64;
 
 export function roomKey(roomId) { return `room-${roomId}`; }
 
+/**
+ * #1023: chat_type for a frame from this room — "direct" for a private chat (the bridge's
+ * documented DM value, bridge/platform/cloud-web/cloudweb.go Direct), else "group".
+ */
+export function chatType(store, roomId) { return store?.dmMember?.(roomId) !== undefined ? 'direct' : 'group'; }
+
 /** Room id from a frame's reply_ctx or session_key ("<platform>:room-<id>"), or undefined. */
 export function roomOf(frame, store) {
   const sk = frame.session_key;
@@ -98,19 +104,21 @@ export function progressCardOf(p) {
     lines.push(`${it.kind === 'tool_use' ? '🔧' : it.kind === 'error' ? '❌' : '•'} ${tool ? tool + ' — ' : ''}${text.slice(0, 120)}`);
   }
   const agent = String(p.agent ?? 'Agent').trim() || 'Agent';
-  const brief = [lines[0], ...briefSteps(items, state)].join('\n');
-  const card = { text: lines.join('\n'), card: JSON.stringify({ title: `${agent} · ${CARD_STATES[state]}`, state, steps, elapsed_sec: sec, brief }) };
+  const run = toolSteps(items);
+  const brief = [lines[0], ...briefSteps(run, state)].join('\n');
+  const chips = stepChips(run, state);
+  const card = { text: lines.join('\n'), card: JSON.stringify({ title: `${agent} · ${CARD_STATES[state]}`, state, steps, elapsed_sec: sec, brief, chips }) };
   // Bridge task card (cloud-web public_progress.go): its members feed the task board (tasks.mjs fromCard).
   return Array.isArray(p.task_members) ? { ...card, members: p.task_members } : card;
 }
 
 /**
- * The 简略 view of a progress card, one line per tool step: tool name and
- * 成功/失败 (进行中 while the turn runs), no command text or output. Same
- * rules as the Discord card (bridge/platform/discord/progress.go
- * buildDiscordProgressBrief, discordProgressItemFailed).
+ * Tool steps of a turn, in order: each tool_use opens a step, its tool_result (same tool, else
+ * the last open one) closes it as succeeded/failed, an error fails the last open step. Same
+ * pairing as the Discord card (bridge/platform/discord/progress.go buildDiscordProgressBrief,
+ * discordProgressItemFailed). Each step keeps its call and output text for the step chips.
  */
-function briefSteps(items, state) {
+function toolSteps(items) {
   const steps = [];
   const open = tool => {
     for (let i = steps.length - 1; i >= 0; i--) if (steps[i].state === 0 && (tool === '' || steps[i].tool === tool)) return i;
@@ -118,19 +126,33 @@ function briefSteps(items, state) {
   };
   const failed = it => typeof it.success === 'boolean' ? !it.success
     : (Number.isInteger(it.exit_code) && it.exit_code !== 0) || ['failed', 'failure', 'error'].includes(String(it.status ?? '').trim().toLowerCase());
+  // 沿用 progressCardOf 正文每行截断 120 字。
+  const clip = v => {
+    const text = String(v ?? '').replace(/\s+/g, ' ').trim();
+    return text.length > 120 ? `${text.slice(0, 119)}…` : text;
+  };
   for (const it of items) {
     if (it === null || typeof it !== 'object') continue;
     const tool = String(it.tool ?? '').trim();
-    if (it.kind === 'tool_use') steps.push({ tool, state: 0 });
+    if (it.kind === 'tool_use') steps.push({ tool, state: 0, input: clip(it.text), output: '' });
     else if (it.kind === 'tool_result') {
       const st = failed(it) ? 2 : 1;
       const i = open(tool);
-      if (i >= 0) steps[i].state = st; else steps.push({ tool, state: st });
+      if (i >= 0) Object.assign(steps[i], { state: st, output: clip(it.text) });
+      else steps.push({ tool, state: st, input: '', output: clip(it.text) });
     } else if (it.kind === 'error') {
       const i = open('');
-      if (i >= 0) steps[i].state = 2;
+      if (i >= 0) Object.assign(steps[i], { state: 2, output: clip(it.text) });
     }
   }
+  return steps;
+}
+
+/**
+ * The 简略 view of a progress card, one line per tool step: tool name and
+ * 成功/失败 (进行中 while the turn runs), no command text or output.
+ */
+function briefSteps(steps, state) {
   return steps.map(s => {
     const name = (s.tool || '工具').slice(0, 120);
     if (s.state === 1) return `✅ ${name} · 成功`;
@@ -139,6 +161,16 @@ function briefSteps(items, state) {
   });
 }
 
+/** Step chips for the DSH page (#125, owner's 11:53 sample): tool, outcome, call and output per step. */
+function stepChips(steps, state) {
+  return steps.map(s => ({
+    tool: (s.tool || '工具').slice(0, 120),
+    state: s.state === 1 ? 'ok' : s.state === 2 ? 'failed' : state === 'running' ? 'running' : 'unknown',
+    ...(s.input ? { input: s.input } : {}),
+    ...(s.output ? { output: s.output } : {}),
+  }));
+}
+
 /** reply_to_* frame fields for a reply (store.quote result); {} for a plain message. */
 function replyToFields(quoted, store) {
   if (quoted === undefined) return {};
@@ -233,7 +265,8 @@ export class CloudWebGateway {
     // avatar=<built-in slug> or an http(s) image URL (cc-connect's own library); anything else falls back to the initial badge.
     let avatar = '';
     try { avatar = checkAvatar(url.searchParams.get('avatar'), { allowUrl: true }); } catch { avatar = ''; }
-    const member = { id, name, rooms, kind: 'bot', mentionId: /^\d+$/.test(mentionId) ? mentionId : '', online: true, ...(avatar ? { avatar } : {}) };
+    // voter: the bridge project, as which its agent cites memories (memvote.py CC_PROJECT; memory-sources.mjs).
+    const member = { id, name, rooms, kind: 'bot', mentionId: /^\d+$/.test(mentionId) ? mentionId : '', online: true, ...(avatar ? { avatar } : {}), voter: project || id };
     const bot = { ws, member };
     const old = this.bots.get(id);
     this.bots.set(id, bot);
@@ -270,6 +303,12 @@ export class CloudWebGateway {
     for (const row of this.hub.store.authorCards('role', memberId)) {
       let card;
       try { card = JSON.parse(row.card); } catch { continue; }
+      // A permission card a hub restart left pending: its asker is gone, and next to the
+      // reconnected bot's new prompt it reads as the same request asked twice (#1017).
+      if (card?.kind === 'permission' && card.state === 'pending' && !this.approvals.pending.has(row.id)) {
+        this.approvals.close(row.id, 'expired', row);
+        continue;
+      }
       if (card?.state !== 'running') continue;
       const note = '⏹ 已中断（桥重启），这一步不会再更新';
       const brief = typeof card.brief === 'string' && card.brief !== '' ? `${card.brief}\n${note}` : note;
@@ -277,7 +316,9 @@ export class CloudWebGateway {
       // so the card keeps its agent name.
       const label = ` · ${CARD_STATES[card.state] ?? ''}`;
       const agent = typeof card.title === 'string' && card.title.endsWith(label) ? card.title.slice(0, -label.length) : (card.title ?? 'Agent');
-      this.hub.edit(row.id, 'role', memberId, `${row.text}\n${note}`, JSON.stringify({ ...card, state: 'cancelled', title: `${agent} · ${CARD_STATES.cancelled}`, brief }));
+      // A cut turn reports no outcome for its open steps.
+      const chips = Array.isArray(card.chips) ? card.chips.map(c => c?.state === 'running' ? { ...c, state: 'unknown' } : c) : card.chips;
+      this.hub.edit(row.id, 'role', memberId, `${row.text}\n${note}`, JSON.stringify({ ...card, state: 'cancelled', title: `${agent} · ${CARD_STATES.cancelled}`, brief, chips }));
     }
   }
 
@@ -313,14 +354,18 @@ export class CloudWebGateway {
       // A reply addressed to other bots is not this bot's to take (reply_routing.go accept=false).
       if (only !== null && !only.has(member.id)) continue;
       let content = forMember(text, member, members);
-      const hit = target === member.id || only !== null || mentioned.has(member.id) || nameCalled(text, member.name);
+      // #1023: an owner message in a private chat is addressed to its one agent.
+      const hit = target === member.id || only !== null || mentioned.has(member.id) || nameCalled(text, member.name)
+        || (!fromAgent && this.hub.store.dmMember?.(msg.room_id) === member.id);
       if (fromAgent && !content) continue;
       if (fromAgent) content = `【${msg.name}】${quote}${content}`;
       else if (hit && !content) content = quote + BARE_MENTION;
       else content = quote + content;
       const frame = {
-        type: 'message', msg_id: `hub-${msg.id}`, chat_id: roomKey(msg.room_id), chat_type: 'group',
-        user_id: msg.author, user_name: msg.name, content: content + (hit ? (this.later?.instructions(member.id, msg.room_id) ?? '') : ''), reply_ctx: roomKey(msg.room_id),
+        type: 'message', msg_id: `hub-${msg.id}`, chat_id: roomKey(msg.room_id), chat_type: chatType(this.hub.store, msg.room_id),
+        // A bridge command (`@橘 /model x`) goes through bare: the bridge reads everything after the
+        // command word as its arguments (core/engine.go handleCommand), so no later instructions.
+        user_id: msg.author, user_name: msg.name, content: content + (hit && !isCommand(content) ? (this.later?.instructions(member.id, msg.room_id) ?? '') : ''), reply_ctx: roomKey(msg.room_id),
         mentioned: hit, from_bot: fromAgent, ...attached, ...replyTo,
       };
       if (room !== undefined) frame.chat_name = room.name.replace(/\s+/g, ' ');
@@ -340,7 +385,7 @@ export class CloudWebGateway {
     const members = this.hub.routableIn(msg.room_id);
     const room = this.hub.store.room(msg.room_id);
     const frame = {
-      type: 'message', msg_id: `hub-${msg.id}`, chat_id: roomKey(msg.room_id), chat_type: 'group',
+      type: 'message', msg_id: `hub-${msg.id}`, chat_id: roomKey(msg.room_id), chat_type: chatType(this.hub.store, msg.room_id),
       user_id: msg.author, user_name: msg.name, content: forMember(msg.text, bot.member, members) || msg.text,
       reply_ctx: roomKey(msg.room_id), mentioned: true, from_bot: false,
     };
@@ -519,6 +564,14 @@ export class CloudWebGateway {
         this.hub.post(room, { authorKind: 'role', author: member.id, name: member.name, text: '', attachments });
         return;
       }
+      case 'queue': {
+        // #1020: the owner's messages ("hub-<id>") waiting behind this bot's running turn here (bridge core/queue_report.go).
+        const room = roomOf(d, this.hub.store);
+        if (room === undefined || !Array.isArray(d.msg_ids)) return;
+        const ids = d.msg_ids.map(x => /^hub-(\d+)$/.exec(String(x))?.[1]).filter(Boolean).map(Number);
+        this.hub.setQueue(room, member.id, ids);
+        return;
+      }
       case 'typing_start':
       case 'typing_stop': {
         const room = roomOf(d, this.hub.store);
@@ -611,6 +664,9 @@ function send(ws, frame) {
   try { ws.send(JSON.stringify(frame)); } catch { /* socket already closing; its close handler cleans up */ }
 }
 
+/** A bridge slash command as forwarded (`/stop`, `/model x`); quoted replies keep their prefix and are not. */
+export function isCommand(content) { return /^\/[a-z]/i.test(content); }
+
 function clean(s) { return String(s ?? '').replace(/[\x00-\x1f\x7f]/g, '').trim(); }
 
 function timingSafeEqualString(a, b) {

package/collab/dsh-member.mjs

@@ -17,7 +17,9 @@ import { GateContext } from './gate-context.mjs';
 import { MemoryIndex } from './memory-index.mjs';
 // Shared with the bridge (bridge/core/team_mode.go): a common part, then one
 // "## <mode>" section per dispatch mode; a member sees only its room's section.
-const TEAM_MODE_FILE = readFileSync(new URL('./team-mode-rules.md', import.meta.url), 'utf8');
+// A Windows checkout (git core.autocrlf) turns the file to CRLF: "## solo\r\n" then misses the
+// `${mode}\n` match below and every member turn failed with "reading 'slice'". Read it as LF.
+const TEAM_MODE_FILE = readFileSync(new URL('./team-mode-rules.md', import.meta.url), 'utf8').replace(/\r\n?/g, '\n');
 export function teamModeRules(mode = DEFAULT_DISPATCH_MODE) {
   const [common, ...parts] = TEAM_MODE_FILE.split(/^## /m);
   const section = parts.find(p => p.startsWith(`${mode}\n`)) ?? parts.find(p => p.startsWith(`${DEFAULT_DISPATCH_MODE}\n`));
@@ -199,7 +201,7 @@ const INTERRUPTED = Symbol('interrupted');
 export function friendlyFailure(raw) {
   if (raw?.code === 'COLLAB_CLI_START') return raw.message;
   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 (/no.{0,12}(api.?key|key)|missing.{0,12}(key|credential)|api.?key.{0,12}(missing|not set|required)|未配置.*key/i.test(text)) return '还没填模型密钥，填好就能用。';
   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.
@@ -460,7 +462,7 @@ export class DshMembers {
     const running = [];
     for (const job of this.store.openJobs()) {
       if (job.trigger_id !== triggerId) continue;
-      if (job.state === 'pending') { this.store.finishJob(job.id, 'interrupted'); continue; }
+      if (job.state === 'pending') { this.store.finishJob(job.id, 'interrupted'); this.syncQueue(job.member_id, job.room_id); continue; }
       const w = this.watching.get(job.session_id);
       const agent = job.input_id ? this.rt.ctx.agents.get(job.session_id) : undefined;
       if (w?.jobId !== job.id || agent === undefined) { running.push(job.member_id); continue; }
@@ -583,14 +585,29 @@ export class DshMembers {
   /** Serialize work per (member, room): runs, recoveries, and Session resumes never overlap. */
   enqueue(job, task) {
     const key = `${job.member_id}\u0000${job.room_id}`;
-    const tail = (this.queues.get(key) ?? Promise.resolve()).then(() => (this.closed ? undefined : task())).catch((error) => {
+    const sync = () => this.syncQueue(job.member_id, job.room_id);
+    const tail = (this.queues.get(key) ?? Promise.resolve()).then(() => { sync(); return this.closed ? undefined : task(); }).catch((error) => {
       this.rt.logger.warn('collab: DSH job %d failed: %s', job.id, error?.stack ?? error);
       if (!this.closed) this.fail(job.id, error?.code === 'COLLAB_CLI_START' ? error : `出错了：${error?.message ?? error}`);
-    });
+    }).finally(sync);
     this.queues.set(key, tail);
+    sync();
     return tail;
   }
 
+  /**
+   * #1020: tell the hub which of the owner's messages wait for this member here — its open
+   * jobs after the first (the one running or about to), still pending. Withdrawing one is the
+   * existing recall (#148 a queued job is closed).
+   */
+  syncQueue(memberId, roomId) {
+    if (typeof this.hub.setQueue !== 'function') return;
+    const open = this.store.openJobs().filter(j => j.member_id === memberId && j.room_id === roomId);
+    const ids = open.slice(1).filter(j => j.state === 'pending').map(j => j.trigger_id)
+      .filter(id => this.store.message(id)?.author_kind === 'user');
+    this.hub.setQueue(roomId, memberId, ids);
+  }
+
   async run(jobId) {
     const job = this.store.job(jobId);
     if (job === undefined || job.state !== 'pending') return;
@@ -655,7 +672,9 @@ export class DshMembers {
     let entry = this.cliAgents.get(cliKey);
     if (entry === undefined) {
       // Persona goes through promptText every turn, so an edit applies without restarting the CLI.
-      entry = { memberId: member.id, cli: member.cli, agent: this.rt.createCliMember({ cli: member.cli, cwd, persona: '' }) };
+      entry = { memberId: member.id, cli: member.cli, agent: this.rt.createCliMember({ cli: member.cli, cwd, persona: '',
+        // #1020: memvote.py records citations under these (memory-sources.mjs), named as the gate key (gate-context.mjs).
+        env: { CC_PROJECT: `dsh:${member.id}`, CC_SESSION_KEY: `dsh:${member.id}:${room.id}` } }) };
       this.cliAgents.set(cliKey, entry);
     }
     this.hub.setError(member.id, undefined);

package/collab/gate-context.mjs

@@ -1,21 +1,95 @@
 // Per-turn wiki pages and task board for DSH-native members, from the local gate's
 // POST /context (bridge/contrib/gate/gate.py -> ctxsvc.context): the same source and the same
-// block the bridge puts before a bot's turn (bridge/core/gate.go turnContext). The gate's port
-// comes from GATE_PORT, which bothouse sets on the `dsh web` it starts to the port it runs the
-// gate on (core/gate_proc.go gatePort); without it, or with the gate down, a turn goes out as before.
+// block the bridge puts before a bot's turn (bridge/core/gate.go turnContext).
+//
+// The gate's port: GATE_PORT, which bothouse sets on the `dsh web` it starts to the port it runs the
+// gate on (core/gate_proc.go gatePort). A `dsh web` started another way (reload-dsh.py reusing an old
+// environment, the desktop app) has no GATE_PORT, so it is read from the same config.toml the bridge
+// itself reads: [gate] port (core/gate_proc.go LocalGatePort), default 9930 when the file has no
+// [gate] table (that is gate.py's own PORT). Without a config file either, no port: a turn goes out
+// as before, and the log says why instead of the badge and the pages vanishing without a word.
+import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { dataDirCandidates } from './memory-sources.mjs';
 
 // Same as the bridge's wait for /context (core/gate.go turnContext: 2s).
 export const GATE_CONTEXT_TIMEOUT_MS = 2_000;
+// 来源：contrib/gate/gate.py PORT = 9930，core/setup_wizard_warnings.go defaultGatePort 同值
+// （LocalGatePort 在 config [gate] port 缺省或为 0 时也用它）。
+export const DEFAULT_GATE_PORT = 9930;
+
+/** `port\0where` of the log lines already written: one line per process, not one per member. */
+const announced = new Set();
+
+/** `[gate] port` of a bridge config's text, as Go reads cfg.Gate.Port; 0 when it has no such table. */
+export function gatePortSetting(text) {
+  let inside = false;
+  for (const line of String(text).split(/\r?\n/)) {
+    const header = /^\s*\[\s*([^\]]+?)\s*\]/.exec(line);
+    if (header !== null) { inside = header[1] === 'gate'; continue; }
+    if (!inside) continue;
+    const kv = /^\s*port\s*=\s*(\d+)\s*(?:#.*)?$/.exec(line);
+    if (kv === null) continue;
+    const port = Number(kv[1]);
+    if (Number.isInteger(port) && port > 0) return port;
+  }
+  return 0;
+}
+
+/**
+ * The bridge config this process should read: $BOTHOUSE_CONFIG (the bridge's --config), else
+ * <its data dir>/config.toml, the data dir being the one the gate itself would pick
+ * (bridge/brand.go dataDir, bridge/contrib/gate/datadir.py data_dir). The process's own ./config.toml
+ * is deliberately not tried: that is the bridge's rule for the bridge's cwd, not for a plugin's.
+ * @param {NodeJS.ProcessEnv} env
+ * @param {string} home
+ * @returns {string}
+ */
+export function bridgeConfigFile(env = process.env, home = homedir()) {
+  const explicit = String(env.BOTHOUSE_CONFIG ?? '').trim();
+  if (explicit !== '' && explicit !== '~' && !explicit.startsWith('~/')) return explicit;
+  if (explicit !== '') return join(home, explicit.slice(2));
+  return join(dataDirCandidates(env, home)[0], 'config.toml');
+}
+
+/**
+ * The gate port to use, and where it came from (for the log line).
+ * @param {NodeJS.ProcessEnv} env
+ * @param {string} home
+ * @param {(file: string, encoding: string) => string} readFile
+ * @returns {{ port: string, why: string }}
+ */
+export function resolveGatePort(env = process.env, home = homedir(), readFile = readFileSync) {
+  const fromEnv = String(env.GATE_PORT ?? '').trim();
+  if (fromEnv !== '') return { port: fromEnv, why: 'GATE_PORT' };
+  const file = bridgeConfigFile(env, home);
+  let text;
+  try { text = readFile(file, 'utf8'); } catch { return { port: '', why: `没有配置文件 ${file}` }; }
+  const port = gatePortSetting(text);
+  if (port !== 0) return { port: String(port), why: `${file} [gate] port` };
+  return { port: String(DEFAULT_GATE_PORT), why: `${file} 没有 [gate] port，用默认端口` };
+}
 
 export class GateContext {
   /**
-   * @param options - { port?: gate port (default process.env.GATE_PORT), timeoutMs?, fetch?, logger? }.
+   * @param options - { port?: gate port (default: GATE_PORT, else the bridge config's [gate] port),
+   *   timeoutMs?, fetch?, logger? }.
    */
-  constructor({ port = process.env.GATE_PORT, timeoutMs = GATE_CONTEXT_TIMEOUT_MS, fetch: fetchFn = globalThis.fetch, logger } = {}) {
-    this.port = String(port ?? '').trim();
+  constructor({ port, timeoutMs = GATE_CONTEXT_TIMEOUT_MS, fetch: fetchFn = globalThis.fetch, logger } = {}) {
+    const from = port === undefined ? resolveGatePort() : { port: String(port ?? '').trim(), why: 'port 参数' };
+    this.port = String(from.port ?? '').trim();
     this.timeoutMs = timeoutMs;
     this.fetch = fetchFn;
     this.logger = logger;
+    // One line per process (a member each builds its own GateContext): which port the context goes
+    // to and from where, so a missing one is a line in the log instead of a silently missing block.
+    const line = `${this.port}\u0000${from.why}`;
+    if (!announced.has(line)) {
+      announced.add(line);
+      if (this.port !== '') this.logger?.info?.('collab: gate context: port %s（%s）', this.port, from.why);
+      else this.logger?.warn?.('collab: gate context: 没有 gate 端口（%s）；每轮不带 wiki 页和任务板', from.why);
+    }
     /** `${member}\0${room}` -> { session, epoch }: the name of that conversation's context for the gate. */
     this.sent = new Map();
   }

package/collab/hub.mjs

@@ -17,6 +17,8 @@ export class Hub {
     this.members = new Map();
     /** roomId -> Set<memberId> currently working */
     this.thinking = new Map();
+    /** #1020: room id -> member id -> ids of the owner's messages waiting behind that member's running turn. */
+    this.queued = new Map();
     /** id -> optional busy fields published by the team-status reader (#876). */
     this.presence = new Map();
     this.listeners = [];
@@ -27,6 +29,9 @@ export class Hub {
   memberList() { return [...this.members.values()]; }
 
   membersInRoom(roomId) {
+    // #1023: a private chat has the owner and its one agent, whatever that agent's channel list says.
+    const dm = this.store.dmMember?.(roomId);
+    if (dm !== undefined) return this.memberList().filter(m => m.kind === 'human' || m.id === dm);
     const channel = this.store.settingsRoom(roomId);
     return this.memberList().filter(m => !m.rooms?.length || m.rooms.includes(channel));
   }
@@ -45,6 +50,9 @@ export class Hub {
 
   /** Channel selection, inherited by workspaces; only unset channels use the legacy global choice. */
   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);
     const member = id === null ? this.selectedPrimaryMember() : this.members.get(id);
     return member && this.routableIn(roomId).some(m => m.id === member.id) ? member : undefined;
@@ -66,6 +74,7 @@ export class Hub {
     if (!this.members.delete(id)) return;
     this.presence.delete(id);
     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() });
   }
 
@@ -76,6 +85,7 @@ export class Hub {
     if (!online) {
       this.presence.delete(id);
       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() });
   }
@@ -114,6 +124,21 @@ export class Hub {
     this.emit({ type: 'thinking', room_id: roomId, members: [...set] });
   }
 
+  /** #1020: replace the queue a member has in a room (ids in queue order; [] clears it). */
+  setQueue(roomId, id, ids) {
+    const room = this.queued.get(roomId) ?? new Map();
+    const before = room.get(id) ?? [];
+    if (before.length === ids.length && before.every((x, i) => x === ids[i])) return;
+    if (ids.length) room.set(id, [...ids]); else room.delete(id);
+    if (room.size) this.queued.set(roomId, room); else this.queued.delete(roomId);
+    this.emit({ type: 'queue', room_id: roomId, queued: this.queueView(roomId) });
+  }
+
+  /** #1020: { member id: [message ids] } waiting in a room. */
+  queueView(roomId) {
+    return Object.fromEntries([...(this.queued.get(roomId) ?? new Map())]);
+  }
+
   memberView() {
     return this.memberList().map(({ id, name, kind, online, model, cli, permissionPreset, persona, nameCustomized, avatar, avatarVersion, source, error, rooms }) => ({
       id, name, kind, ...(rooms ? { rooms } : {}), online: online !== false && !error, ...(error ? { error } : {}), ...(avatar ? { avatar, ...(avatarVersion ? { avatarVersion } : {}) } : {}),
@@ -161,6 +186,7 @@ export class Hub {
       return r;
     });
     if (!result.created) return result;
+    result.message = this.withMemories(result.message);
     for (const next of after) {
       Promise.resolve().then(next).catch((error) => {
         this.logger.warn('collab: post-commit step failed: %s', error?.stack ?? error);
@@ -195,7 +221,7 @@ export class Hub {
       return c;
     });
     if (r === undefined) return undefined;
-    const row = r.message;
+    const row = r.first ? this.withMemories(r.message) : r.message;
     this.emit({ type: 'message', message: publicMessage(row, this.store) });
     if (!r.first) return row;
     for (const next of after) {
@@ -211,6 +237,21 @@ export class Hub {
     return row;
   }
 
+  /**
+   * #1020: attach to a member's reply the memory entries it cited here since its last reply
+   * (memory-sources.mjs). Command answers (from_turn 0), cards and drafts take none.
+   */
+  withMemories(row) {
+    if (!this.memorySources || row?.author_kind !== 'role' || row.card != null || row.draft || row.from_turn === 0) return row;
+    const voter = this.members.get(row.author)?.voter ?? `dsh:${row.author}`;
+    let items;
+    try { items = this.memorySources.take(voter, row.room_id); } catch (error) {
+      this.logger.warn('collab: memory sources failed: %s', error?.message ?? error);
+      return row;
+    }
+    return items.length ? (this.store.setMemories(row.id, items) ?? row) : row;
+  }
+
   /** Edit/delete a row the same author wrote, and tell browsers. */
   edit(id, authorKind, author, text, card) {
     const row = this.store.edit(id, authorKind, author, text, card);