tmex-cli 0.6.5 → 0.6.7

package/dist/runtime/server.js

@@ -20666,7 +20666,17 @@ Time: {{time}}`,
       },
       window: {
         noWindows: "No windows",
-        new: "New Window"
+        new: "New Window",
+        close: "Close window",
+        closePane: "Close pane",
+        closeConfirmTitle: "Close this window?",
+        closePaneConfirmTitle: "Close this pane?",
+        closeConfirmDesc: 'Processes running in "{{name}}" will be terminated. This action cannot be undone.',
+        menu: "Window actions",
+        rename: "Rename window",
+        renamePlaceholder: "Enter a name",
+        renameDesc: "The custom name overrides the title set by the terminal and is kept until the gateway restarts.",
+        renameReset: "Use automatic name"
       },
       validation: {
         deviceNameRequired: "Device name is required",
@@ -21031,7 +21041,17 @@ Bot\uFF1A{{botName}}
       },
       window: {
         noWindows: "\u6682\u65E0\u7A97\u53E3",
-        new: "\u65B0\u5EFA\u7A97\u53E3"
+        new: "\u65B0\u5EFA\u7A97\u53E3",
+        close: "\u5173\u95ED\u7A97\u53E3",
+        closePane: "\u5173\u95ED\u9762\u677F",
+        closeConfirmTitle: "\u5173\u95ED\u6B64\u7A97\u53E3\uFF1F",
+        closePaneConfirmTitle: "\u5173\u95ED\u6B64\u9762\u677F\uFF1F",
+        closeConfirmDesc: '"{{name}}" \u4E2D\u8FD0\u884C\u7684\u8FDB\u7A0B\u5C06\u88AB\u7EC8\u6B62\uFF0C\u6B64\u64CD\u4F5C\u65E0\u6CD5\u64A4\u9500\u3002',
+        menu: "\u7A97\u53E3\u64CD\u4F5C",
+        rename: "\u91CD\u547D\u540D\u7A97\u53E3",
+        renamePlaceholder: "\u8F93\u5165\u540D\u79F0",
+        renameDesc: "\u81EA\u5B9A\u4E49\u540D\u79F0\u4F1A\u8986\u76D6\u7EC8\u7AEF\u8BBE\u7F6E\u7684\u6807\u9898\uFF0C\u5E76\u4FDD\u7559\u81F3 gateway \u91CD\u542F\u3002",
+        renameReset: "\u6062\u590D\u81EA\u52A8\u540D\u79F0"
       },
       validation: {
         deviceNameRequired: "\u8BBE\u5907\u540D\u79F0\u4E3A\u5FC5\u586B\u9879",
@@ -21396,7 +21416,17 @@ Bot\uFF1A{{botName}}
       },
       window: {
         noWindows: "\u30A6\u30A3\u30F3\u30C9\u30A6\u304C\u3042\u308A\u307E\u305B\u3093",
-        new: "\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6"
+        new: "\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6",
+        close: "\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u9589\u3058\u308B",
+        closePane: "\u30DA\u30A4\u30F3\u3092\u9589\u3058\u308B",
+        closeConfirmTitle: "\u3053\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u9589\u3058\u307E\u3059\u304B\uFF1F",
+        closePaneConfirmTitle: "\u3053\u306E\u30DA\u30A4\u30F3\u3092\u9589\u3058\u307E\u3059\u304B\uFF1F",
+        closeConfirmDesc: '"{{name}}" \u3067\u5B9F\u884C\u4E2D\u306E\u30D7\u30ED\u30BB\u30B9\u306F\u7D42\u4E86\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u64CD\u4F5C\u306F\u53D6\u308A\u6D88\u305B\u307E\u305B\u3093\u3002',
+        menu: "\u30A6\u30A3\u30F3\u30C9\u30A6\u64CD\u4F5C",
+        rename: "\u30A6\u30A3\u30F3\u30C9\u30A6\u540D\u3092\u5909\u66F4",
+        renamePlaceholder: "\u540D\u524D\u3092\u5165\u529B",
+        renameDesc: "\u30AB\u30B9\u30BF\u30E0\u540D\u306F\u30BF\u30FC\u30DF\u30CA\u30EB\u304C\u8A2D\u5B9A\u3057\u305F\u30BF\u30A4\u30C8\u30EB\u3092\u4E0A\u66F8\u304D\u3057\u3001\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u304C\u518D\u8D77\u52D5\u3059\u308B\u307E\u3067\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002",
+        renameReset: "\u81EA\u52D5\u540D\u306B\u623B\u3059"
       },
       validation: {
         deviceNameRequired: "\u30C7\u30D0\u30A4\u30B9\u540D\u306F\u5FC5\u9808\u3067\u3059",
@@ -21836,6 +21866,7 @@ var PaneWireSchema = import_zorsh.b.struct({
 var WindowWireSchema = import_zorsh.b.struct({
   id: import_zorsh.b.string(),
   name: import_zorsh.b.string(),
+  customName: OptionStringSchema,
   index: import_zorsh.b.u16(),
   active: import_zorsh.b.bool(),
   panes: import_zorsh.b.vec(PaneWireSchema)
@@ -22256,6 +22287,7 @@ function encodeWindowWire(window2) {
   return {
     id: window2.id,
     name: window2.name,
+    customName: window2.customName ?? null,
     index: window2.index,
     active: window2.active,
     panes: window2.panes.map(encodePaneWire)
@@ -22382,6 +22414,7 @@ function decodeWindowWire(wire) {
   return {
     id: wire.id,
     name: wire.name,
+    customName: wire.customName ?? undefined,
     index: wire.index,
     active: wire.active,
     panes: wire.panes.map(decodePaneWire)
@@ -53985,10 +54018,11 @@ class LocalExternalTmuxConnection {
       ]),
       this.runTmuxAllowFailure([
         "list-panes",
+        "-s",
         "-t",
         this.sessionName,
         "-F",
-        "#{pane_id}\t#{window_id}\t#{pane_index}\t#{pane_title}\t#{pane_active}\t#{pane_width}\t#{pane_height}"
+        "#{pane_id}\t#{window_id}\t#{pane_index}\t#{pane_title}\t#{pane_active}\t#{pane_width}\t#{pane_height}\t#{window_active}"
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
@@ -54060,7 +54094,7 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw] = line.split("\t");
+      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw] = line.split("\t");
       if (!paneId || !windowId) {
         continue;
       }
@@ -54076,7 +54110,7 @@ ${panesRes.stderr}`;
         width: Number.isNaN(width) ? 0 : width,
         height: Number.isNaN(height) ? 0 : height
       };
