Merge pull request #20 from sidequery/nicosuave/fix-ci-runners

nicosuave · web-flow · commit ee988da5b047 · 2026-03-02T06:44:54.000-08:00
Re-apply CI fixes for GitHub-hosted runners
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/macos/Assets.xcassets/Ghostty.appiconset/Contents.json b/macos/Assets.xcassets/Ghostty.appiconset/Contents.json
@@ -59,6 +59,12 @@
       "size": "512x512",
       "scale": "2x",
       "filename": "icon_512x512@2x.png"
+    },
+    {
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024",
+      "filename": "icon_512x512@2x.png"
     }
   ],
   "info": {
diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -144,6 +144,17 @@
 				"Features/Custom App Icon/Extensions/Notification+AppIcon.swift",
 				"Features/Custom App Icon/Extensions/UserDefaults+AppIcon.swift",
 				"Features/Global Keybinds/GlobalEventTap.swift",
+				Features/GitDiff/DiffModels.swift,
+				Features/GitDiff/DiffParser.swift,
+				Features/GitDiff/DiffReviewDraft.swift,
+				Features/GitDiff/DiffReviewDraftStore.swift,
+				Features/GitDiff/DiffSyntaxHighlighter.swift,
+				Features/GitDiff/GitDiffBadges.swift,
+				Features/GitDiff/GitDiffMainView.swift,
+				Features/GitDiff/GitDiffSidebarState.swift,
+				Features/GitDiff/GitDiffSidebarView.swift,
+				Features/GitDiff/GitDiffStore.swift,
+				Features/GitDiff/GitDiffTerminalViewModel.swift,
 				Features/QuickTerminal/QuickTerminal.xib,
 				Features/QuickTerminal/QuickTerminalController.swift,
 				Features/QuickTerminal/QuickTerminalPosition.swift,
@@ -165,6 +176,7 @@
 				Features/Splits/SplitView.Divider.swift,
 				Features/Splits/SplitView.swift,
 				Features/Splits/TerminalSplitTreeView.swift,
+				Features/Terminal/AgentStatus/TerminalAgentHooks.swift,
 				Features/Terminal/BaseTerminalController.swift,
 				Features/Terminal/ErrorView.swift,
 				Features/Terminal/TerminalController.swift,
@@ -204,8 +216,10 @@
 				Features/Worktrunk/StatusRing/StatusRingTooltipOverlay.swift,
 				Features/Worktrunk/StatusRing/StatusRingTooltipState.swift,
 				Features/Worktrunk/StatusRing/StatusRingView.swift,
+				Features/Worktrunk/SidebarListScrollPreserver.swift,
 				Features/Worktrunk/WorktrunkClient.swift,
 				Features/Worktrunk/WorktrunkInstaller.swift,
+				Features/Worktrunk/WorktrunkOpenTabsModel.swift,
 				Features/Worktrunk/WorktrunkPreferences.swift,
 				Features/Worktrunk/WorktrunkSettingsView.swift,
 				Features/Worktrunk/WorktrunkSidebarView.swift,
diff --git a/macos/Sources/Features/GitDiff/GitDiffSidebarView.swift b/macos/Sources/Features/GitDiff/GitDiffSidebarView.swift
@@ -210,6 +210,7 @@ struct GitDiffSidebarView: View {
         }
     }
 
+    // swiftlint:disable:next large_tuple
     private var diffSummary: (files: Int, additions: Int, deletions: Int, unresolved: Int)? {
         guard let doc = state.document else { return nil }
         let adds = doc.files.reduce(0) { $0 + $1.additions }
diff --git a/macos/Sources/Features/GitDiff/GitDiffStore.swift b/macos/Sources/Features/GitDiff/GitDiffStore.swift
@@ -295,14 +295,13 @@ final class GitDiffStore {
             }
         }
 
-        for path in ["/opt/homebrew/bin/git", "/usr/local/bin/git", "/usr/bin/git"] {
-            if FileManager.default.isExecutableFile(atPath: path) {
-                return GitInvocation(
-                    executableURL: URL(fileURLWithPath: path),
-                    arguments: args,
-                    environment: env
-                )
-            }
+        for path in ["/opt/homebrew/bin/git", "/usr/local/bin/git", "/usr/bin/git"]
+            where FileManager.default.isExecutableFile(atPath: path) {
+            return GitInvocation(
+                executableURL: URL(fileURLWithPath: path),
+                arguments: args,
+                environment: env
+            )
         }
 
         let envURL = URL(fileURLWithPath: "/usr/bin/env")
diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -1685,14 +1685,13 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
               let appDelegate = NSApp.delegate as? AppDelegate else { return }
 
         let store = appDelegate.worktrunkStore
-        for repo in store.repositories {
-            if store.worktrees(for: repo.id).contains(where: { $0.path == rootPath }) {
-                let newSelection = SidebarSelection.worktree(repoID: repo.id, path: rootPath)
-                guard worktrunkSidebarState.selection != newSelection else { return }
-                applySyncedWorktrunkSidebarSelection(newSelection)
-                syncWorktrunkSidebarSelectionToTabGroup(newSelection)
-                return
-            }
+        for repo in store.repositories
+            where store.worktrees(for: repo.id).contains(where: { $0.path == rootPath }) {
+            let newSelection = SidebarSelection.worktree(repoID: repo.id, path: rootPath)
+            guard worktrunkSidebarState.selection != newSelection else { return }
+            applySyncedWorktrunkSidebarSelection(newSelection)
+            syncWorktrunkSidebarSelectionToTabGroup(newSelection)
+            return
         }
     }
 
diff --git a/macos/Sources/Features/Update/UpdateController.swift b/macos/Sources/Features/Update/UpdateController.swift
@@ -158,10 +158,8 @@ enum InstallChannel {
             "/opt/homebrew/Caskroom/ghostree",
             "/usr/local/Caskroom/ghostree",
         ]
-        for path in caskroomPaths {
-            if FileManager.default.fileExists(atPath: path) {
-                return .homebrew
-            }
+        for path in caskroomPaths where FileManager.default.fileExists(atPath: path) {
+            return .homebrew
         }
 
         return .manual
diff --git a/macos/Sources/Features/Worktrunk/GitHub/GHClient.swift b/macos/Sources/Features/Worktrunk/GitHub/GHClient.swift
@@ -239,10 +239,9 @@ struct GHClient {
         }
 
         // Find gh executable
-        for path in ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"] {
-            if FileManager.default.isExecutableFile(atPath: path) {
-                return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)
-            }
+        for path in ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"]
+            where FileManager.default.isExecutableFile(atPath: path) {
+            return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)
         }
 
         // Fall back to PATH resolution
diff --git a/macos/Sources/Features/Worktrunk/GitHub/GitHubModels.swift b/macos/Sources/Features/Worktrunk/GitHub/GitHubModels.swift
@@ -76,6 +76,7 @@ struct PRStatus: Identifiable, Equatable {
         return .pending
     }
 
