Skip to content

refactor: share session flags, synthetic account check, and logout write timeout - #4866

Merged
tyler-dane merged 1 commit into
mainfrom
cursor/code-simplification-ac20
Oct 27, 2026
Merged

tyler-dane merged 1 commit into
mainfrom
cursor/code-simplification-ac20

Conversation

@cursor

@cursor cursor Bot commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

What and why

Nightly simplification of merges after #4835, focused on the largest recent churn: Google signup scopes recovery (#4852), logout write flush (#4859), and synthetic journey email skip (#4849).

  • One session-flag helper for the Google consent-retry and scopes-recovery one-shots
  • Missing OAuth scopes are computed once, then reused in the callback surface branch
  • Recovery analytics share one track + signup-step helper
  • Email dispatch and billing use the same isSyntheticAccount predicate (no local email wrapper)
  • waitForPendingEventMutations now races the deadline so a hung mutation cannot block logout forever

Behavior is unchanged for successful paths. Hung logout writes now proceed after 15s, which is the timeout the helper already documented.

Verify

VERDICT: PASS

Checks run:

  • test:web (selected files + full suite via verify)
  • test:backend:fast
  • type-check
  • lint
  • knip
  • test:a11y (67 passed)
  • test:e2e (297 passed, 3 skipped on isolated retry after a resource-contended verify run)

A first bun run verify --strict was INCOMPLETE until Chromium was installed. After install, selected non-Playwright checks passed; a11y passed; an in-verify e2e wave failed without a usable log (sandbox output truncated). Isolated bun run test:e2e then passed. Diff does not touch those e2e specs.

Open in Web View Automation 

…ite timeout

Deduplicate recent OAuth and email dispatch scaffolding, and make the
logout pending-write wait honor its timeout when a mutation never settles.

Co-authored-by: tyler <tyler@switchback.tech>
@tyler-dane tyler-dane added the agent-automerge Agent-loop finished; merge-guard may squash-merge label Oct 27, 2026 — with Cursor
@tyler-dane
tyler-dane enabled auto-merge October 27, 2026 01:34
@github-actions

Copy link
Copy Markdown
Contributor

Boot bundle: 528.8 KB gzip (+0.0 KB vs main)

@tyler-dane
tyler-dane added this pull request to the merge queue Oct 27, 2026
Merged via the queue into main with commit fc92e4b Oct 27, 2026
39 checks passed
@tyler-dane
tyler-dane deleted the cursor/code-simplification-ac20 branch October 27, 2026 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-automerge Agent-loop finished; merge-guard may squash-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants