Skip to content

feat(opencode): support multiple browsers for cookie import #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
houzixiashanxiedaima wants to merge 2 commits into
base: main
Choose a base branch
from
+23 −15
Open

feat(opencode): support multiple browsers for cookie import #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d455a40
feat(opencode): support multiple browsers for cookie import
Feb 14, 2026
7ad2b70
fix(opencode): exclude failed browser on invalid credentials retry
Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Sources/CodexBarCore/Providers/OpenCode/OpenCodeCookieImporter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public enum OpenCodeCookieImporter {

public static func importSession(
browserDetection: BrowserDetection,
preferredBrowsers: [Browser] = [.chrome],
preferredBrowsers: [Browser]? = nil,
excludeBrowsers: [Browser] = [],
logger: ((String) -> Void)? = nil) throws -> SessionInfo
{
let log: (String) -> Void = { msg in logger?("[opencode-cookie] \(msg)") }
let installedBrowsers = preferredBrowsers.isEmpty
? opencodeCookieImportOrder.cookieImportCandidates(using: browserDetection)
: preferredBrowsers.cookieImportCandidates(using: browserDetection)
let browsersToTry = (preferredBrowsers ?? opencodeCookieImportOrder).filter { !excludeBrowsers.contains($0) }
let installedBrowsers = browsersToTry.cookieImportCandidates(using: browserDetection)

for browserSource in installedBrowsers {
do {
Expand Down Expand Up @@ -66,13 +66,15 @@ public enum OpenCodeCookieImporter {

public static func hasSession(
browserDetection: BrowserDetection,
preferredBrowsers: [Browser] = [.chrome],
preferredBrowsers: [Browser]? = nil,
excludeBrowsers: [Browser] = [],
logger: ((String) -> Void)? = nil) -> Bool
{
do {
_ = try self.importSession(
browserDetection: browserDetection,
preferredBrowsers: preferredBrowsers,
excludeBrowsers: excludeBrowsers,
logger: logger)
return true
} catch {
Expand Down
26 changes: 16 additions & 10 deletions Sources/CodexBarCore/Providers/OpenCode/OpenCodeProviderDescriptor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import CodexBarMacroSupport
import Foundation

#if os(macOS)
import SweetCookieKit
#endif

@ProviderDescriptorRegistration
@ProviderDescriptorDefinition
public enum OpenCodeProviderDescriptor {
Expand Down Expand Up @@ -54,25 +58,25 @@ struct OpenCodeUsageFetchStrategy: ProviderFetchStrategy {
?? context.env["CODEXBAR_OPENCODE_WORKSPACE_ID"]
let cookieSource = context.settings?.opencode?.cookieSource ?? .auto
do {
let cookieHeader = try Self.resolveCookieHeader(context: context, allowCached: true)
let cookieHeader = try Self.resolveCookieHeader(context: context, allowCached: true, excludeBrowsers: [])
let snapshot = try await OpenCodeUsageFetcher.fetchUsage(
cookieHeader: cookieHeader,
timeout: context.webTimeout,
workspaceIDOverride: workspaceOverride)
return self.makeResult(
usage: snapshot.toUsageSnapshot(),
sourceLabel: "web")
return self.makeResult(usage: snapshot.toUsageSnapshot(), sourceLabel: "web")
} catch OpenCodeUsageError.invalidCredentials where cookieSource != .manual {
#if os(macOS)
guard let cached = CookieHeaderCache.load(provider: .opencode) else {
throw OpenCodeUsageError.invalidCredentials
}
let failedBrowser = cached.sourceLabel
CookieHeaderCache.clear(provider: .opencode)
let cookieHeader = try Self.resolveCookieHeader(context: context, allowCached: false)
let cookieHeader = try Self.resolveCookieHeader(context: context, allowCached: false, excludeBrowsers: [failedBrowser])
let snapshot = try await OpenCodeUsageFetcher.fetchUsage(
cookieHeader: cookieHeader,
timeout: context.webTimeout,
workspaceIDOverride: workspaceOverride)
return self.makeResult(
usage: snapshot.toUsageSnapshot(),
sourceLabel: "web")
return self.makeResult(usage: snapshot.toUsageSnapshot(), sourceLabel: "web")
#else
throw OpenCodeUsageError.invalidCredentials
#endif
Expand All @@ -83,7 +87,7 @@ struct OpenCodeUsageFetchStrategy: ProviderFetchStrategy {
false
}

private static func resolveCookieHeader(context: ProviderFetchContext, allowCached: Bool) throws -> String {
private static func resolveCookieHeader(context: ProviderFetchContext, allowCached: Bool, excludeBrowsers: [String]) throws -> String {
if let settings = context.settings?.opencode, settings.cookieSource == .manual {
if let header = CookieHeaderNormalizer.normalize(settings.manualCookieHeader) {
let pairs = CookieHeaderNormalizer.pairs(from: header)
Expand All @@ -104,7 +108,9 @@ struct OpenCodeUsageFetchStrategy: ProviderFetchStrategy {
{
return cached.cookieHeader
}
let session = try OpenCodeCookieImporter.importSession(browserDetection: context.browserDetection)
let session = try OpenCodeCookieImporter.importSession(
browserDetection: context.browserDetection,
excludeBrowsers: excludeBrowsers.compactMap { Browser(rawValue: $0) })
CookieHeaderCache.store(
provider: .opencode,
cookieHeader: session.cookieHeader,
Expand Down