Refactor diff viewer onto Pierre React primitives

.github/workflows/ci.yml

@@ -135,6 +135,9 @@ jobs:
       - name: Verify generated diff viewer assets
         run: ./scripts/build-diff-viewer-app.sh --check
 
+      - name: Verify React Compiler for diff viewer
+        run: ./scripts/check-diff-viewer-react-compiler.mjs
+
       - name: Typecheck diff viewer
         working-directory: diff-viewer
         run: bun run typecheck

CLI/cmux_open.swift

@@ -402,6 +402,7 @@ extension CMUXCLI {
                 "commit": CMUXDiffViewerLocalization.string("about.commit", defaultValue: "Commit"),
                 "collapseAllDiffs": CMUXDiffViewerLocalization.string("diffViewer.collapseAllDiffs", defaultValue: "Collapse all diffs"),
                 "collapseUnchangedContext": CMUXDiffViewerLocalization.string("diffViewer.collapseUnchangedContext", defaultValue: "Collapse unchanged context"),
+                "copyFailedGitApplyCommand": CMUXDiffViewerLocalization.string("diffViewer.copyFailedGitApplyCommand", defaultValue: "Could not copy git apply command."),
                 "copiedGitApplyCommand": CMUXDiffViewerLocalization.string("diffViewer.copiedGitApplyCommand", defaultValue: "Copied git apply command"),
                 "copyGitApplyCommand": CMUXDiffViewerLocalization.string("diffViewer.copyGitApplyCommand", defaultValue: "Copy git apply command"),
                 "deletions": CMUXDiffViewerLocalization.string("diffViewer.deletions", defaultValue: "Deletions"),
@@ -1362,23 +1363,63 @@ extension CMUXCLI {
 
         if host == "diffshub.com" || host == "www.diffshub.com" {
             let components = url.pathComponents
-            if components.count >= 5,
-               components[3] == "pull",
-               Int(components[4]) != nil {
-                return URL(string: "https://github.com/\(components[1])/\(components[2])/pull/\(components[4]).diff")
+            guard components.count >= 5 else {
+                return url
+            }
+            if components[3] == "pull" {
+                return trustedGitHubPullPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    pullComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "compare" {
+                return trustedGitHubComparePatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    compareComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "commit" {
+                return trustedGitHubCommitPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    commitComponent: components[4],
+                    defaultExtension: "diff"
+                )
             }
         }
 
         if host == "github.com" || host == "www.github.com" {
             let components = url.pathComponents
-            if components.count >= 5,
-               components[3] == "pull",
-               Int(components[4].replacingOccurrences(of: ".patch", with: "").replacingOccurrences(of: ".diff", with: "")) != nil {
-                let pullComponent = components[4]
-                if pullComponent.hasSuffix(".patch") || pullComponent.hasSuffix(".diff") {
-                    return url
-                }
-                return URL(string: "https://github.com/\(components[1])/\(components[2])/pull/\(pullComponent).diff")
+            guard components.count >= 5 else {
+                return url
+            }
+            if components[3] == "pull" {
+                return trustedGitHubPullPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    pullComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "compare" {
+                return trustedGitHubComparePatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    compareComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "commit" {
+                return trustedGitHubCommitPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    commitComponent: components[4],
+                    defaultExtension: "diff"
+                )
             }
         }
 
@@ -1395,30 +1436,66 @@ extension CMUXCLI {
 
         if host == "diffshub.com" || host == "www.diffshub.com" {
             let components = url.pathComponents
-            guard components.count >= 5,
-                  components[3] == "pull" else {
+            guard components.count >= 5 else {
                 return nil
             }
-            return trustedGitHubPullPatchURL(
-                owner: components[1],
-                repo: components[2],
-                pullComponent: components[4],
-                defaultExtension: "diff"
-            )
+            if components[3] == "pull" {
+                return trustedGitHubPullPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    pullComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "compare" {
+                return trustedGitHubComparePatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    compareComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "commit" {
+                return trustedGitHubCommitPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    commitComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            return nil
         }
 
         if host == "github.com" || host == "www.github.com" {
             let components = url.pathComponents
-            guard components.count >= 5,
-                  components[3] == "pull" else {
+            guard components.count >= 5 else {
                 return nil
             }
-            return trustedGitHubPullPatchURL(
-                owner: components[1],
-                repo: components[2],
-                pullComponent: components[4],
-                defaultExtension: "diff"
-            )
+            if components[3] == "pull" {
+                return trustedGitHubPullPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    pullComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "compare" {
+                return trustedGitHubComparePatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    compareComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            if components[3] == "commit" {
+                return trustedGitHubCommitPatchURL(
+                    owner: components[1],
+                    repo: components[2],
+                    commitComponent: components[4],
+                    defaultExtension: "diff"
+                )
+            }
+            return nil
         }
 
         return nil
@@ -1455,6 +1532,71 @@ extension CMUXCLI {
         return URL(string: "https://github.com/\(owner)/\(repo)/pull/\(pullNumber).\(suffix)")
     }
 
+    private func trustedGitHubComparePatchURL(
+        owner: String,
+        repo: String,
+        compareComponent: String,
+        defaultExtension: String
+    ) -> URL? {
+        guard githubPathSegmentIsSafe(owner),
+              githubPathSegmentIsSafe(repo) else {
+            return nil
+        }
+
+        let suffix: String
+        let compareSpec: String
+        if compareComponent.hasSuffix(".patch") {
+            suffix = "patch"
+            compareSpec = String(compareComponent.dropLast(".patch".count))
+        } else if compareComponent.hasSuffix(".diff") {
+            suffix = "diff"
+            compareSpec = String(compareComponent.dropLast(".diff".count))
+        } else {
+            suffix = defaultExtension
+            compareSpec = compareComponent
+        }
+        guard suffix == "diff" || suffix == "patch",
+              githubCompareSpecIsSafe(compareSpec) else {
+            return nil
+        }
+        return URL(string: "https://github.com/\(owner)/\(repo)/compare/\(compareSpec).\(suffix)")
+    }
+
+    private func trustedGitHubCommitPatchURL(
+        owner: String,
+        repo: String,
+        commitComponent: String,
+        defaultExtension: String
+    ) -> URL? {
+        guard githubPathSegmentIsSafe(owner),
+              githubPathSegmentIsSafe(repo) else {
+            return nil
+        }
+
+        let suffix: String
+        let commit: String
+        if commitComponent.hasSuffix(".patch") {
+            suffix = "patch"
+            commit = String(commitComponent.dropLast(".patch".count))
+        } else if commitComponent.hasSuffix(".diff") {
+            suffix = "diff"
+            commit = String(commitComponent.dropLast(".diff".count))
+        } else {
+            suffix = defaultExtension
+            commit = commitComponent
+        }
+        guard suffix == "diff" || suffix == "patch",
+              commit.count >= 7,
+              commit.unicodeScalars.allSatisfy({ scalar in
+                  (scalar.value >= 48 && scalar.value <= 57) ||
+                      (scalar.value >= 65 && scalar.value <= 70) ||
+                      (scalar.value >= 97 && scalar.value <= 102)
+              }) else {
+            return nil
+        }
+        return URL(string: "https://github.com/\(owner)/\(repo)/commit/\(commit).\(suffix)")
+    }
+
     private func githubPathSegmentIsSafe(_ component: String) -> Bool {
         guard !component.isEmpty else { return false }
         return component.unicodeScalars.allSatisfy { scalar in
@@ -1467,6 +1609,19 @@ extension CMUXCLI {
         }
     }
 
+    private func githubCompareSpecIsSafe(_ component: String) -> Bool {
+        guard component.contains(".."), !component.isEmpty else { return false }
+        return component.unicodeScalars.allSatisfy { scalar in
+            (scalar.value >= 48 && scalar.value <= 57) ||
+                (scalar.value >= 65 && scalar.value <= 90) ||
+                (scalar.value >= 97 && scalar.value <= 122) ||
+                scalar == "-" ||
+                scalar == "_" ||
+                scalar == "." ||
+                scalar == "/"
+        }
+    }
+
     private func diffInputExternalURL(_ url: URL) -> URL {
         guard let host = url.host?.lowercased(),
               host == "github.com" || host == "www.github.com" else {
@@ -5037,7 +5192,7 @@ extension CMUXCLI {
             return path.hasSuffix(".html")
         }
         if mimeType == "text/javascript" {
-            return path.hasSuffix(".mjs")
+            return path.hasSuffix(".mjs") || path.hasSuffix(".js")
         }
         if mimeType == "text/x-diff" {
             return path.hasSuffix(".patch")
@@ -5461,7 +5616,7 @@ extension CMUXCLI {
 
     private func ensureDiffViewerAssets(nextTo viewerURL: URL) throws -> DiffViewerAssets {
         let sourceDirectory = try diffViewerBundledAssetDirectory()
-        let assetDirectoryName = "pierre-diffs-1.2.1-trees-1.0.0-beta.4"
+        let assetDirectoryName = "pierre-diffs-1.2.7-trees-1.0.0-beta.4"
         let targetDirectory = viewerURL.deletingLastPathComponent()
             .appendingPathComponent("assets", isDirectory: true)
             .appendingPathComponent(assetDirectoryName, isDirectory: true)
@@ -5478,7 +5633,7 @@ extension CMUXCLI {
         guard assetPaths.contains("diffs.mjs"),
               assetPaths.contains("trees.mjs"),
               assetPaths.contains("worker-pool/worker-pool.mjs"),
-              assetPaths.contains("worker-pool/worker-portable.mjs") else {
+              assetPaths.contains("worker-pool/worker-portable.js") else {
             throw CLIError(message: "Bundled diff viewer entry assets not found")
         }
         for assetPath in assetPaths {
@@ -5498,7 +5653,7 @@ extension CMUXCLI {
             diffsModuleURL: "./assets/\(assetDirectoryName)/diffs.mjs",
             treesModuleURL: "./assets/\(assetDirectoryName)/trees.mjs",
             workerPoolModuleURL: "./assets/\(assetDirectoryName)/worker-pool/worker-pool.mjs",
-            workerModuleURL: "./assets/\(assetDirectoryName)/worker-pool/worker-portable.mjs",
+            workerModuleURL: "./assets/\(assetDirectoryName)/worker-pool/worker-portable.js",
             files: assetPaths.map { targetDirectory.appendingPathComponent($0, isDirectory: false) }
                 + appAssetPaths.map { targetAppDirectory.appendingPathComponent($0, isDirectory: false) }
         )
@@ -5567,7 +5722,7 @@ extension CMUXCLI {
 
         var relativePaths: [String] = []
         for case let fileURL as URL in enumerator {
-            guard fileURL.pathExtension == "mjs",
+            guard ["js", "mjs"].contains(fileURL.pathExtension),
                   let values = try? fileURL.resourceValues(forKeys: [.isRegularFileKey]),
                   values.isRegularFile == true else {
                 continue