From 6edcaa220b0c91bcb14e8a33f9c8c0008aa823c8 Mon Sep 17 00:00:00 2001
From: Lawrence Chen <lawrencecchen@users.noreply.github.com>
Date: Fri, 13 Mar 2026 16:06:36 -0700
Subject: [PATCH] Add Cmd+Shift+P backspace regression tests

---
 .../CommandPaletteSearchEngineTests.swift     | 31 ++++++++++
 cmuxUITests/SidebarHelpMenuUITests.swift      | 60 ++++++++++++++++++-
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/cmuxTests/CommandPaletteSearchEngineTests.swift b/cmuxTests/CommandPaletteSearchEngineTests.swift
index 4e0ecddf..018f28e7 100644
--- a/cmuxTests/CommandPaletteSearchEngineTests.swift
+++ b/cmuxTests/CommandPaletteSearchEngineTests.swift
@@ -434,6 +434,37 @@ final class CommandPaletteSearchEngineTests: XCTestCase {
         )
     }
 
+    func testVisibleResultsResetWhenQueryChangesCommandPaletteScope() {
+        XCTAssertTrue(
+            ContentView.commandPaletteShouldResetVisibleResultsForQueryTransition(
+                oldQuery: ">",
+                newQuery: "",
+                hasVisibleResults: true
+            )
+        )
+        XCTAssertTrue(
+            ContentView.commandPaletteShouldResetVisibleResultsForQueryTransition(
+                oldQuery: "",
+                newQuery: ">",
+                hasVisibleResults: true
+            )
+        )
+        XCTAssertFalse(
+            ContentView.commandPaletteShouldResetVisibleResultsForQueryTransition(
+                oldQuery: ">rename",
+                newQuery: ">renam",
+                hasVisibleResults: true
+            )
+        )
+        XCTAssertFalse(
+            ContentView.commandPaletteShouldResetVisibleResultsForQueryTransition(
+                oldQuery: ">",
+                newQuery: "",
+                hasVisibleResults: false
+            )
+        )
+    }
+
     func testCommandContextFingerprintTracksExactContextValues() {
         let base = ContentView.commandPaletteContextFingerprint(
             boolValues: [
diff --git a/cmuxUITests/SidebarHelpMenuUITests.swift b/cmuxUITests/SidebarHelpMenuUITests.swift
index 8159289e..35677d75 100644
--- a/cmuxUITests/SidebarHelpMenuUITests.swift
+++ b/cmuxUITests/SidebarHelpMenuUITests.swift
@@ -312,6 +312,56 @@ final class CommandPaletteAllSurfacesUITests: XCTestCase {
         super.tearDown()
     }
 
+    func testCmdShiftPBackspaceReturnsToWorkspaceResults() throws {
+        let app = XCUIApplication()
+        app.launchArguments += ["-AppleLanguages", "(en)", "-AppleLocale", "en_US"]
+        app.launchEnvironment["CMUX_UI_TEST_MODE"] = "1"
+        app.launchEnvironment["CMUX_SOCKET_PATH"] = socketPath
+        launchAndActivate(app)
+
+        XCTAssertTrue(
+            sidebarHelpPollUntil(timeout: 8.0) {
+                app.windows.count >= 1
+            },
+            "Expected the main window to be visible"
+        )
+        XCTAssertTrue(waitForSocketPong(timeout: 12.0), "Expected control socket at \(socketPath)")
+
+        let mainWindowId = try XCTUnwrap(
+            socketCommand("current_window")?.trimmingCharacters(in: .whitespacesAndNewlines)
+        )
+
+        openCommandPaletteCommands(app: app)
+
+        _ = try XCTUnwrap(
+            waitForCommandPaletteSnapshot(windowId: mainWindowId, mode: "commands", query: "", timeout: 5.0) { snapshot in
+                self.commandPaletteResultRows(from: snapshot).contains { row in
+                    let commandId = row["command_id"] as? String ?? ""
+                    return !commandId.hasPrefix("switcher.")
+                }
+            }
+        )
+
+        app.typeKey(XCUIKeyboardKey.delete.rawValue, modifierFlags: [])
+
+        let switcherSnapshot = try XCTUnwrap(
+            waitForCommandPaletteSnapshot(windowId: mainWindowId, mode: "switcher", query: "", timeout: 5.0) { snapshot in
+                self.commandPaletteResultRows(from: snapshot).contains { row in
+                    let commandId = row["command_id"] as? String ?? ""
+                    return commandId.hasPrefix("switcher.workspace.")
+                }
+            }
+        )
+
+        XCTAssertTrue(
+            commandPaletteResultRows(from: switcherSnapshot).contains { row in
+                let commandId = row["command_id"] as? String ?? ""
+                return commandId.hasPrefix("switcher.workspace.")
+            },
+            "Expected deleting the command prefix to restore workspace rows. snapshot=\(switcherSnapshot)"
+        )
+    }
+
     func testCmdPSearchCanIncludeSurfacesFromOtherWorkspacesWhenEnabled() throws {
         let app = XCUIApplication()
         app.launchArguments += ["-AppleLanguages", "(en)", "-AppleLocale", "en_US"]
@@ -411,6 +461,13 @@ final class CommandPaletteAllSurfacesUITests: XCTestCase {
         searchField.typeText(query)
     }
 
+    private func openCommandPaletteCommands(app: XCUIApplication) {
+        let searchField = app.textFields["CommandPaletteSearchField"]
+        app.typeKey("p", modifierFlags: [.command, .shift])
+        XCTAssertTrue(searchField.waitForExistence(timeout: 5.0), "Expected command palette search field")
+        searchField.click()
+    }
+
     private func dismissCommandPalette(app: XCUIApplication) {
         let searchField = app.textFields["CommandPaletteSearchField"]
         for _ in 0..<2 {
@@ -511,6 +568,7 @@ final class CommandPaletteAllSurfacesUITests: XCTestCase {
 
     private func waitForCommandPaletteSnapshot(
         windowId: String,
+        mode: String = "switcher",
         query: String,
         timeout: TimeInterval,
         predicate: (([String: Any]) -> Bool)? = nil
@@ -520,7 +578,7 @@ final class CommandPaletteAllSurfacesUITests: XCTestCase {
             guard let snapshot = commandPaletteSnapshot(windowId: windowId) else { return false }
             latest = snapshot
             guard (snapshot["visible"] as? Bool) == true else { return false }
-            guard (snapshot["mode"] as? String) == "switcher" else { return false }
+            guard (snapshot["mode"] as? String) == mode else { return false }
             guard (snapshot["query"] as? String) == query else { return false }
             return predicate?(snapshot) ?? true
         }