wrangler 2.0.7 → 2.0.8

package/src/__tests__/package-manager.test.ts

@@ -7,100 +7,210 @@ const { getPackageManager, getPackageManagerName } =
   jest.requireActual("../package-manager");
 interface TestCase {
   npm: boolean;
+  pnpm: boolean;
   yarn: boolean;
   npmLockFile: boolean;
   yarnLockFile: boolean;
+  pnpmLockFile: boolean;
   expectedPackageManager: string;
 }
 
 const testCases: TestCase[] = [
-  // npm binary - no yarn binary
+  // npm binary only
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
 
-  // yarn binary - no npm binary
+  // yarn binary only
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
 
+  // pnpm binary only
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: false,
+    pnpmLockFile: true,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: false,
+    pnpmLockFile: false,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: true,
+    pnpmLockFile: false,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: true,
+    pnpmLockFile: true,
+    expectedPackageManager: "pnpm",
+  },
+
   // npm and yarn binaries
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: true,
+    pnpmLockFile: false,
+    expectedPackageManager: "npm",
+  },
+  // npm, yarn and pnpm binaries
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: false,
+    pnpmLockFile: false,
+    expectedPackageManager: "npm",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: false,
+    pnpmLockFile: false,
+    expectedPackageManager: "npm",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: true,
+    pnpmLockFile: false,
+    expectedPackageManager: "yarn",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: false,
+    pnpmLockFile: true,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: true,
+    pnpmLockFile: true,
     expectedPackageManager: "npm",
   },
 ];
