bothouse-dsh 0.1.57 → 0.1.59

package/README.en.md

@@ -7,14 +7,14 @@ BotHouse channels inside DeepSeek Harness (DSH): a Discord-style channels page w
 ## Install (pick one)
 
 1. **Easiest**: tell DSH "install the plugin bothouse-dsh".
-2. **From the UI**: DSH sidebar "Plugins" → "Add plugin", enter `bothouse-dsh`.
+2. **From the UI**: DSH sidebar "Plugins" → "Add plugin", enter `bothouse-dsh`, click "Install"; then switch bothouse on under "Installed plugins" — "Channels" appears in the sidebar right away, no restart.
 3. **From a terminal**:
 
 ~~~sh
 dsh plugin --profile web add bothouse-dsh
 ~~~
 
-Restart DSH once and click "Channels" in the sidebar. Team desk, bothouse panel and other computers start off; switch the one you want on under "Plugins → bothouse" and it appears in the sidebar right away. #general already has Whale Girl, running on the model you configured in DSH; nothing else to fill in. @ her to get a reply; tell her "hand this to a workspace: …" and she opens a workspace, does the work and reports back. For more characters or models, use "Add member".
+Asked through DSH, "Channels" appears right after the install; installed from the command line while DSH is running, restart DSH once. Then click "Channels" in the sidebar. Team desk, bothouse panel and other computers start off; switch the one you want on under "Plugins → bothouse" and it appears in the sidebar right away. #general already has Whale Girl, running on the model you configured in DSH; nothing else to fill in. @ her to get a reply; tell her "hand this to a workspace: …" and she opens a workspace, does the work and reports back. For more characters or models, use "Add member".
 
 If the terminal install says `pnpm was not found`, run `npm i -g pnpm` first.
 
@@ -23,6 +23,7 @@ If the terminal install says `pnpm was not found`, run `npm i -g pnpm` first.
 - DSH 0.2.x (from `0.2.1-rc.2`, see `dsh --version`) and Node.js 22.12 or later. Tested on 0.2.1-rc.2 only; no compatibility promise for the DSH plugin API was found and the page is prebuilt against the DSH 0.2 client packages, so the range stops before 0.3.
 - Model members: configure the model and its key in DSH settings first.
 - CLI members: install and sign in to Claude Code, Codex or the Gemini CLI, with the command on PATH.
+  The Claude Code and Codex adapters are not installed with the plugin; they download the first time you add such a member (Claude Code about 125 MB).
 - Channel messages are stored in `~/.conest-collab/collab.sqlite3`; set `CONEST_COLLAB_DATA` before starting DSH to use another directory.
 
 ## Compared with full BotHouse

package/README.md

@@ -7,14 +7,14 @@
 ## 安装（三选一）
 
 1. **最省事**：在 DSH 里对它说「帮我装插件 bothouse-dsh」。
-2. **点界面**：DSH 侧栏「插件」→「添加插件」，填 `bothouse-dsh`。
+2. **点界面**：DSH 侧栏「插件」→「添加插件」，填 `bothouse-dsh`，点「安装」；装完在「已安装插件」里把 bothouse 的开关打开，左侧马上出现「频道」，不用重启。
 3. **命令行**：
 
 ~~~sh
 dsh plugin --profile web add bothouse-dsh
 ~~~
 
-装完重启一次 DSH，点左侧「频道」。团队工作台、bothouse 面板、其他电脑默认不在左侧，要用就到「插件 → bothouse」里打开对应那一项，左侧马上出现。#general 里已经有鲸鱼娘，用的是你在 DSH 里配好的那个模型，不用再填任何东西。@鲸鱼娘 就回话；对她说「交给工作区做：……」，她会开工作区干完再交回。想要多角色、多模型，再点「添加成员」。
+对 DSH 说的装法装完左侧直接出现「频道」；命令行装时 DSH 若正开着，重启一次。然后点左侧「频道」。团队工作台、bothouse 面板、其他电脑默认不在左侧，要用就到「插件 → bothouse」里打开对应那一项，左侧马上出现。#general 里已经有鲸鱼娘，用的是你在 DSH 里配好的那个模型，不用再填任何东西。@鲸鱼娘 就回话；对她说「交给工作区做：……」，她会开工作区干完再交回。想要多角色、多模型，再点「添加成员」。
 
 命令行装时提示 `pnpm was not found`：先 `npm i -g pnpm` 再装。
 
@@ -23,6 +23,7 @@ dsh plugin --profile web add bothouse-dsh
 - DSH 0.2.x（`0.2.1-rc.2` 起，`dsh --version`）和 Node.js 22.12 以上。只在 0.2.1-rc.2 上实测过；DSH 插件接口有没有兼容承诺没查到，页面又是按 DSH 0.2 的前端包预编译的，所以先只放到 0.2.x，0.3 出来要重新验。
 - 用模型当成员：在 DSH 设置里先配好模型和 Key。
 - 用 CLI 当成员：本机装好并登录 Claude Code、Codex 或 Gemini CLI，命令在 PATH 里。
+  Claude Code、Codex 的接入适配器不随插件安装，第一次把它们加成成员时自动下载（Claude Code 约 125 MB），之后不再下。
 - 频道消息存在 `~/.conest-collab/collab.sqlite3`；启动 DSH 前设置 `CONEST_COLLAB_DATA` 可换目录。
 
 ## 和完整版 BotHouse 的区别

package/collab/attachments.mjs

@@ -4,8 +4,10 @@
 // cloud_web wire format they already understand (bridge/platform/cloud-web/protocol.go
 // wireImage / wireFile: base64 data + mime_type + file_name).
 import { randomUUID } from 'node:crypto';
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { createWriteStream, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
+import { Transform } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import { CollabError, messageAttachments } from './store.mjs';
 
 const ID = /^[0-9a-f-]{36}$/;
@@ -18,6 +20,25 @@ export const INLINE_IMAGE = /^image\/(png|jpeg|gif|webp)$/;
 // over 5 MB (docs "Vision" / image size limits).
 export const MAX_IMAGE_BYTES = 5 * 1024 * 1024;
 
+// #197: cap of one streamed upload when the overlay sets no maxUploadBytes. The
+// old 8 MiB came from #228 aligning the message POST with the bot socket, which
+// capped a file at ~6 MB once base64 was added. The default follows the owner's
+// 「需要大一些 尽可能大」 (2026-11-05 21:01) at the largest size measured on this
+// machine; the measurements are in the PR and in attachments.test.mjs.
+export const DEFAULT_MAX_UPLOAD_BYTES = 1024 * 1024 * 1024;
+
+// cc-connect accepts attachments up to 50 MiB by default (DefaultMaxAttachmentSize in
+// bridge/core/api.go) and a bot frame carries them base64-encoded (x4/3) plus JSON
+// fields; plugin.mjs derives BOT_WS_MAX_PAYLOAD from this. A bigger file is not sent
+// over the socket at all: the bot gets its local path in the prompt instead (#197).
+export const MAX_BOT_ATTACHMENT_BYTES = 50 * 1024 * 1024;
+
+/** Bytes as the UI writes them (MiB/GiB), for limits in messages. */
+export function formatBytes(bytes) {
+  if (bytes >= 1024 ** 3) return `${+(bytes / 1024 ** 3).toFixed(2)} GB`;
+  return `${+(bytes / 1024 ** 2).toFixed(bytes >= 100 * 1024 ** 2 ? 0 : 1)} MB`;
+}
+
 export class Attachments {
   constructor(dir) { this.dir = dir; }
 
@@ -43,11 +64,95 @@ export class Attachments {
     try { return readFileSync(join(this.dir, id)); } catch { return undefined; }
   }
 
+  /** #197: absolute path of a stored attachment (the bot reads it when it is too big for a frame). */
+  path(id) {
+    return ID.test(String(id)) ? join(this.dir, id) : undefined;
+  }
+
+  /**
+   * #197: accept the metadata a streamed upload returned, for a message POST that no
+   * longer carries the bytes. The size is read from disk, never from the request.
+   */
+  adopt(list) {
+    return list.map((item) => {
+      const id = String(item?.id ?? '');
+      if (!ID.test(id)) throw new CollabError('invalid', 'attachment id is invalid');
+      let stats;
+      try { stats = statSync(this.path(id)); } catch { throw new CollabError('invalid', 'attachment is missing'); }
+      if (!stats?.isFile() || stats.size === 0) throw new CollabError('invalid', 'attachment is empty');
+      const name = String(item?.name ?? '').replace(/[\\/]/g, '_').slice(0, 200) || id;
+      return { id, name, mime: String(item?.mime ?? '') || 'application/octet-stream', size: stats.size };
+    });
+  }
+
+  /** #197: a message POST either carries base64 payloads (old clients, bots) or streamed ids. */
+  receive(list) {
+    if (list == null) return [];
+    if (!Array.isArray(list)) throw new CollabError('invalid', 'attachments must be a list');
+    if (list.length === 0) return [];
+    const streamed = list.filter(item => item?.id !== undefined).length;
+    if (streamed === 0) return this.save(list);
+    if (streamed !== list.length) throw new CollabError('invalid', 'attachments must be all streamed uploads or all inline');
+    return this.adopt(list);
+  }
+
+  /**
+   * #197: receive one upload straight from the request body onto disk. Bytes are
+   * never held whole in memory (the old path base64'd them into the message JSON),
+   * they stream through a byte counter into a temp file beside the final one and
+   * are renamed into place only when the whole body arrived. A body over
+   * `maxBytes`, a broken connection or an empty upload leaves no file behind.
+   * Returns the metadata to store on the message; throws CollabError.
+   */
+  async saveStream(body, { name, mime, maxBytes }) {
+    if (!Number.isSafeInteger(maxBytes) || maxBytes <= 0) throw new CollabError('invalid', 'attachment size limit is not configured');
+    mkdirSync(this.dir, { recursive: true });
+    const id = randomUUID();
+    const temporary = join(this.dir, `${id}.part`);
+    let size = 0;
+    let over = false;
+    const counter = new Transform({
+      transform(chunk, _encoding, done) {
+        size += chunk.length;
+        // Past the cap the rest of the body is still read and dropped, so the browser
+        // gets the 413 instead of a reset connection (same trade as readBody in plugin.mjs).
+        if (size > maxBytes) { over = true; return done(); }
+        done(null, chunk);
+      },
+    });
+    try {
+      await pipeline(body, counter, createWriteStream(temporary, { mode: 0o600, flags: 'wx' }));
+      if (over) throw new CollabError('too-large', `附件不能超过 ${formatBytes(maxBytes)}`);
+      if (size === 0) throw new CollabError('invalid', 'attachment is empty');
+      renameSync(temporary, join(this.dir, id));
+    } catch (error) {
+      try { unlinkSync(temporary); } catch (cleanup) { if (cleanup.code !== 'ENOENT') throw cleanup; }
+      if (error instanceof CollabError) throw error;
+      throw new CollabError('invalid', '上传中断了，文件没有存下');
+    }
+    // The name travels in the query string (a header cannot carry 中文); keep only
+    // the last path segment so a generated name never reaches outside the dir.
+    const clean = String(name ?? '').replace(/[\\/]/g, '_').slice(0, 200) || id;
+    return { id, name: clean, mime: String(mime ?? '') || 'application/octet-stream', size };
+  }
+
+  /**
+   * #197: attachments of a message that are too big to travel over a bot
+   * connection (cloud_web frame or ACP block). The bot gets their local path in
+   * the prompt text instead of the bytes (oversizedNote).
+   */
+  oversized(metas) {
+    return (metas ?? []).filter(a => (a.size ?? 0) > MAX_BOT_ATTACHMENT_BYTES)
+      .map(a => ({ ...a, path: this.path(a.id) }));
+  }
+
   /** cloud_web inbound frame fields (images / files) for a message's attachments. */
   wire(metas) {
     const images = [];
     const files = [];
     for (const a of metas ?? []) {
+      // #197: a file over the frame cap is not encoded at all; the bot is told its path.
+      if ((a.size ?? 0) > MAX_BOT_ATTACHMENT_BYTES) continue;
       const bytes = this.read(a.id);
       if (bytes === undefined) continue;
       const item = { mime_type: a.mime, data: bytes.toString('base64'), file_name: a.name };
@@ -60,6 +165,15 @@ export class Attachments {
   }
 }
 
+/**
+ * #197: one line per attachment that was not sent over the connection, with the
+ * path on this machine, so a bot can read or move the file itself.
+ */
+export function oversizedNote(oversized) {
+  return (oversized ?? []).map(a =>
+    `📎 ${a.name}（${formatBytes(a.size)}）太大，没有随消息发送；本机文件：${a.path ?? '（文件已不在）'}`).join('\n');
+}
+
 /** Shared wire admission, projected into the ACP prompt format, each block with its file name. */
 export function namedAttachmentBlocks(files, messages) {
   const wire = files?.wire(messages.flatMap(messageAttachments)) ?? {};

package/collab/cli-member.mjs

@@ -1,7 +1,7 @@
 // CLI 成员：把本机 claude / codex / gemini 通过 ACP 适配器接成群成员。
 // 每个（成员, 房间）一个 ACP session；ask(text) 返回该轮 agent_message_chunk 拼接文本。
-import { spawn } from 'node:child_process'
-import { existsSync } from 'node:fs'
+import { spawn, spawnSync } from 'node:child_process'
+import { existsSync, readFileSync } from 'node:fs'
 import { Readable, Writable } from 'node:stream'
 import { createRequire } from 'node:module'
 import path from 'node:path'
@@ -46,6 +46,58 @@ function resolveBin(pkg) {
   return { cmd: 'npx', args: ['-y', pkg] }
 }
 
+/** PATH 目录（Windows 的键名可能是 Path）；去掉引号。 */
+function pathDirs(env) {
+  return String(env.PATH || env.Path || '').split(path.delimiter).map(d => d.replace(/^"|"$/g, '')).filter(Boolean)
+}
+
+/** 按 PATH + PATHEXT 找可执行文件，返回绝对路径。 */
+function findOnPath(name, env) {
+  if (path.isAbsolute(name)) return existsSync(name) ? name : undefined
+  const exts = String(env.PATHEXT || '.COM;.EXE;.BAT;.CMD').split(';').filter(Boolean)
+  for (const dir of pathDirs(env)) {
+    for (const ext of exts) {
+      const candidate = path.join(dir, `${name}${ext}`)
+      if (existsSync(candidate)) return candidate
+    }
+  }
+  return undefined
+}
+
+/**
+ * Windows：`gemini` / `npx` 是 npm 写的 .cmd 外壳，外壳里再起 `node <脚本>`。经外壳启动时
+ * spawn 出来的是 cmd.exe，close() 只杀外壳，真正的 CLI 和它起的进程全成孤儿（PR #1254 Windows 实测）。
+ * 这里把外壳解析成它要跑的 node 脚本，直接 spawn：拿到的 pid 就是 CLI 自己。
+ * 解析不出来（不是 node 脚本、脚本不存在）返回 null，调用方照旧经外壳启动，关闭时按进程树杀。
+ */
+export function resolveShim(cmd, env = process.env) {
+  const file = findOnPath(cmd, env)
+  if (!file) return null
+  const lower = file.toLowerCase()
+  if (lower.endsWith('.exe') || lower.endsWith('.com')) return { cmd: file, args: [], shell: false }
+  if (!lower.endsWith('.cmd') && !lower.endsWith('.bat')) return null
+  let body
+  try { body = readFileSync(file, 'utf8') } catch { return null }
+  // npm / pnpm 的 shim 结尾：「%_prog%」  「%dp0%\<脚本>」 %*（pnpm 用 %~dp0%）。
+  const m = body.match(/"%(?:~)?dp0%\\?([^"%]+?)"\s*%\*/i)
+  if (!m || !/\bnode(?:\.exe)?\b/i.test(body)) return null
+  const script = path.resolve(path.dirname(file), m[1])
+  if (!existsSync(script) || !/\.(?:m?js|cjs)$/i.test(script)) return null
+  return { cmd: process.execPath, args: [script], shell: false }
+}
+
+/**
+ * 关掉一个 CLI 进程。Windows 上按进程树杀：可能还隔着 cmd.exe 外壳或 npx，只杀 pid 会把真 CLI
+ * 和它起的孙进程留下（PR #1254 Windows 实测）。非 Windows 保持原来的 proc.kill()。
+ */
+export function stopProcess(proc) {
+  if (!proc || proc.exitCode !== null || proc.signalCode !== null) return
+  if (process.platform === 'win32' && proc.pid !== undefined) {
+    try { spawnSync('taskkill', ['/T', '/F', '/PID', String(proc.pid)], { stdio: 'ignore' }) } catch {}
+  }
+  proc.kill()
+}
+
 // 去掉外层 Claude Code 会话的标记（CLAUDECODE、CLAUDE_CODE_ENTRYPOINT…），成员的 claude 才不会当成嵌套会话；
 // 登录用的 CLAUDE_CODE_OAUTH_TOKEN 留着（ANTHROPIC_API_KEY 本来就不在过滤范围），只靠环境变量登录的用户才登得上。
 const KEEP_ENV = new Set(['CLAUDE_CODE_OAUTH_TOKEN'])
@@ -106,13 +158,19 @@ export class CliMember {
     if (this.ready) return this.ready
     const a = ADAPTERS[this.cli]
     const { cmd, args } = a.pkg ? resolveBin(a.pkg) : { cmd: a.cmd, args: [] }
-    const proc = spawn(cmd, [...args, ...a.args], {
+    // 已直接指到 node + 脚本（claude/codex 的包）就不必再解析；其余在 Windows 上先试着把 .cmd 外壳
+    // 拆成 node + 脚本，拆不动才退回经外壳启动。
+    const direct = cmd === process.execPath
+    const shim = !direct && process.platform === 'win32' ? resolveShim(cmd, { ...cleanEnv(), ...this.extraEnv }) : null
+    // shim 只替换命令入口；保留原命令参数（npx 的 -y + 包名），再由 spawn 追加适配器参数。
+    const launch = shim ? { ...shim, args: [...shim.args, ...args] } : { cmd, args, shell: !direct && process.platform === 'win32' }
+    const proc = spawn(launch.cmd, [...launch.args, ...a.args], {
       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,
+      // Windows 上拆不掉外壳时才用 shell：`gemini` / `npx` 是 .cmd，不经外壳 spawn 会 ENOENT
+      //（.cmd 路径还会 EINVAL）。参数都是固定名字和开关，没有空格。
+      shell: launch.shell,
     })
     this.proc = proc
     const client = this._client()
@@ -139,12 +197,12 @@ export class CliMember {
     })
     exited.catch(() => {})
     this.exited = exited
-    // Windows starts the CLI through a shell, which runs even when the CLI or the folder is missing: the ACP
-    // stream then closes before the process reports exit/error, and the member showed "ACP connection closed"
-    // instead of the install advice (or COLLAB_CLI_START). On a failed handshake, report how the process ended.
+    // Windows 上退回经外壳启动时，外壳即使找不到 CLI 或目录也会跑起来：ACP 流在进程报 exit/error 之前
+    // 就断了，成员只会显示 "ACP connection closed"，而不是安装提示（或 COLLAB_CLI_START）。握手失败时
+    // 按进程结束方式报错。
     const init = this.conn.initialize({ protocolVersion: acp.PROTOCOL_VERSION, clientCapabilities: {} })
       .catch(error => {
-        if (proc.exitCode === null && proc.signalCode === null && proc.pid !== undefined) proc.kill()
+        stopProcess(proc)
         return exited.then(() => { throw error })
       })
     this.ready = Promise.race([
@@ -283,7 +341,7 @@ export class CliMember {
   }
 
   close() {
-    this.proc?.kill()
+    stopProcess(this.proc)
     this.sessions.clear()
     this.saved.clear()
     this.ready = null

package/collab/cloudweb.mjs

@@ -7,6 +7,7 @@ import { exitTarget } from './team-exit.mjs';
 import { forDisplay, forMember, mentions, nameCalled } from './mentions.mjs';
 import { checkAvatar } from './avatars.mjs';
 import { CollabError, MAX_TEXT, messageAttachments, publicMessage, quotePrefix } from './store.mjs';
+import { oversizedNote } from './attachments.mjs';
 import { ChannelApprovals, parseCard, textDecision } from './approvals.mjs';
 
 export { textDecision };
@@ -344,6 +345,8 @@ export class CloudWebGateway {
     const only = this.hub.replyRoute(msg);
     const metas = messageAttachments(msg);
     const attached = metas.length && this.files ? this.files.wire(metas) : {};
+    // #197: a file too big for the frame travels as its path on this machine instead.
+    const tooBig = metas.length && this.files ? oversizedNote(this.files.oversized(metas)) : '';
     const quoted = this.hub.store.quote(msg);
     const quote = quotePrefix(quoted);
     // The replied-to row's id (same id space as a task card's preview_handle and a reply_ack),
@@ -367,7 +370,7 @@ export class CloudWebGateway {
         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),
+        user_id: msg.author, user_name: msg.name, content: content + (tooBig ? `\n${tooBig}` : '') + (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, ' ');

package/collab/devices.html

@@ -55,6 +55,8 @@
   #viewer header { display: flex; align-items: center; gap: 8px; padding: 8px 12px; border-bottom: 1px solid var(--line); background: var(--card); flex-wrap: wrap; }
   #viewer header .tabs button.on { background: var(--accent); border-color: var(--accent); color: #fff; }
   #viewer iframe { flex: 1; border: 0; width: 100%; background: var(--bg); }
+  #viewer iframe[hidden], #viewer .react-note[hidden] { display: none; }
+  #viewer .react-note { flex: 1; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 12px; padding: 16px; text-align: center; color: var(--muted, inherit); }
 </style>
 </head>
 <body>
@@ -86,7 +88,7 @@
         <input class="digits" id="digits" inputmode="numeric" autocomplete="one-time-code" maxlength="7" placeholder="输入那台电脑上的数字">
         <label class="mode"><input type="radio" name="mode" value="temp" checked><span><b>临时</b><br><span class="muted">断开后下次要重新输数字。</span></span></label>
         <div class="dur" id="dur">
-          <label><input type="radio" name="dur" value="until" checked>直到我断开<span class="muted">（任一台点「断开」，或关掉 DSH 窗口；刷新页面不会断）</span></label>
+          <label><input type="radio" name="dur" value="until" checked>直到我断开<span class="muted">（任一台点「断开」，或关掉 DSH 窗口；刷新页面、切到别的面板不会断）</span></label>
           <label><input type="radio" name="dur" value="custom">自定义时长：<input type="number" id="durNum" min="1" step="1" value="1" inputmode="numeric"><select id="durUnit"><option value="60000">分钟</option><option value="3600000" selected>小时</option></select><span class="muted">到时自动断</span></label>
         </div>
         <label class="mode"><input type="radio" name="mode" value="remember"><span><b>记住这台电脑</b><br><span class="muted">以后打开就能直接连，不用再输。那台电脑随时可以在「已连接的设备」里踢掉。</span></span></label>
@@ -109,6 +111,10 @@
     </span>
   </header>
   <iframe id="frame" title="另一台电脑"></iframe>
+  <div id="reactNote" class="react-note" hidden>
+    <p>这台电脑的频道已在 DSH 的频道界面里打开（顶上写着电脑名，能 @ 人、点头像、悬停回复）。</p>
+    <button id="reopen" class="primary">再打开频道</button>
+  </div>
 </div>
 <script>
 'use strict';
@@ -254,13 +260,63 @@ $('refresh').onclick = loadPeers;
 // Only the custom-length box belongs to 临时.
 for (const r of document.querySelectorAll('input[name=mode]')) r.addEventListener('change', () => { $('dur').hidden = document.querySelector('input[name=mode]:checked').value !== 'temp'; });
 $('durNum').addEventListener('focus', () => { document.querySelector('input[name=dur][value=custom]').checked = true; });
-// 「直到我断开」: this page beats while it is open (the DSH shell beats too, so switching panels
-// keeps the link); a refresh comes back within the grace, closing the window lets it lapse.
+// 「直到我断开」: only these links lapse when no DSH window beats (pairing.mjs sweep), so only
+// these need a beat. Nothing paired, or only 「记住」 links (those never lapse), stays silent.
+// Switch to another panel and this page is gone, so the answer is published for the DSH window.
+// Every beat rechecks the server list, so a revoked link clears the published answer promptly.
 // 来源：与 pairing.mjs ALIVE_EVERY_MS 同一节拍。
 const ALIVE_EVERY_MS = 3000;
-const beat = () => fetch('api/remote/alive', { method: 'POST', credentials: 'same-origin' }).catch(() => {});
-beat();
-setInterval(beat, ALIVE_EVERY_MS);
+const UNTIL_KEY = 'bothouse-dsh-devices: until-disconnect';
+const UNTIL_LEASE = 'bothouse-dsh-devices: heartbeat';
+const UNTIL_HOLDER = UNTIL_LEASE + ': holder';
+const UNTIL_OWNER = String(Date.now()) + '-' + Math.random();
+let holding = false;
+const untilDisconnect = () => links.some(l => l.mode === 'temp' && l.expires_at === null);
+const publish = () => {
+  try { localStorage.setItem(UNTIL_KEY, untilDisconnect() ? '1' : '0'); } catch (error) { /* no storage: this page still beats while it is open */ }
+};
+const pulse = async () => {
+    const result = await api('api/remote/links');
+    links = result.links;
+    publish();
+    if (!untilDisconnect()) return;
+    await fetch('api/remote/alive', { method: 'POST', credentials: 'same-origin' });
+};
+let tickNow = () => {};
+let holderTimer;
+if (navigator.locks?.request) {
+  const control = new AbortController();
+  globalThis.addEventListener?.('pagehide', () => { control.abort(); clearInterval(holderTimer); }, { once: true });
+  const acquire = () => { if (localStorage.getItem(UNTIL_KEY) !== '1') return Promise.resolve(); return navigator.locks.request(UNTIL_LEASE, { mode: 'exclusive', ifAvailable: true }, lock => {
+    if (!lock) return;
+    holderTimer = setInterval(pulse, ALIVE_EVERY_MS);
+    pulse();
+    return new Promise(resolve => control.signal.addEventListener('abort', resolve, { once: true }));
+  }).catch(() => {}); };
+  setInterval(acquire, ALIVE_EVERY_MS);
+  tickNow = acquire;
+} else {
+  const run = async () => {
+    if (localStorage.getItem(UNTIL_KEY) !== '1') return;
+  const now = Date.now();
+  let held;
+  try { held = JSON.parse(localStorage.getItem(UNTIL_HOLDER) || 'null'); } catch (error) {}
+  if (held && held.owner !== UNTIL_OWNER && held.expires > now) return;
+  // 来源: two ALIVE_EVERY_MS ticks, so a closed tab's fallback lease is reclaimed promptly.
+  localStorage.setItem(UNTIL_HOLDER, JSON.stringify({ owner: UNTIL_OWNER, expires: now + ALIVE_EVERY_MS * 2 }));
+  holding = JSON.parse(localStorage.getItem(UNTIL_HOLDER) || 'null')?.owner === UNTIL_OWNER;
+  if (!holding) return;
+  if (holderTimer === undefined) holderTimer = setInterval(pulse, ALIVE_EVERY_MS);
+  await pulse();
+  if (JSON.parse(localStorage.getItem(UNTIL_HOLDER) || 'null')?.owner === UNTIL_OWNER) localStorage.setItem(UNTIL_HOLDER, JSON.stringify({ owner: UNTIL_OWNER, expires: Date.now() + ALIVE_EVERY_MS * 2 }));
+  };
+  setInterval(() => tickNow(), ALIVE_EVERY_MS);
+  tickNow = run;
+  globalThis.addEventListener?.('pagehide', () => {
+    clearInterval(holderTimer);
+    if (JSON.parse(localStorage.getItem(UNTIL_HOLDER) || 'null')?.owner === UNTIL_OWNER) localStorage.removeItem(UNTIL_HOLDER);
+  }, { once: true });
+}
 $('digits').addEventListener('keydown', e => { if (e.key === 'Enter') $('doConnect').click(); });
 $('doConnect').onclick = async () => {
   if (!selected) return;
@@ -285,6 +341,9 @@ $('doConnect').onclick = async () => {
 async function loadLinks() {
   try {
     ({ links } = await api('api/remote/links'));
+    // Read the list before beating: an 「直到我断开」 link already in it must be kept alive at once.
+    publish();
+    tickNow();
     const ul = $('links');
     ul.replaceChildren();
     if (!links.length) { ul.append(el('li', { class: 'empty' }, '还没有连着的电脑')); return; }
@@ -301,21 +360,44 @@ async function loadLinks() {
 }
 
 // ---- 看那台电脑 ----
-function open(link, tab) {
+function open(link, tab, jump = true) {
   viewing = link;
+  remember(link.id);
   $('viewName').textContent = link.name;
   $('viewer').classList.add('on');
-  show(tab);
+  show(tab, jump);
+}
+// #236: 频道 opens in this DSH's own channels page (client-ui-discord RemoteChannelsPage) with the
+// other computer's data, so @ candidates, the avatar menu and hover reply work as they do locally.
+// Without it (an older client-ui-discord, or this page opened outside DSH) the old page stays.
+function openReactChannels(link) {
+  try {
+    const openRemote = window.parent !== window ? window.parent.__bothouseOpenRemoteChannels : undefined;
+    return typeof openRemote === 'function' && openRemote(link.id, link.name) === true;
+  } catch { return false; }
 }
-function show(tab) {
+// The shell remounts this page when 返回其他电脑 brings it back, so the link being viewed is kept for
+// the tab (per-viewer convenience only) and the viewer comes back on it without jumping again.
+const VIEWING_KEY = 'collab-devices:viewing';
+function remember(id) { try { if (id) sessionStorage.setItem(VIEWING_KEY, id); else sessionStorage.removeItem(VIEWING_KEY); } catch { /* storage off */ } }
+function remembered() { try { return sessionStorage.getItem(VIEWING_KEY); } catch { return null; } }
+function show(tab, jump = true) {
   for (const b of document.querySelectorAll('#viewer [data-tab]')) b.classList.toggle('on', b.dataset.tab === tab);
-  $('frame').src = `remote/${viewing.id}/${tab}`;
+  const hasReact = tab === '' && (() => { try { return window.parent !== window && typeof window.parent.__bothouseOpenRemoteChannels === 'function'; } catch { return false; } })();
+  const react = tab === '' && (jump ? openReactChannels(viewing) : hasReact);
+  $('frame').hidden = react;
+  $('reactNote').hidden = !react;
+  $('frame').src = react ? 'about:blank' : `remote/${viewing.id}/${tab}`;
 }
+$('reopen').onclick = () => { if (viewing) show(''); };
 for (const b of document.querySelectorAll('#viewer [data-tab]')) b.onclick = () => show(b.dataset.tab);
-$('back').onclick = () => { $('viewer').classList.remove('on'); $('frame').src = 'about:blank'; viewing = undefined; loadLinks(); };
+$('back').onclick = () => { $('viewer').classList.remove('on'); $('frame').src = 'about:blank'; viewing = undefined; remember(undefined); loadLinks(); };
 
 (async () => {
-  loadDevices(); loadLinks(); loadPeers();
+  loadDevices(); loadPeers();
+  await loadLinks();
+  const back = links?.find(l => l.id === remembered());
+  if (back) open(back, '', false); else remember(undefined);
   try { const s = await api('api/pair/code'); if (s.waiting) $('hostErr').textContent = '刚才生成的数字还在等待中；看不到数字的话点「生成数字」换一个。'; } catch { /* ignore */ }
 })();
 </script>