tmex-cli 0.12.3 → 0.12.4

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.12.3
+# 0.12.4
 
 _2026-06-15_
 
@@ -6,7 +6,11 @@ _2026-06-15_
 
 ### New
 
-- Custom terminal shortcuts: build your own quick-action bar for the terminal — add, remove, drag to reorder, rename, and capture key combinations by pressing them. Your shortcuts are saved on the server and shared across all your browsers. Built-in special actions (paste, toggle the text-input keyboard, start a new Agent session, scroll the terminal to the bottom) can be added too, and an optional icon mode shows keys as Apple-style symbols (⌃⇧⏎). A live preview lets you see the bar before you save.
+- The Agent can now recognize and work with a coding agent running inside a terminal pane — when an AI coding assistant is active in a pane, tmex's Agent understands it and can act on it.
+
+### Fixes
+
+- More reliable Bun detection during install and startup (issue #28). You can now point tmex at a specific Bun with `--bun-path`, and that choice is remembered for later runs.
 
 ---
 
@@ -14,4 +18,8 @@ _2026-06-15_
 
 ### 新增
 
-- 自定义终端快捷键：可以自己定制终端的快捷按钮栏——增删、拖拽排序、重命名，还能直接按下组合键来录入。快捷键保存在服务器、多端共享。内置特殊动作（粘贴、切换文本框键盘、新建 Agent 会话、终端回到最下方）也能一键加入；并可选「图标模式」用苹果风格符号（⌃⇧⏎）显示按键。编辑时提供实时预览，保存后生效。
+- Agent 现在能识别并配合在终端 pane 内运行的编码助手——当某个 pane 里有 AI 编码助手在运行时，tmex 的 Agent 能感知它并对其进行操作。
+
+### 修复
+
+- 更可靠地检测 Bun（安装与启动时，issue #28）；现在可以用 `--bun-path` 指定使用哪个 Bun，并会记住该选择供后续复用。

package/dist/cli-node.js

@@ -29,9 +29,9 @@ var MESSAGES = {
     "cli.help": `tmex CLI
 
 Usage:
-  tmex init [--no-interactive --install-dir <path> --host <host> --port <port> --db-path <path> --autostart <true|false>]
-  tmex doctor [--install-dir <path>] [--json]
-  tmex upgrade [--version <version>] [--install-dir <path>]
+  tmex init [--no-interactive --install-dir <path> --host <host> --port <port> --db-path <path> --autostart <true|false> --bun-path <path>]
+  tmex doctor [--install-dir <path>] [--json] [--bun-path <path>]
+  tmex upgrade [--version <version>] [--install-dir <path>] [--bun-path <path>]
   tmex uninstall [--install-dir <path>] [--yes] [--purge]
 
 Global flags:
@@ -52,6 +52,8 @@ Global flags:
     "bun.versionExecFailed": "Failed to execute bun --version. Please verify Bun installation.",
     "bun.versionTooLow": "Bun version too low: current {{version}}, required >= {{minVersion}}",
     "bun.checkFailed": "Bun check failed.",
+    "bun.explicitInvalid": "Specified bun path is invalid or not executable: {{path}}",
+    "bun.unsafePath": "Unsafe bun path (contains shell metacharacters): {{path}}",
     "service.install.unsupportedPlatform": "Automatic service installation is not supported on this platform: {{platform}}",
     "service.systemd.daemonReloadFailed": "systemctl daemon-reload failed: {{detail}}",
     "service.systemd.enableFailed": "systemctl enable failed: {{detail}}",
@@ -128,9 +130,9 @@ Global flags:
     "cli.help": `tmex CLI
 
 用法：
-  tmex init [--no-interactive --install-dir <path> --host <host> --port <port> --db-path <path> --autostart <true|false>]
-  tmex doctor [--install-dir <path>] [--json]
-  tmex upgrade [--version <version>] [--install-dir <path>]
+  tmex init [--no-interactive --install-dir <path> --host <host> --port <port> --db-path <path> --autostart <true|false> --bun-path <path>]
+  tmex doctor [--install-dir <path>] [--json] [--bun-path <path>]
+  tmex upgrade [--version <version>] [--install-dir <path>] [--bun-path <path>]
   tmex uninstall [--install-dir <path>] [--yes] [--purge]
 
 全局参数：
@@ -151,6 +153,8 @@ Global flags:
     "bun.versionExecFailed": "无法执行 bun --version，请检查 Bun 安装是否完整。",
     "bun.versionTooLow": "Bun 版本过低：当前 {{version}}，要求 >= {{minVersion}}",
     "bun.checkFailed": "Bun 检查失败。",
+    "bun.explicitInvalid": "指定的 bun 路径无效或不可执行：{{path}}",
+    "bun.unsafePath": "bun 路径包含 shell 特殊字符，不安全：{{path}}",
     "service.install.unsupportedPlatform": "当前平台不支持自动安装服务：{{platform}}",
     "service.systemd.daemonReloadFailed": "systemctl daemon-reload 失败：{{detail}}",
     "service.systemd.enableFailed": "systemctl enable 失败：{{detail}}",
@@ -259,7 +263,7 @@ function t(key, vars) {
 // src/lib/bun.ts
 import { existsSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join } from "node:path";
+import { isAbsolute, join } from "node:path";
 
 // src/lib/process.ts
 import { spawn } from "node:child_process";
@@ -269,10 +273,21 @@ async function runCommand(command, args, options = {}) {
     const child = spawn(command, args, {
       cwd: options.cwd,
       env: options.env,
-      stdio
+      stdio: stdio === "pipe" ? ["ignore", "pipe", "pipe"] : stdio
     });
     let stdout = "";
     let stderr = "";
+    let settled = false;
+    let timer = null;
+    const finish = (fn) => {
+      if (settled)
+        return;
+      settled = true;
+      if (timer) {
+        clearTimeout(timer);
+      }
+      fn();
+    };
     if (stdio === "pipe") {
       child.stdout?.on("data", (chunk) => {
         stdout += chunk.toString();
@@ -281,13 +296,21 @@ async function runCommand(command, args, options = {}) {
         stderr += chunk.toString();
       });
     }
-    child.on("error", reject);
+    if (options.timeoutMs && options.timeoutMs > 0) {
+      timer = setTimeout(() => {
+        child.kill("SIGKILL");
+        finish(() => reject(new Error(`Command timed out after ${options.timeoutMs}ms: ${command}`)));
+      }, options.timeoutMs);
+    }
+    child.on("error", (error) => {
+      finish(() => reject(error));
+    });
     child.on("close", (code) => {
-      resolve2({
+      finish(() => resolve2({
         code: code ?? 1,
         stdout,
         stderr
-      });
+      }));
     });
   });
 }
@@ -316,63 +339,239 @@ function compareSemver(left, right) {
   return 0;
 }
 
+// src/lib/validate.ts
+function asString(value) {
+  if (typeof value === "string")
+    return value;
+  return;
+}
+function asBoolean(value) {
+  if (typeof value === "boolean")
+    return value;
+  if (typeof value !== "string")
+    return;
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "true" || normalized === "1" || normalized === "yes" || normalized === "y") {
+    return true;
+  }
+  if (normalized === "false" || normalized === "0" || normalized === "no" || normalized === "n") {
+    return false;
+  }
+  return;
+}
+function parsePort(value) {
+  const port = Number(value);
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error(t("errors.validate.invalidPort", { value }));
+  }
+  return port;
+}
+function assertNonEmpty(value, fieldName) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new Error(t("errors.validate.emptyField", { field: fieldName }));
+  }
+  return trimmed;
+}
+
 // src/lib/bun.ts
