fix(accounts): preserve shared workspace account slots by KakatkarAkshay · Pull Request #974 · Soju06/codex-lb

KakatkarAkshay · 2026-06-09T19:48:14Z

Summary

Fix account add/reauth for OpenAI workspaces where multiple human emails share the same upstream ChatGPT account id. Also render the upstream ChatGPT account id as the workspace/account-slot context before falling back to the generic unknown-workspace label.

Type of change

fix: — bug fix (no behavior change beyond the bug)
feat: — new user-facing feature or capability
refactor: — internal refactor (no behavior change, no API change)
docs: — documentation only
chore: / ci: / build: — tooling, CI, packaging
test: — test-only change
Breaking change (also append ! after the type, e.g. feat!: or include BREAKING CHANGE: footer)

Linked issue: Related to #355 and #788; fixes a remaining shared-workspace edge case after #865.

OpenSpec

This PR includes / updates an OpenSpec change
Not applicable — bug fix that matches the existing spec
Not applicable — docs / CI / chore only
This PR touches a codex-faithful path (image pipeline, request/response
shape, SSE framing, OAuth flow) and preserves upstream-equivalent behavior

Change directory: openspec/changes/fix-shared-workspace-account-slots/

Changes

Scope account-slot matching by chatgpt_account_id + email instead of treating shared workspace ids as single-user identities.
Persist OAuth accounts through the account-slot path even when OpenAI does not provide a dedicated workspace id.
Expose chatgptAccountId on dashboard account summaries and use it as the first workspace/account-slot display fallback.
Add repository and UI regression tests for shared upstream workspace/account ids.

Test plan

python3 -m compileall -q app/modules/accounts app/modules/oauth tests/integration/test_accounts_repository.py
git diff --check
cd frontend && bun install --frozen-lockfile
cd frontend && bun run test src/features/accounts/components/account-list-item.test.tsx
cd frontend && bun run typecheck

Result: all commands above passed locally.

Not run locally: uv run pytest ..., uv run ruff ..., and openspec validate --specs because this shell does not have uv or openspec; the Nix Python in the environment could not bootstrap pip via ensurepip.

Screenshots / output (optional)

N/A.

Checklist

Title is in Conventional Commits format (<type>(<scope>)?: <subject>).
Linked the related issue / discussion above.
Added or updated tests covering the change.
Ran uv run pre-commit run local-ci --hook-stage manual --all-files or the relevant make <target> subset locally.
If touching specs: openspec validate --specs passes and /opsx:verify is clean.
CHANGELOG is not edited by hand (release-please handles it).

Soju06 · 2026-06-11T03:52:30Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 78011b893b

ℹ️ 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".

Soju06 · 2026-06-11T04:11:44Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 65518d0a20

ℹ️ 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".

Komzpa · 2026-06-11T04:27:16Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5bdbb031de

ℹ️ 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".

Soju06 · 2026-06-11T04:58:29Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 90dfd3f6ea

ℹ️ 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".

Komzpa · 2026-06-11T05:12:41Z

@codex review

chatgpt-codex-connector · 2026-06-11T05:17:29Z

Codex Review: Didn't find any major issues. Can't wait for the next one!

ℹ️ 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".

Soju06 · 2026-06-11T06:13:44Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d07fad516c

ℹ️ 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".

Soju06 · 2026-06-11T06:30:58Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8ebc1d58ad

ℹ️ 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".

chatgpt-codex-connector · 2026-06-11T06:35:21Z

                workspace_id=account.workspace_id,
+                email=account.email,


Include workspace labels in identity reauth lookup

When this merge_by_chatgpt_identity path is used for two same-email, label-only workspace slots, the lookup is still scoped only by workspace_id; with workspace_id is None it considers every label-only row for that ChatGPT id/email, chooses the oldest, and the subsequent duplicate reconciliation also deletes same-email rows with workspace_id IS NULL. Since this change now treats workspace_label as a slot identity elsewhere, reauthing a workspace_label="Triton" slot can overwrite/delete a separate workspace_label="Mavos" slot. Pass the workspace label through this lookup/reconciliation or route this path through the slot-aware matcher.

