browser-cookie-bridge 1.4.1 → 1.4.3

package/README.md

@@ -12,6 +12,7 @@
   <img src="https://img.shields.io/badge/macOS-13.5%2B-111111?logo=apple&logoColor=white" alt="macOS 13.5+" />
   <img src="https://img.shields.io/badge/Swift-6-8E2735?logo=swift&logoColor=white" alt="Swift 6" />
   <img src="https://img.shields.io/badge/Node.js-24%2B-3C873A?logo=nodedotjs&logoColor=white" alt="Node.js 24+" />
+  <img src="https://img.shields.io/badge/Homebrew-Cask-FBB040?logo=homebrew&logoColor=black" alt="Homebrew Cask" />
   <a href="https://www.npmjs.com/package/browser-cookie-bridge"><img src="https://img.shields.io/npm/v/browser-cookie-bridge?logo=npm&color=CB3837" alt="browser-cookie-bridge on npm" /></a>
   <img src="https://img.shields.io/badge/local--first-cloud%20optional-C68B3C" alt="Local-first, cloud optional" />
   <img src="https://img.shields.io/github/stars/apoorvdarshan/browser-cookie-bridge?logo=github&color=C68B3C" alt="GitHub stars" />
@@ -22,6 +23,7 @@
 
 <p>
   <a href="#installation"><b>Install</b></a> ·
+  <a href="https://github.com/apoorvdarshan/homebrew-tap">Homebrew</a> ·
   <a href="https://github.com/apoorvdarshan/browser-cookie-bridge/releases/latest">DMG</a> ·
   <a href="https://www.npmjs.com/package/browser-cookie-bridge">npm</a> ·
   <a href="#how-it-works">How it works</a> ·
@@ -61,9 +63,11 @@ Browser Cookie Bridge currently ships for macOS. A separate Windows app is being
 ## Features
 
 - 🍪 **Cookie and session transfer** — cookies are enabled by default, including supported domain, path, expiry, security, `SameSite`, and partition attributes.
+- 🗃️ **Optional full site data for Codex** — replace Codex's compatible Local Storage, IndexedDB, Session Storage, service-worker, and related origin stores from a closed source profile, with backup and rollback. Off by default.
 - 🌐 **Seven Chromium browsers** — Brave, Chrome, Edge, Arc, Vivaldi, Opera, and Perplexity Comet can be sources or destinations.
 - ✨ **ChatGPT Codex import** — merge selected local browser data into Codex's built-in browser; Codex is destination-only.
 - 🔁 **Optional Codex restart** — manual Sync can force quit a running Codex instance and reopen it only after a successful local transfer; off by default.
+- 🔄 **Optional two-app restart** — Full site data can force quit the selected source browser and Codex, then reopen only the apps that were running after a successful transfer; off by default.
 - ☁️ **Optional Browserless upload** — create or refresh a Browserless authenticated profile with cookies, local storage, and IndexedDB; see a local size preflight, live progress, cancellation, and post-upload verification.
 - 🕘 **Background automation** — sync when you sign in, at a fixed daily time, or whenever you choose.
 - ◉ **Native menu-bar app** — closing the window removes the Dock icon while the helper continues running.
@@ -76,8 +80,9 @@ Browser Cookie Bridge currently ships for macOS. A separate Windows app is being
 | Data | Support | Notes |
 |---|---:|---|
 | **Cookies and sessions** | ✅ Default | Transfers supported cookie values and attributes |
+| **Full site data → Codex** | Optional | Replaces compatible origin storage from a closed Chromium profile; backs up Codex first |
 | **History URLs** | ◐ Optional | Original visit times and page titles cannot be preserved |
-| **Local storage and IndexedDB** | ◐ Browserless only | Included only in an explicit Browserless authenticated-profile upload |
+| **Local storage and IndexedDB** | ◐ Optional | Full site data into Codex, or an explicit Browserless authenticated-profile upload |
 | **Passwords** | — Never | Chromium extensions cannot read the browser password store |
 | **Bookmarks, autofill, payments** | — Never | Not requested or accessed |
 | **iCloud Keychain** | — Never | Remains completely separate |
@@ -93,6 +98,15 @@ The DMG is self-contained. Node.js 24+ and Xcode Command Line Tools are required
 
 ## Installation
 
