ci: put CI keychain first in codesign search list

codesign resolves signing identities through the user keychain search
list (first match wins) and ignores --keychain for the lookup. This
runner hosts another project (Sybil-2) whose keychain holds the same
Apple Distribution identity, so if that keychain is locked and appears
earlier in the search list, codesign fails with errSecInternalComponent
no matter how correctly our own keychain is set up. Prepend the fresh
CI keychain to the search list for the build and always delete it
afterward, which restores the original list.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.env.example

@@ -0,0 +1,16 @@
+FASTLANE_SKIP_UPDATE_CHECK=1
+FASTLANE_HIDE_CHANGELOG=1
+FASTLANE_TEAM_ID=DQQH5H6GBD
+
+APP_STORE_CONNECT_KEY_ID=
+APP_STORE_CONNECT_ISSUER_ID=
+APP_STORE_CONNECT_KEY_CONTENT=
+
+MATCH_GIT_URL=
+MATCH_PASSWORD=
+MATCH_GIT_BASIC_AUTHORIZATION=
+MATCH_GIT_BRANCH=master
+
+ATTRACTOR_PROVISIONING_PROFILE_SPECIFIER=Attractor AppStore CI
+ATTRACTOR_VERSION_TAG=
+ATTRACTOR_BUILD_NUMBER=

.gitea/workflows/testflight.yml

@@ -0,0 +1,45 @@
+name: TestFlight
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "release/ios/v*"
+      - "Attractor-*"
+
+jobs:
+  testflight:
+    runs-on: xcode
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1.7"
+          bundler-cache: true
+
+      - name: Upload to TestFlight
+        env:
+          HOME: /var/lib/act_runner
+          APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
+          APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+          APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
+          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+          ATTRACTOR_VERSION_TAG: ${{ github.ref_name }}
+          FASTLANE_SKIP_UPDATE_CHECK: "1"
+          FASTLANE_HIDE_CHANGELOG: "1"
+          FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: "120"
+        run: |
+          export PATH="/Users/runner/hostedtoolcache/Ruby/3.1.7/arm64/bin:${PATH}"
+          ruby --version
+          bundle exec fastlane ios beta

.gitignore

@@ -0,0 +1,5 @@
+.env
+.bundle/
+build/
+fastlane/README.md
+fastlane/report.xml

App/Browser View/BrowserViewController.swift

@@ -795,7 +795,7 @@ extension BrowserViewController: UITextFieldDelegate
                 
                 currentTab.beginLoadingURL(url)
             } else {
-                let searchURL = Settings.shared.searchProvider.provider().searchURLWithQuery(text)
+                let searchURL = Settings.shared.currentSearchProvider().searchURLWithQuery(text)
                 currentTab.beginLoadingURL(searchURL)
             }
             

App/Settings/AddSearchEngineViewController.swift

@@ -0,0 +1,74 @@
+//
+//  AddSearchEngineViewController.swift
+//  App
+//
+//  Created by James Magahern on 9/29/25.
+//
+
+import SwiftUI
+import UIKit
+
+@MainActor
+struct AddSearchEngineView: View
+{
+    @State var model: ViewModel
+
+    var body: some View {
+        Form {
+            Section {
+                HStack {
+                    Text("Name")
+                    TextField("Name", text: $model.name)
+                        .multilineTextAlignment(.trailing)
+                        .autocorrectionDisabled()
+                }
+            }
+
+            Section {
+                HStack {
+                    Text("URL")
+                    TextField("https://example.com/query=%q", text: $model.url)
+                        .multilineTextAlignment(.trailing)
+                        .autocorrectionDisabled()
+                        .textContentType(.none)
+                }
+            } footer: {
+                Text("URL must contain %q, which will be replaced by the query. ")
+            }
+
+            Section {
+                Toggle("Set as default", isOn: $model.makeDefault)
+            }
+        }
+        .navigationTitle("Add Search Engine")
+    }
+
+    @MainActor
+    @Observable
+    class ViewModel
+    {
+        var name: String = ""
+        var url: String = ""
+        var makeDefault: Bool = false
+    }
+}
+
+@MainActor
+class AddSearchEngineViewController: UIHostingController<AddSearchEngineView>
+{
+    public var viewModel: AddSearchEngineView.ViewModel
+
+    init() {
+        self.viewModel = AddSearchEngineView.ViewModel()
+        super.init(rootView: AddSearchEngineView(model: viewModel))
+    }
+    
+    @MainActor @preconcurrency required dynamic init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+#Preview {
+    @Previewable @State var model = AddSearchEngineView.ViewModel()
+    AddSearchEngineView(model: model)
+}

App/Settings/Amber/AmberSettingsView.swift

@@ -23,8 +23,8 @@ struct AmberSettingsView: View {
     @Environment(\.presentationMode)
         @Binding private var presentationMode
     
-    @State private var searchProvider = Settings.shared.searchProvider {
+    @State private var defaultSearchEngineName = Settings.shared.defaultSearchEngineName {
-        didSet { Settings.shared.searchProvider = searchProvider }
+        didSet { Settings.shared.defaultSearchEngineName = defaultSearchEngineName }
     }
     
     var body: some View {
@@ -35,12 +35,12 @@ struct AmberSettingsView: View {
                 })
                 
                 Section(header: Text("Search Provider"), content: {
-                    ForEach(Settings.SearchProviderSetting.allCases, id: \.self, content: { setting in
+                    ForEach(Array(Settings.shared.searchEngines.keys).sorted(), id: \.self, content: { name in
-                        Button(action: { searchProvider = setting }, label: {
+                        Button(action: { defaultSearchEngineName = name }, label: {
                             HStack {
-                                Text(setting.rawValue)
+                                Text(name)
                                 Spacer()
-                                if searchProvider == setting {
+                                if defaultSearchEngineName == name {
                                     Image(systemName: "checkmark")
                                 }
                             }

App/Settings/GeneralSettingsViewController.swift

@@ -109,55 +109,56 @@ class GeneralSettingsViewController: UIViewController
         case searchEngine = "Search Engine"
         case syncServer = "Sync Server"
     }
-    
+
     typealias Item = String
-    
+
     static let SearchProviderPopupItem = "searchProvider.popup"
     static let SyncServerItem = "syncServer.field"
-    
+
     let dataSource: UICollectionViewDiffableDataSource<Section, Item>
     let collectionView: UICollectionView
-    
+    let viewModel: ViewModel
+
     static func createLayout(forIdiom idiom: UIUserInterfaceIdiom) -> UICollectionViewLayout {
-        #if targetEnvironment(macCatalyst)
+#if targetEnvironment(macCatalyst)
-            let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0),
+        let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0),
-                                                 heightDimension: .fractionalHeight(1.0))
+                                              heightDimension: .fractionalHeight(1.0))
-            let item = NSCollectionLayoutItem(layoutSize: itemSize)
+        let item = NSCollectionLayoutItem(layoutSize: itemSize)
 
-            let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(0.60),
+        let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(0.60),
-                                                  heightDimension: .absolute(44))
+                                               heightDimension: .absolute(44))
-            
-            let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitem: item, count: 1)
-            group.edgeSpacing = NSCollectionLayoutEdgeSpacing(leading: .flexible(1.0), top: nil, trailing: nil, bottom: nil)
-            
-            let insets = NSDirectionalEdgeInsets(top: 24.0, leading: 64.0, bottom: 24.0, trailing: 64.0)
-            
-            let headerFooterSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(0.40),
-                                                          heightDimension: .estimated(44.0))
-            let sectionHeader = NSCollectionLayoutBoundarySupplementaryItem(
-                layoutSize: headerFooterSize,
-                elementKind: UICollectionView.elementKindSectionHeader,
-                alignment: .topLeading,
-                absoluteOffset: CGPoint(x: insets.leading, y: insets.top + 5.0)
-            )
-            sectionHeader.extendsBoundary = false
-            sectionHeader.contentInsets = insets
 
-            let section = NSCollectionLayoutSection(group: group)
+        let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitem: item, count: 1)
-            // section.interGroupSpacing = spacing
+        group.edgeSpacing = NSCollectionLayoutEdgeSpacing(leading: .flexible(1.0), top: nil, trailing: nil, bottom: nil)
-            section.contentInsets = insets
-            section.supplementariesFollowContentInsets = true
-            section.boundarySupplementaryItems = [ sectionHeader ]
 
-            let layout = UICollectionViewCompositionalLayout(section: section)
+        let insets = NSDirectionalEdgeInsets(top: 24.0, leading: 64.0, bottom: 24.0, trailing: 64.0)
-            return layout
+
-        #else
+        let headerFooterSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(0.40),
-            var listConfiguration = UICollectionLayoutListConfiguration(appearance: .insetGrouped)
+                                                      heightDimension: .estimated(44.0))
-            listConfiguration.headerMode = .supplementary
+        let sectionHeader = NSCollectionLayoutBoundarySupplementaryItem(
-            return UICollectionViewCompositionalLayout.list(using: listConfiguration)
+            layoutSize: headerFooterSize,
-        #endif
+            elementKind: UICollectionView.elementKindSectionHeader,
+            alignment: .topLeading,
+            absoluteOffset: CGPoint(x: insets.leading, y: insets.top + 5.0)
+        )
+        sectionHeader.extendsBoundary = false
+        sectionHeader.contentInsets = insets
+
+        let section = NSCollectionLayoutSection(group: group)
+        // section.interGroupSpacing = spacing
+        section.contentInsets = insets
+        section.supplementariesFollowContentInsets = true
+        section.boundarySupplementaryItems = [ sectionHeader ]
+
+        let layout = UICollectionViewCompositionalLayout(section: section)
+        return layout
+#else
+        var listConfiguration = UICollectionLayoutListConfiguration(appearance: .insetGrouped)
+        listConfiguration.headerMode = .supplementary
+        return UICollectionViewCompositionalLayout.list(using: listConfiguration)
+#endif
     }
-    
+
     static func sectionHeaderConfiguration(forIdiom idiom: UIUserInterfaceIdiom, sectionName: String) -> UIContentConfiguration {
         if idiom == .mac {
             return LabelContentConfiguration(
@@ -166,33 +167,41 @@ class GeneralSettingsViewController: UIViewController
                 textAlignment: .right
             )
         } else {
-            var config = UIListContentConfiguration.plainHeader()
+            var config = UIListContentConfiguration.header()
             config.text = sectionName
             return config
         }
     }
 
-    #if targetEnvironment(macCatalyst)
+#if targetEnvironment(macCatalyst)
     static let staticIdiom = UIUserInterfaceIdiom.mac
-    #else
+#else
     static let staticIdiom = UIUserInterfaceIdiom.pad
-    #endif
+#endif
-    
+
     init() {
         let actionHandler = { (action: UIAction) in
-            let providerString = action.title
+            let engineName = action.title
-            let provider = Settings.SearchProviderSetting(rawValue: providerString)!
+            Settings.shared.defaultSearchEngineName = engineName
-            Settings.shared.searchProvider = provider
         }
-        
+
+        let viewModel = ViewModel()
         let itemCellRegistry = UICollectionView.CellRegistration<UICollectionViewCell, Item> { cell, indexPath, identifier in
             if identifier == Self.SearchProviderPopupItem {
-                let menu = UIMenu(children: Settings.SearchProviderSetting.allCases.map { provider in
+                let names = Settings.shared.searchEngines.keys.sorted()
-                    let action = UIAction(title: provider.rawValue, handler: actionHandler)
+                var engineMenuItems: [UIMenuElement] = names.map { name in
-                    action.state = Settings.shared.searchProvider == provider ? .on : .off
+                    let action = UIAction(title: name, handler: actionHandler)
+                    action.state = (Settings.shared.defaultSearchEngineName == name) ? .on : .off
                     return action
-                })
+                }
-                
+
+                engineMenuItems.append(UIMenu(options: .displayInline, children: [
+                    UIAction(title: "Manage Search Engines…", handler: { _ in
+                        viewModel.onManageSearchEngines()
+                    })
+                ]))
+
+                let menu = UIMenu(children: engineMenuItems)
                 cell.contentConfiguration = ButtonContentConfiguration(menu: menu)
             } else if identifier == Self.SyncServerItem {
                 cell.contentConfiguration = TextFieldContentConfiguration(
@@ -206,58 +215,114 @@ class GeneralSettingsViewController: UIViewController
                     returnKeyType: .done
                 )
             }
-            
+
 #if !targetEnvironment(macCatalyst)
-            cell.backgroundConfiguration = UIBackgroundConfiguration.listGroupedCell()
+            cell.backgroundConfiguration = UIBackgroundConfiguration.listCell()
 #endif
         }
-                
+
         let sectionHeaderRegistry = UICollectionView.SupplementaryRegistration<UICollectionViewCell>(elementKind: UICollectionView.elementKindSectionHeader, handler: {
-        (cell, string, indexPath) in
+            (cell, string, indexPath) in
             let sectionName = Section.allCases[indexPath.section].rawValue
             cell.contentConfiguration = Self.sectionHeaderConfiguration(forIdiom: Self.staticIdiom, sectionName: sectionName)
         })
-        
+
         let layout = Self.createLayout(forIdiom: Self.staticIdiom)
         collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.backgroundColor = .systemGroupedBackground
-        
+
         dataSource = UICollectionViewDiffableDataSource<Section, Item>(collectionView: collectionView) {
-        (collectionView, indexPath, identifier) in
+            (collectionView, indexPath, identifier) in
             return collectionView.dequeueConfiguredReusableCell(using: itemCellRegistry, for: indexPath, item: identifier)
         }
-        
+
         dataSource.supplementaryViewProvider = { collectionView, elementKind, indexPath in
             return collectionView.dequeueConfiguredReusableSupplementary(using: sectionHeaderRegistry, for: indexPath)
         }
-        
+
+        self.viewModel = viewModel
+
         super.init(nibName: nil, bundle: nil)
-        
+
         collectionView.delegate = self
         tabBarItem.title = "General"
         tabBarItem.image = UIImage(systemName: "gear")
+
+        let resetPopup = { [weak self] in
+            guard let self else { return }
+            
+            var snapshot = dataSource.snapshot()
+            snapshot.reloadItems([ Self.SearchProviderPopupItem ])
+            dataSource.apply(snapshot, animatingDifferences: false)
+        }
+
+        viewModel.onManageSearchEngines = { [weak self] in
+            guard let self else { return }
+
+            // Reset menu item (to show currently selected search engine)
+            resetPopup()
+
+            let viewController = ManageSearchEnginesViewController()
+            viewController.title = "Manage Search Engines"
+
+            viewController.model.onAddSearchEngine = { [weak self] in
+                guard let self else { return }
+
+                let addSearchEngineViewController = AddSearchEngineViewController()
+                let navController = UINavigationController(rootViewController: addSearchEngineViewController)
+
+                // Cancel
+                addSearchEngineViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(systemItem: .cancel, primaryAction: UIAction { _ in
+                    navController.dismiss(animated: true)
+                })
+
+                // Done
+                addSearchEngineViewController.navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .done, primaryAction: UIAction { [weak self] _ in
+                    self?.saveCustomSearchEngine(model: addSearchEngineViewController.viewModel)
+                    navController.dismiss(animated: true)
+
+                    resetPopup()
+                    viewController.model.reloadConfiguredEngines()
+                })
+
+                self.present(navController, animated: true)
+            }
+
+            viewController.model.onChangeEngines = {
+                resetPopup()
+            }
+
+            #if targetEnvironment(macCatalyst)
+                let alertController = UIAlertController(title: "Not yet implemented for macOS.", message: nil, preferredStyle: .alert)
+                alertController.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in alertController.dismiss(animated: true) }))
+                present(alertController, animated: true)
+            #else
+                navigationController?.pushViewController(viewController, animated: true)
+            #endif
+        }
     }