@@ -112,12 +222,13 @@ describe("getPackageManager()", () => {
   describe("no supported package manager", () => {
     mockYarn(false);
     mockNpm(false);
+    mockPnpm(false);
 
     it("should throw an error", async () => {
       await expect(() =>
         getPackageManager(process.cwd())
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Unable to find a package manager. Supported managers are: npm and yarn."`
+        `"Unable to find a package manager. Supported managers are: npm, yarn, and pnpm."`
       );
     });
   });
@@ -125,16 +236,26 @@ describe("getPackageManager()", () => {
   for (const {
     npm,
     yarn,
+    pnpm,
     npmLockFile,
     yarnLockFile,
+    pnpmLockFile,
     expectedPackageManager,
   } of testCases) {
     describe(
-      getTestCaseDescription(npm, yarn, npmLockFile, yarnLockFile),
+      getTestCaseDescription(
+        npm,
+        yarn,
+        pnpm,
+        npmLockFile,
+        yarnLockFile,
+        pnpmLockFile
+      ),
       () => {
         mockYarn(yarn);
         mockNpm(npm);
-        mockLockFiles(npmLockFile, yarnLockFile);
+        mockPnpm(pnpm);
+        mockLockFiles(npmLockFile, yarnLockFile, pnpmLockFile);
 
         it(`should return the ${expectedPackageManager} package manager`, async () => {
           const actualPackageManager = await getPackageManager(process.cwd());
@@ -169,10 +290,25 @@ function mockNpm(succeed: boolean): void {
   afterEach(() => unMock());
 }
 
+/**
+ * Create a fake pnpm binary
+ */
+function mockPnpm(succeed: boolean): void {
+  let unMock: () => void;
+  beforeEach(async () => {
+    unMock = await mockBinary("pnpm", `process.exit(${succeed ? 0 : 1})`);
+  });
+  afterEach(() => unMock());
+}
+
 /**
  * Create a fake lock files.
  */
-function mockLockFiles(npmLockFile: boolean, yarnLockFile: boolean) {
+function mockLockFiles(
+  npmLockFile: boolean,
+  yarnLockFile: boolean,
+  pnpmLockFile: boolean
+) {
   beforeEach(() => {
     if (npmLockFile) {
       writeFileSync("package-lock.json", "");
@@ -180,14 +316,19 @@ function mockLockFiles(npmLockFile: boolean, yarnLockFile: boolean) {
     if (yarnLockFile) {
       writeFileSync("yarn.lock", "");
     }
+    if (pnpmLockFile) {
+      writeFileSync("pnpm-lock.yaml", "");
+    }
   });
 }
 
 function getTestCaseDescription(
   npm: boolean,
   yarn: boolean,
+  pnpm: boolean,
   npmLockFile: boolean,
-  yarnLockFile: boolean
+  yarnLockFile: boolean,
+  pnpmLockFile: boolean
 ): string {
   const criteria: string[] = [];
   if (npm) {
@@ -202,5 +343,11 @@ function getTestCaseDescription(
   if (yarnLockFile) {
     criteria.push("yarn.lock");
   }
+  if (pnpm) {
+    criteria.push("pnpm");
+  }
+  if (pnpmLockFile) {
+    criteria.push("pnpm-lock.yaml");
+  }
   return "using " + criteria.join("; ");
 }

package/src/__tests__/pages.test.ts

@@ -79,7 +79,7 @@ describe("pages", () => {
       expect(std.out).toMatchInlineSnapshot(`
         "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
     });
 
@@ -89,7 +89,7 @@ describe("pages", () => {
       expect(std.out).toMatchInlineSnapshot(`
         "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
     });
   });
@@ -374,10 +374,10 @@ describe("pages", () => {
             const body = init.body as FormData;
             const manifest = JSON.parse(body.get("manifest") as string);
             expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.png": "2082190357cfd3617ccfe04f340c6247",
-            }
-          `);
+                          Object {
+                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+                          }
+                      `);
           });
 
           return {
@@ -445,10 +445,10 @@ describe("pages", () => {
             const body = init.body as FormData;
             const manifest = JSON.parse(body.get("manifest") as string);
             expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
-            }
-          `);
+                          Object {
+                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+                          }
+                      `);
           });
 
           return {
@@ -533,13 +533,13 @@ describe("pages", () => {
             const body = init.body as FormData;
             const manifest = JSON.parse(body.get("manifest") as string);
             expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
-              "/logo.js": "6be321bef99e758250dac034474ddbb8",
-              "/logo.png": "2082190357cfd3617ccfe04f340c6247",
-              "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
-            }
-          `);
+                          Object {
+                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+                          }
+                      `);
           });
 
           return {

package/src/__tests__/publish.test.ts

@@ -1121,7 +1121,7 @@ addEventListener('fetch', event => {});`
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -1279,7 +1279,7 @@ addEventListener('fetch', event => {});`
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field.
@@ -1327,6 +1327,56 @@ addEventListener('fetch', event => {});`
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
+    it("should not contain backslash for assets with nested directories", async () => {
+      const assets = [
+        { filePath: "assets/subdir/file-1.txt", content: "Content of file-1" },
+        { filePath: "assets/subdir/file-2.txt", content: "Content of file-2" },
+      ];
+      const kvNamespace = {
+        title: "__test-name-workers_sites_assets",
+        id: "__test-name-workers_sites_assets-id",
+      };
+      writeWranglerToml({
+        main: "./index.js",
+        site: {
+          bucket: "assets",
+        },
+      });
+      writeWorkerSource();
+      writeAssets(assets);
+      mockUploadWorkerRequest({
+        expectedBindings: [
+          {
+            name: "__STATIC_CONTENT",
+            namespace_id: "__test-name-workers_sites_assets-id",
+            type: "kv_namespace",
+          },
+        ],
+        expectedModules: {
+          __STATIC_CONTENT_MANIFEST:
+            '{"subdir/file-1.txt":"assets/subdir/file-1.2ca234f380.txt","subdir/file-2.txt":"assets/subdir/file-2.5938485188.txt"}',
+        },
+      });
+      mockSubDomainRequest();
+      mockListKVNamespacesRequest(kvNamespace);
+      mockKeyListRequest(kvNamespace.id, []);
+      mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+
+      await runWrangler("publish");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Reading assets/subdir/file-1.txt...
+        Uploading as assets/subdir/file-1.2ca234f380.txt...
+        Reading assets/subdir/file-2.txt...
+        Uploading as assets/subdir/file-2.5938485188.txt...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
     it("when using a service-worker type, it should add an asset manifest as a text_blob, and bind to a namespace", async () => {
       const assets = [
         { filePath: "assets/file-1.txt", content: "Content of file-1" },
@@ -1940,7 +1990,7 @@ addEventListener('fetch', event => {});`
         "Reading assets/large-file.txt...
         Uploading as assets/large-file.0ea0637a45.txt...
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] File assets/too-large-file.txt is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits
@@ -1980,7 +2030,7 @@ addEventListener('fetch', event => {});`
       expect(std.out).toMatchInlineSnapshot(`
         "Reading assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.txt...
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] The asset path key \\"assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\",
@@ -2691,7 +2741,7 @@ addEventListener('fetch', event => {});`
       expect(std.out).toMatchInlineSnapshot(`
         "Running custom build: node -e \\"console.log('custom build');\\"
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
@@ -2730,7 +2780,7 @@ addEventListener('fetch', event => {});`
       expect(std.out).toMatchInlineSnapshot(`
         "Running custom build: node -e \\"console.log('custom build');\\"
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
@@ -2845,7 +2895,15 @@ addEventListener('fetch', event => {});`
 
             - In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass),
           but no [migrations] for them. This may not work as expected until you add a [migrations] section
-          to your wrangler.toml. Refer to
+          to your wrangler.toml. Add this configuration to your wrangler.toml:
+
+                \`\`\`
+                [[migrations]]
+                tag = \\"v1\\" # Should be unique for each entry
+                new_classes = [\\"SomeClass\\"]
+                \`\`\`
+
+              Refer to
           https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
           for more details.
 
@@ -3531,7 +3589,7 @@ addEventListener('fetch', event => {});`
             `);
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -3630,7 +3688,7 @@ addEventListener('fetch', event => {});`
             `);
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -3764,7 +3822,7 @@ addEventListener('fetch', event => {});`
             `);
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -3838,7 +3896,7 @@ addEventListener('fetch', event => {});`
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
@@ -3975,7 +4033,7 @@ addEventListener('fetch', event => {});`
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
@@ -4084,7 +4142,7 @@ addEventListener('fetch', event => {});`
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml

package/src/__tests__/secret.test.ts

@@ -148,7 +148,7 @@ describe("wrangler secret", () => {
         }
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] Missing script name
@@ -204,7 +204,7 @@ describe("wrangler secret", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -372,7 +372,7 @@ describe("wrangler secret", () => {
       }
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Missing script name
@@ -468,7 +468,7 @@ describe("wrangler secret", () => {
       }
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Missing script name

package/src/cfetch/index.ts

@@ -10,6 +10,7 @@ export { getCloudflareAPIBaseURL as getCloudflareApiBaseUrl } from "./internal";
 export interface FetchError {
   code: number;
   message: string;
+  error_chain?: FetchError[];
 }
 export interface FetchResult<ResponseType = unknown> {
   success: boolean;
@@ -85,9 +86,9 @@ function throwFetchError(
   response: FetchResult<unknown>
 ): never {
   const error = new ParseError({
-    text: "Received a bad response from the API",
+    text: `A request to the Cloudflare API (${resource}) failed.`,
     notes: response.errors.map((err) => ({
-      text: err.code ? `${err.message} [code: ${err.code}]` : err.message,
+      text: renderError(err),
     })),
   });
   // add the first error code directly to this error
@@ -104,3 +105,17 @@ function hasCursor(result_info: unknown): result_info is { cursor: string } {
   const cursor = (result_info as { cursor: string } | undefined)?.cursor;
   return cursor !== undefined && cursor !== null && cursor !== "";
 }
+
+function renderError(err: FetchError, level = 0): string {
+  const chainedMessages =
+    err.error_chain
+      ?.map(
+        (chainedError) =>
+          `\n${"  ".repeat(level)}- ${renderError(chainedError, level + 1)}`
+      )
+      .join("\n") ?? "";
+  return (
+    (err.code ? `${err.message} [code: ${err.code}]` : err.message) +
+    chainedMessages
+  );
+}

package/src/cfetch/internal.ts

@@ -1,4 +1,5 @@
 import { fetch, Headers } from "undici";
+import { version as wranglerVersion } from "../../package.json";
 import { getEnvironmentVariableFactory } from "../environment-variables";
 import { ParseError, parseJSON } from "../parse";
 import { getAPIToken, loginOrRefreshIfRequired } from "../user";
@@ -33,6 +34,7 @@ export async function fetchInternal<ResponseType>(
   const apiToken = requireApiToken();
   const headers = cloneHeaders(init.headers);
   addAuthorizationHeaderIfUnspecified(headers, apiToken);
+  addUserAgent(headers);
 
   const queryString = queryParams ? `?${queryParams.toString()}` : "";
   const method = init.method ?? "GET";
@@ -105,6 +107,10 @@ function addAuthorizationHeaderIfUnspecified(
   }
 }
 
+function addUserAgent(headers: Record<string, string>): void {
+  headers["User-Agent"] = `wrangler/${wranglerVersion}`;
+}
+
 /**
  * The implementation for fetching a kv value from the cloudflare API.
  * We special-case this one call, because it's the only API call that