+### Via Homebrew — recommended
+
+```bash
+brew install --cask apoorvdarshan/tap/browser-cookie-bridge
+```
+
+Homebrew selects the correct Apple-silicon or Intel DMG, verifies its SHA-256
+checksum, and installs the signed and notarized app into `/Applications`.
+
 ### Download a DMG — recommended
 
 - **[Apple silicon DMG](https://github.com/apoorvdarshan/browser-cookie-bridge/releases/latest/download/Browser-Cookie-Bridge-arm64.dmg)** — M1, M2, M3, M4, and newer
@@ -108,9 +122,13 @@ Run the published package directly:
 npx browser-cookie-bridge install-app
 ```
 
-No administrator password is needed. The app is built from source on your Mac and installed in your user Applications folder unless an existing writable system Applications copy is being updated.
+No administrator password is needed. The app is built from source on your Mac and installed in your user Applications folder. If a signed `/Applications/Browser Cookie Bridge.app` already exists, the CLI preserves it instead of replacing its Developer ID signature with an ad-hoc local build; use the app's built-in updater for signed releases.
 
-Both installation methods use the same bundle identifier and the same settings under `~/Library/Application Support/BraveCodexCookieSync`. Installing the DMG after npm does not create a separate product identity: the system Applications copy becomes canonical, and a stale matching user Applications copy is moved to the Trash on launch. Future updates replace that same app in place.
+All installation methods use the same bundle identifier and settings under
+`~/Library/Application Support/BraveCodexCookieSync`. Homebrew and the DMG
+install the canonical system Applications copy. Installing either after npm
+does not create a separate product identity: a stale matching user Applications
+copy is moved to Trash on launch, and future updates replace the same app.
 
 **[View `browser-cookie-bridge` on npm →](https://www.npmjs.com/package/browser-cookie-bridge)**
 
@@ -123,7 +141,7 @@ npm test
 npm run build:app
 ```
 
-The final command compiles the native SwiftUI app, enables **Open at login**, **Sync at login**, and the **menu-bar helper**, then launches it. A first install uses `~/Applications/Browser Cookie Bridge.app` without requesting administrator access. If an existing `/Applications/Browser Cookie Bridge.app` is present, later builds and updates keep using that system Applications copy instead of creating a duplicate. Daily sync stays off until you enable it.
+The final command compiles the native SwiftUI app, enables **Open at login**, **Sync at login**, and the **menu-bar helper**, then launches it. A first install uses `~/Applications/Browser Cookie Bridge.app` without requesting administrator access. If an existing signed `/Applications/Browser Cookie Bridge.app` is present, the CLI keeps that system copy canonical and leaves app updates to the signed-DMG updater. Developers who intentionally need to replace it with a local ad-hoc build can pass `--replace-system-from-source`. Daily sync stays off until you enable it.
 
 ## Setup
 
@@ -186,9 +204,9 @@ Automation uses the saved source, destination, and data choices for local transf
 ## CLI
 
 ```bash
-browser-cookie-bridge install-app [--no-open]
+browser-cookie-bridge install-app [--no-open] [--replace-system-from-source]
 browser-cookie-bridge setup [--hour 9] [--minute 0] [--no-schedule]
-browser-cookie-bridge preferences --source brave --target codex --cookies on --history off --auto-restart-codex off
+browser-cookie-bridge preferences --source brave --target codex --cookies on --history off --site-storage off --auto-restart-codex off --auto-restart-both off
 browser-cookie-bridge sync [--timeout 300] [--allow-cloud-upload]
 browser-cookie-bridge browserless-preflight
 browser-cookie-bridge doctor
@@ -216,6 +234,7 @@ The broker validates a random token and extension origin, limits payload size, a
 - Cookie values and history URLs are never logged.
 - Browser-to-browser data is held only in broker memory.
 - Codex backups are stored with user-only permissions under `~/Library/Application Support/BraveCodexCookieSync/backups/codex`; the newest 14 are retained.
+- Full site-data import is opt-in and requires both Codex and the source browser to be closed. It replaces compatible Codex origin-storage directories rather than attempting an unsafe LevelDB merge; the previous directories are included in the same backup.
 - The app refuses unknown Codex database schemas instead of guessing.
 - Imported Codex rows use an empty `encrypted_value` because OpenAI's Safe Storage key is protected by a private macOS Keychain access group. Those imported rows can therefore remain readable to software running as your macOS user until the website refreshes them.
 - Anyone who can use your logged-in macOS account or modify a generated extension may be able to access transferred browser sessions.
@@ -247,6 +266,7 @@ If Browser Cookie Bridge is useful to you:
 
 - ⭐ **Star** the repository
 - ⬇️ **[Download the latest DMG](https://github.com/apoorvdarshan/browser-cookie-bridge/releases/latest)**
+- 🍺 **[Install from Homebrew](https://github.com/apoorvdarshan/homebrew-tap)**
 - 📦 **[Install from npm](https://www.npmjs.com/package/browser-cookie-bridge)**
 - 🐛 **[Report a bug](https://github.com/apoorvdarshan/browser-cookie-bridge/issues/new?template=bug_report.yml)** — never include cookie values or tokens
 - ☕ **[Support on Ko-fi](https://ko-fi.com/apoorvdarshan)**

package/extension-template/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Browser Cookie Bridge",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Transfers selected browser data locally between supported browsers and into ChatGPT Codex.",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5o6lDkXzU/23Jm2QRk4mfuxNnr3VlEIjRHcZr93Gdo7PI7asHJQhigaMGT6UOz0lkaTn1F+TGIPlsJo9GNBSsxbCfxWoBSXcFQFrPolY5LEfKaMtZQQ6eb4UAnp+bbUwb1den4On0piWU47Yzl6i0Jcdg4EG5H1kCSF/6nJsbKgF7OTaR/3drULu40yRvflzSXRhly3UDO7c5mgHJsaMwVV+VILsxbcPOoRINjuo3zDC737HFs67dpf38xF3tjSVL0HURAWKKobMvfABiDfVEm5O0Lvf+57d1Ib12QLT2qtVXNDy3iYwX+w2S0wH2vIMsfvoFPlRdmeqft70kZOqXwIDAQAB",
   "permissions": ["alarms", "cookies", "history"],

package/macos-app/Info.plist

@@ -10,8 +10,8 @@
   <key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
   <key>CFBundleName</key><string>Browser Cookie Bridge</string>
   <key>CFBundlePackageType</key><string>APPL</string>
-  <key>CFBundleShortVersionString</key><string>1.4.1</string>
-  <key>CFBundleVersion</key><string>29</string>
+  <key>CFBundleShortVersionString</key><string>1.4.3</string>
+  <key>CFBundleVersion</key><string>31</string>
   <key>LSMinimumSystemVersion</key><string>13.5</string>
   <key>NSHighResolutionCapable</key><true/>
 </dict>

package/macos-app/Sources/BraveCodexSyncApp/BraveCodexSyncApp.swift

@@ -569,6 +569,18 @@ struct PreferencesPanel: View {
             Toggle("", isOn: Binding(get: { model.cookiesEnabled }, set: { model.setCookiesEnabled($0) }))
               .labelsHidden().toggleStyle(.switch).tint(Theme.active).disabled(model.isWorking)
           }
+          if model.selectedTargetID == "codex" {
+            RowDivider()
+            PreferenceRow(
+              icon: "externaldrive.badge.plus",
+              color: Theme.accent,
+              title: "Full site data",
+              detail: "Local Storage, IndexedDB, sessions, and service workers · both apps must be closed"
+            ) {
+              Toggle("", isOn: Binding(get: { model.siteStorageEnabled }, set: { model.setSiteStorageEnabled($0) }))
+                .labelsHidden().toggleStyle(.switch).tint(Theme.active).disabled(model.isWorking || model.isSyncing)
+            }
+          }
           RowDivider()
           PreferenceRow(icon: "clock.arrow.circlepath", color: Theme.accent, title: "History URLs", detail: "Original visit times are not preserved") {
             Toggle("", isOn: Binding(get: { model.historyEnabled }, set: { model.setHistoryEnabled($0) }))
@@ -580,14 +592,26 @@ struct PreferencesPanel: View {
           }
           if model.selectedTargetID == "codex" {
             RowDivider()
-            PreferenceRow(
-              icon: "arrow.clockwise.circle",
-              color: Theme.accent,
-              title: "Restart Codex automatically",
-              detail: "Force quit before manual sync; reopen only after success"
-            ) {
-              Toggle("", isOn: Binding(get: { model.autoRestartCodex }, set: { model.setAutoRestartCodex($0) }))
-                .labelsHidden().toggleStyle(.switch).tint(Theme.active).disabled(model.isWorking || model.isSyncing)
+            if model.siteStorageEnabled {
+              PreferenceRow(
+                icon: "arrow.triangle.2.circlepath",
+                color: Theme.accent,
+                title: "Restart both automatically",
+                detail: "Manual sync force quits both; reopens running apps only after success"
+              ) {
+                Toggle("", isOn: Binding(get: { model.autoRestartBoth }, set: { model.setAutoRestartBoth($0) }))
+                  .labelsHidden().toggleStyle(.switch).tint(Theme.active).disabled(model.isWorking || model.isSyncing)
+              }
+            } else {
+              PreferenceRow(
+                icon: "arrow.clockwise.circle",
+                color: Theme.accent,
+                title: "Restart Codex automatically",
+                detail: "Force quit before manual sync; reopen only after success"
+              ) {
+                Toggle("", isOn: Binding(get: { model.autoRestartCodex }, set: { model.setAutoRestartCodex($0) }))
+                  .labelsHidden().toggleStyle(.switch).tint(Theme.active).disabled(model.isWorking || model.isSyncing)
+              }
             }
           }
         }

package/macos-app/Sources/BraveCodexSyncApp/SyncModel.swift

@@ -78,6 +78,7 @@ final class SyncModel: ObservableObject {
   @Published var menuBarEnabled = true
   @Published var autoCheckUpdates = true
   @Published var autoRestartCodex = false
+  @Published var autoRestartBoth = false
   @Published var isCheckingForUpdates = false
   @Published var isInstallingUpdate = false
   @Published var availableUpdateVersion: String?
@@ -85,6 +86,7 @@ final class SyncModel: ObservableObject {
   @Published var extensionsReady = false
   @Published var cookiesEnabled = true
   @Published var historyEnabled = false
+  @Published var siteStorageEnabled = false
   @Published var selectedSourceID = "brave"
   @Published var selectedTargetID = "codex"
   @Published var codexRunning = false
@@ -129,11 +131,16 @@ final class SyncModel: ObservableObject {
   var targetName: String {
     isBrowserlessTarget ? "Browserless Cloud" : selectedTargetBrowser?.name ?? "ChatGPT Codex"
   }
-  var codexBlocked: Bool { selectedTargetID == "codex" && codexRunning && !autoRestartCodex }
+  var codexBlocked: Bool {
+    selectedTargetID == "codex" && codexRunning && !autoRestartCodex && !(siteStorageEnabled && autoRestartBoth)
+  }
+  var sourceSiteDataBlocked: Bool {
+    selectedTargetID == "codex" && siteStorageEnabled && sourceBrowserRunning && !autoRestartBoth
+  }
   var browserlessBlocked: Bool {
     isBrowserlessTarget && (!browserlessConfigured || sourceBrowserRunning || selectedSourceID == "comet")
   }
-  var syncBlocked: Bool { codexBlocked || browserlessBlocked }
+  var syncBlocked: Bool { codexBlocked || sourceSiteDataBlocked || browserlessBlocked }
   var formattedUploadElapsed: String {
     let minutes = uploadElapsedSeconds / 60
     let seconds = uploadElapsedSeconds % 60
@@ -260,9 +267,11 @@ final class SyncModel: ObservableObject {
       if selectedTargetID == selectedSourceID { selectedTargetID = "codex" }
       cookiesEnabled = config.imports?.cookies ?? true
       historyEnabled = config.imports?.history ?? false
+      siteStorageEnabled = config.imports?.siteStorage ?? false
       menuBarEnabled = config.ui?.menuBar ?? true
       autoCheckUpdates = config.ui?.autoCheckUpdates ?? true
       autoRestartCodex = config.ui?.autoRestartCodex ?? false
+      autoRestartBoth = config.ui?.autoRestartBoth ?? false
       browserlessProfileName = config.browserless?.profileName ?? "browser-cookie-bridge"
       browserlessRegion = config.browserless?.region ?? "sfo"
       browserlessOnlyDomains = (config.browserless?.onlyDomains ?? []).joined(separator: ", ")
@@ -309,6 +318,11 @@ final class SyncModel: ObservableObject {
     persistPreferences(successMessage: enabled ? "History URL import enabled" : "History import disabled")
   }
 
+  func setSiteStorageEnabled(_ enabled: Bool) {
+    siteStorageEnabled = enabled
+    persistPreferences(successMessage: enabled ? "Full site-data import enabled" : "Full site-data import disabled")
+  }
+
   func saveBrowserlessSettings(token: String, profileName: String, region: String, onlyDomains: String) {
     let cleanedToken = token.trimmingCharacters(in: .whitespacesAndNewlines)
     let cleanedName = profileName.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -354,6 +368,11 @@ final class SyncModel: ObservableObject {
     persistPreferences(successMessage: enabled ? "Automatic Codex restart enabled" : "Automatic Codex restart disabled")
   }
 
+  func setAutoRestartBoth(_ enabled: Bool) {
+    autoRestartBoth = enabled
+    persistPreferences(successMessage: enabled ? "Automatic source and Codex restart enabled" : "Automatic source and Codex restart disabled")
+  }
+
   func checkForUpdates(showAlert: Bool = false) {
     guard !isCheckingForUpdates, !isInstallingUpdate else { return }
     guard let url = URL(string: "https://api.github.com/repos/apoorvdarshan/browser-cookie-bridge/releases/latest") else { return }
@@ -456,6 +475,10 @@ final class SyncModel: ObservableObject {
       }
       return
     }
+    if selectedTargetID == "codex" && siteStorageEnabled && autoRestartBoth && (sourceBrowserRunning || codexRunning) {
+      forceQuitBothThenSync(showMenuBarAlert: showMenuBarAlert)
+      return
+    }
     if selectedTargetID == "codex" && codexRunning && autoRestartCodex {
       forceQuitCodexThenSync(showMenuBarAlert: showMenuBarAlert)
       return
@@ -463,6 +486,75 @@ final class SyncModel: ObservableObject {
     startSync(showMenuBarAlert: showMenuBarAlert, reopenCodexOnSuccess: false)
   }
 
+  private func forceQuitBothThenSync(showMenuBarAlert: Bool) {
+    let sourceApplications = NSWorkspace.shared.runningApplications.filter {
+      $0.bundleIdentifier == selectedBrowser.bundleIdentifier
+    }
+    let codexApplications = NSWorkspace.shared.runningApplications.filter {
+      $0.bundleIdentifier == "com.openai.codex"
+    }
+    let reopenSource = !sourceApplications.isEmpty
+    let reopenCodex = !codexApplications.isEmpty
+    let applications = sourceApplications + codexApplications
+
+    isSyncing = true
+    uploadCanceling = false
+    state = .syncing
+    primaryStatus = "Closing both apps for full sync"
+    secondaryStatus = "Force quitting \(selectedBrowser.name) and ChatGPT Codex, then waiting for their browser storage to close…"
+    guard applications.allSatisfy({ $0.forceTerminate() }) else {
+      finishCodexPreparationFailure(
+        message: "macOS could not force quit both apps. Close \(selectedBrowser.name) and ChatGPT Codex manually, then try again.",
+        showMenuBarAlert: showMenuBarAlert
+      )
+      return
+    }
+    waitForBothToQuit(
+      attemptsRemaining: 50,
+      reopenSource: reopenSource,
+      reopenCodex: reopenCodex,
+      showMenuBarAlert: showMenuBarAlert
+    )
+  }
+
+  private func waitForBothToQuit(
+    attemptsRemaining: Int,
+    reopenSource: Bool,
+    reopenCodex: Bool,
+    showMenuBarAlert: Bool
+  ) {
+    let runningBundleIDs = Set(NSWorkspace.shared.runningApplications.compactMap(\.bundleIdentifier))
+    let stillRunning = runningBundleIDs.contains(selectedBrowser.bundleIdentifier) || runningBundleIDs.contains("com.openai.codex")
+    if !stillRunning {
+      sourceBrowserRunning = false
+      codexRunning = false
+      secondaryStatus = "Both apps are closed — waiting briefly for browser storage to be released…"
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.8) { [weak self] in
+        self?.startSync(
+          showMenuBarAlert: showMenuBarAlert,
+          reopenCodexOnSuccess: reopenCodex,
+          reopenSourceOnSuccess: reopenSource
+        )
+      }
+      return
+    }
+    guard attemptsRemaining > 0 else {
+      finishCodexPreparationFailure(
+        message: "The apps did not close within 10 seconds. Close both manually, then try again.",
+        showMenuBarAlert: showMenuBarAlert
+      )
+      return
+    }
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
+      self?.waitForBothToQuit(
+        attemptsRemaining: attemptsRemaining - 1,
+        reopenSource: reopenSource,
+        reopenCodex: reopenCodex,
+        showMenuBarAlert: showMenuBarAlert
+      )
+    }
+  }
+
   private func forceQuitCodexThenSync(showMenuBarAlert: Bool) {
     isSyncing = true
     uploadCanceling = false
@@ -517,7 +609,7 @@ final class SyncModel: ObservableObject {
     }
   }
 
-  private func startSync(showMenuBarAlert: Bool, reopenCodexOnSuccess: Bool) {
+  private func startSync(showMenuBarAlert: Bool, reopenCodexOnSuccess: Bool, reopenSourceOnSuccess: Bool = false) {
     isSyncing = true
     uploadCanceling = false
     state = .syncing
@@ -576,10 +668,12 @@ final class SyncModel: ObservableObject {
           : "Keep both browsers open and check the extensions")
       }
       self.updateEndpointRunningStatus()
-      if success && reopenCodexOnSuccess {
-        self.reopenCodexAfterSuccessfulSync(
+      if success && (reopenCodexOnSuccess || reopenSourceOnSuccess) {
+        self.reopenApplicationsAfterSuccessfulSync(
           partial: partial,
           syncSummary: self.secondaryStatus,
+          reopenCodex: reopenCodexOnSuccess,
+          reopenSource: reopenSourceOnSuccess,
           showMenuBarAlert: showMenuBarAlert
         )
       } else if showMenuBarAlert {
@@ -592,15 +686,44 @@ final class SyncModel: ObservableObject {
     }
   }
 
-  private func reopenCodexAfterSuccessfulSync(partial: Bool, syncSummary: String, showMenuBarAlert: Bool) {
+  private func reopenApplicationsAfterSuccessfulSync(
+    partial: Bool,
+    syncSummary: String,
+    reopenCodex: Bool,
+    reopenSource: Bool,
+    showMenuBarAlert: Bool
+  ) {
     let transferResult = syncSummary.replacingOccurrences(
       of: "Reopen Codex to use the updated sessions. ",
       with: ""
     )
+    var restartMessages: [String] = []
+    var sourceRestartFailed = false
+    if reopenSource {
+      if let sourceURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: selectedBrowser.bundleIdentifier),
+         NSWorkspace.shared.open(sourceURL) {
+        sourceBrowserRunning = true
+        restartMessages.append("\(selectedBrowser.name) reopened successfully.")
+      } else {
+        sourceRestartFailed = true
+        restartMessages.append("\(selectedBrowser.name) could not be reopened; open it manually.")
+      }
+    }
+    let completedRestartMessages = restartMessages
+    let didSourceRestartFail = sourceRestartFailed
+    guard reopenCodex else {
+      state = partial || didSourceRestartFail ? .warning : .success
+      primaryStatus = didSourceRestartFail ? "Sync complete, but the source did not reopen" : (partial ? "Codex sync completed with warnings" : "Full site-data sync complete")
+      secondaryStatus = ([transferResult] + completedRestartMessages).joined(separator: "\n\n")
+      if showMenuBarAlert {
+        postNativeAlert(title: primaryStatus, message: secondaryStatus, kind: state == .success ? .information : .warning)
+      }
+      return
+    }
     guard let codexURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.openai.codex") else {
       state = .warning
       primaryStatus = "Codex sessions updated, but Codex was not reopened"
-      secondaryStatus = "\(transferResult)\n\nCodex could not be found. Open it manually to use the updated sessions."
+      secondaryStatus = ([transferResult] + completedRestartMessages + ["Codex could not be found. Open it manually to use the updated sessions."]).joined(separator: "\n\n")
       if showMenuBarAlert {
         postNativeAlert(title: primaryStatus, message: secondaryStatus, kind: .warning)
       }
@@ -612,12 +735,12 @@ final class SyncModel: ObservableObject {
         if let error {
           self.state = .warning
           self.primaryStatus = "Codex sessions updated, but Codex was not reopened"
-          self.secondaryStatus = "\(transferResult)\n\nCodex could not be reopened: \(error.localizedDescription)"
+          self.secondaryStatus = ([transferResult] + completedRestartMessages + ["Codex could not be reopened: \(error.localizedDescription)"]).joined(separator: "\n\n")
         } else {
           self.codexRunning = true
-          self.state = partial ? .warning : .success
-          self.primaryStatus = partial ? "Codex sync completed with warnings" : "Codex sessions updated"
-          self.secondaryStatus = "\(transferResult)\n\nChatGPT Codex reopened successfully."
+          self.state = partial || didSourceRestartFail ? .warning : .success
+          self.primaryStatus = didSourceRestartFail ? "Sync complete, but the source did not reopen" : (partial ? "Codex sync completed with warnings" : "Codex sessions updated")
+          self.secondaryStatus = ([transferResult] + completedRestartMessages + ["ChatGPT Codex reopened successfully."]).joined(separator: "\n\n")
         }
         if showMenuBarAlert {
           self.postNativeAlert(
@@ -738,9 +861,11 @@ final class SyncModel: ObservableObject {
       "--target", selectedTargetID,
       "--cookies", cookiesEnabled ? "on" : "off",
       "--history", historyEnabled ? "on" : "off",
+      "--site-storage", siteStorageEnabled ? "on" : "off",
       "--menu-bar", menuBarEnabled ? "on" : "off",
       "--auto-check-updates", autoCheckUpdates ? "on" : "off",
       "--auto-restart-codex", autoRestartCodex ? "on" : "off",
+      "--auto-restart-both", autoRestartBoth ? "on" : "off",
       "--browserless-profile", browserlessProfileName,
       "--browserless-region", browserlessRegion,
       "--browserless-domains", browserlessOnlyDomains,
@@ -941,7 +1066,15 @@ final class SyncModel: ObservableObject {
       $0.bundleIdentifier == selectedBrowser.bundleIdentifier
     }
     guard !isSyncing else { return }
-    if selectedTargetID == "codex" && codexRunning && autoRestartCodex {
+    if selectedTargetID == "codex" && siteStorageEnabled && autoRestartBoth && (sourceBrowserRunning || codexRunning) {
+      state = .ready
+      primaryStatus = "Ready to sync and restart both apps"
+      secondaryStatus = "Manual sync will force quit \(selectedBrowser.name) and Codex, then reopen only the apps that were running"
+    } else if sourceSiteDataBlocked {
+      state = .warning
+      primaryStatus = "Quit \(selectedBrowser.name) before syncing"
+      secondaryStatus = "Full site data uses live LevelDB files. Close the source browser completely so they can be copied safely"
+    } else if selectedTargetID == "codex" && codexRunning && autoRestartCodex {
       if state == .ready || primaryStatus == "Quit Codex before syncing" {
         state = .ready
         primaryStatus = "Ready to sync and restart Codex"
@@ -1062,6 +1195,7 @@ private struct AppConfig: Decodable {
   struct Imports: Decodable {
     let cookies: Bool
     let history: Bool
+    let siteStorage: Bool?
   }
 
   struct UISettings: Decodable {
@@ -1069,6 +1203,7 @@ private struct AppConfig: Decodable {
     let openAtLogin: Bool?
     let autoCheckUpdates: Bool?
     let autoRestartCodex: Bool?
+    let autoRestartBoth: Bool?
   }
 
   struct BrowserlessSettings: Decodable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-cookie-bridge",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Local-first cookie and session transfer for macOS with optional Browserless upload",
   "type": "module",
   "bin": {
@@ -11,7 +11,7 @@
     "test:web-worker": "node --test web/worker/*.test.mjs",
     "check": "node --check bin/brave-codex-cookie-sync.js && node --check src/app-installer.js && node --check src/browserless.js && node --check src/browserless-preflight.js && node --check src/browserless-runner.js && node --check src/broker.js && node --check src/chromium-reader.js && node --check src/cli.js && node --check src/codex-direct-import.js && node --check src/config.js && node --check src/paths.js && node --check src/scheduler.js && node --check src/updater.js && node --check scripts/build-dmg.js && node --check extension-template/background.js && node --check web/server.js && node --check web/script.js",
     "release:check": "node scripts/check-release-version.js",
-    "build:app": "node bin/brave-codex-cookie-sync.js install-app --no-open",
+    "build:app": "node bin/brave-codex-cookie-sync.js install-app --no-open --replace-system-from-source",
     "build:dmg": "node scripts/build-dmg.js",
     "web": "node web/server.js",
     "web:deploy": "wrangler deploy --config web/wrangler.jsonc"

package/src/app-installer.js

@@ -2,11 +2,25 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
-import { appSupportDir, installedAppPath, projectRoot } from "./paths.js";
+import {
+  appSupportDir,
+  installedAppPath,
+  projectRoot,
+  systemInstalledAppPath,
+} from "./paths.js";
 
-export function installApp({ home = os.homedir(), open = true } = {}) {
+export function installApp({ home = os.homedir(), open = true, preserveSystemApp = true } = {}) {
   if (process.platform !== "darwin") throw new Error("The desktop app supports macOS only.");
 
+  const destination = installedAppPath(home);
+  const isSystemInstall = path.resolve(destination) === path.resolve(systemInstalledAppPath());
+  if (isSystemInstall && preserveSystemApp) {
+    console.log(`Preserving the signed installation at ${destination}`);
+    console.log("Use Check for Updates in the app to install signed releases.");
+    if (open) run("open", [destination]);
+    return destination;
+  }
+
   const packagePath = path.join(projectRoot(), "macos-app");
   run("swift", ["build", "-c", "release", "--package-path", packagePath]);
   const binPath = run("swift", [
@@ -32,7 +46,6 @@ export function installApp({ home = os.homedir(), open = true } = {}) {
 
   run("codesign", ["--force", "--deep", "--sign", "-", staging]);
 
-  const destination = installedAppPath(home);
   fs.mkdirSync(path.dirname(destination), { recursive: true, mode: 0o755 });
   fs.rmSync(destination, { recursive: true, force: true });
   fs.cpSync(staging, destination, { recursive: true, force: true });

package/src/chromium-reader.js

@@ -12,40 +12,57 @@ const BROWSERS = {
     root: ["BraveSoftware", "Brave-Browser"],
     safeStorageService: "Brave Safe Storage",
     safeStorageAccount: "Brave",
+    processPattern: /\/Brave Browser\.app\/Contents\/MacOS\/Brave Browser(?:\s|$)/,
   },
   chrome: {
     root: ["Google", "Chrome"],
     safeStorageService: "Chrome Safe Storage",
     safeStorageAccount: "Chrome",
+    processPattern: /\/Google Chrome\.app\/Contents\/MacOS\/Google Chrome(?:\s|$)/,
   },
   edge: {
     root: ["Microsoft Edge"],
     safeStorageService: "Microsoft Edge Safe Storage",
     safeStorageAccount: "Microsoft Edge",
+    processPattern: /\/Microsoft Edge\.app\/Contents\/MacOS\/Microsoft Edge(?:\s|$)/,
   },
   arc: {
     root: ["Arc", "User Data"],
     safeStorageService: "Arc Safe Storage",
     safeStorageAccount: "Arc",
+    processPattern: /\/Arc\.app\/Contents\/MacOS\/Arc(?:\s|$)/,
   },
   vivaldi: {
     root: ["Vivaldi"],
     safeStorageService: "Vivaldi Safe Storage",
     safeStorageAccount: "Vivaldi",
+    processPattern: /\/Vivaldi\.app\/Contents\/MacOS\/Vivaldi(?:\s|$)/,
   },
   opera: {
     root: ["com.operasoftware.Opera"],
     directProfile: true,
     safeStorageService: "Opera Safe Storage",
     safeStorageAccount: "Opera",
+    processPattern: /\/Opera\.app\/Contents\/MacOS\/Opera(?:\s|$)/,
   },
   comet: {
     root: ["Comet"],
     safeStorageService: "Comet Safe Storage",
     safeStorageAccount: "Comet",
+    processPattern: /\/Comet\.app\/Contents\/MacOS\/Comet(?:\s|$)/,
   },
 };
 
+export function isChromiumBrowserRunning({ browser, processList } = {}) {
+  const definition = BROWSERS[browser];
+  if (!definition) throw new Error(`Unsupported Chromium source: ${browser}`);
+  const output = processList ?? spawnSync("/bin/ps", ["-axo", "command="], {
+    encoding: "utf8",
+    maxBuffer: 16 * 1024 * 1024,
+  }).stdout;
+  return String(output).split("\n").some((command) => definition.processPattern.test(command.trim()));
+}
+
 export function readChromiumProfile({
   browser,
   imports = { cookies: true, history: false },
@@ -61,7 +78,7 @@ export function readChromiumProfile({
     throw new Error(`${browserDisplayName(browser)} profile not found at ${profilePath}`);
   }
 
-  const cookies = imports.cookies
+  const cookieResult = imports.cookies
     ? readCookies({
         databasePath: firstExisting([
           path.join(profilePath, "Network", "Cookies"),
@@ -69,12 +86,18 @@ export function readChromiumProfile({
         ]),
         password: password ?? readSafeStoragePassword(definition, browser),
       })
-    : [];
+    : { cookies: [], total: 0, skipped: 0 };
   const history = imports.history
     ? readHistory(path.join(profilePath, "History"))
     : [];
 
-  return { cookies, history, profileName, profilePath };
+  return {
+    cookies: cookieResult.cookies,
+    cookieStats: { total: cookieResult.total, imported: cookieResult.cookies.length, skipped: cookieResult.skipped },
+    history,
+    profileName,
+    profilePath,
+  };
 }
 
 export function decryptChromiumCookieValue({ domain, encryptedValue, password }) {
@@ -105,6 +128,7 @@ function readCookies({ databasePath, password }) {
       FROM cookies
     `).all();
     const cookies = [];
+    let skipped = 0;
     for (const row of rows) {
       try {
         const value = row.value || decryptChromiumCookieValue({
@@ -133,9 +157,10 @@ function readCookies({ databasePath, password }) {
         });
       } catch {
         // An individual malformed or obsolete cookie must not block the rest of the profile.
+        skipped += 1;
       }
     }
-    return cookies;
+    return { cookies, total: rows.length, skipped };
   } finally {
     database.close();
   }

package/src/cli.js

@@ -8,7 +8,7 @@ import {
   directImportToCodex,
   isCodexRunning,
 } from "./codex-direct-import.js";
-import { readChromiumProfile } from "./chromium-reader.js";
+import { isChromiumBrowserRunning, readChromiumProfile } from "./chromium-reader.js";
 import { uploadBrowserlessProfile } from "./browserless.js";
 import { inspectBrowserlessProfile } from "./browserless-preflight.js";
 import { installConfig, installRuntime, readConfig, updatePreferences } from "./config.js";
@@ -24,6 +24,7 @@ import {
   systemInstalledAppPath,
   userInstalledAppPath,
   APP_ID,
+  APP_BUNDLE_ID,
   SOURCE_BROWSERS,
   TARGET_BROWSERS,
 } from "./paths.js";
@@ -43,9 +44,9 @@ Local cookie and session transfer between Chromium browsers and into ChatGPT Cod
 
 Commands:
   setup [--hour 9] [--minute 0] [--no-schedule]
-  install-app [--no-open]
+  install-app [--no-open] [--replace-system-from-source]
   bootstrap-bundled --app-path /Applications/Browser Cookie Bridge.app
-  preferences --source brave --target codex --cookies on --history off --menu-bar on --auto-check-updates on --auto-restart-codex off
+  preferences --source brave --target codex --cookies on --history off --site-storage off --menu-bar on --auto-check-updates on --auto-restart-codex off --auto-restart-both off
   sync [--timeout 300] [--allow-cloud-upload]
   browserless-preflight
   doctor
@@ -123,18 +124,20 @@ function preferences(args) {
   const config = updatePreferences({
     cookies: booleanFlag(args, "--cookies", existing.imports?.cookies !== false),
     history: booleanFlag(args, "--history", existing.imports?.history === true),
+    siteStorage: booleanFlag(args, "--site-storage", existing.imports?.siteStorage === true),
     sourceBrowser: stringFlag(args, "--source", existing.sourceBrowser || "brave"),
     targetBrowser: stringFlag(args, "--target", existing.targetBrowser || "codex"),
     menuBar: booleanFlag(args, "--menu-bar", existing.ui?.menuBar === true),
     openAtLogin: booleanFlag(args, "--open-at-login", existing.ui?.openAtLogin !== false),
     autoCheckUpdates: booleanFlag(args, "--auto-check-updates", existing.ui?.autoCheckUpdates !== false),
     autoRestartCodex: booleanFlag(args, "--auto-restart-codex", existing.ui?.autoRestartCodex === true),
+    autoRestartBoth: booleanFlag(args, "--auto-restart-both", existing.ui?.autoRestartBoth === true),
     browserlessProfileName: stringFlag(args, "--browserless-profile", existing.browserless?.profileName || "browser-cookie-bridge"),
     browserlessRegion: stringFlag(args, "--browserless-region", existing.browserless?.region || "sfo"),
     browserlessOnlyDomains: optionalStringFlag(args, "--browserless-domains", (existing.browserless?.onlyDomains || []).join(",")),
   });
   console.log(
-    `Saved: source=${config.sourceBrowser}, target=${config.targetBrowser}, cookies=${config.imports.cookies ? "on" : "off"}, history=${config.imports.history ? "on" : "off"}, menu-bar=${config.ui.menuBar ? "on" : "off"}, open-at-login=${config.ui.openAtLogin ? "on" : "off"}, auto-check-updates=${config.ui.autoCheckUpdates ? "on" : "off"}, auto-restart-codex=${config.ui.autoRestartCodex ? "on" : "off"}`,
+    `Saved: source=${config.sourceBrowser}, target=${config.targetBrowser}, cookies=${config.imports.cookies ? "on" : "off"}, history=${config.imports.history ? "on" : "off"}, site-storage=${config.imports.siteStorage ? "on" : "off"}, menu-bar=${config.ui.menuBar ? "on" : "off"}, open-at-login=${config.ui.openAtLogin ? "on" : "off"}, auto-check-updates=${config.ui.autoCheckUpdates ? "on" : "off"}, auto-restart-codex=${config.ui.autoRestartCodex ? "on" : "off"}, auto-restart-both=${config.ui.autoRestartBoth ? "on" : "off"}`,
   );
 }
 
@@ -147,8 +150,11 @@ function installDesktopApp(args) {
     hour: existing?.schedule?.hour ?? 9,
     minute: existing?.schedule?.minute ?? 0,
   });
-  console.log("Building the native macOS app…");
-  const destination = installApp({ open: !args.includes("--no-open") });
+  console.log("Preparing the native macOS app…");
+  const destination = installApp({
+    open: !args.includes("--no-open"),
+    preserveSystemApp: !args.includes("--replace-system-from-source"),
+  });
   if (config.ui.openAtLogin) {
     installAppLogin({ appPath: destination, bootstrapNow: false });
   } else {
@@ -214,7 +220,7 @@ function archiveDuplicateUserApp(currentAppPath) {
   if (!fs.existsSync(duplicate)) return;
   const infoPath = path.join(duplicate, "Contents", "Info.plist");
   const info = fs.existsSync(infoPath) ? fs.readFileSync(infoPath, "utf8") : "";
-  if (!info.includes(`<string>${APP_ID}</string>`)) return;
+  if (!info.includes(`<string>${APP_BUNDLE_ID}</string>`)) return;
 
   const trash = path.join(os.homedir(), ".Trash");
   fs.mkdirSync(trash, { recursive: true, mode: 0o700 });
@@ -302,14 +308,21 @@ async function sync(args, { signal } = {}) {
   }
   if (isCodexTarget) {
     if (isCodexRunning()) throw new Error(CODEX_RUNNING_ERROR);
+    const siteStorage = config.imports?.siteStorage === true;
+    if (siteStorage && isChromiumBrowserRunning({ browser: source })) {
+      throw new Error(`Quit ${source} completely before importing full site data into Codex.`);
+    }
     const payload = readChromiumProfile({
       browser: config.sourceBrowser || "brave",
       imports: config.imports || { cookies: true, history: false },
     });
-    console.log(`Read ${payload.cookies.length} cookies and ${payload.history.length} history URLs from ${config.sourceBrowser || "brave"}.`);
+    console.log(`Read ${payload.cookies.length} of ${payload.cookieStats.total} cookies (${payload.cookieStats.skipped} unavailable) and ${payload.history.length} history URLs from ${config.sourceBrowser || "brave"}.`);
     const result = directImportToCodex({
       cookies: payload.cookies,
       history: payload.history,
+      sourceProfilePath: payload.profilePath,
+      siteStorage,
+      sourceCookieSkipped: payload.cookieStats.skipped,
       codexRunning: false,
     });
     console.log(directCodexSummary(result));
@@ -359,10 +372,15 @@ export function directCodexSummary(result) {
   const imported = result.imported + result.historyImported;
   const skipped = result.skipped + result.historySkipped;
   const failures = result.failed + result.historyFailed;
-  if (failures > 0) {
-    return `Direct Codex sync completed with warnings: ${imported} imported, ${skipped} skipped, ${failures} failed. Backup: ${result.backupPath}`;
+  const unavailable = result.sourceCookieSkipped || 0;
+  const siteStorage = result.siteStorageImported > 0
+    ? ` Full site data: ${result.siteStorageImported} storage area${result.siteStorageImported === 1 ? "" : "s"} replaced from the source profile.`
+    : "";
+  if (failures > 0 || unavailable > 0) {
+    const sourceNote = unavailable > 0 ? ` ${unavailable} source cookie${unavailable === 1 ? " was" : "s were"} unreadable or unsupported.` : "";
+    return `Direct Codex sync completed with warnings: ${imported} imported, ${skipped} skipped, ${failures} failed.${sourceNote}${siteStorage} Backup: ${result.backupPath}`;
   }
-  return `Direct Codex sync complete: ${imported} imported and ${skipped} skipped. Reopen Codex to use the updated sessions. Backup: ${result.backupPath}`;
+  return `Direct Codex sync complete: ${imported} imported and ${skipped} skipped.${siteStorage} Reopen Codex to use the updated sessions. Backup: ${result.backupPath}`;
 }
 
 export function transferSummary(result) {

package/src/codex-direct-import.js

@@ -8,6 +8,16 @@ import { appSupportDir, codexCookiePaths } from "./paths.js";
 const CHROMIUM_EPOCH_OFFSET_SECONDS = 11_644_473_600;
 const CODEX_RUNNING_ERROR = "ChatGPT Codex is open. Quit it completely, then click Sync now again.";
 const MAX_BACKUPS = 14;
+const SITE_STORAGE_DIRECTORIES = [
+  "Local Storage",
+  "IndexedDB",
+  "Session Storage",
+  "Service Worker",
+  "File System",
+  "WebStorage",
+  "shared_proto_db",
+  "Shared Dictionary",
+];
 
 export function isCodexRunning({ processList } = {}) {
   const output = processList ?? spawnSync("/bin/ps", ["-axo", "command="], {
@@ -22,6 +32,9 @@ export function isCodexRunning({ processList } = {}) {
 export function directImportToCodex({
   cookies,
   history = [],
+  sourceProfilePath,
+  siteStorage = false,
+  sourceCookieSkipped = 0,
   home = os.homedir(),
   codexRunning = isCodexRunning(),
   now = new Date(),
@@ -36,6 +49,7 @@ export function directImportToCodex({
     throw new Error("Codex browser storage was not found. Open the Codex browser once, quit Codex, then try again.");
   }
   const historyPath = path.join(path.dirname(cookiePath), "History");
+  const codexProfilePath = codexProfileRoot(cookiePath);
   const backupRoot = path.join(appSupportDir(home), "backups", "codex");
   const backupPath = path.join(backupRoot, backupDirectoryName(now));
   fs.mkdirSync(backupPath, { recursive: true, mode: 0o700 });
@@ -76,6 +90,20 @@ export function directImportToCodex({
     fs.chmodSync(historyWorking, 0o600);
   }
 
+  let siteStoragePlan = [];
+  if (siteStorage) {
+    try {
+      if (!sourceProfilePath || !fs.existsSync(sourceProfilePath)) {
+        throw new Error("The selected source profile was not found for full site-data import.");
+      }
+      siteStoragePlan = prepareSiteStorageTransfer({ sourceProfilePath, codexProfilePath, backupPath });
+    } catch (error) {
+      fs.rmSync(cookieWorking, { force: true });
+      if (historyWorking) fs.rmSync(historyWorking, { force: true });
+      throw error;
+    }
+  }
+
   let cookieResult;
   let historyResult = { imported: 0, skipped: 0, failed: 0 };
   try {
@@ -87,13 +115,16 @@ export function directImportToCodex({
       replaceDatabase(historyWorking, historyPath);
       historyResult.replaced = true;
     }
+    commitSiteStorageTransfer(siteStoragePlan);
   } catch (error) {
     restoreDatabase(cookieBackup, cookiePath);
     if (historyBackup) restoreDatabase(historyBackup, historyPath);
+    restoreSiteStorageTransfer(siteStoragePlan);
     throw new Error(`Codex data was restored from backup after the sync failed: ${error.message}`);
   } finally {
     fs.rmSync(cookieWorking, { force: true });
     if (historyWorking) fs.rmSync(historyWorking, { force: true });
+    cleanupSiteStorageTransfer(siteStoragePlan);
   }
 
   pruneBackups(backupRoot, MAX_BACKUPS);
@@ -107,9 +138,78 @@ export function directImportToCodex({
     backupPath,
     targetPath: cookiePath,
     directCodexImport: true,
+    siteStorageImported: siteStoragePlan.filter((item) => item.committed).length,
+    siteStorageNames: siteStoragePlan.filter((item) => item.committed).map((item) => item.name),
+    sourceCookieSkipped: Number.isInteger(sourceCookieSkipped) && sourceCookieSkipped > 0 ? sourceCookieSkipped : 0,
   };
 }
 
+function codexProfileRoot(cookiePath) {
+  const parent = path.dirname(cookiePath);
+  return path.basename(parent) === "Network" ? path.dirname(parent) : parent;
+}
+
+function prepareSiteStorageTransfer({ sourceProfilePath, codexProfilePath, backupPath }) {
+  const plan = [];
+  try {
+    fs.mkdirSync(codexProfilePath, { recursive: true, mode: 0o700 });
+    for (const name of SITE_STORAGE_DIRECTORIES) {
+      const source = path.join(sourceProfilePath, name);
+      if (!fs.existsSync(source)) continue;
+      const destination = path.join(codexProfilePath, name);
+      const backup = path.join(backupPath, "Site Storage", name);
+      const stage = `${destination}.browser-cookie-bridge-${process.pid}-${Date.now()}.stage`;
+      const existed = fs.existsSync(destination);
+      const item = { name, destination, backup, stage, existed, touched: false, committed: false };
+      plan.push(item);
+      if (existed) copyStorageTree(destination, backup);
+      copyStorageTree(source, stage);
+    }
+    if (plan.length === 0) {
+      throw new Error("No compatible Local Storage, IndexedDB, session, or service-worker data was found in the source profile.");
+    }
+    return plan;
+  } catch (error) {
+    cleanupSiteStorageTransfer(plan);
+    throw error;
+  }
+}
+
+function commitSiteStorageTransfer(plan) {
+  for (const item of plan) {
+    item.touched = true;
+    fs.rmSync(item.destination, { recursive: true, force: true });
+    fs.renameSync(item.stage, item.destination);
+    item.committed = true;
+  }
+}
+
+function restoreSiteStorageTransfer(plan) {
+  for (const item of plan) {
+    if (!item.touched) continue;
+    fs.rmSync(item.destination, { recursive: true, force: true });
+    if (item.existed && fs.existsSync(item.backup)) copyStorageTree(item.backup, item.destination);
+    item.touched = false;
+    item.committed = false;
+  }
+}
+
+function cleanupSiteStorageTransfer(plan) {
+  for (const item of plan) fs.rmSync(item.stage, { recursive: true, force: true });
+}
+
+function copyStorageTree(source, destination) {
+  fs.mkdirSync(path.dirname(destination), { recursive: true, mode: 0o700 });
+  fs.cpSync(source, destination, {
+    recursive: true,
+    force: true,
+    preserveTimestamps: true,
+    filter(candidate) {
+      try { return !fs.lstatSync(candidate).isSymbolicLink(); } catch { return false; }
+    },
+  });
+}
+
 function mergeCookies(databasePath, cookies, now) {
   const database = new DatabaseSync(databasePath);
   let imported = 0;

package/src/config.js

@@ -45,12 +45,14 @@ export function installConfig({ home, hour = 9, minute = 0, nodePath = process.e
       cookies: existing.imports?.cookies !== false,
       passwords: false,
       history: existing.imports?.history === true,
+      siteStorage: existing.imports?.siteStorage === true,
     },
     ui: {
       menuBar: existing.ui?.menuBar !== false,
       openAtLogin: existing.ui?.openAtLogin !== false,
       autoCheckUpdates: existing.ui?.autoCheckUpdates !== false,
       autoRestartCodex: existing.ui?.autoRestartCodex === true,
+      autoRestartBoth: existing.ui?.autoRestartBoth === true,
     },
     browserless: {
       profileName: cleanProfileName(existing.browserless?.profileName) || "browser-cookie-bridge",
@@ -73,12 +75,14 @@ export function updatePreferences({
   home,
   cookies,
   history,
+  siteStorage,
   sourceBrowser,
   targetBrowser,
   menuBar,
   openAtLogin,
   autoCheckUpdates,
   autoRestartCodex,
+  autoRestartBoth,
   browserlessProfileName,
   browserlessRegion,
   browserlessOnlyDomains,
@@ -95,12 +99,18 @@ export function updatePreferences({
   }
   config.sourceBrowser = sourceBrowser;
   config.targetBrowser = targetBrowser;
-  config.imports = { cookies: Boolean(cookies), passwords: false, history: Boolean(history) };
+  config.imports = {
+    cookies: Boolean(cookies),
+    passwords: false,
+    history: Boolean(history),
+    siteStorage: Boolean(siteStorage),
+  };
   config.ui = {
     menuBar: Boolean(menuBar),
     openAtLogin: Boolean(openAtLogin),
     autoCheckUpdates: Boolean(autoCheckUpdates),
     autoRestartCodex: Boolean(autoRestartCodex),
+    autoRestartBoth: Boolean(autoRestartBoth),
   };
   const region = browserlessRegion ?? config.browserless?.region ?? "sfo";
   if (!["sfo", "lon", "ams"].includes(region)) throw new Error("Browserless region must be sfo, lon, or ams");

package/src/paths.js

@@ -4,6 +4,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 export const APP_ID = "com.apoorvdarshan.brave-codex-cookie-sync";
+export const APP_BUNDLE_ID = "com.apoorvdarshan.browser-cookie-bridge";
 export const LOGIN_SYNC_APP_ID = `${APP_ID}.login-sync`;
 export const APP_LOGIN_APP_ID = `${APP_ID}.app-login`;
 export const DEFAULT_PORT = 43128;
@@ -48,10 +49,22 @@ export function systemInstalledAppPath() {
   return path.join("/Applications", "Browser Cookie Bridge.app");
 }
 
+export function isAppBundleWithIdentifier(appPath, identifier = APP_BUNDLE_ID) {
+  const infoPath = path.join(appPath, "Contents", "Info.plist");
+  if (!fs.existsSync(infoPath)) return false;
+  try {
+    const info = fs.readFileSync(infoPath, "utf8");
+    const escaped = identifier.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return new RegExp(`<key>CFBundleIdentifier</key>\\s*<string>${escaped}</string>`).test(info);
+  } catch {
+    return false;
+  }
+}
+
 export function installedAppPath(home = os.homedir()) {
   const systemApp = systemInstalledAppPath();
   const isCurrentUser = path.resolve(home) === path.resolve(os.homedir());
-  return isCurrentUser && fs.existsSync(systemApp) ? systemApp : userInstalledAppPath(home);
+  return isCurrentUser && isAppBundleWithIdentifier(systemApp) ? systemApp : userInstalledAppPath(home);
 }
 
 export function braveCookiePaths(home = os.homedir()) {