-    
+
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     override func loadView() {
         self.view = collectionView
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+        applySnapshot(animatingDifferences: false)
-        var snapshot = dataSource.snapshot()
-        snapshot.appendSections(Section.allCases)
-        // iOS
-        // snapshot.appendItems(Settings.SearchProviderSetting.allCases.map { $0.rawValue }, toSection: .searchEngine)
-        snapshot.appendItems([ Self.SearchProviderPopupItem ], toSection: .searchEngine)
-        snapshot.appendItems([ Self.SyncServerItem ], toSection: .syncServer)
-        dataSource.apply(snapshot, animatingDifferences: false)
     }
 
+    // MARK: - Types
+
+    @MainActor
+    @Observable
+    class ViewModel
+    {
+        var onManageSearchEngines: () -> Void = {}
+    }
 }
 
 extension GeneralSettingsViewController : UICollectionViewDelegate {
@@ -265,3 +330,36 @@ extension GeneralSettingsViewController : UICollectionViewDelegate {
         false
     }
 }
+
+private extension GeneralSettingsViewController {
+    func applySnapshot(animatingDifferences: Bool) {
+        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        snapshot.appendSections(Section.allCases)
+        snapshot.appendItems([ Self.SearchProviderPopupItem ], toSection: .searchEngine)
+        snapshot.appendItems([ Self.SyncServerItem ], toSection: .syncServer)
+        dataSource.apply(snapshot, animatingDifferences: animatingDifferences)
+    }
+    
+    func saveCustomSearchEngine(model: AddSearchEngineView.ViewModel) {
+        let name = model.name.trimmingCharacters(in: .whitespacesAndNewlines)
+        let url = model.url.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !name.isEmpty, !url.isEmpty else { return }
+
+        // Require placeholder
+        guard url.contains("%q") || url.contains("%s") else { return }
+        
+        // Save
+        var engines = Settings.shared.searchEngines
+        engines[name] = url
+        Settings.shared.searchEngines = engines
+
+        if model.makeDefault {
+            Settings.shared.defaultSearchEngineName = name
+        }
+
+        // Reset inputs and refresh UI
+        var snapshot = dataSource.snapshot()
+        snapshot.reloadItems([ Self.SearchProviderPopupItem ])
+        dataSource.apply(snapshot, animatingDifferences: false)
+    }
+}

App/Settings/ManageSearchEnginesViewController.swift

@@ -0,0 +1,139 @@
+//
+//  ManageSearchEnginesViewController.swift
+//  App
+//
+//  Created by James Magahern on 9/29/25.
+//
+
+import SwiftUI
+import UIKit
+
+@MainActor
+struct ManageSearchEnginesView: View
+{
+    @State var model: ViewModel
+
+    var body: some View {
+        Form {
+            Section {
+                List($model.configuredEngines, editActions: .delete) { row in
+                    HStack {
+                        Image(uiImage: .checkmark)
+                            .opacity(row.wrappedValue.isDefault ? 1.0 : 0.0)
+
+                        VStack(alignment: .leading) {
+                            Text(row.wrappedValue.name)
+                                .font(.body)
+                                .bold()
+
+                            Text(row.wrappedValue.url)
+                                .font(.caption)
+                        }
+                    }
+                    .id(row.id)
+
+                    .swipeActions(edge: .leading) {
+                        Button { model.makeDefault(row.id) } label: {
+                            Label("Make Default", systemImage: "checkmark")
+                        }
+                        .tint(.blue)
+                    }
+
+                    .swipeActions(edge: .trailing) {
+                        Button(role: .destructive) { model.deleteEngine(row.id) } label: {
+                            Label("Delete", systemImage: "trash")
+                        }
+                        .disabled(model.configuredEngines.count <= 1)
+                    }
+                }
+            }
+
+            Section {
+                Button("Add Search Engine…") {
+                    model.onAddSearchEngine()
+                }
+            }
+        }
+    }
+
+    // MARK: - Types
+
+    @MainActor
+    @Observable
+    class ViewModel
+    {
+        var configuredEngines: [ConfiguredEngine] = []
+        var onAddSearchEngine: () -> Void = {}
+        var onChangeEngines: () -> Void = {}
+
+        init() {
+            reloadConfiguredEngines()
+        }
+
+        func reloadConfiguredEngines() {
+            let defaultEngine = Settings.shared.defaultSearchEngineName
+            self.configuredEngines = Settings.shared.searchEngines.map { val in
+                ConfiguredEngine(
+                    name: val.key,
+                    url: val.value,
+                    isDefault: val.key == defaultEngine
+                )
+            }
+        }
+
+        func deleteEngine(_ id: ConfiguredEngine.ID) {
+            let engine = configuredEngines.first { $0.url == id }!
+
+            var engines = Settings.shared.searchEngines
+            engines.removeValue(forKey: engine.name)
+            Settings.shared.searchEngines = engines
+
+            if engine.isDefault {
+                // Pick another default
+                if let firstEngine = engines.first {
+                    Settings.shared.defaultSearchEngineName = firstEngine.key
+                }
+            }
+
+            reloadConfiguredEngines()
+            onChangeEngines()
+        }
+
+        func makeDefault(_ id: ConfiguredEngine.ID) {
+            let engineName = configuredEngines.first { $0.url == id }!.name
+            Settings.shared.defaultSearchEngineName = engineName
+
+            reloadConfiguredEngines()
+            onChangeEngines()
+        }
+    }
+
+    struct ConfiguredEngine: Identifiable
+    {
+        let name: String
+        let url: String
+        let isDefault: Bool
+
+        var id: String { url }
+    }
+}
+
+@MainActor
+class ManageSearchEnginesViewController: UIHostingController<ManageSearchEnginesView>
+{
+    let model: ManageSearchEnginesView.ViewModel
+    
+    init() {
+        self.model = ManageSearchEnginesView.ViewModel()
+        super.init(rootView: ManageSearchEnginesView(model: model))
+    }
+    
+    required dynamic init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+#Preview {
+    @Previewable @State var model = ManageSearchEnginesView.ViewModel()
+    ManageSearchEnginesView(model: model)
+}

