tmex-cli 0.2.3 → 0.2.5

package/dist/runtime/server.js

@@ -4,42 +4,61 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
 var __reExport = (target, mod, secondTarget) => {
-  for (let key of __getOwnPropNames(mod))
+  var keys = __getOwnPropNames(mod);
+  for (let key of keys)
     if (!__hasOwnProp.call(target, key) && key !== "default")
       __defProp(target, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
   if (secondTarget) {
-    for (let key of __getOwnPropNames(mod))
+    for (let key of keys)
       if (!__hasOwnProp.call(secondTarget, key) && key !== "default")
         __defProp(secondTarget, key, {
-          get: () => mod[key],
+          get: __accessProp.bind(mod, key),
           enumerable: true
         });
     return secondTarget;
   }
 };
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __require = import.meta.require;
@@ -5560,7 +5579,7 @@ var require_bcrypt_pbkdf = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/cpu-features@0.0.10/node_modules/cpu-features/build/Release/cpufeatures.node
 var require_cpufeatures = __commonJS((exports, module) => {
-  module.exports = __require("./cpufeatures-6knf6x1a.node");
+  module.exports = __require("./cpufeatures-jxwx4v5j.node");
 });
 
 // ../../node_modules/.bun/cpu-features@0.0.10/node_modules/cpu-features/lib/index.js
@@ -6173,12 +6192,12 @@ var require_utils = __commonJS((exports, module) => {
 
 // ../../node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/protocol/crypto/build/Release/sshcrypto.node
 var require_sshcrypto = __commonJS((exports, module) => {
-  module.exports = __require("./sshcrypto-6px2c22x.node");
+  module.exports = __require("./sshcrypto-sx6755rw.node");
 });
 
 // ../../node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/protocol/crypto/poly1305.js
 var require_poly1305 = __commonJS((exports, module) => {
-  var __dirname = "/home/krhougs/tmex/node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/protocol/crypto", __filename = "/home/krhougs/tmex/node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/protocol/crypto/poly1305.js";
+  var __dirname = "/Users/krhougs/LocalCodes/tmex/node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/protocol/crypto", __filename = "/Users/krhougs/LocalCodes/tmex/node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/protocol/crypto/poly1305.js";
   var createPoly1305 = function() {
     var _scriptDir = typeof document !== "undefined" && document.currentScript ? document.currentScript.src : undefined;
     if (typeof __filename !== "undefined")
@@ -8951,7 +8970,7 @@ ${formatted}-----END ${type} KEY-----`;
 
 // ../../node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib/agent.js
 var require_agent = __commonJS((exports, module) => {
-  var __dirname = "/home/krhougs/tmex/node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib";
+  var __dirname = "/Users/krhougs/LocalCodes/tmex/node_modules/.bun/ssh2@1.17.0/node_modules/ssh2/lib";
   var { Socket } = __require("net");
   var { Duplex } = __require("stream");
   var { resolve } = __require("path");
@@ -20262,8 +20281,8 @@ var require_lib3 = __commonJS((exports, module) => {
 });
 
 // src/runtime/server.ts
-import { existsSync as existsSync2 } from "fs";
-import { extname, join as join2, normalize, resolve as resolve2, sep } from "path";
+import { existsSync as existsSync3 } from "fs";
+import { extname, join as join3, normalize, resolve as resolve2, sep } from "path";
 
 // ../../apps/gateway/src/crypto/errors.ts
 function contextLabel(context) {
@@ -22210,14 +22229,9 @@ function decodePaneWire(wire) {
     height: wire.height
   };
 }
-// ../../node_modules/.bun/uuid@11.1.0/node_modules/uuid/dist/esm/stringify.js
-var byteToHex = [];
-for (let i = 0;i < 256; ++i) {
-  byteToHex.push((i + 256).toString(16).slice(1));
-}
-function unsafeStringify(arr, offset = 0) {
-  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-}
+// ../../node_modules/.bun/uuid@11.1.0/node_modules/uuid/dist/esm/native.js
+import { randomUUID } from "crypto";
+var native_default = { randomUUID };
 
 // ../../node_modules/.bun/uuid@11.1.0/node_modules/uuid/dist/esm/rng.js
 import { randomFillSync } from "crypto";
@@ -22231,9 +22245,14 @@ function rng() {
   return rnds8Pool.slice(poolPtr, poolPtr += 16);
 }
 
-// ../../node_modules/.bun/uuid@11.1.0/node_modules/uuid/dist/esm/native.js
-import { randomUUID } from "crypto";
-var native_default = { randomUUID };
+// ../../node_modules/.bun/uuid@11.1.0/node_modules/uuid/dist/esm/stringify.js
+var byteToHex = [];
+for (let i = 0;i < 256; ++i) {
+  byteToHex.push((i + 256).toString(16).slice(1));
+}
+function unsafeStringify(arr, offset = 0) {
+  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+}
 
 // ../../node_modules/.bun/uuid@11.1.0/node_modules/uuid/dist/esm/v4.js
 function v4(options, buf, offset) {
@@ -51846,6 +51865,158 @@ var eventNotifier = new EventNotifier;
 
 // ../../apps/gateway/src/tmux/connection.ts
 var import_ssh2 = __toESM(require_lib3(), 1);
+import { homedir } from "os";
+
+// ../../apps/gateway/src/tmux/local-shell-path.ts
+import { existsSync } from "fs";
+import { delimiter, join as join2 } from "path";
+var SHELL_ENV_BEGIN_MARKER = "__TMEX_SHELL_ENV_BEGIN__";
+var SHELL_ENV_END_MARKER = "__TMEX_SHELL_ENV_END__";
+var SHELL_ENV_PROBE_COMMAND = `printf '${SHELL_ENV_BEGIN_MARKER}\\n'; /usr/bin/env; printf '${SHELL_ENV_END_MARKER}\\n'`;
+function defaultRunSync(cmd) {
+  const result = Bun.spawnSync(cmd, {
+    env: process.env,
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  return {
+    exitCode: result.exitCode,
+    stdout: Buffer.from(result.stdout).toString("utf8"),
+    stderr: Buffer.from(result.stderr).toString("utf8")
+  };
+}
+function resolveShellFromDscl(deps) {
+  if (deps.platform !== "darwin") {
+    return null;
+  }
+  const username = deps.env.USER?.trim() || deps.env.LOGNAME?.trim();
+  if (!username) {
+    return null;
+  }
+  const result = deps.runSync(["/usr/bin/dscl", ".", "-read", `/Users/${username}`, "UserShell"]);
+  if (result.exitCode !== 0) {
+    return null;
+  }
+  const matched = result.stdout.match(/UserShell:\s*(\S+)/);
+  const shellPath = matched?.[1]?.trim();
+  if (!shellPath || !deps.fileExists(shellPath)) {
+    return null;
+  }
+  return shellPath;
+}
+function resolveDefaultShell(deps) {
+  const envShell = deps.env.SHELL?.trim();
+  if (envShell && deps.fileExists(envShell)) {
+    return envShell;
+  }
+  const dsclShell = resolveShellFromDscl(deps);
+  if (dsclShell) {
+    return dsclShell;
+  }
+  const fallbackShell = deps.platform === "darwin" ? "/bin/zsh" : "/bin/bash";
+  if (deps.fileExists(fallbackShell)) {
+    return fallbackShell;
+  }
+  return null;
+}
+function extractPathFromShellEnv(stdout) {
+  const beginIndex = stdout.lastIndexOf(SHELL_ENV_BEGIN_MARKER);
+  if (beginIndex < 0) {
+    return null;
+  }
+  const endIndex = stdout.indexOf(SHELL_ENV_END_MARKER, beginIndex + SHELL_ENV_BEGIN_MARKER.length);
+  if (endIndex < 0) {
+    return null;
+  }
+  const body = stdout.slice(beginIndex + SHELL_ENV_BEGIN_MARKER.length, endIndex);
+  for (const rawLine of body.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line.startsWith("PATH=")) {
+      continue;
+    }
+    const value = line.slice("PATH=".length).trim();
+    return value.length > 0 ? value : null;
+  }
+  return null;
+}
+function canResolveExecutableFromPath(resolvedPath, executableName, deps) {
+  for (const rawDir of resolvedPath.split(delimiter)) {
+    const dir2 = rawDir.trim();
+    if (!dir2) {
+      continue;
+    }
+    if (deps.fileExists(join2(dir2, executableName))) {
+      return true;
+    }
+  }
+  return false;
+}
+function probeShellPath(shellPath, deps) {
+  const attempts = [
+    [shellPath, "-l", "-c", SHELL_ENV_PROBE_COMMAND],
+    [shellPath, "-l", "-i", "-c", SHELL_ENV_PROBE_COMMAND],
+    [shellPath, "-c", SHELL_ENV_PROBE_COMMAND]
+  ];
+  let fallbackPath = null;
+  for (const cmd of attempts) {
+    const result = deps.runSync(cmd);
+    if (result.exitCode !== 0) {
+      continue;
+    }
+    const resolvedPath = extractPathFromShellEnv(result.stdout);
+    if (!resolvedPath) {
+      continue;
+    }
+    fallbackPath ??= resolvedPath;
+    if (canResolveExecutableFromPath(resolvedPath, "tmux", deps)) {
+      return resolvedPath;
+    }
+  }
+  return fallbackPath;
+}
+function createLocalShellPathCache(input = {}) {
+  const deps = {
+    env: input.env ?? process.env,
+    fileExists: input.fileExists ?? existsSync,
+    platform: input.platform ?? process.platform,
+    runSync: input.runSync ?? defaultRunSync
+  };
+  let initialized = false;
+  let cachedPath = null;
+  return {
+    get() {
+      return initialized ? cachedPath : null;
+    },
+    prime() {
+      if (initialized) {
+        return cachedPath;
+      }
+      initialized = true;
+      const shellPath = resolveDefaultShell(deps);
+      if (!shellPath) {
+        return null;
+      }
+      cachedPath = probeShellPath(shellPath, deps);
+      return cachedPath;
+    }
+  };
+}
+var defaultLocalShellPathCache = createLocalShellPathCache();
+function primeLocalShellPath() {
+  return defaultLocalShellPathCache.prime();
+}
+function getLocalShellPath() {
+  return defaultLocalShellPathCache.get();
+}
+function buildLocalTmuxEnv(resolvedPath, baseEnv = process.env) {
+  if (!resolvedPath) {
+    return { ...baseEnv };
+  }
+  return {
+    ...baseEnv,
+    PATH: resolvedPath
+  };
+}
 
 // ../../apps/gateway/src/tmux/ssh-auth.ts
 function normalizeEnvValue(value) {
@@ -52321,6 +52492,9 @@ class TmuxControlParser {
 
 // ../../apps/gateway/src/tmux/connection.ts
 var BELL_DEDUP_WINDOW_MS = 200;
+function buildLocalTmuxCommand(sessionName, startDirectory) {
+  return ["tmux", "-CC", "new-session", "-A", "-c", startDirectory, "-s", sessionName];
+}
 
 class TmuxConnection {
   deviceId;
@@ -52441,7 +52615,10 @@ ${detail}`) : error;
   }
   async connectLocal() {
     const sessionName = this.device?.session ?? "tmex";
-    this.subprocess = Bun.spawn(["tmux", "-CC", "new-session", "-A", "-s", sessionName], {
+    const env = buildLocalTmuxEnv(getLocalShellPath());
+    const startDirectory = homedir();
+    this.subprocess = Bun.spawn(buildLocalTmuxCommand(sessionName, startDirectory), {
+      env,
       terminal: {
         name: "xterm-256color",
         cols: 80,
@@ -53951,7 +54128,7 @@ function json(data, status = 200, headers = {}) {
 }
 
 // ../../apps/gateway/src/db/migrate.ts
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { resolve } from "path";
 
 // ../../node_modules/.bun/drizzle-orm@0.45.1+3f568c6259dbead9/node_modules/drizzle-orm/migrator.js
@@ -53998,7 +54175,7 @@ function resolveMigrationsFolder() {
   if (fromEnv)
     return fromEnv;
   const byCwd = resolve(process.cwd(), "drizzle");
-  if (existsSync(byCwd))
+  if (existsSync2(byCwd))
     return byCwd;
   return resolve(import.meta.dir, "../../drizzle");
 }
@@ -55287,6 +55464,7 @@ async function createGatewayRuntime(options = {}) {
     ensureSiteSettingsInitialized();
   }
   runtimeController.reset();
+  primeLocalShellPath();
   const wsServer = new WebSocketServer;
   await telegramService.refresh();
   await pushSupervisor.start();
@@ -55598,9 +55776,9 @@ async function serveFrontend(req, staticRoot) {
   if (!requestedPath) {
     return new Response(t3("runtime.forbidden"), { status: 403 });
   }
-  const indexPath = join2(staticRoot, "index.html");
-  const targetPath = existsSync2(requestedPath) ? requestedPath : indexPath;
-  if (!existsSync2(targetPath)) {
+  const indexPath = join3(staticRoot, "index.html");
+  const targetPath = existsSync3(requestedPath) ? requestedPath : indexPath;
+  if (!existsSync3(targetPath)) {
     return new Response(t3("runtime.frontendMissing"), { status: 500 });
   }
   const headers = new Headers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmex-cli",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "bin": {
     "tmex": "./bin/tmex.js",