-      if (pane.active) {
+      if (pane.active && windowActiveRaw === "1") {
         this.activePaneId = paneId;
         this.activeWindowId = windowId;
       }
@@ -54581,12 +54615,13 @@ function splitSnapshotFields(line, fieldCount) {
   if (fieldCount === 4) {
     return [parts[0] ?? "", parts[1] ?? "", parts.slice(2, -1).join(SNAPSHOT_FIELD_SEPARATOR), parts.at(-1) ?? ""];
   }
-  if (fieldCount === 7) {
+  if (fieldCount === 8) {
     return [
       parts[0] ?? "",
       parts[1] ?? "",
       parts[2] ?? "",
-      parts.slice(3, -3).join(SNAPSHOT_FIELD_SEPARATOR),
+      parts.slice(3, -4).join(SNAPSHOT_FIELD_SEPARATOR),
+      parts.at(-4) ?? "",
       parts.at(-3) ?? "",
       parts.at(-2) ?? "",
       parts.at(-1) ?? ""
@@ -55185,10 +55220,11 @@ class SshExternalTmuxConnection {
       ]),
       this.runTmuxAllowFailure([
         "list-panes",
+        "-s",
         "-t",
         this.sessionName,
         "-F",
-        "#{pane_id}|#{window_id}|#{pane_index}|#{pane_title}|#{pane_active}|#{pane_width}|#{pane_height}"
+        "#{pane_id}|#{window_id}|#{pane_index}|#{pane_title}|#{pane_active}|#{pane_width}|#{pane_height}|#{window_active}"
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
@@ -55260,7 +55296,7 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw] = splitSnapshotFields(line, 7);
+      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw] = splitSnapshotFields(line, 8);
       if (!paneId || !windowId) {
         continue;
       }
@@ -55276,7 +55312,7 @@ ${panesRes.stderr}`;
         width: Number.isNaN(width) ? 0 : width,
         height: Number.isNaN(height) ? 0 : height
       };
-      if (pane.active) {
+      if (pane.active && windowActiveRaw === "1") {
         this.activePaneId = paneId;
         this.activeWindowId = windowId;
       }
@@ -57279,6 +57315,7 @@ var defaultDeps2 = {
 class WebSocketServer {
   connections = new Map;
   pendingConnectionEntries = new Map;
+  windowCustomNames = new Map;
   deps;
   constructor(options = {}) {
     this.deps = {
@@ -57638,7 +57675,7 @@ class WebSocketServer {
     });
     this.sendEnvelope(ws, exports_ws_borsh.KIND_DEVICE_CONNECTED, connectedPayload);
     if (entry.lastSnapshot) {
-      const snapshotBytes = exports_ws_borsh.encodeStateSnapshot(entry.lastSnapshot);
+      const snapshotBytes = exports_ws_borsh.encodeStateSnapshot(this.applyWindowCustomNames(entry.lastSnapshot));
       this.sendChunked(ws, exports_ws_borsh.KIND_STATE_SNAPSHOT, snapshotBytes);
     } else {
       entry.runtime.requestSnapshot();
@@ -57742,10 +57779,46 @@ class WebSocketServer {
     entry.runtime.closePane(paneId);
   }
   handleRenameWindow(deviceId, windowId, name) {
+    const trimmed = name.trim().slice(0, 64);
+    const names = this.windowCustomNames.get(deviceId);
+    if (!trimmed) {
+      names?.delete(windowId);
+    } else if (names) {
+      names.set(windowId, trimmed);
+    } else {
+      this.windowCustomNames.set(deviceId, new Map([[windowId, trimmed]]));
+    }
     const entry = this.connections.get(deviceId);
-    if (!entry)
+    if (!entry?.lastSnapshot)
       return;
-    entry.runtime.renameWindow(windowId, name);
+    this.sendSnapshotToClients(entry, entry.lastSnapshot);
+  }
+  applyWindowCustomNames(payload) {
+    const names = this.windowCustomNames.get(payload.deviceId);
+    if (!names?.size || !payload.session)
+      return payload;
+    const liveWindowIds = new Set(payload.session.windows.map((w) => w.id));
+    for (const windowId of names.keys()) {
+      if (!liveWindowIds.has(windowId)) {
+        names.delete(windowId);
+      }
+    }
+    return {
+      ...payload,
+      session: {
+        ...payload.session,
+        windows: payload.session.windows.map((window2) => {
+          const customName = names.get(window2.id);
+          return customName ? { ...window2, customName } : window2;
+        })
+      }
+    };
+  }
+  sendSnapshotToClients(entry, payload) {
+    const payloadBytes = exports_ws_borsh.encodeStateSnapshot(this.applyWindowCustomNames(payload));
+    for (const client of entry.clients) {
+      this.sendChunked(client, exports_ws_borsh.KIND_STATE_SNAPSHOT, payloadBytes);
+    }
   }
   async createDeviceConnectionEntry(deviceId, ws) {
     let runtime = null;
@@ -57864,10 +57937,7 @@ class WebSocketServer {
     if (!entry)
       return;
     entry.lastSnapshot = payload;
-    const payloadBytes = exports_ws_borsh.encodeStateSnapshot(payload);
-    for (const client of entry.clients) {
-      this.sendChunked(client, exports_ws_borsh.KIND_STATE_SNAPSHOT, payloadBytes);
-    }
+    this.sendSnapshotToClients(entry, payload);
   }
   broadcastTerminalOutput(deviceId, paneId, data) {
     const entry = this.connections.get(deviceId);

package/package.json

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