tmex-cli 0.8.2 → 0.9.1

package/dist/cli-node.js

@@ -556,6 +556,7 @@ After=network.target
 
 [Service]
 Type=simple
+KillMode=process
 WorkingDirectory=${escapedInstallDir}
 SyslogIdentifier=tmex
 StandardOutput=journal
@@ -595,6 +596,8 @@ function buildLaunchdPlist({
   <true/>
   <key>KeepAlive</key>
   <true/>
+  <key>AbandonProcessGroup</key>
+  <true/>
   <key>StandardOutPath</key>
   <string>${escapeXml(join3(installDir, "tmex.log"))}</string>
   <key>StandardErrorPath</key>

package/dist/runtime/server.js

@@ -32413,10 +32413,16 @@ var telegramBotChats = sqliteTable("telegram_bot_chats", {
 // ../../apps/gateway/src/db/client.ts
 var sqliteClient = null;
 var db = null;
+function applyPragmas(database) {
+  database.run("PRAGMA foreign_keys = ON");
+  database.run("PRAGMA journal_mode = WAL");
+  database.run("PRAGMA busy_timeout = 5000");
+  database.run("PRAGMA synchronous = NORMAL");
+}
 function ensureSqliteClient() {
   if (!sqliteClient) {
     sqliteClient = new Database2(config.databaseUrl);
-    sqliteClient.run("PRAGMA foreign_keys = ON");
+    applyPragmas(sqliteClient);
   }
   return sqliteClient;
 }
@@ -95733,6 +95739,9 @@ var TMEX_INJECTED_ENV_EXACT = new Set(["NODE_ENV", "DATABASE_URL", "GATEWAY_PORT
 function isTmexInjectedEnvKey(key) {
   return key.startsWith("TMEX_") || TMEX_INJECTED_ENV_EXACT.has(key);
 }
+function isUtf8Locale(value) {
+  return typeof value === "string" && /utf-?8/i.test(value);
+}
 function buildLocalTmuxEnv(resolvedPath, baseEnv = process.env) {
   const nextEnv = {};
   for (const [key, value] of Object.entries(baseEnv)) {
@@ -95744,8 +95753,8 @@ function buildLocalTmuxEnv(resolvedPath, baseEnv = process.env) {
   if (resolvedPath) {
     nextEnv.PATH = resolvedPath;
   }
-  if (!nextEnv.LC_CTYPE && !nextEnv.LC_ALL && !nextEnv.LANG) {
-    nextEnv.LC_CTYPE = "en_US.UTF-8";
+  if (!isUtf8Locale(nextEnv.LC_ALL) && (nextEnv.LC_ALL || !isUtf8Locale(nextEnv.LC_CTYPE) && !isUtf8Locale(nextEnv.LANG))) {
+    nextEnv.LC_ALL = "C.UTF-8";
   }
   return nextEnv;
 }
@@ -96625,6 +96634,76 @@ function encodeInputToHexChunks(input, chunkBytes = SEND_KEYS_HEX_CHUNK_BYTES) {
   return chunks;
 }
 
+// ../../apps/gateway/src/tmux-client/snapshot-format.ts
+var SNAPSHOT_FIELD_SEPARATOR = "|";
+var TMUX_SESSION_ID_PATTERN = /^\$\d+$/;
+var TMUX_WINDOW_ID_PATTERN = /^@\d+$/;
+var TMUX_PANE_ID_PATTERN = /^%\d+$/;
+function isTmuxSessionId(value) {
+  return typeof value === "string" && TMUX_SESSION_ID_PATTERN.test(value);
+}
+function isTmuxWindowId(value) {
+  return typeof value === "string" && TMUX_WINDOW_ID_PATTERN.test(value);
+}
+function isTmuxPaneId(value) {
+  return typeof value === "string" && TMUX_PANE_ID_PATTERN.test(value);
+}
+function parseSnapshotInteger(value) {
+  if (typeof value !== "string" || !/^\d+$/.test(value)) {
+    return null;
+  }
+  return Number.parseInt(value, 10);
+}
+function formatSnapshotRowForLog(line, limit = 160) {
+  if (line.length <= limit) {
+    return line;
+  }
+  return `${line.slice(0, Math.max(0, limit - 3))}...`;
+}
+function splitSnapshotFields(line, fieldCount) {
+  const parts = line.split(SNAPSHOT_FIELD_SEPARATOR);
+  if (parts.length <= fieldCount) {
+    return parts;
+  }
+  if (fieldCount === 2) {
+    return [parts[0] ?? "", parts.slice(1).join(SNAPSHOT_FIELD_SEPARATOR)];
+  }
+  if (fieldCount === 4) {
+    return [
+      parts[0] ?? "",
+      parts[1] ?? "",
+      parts.slice(2, -1).join(SNAPSHOT_FIELD_SEPARATOR),
+      parts.at(-1) ?? ""
+    ];
+  }
+  if (fieldCount === 8) {
+    return [
+      parts[0] ?? "",
+      parts[1] ?? "",
+      parts[2] ?? "",
+      parts.slice(3, -4).join(SNAPSHOT_FIELD_SEPARATOR),
+      parts.at(-4) ?? "",
+      parts.at(-3) ?? "",
+      parts.at(-2) ?? "",
+      parts.at(-1) ?? ""
+    ];
+  }
+  if (fieldCount === 9) {
+    return [
+      parts[0] ?? "",
+      parts[1] ?? "",
+      parts[2] ?? "",
+      parts.slice(3, -5).join(SNAPSHOT_FIELD_SEPARATOR),
+      parts.at(-5) ?? "",
+      parts.at(-4) ?? "",
+      parts.at(-3) ?? "",
+      parts.at(-2) ?? "",
+      parts.at(-1) ?? ""
+    ];
+  }
+  return parts;
+}
+
 // ../../apps/gateway/src/tmux-client/target-missing.ts
 class TmuxTargetMissingError extends Error {
   constructor(message) {
@@ -96848,7 +96927,7 @@ class LocalExternalTmuxConnection {
     if (!this.connected) {
       return;
     }
-    this.runAndRefresh(["select-window", "-t", windowId]).catch((error51) => {
+    this.runAndRefresh(["select-window", "-t", windowId], true).catch((error51) => {
       this.callbacks.onError(error51);
     });
   }
@@ -97272,14 +97351,14 @@ class LocalExternalTmuxConnection {
         "-p",
         "-t",
         this.sessionName,
-        "#{session_id}\t#{session_name}"
+        ["#{session_id}", "#{session_name}"].join(SNAPSHOT_FIELD_SEPARATOR)
       ]),
       this.runTmuxAllowFailure([
         "list-windows",
         "-t",
         this.sessionName,
         "-F",
-        "#{window_id}\t#{window_index}\t#{window_name}\t#{window_active}"
+        ["#{window_id}", "#{window_index}", "#{window_name}", "#{window_active}"].join(SNAPSHOT_FIELD_SEPARATOR)
       ]),
       this.runTmuxAllowFailure([
         "list-panes",
@@ -97287,7 +97366,17 @@ class LocalExternalTmuxConnection {
         "-t",
         this.sessionName,
         "-F",
-        "#{pane_id}\t#{window_id}\t#{pane_index}\t#{pane_title}\t#{pane_active}\t#{pane_width}\t#{pane_height}\t#{window_active}\t#{pane_current_command}"
+        [
+          "#{pane_id}",
+          "#{window_id}",
+          "#{pane_index}",
+          "#{pane_title}",
+          "#{pane_active}",
+          "#{pane_width}",
+          "#{pane_height}",
+          "#{window_active}",
+          "#{pane_current_command}"
+        ].join(SNAPSHOT_FIELD_SEPARATOR)
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
@@ -97311,6 +97400,7 @@ ${panesRes.stderr}`;
     this.parseSnapshotSession(sessionRes.stdout.split(/\r?\n/));
     this.parseSnapshotWindows(windowsRes.stdout.split(/\r?\n/));
     this.parseSnapshotPanes(panesRes.stdout.split(/\r?\n/));
+    this.discardInvalidSnapshot();
     this.controlSubscription?.prunePanes(new Set(this.getExpectedPaneIds()));
     this.emitSnapshot();
   }
@@ -97320,9 +97410,11 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [id, name24] = line.split("\t");
-      if (id) {
+      const [id, name24] = splitSnapshotFields(line, 2);
+      if (isTmuxSessionId(id)) {
         this.snapshotSession = { id, name: name24 ?? "" };
+      } else {
+        console.warn(`[local] ignoring invalid tmux session id on ${this.deviceId}: ${id ?? ""}`);
       }
       return;
     }
@@ -97333,18 +97425,19 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [id, indexRaw, name24, activeRaw] = line.split("\t");
-      if (!id) {
+      const [id, indexRaw, name24, activeRaw] = splitSnapshotFields(line, 4);
+      const index = parseSnapshotInteger(indexRaw);
+      if (!isTmuxWindowId(id) || index === null || !this.isSnapshotFlag(activeRaw)) {
+        console.warn(`[local] ignoring invalid tmux window snapshot row on ${this.deviceId}: ${formatSnapshotRowForLog(line)}`);
         continue;
       }
-      const index = Number.parseInt(indexRaw ?? "", 10);
       const active = activeRaw === "1";
       if (active) {
         this.activeWindowId = id;
       }
       this.snapshotWindows.set(id, {
         id,
-        index: Number.isNaN(index) ? 0 : index,
+        index,
         name: name24 ?? "",
         active,
         panes: []
@@ -97359,22 +97452,23 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw, currentCommandRaw] = line.split("\t");
-      if (!paneId || !windowId) {
+      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw, currentCommandRaw] = splitSnapshotFields(line, 9);
+      const index = parseSnapshotInteger(indexRaw);
+      const width = parseSnapshotInteger(widthRaw);
+      const height = parseSnapshotInteger(heightRaw);
+      if (!isTmuxPaneId(paneId) || !isTmuxWindowId(windowId) || index === null || width === null || height === null || !this.isSnapshotFlag(activeRaw) || !this.isSnapshotFlag(windowActiveRaw)) {
+        console.warn(`[local] ignoring invalid tmux pane snapshot row on ${this.deviceId}: ${formatSnapshotRowForLog(line)}`);
         continue;
       }
-      const index = Number.parseInt(indexRaw ?? "", 10);
-      const width = Number.parseInt(widthRaw ?? "", 10);
-      const height = Number.parseInt(heightRaw ?? "", 10);
       const pane = {
         id: paneId,
         windowId,
-        index: Number.isNaN(index) ? 0 : index,
+        index,
         title: this.pendingPaneTitles.get(paneId) ?? (titleRaw?.trim() ? titleRaw : undefined),
         currentCommand: currentCommandRaw?.trim() ? currentCommandRaw.trim() : undefined,
         active: activeRaw === "1",
-        width: Number.isNaN(width) ? 0 : width,
-        height: Number.isNaN(height) ? 0 : height
+        width,
+        height
       };
       if (pane.active && windowActiveRaw === "1") {
         this.activePaneId = paneId;
@@ -97391,6 +97485,23 @@ ${panesRes.stderr}`;
       window2.panes.sort((left, right) => left.index - right.index);
     }
   }
+  isSnapshotFlag(value) {
+    return value === "0" || value === "1";
+  }
+  discardInvalidSnapshot() {
+    if (!this.snapshotSession) {
+      this.snapshotWindows.clear();
+      this.activeWindowId = null;
+      this.activePaneId = null;
+      return;
+    }
+    if (this.snapshotWindows.size === 0) {
+      console.warn(`[local] ignoring tmux snapshot with no valid windows on ${this.deviceId}`);
+      this.snapshotSession = null;
+      this.activeWindowId = null;
+      this.activePaneId = null;
+    }
+  }
   emitSnapshot() {
     const session = this.snapshotSession ? {
       id: this.snapshotSession.id,
@@ -97451,6 +97562,7 @@ ${panesRes.stderr}`;
       this.recoverFromTargetMissingError(message);
       return result;
     }
+    console.warn(`[local] tmux command failed deviceId=${this.deviceId} sessionName=${this.sessionName} argv=${argv.join(" ")} exitCode=${result.exitCode}: ${message}`);
     this.notifyRuntimeError(message);
     if (this.connected && !this.manualDisconnect && this.isTmuxServerGoneMessage(message)) {
       console.warn(`[local] tmux server gone on ${this.deviceId}: ${message}`);
@@ -97862,51 +97974,12 @@ function hasRenderableTerminalContent2(value) {
 }
 var BELL_DEDUP_WINDOW_MS2 = 200;
 var COMMAND_SENTINEL = "\x1ETMEX_END ";
-var SNAPSHOT_FIELD_SEPARATOR = "|";
 var CONTROL_MAX_RESTARTS2 = 3;
 var CONTROL_RESTART_DELAY_MS2 = 500;
 var CONTROL_STABLE_RESET_MS2 = 1e4;
 var CONTROL_STDERR_TAIL_LIMIT2 = 2048;
 var CONTROL_ATTACH_READY_TIMEOUT_MS2 = 3000;
 var PARKING_WINDOW_NAME2 = "tmex-park";
-function splitSnapshotFields(line, fieldCount) {
-  const parts = line.split(SNAPSHOT_FIELD_SEPARATOR);
-  if (parts.length <= fieldCount) {
-    return parts;
-  }
-  if (fieldCount === 2) {
-    return [parts[0] ?? "", parts.slice(1).join(SNAPSHOT_FIELD_SEPARATOR)];
-  }
-  if (fieldCount === 4) {
-    return [parts[0] ?? "", parts[1] ?? "", parts.slice(2, -1).join(SNAPSHOT_FIELD_SEPARATOR), parts.at(-1) ?? ""];
-  }
-  if (fieldCount === 8) {
-    return [
-      parts[0] ?? "",
-      parts[1] ?? "",
-      parts[2] ?? "",
-      parts.slice(3, -4).join(SNAPSHOT_FIELD_SEPARATOR),
-      parts.at(-4) ?? "",
-      parts.at(-3) ?? "",
-      parts.at(-2) ?? "",
-      parts.at(-1) ?? ""
-    ];
-  }
-  if (fieldCount === 9) {
-    return [
-      parts[0] ?? "",
-      parts[1] ?? "",
-      parts[2] ?? "",
-      parts.slice(3, -5).join(SNAPSHOT_FIELD_SEPARATOR),
-      parts.at(-5) ?? "",
-      parts.at(-4) ?? "",
-      parts.at(-3) ?? "",
-      parts.at(-2) ?? "",
-      parts.at(-1) ?? ""
-    ];
-  }
-  return parts;
-}
 
 class SshExternalTmuxConnection {
   deviceId;
@@ -98018,7 +98091,7 @@ class SshExternalTmuxConnection {
     if (!this.connected) {
       return;
     }
-    this.runAndRefresh(["select-window", "-t", windowId]).catch((error51) => {
+    this.runAndRefresh(["select-window", "-t", windowId], true).catch((error51) => {
       this.callbacks.onError(error51);
     });
   }
@@ -98558,6 +98631,7 @@ ${panesRes.stderr}`;
     this.parseSnapshotSession(sessionRes.stdout.split(/\r?\n/));
     this.parseSnapshotWindows(windowsRes.stdout.split(/\r?\n/));
     this.parseSnapshotPanes(panesRes.stdout.split(/\r?\n/));
+    this.discardInvalidSnapshot();
     this.controlSubscription?.prunePanes(new Set(this.getExpectedPaneIds()));
     this.emitSnapshot();
   }
@@ -98568,8 +98642,10 @@ ${panesRes.stderr}`;
         continue;
       }
       const [id, name24] = splitSnapshotFields(line, 2);
-      if (id) {
+      if (isTmuxSessionId(id)) {
         this.snapshotSession = { id, name: name24 ?? "" };
+      } else {
+        console.warn(`[ssh] ignoring invalid tmux session id on ${this.deviceId}: ${id ?? ""}`);
       }
       return;
     }
@@ -98581,17 +98657,18 @@ ${panesRes.stderr}`;
         continue;
       }
       const [id, indexRaw, name24, activeRaw] = splitSnapshotFields(line, 4);
-      if (!id) {
+      const index = parseSnapshotInteger(indexRaw);
+      if (!isTmuxWindowId(id) || index === null || !this.isSnapshotFlag(activeRaw)) {
+        console.warn(`[ssh] ignoring invalid tmux window snapshot row on ${this.deviceId}: ${formatSnapshotRowForLog(line)}`);
         continue;
       }
-      const index = Number.parseInt(indexRaw ?? "", 10);
       const active = activeRaw === "1";
       if (active) {
         this.activeWindowId = id;
       }
       this.snapshotWindows.set(id, {
         id,
-        index: Number.isNaN(index) ? 0 : index,
+        index,
         name: name24 ?? "",
         active,
         panes: []
@@ -98607,21 +98684,22 @@ ${panesRes.stderr}`;
         continue;
       }
       const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw, currentCommandRaw] = splitSnapshotFields(line, 9);
-      if (!paneId || !windowId) {
+      const index = parseSnapshotInteger(indexRaw);
+      const width = parseSnapshotInteger(widthRaw);
+      const height = parseSnapshotInteger(heightRaw);
+      if (!isTmuxPaneId(paneId) || !isTmuxWindowId(windowId) || index === null || width === null || height === null || !this.isSnapshotFlag(activeRaw) || !this.isSnapshotFlag(windowActiveRaw)) {
+        console.warn(`[ssh] ignoring invalid tmux pane snapshot row on ${this.deviceId}: ${formatSnapshotRowForLog(line)}`);
         continue;
       }
-      const index = Number.parseInt(indexRaw ?? "", 10);
-      const width = Number.parseInt(widthRaw ?? "", 10);
-      const height = Number.parseInt(heightRaw ?? "", 10);
       const pane = {
         id: paneId,
         windowId,
-        index: Number.isNaN(index) ? 0 : index,
+        index,
         title: this.pendingPaneTitles.get(paneId) ?? (titleRaw?.trim() ? titleRaw : undefined),
         currentCommand: currentCommandRaw?.trim() ? currentCommandRaw.trim() : undefined,
         active: activeRaw === "1",
-        width: Number.isNaN(width) ? 0 : width,
-        height: Number.isNaN(height) ? 0 : height
+        width,
+        height
       };
       if (pane.active && windowActiveRaw === "1") {
         this.activePaneId = paneId;
@@ -98638,6 +98716,23 @@ ${panesRes.stderr}`;
       window2.panes.sort((left, right) => left.index - right.index);
     }
   }
+  isSnapshotFlag(value) {
+    return value === "0" || value === "1";
+  }
+  discardInvalidSnapshot() {
+    if (!this.snapshotSession) {
+      this.snapshotWindows.clear();
+      this.activeWindowId = null;
+      this.activePaneId = null;
+      return;
+    }
+    if (this.snapshotWindows.size === 0) {
+      console.warn(`[ssh] ignoring tmux snapshot with no valid windows on ${this.deviceId}`);
+      this.snapshotSession = null;
+      this.activeWindowId = null;
+      this.activePaneId = null;
+    }
+  }
   emitSnapshot() {
     const session = this.snapshotSession ? {
       id: this.snapshotSession.id,
@@ -98698,6 +98793,7 @@ ${panesRes.stderr}`;
       this.recoverFromTargetMissingError(message);
       return result;
     }
+    console.warn(`[ssh] tmux command failed deviceId=${this.deviceId} sessionName=${this.sessionName} argv=${argv.join(" ")} exitCode=${result.exitCode}: ${message}`);
     updateDeviceRuntimeStatus(this.deviceId, {
       lastSeenAt: new Date().toISOString(),
       tmuxAvailable: false,
@@ -105067,6 +105163,7 @@ class SwitchBarrier {
     console.warn(`[switch-barrier] Transaction timeout at stage: ${stage} for ${deviceId}`);
     if (stage === "history") {
       this.sendLiveResume(ws, deviceId, expectedToken);
+      sessionStateStore.stopOutputBuffering(ws, deviceId);
       pending.callbacks.onTimeout?.(stage);
       return;
     }
@@ -105566,17 +105663,15 @@ class WebSocketServer {
   }
   handleTmuxSelect(ws, data) {
     const deviceId = data.deviceId;
-    const paneId = data.paneId ?? undefined;
-    if (paneId) {
-      ws.data.borshState.selectedPanes[deviceId] = paneId;
-      this.refreshSnapshotPolling(deviceId);
-    }
     const entry = this.connections.get(deviceId);
     if (!entry)
       return;
     const windowId = data.windowId ?? undefined;
+    const paneId = data.paneId ?? undefined;
     if (!windowId || !paneId)
       return;
+    if (!this.canSelectPane(entry, deviceId, windowId, paneId))
+      return;
     const started = switchBarrier.startTransaction(ws, {
       deviceId,
       windowId,
@@ -105590,6 +105685,8 @@ class WebSocketServer {
       this.sendError(ws, null, exports_ws_borsh.ERROR_SELECT_CONFLICT, "Failed to start select transaction", false);
       return;
     }
+    ws.data.borshState.selectedPanes[deviceId] = paneId;
+    this.refreshSnapshotPolling(deviceId);
     switchBarrier.sendSwitchAck(ws, deviceId);
     const cols = data.cols ?? null;
     const rows = data.rows ?? null;
@@ -105603,8 +105700,41 @@ class WebSocketServer {
     const entry = this.connections.get(deviceId);
     if (!entry)
       return;
+    if (!this.canSelectWindow(entry, deviceId, windowId))
+      return;
     entry.runtime.selectWindow(windowId);
   }
+  canSelectWindow(entry, deviceId, windowId) {
+    if (!isTmuxWindowId(windowId)) {
+      console.warn(`[ws] rejecting invalid tmux window id on ${deviceId}: ${windowId ?? ""}`);
+      entry.runtime.requestSnapshot();
+      return false;
+    }
+    const windows = entry.lastSnapshot?.session?.windows;
+    if (!windows?.some((window2) => window2.id === windowId)) {
+      console.warn(`[ws] rejecting missing tmux window id on ${deviceId}: ${windowId}`);
+      entry.runtime.requestSnapshot();
+      return false;
+    }
+    return true;
+  }
+  canSelectPane(entry, deviceId, windowId, paneId) {
+    if (!this.canSelectWindow(entry, deviceId, windowId)) {
+      return false;
+    }
+    if (!isTmuxPaneId(paneId)) {
+      console.warn(`[ws] rejecting invalid tmux pane id on ${deviceId}: ${paneId ?? ""}`);
+      entry.runtime.requestSnapshot();
+      return false;
+    }
+    const window2 = entry.lastSnapshot?.session?.windows.find((candidate) => candidate.id === windowId);
+    if (!window2?.panes.some((pane) => pane.id === paneId)) {
+      console.warn(`[ws] rejecting missing tmux pane id on ${deviceId}: ${paneId}`);
+      entry.runtime.requestSnapshot();
+      return false;
+    }
+    return true;
+  }
   handleTermInput(deviceId, paneId, data) {
     const entry = this.connections.get(deviceId);
     if (!entry)

package/package.json

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