App/Settings/Settings.swift

@@ -74,26 +74,28 @@ extension String: RawRepresentable {
 class Settings
 {
     static let shared = Settings()
-    
+
-    public enum SearchProviderSetting: String, CaseIterable {
+    // Map of search engine name -> URL template containing %q or %s placeholder
-        case google         = "Google"
+    // Defaults preserve the previous built-in engines
-        case duckduckgo     = "DuckDuckGo"
+    @SettingProperty(key: "searchEngines")
-        case searxnor       = "Searx.nor"
+    public var searchEngines: [String: String] = [
-        case whoogle        = "Whoogle.nor"
+        "Google":      "https://google.com/search?q=%q&gbv=1",
-        
+        "DuckDuckGo":  "https://html.duckduckgo.com/html/?q=%q",
-        func provider() -> SearchProvider {
+    ]
-            switch self {
+
-                case .google:     return SearchProvider.google
+    // Name of the default search engine from `searchEngines`
-                case .duckduckgo: return SearchProvider.duckduckgo
+    @SettingProperty(key: "defaultSearchEngine")
-                case .searxnor:   return SearchProvider.searxnor
+    public var defaultSearchEngineName: String = "Searx.nor"
-                case .whoogle:    return SearchProvider.whoogle
+
-            }
+    // Convenience to build a SearchProvider from current default
+    func currentSearchProvider() -> SearchProvider {
+        if let template = searchEngines[defaultSearchEngineName] {
+            return SearchProvider.fromTemplate(template)
         }
+        // Fallback to Google if something goes wrong
+        return SearchProvider.fromTemplate("https://google.com/search?q=%q&gbv=1")
     }
     
-    @SettingProperty(key: "searchProvider")
-    public var searchProvider: SearchProviderSetting = .searxnor
-    
     @SettingProperty(key: "redirectRules")
     public var redirectRules: [String: String] = [:]
     

App/Supporting Files/Info.plist

@@ -34,6 +34,8 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSRequiresIPhoneOS</key>

App/Supporting Files/SBrowser.entitlements

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.web-browser</key>
+	<true/>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.network.client</key>

App/Tabs/Tab.swift

@@ -19,7 +19,6 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
     
     public var tabInfo: TabInfo {
         get {
-            updateMetadata()
             return _tabInfo
         }
     }
@@ -39,18 +38,14 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
     }
     public var policyManager: ResourcePolicyManager
     
-    private var _tabInfo: TabInfo = TabInfo()
+    // Persisted snapshot of visible tab metadata; do not recompute on read.
+    var _tabInfo: TabInfo = TabInfo()
     
     private var loadedWebView: WKWebView? = nil
     public var title: String? { get { tabInfo.title } }
     public var url: URL? {
-        get {
+        if let urlString = tabInfo.urlString { return URL(string: urlString) }
-            if let urlString = tabInfo.urlString {
+        return nil
-                return URL(string: urlString)
-            }
-            
-            return nil
-        }
     }
     
     public var javaScriptEnabled: Bool = false {
@@ -110,6 +105,10 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
         super.init()
         
         bridge.delegate = self
+
+        // Initialize snapshot metadata
+        _tabInfo.identifier = self.identifier
+        if let url { _tabInfo.urlString = url.absoluteString }
     }
     
     deinit {
@@ -117,6 +116,8 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
     }
     
     func beginLoadingURL(_ url: URL) {
+        // Update snapshot immediately so UI keeps URL even if process jettisons.
+        _tabInfo.urlString = url.absoluteString
         let request = URLRequest(url: url)
         webView.load(request)
     }
@@ -150,15 +151,4 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
                 .assign(to: \.favicon, on: self)
         }
     }
-    
-    private func updateMetadata() {
-        guard contentProcessTerminated == false else { return }
-        
-        _tabInfo = TabInfo(
-            title: loadedWebView?.title,
-            urlString: loadedWebView?.url?.absoluteString ?? self.homeURL?.absoluteString,
-            faviconData: self.favicon?.pngData(),
-            identifier: self.identifier
-        )
-    }
 }

App/Tabs/TabController.swift

@@ -49,16 +49,28 @@ class TabController
             tabs.append(tab)
         }
         
-        // Title observation
+        // Title observation: update snapshot and notify delegate.
         tab.titleObservation = tab.webView.observe(\.title, changeHandler: { [weak tab, weak self] (webView, change) in
-            if let tab = tab, let self = self, let delegate = self.controllerDelegate {
+            guard let tab = tab else { return }
+            if let newTitle = webView.title, !newTitle.isEmpty {
+                tab._tabInfo.title = newTitle
+            }
+            if let self = self, let delegate = self.controllerDelegate {
                 delegate.tabController(self, didUpdateTitle: webView.title ?? "", forTab: tab)
             }
         })
+
+        // URL observation: persist the latest URL in the snapshot.
+        tab.urlObservation = tab.webView.observe(\.url, changeHandler: { [weak tab] (webView, change) in
+            guard let tab = tab else { return }
+            tab._tabInfo.urlString = webView.url?.absoluteString ?? tab._tabInfo.urlString
+        })
         
         // Favicon Observation
         tab.faviconObservation = tab.$favicon.receive(on: RunLoop.main).sink { [weak tab, weak self] val in
-            if let tab = tab, let self = self, let delegate = self.controllerDelegate {
+            guard let tab = tab else { return }
+            tab._tabInfo.faviconData = val?.pngData()
+            if let self = self, let delegate = self.controllerDelegate {
                 delegate.tabController(self, didUpdateFavicon: val, forTab: tab)
             }
         }

App/Web Process Bundle Bridge/SBRProcessBundleBridge.m

@@ -11,6 +11,7 @@
 #import "Hacks.h"
 
 #import <OSLog/OSLog.h>
+#import <stdatomic.h>
 
 #import <WebKit/_WKRemoteObjectInterface.h>
 #import <WebKit/_WKRemoteObjectRegistry.h>
@@ -19,10 +20,28 @@
 #import <WebKit/WKProcessPoolPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
+#import <WebKit/WKContentRuleListStore.h>
 
 #define WKUserStyleSheet id
 #define WKUserStyleSheetEncodedClassName "X1dLVXNlclN0eWxlU2hlZXQ="
 
+NSArray<NSString *> *CommonCDNList(void) {
+    static dispatch_once_t onceToken;
+    static NSArray<NSString *> *commonCDNList = nil;
+    dispatch_once(&onceToken, ^{
+        commonCDNList = @[
+            @"cdn.jsdelivr.net",
+             @"fsdn.net",
+             @"cdnjs.com",
+             @"osscdn.com",
+             @"code.jquery.com",
+             @"bootstrapcdn.com"
+        ];
+    });
+    
+    return commonCDNList;
+}
+
 @interface StyleSheet : NSObject <NSCopying>
 @property (nonatomic, readonly, copy) NSString *source;
 @property (nonatomic, readonly, copy) NSURL *baseURL;
@@ -31,6 +50,9 @@
 - (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly;
 @end
 
+// Note: We no longer proxy http/https via WKURLSchemeHandler; we use
+// WebKit content blocking rules instead.
+
 @interface WKUserContentController (Private)
 - (void)__addUserStyleSheet:(WKUserStyleSheet)userStyleSheet;
 - (void)__removeUserStyleSheet:(WKUserStyleSheet)userStyleSheet;
@@ -68,6 +90,13 @@
 #define LOG_DEBUG(format, ...) os_log_debug(_log, format, ##__VA_ARGS__)
 #define LOG_ERROR(format, ...) os_log_error(_log, format, ##__VA_ARGS__)
 
+static os_log_t _log;
+
+__attribute__((constructor))
+static void initialize_log(void) {
+    _log = os_log_create("net.buzzert.attractor.webview", "bridge");
+}
+
 @interface NSURLResponse (BridgeAdditions)
 @property (nonatomic, readonly) BOOL isJavascriptResponse;
 @end
@@ -91,13 +120,11 @@
 
 @end
 
-@interface SBRProcessBundleBridge () <WKURLSchemeHandler>
+@interface SBRProcessBundleBridge ()
 
 @end
 
 @implementation SBRProcessBundleBridge {
-    os_log_t                _log;
-    
     WKWebView              *_webView;
     WKWebViewConfiguration *_webViewConfiguration;
     WKProcessPool          *_processPool;
@@ -107,17 +134,21 @@
     
     NSArray<WKUserScript *> *_userScripts;
     
-    dispatch_queue_t _dataTasksAccessQueue;
-    NSMutableDictionary<NSURLRequest *, NSURLSessionDataTask *> *_dataTasks;
-    
     // These come from settings. 
     WKUserStyleSheet   _customizedUserStylesheet;
     WKUserScript      *_customizedUserScript;
+
+    // Content blocking
+    WKContentRuleList *_activeScriptRuleList;
+    void *_urlKVOContext;
 }
 
 - (void)tearDown
 {
-    // This was used to unregister the delegate with the web process.
+    if (_webView) {
+        @try { [_webView removeObserver:self forKeyPath:@"URL" context:_urlKVOContext]; }
+        @catch (__unused NSException *ex) {}
+    }
 }
 
 - (instancetype)initWithWebViewConfiguration:(WKWebViewConfiguration *)webViewConfiguration
@@ -125,8 +156,6 @@
     self = [super init];
     if (self) {
         if (!webViewConfiguration) {
-            _log = os_log_create("net.buzzert.attractor.webview", "bridge");
-            
             webViewConfiguration = [[WKWebViewConfiguration alloc] init];
 
             // Set up process pool
@@ -135,12 +164,7 @@
             
             webViewConfiguration._waitsForPaintAfterViewDidMoveToWindow = NO;
             webViewConfiguration._applePayEnabled = YES;
-            
+            // No http/https interception — rely on content blocking rules instead.
-            _dataTasks = [NSMutableDictionary dictionary];
-            _dataTasksAccessQueue = dispatch_queue_create("net.buzzert.attractor.dataTasksAccess", DISPATCH_QUEUE_SERIAL);
-            
-            [webViewConfiguration setURLSchemeHandler:self forURLScheme:@"http"];
-            [webViewConfiguration setURLSchemeHandler:self forURLScheme:@"https"];
         }
         
         _webViewConfiguration = webViewConfiguration;
@@ -161,6 +185,11 @@
         }
         
         _webView = webView;
+        _urlKVOContext = &_urlKVOContext; // unique context pointer
+        [_webView addObserver:self forKeyPath:@"URL" options:(NSKeyValueObservingOptionNew) context:_urlKVOContext];
+
+        // Initialize content blocking rules for current host
+        [self rebuildContentBlockingRulesForCurrentHost];
     }
     
     return self;
@@ -223,97 +252,18 @@
     });
 }
 
-#pragma mark <WKURLSchemeHandler>
-
-- (void)webView:(WKWebView *)webView startURLSchemeTask:(id<WKURLSchemeTask>)urlSchemeTask
-{
-    NSString *hostOrigin = [[_webView URL] host];
-    NSURLRequest *request = [urlSchemeTask request];
-    
-    LOG_DEBUG("Start URL scheme task: request: %@", request);
-    
-    __weak __auto_type welf = self;
-    NSURLSessionDataTask *dataTask = [[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error)
-    {
-        if (!welf) return;
-        __strong __auto_type sself = welf;
-        
-        if (error != nil) {
-            [urlSchemeTask didFailWithError:error];
-        } else if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
-            NSURL *requestURL = [request URL];
-            NSString *resourceOrigin = [requestURL host];
-            const __auto_type allowResource = ^{
-                os_log_debug(sself->_log, "Allowing resource: %@", requestURL.lastPathComponent);
-                [urlSchemeTask didReceiveResponse:response];
-                [urlSchemeTask didReceiveData:data];
-                [urlSchemeTask didFinish];
-                
-                [self webProcessDidAllowScriptWithOrigin:resourceOrigin];
-            };
-            
-            const __auto_type denyResource = ^{
-                os_log_debug(sself->_log, "Blocking resource: %@", requestURL.lastPathComponent);
-                NSHTTPURLResponse *altResponse = [[NSHTTPURLResponse alloc] initWithURL:requestURL
-                                                                               MIMEType:@"application/javascript"
-                                                                  expectedContentLength:0 textEncodingName:@"utf8"];
-                [urlSchemeTask didReceiveResponse:altResponse];
-                [urlSchemeTask didReceiveData:[NSData data]];
-                [urlSchemeTask didFinish];
-                
-                [self webProcessDidBlockScriptWithOrigin:resourceOrigin];
-            };
-            
-            // Check MIME type for JavaScript responses.
-            if ([response isJavascriptResponse] && ![sself allowAllScripts]) {
-                dispatch_async(sself->_dataTasksAccessQueue, ^{
-                    NSDictionary<NSString *, NSNumber *> *policyTypes = [sself->_policyDataSource scriptPolicyTypeByOrigin];
-                    NSNumber *policyType = [policyTypes objectForKey:hostOrigin];
-                    
-                    SBRScriptPolicy *policy = [[SBRScriptPolicy alloc] initWithSecurityOrigin:hostOrigin policyType:[policyType integerValue]];
-                    if ([policy allowsExternalJavaScriptResourceOrigin:resourceOrigin]) {
-                        allowResource();
-                    } else {
-                        denyResource();
-                    }
-                });
-            } else {
-                allowResource();
-            }
-        } else {
-            [urlSchemeTask didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:0 userInfo:nil]];
-        }
-        
-        [sself->_dataTasks removeObjectForKey:request];
-    }];
-    
-    [_dataTasks setObject:dataTask forKey:request];
-    [dataTask resume];
-}
-
-- (void)webView:(WKWebView *)webView stopURLSchemeTask:(id<WKURLSchemeTask>)urlSchemeTask
-{
-    NSURLRequest *request = [urlSchemeTask request];
-    NSURLSessionDataTask *dataTask = [_dataTasks objectForKey:request];
-    if (dataTask) {
-        if ([dataTask state] != NSURLSessionTaskStateCanceling) {
-            [dataTask cancel];
-        }
-        
-        [_dataTasks removeObjectForKey:request];
-    }
-}
-
 #pragma mark Actions
 
 - (void)policyDataSourceDidChange
 {
-    // This was used when we had to signal the process bundle.
+    // Rebuild content blocking rules when policy changes.
+    [self rebuildContentBlockingRulesForCurrentHost];
 }
 
 - (void)setAllowAllScripts:(BOOL)allowAllScripts
 {
     _allowAllScripts = allowAllScripts;
+    [self rebuildContentBlockingRulesForCurrentHost];
 }
 
 - (void)setDarkModeEnabled:(BOOL)darkModeEnabled
@@ -360,4 +310,119 @@
     }];
 }
 
+// MARK: - Content Blocking Rules
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
+{
+    if (context == _urlKVOContext && [keyPath isEqualToString:@"URL"]) {
+        [self rebuildContentBlockingRulesForCurrentHost];
+        return;
+    }
+    [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+}
+
+- (void)rebuildContentBlockingRulesForCurrentHost
+{
+    NSString *hostOrigin = _webView.URL.host;
+    if (!hostOrigin) {
+        // No page loaded yet; clear any existing rules
+        [self applyContentRuleListJSON:nil withName:nil];
+        return;
+    }
+
+    // Determine policy for this host
+    NSNumber *policyType = nil;
+    @synchronized (_policyDataSource) {
+        NSDictionary<NSString *, NSNumber *> *policyTypes = [_policyDataSource scriptPolicyTypeByOrigin];
+        policyType = [policyTypes objectForKey:hostOrigin] ?: @(0);
+    }
+
+    // Alpha=0 Bravo=1 Charlie=2 Delta=3 Echo=4
+    SBRScriptOriginPolicyType type = [policyType integerValue];
+    if (_allowAllScripts || type >= SBRScriptOriginPolicyTypeEcho) {
+        // Echo or shields down: no blocking
+        [self applyContentRuleListJSON:nil withName:nil];
+        return;
+    }
+
+    // Base trigger applies only to this page's domain
+    NSMutableArray *rules = [NSMutableArray array];
+    NSDictionary *baseScriptTrigger = @{
+        @"resource-type" : @[ @"script" ],
+        @"if-domain"     : @[ hostOrigin ]
+    };
+
+    if (type <= SBRScriptOriginPolicyTypeBravo) {
+        // Alpha or Bravo: block all external script subresources (inline JS is controlled via preferences elsewhere)
+        [rules addObject:@{ @"trigger": baseScriptTrigger, @"action": @{ @"type": @"block" } }];
+    } else {
+        // Charlie/Delta: block third-party scripts
+        NSMutableDictionary *trigger = [baseScriptTrigger mutableCopy];
+        trigger[@"load-type"] = @[ @"third-party" ];
+        [rules addObject:@{ @"trigger": trigger, @"action": @{ @"type": @"block" } }];
+        
+        if (type >= SBRScriptOriginPolicyTypeDelta) {
+            // Delta: add allowlist for common CDNs
+            for (NSString *cdn in CommonCDNList()) {
+                NSString *escaped = [NSRegularExpression escapedPatternForString:cdn];
+                NSString *pattern = [NSString stringWithFormat:@".*://([^.]*\\.)?%@/", escaped];
+                [rules addObject:@{
+                    @"trigger": @{
+                        @"url-filter": pattern,
+                        @"if-domain": @[ hostOrigin ],
+                        @"resource-type": @[ @"script" ]
+                    },
+                    @"action": @{ @"type": @"ignore-previous-rules" }
+                }];
+            }
+            
+            // Heuristic: allow cdn.<anything-with-family-name>/* where family name is the second-level label
+            NSArray<NSString *> *components = [hostOrigin componentsSeparatedByString:@"."];
+            if (components.count > 1) {
+                NSString *family = components[components.count - 2];
+                NSString *escapedFamily = [NSRegularExpression escapedPatternForString:family];
+                NSString *familyPattern = [NSString stringWithFormat:@".*://cdn\\.[^/]*%@[^/]*/", escapedFamily];
+                [rules addObject:@{
+                    @"trigger": @{
+                        @"url-filter": familyPattern,
+                        @"if-domain": @[ hostOrigin ],
+                        @"resource-type": @[ @"script" ]
+                    },
+                    @"action": @{ @"type": @"ignore-previous-rules" }
+                }];
+            }
+        }
+    }
+
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:rules options:0 error:nil];
+    NSString *json = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    NSString *name = [NSString stringWithFormat:@"net.buzzert.attractor.rules.%@", hostOrigin];
+    [self applyContentRuleListJSON:json withName:name];
+}
+
+- (void)applyContentRuleListJSON:(NSString *)json withName:(NSString *)name
+{
+    WKUserContentController *controller = [_webViewConfiguration userContentController];
+    if (_activeScriptRuleList) {
+        [controller removeContentRuleList:_activeScriptRuleList];
+        _activeScriptRuleList = nil;
+    }
+
+    if (!json || !name) { return; }
+
+    WKContentRuleListStore *store = [WKContentRuleListStore defaultStore];
+    [store compileContentRuleListForIdentifier:name encodedContentRuleList:json completionHandler:^(WKContentRuleList * _Nullable ruleList, NSError * _Nullable error) {
+        if (error) {
+            LOG_ERROR("Failed to compile content rule list: %@", error.localizedDescription);
+            return;
+        }
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self->_activeScriptRuleList = ruleList;
+            [controller addContentRuleList:ruleList];
+            LOG_DEBUG("Applied content rule list: %@", name);
+        });
+    }];
+}
+
 @end

App/Web Search/SearchProvider.swift

@@ -9,6 +9,18 @@ import Foundation
 
 class SearchProvider
 {
+    // Build a provider from a URL template. Template should contain %q or %s
+    // which will be replaced with the sanitized query string.
+    static func fromTemplate(_ template: String) -> SearchProvider {
+        SearchProvider(resolver: { query in
+            let sanitized = query.sanitized()
+            let replaced = template
+                .replacingOccurrences(of: "%q", with: sanitized)
+                .replacingOccurrences(of: "%s", with: sanitized)
+            return URL(string: replaced) ?? URL(string: "https://google.com/search?q=\(sanitized)&gbv=1")!
+        })
+    }
+
     static let google = SearchProvider(resolver: { query in
         // gbv=1: no JS
         URL(string: "https://google.com/search?q=\(query.sanitized())&gbv=1")!

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

Gemfile.lock

@@ -0,0 +1,231 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.9)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.2)
+    aws-partitions (1.1109.0)
+    aws-sdk-core (3.224.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.101.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.188.0)
+      aws-sdk-core (~> 3, >= 3.224.1)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    csv (3.3.5)
+    declarative (0.0.20)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.109.0)
+    faraday (1.10.6)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.8)
+      faraday (>= 0.8.0)
+      http-cookie (>= 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.1)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.4)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.4.1)
+    fastlane (2.230.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      base64 (~> 0.2.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      csv (~> 3.3)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3.0)
+      naturally (~> 2.2)
+      nkf (~> 0.2.0)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.1.0)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.45.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.29.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    httpclient (2.9.0)
+      mutex_m
+    jmespath (1.6.2)
+    json (2.7.6)
+    jwt (2.10.3)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    nkf (0.2.0)
+    optparse (0.8.1)
+    os (1.1.4)
+    plist (3.7.2)
+    public_suffix (5.1.1)
+    rake (13.4.2)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.8.0)
+    rexml (3.4.4)
+    rouge (3.28.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.18.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.2.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.27.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.5.23

README.md

@@ -26,3 +26,10 @@ Attractor operates in five "security modes":
 - Custom redirect rules
 - Catalyst and iPadOS support
 
+## Deployment
+
+TestFlight deployment is handled by Fastlane and the Gitea workflow at `.gitea/workflows/testflight.yml`.
+
+Required Gitea secrets match the local `.env.example`: `APP_STORE_CONNECT_KEY_ID`, `APP_STORE_CONNECT_ISSUER_ID`, `APP_STORE_CONNECT_KEY_CONTENT`, `MATCH_GIT_URL`, `MATCH_PASSWORD`, and `MATCH_GIT_BASIC_AUTHORIZATION`.
+
+Push a tag like `release/ios/v4.2` or `Attractor-4.2` to build and upload to TestFlight. To prepare signing assets locally, run `bundle exec fastlane ios setup_signing`; to upload manually, run `bundle exec fastlane ios beta`.

SBrowser.xcodeproj/project.pbxproj

@@ -44,6 +44,8 @@
 		CD361CF6271A3718006E9CA5 /* SBRScriptPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD361CF5271A3718006E9CA5 /* SBRScriptPolicy.m */; };
 		CD470C4225DE056600AFBE0E /* BrowserViewController+WebKitDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD470C4125DE056600AFBE0E /* BrowserViewController+WebKitDelegate.swift */; };
 		CD470C4425DE070400AFBE0E /* BrowserViewController+Keyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD470C4325DE070400AFBE0E /* BrowserViewController+Keyboard.swift */; };
