browser-cookie-bridge 1.5.5 → 1.5.6

package/extension-template/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Browser Cookie Bridge",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Transfers selected browser data locally between supported browsers and embedded app browsers.",
   "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.5.5</string>
-  <key>CFBundleVersion</key><string>42</string>
+  <key>CFBundleShortVersionString</key><string>1.5.6</string>
+  <key>CFBundleVersion</key><string>43</string>
   <key>LSMinimumSystemVersion</key><string>13.5</string>
   <key>NSHighResolutionCapable</key><true/>
 </dict>

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

@@ -34,6 +34,7 @@ struct BraveCodexSyncApp: App {
 final class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
   weak var model: SyncModel?
   private weak var mainWindow: NSWindow?
+  private var grokBotResultPanel: NSPanel?
   private var statusItem: NSStatusItem?
   private var syncMenuItem: NSMenuItem?
   private var updateMenuItem: NSMenuItem?
@@ -63,6 +64,18 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
       name: .syncStateChanged,
       object: nil
     )
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(showMainWindowNotification(_:)),
+      name: .showMainWindow,
+      object: nil
+    )
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(presentGrokBotResultNotification(_:)),
+      name: .presentGrokBotResult,
+      object: nil
+    )
   }
 
   func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { false }
@@ -186,8 +199,56 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     }
   }
 
+  @objc private func showMainWindowNotification(_ notification: Notification) {
+    showMainWindow()
+  }
+
+  @objc private func presentGrokBotResultNotification(_ notification: Notification) {
+    guard let model else { return }
+    showMainWindow()
+    grokBotResultPanel?.close()
+    grokBotResultPanel = nil
+    DispatchQueue.main.async { [weak self] in
+      guard let self, let model = self.model else { return }
+      self.presentGrokBotResultPanel(model: model)
+    }
+  }
+
+  private func presentGrokBotResultPanel(model: SyncModel) {
+    let panel = NSPanel(
+      contentRect: NSRect(x: 0, y: 0, width: 520, height: 520),
+      styleMask: [.titled, .closable, .fullSizeContentView],
+      backing: .buffered,
+      defer: false
+    )
+    panel.title = "Grok Bot transfer ready"
+    panel.titlebarAppearsTransparent = false
+    panel.isFloatingPanel = true
+    panel.level = .modalPanel
+    panel.collectionBehavior = [.moveToActiveSpace, .fullScreenAuxiliary]
+    panel.isReleasedWhenClosed = false
+    panel.center()
+    let dismissPanel = { [weak self] in
+      self?.grokBotResultPanel?.close()
+      self?.grokBotResultPanel = nil
+    }
+    panel.contentView = NSHostingView(
+      rootView: GrokBotResultSheet(onDone: dismissPanel).environmentObject(model)
+    )
+    panel.makeKeyAndOrderFront(nil)
+    NSApp.activate(ignoringOtherApps: true)
+    grokBotResultPanel = panel
+  }
+
   private func showMainWindow() {
     NSApp.setActivationPolicy(.regular)
+    if mainWindow == nil || mainWindow?.isVisible == false {
+      let candidate = NSApp.windows.first(where: { $0.canBecomeMain && $0.title == "Browser Cookie Bridge" })
+        ?? NSApp.windows.first(where: { $0.canBecomeMain })
+        ?? NSApp.windows.first
+      mainWindow = candidate
+      mainWindow?.delegate = self
+    }
     mainWindow?.makeKeyAndOrderFront(nil)
     NSApp.activate(ignoringOtherApps: true)
   }