-async function locateBunFromShell() {
-  const result = await runCommand("zsh", ["-lic", "command -v bun"], { stdio: "pipe" }).catch(() => null);
+var ESC = 27;
+var CSI_OPEN = 91;
+var OSC_OPEN = 93;
+var BEL = 7;
+var ST_TAIL = 92;
+var LF = 10;
+var CR = 13;
+var DEL = 127;
+var SLASH = 47;
+var PROBE_TIMEOUT_MS = 5000;
+function sanitizeBunPath(raw) {
+  let stripped = "";
+  for (let i = 0;i < raw.length; i += 1) {
+    const code = raw.charCodeAt(i);
+    if (code === ESC) {
+      const next = raw.charCodeAt(i + 1);
+      if (next === CSI_OPEN) {
+        i += 1;
+        while (i + 1 < raw.length) {
+          const c = raw.charCodeAt(i + 1);
+          i += 1;
+          if (c >= 64 && c <= 126) {
+            break;
+          }
+        }
+      } else if (next === OSC_OPEN) {
+        i += 1;
+        while (i + 1 < raw.length) {
+          const c = raw.charCodeAt(i + 1);
+          if (c === BEL) {
+            i += 1;
+            break;
+          }
+          if (c === ESC && raw.charCodeAt(i + 2) === ST_TAIL) {
+            i += 2;
+            break;
+          }
+          i += 1;
+        }
+      }
+      continue;
+    }
+    stripped += raw[i];
+  }
+  const lines = [];
+  let current = "";
+  const flush = () => {
+    let cleaned = "";
+    for (let i = 0;i < current.length; i += 1) {
+      const code = current.charCodeAt(i);
+      if (code <= 31 || code === DEL) {
+        continue;
+      }
+      cleaned += current[i];
+    }
+    cleaned = cleaned.trim();
+    if (cleaned.length > 0) {
+      lines.push(cleaned);
+    }
+    current = "";
+  };
+  for (let i = 0;i < stripped.length; i += 1) {
+    const code = stripped.charCodeAt(i);
+    if (code === LF || code === CR) {
+      flush();
+      continue;
+    }
+    current += stripped[i];
+  }
+  flush();
+  if (lines.length === 0) {
+    return "";
+  }
+  for (let i = lines.length - 1;i >= 0; i -= 1) {
+    if (lines[i].charCodeAt(0) === SLASH) {
+      return lines[i];
+    }
+  }
+  return lines[lines.length - 1];
+}
+function readExplicitBunPath(flags) {
+  return asString(flags["bun-path"]) || process.env.TMEX_BUN_PATH;
+}
+function isBunRuntime() {
+  const bunVersion = process.versions.bun;
+  return typeof bunVersion === "string" && bunVersion.length > 0;
+}
+function hardCandidatePaths() {
+  return [
+    join(homedir2(), ".bun", "bin", "bun"),
+    "/opt/homebrew/bin/bun",
+    "/usr/local/bin/bun",
+    "/home/linuxbrew/.linuxbrew/bin/bun"
+  ];
+}
+async function locateBunFromShellWith(shell) {
+  const result = await runCommand(shell, ["-lic", "command -v bun"], {
+    stdio: "pipe",
+    timeoutMs: PROBE_TIMEOUT_MS
+  }).catch(() => null);
   if (!result || result.code !== 0) {
     return null;
   }
-  const bin = result.stdout.trim();
-  if (!bin) {
+  const bin = sanitizeBunPath(result.stdout);
+  if (!bin || !isAbsolute(bin) || !existsSync(bin)) {
     return null;
   }
   return bin;
 }
-async function findBunBinary() {
-  const zshBin = await locateBunFromShell();
-  if (zshBin) {
-    return zshBin;
-  }
-  const fallback = join(homedir2(), ".bun", "bin", "bun");
-  if (existsSync(fallback)) {
-    return fallback;
+async function locateBunFromShell() {
+  const shells = [];
+  const envShell = process.env.SHELL?.trim();
+  if (envShell) {
+    shells.push(envShell);
+  }
+  for (const fallbackShell of ["zsh", "bash"]) {
+    if (!shells.includes(fallbackShell)) {
+      shells.push(fallbackShell);
+    }
   }
-  const direct = await runCommand("bun", ["--version"], { stdio: "pipe" }).catch(() => null);
-  if (direct?.code === 0) {
-    return "bun";
+  for (const shell of shells) {
+    const found = await locateBunFromShellWith(shell);
+    if (found) {
+      return found;
+    }
   }
   return null;
 }
-async function checkBunVersion(minVersion = MIN_BUN_VERSION) {
-  const bunPath = await findBunBinary();
-  if (!bunPath) {
-    return {
-      ok: false,
-      reason: t("bun.notFound")
-    };
+async function probeBunCandidates(metaBunPath) {
+  const candidates = [];
+  const add = (value) => {
+    if (!value) {
+      return;
+    }
+    const sanitized = sanitizeBunPath(value);
+    if (sanitized && !candidates.includes(sanitized)) {
+      candidates.push(sanitized);
+    }
+  };
+  if (isBunRuntime()) {
+    add(process.execPath);
   }
-  const versionResult = await runCommand(bunPath, ["--version"], { stdio: "pipe" }).catch(() => null);
+  add(metaBunPath);
+  add(await locateBunFromShell());
+  candidates.push("bun");
+  for (const candidate of hardCandidatePaths()) {
+    add(candidate);
+  }
+  return candidates;
+}
+async function validateBunAt(candidate, minVersion) {
+  const versionResult = await runCommand(candidate, ["--version"], {
+    stdio: "pipe",
+    timeoutMs: PROBE_TIMEOUT_MS
+  }).catch(() => null);
   if (!versionResult || versionResult.code !== 0) {
-    return {
-      ok: false,
-      reason: t("bun.versionExecFailed"),
-      path: bunPath
-    };
+    return { ok: false, path: candidate, reason: t("bun.versionExecFailed") };
   }
-  const version = versionResult.stdout.trim();
+  const version = sanitizeBunPath(versionResult.stdout);
   if (compareSemver(version, minVersion) < 0) {
     return {
       ok: false,
-      path: bunPath,
+      path: candidate,
       version,
       reason: t("bun.versionTooLow", { version, minVersion })
     };
   }
-  return {
-    ok: true,
-    path: bunPath,
-    version
-  };
+  return { ok: true, path: candidate, version };
+}
+async function checkBunVersion(minVersion = MIN_BUN_VERSION, opts = {}) {
+  if (opts.explicitPath !== undefined && opts.explicitPath !== "") {
+    const explicit = sanitizeBunPath(opts.explicitPath);
+    if (!explicit || !isAbsolute(explicit) || !existsSync(explicit)) {
+      const reported = explicit || opts.explicitPath;
+      return {
+        ok: false,
+        path: reported,
+        reason: t("bun.explicitInvalid", { path: reported })
+      };
+    }
+    return await validateBunAt(explicit, minVersion);
+  }
+  const candidates = await probeBunCandidates(opts.metaBunPath);
+  let firstFailure = null;
+  for (const candidate of candidates) {
+    if (candidate !== "bun" && isAbsolute(candidate) && !existsSync(candidate)) {
+      continue;
+    }
+    const result = await validateBunAt(candidate, minVersion);
+    if (result.ok) {
+      return result;
+    }
+    if (!firstFailure) {
+      firstFailure = result;
+    }
+  }
+  return firstFailure ?? { ok: false, reason: t("bun.notFound") };
 }
 
 // src/lib/env-file.ts
@@ -768,41 +967,6 @@ function serviceHint(serviceName) {
   return t("service.hint.none");
 }
 
-// src/lib/validate.ts
-function asString(value) {
-  if (typeof value === "string")
-    return value;
-  return;
-}
-function asBoolean(value) {
-  if (typeof value === "boolean")
-    return value;
-  if (typeof value !== "string")
-    return;
-  const normalized = value.trim().toLowerCase();
-  if (normalized === "true" || normalized === "1" || normalized === "yes" || normalized === "y") {
-    return true;
-  }
-  if (normalized === "false" || normalized === "0" || normalized === "no" || normalized === "n") {
-    return false;
-  }
-  return;
-}
-function parsePort(value) {
-  const port = Number(value);
-  if (!Number.isInteger(port) || port < 1 || port > 65535) {
-    throw new Error(t("errors.validate.invalidPort", { value }));
-  }
-  return port;
-}
-function assertNonEmpty(value, fieldName) {
-  const trimmed = value.trim();
-  if (!trimmed) {
-    throw new Error(t("errors.validate.emptyField", { field: fieldName }));
-  }
-  return trimmed;
-}
-
 // src/commands/doctor.ts
 async function checkCommandExists(bin, args, id, okMessage, failMessage) {
   const result = await runCommand(bin, args, { stdio: "pipe" }).catch(() => null);
@@ -843,7 +1007,12 @@ async function runDoctor(parsed) {
       message: t("doctor.platform.supported", { platform: process.platform })
     });
   }
-  const bun = await checkBunVersion();
+  const explicitBunPath = readExplicitBunPath(parsed.flags);
+  const meta = await pathExists(installLayout.metaPath) ? await readJsonFile(installLayout.metaPath).catch(() => null) : null;
+  const bun = await checkBunVersion(undefined, {
+    explicitPath: explicitBunPath,
+    metaBunPath: meta?.bunPath
+  });
   if (bun.ok) {
     checks.push({
       id: "bun",
@@ -946,11 +1115,8 @@ async function runDoctor(parsed) {
     });
   }
   let serviceName = asString(parsed.flags["service-name"]) || "tmex";
-  if (await pathExists(installLayout.metaPath)) {
-    const meta = await readJsonFile(installLayout.metaPath).catch(() => null);
-    if (meta?.serviceName) {
-      serviceName = meta.serviceName;
-    }
+  if (meta?.serviceName) {
+    serviceName = meta.serviceName;
   }
   const status = await getServiceStatus(serviceName, installDir);
   if (status.manager === "none") {
@@ -1008,12 +1174,13 @@ async function runDoctor(parsed) {
 
 // src/commands/init.ts
 import { readdir } from "node:fs/promises";
-import { dirname as dirname4, resolve as resolve6 } from "node:path";
+import { dirname as dirname5, resolve as resolve6 } from "node:path";
 
 // src/lib/install.ts
 import { randomBytes } from "node:crypto";
 import { chmod, copyFile, rm as rm2 } from "node:fs/promises";
-import { resolve as resolve5 } from "node:path";
+import { homedir as homedir4 } from "node:os";
+import { dirname as dirname4, isAbsolute as isAbsolute2, join as join4, resolve as resolve5 } from "node:path";
 function generateMasterKey() {
   return randomBytes(32).toString("base64");
 }
@@ -1050,6 +1217,20 @@ async function deployRuntimeFiles(packageLayout, installLayout) {
   await copyDirectory(packageLayout.resourceDrizzlePath, installLayout.drizzleDir);
 }
 async function writeRunScript(installLayout, bunPath) {
+  for (let i = 0;i < bunPath.length; i += 1) {
+    const code = bunPath.charCodeAt(i);
+    if (code === 34 || code === 96 || code === 36 || code === 92 || code === 10 || code === 13) {
+      throw new Error(t("bun.unsafePath", { path: bunPath }));
+    }
+  }
+  const homeBunBin = join4(homedir4(), ".bun", "bin");
+  const bunDir = isAbsolute2(bunPath) ? dirname4(bunPath) : "";
+  const extraPathDirs = [
+    bunDir,
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    "/home/linuxbrew/.linuxbrew/bin"
+  ].filter((dir, index, arr) => dir.length > 0 && dir !== homeBunBin && arr.indexOf(dir) === index);
   const lines = [
     "#!/usr/bin/env bash",
     "set -euo pipefail",
@@ -1065,6 +1246,7 @@ async function writeRunScript(installLayout, bunPath) {
     'if [[ -n "${HOME:-}" ]] && [[ -d "${HOME}/.bun/bin" ]]; then',
     '  export PATH="${HOME}/.bun/bin:${PATH:-}"',
     "fi",
+    `export PATH="${[...extraPathDirs, "${PATH:-}"].join(":")}"`,
     "",
     `export TMEX_FE_DIST_DIR="${installLayout.feDir}"`,
     `export TMEX_MIGRATIONS_DIR="${installLayout.drizzleDir}"`,
@@ -1154,9 +1336,9 @@ async function promptConfirm(ctx, message, defaultValue) {
 }
 
 // src/lib/version.ts
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 async function readPackageVersion(packageRoot) {
-  const pkg = await readJsonFile(join4(packageRoot, "package.json"));
+  const pkg = await readJsonFile(join5(packageRoot, "package.json"));
   return pkg.version || "0.0.0";
 }
 
@@ -1228,7 +1410,8 @@ async function buildInitConfig(parsed) {
 }
 async function runInit(parsed) {
   const config = await buildInitConfig(parsed);
-  const bun = await checkBunVersion();
+  const explicitBunPath = readExplicitBunPath(parsed.flags);
+  const bun = await checkBunVersion(undefined, { explicitPath: explicitBunPath });
   if (!bun.ok || !bun.path) {
     throw new Error(bun.reason || t("bun.checkFailed"));
   }
@@ -1244,7 +1427,7 @@ async function runInit(parsed) {
   const packageLayout = await resolvePackageLayout(import.meta.url);
   const installLayout = createInstallLayout(config.installDir);
   await ensureInstallDir(config.installDir, config.force);
-  await ensureDir(dirname4(config.databasePath));
+  await ensureDir(dirname5(config.databasePath));
   await deployRuntimeFiles(packageLayout, installLayout);
   const masterKey = generateMasterKey();
   const envValues = buildAppEnvValues({
@@ -1273,7 +1456,8 @@ async function runInit(parsed) {
     autostart: config.autostart,
     installDir: config.installDir,
     updatedAt: new Date().toISOString(),
-    cliVersion
+    cliVersion,
+    bunPath: bun.path
   };
   await writeInstallMeta(installLayout, meta);
   console.log(`[tmex] ${t("init.done")}`);
@@ -1345,7 +1529,7 @@ async function runUninstall(parsed) {
 // src/commands/upgrade.ts
 import { mkdtemp, rm as rm4 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 async function delegateUpgrade(parsed, targetVersion) {
   const args = ["--yes", `tmex-cli@${targetVersion}`, "upgrade", "--apply-current-package"];
   const passthrough = ["install-dir", "service-name", "yes", "lang"];
@@ -1401,13 +1585,17 @@ async function runUpgrade(parsed) {
   if (!await pathExists(installLayout.metaPath)) {
     throw new Error(t("upgrade.missingMeta", { path: installLayout.metaPath }));
   }
-  const bun = await checkBunVersion();
+  const meta = await readJsonFile(installLayout.metaPath);
+  const explicitBunPath = readExplicitBunPath(parsed.flags);
+  const bun = await checkBunVersion(undefined, {
+    explicitPath: explicitBunPath,
+    metaBunPath: meta.bunPath
+  });
   if (!bun.ok || !bun.path) {
     throw new Error(bun.reason || t("bun.checkFailed"));
   }
-  const meta = await readJsonFile(installLayout.metaPath);
   const packageLayout = await resolvePackageLayout(import.meta.url);
-  const backupDir = await mkdtemp(join5(tmpdir(), "tmex-upgrade-"));
+  const backupDir = await mkdtemp(join6(tmpdir(), "tmex-upgrade-"));
   try {
     await stopService(meta.serviceName, installDir);
     await backupInstallArtifacts(installLayout, backupDir);
@@ -1416,6 +1604,7 @@ async function runUpgrade(parsed) {
     const cliVersion = await readPackageVersion(packageLayout.packageRoot);
     meta.updatedAt = new Date().toISOString();
     meta.cliVersion = cliVersion;
+    meta.bunPath = bun.path;
     await writeInstallMeta(installLayout, meta);
     await installService({
       serviceName: meta.serviceName,