Useful? React with 👍 / 👎.

* fix(accounts): preserve shared workspace account slots * fix(accounts): align shared workspace slot CI expectations * fix(accounts): preserve shared workspace slot identity semantics * style(accounts): format shared workspace fallback * fix(accounts): preserve legacy workspace upgrades * fix(accounts): keep workspace slot fallback scoped * fix(accounts): allow additional workspace slots * fix(accounts): preserve workspace identity on oauth * fix(accounts): route oauth through account slots * fix(accounts): keep oauth slots identity-keyed * fix(accounts): scope oauth slot preservation * fix(accounts): match identity merge by email slot * fix(accounts): upgrade label-only workspace slots --------- Co-authored-by: Darafei Praliaskouski <me@komzpa.net>

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread app/modules/accounts/repository.py Outdated

Komzpa added the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

Soju06 removed the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread app/modules/oauth/service.py Outdated

Comment thread app/modules/accounts/repository.py Outdated

Komzpa added the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

Soju06 removed the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread app/modules/oauth/service.py Outdated

Comment thread app/modules/accounts/repository.py Outdated

Komzpa added the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

Soju06 removed the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread app/modules/accounts/repository.py

Komzpa added the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

Soju06 removed the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

Soju06 added 🤖 codex: ok [@codex review] says no issues found. and removed 🤖 codex: ok [@codex review] says no issues found. labels Jun 11, 2026

KakatkarAkshay and others added 10 commits June 11, 2026 10:03

fix(accounts): preserve shared workspace account slots

da936bf

fix(accounts): align shared workspace slot CI expectations

a873e80

fix(accounts): preserve shared workspace slot identity semantics

ece5176

style(accounts): format shared workspace fallback

cdbddf8

fix(accounts): preserve legacy workspace upgrades

606d218

fix(accounts): keep workspace slot fallback scoped

e856647

fix(accounts): allow additional workspace slots

3963c1f

fix(accounts): preserve workspace identity on oauth

32c7fee

fix(accounts): route oauth through account slots

ecfe58b

fix(accounts): keep oauth slots identity-keyed

ce41da9

Komzpa added 2 commits June 11, 2026 10:03

fix(accounts): scope oauth slot preservation

c8326a3

fix(accounts): match identity merge by email slot

d07fad5

Komzpa force-pushed the fix/shared-workspace-account-identity branch from 741005a to d07fad5 Compare June 11, 2026 06:04

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

Comment thread app/modules/accounts/repository.py

Soju06 added the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

fix(accounts): upgrade label-only workspace slots

8ebc1d5

Soju06 removed the 🤖 codex: needs work [@codex review] raised an issue label Jun 11, 2026

Komzpa merged commit dd4436f into Soju06:main Jun 11, 2026
25 checks passed

Soju06 mentioned this pull request Jun 11, 2026

chore(main): release 1.20.0 #806

Merged

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

This was referenced Jun 11, 2026

fix(accounts): scope identity merge by workspace label #982

Closed

bug: Can't add a workspace and a personal space from the same account, one gets overwritten by the other #952

Closed

Soju06 mentioned this pull request Jun 16, 2026

chore: release v1.20.0-beta.3 #1029

Merged

6 tasks

kgskr mentioned this pull request Jun 18, 2026

chore: release v1.20.1-beta.1 CINEV/codex-lb-cinamon#38

Closed

6 tasks

vitalNohj mentioned this pull request Jun 28, 2026

Merge upstream 1.20.1 + Cursor sidecar customizations (image input, model aliasing, reasoning-effort overrides) vitalNohj/codex-lb#1

Merged

Conversation

KakatkarAkshay commented Jun 9, 2026

Summary

Type of change

OpenSpec

Changes

Test plan

Screenshots / output (optional)

Checklist

Uh oh!

Soju06 commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Soju06 commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Komzpa commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Soju06 commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Komzpa commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 11, 2026

Uh oh!

Soju06 commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Soju06 commented Jun 11, 2026

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants