botmux 3.18.4 → 3.18.6

package/dist/.runtime-build-id

@@ -1 +1 @@
-a00e695f90038d1f1a1a3b2e10f626edb0f26749fdeaf4eb41724a87de90b768
+772cb5082be7e1181051fb6e4344f92bc8a484024a69f8d8f5cbc607b014e30a

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA8BA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAiLhD,OAAO,EAAE,KAAK,KAAK,EAA0C,MAAM,yBAAyB,CAAC;AAujB7F;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,GAAG,OAAO,CACpF;IACE,EAAE,EAAE,IAAI,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oDAAoD;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,CACrC,CA6LA;AAmlDD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACtE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,SAAS,GAAG,kBAAkB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtH,MAAM,MAAM,iBAAiB,GACzB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,iBAAiB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACvE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,YAAY,GAAG,SAAS,GAAG,kBAAkB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAooQxG;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,EAC9F,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC;AAC1F;qDACqD;AACrD,wBAAwB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC,GAClH,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAuL7B"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA8BA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAqLhD,OAAO,EAAE,KAAK,KAAK,EAA0C,MAAM,yBAAyB,CAAC;AA2iB7F;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,iBAAiB,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,GAAG,OAAO,CACpF;IACE,EAAE,EAAE,IAAI,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oDAAoD;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,CACrC,CA6LA;AAmlDD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACtE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,SAAS,GAAG,kBAAkB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtH,MAAM,MAAM,iBAAiB,GACzB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,iBAAiB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACvE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,YAAY,GAAG,SAAS,GAAG,kBAAkB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AA4rQxG;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,EAC9F,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC;AAC1F;qDACqD;AACrD,wBAAwB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC,GAClH,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAuL7B"}

package/dist/cli.js

