bothouse-dsh 0.1.0 → 0.1.40

package/collab/team-exit.mjs

@@ -1,10 +1,96 @@
 // Durable workspace questions; system forwards never enter agent routing.
 import { randomBytes } from 'node:crypto';
+import { withoutLeadingMentions } from './mentions.mjs';
 
 export function exitTarget(msg) {
   return /^team-answer:([^:]+):/.exec(msg.client_key ?? '')?.[1];
 }
 
+// #574 B4: an [ask] must carry 「自验：」 (evidence) and 「类别：」 before it waits on
+// the user; only 方向、花钱、需要用户看的成品、权限确认 may write 「自验：无需」.
+// Same check in the Go bridge: bridge/core/team_ask_evidence.go askEvidenceProblems.
+const SELF_CHECK = /自验\s*[：:]/;
+const CATEGORY = /类别\s*[：:]/;
+const EXEMPT = /方向|花钱|成品|权限/;
+const NO_CHECK = /^(无需|不需要|无|免)([\s，。,.;；（(]|$)/;
+export const ASK_MISSING_SELF_CHECK = '缺「自验：」（附证据：截图或命令输出）';
+export const ASK_MISSING_CATEGORY = '缺「类别：」（方向、花钱、需要用户看的成品、权限确认之一，或写别的类别）';
+export const ASK_NO_CHECK_NOT_EXEMPT = '「自验：无需」只限方向、花钱、需要用户看的成品、权限确认四类，其它类别要附证据';
+// Consecutive bounces that still wake the asking member; later ones are only posted.
+const BOUNCE_WAKE_LIMIT = 2;
+
+/** What an [ask] body lacks; [] means it may go to the user. */
+export function askEvidenceProblems(body) {
+  const cat = CATEGORY.exec(body);
+  const category = cat ? body.slice(cat.index + cat[0].length).split('\n')[0].trim() : '';
+  const own = SELF_CHECK.exec(body);
+  let check = '';
+  if (own) {
+    let rest = body.slice(own.index + own[0].length);
+    const next = CATEGORY.exec(rest);
+    if (next) rest = rest.slice(0, next.index);
+    check = rest.trim();
+  }
+  const problems = [];
+  if (!check) problems.push(ASK_MISSING_SELF_CHECK);
+  if (!category) problems.push(ASK_MISSING_CATEGORY);
+  if (check && category && NO_CHECK.test(check) && !EXEMPT.test(category)) problems.push(ASK_NO_CHECK_NOT_EXEMPT);
+  return problems;
+}
+
+export function askBounceText(problems) {
+  return exitBounceText('ask', problems);
+}
+
+// Headline (user 2026-10-28 「做」): the first line is `[report] #<task id> <one or two sentences
+// for the user>`; that sentence is what the chat channel shows first. Same rule in the Go bridge:
+// bridge/core/team_exit_headline.go exitHeadline.
+const HEADLINE = /^#(\d+)[\s\u3000:：,，、.。]*(.*)$/;
+export const EXIT_MISSING_ID = '第一行缺任务板编号（#编号）';
+export const EXIT_MISSING_LINE = '第一行缺给用户的一两句话';
+export const EXIT_UNKNOWN_ID = '任务板上没有这个编号';
+
+/** { id, line, problems } of a marked body's first line. */
+export function exitHeadline(body) {
+  const first = String(body ?? '').split('\n')[0].trim();
+  const m = HEADLINE.exec(first);
+  if (!m) return { id: 0, line: '', problems: first === '' || first.startsWith('#') ? [EXIT_MISSING_ID, EXIT_MISSING_LINE] : [EXIT_MISSING_ID] };
+  const line = m[2].trim();
+  return { id: Number(m[1]), line, problems: line ? [] : [EXIT_MISSING_LINE] };
+}
+
+/** Why a workspace [ask]/[report] stayed in the workspace and how to resend it (Go: exitBounceText). */
+export function exitBounceText(kind, problems) {
+  let t = `这条 [${kind}] 没有转给用户：${problems.join('；')}。补上后重发：第一行写 [${kind}] #任务板编号 给用户的一两句话（系统原样贴到聊天频道），第二行起写细节`;
+  if (kind === 'ask') t += '，正文写「自验：」附证据和「类别：」；方向、花钱、需要用户看的成品、权限确认四类可写「自验：无需」';
+  return `${t}。`;
+}
+
+const FIRST_MARK = /^\[(ask|report)\][ \t]*\n?([\s\S]*\S[\s\S]*)$/i;
+const LINE_MARK = /^[ \t]*\[(ask|report)\]/i;
+
+/**
+ * The [ask] / [report] mark of a role reply: { kind, body } or undefined. Marked on the first
+ * line, as the bridge reads it (core/team_exit.go parseExitKind, first line only). lastLine (a
+ * DSH member, whose reply is one row for the whole turn: first line 【接】#id, then everything it
+ * said) also takes the line starting the turn's last part: the last line that opens with the mark.
+ * team (the routable members): @-mentions a reply or a part opens with are not part of it (#597 G37:
+ * a DSH reply comes back as 「@主 [report]…」, dsh-member.mjs returnToLead, also as a later part of
+ * the turn's row, #597 G40), as for its stance line.
+ */
+export function exitMark(text, { lastLine = false, team = [] } = {}) {
+  const t = withoutLeadingMentions(String(text ?? ''), team).trim();
+  let m = FIRST_MARK.exec(t);
+  if (m === null && lastLine) {
+    const lines = t.split('\n');
+    for (let i = lines.length - 1; i > 0 && m === null; i--) {
+      const line = withoutLeadingMentions(lines[i], team);
+      if (LINE_MARK.test(line)) m = FIRST_MARK.exec([line.trimStart(), ...lines.slice(i + 1)].join('\n'));
+    }
+  }
+  return m === null ? undefined : { kind: m[1].toLowerCase(), body: m[2] };
+}
+
 export class TeamExit {
   constructor(hub) {
     this.hub = hub;
@@ -15,9 +101,25 @@ export class TeamExit {
       id TEXT PRIMARY KEY, parent_id INTEGER NOT NULL, workspace_id INTEGER NOT NULL,
       member_id TEXT NOT NULL, forwarded_id INTEGER UNIQUE, source_id INTEGER UNIQUE,
       answer_source_id INTEGER UNIQUE, answered INTEGER NOT NULL DEFAULT 0)`);
+    this.bounces = new Map(); // `${room}:${member}` -> consecutive [ask] bounces
     hub.onMessage(msg => this.onMessage(msg));
   }
 
+  /** Post why the [ask] stayed in the workspace and wake its author to fix it. */
+  bounce(room, msg, problems, kind = 'ask') {
+    const key = `${room.id}:${msg.author}`;
+    const count = (this.bounces.get(key) ?? 0) + 1;
+    this.bounces.set(key, count);
+    const { message } = this.hub.post(room.id, {
+      authorKind: 'system', author: 'system', name: 'system', clientKey: `team-exit-bounce:${msg.id}`,
+      text: `📬 @${msg.name} ${exitBounceText(kind, problems)}`,
+    });
+    if (count > BOUNCE_WAKE_LIMIT) return;
+    for (const wake of this.hub.tasks?.wakers ?? []) {
+      try { if (wake(msg.author, message)) break; } catch (error) { this.hub.logger?.warn?.('collab: ask bounce wake failed: %s', error?.message ?? error); }
+    }
+  }
+
   answerFor(msg) {
     if (!this.enabled || msg.author_kind !== 'user' || exitTarget(msg)) return;
     const prior = this.db.prepare('SELECT * FROM team_exit_asks WHERE answer_source_id = ?').get(msg.id);
@@ -34,28 +136,104 @@ export class TeamExit {
       // Stable client key prevents duplicate delivery if acknowledgement is retried.
       const { message } = this.hub.post(answer.workspace_id, {
         authorKind: 'user', author: msg.author, name: msg.name,
-        text: `@${answer.member_id} 用户回复 ${answer.id}：\n${msg.text}`,
+        text: `@${this.hub.members?.get(answer.member_id)?.name ?? answer.member_id} 用户回复 ${answer.id}：\n${msg.text}`,
         clientKey: `team-answer:${answer.member_id}:${answer.id}`,
       });
       this.db.prepare('UPDATE team_exit_asks SET answered = 1, answer_source_id = ? WHERE id = ?').run(msg.id, answer.id);
+      // #597 G35: the watch waited on the user (Tasks.watch awaitingUser); it starts again from here.
+      this.hub.tasks?.rewatch?.(answer.workspace_id, answer.member_id);
       return message;
     }
-    if (msg.author_kind !== 'role' || msg.card != null) return;
-    const mark = /^\[(ask|report)\]\s*\n([\s\S]+)$/i.exec(msg.text.trim());
+    if (msg.author_kind !== 'role') return;
+    const mark = msg.card == null ? exitMark(msg.text, this.markOpts(msg)) : undefined;
+    const room = this.workspaceOf(msg);
+    if (!room) return;
+    const ask = mark?.kind === 'ask';
+    let headline;
+    if (mark) {
+      const problems = ask ? askEvidenceProblems(mark.body) : [];
+      headline = exitHeadline(mark.body);
+      if (!headline.problems.length) {
+        headline.task = this.hub.tasks?.task?.(headline.id);
+        if (!headline.task) headline.problems.push(`${EXIT_UNKNOWN_ID}（#${headline.id}）`);
+      }
+      // Once bounces stop waking the member, a reply still without a headline goes out as before.
+      if (headline.problems.length && !problems.length && (this.bounces.get(`${room.id}:${msg.author}`) ?? 0) >= BOUNCE_WAKE_LIMIT) headline = undefined;
+      else problems.push(...headline.problems);
+      if (problems.length) return this.bounce(room, msg, problems, mark.kind);
+    }
+    // Any reply without a bounced [ask] ends the run of bounces.
+    this.bounces.delete(`${room.id}:${msg.author}`);
     if (!mark) return;
-    const room = this.db.prepare('SELECT * FROM rooms WHERE id = ?').get(msg.room_id);
-    if (!room?.parent_id || room.parent_id === room.id) return;
-    const ask = mark[1].toLowerCase() === 'ask';
     let record;
     if (ask) {
       this.db.prepare(`INSERT OR IGNORE INTO team_exit_asks (id, parent_id, workspace_id, member_id, source_id)
         VALUES (?, ?, ?, ?, ?)`).run(`ask-${randomBytes(4).toString('hex')}`, room.parent_id, room.id, msg.author, msg.id);
       record = this.db.prepare('SELECT * FROM team_exit_asks WHERE source_id = ?').get(msg.id);
     }
-    const { message } = this.hub.post(room.parent_id, {
-      authorKind: 'system', author: 'system', name: 'system', clientKey: `team-exit:${msg.id}`,
-      text: `📬 来自 ${room.name} · ${msg.name}${ask ? ` · ${record.id}` : ' · 阶段结果'}\n${mark[2]}`,
-    });
-    if (ask) this.db.prepare('UPDATE team_exit_asks SET forwarded_id = ? WHERE id = ?').run(message.id, record.id);
+    const message = this.forward(room, msg, mark.body, record, headline);
+    if (ask) {
+      this.db.prepare('UPDATE team_exit_asks SET forwarded_id = ? WHERE id = ?').run(message.id, record.id);
+      const tasks = this.hub.tasks;
+      // #597 G35: a DSH member's [ask] keeps its task in work and watched (and its workspace, so the
+      // answer reaches the same session); a bridge bot's [ask] parks it as before (#280).
+      if (tasks && !this.markOpts(msg).lastLine) {
+        const taskId = /任务\s*#(\d+)\b/.exec(mark.body)?.[1];
+        const inRoom = tasks.q.allBusy.all('assigned', 'accepted', 'asked', 'rework')
+          .filter(t => t.room_id === room.id);
+        const marked = taskId ? tasks.task(Number(taskId)) : undefined;
+        const selected = marked?.room_id === room.id ? marked : inRoom[0];
+        if (selected?.room_id === room.id) tasks.pauseTask(selected.id);
+      }
+    }
+  }
+
+  /** A DSH member's one-row reply may carry its mark on a later line; a bridge bot's only on the first. */
+  markOpts(msg) {
+    return { lastLine: this.hub.members?.get(msg.author)?.kind === 'dsh', team: this.hub.routable?.() ?? [] };
+  }
+
+  /** The workspace room msg was posted in (with a chat channel above it), or undefined. */
+  workspaceOf(msg) {
+    if (!this.enabled) return undefined;
+    const room = this.db.prepare('SELECT * FROM rooms WHERE id = ?').get(msg.room_id);
+    return room?.parent_id && room.parent_id !== room.id ? room : undefined;
+  }
+
+  /**
+   * Copy a workspace reply into its chat channel (once per source row: a repeated client key
+   * returns the copy already posted). ask: its team_exit_asks record; otherwise a 阶段结果.
+   */
+  forward(room, msg, body, ask, headline) {
+    let text = `📬 来自 ${room.name} · ${msg.name}${ask ? ` · ${ask.id}` : ' · 阶段结果'}\n${body}`;
+    if (headline) {
+      // The headline as written, named by its task; the details follow (the DSH lead reads them here).
+      const name = headline.task?.title ?? '';
+      const rest = String(body).split('\n').slice(1).join('\n').trim();
+      text = `📬 #${headline.id}「${name}」${ask ? `要你定：${headline.line}（直接回复这条就能答复，编号 ${ask.id}）` : `：${headline.line}`}`
+        + (rest ? `\n\n来自 ${room.name} · ${msg.name} 的细节：\n${rest}` : '');
+    }
+    return this.hub.post(room.parent_id, {
+      authorKind: 'system', author: 'system', name: 'system', clientKey: `team-exit:${msg.id}`, text,
+    }).message;
+  }
+
+  /**
+   * The delivery msg of a workspace task, copied into the chat channel (Tasks.handBack): its
+   * [report] body, already forwarded by onMessage, or else the reply without its stance line, so
+   * the chat channel always gets the result and not only the 交回 record. undefined outside a
+   * workspace and for an [ask] (a question, not a result).
+   */
+  forwardResult(msg) {
+    const room = this.workspaceOf(msg);
+    if (!room || msg.author_kind !== 'role' || msg.card != null) return undefined;
+    const mark = exitMark(msg.text, this.markOpts(msg));
+    if (mark?.kind === 'ask') return undefined;
+    const lines = String(msg.text).trim().split('\n');
+    if (/^\s*(?:@\S+\s+)*【(接|问|退|升)】/.test(lines[0])) lines.shift();
+    const body = mark?.body ?? (lines.join('\n').trim() || String(msg.text).trim());
+    const headline = mark ? exitHeadline(mark.body) : undefined;
+    if (headline && !headline.problems.length) headline.task = this.hub.tasks?.task?.(headline.id);
+    return this.forward(room, msg, body, undefined, headline?.task ? headline : undefined);
   }
 }

