Right sidebar overhaul

CLI/cmux.swift

@@ -20780,6 +20780,11 @@ struct CMUXCLI {
               cmux right-sidebar set find
               cmux right-sidebar set custom panel-info
               cmux right-sidebar mode
+            """) + "\n\n" + String(localized: "cli.rightSidebar.usage.find", defaultValue: """
+            Find:
+              set find --query <text> [--regex] [--case-sensitive] [--whole-word] [--no-focus]
+                                             Search Find for <text> as if typed into its field
+              find-status                    Print the Find query, phase, results and files as JSON
             """)
         case "sidebar":
             return String(localized: "cli.sidebar.usage", defaultValue: """
@@ -21269,6 +21274,8 @@ struct CMUXCLI {
         let workspace: String?
         let window: String?
         let noFocus: Bool
+        /// `--query`, `--regex`, `--case-sensitive`, `--whole-word` for Find.
+        var findOptions: [String] = []
     }
 
     private func forwardRightSidebarCommand(
@@ -21293,7 +21300,8 @@ struct CMUXCLI {
             .map(shellQuote)
             .joined(separator: " ")
         let response = try sendV1Command(command, client: client)
-        if parsed.positional.first?.lowercased() == "mode" {
+        let action = parsed.positional.first?.lowercased()
+        if action == "mode" || action == "find-status" || action == "find_status" {
             print(response)
         }
     }
@@ -21478,11 +21486,21 @@ struct CMUXCLI {
         var workspace: String?
         var window: String?
         var noFocus = false
+        var findOptions: [String] = []
         var index = 0
 
         while index < args.count {
             let arg = args[index]
             switch arg {
+            case "--query":
+                guard index + 1 < args.count else {
+                    throw CLIError(message: String(localized: "cli.rightSidebar.error.queryRequiresValue", defaultValue: "right-sidebar: --query requires text"))
+                }
+                findOptions.append("--query=\(args[index + 1])")
+                index += 2
+            case "--regex", "--case-sensitive", "--whole-word":
+                findOptions.append(arg)
+                index += 1
             case "--workspace":
                 guard index + 1 < args.count else {
                     throw CLIError(message: String(localized: "cli.rightSidebar.error.workspaceRequiresValue", defaultValue: "right-sidebar: --workspace requires an id"))
@@ -21499,7 +21517,10 @@ struct CMUXCLI {
                 noFocus = true
                 index += 1
             default:
-                if arg.hasPrefix("--workspace=") {
+                if arg.hasPrefix("--query=") {
+                    findOptions.append(arg)
+                    index += 1
+                } else if arg.hasPrefix("--workspace=") {
                     workspace = String(arg.dropFirst("--workspace=".count))
                     index += 1
                 } else if arg.hasPrefix("--window=") {
@@ -21517,14 +21538,34 @@ struct CMUXCLI {
             positional: positional,
             workspace: workspace,
             window: window,
-            noFocus: noFocus
+            noFocus: noFocus,
+            findOptions: findOptions
         )
     }
     private func rightSidebarSocketArguments(from parsed: RightSidebarCLIArguments) throws -> [String] {
         guard let action = parsed.positional.first?.lowercased() else {
             throw CLIError(message: String(localized: "cli.rightSidebar.error.missingCommand", defaultValue: "right-sidebar requires a subcommand"))
         }
 
+        if action == "find-status" || action == "find_status" {
+            guard parsed.positional.count == 1, !parsed.noFocus, parsed.findOptions.isEmpty else {
+                throw CLIError(message: String(localized: "cli.rightSidebar.error.unexpectedArguments", defaultValue: "right-sidebar \(action) received unexpected arguments"))
+            }
+            return ["find_status"]
+        }
+        if !parsed.findOptions.isEmpty {
+            let modeArgument = action == "set" && parsed.positional.count == 2 ? parsed.positional[1] : action
+            guard normalizedRightSidebarCLIArgument(modeArgument) == "find",
+                  parsed.positional.count == (action == "set" ? 2 : 1),
+                  parsed.findOptions.contains(where: { $0.hasPrefix("--query=") }) else {
+                throw CLIError(message: String(localized: "cli.rightSidebar.error.findOptionsRequireFind", defaultValue: "right-sidebar: --query, --regex, --case-sensitive and --whole-word need 'find' or 'set find' and a --query"))
+            }
+            guard action == "set" || !parsed.noFocus else {
+                throw CLIError(message: String(localized: "cli.rightSidebar.error.noFocusOnlySet", defaultValue: "right-sidebar: --no-focus is only valid with set"))
+            }
+            return ["set", "find"] + parsed.findOptions + (parsed.noFocus ? ["--no-focus"] : [])
+        }
+
         switch action {
         case "toggle", "show", "hide", "focus", "mode":
             guard parsed.positional.count == 1 else {

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Sidebar/ControlCommandCoordinator+SidebarReportsV1.swift

@@ -508,6 +508,17 @@ extension ControlCommandCoordinator {
                 "visible": .bool(visible),
                 "mode": .string(modeRawValue),
             ]))
+        case .findStatus(let status):
+            return ControlResponseEncoder().encode(.object([
+                "query": .string(status.query),
+                "regex": .bool(status.isRegex),
+                "case_sensitive": .bool(status.isCaseSensitive),
+                "whole_word": .bool(status.matchesWholeWord),
+                "phase": .string(status.phase),
+                "results": .int(Int64(status.results)),
+                "files": .int(Int64(status.files)),
+                "message": status.message.map { .string($0) } ?? .null,
+            ]))
         case .failure(let message):
             return message
         }

Packages/macOS/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Sidebar/ControlSidebarRightSidebarResolution.swift

@@ -8,7 +8,44 @@ public enum ControlSidebarRightSidebarResolution: Sendable, Equatable {
     case ok
     /// A `get`-style command returned sidebar state to encode.
     case state(visible: Bool, modeRawValue: String)
+    /// `find_status` returned the Find query and totals to encode.
+    case findStatus(ControlSidebarFindStatus)
     /// A parse or apply failure; `message` is the full legacy reply line
     /// (localized app-side where the original was localized).
     case failure(message: String)
 }
+
+/// The Find state `right_sidebar find_status` reports, so a script can wait
+/// for a search and assert its totals.
+public struct ControlSidebarFindStatus: Sendable, Equatable {
+    public let query: String
+    public let isRegex: Bool
+    public let isCaseSensitive: Bool
+    public let matchesWholeWord: Bool
+    /// `idle`, `searching`, `completed`, `limited` or `failed`.
+    public let phase: String
+    public let results: Int
+    public let files: Int
+    /// The status line as shown, or nil when hidden.
+    public let message: String?
+
+    public init(
+        query: String,
+        isRegex: Bool,
+        isCaseSensitive: Bool,
+        matchesWholeWord: Bool,
+        phase: String,
+        results: Int,
+        files: Int,
+        message: String?
+    ) {
+        self.query = query
+        self.isRegex = isRegex
+        self.isCaseSensitive = isCaseSensitive
+        self.matchesWholeWord = matchesWholeWord
+        self.phase = phase
+        self.results = results
+        self.files = files
+        self.message = message
+    }
+}

Packages/macOS/CmuxFileSearch/Package.swift

@@ -0,0 +1,35 @@
+// swift-tools-version: 6.0
+
+import PackageDescription
+
+let package = Package(
+    name: "CmuxFileSearch",
+    platforms: [
+        .macOS(.v14),
+    ],
+    products: [
+        .library(
+            name: "CmuxFileSearch",
+            targets: ["CmuxFileSearch"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "CmuxFileSearch",
+            swiftSettings: [
+                .swiftLanguageMode(.v6),
+                .enableUpcomingFeature("ExistentialAny"),
+                .enableUpcomingFeature("InternalImportsByDefault"),
+            ]
+        ),
+        .testTarget(
+            name: "CmuxFileSearchTests",
+            dependencies: ["CmuxFileSearch"],
+            swiftSettings: [
+                .swiftLanguageMode(.v6),
+                .enableUpcomingFeature("ExistentialAny"),
+                .enableUpcomingFeature("InternalImportsByDefault"),
+            ]
+        ),
+    ]
+)

Packages/macOS/CmuxFileSearch/README.md

@@ -0,0 +1,27 @@
+# CmuxFileSearch
+
+Project-wide search for the right sidebar's Find mode, independent of AppKit.
+
+- `FileSearchQuery` holds the VS Code style options (Match Case, Match Whole
+  Word, Use Regular Expression, include and exclude globs, Use Exclude Settings
+  and Ignore Files). `FileSearchQuery.ripgrepArguments(rootPath:)` maps it to one `rg --json` argument
+  vector that runs unchanged locally, over SSH and on a Cloud VM.
+- `RipgrepJSONLineParser` and `RipgrepStreamDecoder` turn ripgrep output into
+  one `FileSearchMatch` per submatch, with UTF-16 columns and a bounded preview
+  around the match. Invalid UTF-8 (`"bytes"` payloads) is decoded consistently.
+- `FileSearchProcess` spawns the command with `posix_spawn` in its own process
+  group, so arguments are not Unicode-normalized and cancellation also stops
+  processes the command started.
+- `FileSearchEngine` debounces requests with an injected `Clock`, cancels
+  superseded searches, and applies streamed batches to `FileSearchResultTree`
+  at most once per frame. `FileSearchRowList` flattens the tree into table
+  rows: `NSOutlineView` expansion is linear in the rows below each expanded
+  item, which measured several seconds for 100,000 streamed matches, while
+  appending table rows costs microseconds.
+
+```bash
+swift test --package-path Packages/macOS/CmuxFileSearch
+```
+
+`FileSearchPerformanceTests` prints decode and tree timings for 100,000
+matches. The ripgrep end-to-end suite runs only when `rg` is installed.