tmex-cli 0.8.0 → 0.8.1

package/dist/runtime/server.js

@@ -22669,6 +22669,8 @@ var I18N_RESOURCES = {
         disconnect: "Disconnect",
         disconnected: "Disconnected",
         connecting: "Connecting...",
+        dragHandle: "Drag to reorder device",
+        reorderFailed: "Failed to reorder devices",
         deleteConfirm: "Delete this device?",
         deleteDescription: 'Device "{{name}}" will be permanently removed. This action cannot be undone.',
         deleteSuccess: "Device deleted",
@@ -23010,6 +23012,8 @@ Time: {{time}}`,
         time: "Time",
         directLink: "Direct Link",
         message: "Message",
+        paneTitle: "Title",
+        process: "Process",
         telegramBell: {
           title: "\uD83D\uDD14 Bell from {{siteName}}: {{terminalTopbarLabel}}",
           viewLink: "Click to view",
@@ -23028,7 +23032,8 @@ Time: {{time}}`,
           summaryTriggered: 'Watch "{{name}}": {{summary}}',
           unconfirmedSuffix: " (model unavailable, not LLM-confirmed)",
           modelUnavailable: 'Watch "{{name}}" model call failed: {{message}}',
-          ruleError: 'Watch "{{name}}" failed {{count}} times in a row and has been disabled: {{message}}'
+          ruleError: 'Watch "{{name}}" failed {{count}} times in a row and has been disabled: {{message}}',
+          paneGone: 'Watch "{{name}}" pane ({{paneId}}) was destroyed; the rule has been removed'
         }
       },
       sidebar: {
@@ -23087,7 +23092,7 @@ Time: {{time}}`,
         },
         session: {
           none: "No session selected",
-          new: "New session",
+          new: "New agent session",
           switch: "Switch session",
           selectPaneHint: "Select a pane in the Panes tab to start a session",
           noSessions: "No sessions yet",
@@ -23147,6 +23152,8 @@ Time: {{time}}`,
         closePaneConfirmTitle: "Close this pane?",
         closeConfirmDesc: 'Processes running in "{{name}}" will be terminated. This action cannot be undone.',
         menu: "Window actions",
+        dragHandle: "Drag to reorder window",
+        dragHandlePane: "Drag to reorder pane",
         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.",
@@ -23359,6 +23366,8 @@ Time: {{time}}`,
         disconnect: "\u65AD\u5F00",
         disconnected: "\u5DF2\u65AD\u5F00",
         connecting: "\u8FDE\u63A5\u4E2D...",
+        dragHandle: "\u62D6\u52A8\u4EE5\u8C03\u6574\u8BBE\u5907\u987A\u5E8F",
+        reorderFailed: "\u8BBE\u5907\u6392\u5E8F\u5931\u8D25",
         deleteConfirm: "\u5220\u9664\u6B64\u8BBE\u5907\uFF1F",
         deleteDescription: '\u8BBE\u5907 "{{name}}" \u5C06\u88AB\u6C38\u4E45\u79FB\u9664\uFF0C\u6B64\u64CD\u4F5C\u65E0\u6CD5\u64A4\u9500\u3002',
         deleteSuccess: "\u8BBE\u5907\u5DF2\u5220\u9664",
@@ -23700,6 +23709,8 @@ Bot\uFF1A{{botName}}
         time: "\u65F6\u95F4",
         directLink: "\u76F4\u8FBE",
         message: "\u4FE1\u606F",
+        paneTitle: "\u6807\u9898",
+        process: "\u8FDB\u7A0B",
         telegramBell: {
           title: "\uD83D\uDD14 \u6765\u81EA {{siteName}} \u7684 Bell\uFF1A{{terminalTopbarLabel}}",
           viewLink: "\u70B9\u51FB\u67E5\u770B",
@@ -23718,7 +23729,8 @@ Bot\uFF1A{{botName}}
           summaryTriggered: "\u76D1\u63A7\u300C{{name}}\u300D\uFF1A{{summary}}",
           unconfirmedSuffix: "\uFF08\u6A21\u578B\u4E0D\u53EF\u7528\uFF0C\u672A\u7ECF LLM \u4E8C\u6B21\u786E\u8BA4\uFF09",
           modelUnavailable: "\u76D1\u63A7\u300C{{name}}\u300D\u6A21\u578B\u8C03\u7528\u5931\u8D25\uFF1A{{message}}",
-          ruleError: "\u76D1\u63A7\u300C{{name}}\u300D\u8FDE\u7EED\u5931\u8D25 {{count}} \u6B21\uFF0C\u5DF2\u81EA\u52A8\u505C\u7528\uFF1A{{message}}"
+          ruleError: "\u76D1\u63A7\u300C{{name}}\u300D\u8FDE\u7EED\u5931\u8D25 {{count}} \u6B21\uFF0C\u5DF2\u81EA\u52A8\u505C\u7528\uFF1A{{message}}",
+          paneGone: "\u76D1\u63A7\u300C{{name}}\u300D\u7684 Pane\uFF08{{paneId}}\uFF09\u5DF2\u9500\u6BC1\uFF0C\u89C4\u5219\u5DF2\u81EA\u52A8\u5220\u9664"
         }
       },
       sidebar: {
@@ -23777,7 +23789,7 @@ Bot\uFF1A{{botName}}
         },
         session: {
           none: "\u672A\u9009\u62E9\u4F1A\u8BDD",
-          new: "\u65B0\u5EFA\u4F1A\u8BDD",
+          new: "\u65B0\u5EFA Agent \u4F1A\u8BDD",
           switch: "\u5207\u6362\u4F1A\u8BDD",
           selectPaneHint: "\u8BF7\u5728 Panes \u6807\u7B7E\u4E2D\u9009\u62E9\u4E00\u4E2A pane \u6765\u5F00\u542F\u4F1A\u8BDD",
           noSessions: "\u6682\u65E0\u4F1A\u8BDD",
@@ -23837,6 +23849,8 @@ Bot\uFF1A{{botName}}
         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",
+        dragHandle: "\u62D6\u52A8\u4EE5\u8C03\u6574\u7A97\u53E3\u987A\u5E8F",
+        dragHandlePane: "\u62D6\u52A8\u4EE5\u8C03\u6574 pane \u987A\u5E8F",
         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",
@@ -24049,6 +24063,8 @@ Bot\uFF1A{{botName}}
         disconnect: "\u5207\u65AD",
         disconnected: "\u5207\u65AD\u6E08\u307F",
         connecting: "\u63A5\u7D9A\u4E2D...",
+        dragHandle: "\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u30C7\u30D0\u30A4\u30B9\u3092\u4E26\u3079\u66FF\u3048",
+        reorderFailed: "\u30C7\u30D0\u30A4\u30B9\u306E\u4E26\u3079\u66FF\u3048\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
         deleteConfirm: "\u3053\u306E\u30C7\u30D0\u30A4\u30B9\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F",
         deleteDescription: "\u30C7\u30D0\u30A4\u30B9\u300C{{name}}\u300D\u306F\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u64CD\u4F5C\u306F\u53D6\u308A\u6D88\u305B\u307E\u305B\u3093\u3002",
         deleteSuccess: "\u30C7\u30D0\u30A4\u30B9\u3092\u524A\u9664\u3057\u307E\u3057\u305F",
@@ -24390,6 +24406,8 @@ Bot\uFF1A{{botName}}
         time: "\u6642\u9593",
         directLink: "\u76F4\u63A5\u30EA\u30F3\u30AF",
         message: "\u30E1\u30C3\u30BB\u30FC\u30B8",
+        paneTitle: "\u30BF\u30A4\u30C8\u30EB",
+        process: "\u30D7\u30ED\u30BB\u30B9",
         telegramBell: {
           title: "\uD83D\uDD14 {{siteName}} \u304B\u3089\u306E\u30D9\u30EB\uFF1A{{terminalTopbarLabel}}",
           viewLink: "\u8868\u793A",
@@ -24408,7 +24426,8 @@ Bot\uFF1A{{botName}}
           summaryTriggered: "Watch\u300C{{name}}\u300D\uFF1A{{summary}}",
           unconfirmedSuffix: "\uFF08\u30E2\u30C7\u30EB\u5229\u7528\u4E0D\u53EF\u306E\u305F\u3081 LLM \u672A\u78BA\u8A8D\uFF09",
           modelUnavailable: "Watch\u300C{{name}}\u300D\u306E\u30E2\u30C7\u30EB\u547C\u3073\u51FA\u3057\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A{{message}}",
-          ruleError: "Watch\u300C{{name}}\u300D\u304C {{count}} \u56DE\u9023\u7D9A\u3067\u5931\u6557\u3057\u305F\u305F\u3081\u81EA\u52D5\u505C\u6B62\u3057\u307E\u3057\u305F\uFF1A{{message}}"
+          ruleError: "Watch\u300C{{name}}\u300D\u304C {{count}} \u56DE\u9023\u7D9A\u3067\u5931\u6557\u3057\u305F\u305F\u3081\u81EA\u52D5\u505C\u6B62\u3057\u307E\u3057\u305F\uFF1A{{message}}",
+          paneGone: "Watch\u300C{{name}}\u300D\u306E\u30DA\u30A4\u30F3\uFF08{{paneId}}\uFF09\u304C\u7834\u68C4\u3055\u308C\u305F\u305F\u3081\u3001\u30EB\u30FC\u30EB\u3092\u524A\u9664\u3057\u307E\u3057\u305F"
         }
       },
       sidebar: {
@@ -24467,7 +24486,7 @@ Bot\uFF1A{{botName}}
         },
         session: {
           none: "\u30BB\u30C3\u30B7\u30E7\u30F3\u672A\u9078\u629E",
-          new: "\u65B0\u898F\u30BB\u30C3\u30B7\u30E7\u30F3",
+          new: "\u65B0\u898F\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30BB\u30C3\u30B7\u30E7\u30F3",
           switch: "\u30BB\u30C3\u30B7\u30E7\u30F3\u3092\u5207\u308A\u66FF\u3048",
           selectPaneHint: "Panes \u30BF\u30D6\u3067\u30DA\u30A4\u30F3\u3092\u9078\u629E\u3057\u3066\u30BB\u30C3\u30B7\u30E7\u30F3\u3092\u958B\u59CB\u3057\u3066\u304F\u3060\u3055\u3044",
           noSessions: "\u30BB\u30C3\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093",
@@ -24527,6 +24546,8 @@ Bot\uFF1A{{botName}}
         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",
+        dragHandle: "\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u4E26\u3079\u66FF\u3048",
+        dragHandlePane: "\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u30DA\u30A4\u30F3\u3092\u4E26\u3079\u66FF\u3048",
         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",
@@ -24692,6 +24713,8 @@ __export(exports_ws_borsh, {
   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_REORDER_WINDOWS: () => KIND_TMUX_REORDER_WINDOWS,
+  KIND_TMUX_REORDER_PANES: () => KIND_TMUX_REORDER_PANES,
   KIND_TMUX_RENAME_WINDOW: () => KIND_TMUX_RENAME_WINDOW,
   KIND_TMUX_EVENT: () => KIND_TMUX_EVENT,
   KIND_TMUX_CREATE_WINDOW: () => KIND_TMUX_CREATE_WINDOW,
@@ -24780,6 +24803,8 @@ 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_TMUX_REORDER_WINDOWS = 523;
+var KIND_TMUX_REORDER_PANES = 524;
 var KIND_TERM_INPUT = 769;
 var KIND_TERM_PASTE = 770;
 var KIND_TERM_RESIZE = 771;
@@ -24814,6 +24839,8 @@ var VALID_KINDS = new Set([
   KIND_STATE_SNAPSHOT,
   KIND_STATE_SNAPSHOT_DIFF,
   KIND_TMUX_SET_WINDOW_STYLE,
+  KIND_TMUX_REORDER_WINDOWS,
+  KIND_TMUX_REORDER_PANES,
   KIND_TERM_INPUT,
   KIND_TERM_PASTE,
   KIND_TERM_RESIZE,
@@ -24853,6 +24880,8 @@ function kindToString(kind) {
     [KIND_STATE_SNAPSHOT]: "STATE_SNAPSHOT",
     [KIND_STATE_SNAPSHOT_DIFF]: "STATE_SNAPSHOT_DIFF",
     [KIND_TMUX_SET_WINDOW_STYLE]: "TMUX_SET_WINDOW_STYLE",
+    [KIND_TMUX_REORDER_WINDOWS]: "TMUX_REORDER_WINDOWS",
+    [KIND_TMUX_REORDER_PANES]: "TMUX_REORDER_PANES",
     [KIND_TERM_INPUT]: "TERM_INPUT",
     [KIND_TERM_PASTE]: "TERM_PASTE",
     [KIND_TERM_RESIZE]: "TERM_RESIZE",
@@ -24939,6 +24968,8 @@ __export(exports_schema, {
   TmuxSetWindowStyleSchema: () => TmuxSetWindowStyleSchema,
   TmuxSelectWindowSchema: () => TmuxSelectWindowSchema,
   TmuxSelectSchema: () => TmuxSelectSchema,
+  TmuxReorderWindowsSchema: () => TmuxReorderWindowsSchema,
+  TmuxReorderPanesSchema: () => TmuxReorderPanesSchema,
   TmuxRenameWindowSchema: () => TmuxRenameWindowSchema,
   TmuxEventSchema: () => TmuxEventSchema,
   TmuxCreateWindowSchema: () => TmuxCreateWindowSchema,
@@ -25070,6 +25101,15 @@ var TmuxSetWindowStyleSchema = import_zorsh.b.struct({
   deviceId: import_zorsh.b.string(),
   style: import_zorsh.b.string()
 });
+var TmuxReorderWindowsSchema = import_zorsh.b.struct({
+  deviceId: import_zorsh.b.string(),
+  windowIds: import_zorsh.b.vec(import_zorsh.b.string())
+});
+var TmuxReorderPanesSchema = import_zorsh.b.struct({
+  deviceId: import_zorsh.b.string(),
+  windowId: import_zorsh.b.string(),
+  paneIds: import_zorsh.b.vec(import_zorsh.b.string())
+});
 var TmuxEventSchema = import_zorsh.b.struct({
   deviceId: import_zorsh.b.string(),
   eventType: import_zorsh.b.u8(),
@@ -32145,6 +32185,7 @@ __export(exports_schema2, {
   siteSettings: () => siteSettings,
   llmProviders: () => llmProviders,
   devices: () => devices,
+  deviceTreeOrder: () => deviceTreeOrder,
   deviceRuntimeStatus: () => deviceRuntimeStatus,
   agentSettings: () => agentSettings,
   agentSessions: () => agentSessions,
@@ -32184,6 +32225,7 @@ var devices = sqliteTable("devices", {
   passwordEnc: text("password_enc"),
   privateKeyEnc: text("private_key_enc"),
   privateKeyPassphraseEnc: text("private_key_passphrase_enc"),
+  sortOrder: integer("sort_order").notNull().default(0),
   createdAt: text("created_at").notNull(),
   updatedAt: text("updated_at").notNull()
 }, (table) => [
@@ -32334,6 +32376,12 @@ var watchRuleState = sqliteTable("watch_rule_state", {
   lastError: text("last_error"),
   modelUnavailableNotified: integer("model_unavailable_notified", { mode: "boolean" }).notNull().default(false)
 });
+var deviceTreeOrder = sqliteTable("device_tree_order", {
+  deviceId: text("device_id").primaryKey().references(() => devices.id, { onDelete: "cascade" }),
+  windows: text("windows", { mode: "json" }).$type().notNull().default([]),
+  panes: text("panes", { mode: "json" }).$type().notNull().default({}),
+  updatedAt: text("updated_at").notNull()
+});
 var telegramBotChats = sqliteTable("telegram_bot_chats", {
   id: text("id").primaryKey(),
   botId: text("bot_id").notNull().references(() => telegramBots.id, { onDelete: "cascade" }),
@@ -32388,6 +32436,7 @@ function toDevice(row) {
     passwordEnc: optional(row.passwordEnc),
     privateKeyEnc: optional(row.privateKeyEnc),
     privateKeyPassphraseEnc: optional(row.privateKeyPassphraseEnc),
+    sortOrder: row.sortOrder,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt
   };
@@ -32466,6 +32515,8 @@ function ensureSiteSettingsInitialized() {
 function createDevice(device) {
   const orm = getDb();
   orm.transaction((tx) => {
+    const maxRow = tx.select({ value: max(devices.sortOrder) }).from(devices).get();
+    const nextSortOrder = (maxRow?.value ?? -1) + 1;
     tx.insert(devices).values({
       id: device.id,
       name: device.name,
@@ -32479,6 +32530,7 @@ function createDevice(device) {
       passwordEnc: device.passwordEnc ?? null,
       privateKeyEnc: device.privateKeyEnc ?? null,
       privateKeyPassphraseEnc: device.privateKeyPassphraseEnc ?? null,
+      sortOrder: nextSortOrder,
       createdAt: device.createdAt,
       updatedAt: device.updatedAt
     }).run();
@@ -32501,7 +32553,16 @@ function getDeviceById(id) {
 }
 function getAllDevices() {
   const orm = getDb();
-  return orm.select().from(devices).orderBy(desc(devices.createdAt)).all().map(toDevice);
+  return orm.select().from(devices).orderBy(asc(devices.sortOrder), desc(devices.createdAt)).all().map(toDevice);
+}
+function reorderDevices(orderedIds) {
+  const orm = getDb();
+  const now = new Date().toISOString();
+  orm.transaction((tx) => {
+    orderedIds.forEach((id, index) => {
+      tx.update(devices).set({ sortOrder: index, updatedAt: now }).where(eq(devices.id, id)).run();
+    });
+  });
 }
 function updateDevice(id, updates) {
   const orm = getDb();
@@ -32544,6 +32605,36 @@ function deleteDevice(id) {
   const orm = getDb();
   orm.delete(devices).where(eq(devices.id, id)).run();
 }
+function getDeviceTreeOrder(deviceId) {
+  const orm = getDb();
+  const row = orm.select().from(deviceTreeOrder).where(eq(deviceTreeOrder.deviceId, deviceId)).get();
+  if (!row) {
+    return { deviceId, windows: [], panes: {} };
+  }
+  return {
+    deviceId: row.deviceId,
+    windows: Array.isArray(row.windows) ? row.windows : [],
+    panes: row.panes && typeof row.panes === "object" ? row.panes : {}
+  };
+}
+function setWindowOrder(deviceId, windowIds) {
+  const orm = getDb();
+  const now = new Date().toISOString();
+  orm.insert(deviceTreeOrder).values({ deviceId, windows: windowIds, panes: {}, updatedAt: now }).onConflictDoUpdate({
+    target: deviceTreeOrder.deviceId,
+    set: { windows: windowIds, updatedAt: now }
+  }).run();
+}
+function setPaneOrder(deviceId, windowId, paneIds) {
+  const current = getDeviceTreeOrder(deviceId);
+  const nextPanes = { ...current.panes, [windowId]: paneIds };
+  const orm = getDb();
+  const now = new Date().toISOString();
+  orm.insert(deviceTreeOrder).values({ deviceId, windows: current.windows, panes: nextPanes, updatedAt: now }).onConflictDoUpdate({
+    target: deviceTreeOrder.deviceId,
+    set: { panes: nextPanes, updatedAt: now }
+  }).run();
+}
 function getDeviceRuntimeStatus(deviceId) {
   const orm = getDb();
   const row = orm.select().from(deviceRuntimeStatus).where(eq(deviceRuntimeStatus.deviceId, deviceId)).get();
@@ -86215,9 +86306,6 @@ _a21 = symbol21;
 var defaultDownload2 = createDownload();
 
 // ../../apps/gateway/src/events/index.ts
-function sanitizeMarkdownV2(input) {
-  return input.replace(/([_\*\[\]()~`>#+\-=|{}.!\\])/g, "\\$1");
-}
 function escapeTelegramHtmlText(input) {
   return input.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -86367,7 +86455,7 @@ class EventNotifier {
       return;
     }
     const message = this.formatTelegramMessage(event, settings);
-    await telegramService.sendToAuthorizedChats({ text: message });
+    await telegramService.sendToAuthorizedChats({ text: message, parseMode: "HTML" });
   }
   buildTerminalTopbarLabel(event) {
     const windowLabel = typeof event.tmux?.windowIndex === "number" ? `${event.tmux.windowIndex}` : event.tmux?.windowId ?? "?";
@@ -86378,12 +86466,23 @@ class EventNotifier {
       device: event.device.name
     });
   }
