botmux 3.29.0 → 3.30.0

package/README.en.md

@@ -50,7 +50,7 @@ botmux start                 # start the daemon (botmux autostart enable for aut
 >
 > Stable macOS CLI releases use a consistent Apple Developer ID signature. Replacing the binary during an upgrade therefore preserves the code identity used by macOS file and App Data permissions instead of appearing as a new program for every version. Canary, beta, and RC builds remain ad-hoc signed.
 >
-> To upgrade: `botmux upgrade` (replaces the binary in place), or just **re-run the curl command** — also an in-place upgrade, and it won't append a second PATH line.
+> To upgrade: **always re-run the curl command above** (this also upgrades npm/pnpm global installs — in-place replacement, no second PATH line), then open a new terminal and run `botmux restart`; on ≥3.18 binary installs `botmux upgrade` is equivalent. To install a pinned version (rollbacks included): `curl -fsSL https://raw.githubusercontent.com/deepcoldy/botmux/master/install.sh | BOTMUX_VERSION=v3.18.8 sh` (the variable must precede the `sh` on the right side of the pipe). ⚠️ **Do not npm-upgrade from releases older than v3.18.0** — crossing the Node-sources → binary form boundary leaves the daemon unable to restart.
 
 <details>
 <summary>Already living in the Node ecosystem? npm works too (same binary)</summary>
@@ -59,9 +59,9 @@ botmux start                 # start the daemon (botmux autostart enable for aut
 npm install -g botmux        # requires Node >= 22 to run the install itself
 ```
 
-The npm package carries **the same self-contained binary** (only the one matching your os/arch is installed); its postinstall points `~/.botmux/bin/botmux` at it and writes PATH the same way. So you end up with exactly **one** botmux version — no more "two Node versions each carrying their own global botmux, fighting each other / no idea which one I just updated".
+The npm package carries **the same self-contained binary** (only the one matching your os/arch is installed). The package's `bin` points at a shipped sh launcher that the package manager links onto PATH itself, so **npm, pnpm and bun all work without any lifecycle script** (pnpm 10/11 and bun skip dependency postinstalls by default, which used to leave those installs with no `botmux` command at all). The postinstall still points `~/.botmux/bin/botmux` at the same binary and writes PATH. So you still end up with exactly **one** botmux **version** — both entry points exec the same binary — and no more "two Node versions each carrying their own global botmux, fighting each other / no idea which one I just updated".
 
-The only difference is **who installs it and who upgrades it later**: the npm path needs Node ≥ 22 to run the install itself and hands upgrades back to `npm i -g botmux@latest`; the curl path never touches Node. Once running, the two are identical — same binary, same commands.
+The only difference is **who installs it**: the npm path needs Node ≥ 22 to run the install itself, the curl path never touches Node; **upgrades always re-run the curl command, no matter how you installed** (npm-upgrading from a pre-v3.18.0 install across that form boundary can leave the daemon unable to come back). Once running, the two are identical — same binary, same commands.
 
 </details>
 

package/README.md

@@ -50,7 +50,7 @@ botmux start                 # 启动 daemon（botmux autostart enable 设开机
 >
 > 正式版 macOS CLI 使用稳定的 Apple Developer ID 签名。升级替换二进制后，macOS 的文件与 App 数据访问授权仍绑定同一代码身份，不会因为版本哈希变化而把 botmux 当成一个新程序；canary / beta / rc 等预览版仍使用 ad-hoc 签名。
 >
-> 升级：`botmux upgrade`（原地换二进制），或**重跑一遍上面那条 curl 命令**——同样原地升级，不会重复往启动文件里追加 PATH。
+> 升级：**一律重跑上面那条 curl 命令**（npm / pnpm 全局安装也用它，原地替换、不会重复往启动文件里追加 PATH），装完开个新终端跑 `botmux restart`；≥3.18 的二进制安装上 `botmux upgrade` 与其等价。装指定版本（含回滚）：`curl -fsSL https://raw.githubusercontent.com/deepcoldy/botmux/master/install.sh | BOTMUX_VERSION=v3.18.8 sh`（变量必须在管道右侧的 `sh` 前面）。⚠️ **v3.18.0 之前的老版本不要用 npm 升级**——跨「Node 源码 → 二进制」形态边界会让 daemon 重启失败。
 
 <details>
 <summary>已经在用 Node 生态？也可以走 npm（同一个二进制）</summary>