+		CD4930D92E8B390200ADDE99 /* AddSearchEngineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD4930D82E8B38FC00ADDE99 /* AddSearchEngineViewController.swift */; };
+		CD4930DB2E8B3F6500ADDE99 /* ManageSearchEnginesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD4930DA2E8B3F5B00ADDE99 /* ManageSearchEnginesViewController.swift */; };
 		CD7313E22705349700053347 /* ScriptPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD7313E12705349700053347 /* ScriptPolicyViewController.swift */; };
 		CD7313E4270534B800053347 /* ScriptPolicyViewControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD7313E3270534B800053347 /* ScriptPolicyViewControllerDelegate.swift */; };
 		CD7A7E9D2686A9A500E20BA3 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD7A7E9C2686A9A500E20BA3 /* SettingsViewController.swift */; };
@@ -143,6 +145,8 @@
 		CD3D6CED2DA9F8910099667F /* WebKitDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebKitDefines.h; sourceTree = "<group>"; };
 		CD470C4125DE056600AFBE0E /* BrowserViewController+WebKitDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BrowserViewController+WebKitDelegate.swift"; sourceTree = "<group>"; };
 		CD470C4325DE070400AFBE0E /* BrowserViewController+Keyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BrowserViewController+Keyboard.swift"; sourceTree = "<group>"; };
+		CD4930D82E8B38FC00ADDE99 /* AddSearchEngineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSearchEngineViewController.swift; sourceTree = "<group>"; };
+		CD4930DA2E8B3F5B00ADDE99 /* ManageSearchEnginesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManageSearchEnginesViewController.swift; sourceTree = "<group>"; };
 		CD7313E12705349700053347 /* ScriptPolicyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptPolicyViewController.swift; sourceTree = "<group>"; };
 		CD7313E3270534B800053347 /* ScriptPolicyViewControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptPolicyViewControllerDelegate.swift; sourceTree = "<group>"; };
 		CD7A7E9C2686A9A500E20BA3 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
@@ -477,6 +481,8 @@
 				CD7A7E9C2686A9A500E20BA3 /* SettingsViewController.swift */,
 				CD7A7E9E2686B29100E20BA3 /* GeneralSettingsViewController.swift */,
 				CD7A7EA02686B2E600E20BA3 /* RedirectRulesSettingsViewController.swift */,
+				CD4930D82E8B38FC00ADDE99 /* AddSearchEngineViewController.swift */,
+				CD4930DA2E8B3F5B00ADDE99 /* ManageSearchEnginesViewController.swift */,
 				CDF3468F276C14BD00FB3141 /* CodeEditorSettingsViewController.swift */,
 			);
 			path = Settings;