+    // swiftlint:disable:next large_tuple
     var checkCounts: (passed: Int, failed: Int, pending: Int, skipped: Int) {
         var passed = 0, failed = 0, pending = 0, skipped = 0
         for check in checks {
diff --git a/macos/Sources/Features/Worktrunk/WorktrunkClient.swift b/macos/Sources/Features/Worktrunk/WorktrunkClient.swift
@@ -98,10 +98,9 @@ struct WorktrunkClient {
             return Invocation(executableURL: url, arguments: args, environment: env)
         }
 
-        for path in wtExecutableCandidatePaths() {
-            if FileManager.default.isExecutableFile(atPath: path) {
-                return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)
-            }
+        for path in wtExecutableCandidatePaths()
+            where FileManager.default.isExecutableFile(atPath: path) {
+            return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)
         }
 
         // Last resort: rely on PATH resolution.
diff --git a/macos/Sources/Features/Worktrunk/WorktrunkSidebarView.swift b/macos/Sources/Features/Worktrunk/WorktrunkSidebarView.swift
@@ -303,10 +303,8 @@ struct WorktrunkSidebarView: View {
     private func findWorktree(forWorktreeRootPath rootPath: String) -> WorktrunkStore.Worktree? {
         let root = standardizedPath(rootPath)
         for repo in store.repositories {
-            for wt in store.worktrees(for: repo.id) {
-                if standardizedPath(wt.path) == root {
-                    return wt
-                }
+            for wt in store.worktrees(for: repo.id) where standardizedPath(wt.path) == root {
+                return wt
             }
         }
         return nil
diff --git a/macos/Sources/Features/Worktrunk/WorktrunkStore.swift b/macos/Sources/Features/Worktrunk/WorktrunkStore.swift
@@ -650,11 +650,9 @@ final class WorktrunkStore: ObservableObject {
 
                 if result.hadExistingList, !added.isEmpty {
                     let now = Date()
-                    for path in added {
-                        if firstSeenAtByWorktreePath[path] == nil {
-                            firstSeenAtByWorktreePath[path] = now
-                            didChangeFirstSeen = true
-                        }
+                    for path in added where firstSeenAtByWorktreePath[path] == nil {
+                        firstSeenAtByWorktreePath[path] = now
+                        didChangeFirstSeen = true
                     }
                 }
 
@@ -713,11 +711,9 @@ final class WorktrunkStore: ObservableObject {
                 if hadExistingList, !addedPaths.isEmpty {
                     let now = Date()
                     var didChange = false
-                    for path in addedPaths {
-                        if firstSeenAtByWorktreePath[path] == nil {
-                            firstSeenAtByWorktreePath[path] = now
-                            didChange = true
-                        }
+                    for path in addedPaths where firstSeenAtByWorktreePath[path] == nil {
+                        firstSeenAtByWorktreePath[path] = now
+                        didChange = true
                     }
                     if didChange {
                         saveFirstSeenAt()
@@ -1079,14 +1075,13 @@ final class WorktrunkStore: ObservableObject {
             }
         }
 
-        for path in ["/opt/homebrew/bin/git", "/usr/local/bin/git", "/usr/bin/git"] {
-            if FileManager.default.isExecutableFile(atPath: path) {
-                return GitInvocation(
-                    executableURL: URL(fileURLWithPath: path),
-                    arguments: args,
-                    environment: env
-                )
-            }
+        for path in ["/opt/homebrew/bin/git", "/usr/local/bin/git", "/usr/bin/git"]
+            where FileManager.default.isExecutableFile(atPath: path) {
+            return GitInvocation(
+                executableURL: URL(fileURLWithPath: path),
+                arguments: args,
+                environment: env
+            )
         }
 
         let envURL = URL(fileURLWithPath: "/usr/bin/env")

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ struct GitDiffSidebarView: View {`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
	`213`	`+ // swiftlint:disable:next large_tuple`
`213`	`214`	`private var diffSummary: (files: Int, additions: Int, deletions: Int, unresolved: Int)? {`
`214`	`215`	`guard let doc = state.document else { return nil }`
`215`	`216`	`let adds = doc.files.reduce(0) { $0 + $1.additions }`
Original file line number	Diff line number	Diff line change
`@@ -158,10 +158,8 @@ enum InstallChannel {`
`158`	`158`	`"/opt/homebrew/Caskroom/ghostree",`
`159`	`159`	`"/usr/local/Caskroom/ghostree",`
`160`	`160`	`]`
`161`		`- for path in caskroomPaths {`
`162`		`- if FileManager.default.fileExists(atPath: path) {`
`163`		`- return .homebrew`
`164`		`- }`
	`161`	`+ for path in caskroomPaths where FileManager.default.fileExists(atPath: path) {`
	`162`	`+ return .homebrew`
`165`	`163`	`}`
`166`	`164`
`167`	`165`	`return .manual`
Original file line number	Diff line number	Diff line change
`@@ -239,10 +239,9 @@ struct GHClient {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`// Find gh executable`
`242`		`- for path in ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"] {`
`243`		`- if FileManager.default.isExecutableFile(atPath: path) {`
`244`		`- return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)`
`245`		`- }`
	`242`	`+ for path in ["/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"]`
	`243`	`+ where FileManager.default.isExecutableFile(atPath: path) {`
	`244`	`+ return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)`
`246`	`245`	`}`
`247`	`246`
`248`	`247`	`// Fall back to PATH resolution`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ struct PRStatus: Identifiable, Equatable {`
`76`	`76`	`return .pending`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ // swiftlint:disable:next large_tuple`
`79`	`80`	`var checkCounts: (passed: Int, failed: Int, pending: Int, skipped: Int) {`
`80`	`81`	`var passed = 0, failed = 0, pending = 0, skipped = 0`
`81`	`82`	`for check in checks {`
Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,9 @@ struct WorktrunkClient {`
`98`	`98`	`return Invocation(executableURL: url, arguments: args, environment: env)`
`99`	`99`	`}`
`100`	`100`
`101`		`- for path in wtExecutableCandidatePaths() {`
`102`		`- if FileManager.default.isExecutableFile(atPath: path) {`
`103`		`- return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)`
`104`		`- }`
	`101`	`+ for path in wtExecutableCandidatePaths()`
	`102`	`+ where FileManager.default.isExecutableFile(atPath: path) {`
	`103`	`+ return Invocation(executableURL: URL(fileURLWithPath: path), arguments: args, environment: env)`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`// Last resort: rely on PATH resolution.`