Skip to content

Feat/multiple accounts stack vs segmented options#869

Merged
steipete merged 4 commits intosteipete:mainfrom
ajmccall:feat/multiple_accounts_stack_vs_segmented_options
May 10, 2026
Merged

Feat/multiple accounts stack vs segmented options#869
steipete merged 4 commits intosteipete:mainfrom
ajmccall:feat/multiple_accounts_stack_vs_segmented_options

Conversation

@ajmccall
Copy link
Copy Markdown
Contributor

@ajmccall ajmccall commented May 8, 2026

No description provided.

@steipete steipete marked this pull request as ready for review May 10, 2026 15:33
@steipete steipete merged commit 28f5394 into steipete:main May 10, 2026
4 checks passed
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 96ef6b48d8

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines 204 to +206
let codexSwitcherCompatible = codexAccountDisplay == self.lastCodexAccountMenuDisplay &&
((codexAccountDisplay == nil && !hasCodexSwitcher) || (codexAccountDisplay != nil && hasCodexSwitcher))
((codexAccountDisplay?.showSwitcher == true && hasCodexSwitcher) ||
(codexAccountDisplay?.showSwitcher != true && !hasCodexSwitcher))
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Prevent smart-update for stacked Codex layouts

This compatibility check now treats the "stacked" Codex layout as smart-update-safe when no Codex switcher view is present. In merged menus (mergeIcons on, multiple providers), that allows canSmartUpdate to run even though stacked account cards must be rebuilt with codexAccountDisplay; the smart-update path rebuilds content without that display context, so periodic menu refresh can collapse stacked Codex cards back to a single live card.

Useful? React with 👍 / 👎.

self.settings.codexActiveSource = originalSource
}
}
defer { restoreOriginalSelection() }
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Stop forcing stale Codex account selection after refresh

This deferred restore always writes the originally captured account/source back after an async multi-account refresh. Because the function awaits network fetches per account, user actions can interleave and change the active Codex account during the refresh; when the deferred restore runs, it overwrites that newer selection and can persist the wrong account/source unexpectedly.

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants