Fix remote tmux mirror pane titles

.github/workflows/ci.yml

@@ -827,7 +827,8 @@ jobs:
     # transitive skip otherwise marks every macOS job skipped even when
     # linux-preflight itself succeeds. Require the direct needs explicitly.
     if: ${{ !cancelled() && needs.changes.result == 'success' && needs.linux-preflight.result == 'success' && needs.changes.outputs.macos == 'true' }}
-    runs-on: ${{ vars.MACOS_RUNNER_15 || 'warp-macos-15-arm64-6x' }}
+    # Build the release helper with SDK 15, then run package tests with SDK 26.
+    runs-on: ${{ vars.MACOS_RUNNER_DUAL_XCODE || 'blacksmith-6vcpu-macos-15' }}
     timeout-minutes: 40
     env:
       CMUX_CI_XCODE_APP: ${{ vars.CMUX_CI_XCODE_APP_MACOS_15 }}

Resources/Localizable.xcstrings

@@ -132873,17 +132873,250 @@
     "remoteTmux.tab.window": {
       "extractionState": "manual",
       "localizations": {
+        "ar": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "نافذة tmux"
+          }
+        },
+        "bs": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux prozor"
+          }
+        },
+        "da": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux-vindue"
+          }
+        },
+        "de": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux-Fenster"
+          }
+        },
         "en": {
           "stringUnit": {
             "state": "translated",
             "value": "tmux window"
           }
         },
+        "es": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "ventana de tmux"
+          }
+        },
+        "fr": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "fenêtre tmux"
+          }
+        },
+        "it": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "finestra tmux"
+          }
+        },
         "ja": {
           "stringUnit": {
             "state": "translated",
             "value": "tmux ウィンドウ"
           }
+        },
+        "km": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "បង្អួច tmux"
+          }
+        },
+        "ko": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux 윈도우"
+          }
+        },
+        "nb": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux-vindu"
+          }
+        },
+        "pl": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "okno tmux"
+          }
+        },
+        "pt-BR": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "janela tmux"
+          }
+        },
+        "ru": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "окно tmux"
+          }
+        },
+        "th": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "หน้าต่าง tmux"
+          }
+        },
+        "tr": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux penceresi"
+          }
+        },
+        "uk": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "вікно tmux"
+          }
+        },
+        "zh-Hans": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux 窗口"
+          }
+        },
+        "zh-Hant": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "tmux 視窗"
+          }
+        }
+      }
+    },
+    "remoteTmux.tab.windowPaneIndexed": {
+      "extractionState": "manual",
+      "localizations": {
+        "ar": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ ‏[%2$@]"
+          }
+        },
+        "bs": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "da": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "de": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "es": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "fr": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "it": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@［%2$@］"
+          }
+        },
+        "km": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "ko": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "nb": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "pl": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "pt-BR": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "ru": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "th": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "tr": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "uk": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@ [%2$@]"
+          }
+        },
+        "zh-Hans": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@［%2$@］"
+          }
+        },
+        "zh-Hant": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "%1$@［%2$@］"
+          }
         }
       }
     },

Sources/RemoteTmuxRawLayoutParser.swift

@@ -28,6 +28,8 @@ enum RemoteTmuxRawLayoutParser {
         }
         var cursor = 0
         guard let node = parseNode(chars, &cursor), cursor == chars.count else { return nil }
+        let paneIDs = node.paneIDsInOrder
+        guard Set(paneIDs).count == paneIDs.count else { return nil }
         return node
     }
 

Sources/RemoteTmuxWindowMirror+Bonsplit.swift

@@ -365,10 +365,8 @@ extension RemoteTmuxWindowMirror {
     }
 
     func title(forPane paneId: Int) -> String {
-        Self.paneTitle(
-            command: connection?.paneForegroundStates[paneId]?.command,
-            cwd: cwdByPaneId[paneId]
-        ) ?? String(localized: "remoteTmux.tab.pane", defaultValue: "tmux pane")
+        let index = paneIndexByPaneId[paneId] ?? 0
+        return Self.windowPaneTitle(windowTitle, paneIndex: index)
     }
 
     func combined(children: [RemoteTmuxLayoutNode], orientation: SplitOrientation) -> RemoteTmuxLayoutNode {

Sources/RemoteTmuxWindowMirror+BonsplitLayout.swift

@@ -41,18 +41,17 @@ extension RemoteTmuxWindowMirror {
         ).clientGrid(layout: layout, contentSize: contentSize)
     }
 