@@ -59,9 +59,9 @@ botmux start                 # 启动 daemon（botmux autostart enable 设开机
 npm install -g botmux        # 需要 Node >= 22 装包本身
 ```
 
-npm 包内带的是**同一个自包含二进制**（按 os/arch 只装匹配的那一个），postinstall 把 `~/.botmux/bin/botmux` 指向它并同样写 PATH。所以装完只有**一个** botmux 版本，不再出现「装了两个 Node 版本、各自带一份全局 botmux 互相打架 / 不知道更新了哪个」。
+npm 包内带的是**同一个自包含二进制**（按 os/arch 只装匹配的那一个）。包的 `bin` 指向随包发布的 sh 启动器，由包管理器自己链到 PATH——**npm / pnpm / bun 三种装法都不依赖生命周期脚本**（pnpm 10/11 与 bun 默认不跑依赖的 postinstall，早期版本因此装完没有任何 `botmux` 命令）。postinstall 仍会把 `~/.botmux/bin/botmux` 指向同一个二进制并写 PATH。所以装完始终只有**一个** botmux **版本**（两个入口都 exec 同一个二进制），不再出现「装了两个 Node 版本、各自带一份全局 botmux 互相打架 / 不知道更新了哪个」。
 
-区别只在**谁来装、以后谁来升**：npm 路径需要 Node ≥ 22 才能执行安装本身，升级交回 `npm i -g botmux@latest`；curl 路径全程不碰 Node。跑起来之后两者完全一致——同样的二进制、同样的命令。
+区别只在**谁来装**：npm 路径需要 Node ≥ 22 才能执行安装本身，curl 路径全程不碰 Node；**无论哪种装法，升级都重跑 curl**（v3.18.0 之前的老版本用 npm 跨形态升级会让 daemon 起不回来）。跑起来之后两者完全一致——同样的二进制、同样的命令。
 
 </details>
 
@@ -71,6 +71,7 @@ npm 包内带的是**同一个自包含二进制**（按 os/arch 只装匹配的
 
 - **[实时流式卡片](https://deepcoldy.github.io/botmux/cards)** — 每轮对话一张实时刷新的卡片，终端画面原样截图回传；一键显示/隐藏输出、翻屏、重启/关闭/接管会话。
 - **[多机器人协作](https://deepcoldy.github.io/botmux/multi-bot)** — 同群多 bot @mention 路由，不同 CLI 背后不同模型，天然多样性；方案评审 / 代码 review / 技术选型让它们互相挑刺。
+- **[群内真人独立 lane](docs/principal-lanes.md)** — 可复用 Dashboard 的「跨身份打断隔离（XPI）」开关，让同一群里的真人各用独立 CLI 上下文和 git worktree；消息仍公开可见，引用别人的任务仍可走建议/确认协作。
 - **[多话题并行编排](https://deepcoldy.github.io/botmux/multi-topic)** — 给编排者一个大任务，它自动在群里种话题、拉各 bot 起独立会话跑流水线，飞书任务面板一眼看完所有子任务进度。
 - **[可交互 Web 终端](https://deepcoldy.github.io/botmux/web-terminal)** — 不只是看输出，浏览器 / 手机直接操作 CLI，移动端带悬浮快捷键栏（Esc、Ctrl+C、方向键）。
 - **[会话接入 & 接力](https://deepcoldy.github.io/botmux/adopt)** — 本地 tmux 里跑到一半，手机 `/adopt` 接管；`/relay` 把整个会话（原进程、原记忆）搬进团队群继续。

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "botmux",
-  "version": "3.29.0",
+  "version": "3.30.0",
   "description": "Bridge between IM platforms and AI coding CLIs — one topic, one CLI session with live streaming",
   "type": "module",
+  "bin": {
+    "botmux": "scripts/botmux-launcher.sh"
+  },
   "files": [
+    "scripts/botmux-launcher.sh",
     "scripts/postinstall-bin.mjs",
     "scripts/install-path-entry.mjs",
     "README.md",
@@ -15,7 +19,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "bun run audit:domains && node scripts/generate-app-icon-data.mjs && node scripts/generate-pi-initial-prompt-extension.mjs && node scripts/clean-dist.mjs && tsc && bun run typecheck:scripts && bun run typecheck:test-mocks && node scripts/generate-runtime-build-id.mjs && cp src/setup/lark-scopes.json dist/setup/ && bun run dashboard:bundle && chmod +x dist/cli.js && node scripts/audit-dist.mjs && node scripts/audit-embedded-assets.mjs --require-dist",
+    "build": "bun run audit:domains && node scripts/generate-app-icon-data.mjs && node scripts/generate-pi-initial-prompt-extension.mjs && node scripts/generate-pi-turn-boundary-extension.mjs && node scripts/clean-dist.mjs && tsc && bun run typecheck:scripts && bun run typecheck:test-mocks && node scripts/generate-runtime-build-id.mjs && cp src/setup/lark-scopes.json dist/setup/ && bun run dashboard:bundle && chmod +x dist/cli.js && node scripts/audit-dist.mjs && node scripts/audit-embedded-assets.mjs --require-dist",
     "verify:binary": "bun scripts/verify-binary.mjs",
     "typecheck:scripts": "tsc -p tsconfig.scripts.json",
     "typecheck:test-mocks": "tsc -p tsconfig.test-mocks.json",
@@ -82,12 +86,12 @@
   },
   "optionalDependencies": {
     "@napi-rs/canvas": "^0.1.65",
-    "botmux-darwin-arm64": "3.29.0",
-    "botmux-darwin-x64": "3.29.0",
-    "botmux-linux-arm64": "3.29.0",
-    "botmux-linux-arm64-musl": "3.29.0",
-    "botmux-linux-x64": "3.29.0",
-    "botmux-linux-x64-musl": "3.29.0"
+    "botmux-darwin-arm64": "3.30.0",
+    "botmux-darwin-x64": "3.30.0",
+    "botmux-linux-arm64": "3.30.0",
+    "botmux-linux-arm64-musl": "3.30.0",
+    "botmux-linux-x64": "3.30.0",
+    "botmux-linux-x64-musl": "3.30.0"
   },
   "devDependencies": {
     "@midscene/web": "^1.7.6",

package/scripts/botmux-launcher.sh

@@ -0,0 +1,120 @@
+#!/bin/sh
+# botmux launcher — the `bin` entry npm/pnpm/bun link onto PATH.
+#
+# ── WHY THIS FILE EXISTS ───────────────────────────────────────────────────────
+# The main package ships NO binary (0.1MB, 6 files): the compiled single-file
+# executable lives in a platform subpackage (`botmux-linux-x64`, …) pulled in as
+# an optional dependency. `bin` can only point INSIDE the main package, so it
+# cannot name that binary directly — hence this dispatcher, which resolves the
+# subpackage at RUN time and `exec`s it.
+#
+# Until now the only thing that produced a runnable `botmux` was
+# `scripts/postinstall-bin.mjs`, which writes ~/.botmux/bin/botmux. That still
+# runs and is still what gives multi-Node-version boxes ONE unambiguous global
+# botmux. But postinstall is not guaranteed to run:
+#
+#   MEASURED on v3.18.13, isolated HOME, each manager's own global install:
+#     npm i -g botmux    → postinstall runs   → launcher written → `botmux` works
+#     bun add -g botmux  → "Blocked 2 postinstalls" → NO launcher → no command
+#     pnpm add -g botmux → script not run at all    → NO launcher → no command
+#
+#   Both failures exit 0 and print "installed botmux@3.18.13" / "+ botmux 3.18.13",
+#   so the user believes it worked and only finds out at `botmux: command not found`.
+#   bun can be rescued with `bun pm -g trust botmux`; pnpm could NOT be rescued —
+#   `onlyBuiltDependencies: [botmux]` still produced no launcher (measured).
+#
+# With a `bin` entry the package manager links this script itself, so all three
+# get a working command with no lifecycle script at all. postinstall then becomes
+# an OPTIMISATION (the single canonical launcher) rather than a prerequisite.
+#
+# ── WHY sh AND NOT node ────────────────────────────────────────────────────────
+# A Node dispatcher would reintroduce a Node dependency for a package whose whole
+# point is a self-contained binary, and would add interpreter startup to every
+# invocation. `bin` pointing at a shell script works on npm, pnpm and bun alike
+# (measured, all three link it and run it). `exec` replaces this process, so the
+# binary receives the original argv and signals with no shell left in between.
+#
+# Windows is not handled here: there are no win32 platform subpackages at all
+# (only darwin/linux × x64/arm64 ± musl), so there is nothing for a .cmd shim to
+# dispatch to. WSL2 reports as linux and is the supported route.
+
+set -e
+
+# Resolve this script through symlinks, then take the PACKAGE root.
+#
+# Two things make this fiddly, both MEASURED:
+#  · `bin` entries are linked into the manager's bin dir, so $0 is often a
+#    symlink — but pnpm instead generates a wrapper that runs `/bin/sh <path>`,
+#    where <path> goes through a symlinked package dir. Either way the honest
+#    answer comes from resolving the path and then `cd -P`.
+#  · This file lives in `<pkg>/scripts/`, so the package root is the PARENT of
+#    this script's directory. Using the script's own dir made every sibling
+#    lookup miss by one level.
+target=$0
+# Bounded: a symlink cycle would otherwise spin here forever.
+i=0
+while [ -L "$target" ] && [ "$i" -lt 40 ]; do
+  link=$(readlink "$target")
+  case $link in
+    /*) target=$link ;;
+    *)  target=$(dirname "$target")/$link ;;
+  esac
+  i=$((i + 1))
+done
+# `cd -P` resolves any symlinked parent directory (pnpm's store links).
+pkg=$(cd "$(dirname "$target")/.." && pwd -P)
+
+# musl (Alpine and most slim images): npm/pnpm/bun select the -musl subpackage via
+# each subpackage's `libc` field, so we must look for that same name. Positive
+# evidence only — never claim musl on a glibc box.
+libc=''
+if [ "$(uname -s)" = Linux ]; then
+  # ⚠️ ONE `ls` PER DIRECTORY. `ls a/glob b/glob` exits non-zero when EITHER
+  # glob misses, i.e. it is an AND — and on real Alpine the loader lives only in
+  # /lib, so the combined form NEVER fired and only /etc/alpine-release saved it
+  # (MEASURED on alpine:3.20: combined → exit 1, per-dir OR → exit 0). That left
+  # a musl box without that file resolving to the glibc subpackage name. Same
+  # per-directory shape as install.sh, postinstall-bin.mjs and binary-self-update.ts.
+  if ls /lib/ld-musl-* >/dev/null 2>&1 \
+    || ls /usr/lib/ld-musl-* >/dev/null 2>&1 \
+    || [ -f /etc/alpine-release ]; then
+    libc='-musl'
+  fi
+fi
+
+case $(uname -s) in
+  Linux)  os=linux ;;
+  Darwin) os=darwin ;;
+  *)      os='' ;;
+esac
+case $(uname -m) in
+  x86_64|amd64)  arch=x64 ;;
+  aarch64|arm64) arch=arm64 ;;
+  *)             arch='' ;;
+esac
+
+if [ -z "$os" ] || [ -z "$arch" ]; then
+  echo "botmux: unsupported platform $(uname -s)/$(uname -m)." >&2
+  echo "Supported: linux-x64, linux-arm64, darwin-x64, darwin-arm64. On Windows use WSL2." >&2
+  exit 1
+fi
+
+sub="botmux-$os-$arch$libc"
+
+# Two layouts, both MEASURED against real global installs of v3.18.13:
+#   npm       → <main>/node_modules/botmux-linux-x64/botmux   (nested)
+#   pnpm, bun → <main>/../botmux-linux-x64/botmux             (sibling / hoisted)
+# Try the exact-libc name first, then the other libc as a fallback: a mirrored or
+# repacked registry can drop the `libc` field, leaving the "wrong" one installed.
+for name in "$sub" "botmux-$os-$arch"; do
+  for candidate in "$pkg/node_modules/$name/botmux" "$pkg/../$name/botmux"; do
+    if [ -x "$candidate" ]; then
+      exec "$candidate" "$@"
+    fi
+  done
+done
+
+echo "botmux: no platform binary found for $sub." >&2
+echo "The optional platform package did not install. Reinstall with:" >&2
+echo "  npm i -g botmux --force    (or: pnpm add -g botmux / bun add -g botmux)" >&2
+exit 1

package/scripts/install-path-entry.mjs

@@ -2,10 +2,12 @@
  * Put `~/.botmux/bin` on the user's PATH by writing their shell's startup file.
  *
  * WHY THIS EXISTS
- * `npm i -g botmux` has no `bin` field (removed with the Node fallback — see
- * postinstall-bin.mjs), so the ONLY `botmux` command is the launcher written to
- * `~/.botmux/bin/botmux`. If that directory is not on PATH, a successful install
- * still leaves the user with `botmux: command not found`.
+ * The package's `bin` is a sh launcher the package manager links onto PATH, but
+ * that only covers installs done BY a package manager: `install.sh` (the curl
+ * route) has no manager involved, and the postinstall launcher at
+ * `~/.botmux/bin/botmux` is what gives a multi-Node-version box ONE unambiguous
+ * global botmux. If that directory is not on PATH, those routes still leave the
+ * user with `botmux: command not found` — which is what this file prevents.
  *
  * Both installers used to just PRINT a hint, and the hint was:
  *

package/scripts/postinstall-bin.mjs

@@ -330,8 +330,9 @@ try {
 // This used to only PRINT `echo 'export PATH=…' >> ~/.profile`. Two problems:
 // the user had to act on it, and for zsh users the suggested file is WRONG —
 // zsh never reads ~/.profile (measured), so following the hint verbatim left
-// `botmux` still not found. There is no `bin` field any more, so PATH is the
-// only way this launcher becomes a command; we now write the right startup file
+// `botmux` still not found. PATH is the only way THIS launcher becomes a
+// command (the package's own `bin` is linked by the package manager and is a
+// separate entry point); we now write the right startup file
 // for the user's actual shell (bash/zsh/fish/other) and tell them what we did.
 //
 // ⚠️ DO NOT GATE THIS ON `process.env.PATH`. It used to be wrapped in