+  buildPaneMetaLines(event) {
+    const lines = [];
+    if (event.tmux?.paneTitle) {
+      lines.push(`${escapeTelegramHtmlText(t2("notification.paneTitle"))}\uFF1A${escapeTelegramHtmlText(event.tmux.paneTitle)}`);
+    }
+    if (event.tmux?.paneCurrentCommand) {
+      lines.push(`${escapeTelegramHtmlText(t2("notification.process"))}\uFF1A${escapeTelegramHtmlText(event.tmux.paneCurrentCommand)}`);
+    }
+    return lines;
+  }
   formatTelegramBellMessage(event) {
     const title = t2("notification.telegramBell.title", {
       siteName: event.site.name,
       terminalTopbarLabel: this.buildTerminalTopbarLabel(event)
     });
     const lines = [escapeTelegramHtmlText(title)];
+    lines.push(...this.buildPaneMetaLines(event));
     const paneUrl = normalizeHttpUrl(buildPaneUrl(event));
     if (paneUrl) {
       const tgSafePaneUrl = encodePercentForTelegramUrl(paneUrl);
@@ -86402,6 +86501,7 @@ class EventNotifier {
     if (body) {
       lines.push(escapeTelegramHtmlText(body));
     }
+    lines.push(...this.buildPaneMetaLines(event));
     const paneUrl = normalizeHttpUrl(buildPaneUrl(event));
     const topbarLabel = this.buildTerminalTopbarLabel(event);
     const footer = `from ${event.site.name}: ${topbarLabel}`;
@@ -86431,23 +86531,26 @@ class EventNotifier {
       watch_model_unavailable: "\uD83D\uDC41\uFE0F",
       watch_rule_error: "\uD83D\uDC41\uFE0F"
     };
-    const paneUrl = buildPaneUrl(event);
+    const esc2 = escapeTelegramHtmlText;
     const eventTypeLabel = t2(`notification.eventType.${event.eventType}`);
     const lines = [
-      `${emojiMap[event.eventType] ?? "\uD83D\uDCE2"} ${eventTypeLabel}`,
-      `${t2("notification.site")}\uFF1A${event.site.name}`,
-      `${t2("notification.time")}\uFF1A${new Date(event.timestamp).toLocaleString(toBCP47(settings.language))}`,
-      `${t2("notification.device")}\uFF1A${event.device.name} (${event.device.type})`,
-      event.tmux?.windowIndex !== undefined ? `${t2("notification.window")}\uFF1A${event.tmux.windowIndex} (${event.tmux.windowId ?? "-"})` : event.tmux?.windowId ? `${t2("notification.window")}\uFF1A${event.tmux.windowId}` : `${t2("notification.window")}\uFF1A-`,
-      event.tmux?.paneIndex !== undefined ? `${t2("notification.pane")}\uFF1A${event.tmux.paneIndex} (${event.tmux.paneId ?? "-"})` : event.tmux?.paneId ? `${t2("notification.pane")}\uFF1A${event.tmux.paneId}` : `${t2("notification.pane")}\uFF1A-`
+      `${emojiMap[event.eventType] ?? "\uD83D\uDCE2"} ${esc2(eventTypeLabel)}`,
+      `${esc2(t2("notification.site"))}\uFF1A${esc2(event.site.name)}`,
+      `${esc2(t2("notification.time"))}\uFF1A${esc2(new Date(event.timestamp).toLocaleString(toBCP47(settings.language)))}`,
+      `${esc2(t2("notification.device"))}\uFF1A${esc2(event.device.name)} (${esc2(event.device.type)})`,
+      event.tmux?.windowIndex !== undefined ? `${esc2(t2("notification.window"))}\uFF1A${event.tmux.windowIndex} (${esc2(event.tmux.windowId ?? "-")})` : event.tmux?.windowId ? `${esc2(t2("notification.window"))}\uFF1A${esc2(event.tmux.windowId)}` : `${esc2(t2("notification.window"))}\uFF1A-`,
+      event.tmux?.paneIndex !== undefined ? `${esc2(t2("notification.pane"))}\uFF1A${event.tmux.paneIndex} (${esc2(event.tmux.paneId ?? "-")})` : event.tmux?.paneId ? `${esc2(t2("notification.pane"))}\uFF1A${esc2(event.tmux.paneId)}` : `${esc2(t2("notification.pane"))}\uFF1A-`
     ];
-    if (paneUrl) {
-      lines.push(`${t2("notification.directLink")}\uFF1A${paneUrl}`);
-    }
+    lines.push(...this.buildPaneMetaLines(event));
     if (event.payload?.message && typeof event.payload.message === "string") {
-      lines.push(`${t2("notification.message")}\uFF1A${event.payload.message}`);
+      lines.push(`${esc2(t2("notification.message"))}\uFF1A${esc2(event.payload.message)}`);
     }
-    return lines.map((line) => sanitizeMarkdownV2(line)).join(`
+    const paneUrl = normalizeHttpUrl(buildPaneUrl(event));
+    if (paneUrl) {
+      const tgSafePaneUrl = encodePercentForTelegramUrl(paneUrl);
+      lines.push("", `<a href="${escapeTelegramHtmlAttribute(tgSafePaneUrl)}">${esc2(t2("notification.directLink"))}</a>`);
+    }
+    return lines.join(`
 `);
   }
   async generateHmac(secret, message) {
@@ -97172,7 +97275,7 @@ 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}"
+        "#{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}"
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
@@ -97244,7 +97347,7 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw] = line.split("\t");
+      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw, currentCommandRaw] = line.split("\t");
       if (!paneId || !windowId) {
         continue;
       }
@@ -97256,6 +97359,7 @@ ${panesRes.stderr}`;
         windowId,
         index: Number.isNaN(index) ? 0 : 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
@@ -97776,6 +97880,19 @@ function splitSnapshotFields(line, fieldCount) {
       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;
 }
 
@@ -98405,7 +98522,7 @@ class SshExternalTmuxConnection {
         "-t",
         this.sessionName,
         "-F",
-        "#{pane_id}|#{window_id}|#{pane_index}|#{pane_title}|#{pane_active}|#{pane_width}|#{pane_height}|#{window_active}"
+        "#{pane_id}|#{window_id}|#{pane_index}|#{pane_title}|#{pane_active}|#{pane_width}|#{pane_height}|#{window_active}|#{pane_current_command}"
       ])
     ]);
     if (sessionRes.exitCode !== 0 || windowsRes.exitCode !== 0 || panesRes.exitCode !== 0) {
@@ -98477,7 +98594,7 @@ ${panesRes.stderr}`;
       if (!line.trim()) {
         continue;
       }
-      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw] = splitSnapshotFields(line, 8);
+      const [paneId, windowId, indexRaw, titleRaw, activeRaw, widthRaw, heightRaw, windowActiveRaw, currentCommandRaw] = splitSnapshotFields(line, 9);
       if (!paneId || !windowId) {
         continue;
       }
@@ -98489,6 +98606,7 @@ ${panesRes.stderr}`;
         windowId,
         index: Number.isNaN(index) ? 0 : 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
@@ -101292,7 +101410,9 @@ function resolvePaneContext(options) {
     paneId: targetPane?.id ?? bellPaneId,
     windowIndex: targetWindow?.index,
     paneIndex: targetPane?.index,
-    paneUrl
+    paneUrl,
+    paneTitle: targetPane?.title,
+    paneCurrentCommand: targetPane?.currentCommand
   };
 }
 
@@ -101324,7 +101444,9 @@ var defaultDeps2 = {
         paneId: bell.paneId,
         windowIndex: bell.windowIndex,
         paneIndex: bell.paneIndex,
-        paneUrl: bell.paneUrl
+        paneUrl: bell.paneUrl,
+        paneTitle: bell.paneTitle,
+        paneCurrentCommand: bell.paneCurrentCommand
       },
       payload: {
         message: t2("notification.eventType.terminal_bell")
@@ -101350,7 +101472,9 @@ var defaultDeps2 = {
         paneId: notification.paneId,
         windowIndex: notification.windowIndex,
         paneIndex: notification.paneIndex,
-        paneUrl: notification.paneUrl
+        paneUrl: notification.paneUrl,
+        paneTitle: notification.paneTitle,
+        paneCurrentCommand: notification.paneCurrentCommand
       },
       payload: {
         source: notification.source,
@@ -102706,6 +102830,7 @@ var defaultDeps3 = {
   getState: getWatchRuleState,
   upsertState: upsertWatchRuleState,
   updateRule: updateWatchRule,
+  deleteRule: deleteWatchRule,
   acquireRuntime: (deviceId) => tmuxRuntimeRegistry.acquire(deviceId),
   releaseRuntime: (deviceId, runtime) => tmuxRuntimeRegistry.release(deviceId, runtime),
   resolveModel: resolveLanguageModel2,
@@ -102999,7 +103124,12 @@ class WatchService {
       if (!this.rules.has(rule.id)) {
         return;
       }
-      await this.recordRuleError(rule, toErrorMessage3(error51), now2);
+      const message = toErrorMessage3(error51);
+      if (isTargetMissingMessage(message)) {
+        await this.handlePaneGone(rule);
+        return;
+      }
+      await this.recordRuleError(rule, message, now2);
       return;
     }
     if (!this.rules.has(rule.id)) {
@@ -103151,6 +103281,22 @@ class WatchService {
       await this.disableRuleForErrors(rule, errors3, message);
     }
   }
+  async handlePaneGone(rule) {
+    this.deps.deleteRule(rule.id);
+    await this.teardownRule(rule.id);
+    this.samples.delete(rule.id);
+    const message = t2("notification.watch.paneGone", {
+      name: rule.name,
+      paneId: rule.paneId
+    });
+    await this.safeNotify("watch_rule_error", rule, {
+      message,
+      ruleId: rule.id,
+      ruleName: rule.name,
+      paneGone: true
+    }, { paneId: rule.paneId });
+    this.broadcastSafe(rule, exports_ws_borsh.WATCH_EVENT_RULE_ERROR, { message });
+  }
   async disableRuleForErrors(rule, errorCount, detail) {
     this.deps.updateRule(rule.id, { enabled: false });
     await this.teardownRule(rule.id);
@@ -103258,7 +103404,9 @@ class WatchService {
           windowIndex: paneContext.windowIndex,
           paneId: paneContext.paneId ?? rule.paneId,
           paneIndex: paneContext.paneIndex,
-          paneUrl: paneContext.paneUrl
+          paneUrl: paneContext.paneUrl,
+          paneTitle: paneContext.paneTitle,
+          paneCurrentCommand: paneContext.paneCurrentCommand
         },
         payload
       });
@@ -103906,6 +104054,9 @@ function handleApiRequest(req, _server) {
   if (path === "/api/devices" && req.method === "POST") {
     return handleCreateDevice(req);
   }
+  if (path === "/api/devices/order" && req.method === "PUT") {
+    return handleReorderDevices(req);
+  }
   if (path.match(/^\/api\/devices\/[^/]+$/) && req.method === "GET") {
     return handleGetDevice(path.split("/")[3]);
   }
@@ -104029,12 +104180,13 @@ async function handleCreateDevice(req) {
     passwordEnc: body.password ? await encrypt(body.password) : undefined,
     privateKeyEnc: body.privateKey ? await encrypt(body.privateKey) : undefined,
     privateKeyPassphraseEnc: body.privateKeyPassphrase ? await encrypt(body.privateKeyPassphrase) : undefined,
+    sortOrder: 0,
     createdAt: now2,
     updatedAt: now2
   };
   createDevice(device);
   await pushSupervisor.upsert(device.id);
-  return json7({ device }, 201);
+  return json7({ device: getDeviceById(device.id) ?? device }, 201);
 }
 async function handleUpdateDevice(req, id) {
   const existing = getDeviceById(id);
@@ -104071,6 +104223,14 @@ async function handleUpdateDevice(req, id) {
   const device = getDeviceById(id);
   return json7({ device });
 }
+async function handleReorderDevices(req) {
+  const body = await req.json();
+  if (!Array.isArray(body.deviceIds) || body.deviceIds.some((id) => typeof id !== "string")) {
+    return json7({ error: t2("apiError.invalidRequest") }, 400);
+  }
+  reorderDevices(body.deviceIds);
+  return json7({ devices: getAllDevices().map(enrichDeviceWithRuntime) });
+}
 async function handleDeleteDevice(id) {
   const existing = getDeviceById(id);
   if (!existing) {
@@ -104933,6 +105093,45 @@ class SwitchBarrier {
 }
 var switchBarrier = new SwitchBarrier;
 
+// ../../apps/gateway/src/ws/overlay-utils.ts
+function orderBySaved(items, getId, savedIds) {
+  if (savedIds.length === 0)
+    return items;
+  const byId = new Map(items.map((item) => [getId(item), item]));
+  const used = new Set;
+  const result = [];
+  for (const id of savedIds) {
+    const item = byId.get(id);
+    if (item && !used.has(id)) {
+      result.push(item);
+      used.add(id);
+    }
+  }
+  for (const item of items) {
+    if (!used.has(getId(item)))
+      result.push(item);
+  }
+  return result;
+}
+function applyDeviceTreeOverlay(payload, order) {
+  if (!payload.session)
+    return payload;
+  const hasWindowOrder = order.windows.length > 0;
+  const hasPaneOrder = Object.keys(order.panes).length > 0;
+  if (!hasWindowOrder && !hasPaneOrder)
+    return payload;
+  const orderedWindows = orderBySaved(payload.session.windows, (w) => w.id, order.windows).map((window2) => {
+    const savedPaneOrder = order.panes[window2.id];
+    if (!savedPaneOrder || savedPaneOrder.length === 0)
+      return window2;
+    return { ...window2, panes: orderBySaved(window2.panes, (p) => p.id, savedPaneOrder) };
+  });
+  return {
+    ...payload,
+    session: { ...payload.session, windows: orderedWindows }
+  };
+}
+
 // ../../apps/gateway/src/ws/index.ts
 var defaultDeps5 = {
   acquireRuntime: async (deviceId) => tmuxRuntimeRegistry.acquire(deviceId),
@@ -105183,6 +105382,16 @@ class WebSocketServer {
         this.handleSetWindowStyle(decoded.deviceId, decoded.style);
         return;
       }
+      case exports_ws_borsh.KIND_TMUX_REORDER_WINDOWS: {
+        const decoded = exports_ws_borsh.decodePayload(exports_ws_borsh.schema.TmuxReorderWindowsSchema, payload);
+        this.handleReorderWindows(decoded.deviceId, decoded.windowIds);
+        return;
+      }
+      case exports_ws_borsh.KIND_TMUX_REORDER_PANES: {
+        const decoded = exports_ws_borsh.decodePayload(exports_ws_borsh.schema.TmuxReorderPanesSchema, payload);
+        this.handleReorderPanes(decoded.deviceId, decoded.windowId, decoded.paneIds);
+        return;
+      }
       case exports_ws_borsh.KIND_TERM_INPUT: {
         const decoded = exports_ws_borsh.decodePayload(exports_ws_borsh.schema.TermInputSchema, payload);
         if (decoded.isComposing)
@@ -105321,7 +105530,7 @@ class WebSocketServer {
     });
     this.sendEnvelope(ws, exports_ws_borsh.KIND_DEVICE_CONNECTED, connectedPayload);
     if (entry.lastSnapshot) {
-      const snapshotBytes = exports_ws_borsh.encodeStateSnapshot(this.applyWindowCustomNames(entry.lastSnapshot));
+      const snapshotBytes = this.encodeSnapshotWithOverlays(entry.lastSnapshot);
       this.sendChunked(ws, exports_ws_borsh.KIND_STATE_SNAPSHOT, snapshotBytes);
     } else {
       entry.runtime.requestSnapshot();
@@ -105445,6 +105654,20 @@ class WebSocketServer {
       return;
     entry.runtime.setWindowStyle(style);
   }
+  handleReorderWindows(deviceId, windowIds) {
+    setWindowOrder(deviceId, windowIds);
+    const entry = this.connections.get(deviceId);
+    if (!entry?.lastSnapshot)
+      return;
+    this.sendSnapshotToClients(entry, entry.lastSnapshot);
+  }
+  handleReorderPanes(deviceId, windowId, paneIds) {
+    setPaneOrder(deviceId, windowId, paneIds);
+    const entry = this.connections.get(deviceId);
+    if (!entry?.lastSnapshot)
+      return;
+    this.sendSnapshotToClients(entry, entry.lastSnapshot);
+  }
   applyWindowCustomNames(payload) {
     const names = this.windowCustomNames.get(payload.deviceId);
     if (!names?.size || !payload.session)
@@ -105466,8 +105689,12 @@ class WebSocketServer {
       }
     };
   }
+  encodeSnapshotWithOverlays(payload) {
+    const ordered = applyDeviceTreeOverlay(payload, getDeviceTreeOrder(payload.deviceId));
+    return exports_ws_borsh.encodeStateSnapshot(this.applyWindowCustomNames(ordered));
+  }
   sendSnapshotToClients(entry, payload) {
-    const payloadBytes = exports_ws_borsh.encodeStateSnapshot(this.applyWindowCustomNames(payload));
+    const payloadBytes = this.encodeSnapshotWithOverlays(payload);
     for (const client of entry.clients) {
       this.sendChunked(client, exports_ws_borsh.KIND_STATE_SNAPSHOT, payloadBytes);
     }