-    nonisolated static func paneTitle(command: String?, cwd: String?) -> String? {
-        let trimmedCommand = command?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if !trimmedCommand.isEmpty,
-           !RemoteTmuxPaneForegroundState.plainShellCommands.contains(trimmedCommand) {
-            return trimmedCommand
-        }
-        let trimmedCwd = cwd?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if !trimmedCwd.isEmpty {
-            let component = URL(fileURLWithPath: trimmedCwd).lastPathComponent
-            if !component.isEmpty { return component }
-        }
-        return nil
+    nonisolated static func windowPaneTitle(_ windowTitle: String, paneIndex: Int) -> String {
+        let trimmed = windowTitle.trimmingCharacters(in: .whitespacesAndNewlines)
+        let base = trimmed.isEmpty
+            ? String(localized: "remoteTmux.tab.window", defaultValue: "tmux window")
+            : trimmed
+        guard paneIndex > 0 else { return base }
+        let formattedIndex = paneIndex.formatted()
+        return String(
+            localized: "remoteTmux.tab.windowPaneIndexed",
+            defaultValue: "\(base) [\(formattedIndex)]"
+        )
     }
 
     nonisolated static func dividerFraction(

Sources/RemoteTmuxWindowMirror+ControlTopology.swift

@@ -10,13 +10,11 @@ extension RemoteTmuxWindowMirror {
                   let panel = panel(forPane: tmuxPaneID) else {
                 return nil
             }
-            let header = paneHeaderLabels[tmuxPaneID]?
-                .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             return RemoteTmuxControlPane(
                 tmuxPaneID: tmuxPaneID,
                 paneID: paneID,
                 panel: panel,
-                title: header.isEmpty ? panel.displayTitle : header,
+                title: title(forPane: tmuxPaneID),
                 isFocused: tmuxPaneID == activePaneId
             )
         }

Sources/RemoteTmuxWindowMirror.swift

@@ -63,6 +63,9 @@ final class RemoteTmuxWindowMirror {
     private(set) var layoutStructureVersion = 0
     /// The tmux pane the user last focused (drives the focus overlay + splits).
     private(set) var activePaneId: Int?
+    /// Display title for this mirrored tmux window; every inner surface/tab title
+    /// derives from this tmux window name, never from pane-border labels.
+    private(set) var windowTitle = String(localized: "remoteTmux.tab.window", defaultValue: "tmux window")
 
     /// Only the visible tab's mirror writes after its initial claim. Hidden
     /// tabs stay mounted and still receive geometry callbacks, so default-hidden
@@ -77,6 +80,7 @@ final class RemoteTmuxWindowMirror {
     @ObservationIgnored var paneIdByPaneId: [Int: PaneID] = [:]
     @ObservationIgnored var paneIdByBonsplitPane: [PaneID: Int] = [:]
     @ObservationIgnored var paneIdByTabId: [TabID: Int] = [:]
+    @ObservationIgnored var paneIndexByPaneId: [Int: Int] = [:]
     @ObservationIgnored var cwdByPaneId: [Int: String] = [:]
     @ObservationIgnored var isApplyingRemoteLayout = false
     @ObservationIgnored var isApplyingTmuxFocus = false
@@ -168,6 +172,8 @@ final class RemoteTmuxWindowMirror {
     /// never creates or closes panels, and f's output is zoom-invariant.
     func apply(window: RemoteTmuxWindow) {
         let previousRenderedLayout = renderedLayout
+        let nextTitle = RemoteTmuxSessionMirror.tabTitle(for: window)
+        if windowTitle != nextTitle { windowTitle = nextTitle }
         let newVisible = window.zoomed ? window.visibleLayout : nil
         if visibleLayout != newVisible { visibleLayout = newVisible }
         if zoomed != window.zoomed { zoomed = window.zoomed }
@@ -185,8 +191,13 @@ final class RemoteTmuxWindowMirror {
         layout newLayout: RemoteTmuxLayoutNode,
         previousRenderedLayout: RemoteTmuxLayoutNode
     ) {
-        let livePaneIds = Set(newLayout.paneIDsInOrder)
-        for paneId in newLayout.paneIDsInOrder where panelsByPaneId[paneId] == nil {
+        let livePaneIDsInOrder = newLayout.paneIDsInOrder
+        let livePaneIds = Set(livePaneIDsInOrder)
+        paneIndexByPaneId = Dictionary(
+            livePaneIDsInOrder.enumerated().map { ($0.element, $0.offset) },
+            uniquingKeysWith: { firstIndex, _ in firstIndex }
+        )
+        for paneId in livePaneIDsInOrder where panelsByPaneId[paneId] == nil {
             guard let panel = makePanel(paneId) else { continue }
             panelsByPaneId[paneId] = panel
             let surface = panel.surface

cmuxTests/RemoteTmuxControlParserTests.swift

@@ -413,6 +413,10 @@ import Testing
         #expect(RemoteTmuxRawLayoutParser.parse("abcd,60x40,0,0{60x40,0,0,4}") == nil)
     }
 
+    @Test func rejectsDuplicatePaneIDs() {
+        #expect(RemoteTmuxRawLayoutParser.parse("abcd,120x40,0,0{60x40,0,0,4,59x40,61,0,4}") == nil)
+    }
+
     @Test func rejectsGarbageLayout() {
         #expect(RemoteTmuxRawLayoutParser.parse("not-a-layout") == nil)
         #expect(RemoteTmuxRawLayoutParser.parse("") == nil)

cmuxTests/RemoteTmuxMirrorLayoutMathTests.swift

@@ -212,9 +212,4 @@ import Testing
         #expect(grid?.rows == 5)
     }
 
-    @Test func paneTitleUsesCommandThenShellCwdThenNil() {
-        #expect(RemoteTmuxWindowMirror.paneTitle(command: "vim", cwd: "/tmp/project") == "vim")
-        #expect(RemoteTmuxWindowMirror.paneTitle(command: "zsh", cwd: "/tmp/project") == "project")
-        #expect(RemoteTmuxWindowMirror.paneTitle(command: "", cwd: nil) == nil)
-    }
 }