[pull] main from cloudflare:main

.changeset/extract-workers-auth-oauth-flow.md

@@ -0,0 +1,20 @@
+---
+"wrangler": patch
+"@cloudflare/workers-auth": patch
+---
+
+Extract the OAuth 2.0 + PKCE flow into a new `@cloudflare/workers-auth` package.
+
+The OAuth login / logout / refresh logic, the auth-config TOML file IO, the OAuth token exchange + local callback server, and the Cloudflare Access detection helpers that previously lived in `packages/wrangler/src/user/` have moved to the new internal-only `@cloudflare/workers-auth` package. Wrangler now wires the OAuth flow up via a small glue module that injects its logger, browser opener, interactivity detector, and config cache via a dependency- injection context.
+
+What stays in wrangler:
+
+- The yargs `login` / `logout` / `whoami` / `auth token` commands
+- Environment-based credential resolution (`CLOUDFLARE_API_TOKEN`, `CLOUDFLARE_API_KEY` / `CLOUDFLARE_EMAIL`, etc.)
+- Cloudflare account selection (`requireAuth`, `getOrSelectAccountId`)
+- The OAuth scope catalog (passed into the OAuth flow as a generic `string[]`)
+- `whoami` / account fetching
+
+No behavior change for end users. The on-disk TOML format and location remain identical, and all telemetry message labels are preserved verbatim.
+
+`@cloudflare/workers-auth` is published with `prerelease: true` and is not intended for external use — its APIs may change without notice.

.changeset/late-lemons-report.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+Limit `wrangler versions list` to the 10 most recent deployable versions
+
+The versions API ignores pagination when filtering to deployable versions, so Wrangler now caps the command output client-side. This keeps the command aligned with its help text and avoids overwhelming terminal output for Workers with many versions.

.changeset/skip-stale-bundles-during-reload.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+Skip stale bundles during dev server reload to avoid redundant restarts
+
+When rapidly saving a wrangler config file with remote bindings, each save would trigger a full reload cycle (remote connection setup, miniflare restart), causing many sequential "Reloading local server... / Establishing remote connection..." messages (while blocking the user). The runtime controllers now check whether a newer bundle has been queued at each expensive async boundary and bail out early if the current bundle is stale. This ensures that only the latest config change triggers a reload, making `wrangler dev` much more responsive during repeated config edits.

packages/workers-auth/AGENTS.md

