tmex-cli 0.6.6 → 0.6.8

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",
@@ -21442,6 +21472,7 @@ __export(exports_ws_borsh, {
   MAX_CHUNK_STREAMS: () => MAX_CHUNK_STREAMS,
   MAX_CHUNKS_PER_MESSAGE: () => MAX_CHUNKS_PER_MESSAGE,
   MAGIC: () => MAGIC,
+  KIND_TMUX_SET_WINDOW_STYLE: () => KIND_TMUX_SET_WINDOW_STYLE,
   KIND_TMUX_SELECT_WINDOW: () => KIND_TMUX_SELECT_WINDOW,
   KIND_TMUX_SELECT: () => KIND_TMUX_SELECT,
   KIND_TMUX_RENAME_WINDOW: () => KIND_TMUX_RENAME_WINDOW,
@@ -21515,6 +21546,7 @@ var KIND_TMUX_RENAME_WINDOW = 518;
 var KIND_TMUX_EVENT = 519;
 var KIND_STATE_SNAPSHOT = 520;
 var KIND_STATE_SNAPSHOT_DIFF = 521;
+var KIND_TMUX_SET_WINDOW_STYLE = 522;
 var KIND_TERM_INPUT = 769;
 var KIND_TERM_PASTE = 770;
 var KIND_TERM_RESIZE = 771;
@@ -21544,6 +21576,7 @@ var VALID_KINDS = new Set([
   KIND_TMUX_EVENT,
   KIND_STATE_SNAPSHOT,
   KIND_STATE_SNAPSHOT_DIFF,
+  KIND_TMUX_SET_WINDOW_STYLE,
   KIND_TERM_INPUT,
   KIND_TERM_PASTE,
   KIND_TERM_RESIZE,
@@ -21578,6 +21611,7 @@ function kindToString(kind) {
     [KIND_TMUX_EVENT]: "TMUX_EVENT",
     [KIND_STATE_SNAPSHOT]: "STATE_SNAPSHOT",
     [KIND_STATE_SNAPSHOT_DIFF]: "STATE_SNAPSHOT_DIFF",
+    [KIND_TMUX_SET_WINDOW_STYLE]: "TMUX_SET_WINDOW_STYLE",
     [KIND_TERM_INPUT]: "TERM_INPUT",
     [KIND_TERM_PASTE]: "TERM_PASTE",
     [KIND_TERM_RESIZE]: "TERM_RESIZE",
@@ -21639,6 +21673,7 @@ __export(exports_schema, {
   WindowCloseEventSchema: () => WindowCloseEventSchema,
   WindowAddEventSchema: () => WindowAddEventSchema,
   WindowActiveEventSchema: () => WindowActiveEventSchema,
+  TmuxSetWindowStyleSchema: () => TmuxSetWindowStyleSchema,
   TmuxSelectWindowSchema: () => TmuxSelectWindowSchema,
   TmuxSelectSchema: () => TmuxSelectSchema,
   TmuxRenameWindowSchema: () => TmuxRenameWindowSchema,
@@ -21765,6 +21800,10 @@ var TmuxRenameWindowSchema = import_zorsh.b.struct({
   windowId: import_zorsh.b.string(),
   name: import_zorsh.b.string()
 });
+var TmuxSetWindowStyleSchema = import_zorsh.b.struct({
+  deviceId: import_zorsh.b.string(),
+  style: import_zorsh.b.string()
+});
 var TmuxEventSchema = import_zorsh.b.struct({
   deviceId: import_zorsh.b.string(),
   eventType: import_zorsh.b.u8(),
@@ -21836,6 +21875,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 +22296,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 +22423,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)
@@ -53401,7 +53443,7 @@ function resolveTmuxWindowStyle(value) {
     return null;
   }
   if (!WINDOW_STYLE_PATTERN.test(style)) {
-    console.warn(`[tmex] ignoring invalid TMEX_TMUX_WINDOW_STYLE: ${style}`);
+    console.warn(`[tmex] ignoring invalid tmux window-style: ${style}`);
     return null;
   }
   return style;
@@ -53619,6 +53661,17 @@ class LocalExternalTmuxConnection {
       this.callbacks.onError(error);
     });
   }
+  setWindowStyle(style) {
+    if (!this.connected) {
+      return;
+    }
+    if (!resolveTmuxWindowStyle(config.tmuxWindowStyle)) {
+      return;
+    }
+    this.configureWindowStyle(style).catch((error) => {
+      this.callbacks.onError(error);
+    });
+  }
   async ensureSession() {
     const exists3 = await this.runTmuxAllowFailure(["has-session", "-t", this.sessionName]);
     if (exists3.exitCode === 0) {
@@ -53680,8 +53733,8 @@ class LocalExternalTmuxConnection {
     ]);
     await this.configureWindowStyle();
   }
-  async configureWindowStyle() {
-    const windowStyle = resolveTmuxWindowStyle(config.tmuxWindowStyle);
+  async configureWindowStyle(styleValue = config.tmuxWindowStyle) {
+    const windowStyle = resolveTmuxWindowStyle(styleValue);
     if (!windowStyle) {
       return;
     }
@@ -53985,10 +54038,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 +54114,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 +54130,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 +54635,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) ?? ""
@@ -54742,6 +54797,17 @@ class SshExternalTmuxConnection {
       this.callbacks.onError(error);
     });
   }
+  setWindowStyle(style) {
+    if (!this.connected) {
+      return;
+    }
+    if (!resolveTmuxWindowStyle(config.tmuxWindowStyle)) {
+      return;
+    }
+    this.configureWindowStyle(style).catch((error) => {
+      this.callbacks.onError(error);
+    });
+  }
   async connectSshClient() {
     if (!this.device) {
       throw new Error("SSH device not loaded");
@@ -54909,8 +54975,8 @@ class SshExternalTmuxConnection {
     ]);
     await this.configureWindowStyle();
   }
-  async configureWindowStyle() {
-    const windowStyle = resolveTmuxWindowStyle(config.tmuxWindowStyle);
+  async configureWindowStyle(styleValue = config.tmuxWindowStyle) {
+    const windowStyle = resolveTmuxWindowStyle(styleValue);
     if (!windowStyle) {
       return;
     }
@@ -55185,10 +55251,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 +55327,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 +55343,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;
       }
@@ -55647,6 +55714,9 @@ class DeviceSessionRuntime {
   renameWindow(windowId, name) {
     this.connection.renameWindow(windowId, name);
   }
+  setWindowStyle(style) {
+    this.connection.setWindowStyle(style);
+  }
   broadcast(action) {
     for (const listener of this.listeners) {
       try {
@@ -57279,6 +57349,7 @@ var defaultDeps2 = {
 class WebSocketServer {
   connections = new Map;
   pendingConnectionEntries = new Map;
+  windowCustomNames = new Map;
   deps;
   constructor(options = {}) {
     this.deps = {
@@ -57511,6 +57582,11 @@ class WebSocketServer {
         this.handleRenameWindow(decoded.deviceId, decoded.windowId, decoded.name);
         return;
       }
+      case exports_ws_borsh.KIND_TMUX_SET_WINDOW_STYLE: {
+        const decoded = exports_ws_borsh.decodePayload(exports_ws_borsh.schema.TmuxSetWindowStyleSchema, payload);
+        this.handleSetWindowStyle(decoded.deviceId, decoded.style);
+        return;
+      }
       case exports_ws_borsh.KIND_TERM_INPUT: {
         const decoded = exports_ws_borsh.decodePayload(exports_ws_borsh.schema.TermInputSchema, payload);
         if (decoded.isComposing)
@@ -57638,7 +57714,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 +57818,52 @@ 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?.lastSnapshot)
+      return;
+    this.sendSnapshotToClients(entry, entry.lastSnapshot);
+  }
+  handleSetWindowStyle(deviceId, style) {
     const entry = this.connections.get(deviceId);
     if (!entry)
       return;
-    entry.runtime.renameWindow(windowId, name);
+    entry.runtime.setWindowStyle(style);
+  }
+  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 +57982,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.6",
+  "version": "0.6.8",
   "type": "module",
   "bin": {
     "tmex": "./bin/tmex.js",