@@ -241,9 +302,6 @@ struct ContentView: View {
     .sheet(isPresented: $model.showingBrowserlessSetup) {
       BrowserlessSetupSheet().environmentObject(model)
     }
-    .sheet(isPresented: $model.showingGrokBotResult) {
-      GrokBotResultSheet().environmentObject(model)
-    }
   }
 
   private var header: some View {
@@ -1170,6 +1228,7 @@ enum Theme {
 struct GrokBotResultSheet: View {
   @EnvironmentObject private var model: SyncModel
   @Environment(\.dismiss) private var dismiss
+  var onDone: (() -> Void)?
 
   var body: some View {
     VStack(alignment: .leading, spacing: 16) {
@@ -1228,7 +1287,10 @@ struct GrokBotResultSheet: View {
           NSPasteboard.general.setString(model.grokBotPrompt, forType: .string)
         }
         Spacer()
-        Button("Done") { dismiss() }
+        Button("Done") {
+          onDone?()
+          dismiss()
+        }
           .keyboardShortcut(.defaultAction)
       }
       .controlSize(.regular)

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

@@ -8,6 +8,8 @@ extension Notification.Name {
   static let nativeAlert = Notification.Name("BraveCodexSync.nativeAlert")
   static let updateStateChanged = Notification.Name("BraveCodexSync.updateStateChanged")
   static let syncStateChanged = Notification.Name("BraveCodexSync.syncStateChanged")
+  static let showMainWindow = Notification.Name("BraveCodexSync.showMainWindow")
+  static let presentGrokBotResult = Notification.Name("BraveCodexSync.presentGrokBotResult")
 }
 
 struct NativeAlert {
@@ -99,7 +101,6 @@ final class SyncModel: ObservableObject {
   @Published var browserlessOnlyDomains = ""
   @Published var grokBotOnlyDomains = ""
   @Published var showingBrowserlessSetup = false
-  @Published var showingGrokBotResult = false
   @Published var grokBotPrompt = ""
   @Published var grokBotOutputPath = ""
   @Published var browserlessAssessment: BrowserlessProfileAssessment?
@@ -118,6 +119,16 @@ final class SyncModel: ObservableObject {
   private var appLoginAgent: URL { home.appending(path: "Library/LaunchAgents/com.apoorvdarshan.brave-codex-cookie-sync.app-login.plist") }
   private var endpointStatusTimer: Timer?
   private var updateTimer: Timer?
+  private var activeGrokBotOutputPath: String?
+
+  private static let grokBotFallbackPrompt = """
+On your Grok Bot cloud computer only — do not access my local Mac and do not print cookie values.
+
+1. Save the attached GrokBot-Import.bcbx to the cloud computer.
+2. Unzip it: unzip -o GrokBot-Import.bcbx -d bcb-import && cd bcb-import
+3. Run: node import.mjs
+4. Report only how many cookies were imported per domain, then delete the bcb-import folder and any copies of the bundle.
+"""
   private var didCheckAfterLaunch = false
   private var didConsumeUpdateResult = false
   private var assessedBrowserID: String?
@@ -725,7 +736,10 @@ final class SyncModel: ObservableObject {
     var environment: [String: String] = [:]
     var arguments = ["sync", "--timeout", isBrowserlessTarget ? "900" : "300"]
     if let grokBotOutputPath {
+      activeGrokBotOutputPath = grokBotOutputPath
       arguments.append(contentsOf: ["--output", grokBotOutputPath])
+    } else {
+      activeGrokBotOutputPath = nil
     }
     if isBrowserlessTarget {
       guard let token = BrowserlessCredentialStore.read() else {
@@ -760,12 +774,14 @@ final class SyncModel: ObservableObject {
         self.state = partial ? .warning : .success
         if self.isGrokBotTarget {
           let parsed = self.parseGrokBotResult(from: output)
-          let outputPath = parsed?.outputPath ?? grokBotOutputPath ?? self.grokBotOutputPath
-          self.grokBotOutputPath = outputPath
-          self.grokBotPrompt = parsed?.prompt ?? Self.grokBotFallbackPrompt
+          let outputPath = parsed?.outputPath ?? self.activeGrokBotOutputPath ?? grokBotOutputPath ?? self.grokBotOutputPath
+          let prompt = parsed?.prompt ?? Self.grokBotFallbackPrompt
+          if !outputPath.isEmpty {
+            self.presentGrokBotResultSheet(prompt: prompt, outputPath: outputPath)
+          }
+          self.activeGrokBotOutputPath = nil
           self.primaryStatus = partial ? "Grok Bot transfer created with warnings" : "Grok Bot transfer file ready"
           self.secondaryStatus = self.lastMeaningfulLine(output) ?? "Attach the .bcbx file to any Grok Bot and paste the prompt"
-          self.presentGrokBotResultSheet()
         } else {
           self.primaryStatus = self.isBrowserlessTarget
             ? (partial ? "Browserless profile uploaded with omissions" : "Browserless profile uploaded")
@@ -1171,21 +1187,6 @@ final class SyncModel: ObservableObject {
     isDirectTarget || selectedTargetID == "browserless" || isGrokBotTarget ? [] : [selectedSourceID, selectedTargetID]
   }
 
-  private static let grokBotFallbackPrompt = """
-On your Grok Bot cloud computer only — do not access my local Mac and do not print cookie values.
-
-1. Save the attached GrokBot-Import.bcbx to the cloud computer.
-2. Unzip it: unzip -o GrokBot-Import.bcbx -d bcb-import && cd bcb-import
-3. Run: node import.mjs
-4. Report only how many cookies were imported per domain, then delete the bcb-import folder and any copies of the bundle.
-"""
-
-  private func presentGrokBotResultSheet() {
-    DispatchQueue.main.async { [weak self] in
-      self?.showingGrokBotResult = true
-    }
-  }
-
   private struct GrokBotResultPayload: Decodable {
     let outputPath: String
     let prompt: String
@@ -1200,6 +1201,15 @@ On your Grok Bot cloud computer only — do not access my local Mac and do not p
     return try? JSONDecoder().decode(GrokBotResultPayload.self, from: data)
   }
 
+  private func presentGrokBotResultSheet(prompt: String, outputPath: String) {
+    grokBotPrompt = prompt
+    grokBotOutputPath = outputPath
+    NSPasteboard.general.clearContents()
+    NSPasteboard.general.setString(prompt, forType: .string)
+    NotificationCenter.default.post(name: .showMainWindow, object: nil)
+    NotificationCenter.default.post(name: .presentGrokBotResult, object: nil)
+  }
+
   private func updateEndpointRunningStatus() {
     let wasDirectTargetRunning = directTargetRunning
     codexRunning = NSWorkspace.shared.runningApplications.contains {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-cookie-bridge",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Local-first cookie and session transfer for macOS with optional Browserless upload",
   "type": "module",
   "bin": {