Repository navigation
Merge upstream main into fork - #13
Merged
Merged
Conversation
* Route sign-up and v2 paths on executor.sh to v2 * Fail edge requests on broken v2 settings instead of serving them from v1 * Answer edge requests with a 500 on broken v2 settings * Forward only v2's contract paths and reserve the apps and experiments slugs * Test the executor.sh v2 edge and reserved slugs * Test that broken edge settings fail only edge requests * Test the contract paths and the apps and experiments slugs * Forward connected-account callbacks with v2's state prefix to v2 * Test v2's connected-account callbacks and the shipped v2 edge settings
…Co#2217) * Send sign-up to v2's app host * Test the shipped sign-up URL on app.executor.sh * Serve executor.sh marketing from v2 and keep v1's terms * Describe the visitor cookie the edge passes to v2 * Keep v1's privacy and Google OAuth pages, match v2's contract and pin its telemetry paths * Forward only below v2's analytics proxy root * Redirect slashed v2 pages on executor.sh to the page * Test v2 marketing, telemetry proxies and v1's terms on executor.sh * Test v1's edge against v2's pinned edge contract * Test the analytics proxy root stays with v1 and update the pinned contract * Test that slashed v2 pages redirect and update the pinned contract
…o#2222) * Keep forwarded marketing requests off the application path * Verify the production marketing binding
…efulSoftwareCo#2225) * Serve executor.sh's forwarded paths from an unplaced front Worker * Test the executor.sh front Worker
…ftwareCo#2266) * Link eligible orgs to Executor v2's import from the sidebar * Read the v2 import's billing without creating an Autumn customer
* Test the v2 import sidebar link * Test the v2 import's read-only billing lookup
…ftwareCo#2269) Reads the move v2 records on the WorkOS organization (executor_v2_org_slug, executor_v2_moved_at) into the v2-import answer, shows a dismissible notice on the dashboard with a feedback step for staying on v1, and points the sidebar link at the org in v2.
Patches the WorkOS emulator to store organization metadata, as the real Create and Update Organization endpoints do.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merge 22 upstream commits through
4998ad021intofork, preserving upstream ancestry and the fork's authentication, MCP, and dependency security fixes. Resolve the patch-list conflict by retaining MCP client 2.3.1 and adding upstream's emulator patch. Regenerate the cloud route metadata with the installed router tooling.Verification
bun run format:checkbun run lintbun run typecheck— all 45 tasks passed.bun run test --env-mode=loose— all 39 tasks passed with the installed Playwright Chromium configured.bun run check:patchesandbun run check:routesvitest run --project cloud cloud/v2-moved-notice.test.ts cloud/v2-import-link.test.ts— 7 passed, 1 failed. All four moved-notice scenarios pass, covering dismissal, feedback, malformed metadata, and long organization names.licensesarray. The same error reproduces using the unpatched published pre-merge dependency pair (autumn-js@1.5.17,@executor-js/emulate@0.14.3-mfa.0). No assertions were changed or skipped.The recording shows the moved-organization notice, its v2 link, dismissal, and persistence after reload. It uses isolated test identities.
Checklist