Skip to content

refactor: share oauth callback context and recent form helpers - #4617

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

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

Conversation

@cursor

@cursor cursor Bot commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

What and why

Nightly cleanup of merges after #4573, focused on #4588 (oauth_callback attribution), #4603/#4607/#4610 (FormCard event form), #4605/#4608 (EventJump), #4602 (palette search), and #4604 (now-cue pulse).

Dead unused NativeWebFocusRing is gone. Schedule and conference sections drop unused focusField. EventFormCard owns the accent highlight used by logistics and description. Timed start/end rows share one helper. Compact date revert paths share revertTextToBoundDate. OAuth callback analytics context is one verify/peek helper, so intent still comes from signature-valid state on the wrong provider path. Signed tokens split in one place. Failure reasons share withProviderError. EventJump reuses visibleDateKeys() and drops the dead s prefix guard. TimeGrid header shimmer reuses nowCuePulseAnimation. UITest launch-arg values share stringValue(forFlag:).

Left alone: AuthStore success paths, Welcome Enter vs connect-prompt Enter, first-event celebration, TimePicker commit-draft event, TimePicker shortcut test harness, calendar notice stack, TimeGrid hit-test passes, ShiftHintOverlay, TimePickers start/end menu booleans, NativeGridKeyboardRouter confirmation-dialog and guest-email Return handling, deploy yaml awk readers, EventFormDateField commit paths, recurrence timezone vs draft TZ, keyboard vs form duplicate pipelines, CompassKit test trees, CommandPaletteSearch adapter, palette recent-while-searching, Event form Meet draft.kind === "create" type narrowing.

Verify

VERDICT: PASS

Checks run: test:core, test:sync:fast, type-check, lint, knip.

Also ran the 8 captures oauth_callback cases in connection.routes.db.test.ts (including stateMismatch still emitting intent connect).

CI-only: test:macos / test:macos:packages (no Xcode on this machine).

Open in Web View Automation 

Note

Low Risk
Mostly structural refactors and UI polish; OAuth analytics consolidation is covered by existing tests, with a low-risk palette wrap fix.

Overview
Refactors and small fixes across macOS calendar UI, OAuth analytics, and shared helpers—mostly DRY cleanup with a couple of behavior fixes.

macOS: Command palette keyboard selection now wraps with correct modulo on (index + delta). Event jump reuses shared visibleDateKeys() and drops a redundant weekend-prefix guard. Event form moves accent focus styling into EventFormCard(highlighted:), extracts timed start/end into timedRow, shares compact-date revert logic, and removes dead NativeWebFocusRing plus unused focusField props. UITest launch flags parse via stringValue(forFlag:). Command palette search tightens word-prefix matching (haystack already lowercased). Time grid “now” header pulse reuses nowCuePulseAnimation.

Sync/core: OAuth signed token parsing is centralized in splitSignedToken; callback routes read distinctId, connect intent, and relay-desktop from one oauthStateAnalyticsContext verify/peek pass. Failure analytics use withProviderError and can fall back to sanitized error_description for provider_error.

Reviewed by Cursor Bugbot for commit 29965d1. Bugbot is set up for automated code reviews on this repo. Configure here.

Drop the unused native focus ring, fold three OAuth state readers into
one verify/peek helper, and reuse existing form, jump, and pulse helpers
from the merges after #4573.

Co-authored-by: tyler <tyler@switchback.tech>
@tyler-dane
tyler-dane marked this pull request as ready for review October 20, 2026 01:24
@tyler-dane tyler-dane added the agent-automerge Agent-loop finished; merge-guard may squash-merge label Oct 20, 2026
@tyler-dane
tyler-dane enabled auto-merge October 20, 2026 01:24
@github-actions

Copy link
Copy Markdown
Contributor

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

@tyler-dane
tyler-dane added this pull request to the merge queue Oct 20, 2026
Merged via the queue into main with commit 49355e5 Oct 20, 2026
34 checks passed
@tyler-dane
tyler-dane deleted the cursor/code-simplification-e064 branch October 20, 2026 01:55
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