Skip to content

Fix Codex same-email multi-workspace account correctness #629

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

Closed
monterrr wants to merge 2 commits into from
Closed

Fix Codex same-email multi-workspace account correctness #629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c41d16
Fix Codex same-email workspace correctness
monterrr Mar 31, 2026
91af1f1
Prefer live Codex workspace labels
monterrr Mar 31, 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
102 changes: 80 additions & 22 deletions Sources/CodexBar/CodexAccountReconciliation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ import Foundation
struct CodexVisibleAccount: Equatable, Sendable, Identifiable {
let id: String
let email: String
let workspaceLabel: String?
let storedAccountID: UUID?
let selectionSource: CodexActiveSource
let isActive: Bool
let isLive: Bool
let canReauthenticate: Bool
let canRemove: Bool

var displayName: String {
guard let workspaceLabel, !workspaceLabel.isEmpty else { return self.email }
return "\(self.email) — \(workspaceLabel)"
}
}

struct CodexVisibleAccountProjection: Equatable, Sendable {
Expand Down Expand Up @@ -40,7 +46,7 @@ enum CodexActiveSourceResolver {
.liveSystem
case let .managedAccount(id):
if let activeStoredAccount = snapshot.activeStoredAccount {
self.matchesLiveSystemAccountEmail(
self.matchesLiveSystemAccountIdentity(
storedAccount: activeStoredAccount,
liveSystemAccount: snapshot.liveSystemAccount) ? .liveSystem : .managedAccount(id: id)
} else {
Expand All @@ -53,16 +59,18 @@ enum CodexActiveSourceResolver {
resolvedSource: resolvedSource)
}

private static func matchesLiveSystemAccountEmail(
private static func matchesLiveSystemAccountIdentity(
storedAccount: ManagedCodexAccount,
liveSystemAccount: ObservedSystemCodexAccount?) -> Bool
{
guard let liveSystemAccount else { return false }
return Self.normalizeEmail(storedAccount.email) == Self.normalizeEmail(liveSystemAccount.email)
}

private static func normalizeEmail(_ email: String) -> String {
email.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
return ManagedCodexAccount.identityKey(
email: storedAccount.email,
workspaceAccountID: storedAccount.workspaceAccountID,
workspaceLabel: storedAccount.workspaceLabel) == ManagedCodexAccount.identityKey(
email: liveSystemAccount.email,
workspaceAccountID: liveSystemAccount.workspaceAccountID,
workspaceLabel: liveSystemAccount.workspaceLabel)
}
}

Expand Down Expand Up @@ -114,7 +122,10 @@ struct DefaultCodexAccountReconciler {
nil
}
let matchingStoredAccountForLiveSystemAccount = liveSystemAccount.flatMap {
accounts.account(email: $0.email)
accounts.account(
email: $0.email,
workspaceAccountID: $0.workspaceAccountID,
workspaceLabel: $0.workspaceLabel)
}

return CodexAccountReconciliationSnapshot(
Expand Down Expand Up @@ -150,6 +161,8 @@ struct DefaultCodexAccountReconciler {
}
return ObservedSystemCodexAccount(
email: normalizedEmail,
workspaceLabel: ManagedCodexAccount.normalizeWorkspaceLabel(account.workspaceLabel),
workspaceAccountID: ManagedCodexAccount.normalizeWorkspaceAccountID(account.workspaceAccountID),
codexHomePath: account.codexHomePath,
observedAt: account.observedAt)
} catch {
Expand All @@ -165,13 +178,20 @@ struct DefaultCodexAccountReconciler {
extension CodexVisibleAccountProjection {
static func make(from snapshot: CodexAccountReconciliationSnapshot) -> CodexVisibleAccountProjection {
let resolvedActiveSource = CodexActiveSourceResolver.resolve(from: snapshot).resolvedSource
var visibleByEmail: [String: CodexVisibleAccount] = [:]
var visibleByID: [String: CodexVisibleAccount] = [:]

for storedAccount in snapshot.storedAccounts {
let normalizedEmail = Self.normalizeVisibleEmail(storedAccount.email)
visibleByEmail[normalizedEmail] = CodexVisibleAccount(
id: normalizedEmail,
let workspaceLabel = ManagedCodexAccount.normalizeWorkspaceLabel(storedAccount.workspaceLabel)
let workspaceAccountID = ManagedCodexAccount.normalizeWorkspaceAccountID(storedAccount.workspaceAccountID)
let visibleID = Self.visibleAccountID(
email: normalizedEmail,
workspaceAccountID: workspaceAccountID,
workspaceLabel: workspaceLabel)
visibleByID[visibleID] = CodexVisibleAccount(
id: visibleID,
email: normalizedEmail,
workspaceLabel: workspaceLabel,
storedAccountID: storedAccount.id,
selectionSource: .managedAccount(id: storedAccount.id),
isActive: false,
Expand All @@ -182,20 +202,29 @@ extension CodexVisibleAccountProjection {

if let liveSystemAccount = snapshot.liveSystemAccount {
let normalizedEmail = Self.normalizeVisibleEmail(liveSystemAccount.email)
if let existing = visibleByEmail[normalizedEmail] {
visibleByEmail[normalizedEmail] = CodexVisibleAccount(
let workspaceLabel = ManagedCodexAccount.normalizeWorkspaceLabel(liveSystemAccount.workspaceLabel)
let workspaceAccountID = ManagedCodexAccount
.normalizeWorkspaceAccountID(liveSystemAccount.workspaceAccountID)
let visibleID = Self.visibleAccountID(
email: normalizedEmail,
workspaceAccountID: workspaceAccountID,
workspaceLabel: workspaceLabel)
if let existing = visibleByID[visibleID] {
visibleByID[visibleID] = CodexVisibleAccount(
id: existing.id,
email: existing.email,
workspaceLabel: existing.workspaceLabel,
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Use live workspace label when merging account rows

This merge path keeps existing.workspaceLabel even when the live system account resolved the same identity with a newer authoritative workspace name. In the migrated/stale-label case (for example, stored as Personal but live resolves team workspace), the UI continues showing the stale label and fails the intended same-email workspace disambiguation until the account is re-authenticated. Use the live normalized workspace label here (with fallback to existing only when live is missing).

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

@monterrr monterrr Mar 31, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 91af1f10. When a stored and live Codex account reconcile to the same visible identity, the merged row now prefers the live authoritative workspace label instead of preserving a stale stored one. I also added a regression test covering the stale Personal vs live team label case.

storedAccountID: existing.storedAccountID,
selectionSource: .liveSystem,
isActive: existing.isActive,
isLive: true,
canReauthenticate: existing.canReauthenticate,
canRemove: existing.canRemove)
} else {
visibleByEmail[normalizedEmail] = CodexVisibleAccount(
id: normalizedEmail,
visibleByID[visibleID] = CodexVisibleAccount(
id: visibleID,
email: normalizedEmail,
workspaceLabel: workspaceLabel,
storedAccountID: nil,
selectionSource: .liveSystem,
isActive: false,
Expand All @@ -205,17 +234,28 @@ extension CodexVisibleAccountProjection {
}
}

let activeEmail: String? = switch resolvedActiveSource {
let activeVisibleID: String? = switch resolvedActiveSource {
case let .managedAccount(id):
snapshot.storedAccounts.first { $0.id == id }.map { Self.normalizeVisibleEmail($0.email) }
snapshot.storedAccounts.first { $0.id == id }.map {
Self.visibleAccountID(
email: Self.normalizeVisibleEmail($0.email),
workspaceAccountID: $0.workspaceAccountID,
workspaceLabel: $0.workspaceLabel)
}
case .liveSystem:
snapshot.liveSystemAccount.map { Self.normalizeVisibleEmail($0.email) }
snapshot.liveSystemAccount.map {
Self.visibleAccountID(
email: Self.normalizeVisibleEmail($0.email),
workspaceAccountID: $0.workspaceAccountID,
workspaceLabel: $0.workspaceLabel)
}
}

if let activeEmail, let current = visibleByEmail[activeEmail] {
visibleByEmail[activeEmail] = CodexVisibleAccount(
if let activeVisibleID, let current = visibleByID[activeVisibleID] {
visibleByID[activeVisibleID] = CodexVisibleAccount(
id: current.id,
email: current.email,
workspaceLabel: current.workspaceLabel,
storedAccountID: current.storedAccountID,
selectionSource: current.selectionSource,
isActive: true,
Expand All @@ -224,8 +264,11 @@ extension CodexVisibleAccountProjection {
canRemove: current.canRemove)
}

let visibleAccounts = visibleByEmail.values.sorted { lhs, rhs in
lhs.email < rhs.email
let visibleAccounts = visibleByID.values.sorted { lhs, rhs in
if lhs.email == rhs.email {
return (lhs.workspaceLabel ?? "") < (rhs.workspaceLabel ?? "")
}
return lhs.email < rhs.email
}

return CodexVisibleAccountProjection(
Expand All @@ -238,11 +281,24 @@ extension CodexVisibleAccountProjection {
private static func normalizeVisibleEmail(_ email: String) -> String {
email.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
}

private static func visibleAccountID(
email: String,
workspaceAccountID: String?,
workspaceLabel: String?) -> String
{
ManagedCodexAccount.identityKey(
email: email,
workspaceAccountID: workspaceAccountID,
workspaceLabel: workspaceLabel)
}
}

private struct AccountIdentity: Equatable {
let id: UUID
let email: String
let workspaceLabel: String?
let workspaceAccountID: String?
let managedHomePath: String
let createdAt: TimeInterval
let updatedAt: TimeInterval
Expand All @@ -251,6 +307,8 @@ private struct AccountIdentity: Equatable {
init(_ account: ManagedCodexAccount) {
self.id = account.id
self.email = account.email
self.workspaceLabel = account.workspaceLabel
self.workspaceAccountID = account.workspaceAccountID
self.managedHomePath = account.managedHomePath
self.createdAt = account.createdAt
self.updatedAt = account.updatedAt
Expand Down
18 changes: 18 additions & 0 deletions Sources/CodexBar/CodexSystemAccountObserver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,24 @@ import Foundation

struct ObservedSystemCodexAccount: Equatable, Sendable {
let email: String
let workspaceLabel: String?
let workspaceAccountID: String?
let codexHomePath: String
let observedAt: Date

init(
email: String,
workspaceLabel: String? = nil,
workspaceAccountID: String? = nil,
codexHomePath: String,
observedAt: Date)
{
self.email = email
self.workspaceLabel = workspaceLabel
self.workspaceAccountID = workspaceAccountID
self.codexHomePath = codexHomePath
self.observedAt = observedAt
}
}

protocol CodexSystemAccountObserving: Sendable {
Expand All @@ -25,6 +41,8 @@ struct DefaultCodexSystemAccountObserver: CodexSystemAccountObserving {

return ObservedSystemCodexAccount(
email: rawEmail.lowercased(),
workspaceLabel: info.workspaceLabel,
workspaceAccountID: info.workspaceAccountID,
codexHomePath: homeURL.path,
observedAt: Date())
}
Expand Down
Loading