Skip to content

chore(sync): merge main and mobile-main into dev#4917

Merged
DIYgod merged 10 commits intodevfrom
codex/sync-release-to-dev-20260312
Mar 12, 2026
Merged

chore(sync): merge main and mobile-main into dev#4917
DIYgod merged 10 commits intodevfrom
codex/sync-release-to-dev-20260312

Conversation

@DIYgod
Copy link
Member

@DIYgod DIYgod commented Mar 12, 2026

Summary

  • merge released desktop changes from main into dev
  • merge released mobile changes from mobile-main into dev
  • replace the failed direct-push sync runs with a reviewable PR so protected branch checks can pass

Context

This PR manually applies the sync that failed in runs 22995713041 and 23004205636 because dev now requires status checks before update.

@DIYgod DIYgod enabled auto-merge March 12, 2026 13:29
@DIYgod DIYgod merged commit 6593d79 into dev Mar 12, 2026
17 checks passed
@DIYgod DIYgod deleted the codex/sync-release-to-dev-20260312 branch March 12, 2026 13:34
Copy link

@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: 82b5791950

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

: followApi

apiContext.provide(providedApi)
apiContext.provide(followApi)

Choose a reason for hiding this comment

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

P1 Badge Restore Electron token fallback for initial session fetch

Providing followApi directly here removes the Electron-specific auth.getSession override that previously called ipcServices.auth.getSessionByToken(getAuthSessionToken()) before falling back to HTTP. The login/register flow still sets the cookie asynchronously (setElectronSessionToken(token) is fire-and-forget in modules/auth/Form.tsx) and then immediately reloads (handleSessionChanges), so the first post-login api().auth.getSession() can run before the cookie is persisted. In that window Electron now gets a 401 and treats the user as unauthenticated, which can surface as intermittent post-login failures/loops.

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.

1 participant