austinywang · Jul 27, 2026 · Jul 23, 2026 · Jul 23, 2026 · Jul 23, 2026 · Jul 23, 2026
diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Defaults.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Defaults.swift
@@ -112,6 +112,18 @@ extension ShortcutAction {
         case .prevSurface: return ShortcutStroke(key: "[", command: true, shift: true)
         case .moveSurfaceLeft: return ShortcutStroke(key: "[", command: true, shift: true, option: true)
         case .moveSurfaceRight: return ShortcutStroke(key: "]", command: true, shift: true, option: true)
+        case .moveSurfaceToPreviousPane:
+            return ShortcutStroke(key: "[", command: true, shift: true, control: true)
+        case .moveSurfaceToNextPane:
+            return ShortcutStroke(key: "]", command: true, shift: true, control: true)
+        case .moveSurfaceToPaneLeft:
+            return ShortcutStroke(key: "←", command: true, shift: true, option: true)
+        case .moveSurfaceToPaneRight:
+            return ShortcutStroke(key: "→", command: true, shift: true, option: true)
+        case .moveSurfaceToPaneUp:
+            return ShortcutStroke(key: "↑", command: true, shift: true, option: true)
+        case .moveSurfaceToPaneDown:
+            return ShortcutStroke(key: "↓", command: true, shift: true, option: true)
         case .selectSurfaceByNumber: return ShortcutStroke(key: "1", control: true)
         case .selectWorkspaceByNumber: return ShortcutStroke(key: "1", command: true)
         case .moveWorkspaceUp: return ShortcutStroke(key: "[", command: true, option: true, control: true)

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+DisplayName.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+DisplayName.swift
@@ -38,8 +38,20 @@ extension ShortcutAction {
         case .triggerFlash: return "Flash Focused Panel"
         case .nextSurface: return "Next Surface"
         case .prevSurface: return "Previous Surface"
-        case .moveSurfaceLeft: return String(localized: "shortcut.moveSurfaceLeft.label", defaultValue: "Move Surface Left")
-        case .moveSurfaceRight: return String(localized: "shortcut.moveSurfaceRight.label", defaultValue: "Move Surface Right")
+        case .moveSurfaceLeft: return String(localized: "shortcut.moveSurfaceLeft.label", defaultValue: "Reorder Surface Left")
+        case .moveSurfaceRight: return String(localized: "shortcut.moveSurfaceRight.label", defaultValue: "Reorder Surface Right")
+        case .moveSurfaceToPreviousPane:
+            return String(localized: "shortcut.moveSurfaceToPreviousPane.label", defaultValue: "Move Surface to Previous Pane")
+        case .moveSurfaceToNextPane:
+            return String(localized: "shortcut.moveSurfaceToNextPane.label", defaultValue: "Move Surface to Next Pane")
+        case .moveSurfaceToPaneLeft:
+            return String(localized: "shortcut.moveSurfaceToPaneLeft.label", defaultValue: "Move Surface to Pane on Left")
+        case .moveSurfaceToPaneRight:
+            return String(localized: "shortcut.moveSurfaceToPaneRight.label", defaultValue: "Move Surface to Pane on Right")
+        case .moveSurfaceToPaneUp:
+            return String(localized: "shortcut.moveSurfaceToPaneUp.label", defaultValue: "Move Surface to Pane Above")
+        case .moveSurfaceToPaneDown:
+            return String(localized: "shortcut.moveSurfaceToPaneDown.label", defaultValue: "Move Surface to Pane Below")
         case .selectSurfaceByNumber: return "Select Surface 1…9"
         case .nextSidebarTab: return "Next Workspace"
         case .prevSidebarTab: return "Previous Workspace"

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Group.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction+Group.swift
@@ -1,4 +1,60 @@
 extension ShortcutAction {
+    /// Which group this action belongs to in the settings pane.
+    public var group: Group {
+        switch self {
+        case .openSettings, .reloadConfiguration, .showHideAllWindows, .globalSearch,
+             .newWindow, .closeWindow, .toggleFullScreen, .quit:
+            return .app
+        case .toggleSidebar, .newTab, .newBrowserWorkspace, .saveLayoutTemplate, .openFolder, .reopenPreviousSession, .goToWorkspace,
+             .commandPalette, .commandPaletteNext, .commandPalettePrevious, .sendFeedback,
+             .showNotifications, .jumpToUnread, .toggleUnread, .markOldestUnreadAndJumpNext,
+             .focusRightSidebar, .switchRightSidebarToFiles, .switchRightSidebarToFind,
+             .switchRightSidebarToSessions, .switchRightSidebarToFeed,
+             .switchRightSidebarToDock, .triggerFlash, .reopenClosedWorkspace:
+            return .workspace
+        case .nextSurface, .prevSurface, .moveSurfaceLeft, .moveSurfaceRight,
+             .moveSurfaceToPreviousPane, .moveSurfaceToNextPane,
+             .moveSurfaceToPaneLeft, .moveSurfaceToPaneRight,
+             .moveSurfaceToPaneUp, .moveSurfaceToPaneDown,
+             .selectSurfaceByNumber,
+             .nextSidebarTab, .prevSidebarTab, .moveWorkspaceUp, .moveWorkspaceDown,
+             .focusHistoryBack, .focusHistoryForward, .selectWorkspaceByNumber,
+             .renameTab, .renameWorkspace, .editWorkspaceDescription,
+             .markWorkspaceDone, .cycleWorkspaceStatus, .toggleChecklistItemComplete,
+             .closeTab, .closeOtherTabsInPane, .closeWorkspace,
+             .newWorkspaceGroup, .groupSelectedWorkspaces,
+             .toggleFocusedWorkspaceGroupCollapsed, .reopenClosedBrowserPanel,
+             .newSurface, .toggleTerminalCopyMode, .focusTextBoxInput,
+             .cycleTextBoxSubmitAction, .attachTextBoxFile, .sendCtrlFToTerminal,
+             .clearScreenKeepScrollback:
+            return .navigation
+        case .focusLeft, .focusRight, .focusUp, .focusDown, .splitRight, .splitDown,
+             .toggleSplitZoom, .equalizeSplits, .splitBrowserRight, .splitBrowserDown,
+             .toggleRightSidebar, .fileExplorerOpenSelection, .fileExplorerOpenSelectionFinderAlias,
+             .toggleCanvasLayout, .canvasRevealFocusedPane, .canvasOverview,
+             .canvasZoomIn, .canvasZoomOut, .canvasZoomReset, .canvasTidy,
+             .canvasAlignLeft, .canvasAlignRight, .canvasAlignTop, .canvasAlignBottom,
+             .canvasEqualizeWidths, .canvasEqualizeHeights,
+             .canvasDistributeHorizontally, .canvasDistributeVertically,
+             .simulatorHome, .simulatorRotateLeft, .simulatorRotateRight,
+             .simulatorToggleAppearance, .simulatorToggleSoftwareKeyboard:
+            return .panes
+        case .openDiffViewer, .saveFilePreview, .openBrowser, .focusBrowserAddressBar,
+             .browserBack, .browserForward, .browserReload, .browserHardReload,
+             .browserZoomIn, .browserZoomOut, .browserZoomReset,
+             .markdownZoomIn, .markdownZoomOut, .markdownZoomReset,
+             .find, .findInDirectory, .findNext, .findPrevious,
+             .hideFind, .useSelectionForFind, .toggleBrowserDeveloperTools,
+             .showBrowserJavaScriptConsole, .toggleBrowserFocusMode, .toggleReactGrab,
+             .diffViewerScrollDown, .diffViewerScrollUp,
+             .diffViewerScrollHalfPageDown, .diffViewerScrollHalfPageUp,
+             .diffViewerScrollDownEmacs, .diffViewerScrollUpEmacs,
+             .diffViewerScrollToBottom, .diffViewerScrollToTop,
+             .diffViewerOpenFileSearch, .diffViewerNextFile, .diffViewerPreviousFile:
+            return .browser
+        }
+    }
+
     /// Logical grouping used for sectioning the shortcuts pane.
     public enum Group: String, CaseIterable, Sendable, Hashable {
         /// Application-wide actions.

diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Values/ShortcutAction.swift
@@ -48,6 +48,18 @@ public enum ShortcutAction: String, CaseIterable, Sendable, Hashable, SettingCod
     case moveSurfaceLeft
     /// Moves the selected surface one position right.
     case moveSurfaceRight
+    /// Moves the selected surface to the previous pane in spatial order.
+    case moveSurfaceToPreviousPane
+    /// Moves the selected surface to the next pane in spatial order.
+    case moveSurfaceToNextPane
+    /// Moves the selected surface to the pane on the left.
+    case moveSurfaceToPaneLeft
+    /// Moves the selected surface to the pane on the right.
+    case moveSurfaceToPaneRight
+    /// Moves the selected surface to the pane above.
+    case moveSurfaceToPaneUp
+    /// Moves the selected surface to the pane below.
+    case moveSurfaceToPaneDown
     case selectSurfaceByNumber
     case nextSidebarTab
     case prevSidebarTab
@@ -186,54 +198,6 @@ public enum ShortcutAction: String, CaseIterable, Sendable, Hashable, SettingCod
 }
 
 extension ShortcutAction {
-    /// Which group this action belongs to in the settings pane.
-    public var group: Group {
-        switch self {
-        case .openSettings, .reloadConfiguration, .showHideAllWindows, .globalSearch,
-             .newWindow, .closeWindow, .toggleFullScreen, .quit:
-            return .app
-        case .toggleSidebar, .newTab, .newBrowserWorkspace, .saveLayoutTemplate, .openFolder, .reopenPreviousSession, .goToWorkspace,
-             .commandPalette, .commandPaletteNext, .commandPalettePrevious, .sendFeedback,
-             .showNotifications, .jumpToUnread, .toggleUnread, .markOldestUnreadAndJumpNext,
-             .focusRightSidebar, .switchRightSidebarToFiles, .switchRightSidebarToFind,
-             .switchRightSidebarToSessions, .switchRightSidebarToFeed,
-             .switchRightSidebarToDock, .triggerFlash, .reopenClosedWorkspace:
-            return .workspace
-        case .nextSurface, .prevSurface, .moveSurfaceLeft, .moveSurfaceRight, .selectSurfaceByNumber,
-             .nextSidebarTab, .prevSidebarTab, .moveWorkspaceUp, .moveWorkspaceDown, .focusHistoryBack, .focusHistoryForward,
-             .selectWorkspaceByNumber, .renameTab, .renameWorkspace,
-             .editWorkspaceDescription, .markWorkspaceDone, .cycleWorkspaceStatus, .toggleChecklistItemComplete, .closeTab, .closeOtherTabsInPane, .closeWorkspace,
-             .newWorkspaceGroup, .groupSelectedWorkspaces, .toggleFocusedWorkspaceGroupCollapsed,
-             .reopenClosedBrowserPanel, .newSurface, .toggleTerminalCopyMode,
-             .focusTextBoxInput, .cycleTextBoxSubmitAction, .attachTextBoxFile, .sendCtrlFToTerminal,
-             .clearScreenKeepScrollback:
-            return .navigation
-        case .focusLeft, .focusRight, .focusUp, .focusDown, .splitRight, .splitDown,
-             .toggleSplitZoom, .equalizeSplits, .splitBrowserRight, .splitBrowserDown,
-             .toggleRightSidebar, .fileExplorerOpenSelection, .fileExplorerOpenSelectionFinderAlias,
-             .toggleCanvasLayout, .canvasRevealFocusedPane, .canvasOverview,
-             .canvasZoomIn, .canvasZoomOut, .canvasZoomReset, .canvasTidy,
-             .canvasAlignLeft, .canvasAlignRight, .canvasAlignTop, .canvasAlignBottom,
-             .canvasEqualizeWidths, .canvasEqualizeHeights,
-             .canvasDistributeHorizontally, .canvasDistributeVertically,
-             .simulatorHome, .simulatorRotateLeft, .simulatorRotateRight,
-             .simulatorToggleAppearance, .simulatorToggleSoftwareKeyboard:
-            return .panes
-        case .openDiffViewer, .saveFilePreview, .openBrowser, .focusBrowserAddressBar, .browserBack,
-             .browserForward, .browserReload, .browserHardReload, .browserZoomIn, .browserZoomOut,
-             .browserZoomReset, .markdownZoomIn, .markdownZoomOut, .markdownZoomReset,
-             .find, .findInDirectory, .findNext, .findPrevious,
-             .hideFind, .useSelectionForFind, .toggleBrowserDeveloperTools,
-             .showBrowserJavaScriptConsole, .toggleBrowserFocusMode, .toggleReactGrab,
-             .diffViewerScrollDown, .diffViewerScrollUp,
-             .diffViewerScrollHalfPageDown, .diffViewerScrollHalfPageUp,
-             .diffViewerScrollDownEmacs, .diffViewerScrollUpEmacs, .diffViewerScrollToBottom,
-             .diffViewerScrollToTop, .diffViewerOpenFileSearch,
-             .diffViewerNextFile, .diffViewerPreviousFile:
-            return .browser
-        }
-    }
-
     /// Whether this action binds the whole `1…9` digit range through a
     /// single stored placeholder.
     ///

diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings
@@ -63803,6 +63803,23 @@
         }
       }
     },
+    "command.surfaceNavigation.subtitle": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Surface Navigation"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスナビゲーション"
+          }
+        }
+      }
+    },
     "command.switchExtensionSidebar.subtitle": {
       "extractionState": "manual",
       "localizations": {
@@ -202932,13 +202949,13 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Surface Left"
+            "value": "Reorder Surface Left"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "サーフェスを左へ移動"
+            "value": "サーフェスを左へ並べ替え"
           }
         }
       }
@@ -202949,13 +202966,115 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Move Surface Right"
+            "value": "Reorder Surface Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを右へ並べ替え"
+          }
+        }
+      }
+    },
+    "shortcut.moveSurfaceToNextPane.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Surface to Next Pane"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを次のペインへ移動"
+          }
+        }
+      }
+    },
+    "shortcut.moveSurfaceToPaneDown.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Surface to Pane Below"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを下のペインへ移動"
+          }
+        }
+      }
+    },
+    "shortcut.moveSurfaceToPaneLeft.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Surface to Pane on Left"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを左のペインへ移動"
+          }
+        }
+      }
+    },
+    "shortcut.moveSurfaceToPaneRight.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Surface to Pane on Right"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを右のペインへ移動"
+          }
+        }
+      }
+    },
+    "shortcut.moveSurfaceToPaneUp.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Surface to Pane Above"
+          }
+        },
+        "ja": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "サーフェスを上のペインへ移動"
+          }
+        }
+      }
+    },
+    "shortcut.moveSurfaceToPreviousPane.label": {
+      "extractionState": "manual",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Move Surface to Previous Pane"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "サーフェスを右へ移動"
+            "value": "サーフェスを前のペインへ移動"
           }
         }
       }