@@ -569,6 +575,7 @@
 			files = (
 				1ADFF46024C7DE53006DC7AE /* AppDelegate.swift in Sources */,
 				1AD3104325254FB900A4A952 /* FindOnPageViewController.swift in Sources */,
+				CD4930D92E8B390200ADDE99 /* AddSearchEngineViewController.swift in Sources */,
 				1A03811424E73EB300826501 /* SegmentedReliefButton.swift in Sources */,
 				1A03811024E71CF000826501 /* ReliefButton.swift in Sources */,
 				CD8ACBC22DC9A2F7008BF856 /* Hacks.m in Sources */,
@@ -604,6 +611,7 @@
 				CD853BCE24E7763900D2BDCC /* BrowserHistory.swift in Sources */,
 				1A03810B24E71C5600826501 /* ToolbarButtonContainerView.swift in Sources */,
 				CD8DBE7B2A85D892006A0FE0 /* LayoutLatch.swift in Sources */,
+				CD4930DB2E8B3F6500ADDE99 /* ManageSearchEnginesViewController.swift in Sources */,
 				CD7A7EA12686B2E600E20BA3 /* RedirectRulesSettingsViewController.swift in Sources */,
 				1ADFF4CB24CB8278006DC7AE /* ScriptControllerIconView.swift in Sources */,
 				CD7A8915251975B70075991E /* AutocompleteViewController.swift in Sources */,
@@ -782,9 +790,9 @@
 				CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DQQH5H6GBD;
+				DEVELOPMENT_TEAM = 3SJALV9BQ7;
 				INFOPLIST_FILE = "App/Supporting Files/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Attractor;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
@@ -793,7 +801,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0;
+				MARKETING_VERSION = 4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.attractor;
 				PRODUCT_NAME = Attractor;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -817,9 +825,9 @@
 				CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DQQH5H6GBD;
+				DEVELOPMENT_TEAM = 3SJALV9BQ7;
 				INFOPLIST_FILE = "App/Supporting Files/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = Attractor;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
@@ -828,7 +836,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0;
+				MARKETING_VERSION = 4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.attractor;
 				PRODUCT_NAME = Attractor;
 				PROVISIONING_PROFILE_SPECIFIER = "";

fastlane/Fastfile

@@ -0,0 +1,186 @@
+require "shellwords"
+require "xcodeproj"
+
+default_platform(:ios)
+
+APP_IDENTIFIER = "net.buzzert.attractor"
+SCHEME = "Attractor"
+TARGET_NAME = "App"
+TEAM_ID = ENV["FASTLANE_TEAM_ID"].to_s.strip.empty? ? "DQQH5H6GBD" : ENV["FASTLANE_TEAM_ID"]
+PROFILE_NAME = ENV["ATTRACTOR_PROVISIONING_PROFILE_SPECIFIER"].to_s.strip.empty? ? "Attractor AppStore CI" : ENV["ATTRACTOR_PROVISIONING_PROFILE_SPECIFIER"]
+CI_KEYCHAIN_NAME = "attractor_ci_keychain"
+CI_KEYCHAIN_PASSWORD = "attractor-ci-keychain-password"
+CI_KEYCHAIN_DB_PATH = File.expand_path("~/Library/Keychains/#{CI_KEYCHAIN_NAME}-db")
+PROJECT_FILE = File.expand_path("../SBrowser.xcodeproj", __dir__)
+
+def present?(value)
+  !value.to_s.strip.empty?
+end
+
+def ci?
+  present?(ENV["CI"])
+end
+
+def version_from_tag(tag)
+  patterns = [
+    %r{\Arelease/ios/v(\d+(?:\.\d+){1,2})\z},
+    %r{\AAttractor-(\d+(?:\.\d+){1,2})\z},
+    %r{\Av(\d+(?:\.\d+){1,2})\z}
+  ]
+
+  patterns.each do |pattern|
+    match = tag.to_s.match(pattern)
+    return match[1] if match
+  end
+
+  nil
+end
+
+def release_version
+  candidates = [
+    ENV["ATTRACTOR_VERSION_TAG"],
+    ENV["GITHUB_REF_NAME"],
+    ENV["GITHUB_REF"].to_s.sub(%r{\Arefs/tags/}, "")
+  ]
+
+  candidates.each do |tag|
+    version = version_from_tag(tag)
+    return version if version
+  end
+
+  latest_tag = sh("git describe --tags --abbrev=0").strip
+  version = version_from_tag(latest_tag)
+  return version if version
+
+  candidates << latest_tag
+  UI.user_error!("Release tag must look like release/ios/v4.1, Attractor-4.1, or v4.1; got #{candidates.compact.inspect}")
+end
+
+# App Store Connect requires CFBundleVersion to be unique and strictly
+# increasing app-wide. Attractor already has historical builds, so use a UTC
+# timestamp by default instead of assuming a fresh CI run number is high enough.
+def build_number
+  value = ENV["ATTRACTOR_BUILD_NUMBER"]
+  value = Time.now.utc.strftime("%Y%m%d%H%M%S") unless present?(value)
+
+  unless value.to_s.match?(/\A\d+\z/)
+    UI.user_error!("Build number must be numeric; got #{value.inspect}")
+  end
+
+  value.to_s
+end
+
+def stamp_project_versions(version:, build:)
+  project = Xcodeproj::Project.open(PROJECT_FILE)
+  target = project.targets.find { |candidate| candidate.name == TARGET_NAME }
+  UI.user_error!("Could not find target #{TARGET_NAME.inspect} in #{PROJECT_FILE}") unless target
+
+  target.build_configurations.each do |configuration|
+    configuration.build_settings["MARKETING_VERSION"] = version
+    configuration.build_settings["CURRENT_PROJECT_VERSION"] = build
+  end
+
+  project.save
+end
+
+platform :ios do
+  private_lane :app_store_api_key do
+    app_store_connect_api_key(
+      key_id: ENV.fetch("APP_STORE_CONNECT_KEY_ID"),
+      issuer_id: ENV.fetch("APP_STORE_CONNECT_ISSUER_ID"),
+      key_content: ENV.fetch("APP_STORE_CONNECT_KEY_CONTENT"),
+      is_key_content_base64: true
+    )
+  end
+
+  # CI signs headlessly, so match needs a fresh unlocked keychain to import
+  # into. codesign resolves identities through the user keychain search
+  # list (first match wins; the --keychain flag does not restrict the
+  # lookup), and other projects' keychains on this runner hold the same
+  # identity but are usually locked — so ours must come first. delete_keychain
+  # in the beta lane's ensure removes both the keychain and its search-list
+  # entry, which also keeps our (later locked) copy from shadowing those
+  # other projects.
+  private_lane :prepare_ci_keychain do
+    next unless ci?
+
+    delete_keychain(name: CI_KEYCHAIN_NAME) if File.file?(CI_KEYCHAIN_DB_PATH)
+    create_keychain(
+      name: CI_KEYCHAIN_NAME,
+      password: CI_KEYCHAIN_PASSWORD,
+      unlock: true,
+      timeout: 3600,
+      add_to_search_list: false
+    )
+
+    others = sh("security list-keychains -d user", log: false)
+      .scan(/"([^"]+)"/)
+      .flatten
+      .reject { |path| path.include?(CI_KEYCHAIN_NAME) }
+    sh("security list-keychains -d user -s #{([CI_KEYCHAIN_DB_PATH] + others).shelljoin}")
+
+    ENV["MATCH_KEYCHAIN_NAME"] = CI_KEYCHAIN_NAME
+    ENV["MATCH_KEYCHAIN_PASSWORD"] = CI_KEYCHAIN_PASSWORD
+  end
+
+  private_lane :sync_signing do |options|
+    match(
+      type: "appstore",
+      readonly: options.fetch(:readonly),
+      app_identifier: APP_IDENTIFIER,
+      team_id: TEAM_ID,
+      profile_name: PROFILE_NAME,
+      git_url: ENV.fetch("MATCH_GIT_URL"),
+      git_branch: ENV.fetch("MATCH_GIT_BRANCH", "master"),
+      git_full_name: "Attractor Release Bot",
+      git_user_email: "james.magahern@me.com",
+      api_key: options.fetch(:api_key)
+    )
+  end
+
+  desc "Create or update match signing assets"
+  lane :setup_signing do
+    sync_signing(api_key: app_store_api_key, readonly: false)
+  end
+
+  desc "Build and upload to TestFlight"
+  lane :beta do
+    prepare_ci_keychain
+
+    api_key = app_store_api_key
+    version = release_version
+    build = build_number
+
+    stamp_project_versions(version: version, build: build)
+
+    sync_signing(api_key: api_key, readonly: true)
+
+    build_app(
+      project: PROJECT_FILE,
+      scheme: SCHEME,
+      destination: "generic/platform=iOS",
+      export_method: "app-store",
+      codesigning_identity: "Apple Distribution",
+      xcargs: [
+        "DEVELOPMENT_TEAM=#{TEAM_ID.shellescape}",
+        "CODE_SIGN_STYLE=Manual",
+        "CODE_SIGN_IDENTITY=Apple\\ Distribution",
+        "PROVISIONING_PROFILE_SPECIFIER=#{PROFILE_NAME.shellescape}"
+      ].join(" "),
+      export_options: {
+        signingStyle: "manual",
+        teamID: TEAM_ID,
+        provisioningProfiles: {
+          APP_IDENTIFIER => PROFILE_NAME
+        }
+      }
+    )
+
+    upload_to_testflight(
+      api_key: api_key,
+      skip_waiting_for_build_processing: true
+    )
+  ensure
+    delete_keychain(name: CI_KEYCHAIN_NAME) if ci? && File.file?(CI_KEYCHAIN_DB_PATH)
+  end
+end

justfile

@@ -0,0 +1,18 @@
+simulator := "platform=iOS Simulator,name=iPhone 17e,OS=latest"
+derived_data := "build/DerivedData"
+
+default:
+  @just build
+
+build:
+  if command -v xcbeautify >/dev/null 2>&1; then \
+    xcodebuild -project SBrowser.xcodeproj -scheme Attractor -destination '{{simulator}}' | xcbeautify; \
+  else \
+    xcodebuild -project SBrowser.xcodeproj -scheme Attractor -destination '{{simulator}}'; \
+  fi
+
+beta:
+  bundle exec fastlane ios beta
+
+setup-signing:
+  bundle exec fastlane ios setup_signing

mise.toml

@@ -0,0 +1,4 @@
+[tools]
+just = "latest"
+ruby = "3.1.7"
+xcbeautify = "latest"