@@ -0,0 +1,56 @@
+# AGENTS.md — workers-auth
+
+OAuth-2.0-with-PKCE flow against Cloudflare's `dash.cloudflare.com` (or staging /
+custom-overridden) endpoints. Used by wrangler and (in future) other Cloudflare
+CLIs. Internal-only — published as `prerelease: true`.
+
+## STRUCTURE
+
+- `src/pkce.ts` — PKCE code-verifier / code-challenge generation (RFC 7636)
+- `src/errors.ts` — `ErrorOAuth2` class hierarchy + `toErrorClass` mapper
+- `src/generate-auth-url.ts` — authorize URL builder + `OAUTH_CALLBACK_URL`
+- `src/generate-random-state.ts` — CSRF state generator
+- `src/env-vars.ts` — `WRANGLER_*` env-var getters for OAuth endpoints
+- `src/access.ts` — Cloudflare Access detection + service-token / `cloudflared` headers
+- `src/auth-config-file.ts` — read/write the persisted TOML at `<globalWranglerConfigPath>/config/<env>.toml`
+- `src/state.ts` — `readStoredAuthState()` + `StoredAuthState` shape
+- `src/token-exchange.ts` — auth-code → token + refresh-token rotation + `fetchAuthToken`
+- `src/callback-server.ts` — local HTTP server on `localhost:8976` for the OAuth callback
+- `src/flow.ts` — `createOAuthFlow(ctx)` factory wiring everything together
+- `src/context.ts` — `OAuthFlowContext` interface (DI surface)
+- `src/test-helpers/` — MSW handlers for consumers' tests (`@cloudflare/workers-auth/test-helpers`)
+
+## DI SURFACE
+
+`createOAuthFlow(ctx)` accepts a context object:
+
+- `logger` — drop-in replacement for wrangler's logger singleton
+- `isNonInteractiveOrCI()` — whether to suppress interactive prompts
+- `openInBrowser(url)` — opens the browser to the OAuth authorize URL
+- `hasEnvCredentials()` — short-circuits refresh logic when env-based auth is set
+- `purgeOnLoginOrLogout()` — invalidate consumer-side caches after login/logout
+- `generateAuthUrl?` / `generateRandomState?` — test overrides for deterministic
+  snapshot tests (defaults pull from `./generate-auth-url` / `./generate-random-state`)
+
+Wrangler wires this once in `packages/wrangler/src/user/user.ts`.
+
+## CONVENTIONS
+
+- License: dual MIT/Apache-2.0. Files derived from
+  [BitySA/oauth2-auth-code-pkce](https://github.com/BitySA/oauth2-auth-code-pkce)
+  carry the Apache-2.0 header.
+- No `console.*` — use the injected `ctx.logger`.
+- No global `fetch` — use undici's `fetch`.
+- `UserError` instances must carry stable `telemetryMessage` labels
+  (`<area> <sub-area> <failure>`, e.g. `user oauth invalid scope`).
+  These labels are part of the telemetry contract — preserve them verbatim.
+- No direct Cloudflare REST API calls. This package talks to OAuth endpoints
+  (`/oauth2/auth`, `/oauth2/token`, `/oauth2/revoke`) only.
+- OAuth callback server listens on `localhost:8976` by default; override via
+  `LoginProps.callbackHost` / `callbackPort` per-call.
+
+## BUILD
+
+- tsup: two entry points — `src/index.ts` and `src/test-helpers/index.ts`
+- ESM-only output to `dist/`
+- `@cloudflare/*`, `undici`, `msw`, and `vitest` are kept external

packages/workers-auth/LICENSE-APACHE

@@ -0,0 +1,176 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

packages/workers-auth/LICENSE-MIT

@@ -0,0 +1,25 @@
+Copyright (c) 2020 Cloudflare, Inc. <wrangler@cloudflare.com>
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

packages/workers-auth/README.md

@@ -0,0 +1,31 @@
+# @cloudflare/workers-auth
+
+Internal OAuth 2.0 + PKCE flow for Cloudflare CLIs (wrangler and friends).
+
+> **Not intended for external use.** APIs may change without notice. This package
+> is consumed only by other packages inside this monorepo.
+
+## What's in this package
+
+- OAuth 2.0 Authorization Code flow with PKCE (RFC 6749 + RFC 7636)
+- Cloudflare-flavored OAuth endpoints (`dash.cloudflare.com` / staging / `WRANGLER_*` overrides)
+- Cloudflare Access detection + service-token / `cloudflared` integration for staging auth domains
+- Persistent auth state stored as TOML in `<globalWranglerConfigPath>/config/<env>.toml`
+- `login`, `logout`, `loginOrRefreshIfRequired`, `getOauthToken`, `getOAuthTokenFromLocalState`
+
+What's **not** here (lives in wrangler):
+
+- yargs `login` / `logout` / `whoami` / `auth token` commands
+- Environment-based credential resolution (`CLOUDFLARE_API_TOKEN`, etc.)
+- Cloudflare account selection (`requireAuth`, `getOrSelectAccountId`)
+- The scope catalog (passed in as `string[]`)
+- `whoami` / account fetching
+
+## Attribution
+
+Portions of this package are derived from
+[BitySA/oauth2-auth-code-pkce](https://github.com/BitySA/oauth2-auth-code-pkce),
+licensed under the Apache License 2.0. See the individual file headers for
+the attribution and `LICENSE` for the full text.
+
+The rest of the package is MIT-licensed.