feat: add open in to toolbar

.github/workflows/auto-merge-release.yml

@@ -53,10 +53,16 @@ jobs:
         if: steps.find-pr.outputs.found == 'true'
         run: swift run GitKitChecks
 
-      - name: Approve and auto-merge
+      - name: Approve PR
         if: steps.find-pr.outputs.found == 'true'
         env:
-          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh pr review "${{ steps.find-pr.outputs.number }}" --approve
+
+      - name: Auto-merge PR
+        if: steps.find-pr.outputs.found == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: |
           gh pr merge "${{ steps.find-pr.outputs.number }}" --squash --auto

.github/workflows/release.yml

@@ -33,9 +33,42 @@ jobs:
         with:
           ref: ${{ needs.release-please.outputs.tag_name }}
 
+      - name: Import code signing certificate
+        env:
+          APPLE_CERTIFICATE_BASE64: ${{ secrets.APPLE_CERTIFICATE_BASE64 }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+        run: |
+          CERT_PATH="$RUNNER_TEMP/certificate.p12"
+          KEYCHAIN_PATH="$RUNNER_TEMP/build.keychain-db"
+          KEYCHAIN_PASSWORD="$(openssl rand -base64 32)"
+
+          echo -n "$APPLE_CERTIFICATE_BASE64" | base64 --decode -o "$CERT_PATH"
+
+          security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security import "$CERT_PATH" -P "$APPLE_CERTIFICATE_PASSWORD" \
+            -A -t cert -f pkcs12 -k "$KEYCHAIN_PATH"
+          security set-key-partition-list -S apple-tool:,apple: \
+            -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security list-keychains -d user -s "$KEYCHAIN_PATH" login.keychain-db
+
+      - name: Store notarization credentials
+        env:
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        run: |
+          xcrun notarytool store-credentials "GITIFY_NOTARY" \
+            --apple-id "$APPLE_ID" \
+            --team-id "$APPLE_TEAM_ID" \
+            --password "$APPLE_ID_PASSWORD"
+
       - name: Build DMG
         env:
           VERSION: ${{ needs.release-please.outputs.version }}
+          SIGN_IDENTITY: ${{ secrets.SIGN_IDENTITY }}
+          NOTARY_PROFILE: "GITIFY_NOTARY"
         run: scripts/package.sh
 
       - name: Download Sparkle sign_update
@@ -135,6 +168,9 @@ jobs:
         run: |
           gh release upload "${{ needs.release-please.outputs.tag_name }}" \
             "build/Gitify-${{ needs.release-please.outputs.version }}.dmg"
+          cp "build/Gitify-${{ needs.release-please.outputs.version }}.dmg" build/Gitify.dmg
+          gh release upload "${{ needs.release-please.outputs.tag_name }}" \
+            build/Gitify.dmg
 
       - name: Commit updated appcast.xml
         if: env.ED_SIGNATURE != ''
@@ -153,3 +189,8 @@ jobs:
           git add appcast.xml
           git commit -m "chore: update appcast.xml for v${{ needs.release-please.outputs.version }}"
           git push origin main
+
+      - name: Clean up keychain
+        if: always()
+        run: |
+          security delete-keychain "$RUNNER_TEMP/build.keychain-db" 2>/dev/null || true

README.md

@@ -1,5 +1,7 @@
 # Gitify
 
+**Website: [gitify.mrmasonic.com](https://gitify.mrmasonic.com)**
+
 A fast, lightweight, native macOS Git client built entirely with SwiftUI and AppKit. No Electron, no embedded runtimes -- just a clean, responsive app that wraps your installed `git` binary so every operation matches your exact git config.
 
 ![Gitify screenshot](docs/screenshot.png)
@@ -29,11 +31,6 @@ A fast, lightweight, native macOS Git client built entirely with SwiftUI and App
 1. Go to the [Releases](https://github.com/craigharman/gitify/releases) page
 2. Download the latest `.dmg` file
 3. Open the `.dmg` and drag **Gitify.app** into your Applications folder
-4. On first launch, macOS will block the app because it is not signed with an Apple Developer ID. To allow it:
-   - Open **System Settings** > **Privacy & Security**
-   - Scroll down to the **Security** section
-   - You will see a message that "Gitify" was blocked -- click **Open Anyway**
-   - Confirm in the dialog that appears
 
 ## Building from source
 

Resources/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDisplayName</key>
 	<string>Gitify</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.gitify.app</string>
+	<string>com.craigharman.gitify</string>
 	<key>CFBundleVersion</key>
 	<string>1.1.0</string>
 	<key>CFBundleShortVersionString</key>

Sources/GitKit/RepositoryWatcher.swift

@@ -50,8 +50,10 @@ public final class RepositoryWatcher: RepositoryWatching, @unchecked Sendable {
     }
 
     public func stop() {
-        queue.async { [weak self] in
-            guard let self, let stream = self.stream else { return }
+        // Must run on the stream's dispatch queue so no callback is in-flight when we
+        // invalidate. Uses sync so the caller can safely release the watcher afterward.
+        queue.sync {
+            guard let stream else { return }
             FSEventStreamStop(stream)
             FSEventStreamInvalidate(stream)
             FSEventStreamRelease(stream)
@@ -60,9 +62,17 @@ public final class RepositoryWatcher: RepositoryWatching, @unchecked Sendable {
     }
 
     deinit {
+        // If stop() was already called, stream is nil and this is a no-op.
+        // Otherwise, schedule cleanup on the stream's queue. We can't use queue.sync
+        // from deinit (risks deadlock), so capture the values and dispatch async.
         guard let stream else { return }
-        FSEventStreamStop(stream)
-        FSEventStreamInvalidate(stream)
-        FSEventStreamRelease(stream)
+        let q = queue
+        // OpaquePointer is not Sendable but FSEventStreamRef is safe to pass across queues.
+        nonisolated(unsafe) let s = stream
+        q.async {
+            FSEventStreamStop(s)
+            FSEventStreamInvalidate(s)
+            FSEventStreamRelease(s)
+        }
     }
 }

Sources/Gitify/App/GitifyApp.swift

@@ -6,17 +6,28 @@ struct GitifyApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
     @State private var model = AppModel()
     @State private var sparkleController = SparkleController()
+    @AppStorage("appearance.mode") private var appearanceMode: String = "system"
+
+    private var colorScheme: ColorScheme? {
+        switch appearanceMode {
+        case "light": .light
+        case "dark": .dark
+        default: nil
+        }
+    }
 
     var body: some Scene {
         WindowGroup {
             RootView()
                 .environment(model)
                 .frame(minWidth: 900, minHeight: 560)
+                .preferredColorScheme(colorScheme)
         }
         .windowStyle(.titleBar)
         .windowToolbarStyle(.unified)
         Settings {
             AppSettingsView()
+                .preferredColorScheme(colorScheme)
         }
         .commands {
             CommandGroup(after: .appInfo) {

Sources/Gitify/Model/AppDefaults.swift

@@ -3,6 +3,20 @@ import AppKit
 /// App-level preferences stored in UserDefaults.
 enum AppDefaults {
 
+    // MARK: - Appearance
+
+    /// The user\u{2019}s preferred appearance mode.
+    enum AppearanceMode: String, CaseIterable {
+        case system, light, dark
+    }
+
+    private static let appearanceKey = "appearance.mode"
+
+    static var appearanceMode: AppearanceMode {
+        get { UserDefaults.standard.string(forKey: appearanceKey).flatMap(AppearanceMode.init(rawValue:)) ?? .system }
+        set { UserDefaults.standard.set(newValue.rawValue, forKey: appearanceKey) }
+    }
+
     // MARK: - Keys
 
     private static let terminalKey = "defaultTerminalBundleID"

Sources/Gitify/Model/RepositoryViewModel.swift

@@ -63,8 +63,17 @@ final class RepositoryViewModel {
     init(ref: RepositoryRef) {
         self.ref = ref
     }
-    // Cleanup is automatic: releasing `watcher` invalidates the FSEvents stream via its
-    // own deinit, and the debounced refresh task holds only a weak self.
+
+    /// Explicitly tears down the file-system watcher and cancels the debounce task. Called
+    /// from the view's `onDisappear` so cleanup happens deterministically before the view
+    /// model is released (relying solely on `deinit` is racy when FSEvents callbacks are
+    /// still in-flight on the watcher's dispatch queue).
+    func tearDown() {
+        autoRefreshTask?.cancel()
+        autoRefreshTask = nil
+        watcher?.stop()
+        watcher = nil
+    }
 
     var localBranches: [Ref] { refs.filter { $0.kind == .localBranch } }
     var remoteBranches: [Ref] { refs.filter { $0.kind == .remoteBranch } }
@@ -228,6 +237,15 @@ final class RepositoryViewModel {
         }
     }
 
+    func openProject(in app: AppDefaults.KnownApp) {
+        guard let appURL = AppDefaults.appURL(for: app.bundleID) else { return }
+        NSWorkspace.shared.open(
+            [ref.url],
+            withApplicationAt: appURL,
+            configuration: NSWorkspace.OpenConfiguration()
+        )
+    }
+
     func openInTerminal(_ file: FileStatus) {
         let dir = ref.url.appendingPathComponent(file.path).deletingLastPathComponent()
         let bundleID = AppDefaults.terminalBundleID
@@ -562,7 +580,9 @@ final class RepositoryViewModel {
     /// deletes the now-merged `source` branch.
     func merge(source: String, into target: String, squash: Bool, noFastForward: Bool,
                noCommit: Bool, skipHooks: Bool, deleteSource: Bool,
-               pushAfterMerge: Bool = false) async {
+               pushAfterMerge: Bool = false,
+               squashCommitMessage: String? = nil,
+               generateSquashMessage: Bool = false) async {
         // Park the deletion intent before attempting the merge so it survives a conflict: a
         // conflicting merge throws below and is finished later by a manual commit, which calls
         // finalizePendingMergeDeletion(). Don't delete when stopping before commit — nothing
@@ -577,6 +597,22 @@ final class RepositoryViewModel {
             try await service.merge(branch: source, squash: squash, noFastForward: noFastForward,
                                     noCommit: noCommit, skipHooks: skipHooks)
             // Reaching here means the merge completed cleanly (a conflicting merge throws above).
+
+            // Auto-commit after a squash merge when the user opted in.
+            if squash, let requestedMessage = squashCommitMessage {
+                var message = requestedMessage
+                if generateSquashMessage {
+                    if let ai = try? await AICommitMessageGenerator.generate(viewModel: self),
+                       !ai.isEmpty {
+                        message = ai
+                    }
+                }
+                if message.isEmpty {
+                    message = "Squash merge branch \u{2018}\(source)\u{2019} into \u{2018}\(target)\u{2019}"
+                }
+                try await service.commit(message: message, amend: false)
+            }
+
             await self.finalizePendingMergeDeletion()
         }
         // If the merge didn't leave a conflicted merge in progress (it finalized cleanly above,

Sources/Gitify/Resources/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.14.0](https://github.com/craigharman/gitify/compare/v1.13.1...v1.14.0) (2026-07-03)
+
+
+### Features
+
+* add (optional) ai assistant ([#36](https://github.com/craigharman/gitify/issues/36)) ([225e2d1](https://github.com/craigharman/gitify/commit/225e2d13f620547cff3fe997ff9f9b2d544ab102))
+
 ## [1.13.1](https://github.com/craigharman/gitify/compare/v1.13.0...v1.13.1) (2026-06-30)
 
 

Sources/Gitify/Views/AppSettingsView.swift

@@ -18,11 +18,18 @@ private struct GeneralSettingsTab: View {
     @State private var terminalID: String = AppDefaults.terminalBundleID
     @State private var editorID: String = AppDefaults.editorBundleID ?? ""
 
+    @State private var appearanceMode: AppDefaults.AppearanceMode = AppDefaults.appearanceMode
     @State private var installedTerminals: [AppDefaults.KnownApp] = []
     @State private var installedEditors: [AppDefaults.KnownApp] = []
 
     var body: some View {
         Form {
+            Picker("Appearance", selection: $appearanceMode) {
+                Text("System").tag(AppDefaults.AppearanceMode.system)
+                Text("Light").tag(AppDefaults.AppearanceMode.light)
+                Text("Dark").tag(AppDefaults.AppearanceMode.dark)
+            }
+
             Picker("Terminal", selection: $terminalID) {
                 ForEach(installedTerminals) { app in
                     AppLabel(app: app).tag(app.bundleID)
@@ -39,6 +46,9 @@ private struct GeneralSettingsTab: View {
         .formStyle(.grouped)
         .frame(width: 400)
         .fixedSize(horizontal: false, vertical: true)
+        .onChange(of: appearanceMode) { _, newValue in
+            AppDefaults.appearanceMode = newValue
+        }
         .onChange(of: terminalID) { _, newValue in
             AppDefaults.terminalBundleID = newValue
         }

Sources/Gitify/Views/HistoryView.swift

@@ -30,8 +30,9 @@ struct HistoryView: View {
                 }
             }
             .frame(minWidth: 380, idealWidth: 480, maxHeight: .infinity)
+            .layoutPriority(1)
             CommitDetailPane(selection: selection, viewModel: viewModel)
-                .frame(minWidth: 320, maxWidth: .infinity, maxHeight: .infinity)
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
     }