@@ -52,11 +52,12 @@ import { buildBotFromAddFlags, editInputFromFlags, isScriptedSetupInvocation, ma
 import { detectUnusableOwnerEntries, normalizeManagedOwnerEntries, resolveScannerAllowedUser, } from './setup/owner-identity.js';
 import { interactiveSelect, pickChoice, pickCliSelection } from './setup/interactive-select.js';
 import { buildPreset, serializePreset, presetFilename } from './setup/agent-preset.js';
+import bundledScopeManifest from './setup/lark-scopes.json' with { type: 'json' };
 import { validateCodexAppManagedSendOrigin, } from './utils/codex-app-dispatch-ledger.js';
 import { hasProtectedSessionMutationOwnership } from './core/session-mutation-guard.js';
 import { logger } from './utils/logger.js';
 import { reapLegacyPm2, liveGodAt } from './core/legacy-pm2-reaper.js';
-import { withFileLock, withFileLockSync } from './utils/file-lock.js';
+import { withFileLock, withFileLockSync, FileLockTimeoutError } from './utils/file-lock.js';
 import { scheduleTimeZone } from './utils/timezone.js';
 import { expandHomePath, invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional, hasFlagOrEq } from './cli/arg-utils.js';
@@ -78,7 +79,10 @@ import { isRemoteAccessEnabled } from './global-config.js';
 import { DASHBOARD_COMMAND_USAGE, executeDashboardCommand, formatDashboardFallbackFailure, formatDashboardSuccessLines, } from './cli/dashboard-command.js';
 import { globalInstallUpdateLockTarget, globalInstallUpdateLockTargetIn, installLatestBotmuxSync } from './core/maintenance.js';
 import { formatGlobalInstallCommand, resolveGlobalInstallPlan, UnsupportedGlobalInstallError, } from './utils/global-install.js';
-import { isLocalDevInstall, botmuxCliEntryAt, bakedBinaryVersion } from './utils/install-info.js';
+import { isLocalDevInstall, botmuxCliEntryAt, bakedBinaryVersion, botmuxInstallRoot } from './utils/install-info.js';
+import { currentUpdateStrategy, replaceStandaloneBinary } from './core/binary-self-update.js';
+import { fetchLatestVersion, isNewerVersion } from './core/update-check.js';
+import { resolveCurrentVersion } from './utils/install-diagnostics.js';
 import { resolveLocalDevCheckoutDir, isGitWorktree, gitPorcelainStatus, localDevUpdateSteps, describeSpawnFailure, } from './utils/local-dev-update.js';
 import { loadDashboardSecret } from './dashboard/auth.js';
 import { postWorkflowDaemonMutation, } from './workflows/v3/daemon-ipc-client.js';
@@ -357,23 +361,8 @@ function botBrand(b) {
  * Returns: 写出的 JSON 文件绝对路径.
  */
 function writeScopesJsonToConfigDir() {
-    // build script 会把 src/setup/lark-scopes.json copy 到 dist/setup/.
-    // dist 模式下 __dirname 是 dist/, 找 ./setup/lark-scopes.json; dev (tsx)
-    // 模式找 src/setup/lark-scopes.json 在源码同目录也成立.
-    const here = dirname(fileURLToPath(import.meta.url));
-    const srcCandidates = [
-        join(here, 'setup', 'lark-scopes.json'),
-        join(here, '..', 'src', 'setup', 'lark-scopes.json'),
-    ];
-    let scopesPath = srcCandidates[0];
-    for (const p of srcCandidates) {
-        if (existsSync(p)) {
-            scopesPath = p;
-            break;
-        }
-    }
     const destPath = join(CONFIG_DIR, 'lark-scopes.json');
-    copyFileSync(scopesPath, destPath);
+    writeFileSync(destPath, `${JSON.stringify(bundledScopeManifest, null, 2)}\n`);
     return destPath;
 }
 function printCopyHint(filePath) {
@@ -2668,7 +2657,7 @@ async function cmdStatus() {
     // registry to reconcile against. Legacy pm2 still gets surfaced by
     // warnIfLegacyBotmuxAlive above, which is what a pre-migration host needs.
 }
-function cmdUpgrade() {
+async function cmdUpgrade() {
     // 本地 checkout（有 .git/src）：走 git pull --ff-only → 重新 build → 从本
     // checkout 重启，而不是拿全局包管理器去升级（那对 dev 部署无效，见
     // install-info.ts 的 isLocalDevInstall 说明）。
@@ -2676,8 +2665,66 @@ function cmdUpgrade() {
         cmdUpgradeLocalDev();
         return;
     }
+    // 编译版单文件二进制没有 package.json 落盘 ⟹ resolveGlobalInstallPlan 恒抛
+    // Unsupported（实测真实 v3.18.4 二进制就是这条）。改为先按「二进制装在哪」
+    // 判形态：npm 子包形态交回 npm/pnpm/bun，install.sh 形态自己换二进制。
+    const strategy = currentUpdateStrategy(botmuxInstallRoot());
+    if (strategy.kind === 'self-replace') {
+        try {
+            const latest = await fetchLatestVersion();
+            if (!latest) {
+                console.error('❌ 无法获取最新版本号（网络不可达或 registry 异常）。');
+                process.exit(1);
+            }
+            const current = resolveCurrentVersion();
+            if (!isNewerVersion(latest, current)) {
+                console.log(`✅ 已是最新版本（${current}）。`);
+                return;
+            }
+            console.log(`🔄 升级中：下载 v${latest} 二进制并替换 ${strategy.target}`);
+            // 握与 dashboard / maintenance 同一把跨进程锁：这条路径是**写同一个文件**，
+            // 两个 update 并发跑会互相盖掉临时文件与 rename。锁文件父目录可能还不存在
+            // （daemon 从未在本机起过就先跑 update），先建再握，否则 ENOENT 会盖掉真实错误。
+            const lockTarget = globalInstallUpdateLockTarget();
+            mkdirSync(dirname(lockTarget), { recursive: true });
+            let acquired = false;
+            try {
+                await withFileLock(lockTarget, async () => {
+                    acquired = true;
+                    const r = await replaceStandaloneBinary(latest, strategy.target);
+                    console.log(`✅ 升级完成：${r.asset} → ${r.target}（${current} → ${latest}）。运行 botmux restart 以应用更新。`);
+                }, { maxWaitMs: 2_000 });
+            }
+            catch (error) {
+                // ⚠️ 三态，不是二态。`withFileLock` 拿不到锁时是**抛异常**不是安静返回，
+                // 但 `acquired === false` 只证明「回调没执行」，**不等于「别人持锁」**：
+                // 回调之前还可能因 `open` 的 EACCES/ENOSPC、holder 写入失败、holder 元数据
+                // 不可读、stale-claim `link` 失败而抛错。只看 `acquired` 会把这些**真实故障
+                // 全部误报成「另一个更新正在进行」**——磁盘满被说成并发冲突，是最坏的那种
+                // 误导。所以必须同时要求它是 timeout 类型：
+                //   ① 超时且回调未进入        → 友好并发提示（正常互斥结果，不是故障）
+                //   ② 回调已进入后失败        → 透出真实错误（下载/校验/替换）
+                //   ③ 回调前的基础设施失败    → 同样透出真实错误
+                // 判类型而不是匹文案：file-lock 的文案被多处按字符串匹配，不能动，但新代码
+                // 应该用 FileLockTimeoutError（async/sync 两处语义一致）。
+                if (!acquired && error instanceof FileLockTimeoutError) {
+                    console.error('❌ 另一个更新正在进行中（dashboard 或定时任务），请稍后重试。');
+                    process.exit(1);
+                }
+                throw error; // ②③ 交给外层统一报错，不被友好文案吞掉
+            }
+        }
+        catch (error) {
+            console.error(`❌ 升级失败：${error instanceof Error ? error.message : error}`);
+            process.exit(1);
+        }
+        return;
+    }
     try {
-        const plan = resolveGlobalInstallPlan();
+        if (strategy.kind === 'unsupported') {
+            throw new UnsupportedGlobalInstallError('unknown', process.execPath);
+        }
+        const plan = resolveGlobalInstallPlan(strategy.packageRoot);
         console.log(`🔄 升级中：${formatGlobalInstallCommand(plan)}`);
         installLatestBotmuxSync(plan);
         console.log('\n✅ 升级完成。运行 botmux restart 以应用更新。');
@@ -11388,6 +11435,38 @@ if (__entrySubcommand) {
     // below never runs. This awaits forever; the imported module owns exit().
     await new Promise(() => { });
 }
+// Hidden: perform a compiled-binary self-replace and exit. Invoked by
+// `runSelfReplaceBlocking` (src/core/maintenance.ts) so the synchronous
+// maintenance tick / dashboard handler can wait on one child instead of
+// restructuring around an await. Not a user-facing command; it only ever makes
+// sense for the standalone binary, which owns its own file.
+if (command === '__self-update') {
+    const requested = process.argv[3] || 'latest';
+    try {
+        const { replaceStandaloneBinary, currentBinaryInstallShape } = await import('./core/binary-self-update.js');
+        if (currentBinaryInstallShape() !== 'curl-binary') {
+            // Fail closed rather than write into a tree a package manager owns.
+            console.error('__self-update: 当前不是独立二进制安装（install.sh 形态），拒绝自替换');
+            process.exit(1);
+        }
+        const { fetchLatestVersion } = await import('./core/update-check.js');
+        const version = requested === 'latest' ? await fetchLatestVersion() : requested;
+        if (!version) {
+            console.error('__self-update: 无法解析最新版本（网络不可达或 registry 异常）');
+            process.exit(1);
+        }
+        const r = await replaceStandaloneBinary(version);
+        // The caller parses this line: after a self-replace the running process still
+        // reports its OWN baked version, so it cannot discover the new one by re-reading.
+        console.log(`BOTMUX_SELF_UPDATE_VERSION=${version}`);
+        console.log(`__self-update: ${r.asset} → ${r.target} (${r.bytes} bytes)`);
+        process.exit(0);
+    }
+    catch (error) {
+        console.error(`__self-update: ${error instanceof Error ? error.message : error}`);
+        process.exit(1);
+    }
+}
 const ROOT_FLEET_MUTATION_COMMANDS = new Set(['start', 'stop', 'restart', 'upgrade', 'update']);
 if (ROOT_FLEET_MUTATION_COMMANDS.has(command ?? '')
     && process.argv.slice(3).some(arg => arg === '--help' || arg === '-h')) {
@@ -12245,7 +12324,7 @@ switch (command) {
         break;
     case 'upgrade':
     case 'update':
-        cmdUpgrade();
+        await cmdUpgrade();
         break;
     case 'dashboard':
         await cmdDashboard(process.argv.slice(3));
@@ -12275,6 +12354,36 @@ switch (command) {
     case '__zmx-attach-managed':
         cmdManagedZmxAttach(process.argv.slice(3));
         break;
+    // Hidden self-check for the compiled single-file binary: exercise the two
+    // setup-time code paths that load lark-scopes.json off a module-relative path —
+    // readDefaultScopeManifest() (real Open Platform setup) and
+    // writeScopesJsonToConfigDir() (writes ~/.botmux/lark-scopes.json). In compiled
+    // mode the module graph lives in the read-only virtual /$bunfs, so the old
+    // readFileSync/copyFileSync of a __dirname-derived path threw
+    // "找不到 botmux lark-scopes.json". The npm/Node unit tests can't catch that —
+    // dist/ physically exists there — so smoke-bun-binary.mjs drives THIS against
+    // the actual binary. Prints a one-line JSON summary and exits 0; any throw
+    // (missing/empty manifest, unwritable path) exits non-zero and fails the smoke.
+    case '__selfcheck': {
+        const { readDefaultScopeManifest } = await import('./setup/open-platform-automation.js');
+        const manifest = readDefaultScopeManifest();
+        const tenant = manifest.scopes?.tenant?.length ?? 0;
+        const user = manifest.scopes?.user?.length ?? 0;
+        if (tenant <= 0 || user <= 0) {
+            console.error(`__selfcheck: lark-scopes manifest empty (tenant=${tenant}, user=${user})`);
+            process.exit(1);
+        }
+        const written = writeScopesJsonToConfigDir();
+        const onDisk = JSON.parse(readFileSync(written, 'utf-8'));
+        const wroteTenant = onDisk?.scopes?.tenant?.length ?? 0;
+        const wroteUser = onDisk?.scopes?.user?.length ?? 0;
+        if (wroteTenant !== tenant || wroteUser !== user) {
+            console.error(`__selfcheck: written manifest mismatch (${wroteTenant}/${wroteUser} vs ${tenant}/${user})`);
+            process.exit(1);
+        }
+        console.log(JSON.stringify({ ok: true, tenant, user, written }));
+        process.exit(0);
+    }
     case 'delete':
     case 'del':
     case 'rm':