bothouse-dsh 0.1.47 → 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).
 /**
@@ -52,12 +52,20 @@ export const NOTICE_PREFIXES = ['📬', '✅', '↪', '⏳', '🔄', '⏹', '⏸
 const FOOTER = /(?:^|\n+)\*[^*\n]*·[^*]*\*\s*$/s;
 const BARE_MENTION = '（只 @ 了你，没写内容：看上面的频道消息判断要你做什么；看不出来就问）';
 export const PROGRESS_PREFIX = '__cc_connect_progress_card_v1__:';
-const CARD_STATES = { running: '处理中', completed: '已完成', failed: '失败' };
+// cancelled (#913): a card whose turn was cut without an outcome — a restarted bridge, a
+// cancelled DSH job. page.html styles it like any other card state.
+const CARD_STATES = { running: '处理中', completed: '已完成', failed: '失败', cancelled: '已取消' };
 const RESERVED_IDS = new Set(['user', 'system']);
 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;
@@ -96,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;
@@ -116,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} · 成功`;
@@ -137,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 {};
@@ -231,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);
@@ -245,9 +280,48 @@ export class CloudWebGateway {
     this.hub.dropDrafts('role', id);
     // ...and its pending permission requests are gone with the old process.
     this.approvals.expireWhere(p => p.meta?.gateway === this && p.meta.bot === id);
+    // ...and the progress cards it already posted would stay 「处理中」 forever: the old
+    // process held the only handle, and the turn it resumes posts a second card (#913).
+    this.closeStaleCards(id);
     return bot;
   }
 
+  /**
+   * #913: close the progress cards a bot left running. A restarted cc-connect keeps no
+   * message ids, so nothing will ever edit those rows again, while its resumed turn posts
+   * a fresh card; the room then shows two 「处理中」 and no way to tell which is alive.
+   * They are closed as 已取消 (page.html already styles that state) and keep their steps,
+   * plus a line saying the turn was cut, so the history stays readable.
+   *
+   * Every card row this member posted is looked at, not the last page of one room: the
+   * room may have carried a hundred messages since (a busy channel, a workshop), and a
+   * running card there must still be closed. Only this member's own rows are touched,
+   * and only rows still `running`: a card the resumed turn reopens by its own handle goes
+   * back to 处理中 on the next frame.
+   */
+  closeStaleCards(memberId) {
+    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;
+      // The stored title is already rendered ("CC · 处理中"): swap only its state label,
+      // 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');
+      // 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 }));
+    }
+  }
+
   /** Forward one new channel message to every connected bot except its author. */
   onNew(msg) {
     if (msg.author_kind === 'system' || msg.card !== null || this.bots.size === 0 || this.hub.teamExit?.answerFor(msg)) return;
@@ -280,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, ' ');
@@ -307,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,
     };
@@ -486,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);
@@ -578,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) {