package/collab/verify-multichannel.mjs

@@ -0,0 +1,42 @@
+#!/usr/bin/env node
+// Developer checks, not independent acceptance or a live desktop/QQ test.
+import { mkdtempSync, readdirSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join, dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { spawnSync } from 'node:child_process';
+
+const collab = dirname(fileURLToPath(import.meta.url));
+const data = mkdtempSync(join(tmpdir(), 'bothouse-multichannel-'));
+const env = { ...process.env, CONEST_COLLAB_DATA: data };
+console.log(`Isolated CONEST_COLLAB_DATA: ${data}`);
+const cases = [
+  ['Legacy configuration', 'Automated coverage: default directory and global member scope'],
+  ['Upgrade visibility', 'Automated coverage: global legacy scope and restart idempotence'],
+  ['Channel routing and same-name bots', 'Automated coverage: channel routing and channel bots tests'],
+  ['New channel retains global members', 'Automated coverage: legacy and explicitly global members remain visible'],
+  ['Separate directories and workspace reuse', 'Automated coverage: native/CLI directory selection; real model file writes not exercised'],
+  ['Rename/model edit retains room scope', 'Automated coverage: rename and reload retain scope; model edit needs a dedicated check'],
+  ['Application shutdown', 'Automated coverage: late cleanup; real desktop shutdown not exercised'],
+  ['Never-spoken legacy member survives upgrade', 'Automated coverage: global migration regression'],
+  ['Post-upgrade new channel routes to primary', 'Automated coverage: plain message dispatch to the legacy primary'],
+];
+for (const [i, [name, status]] of cases.entries()) console.log(`${i + 1}. ${name}: ${status}`);
+const serverTests = readdirSync(collab, { withFileTypes: true })
+  .filter(entry => entry.isFile() && entry.name.endsWith('.test.mjs'))
+  .map(entry => entry.name).sort();
+if (!serverTests.length) throw new Error(`No collab test files found in ${collab}`);
+console.log(`Server suite: ${serverTests.length} test files (${serverTests.join(', ')})`);
+const commands = [
+  [process.execPath, ['--test', ...serverTests], collab],
+  ['pnpm', ['test'], resolve(collab, '..')],
+];
+for (const [command, args, cwd] of commands) {
+  console.log(`\nRunning ${command} ${args.join(' ')}`);
+  const result = spawnSync(command, args, { cwd, env, stdio: 'inherit' });
+  if (result.error) { console.error(result.error.message); process.exit(1); }
+  if (result.status !== 0) process.exit(result.status ?? 1);
+}
+console.log('\nAutomated suites passed. Acceptance remains incomplete: pending live checks and independent review above.');
+console.log('Temporary data is retained for inspection; this script does not delete directories.');
+process.exitCode = 2; // Distinguish partial verification from completed acceptance.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bothouse-dsh",
-  "version": "0.1.0",
+  "version": "0.1.40",
   "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",
@@ -9,8 +9,18 @@
     "./client": "./client/client.js",
     "./package.json": "./package.json"
   },
-  "keywords": ["dsh", "deepseek", "harness", "plugin", "bothouse"],
-  "repository": { "type": "git", "url": "https://github.com/zuiho-kai/bothouse", "directory": "dsh/plugin-pkg" },
+  "keywords": [
+    "dsh",
+    "deepseek",
+    "harness",
+    "plugin",
+    "bothouse"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zuiho-kai/bothouse",
+    "directory": "dsh/plugin-pkg"
+  },
   "license": "Apache-2.0",
   "files": [
     "collab/*.mjs",