wrangler 0.0.0-e3cab74 → 0.0.0-e3e3243

package/src/index.tsx

@@ -3,17 +3,19 @@ import { writeFile, mkdir } from "node:fs/promises";
 import path from "node:path";
 import { setTimeout } from "node:timers/promises";
 import TOML from "@iarna/toml";
+import chalk from "chalk";
 import { findUp } from "find-up";
 import getPort from "get-port";
 import { render } from "ink";
 import React from "react";
 import onExit from "signal-exit";
+import supportsColor from "supports-color";
 import makeCLI from "yargs";
 import { version as wranglerVersion } from "../package.json";
-import { toFormData } from "./api/form_data";
 import { fetchResult } from "./cfetch";
 import { findWranglerToml, readConfig } from "./config";
-import Dev from "./dev";
+import { createWorkerUploadForm } from "./create-worker-upload-form";
+import Dev from "./dev/dev";
 import { confirm, prompt } from "./dialogs";
 import { getEntry } from "./entry";
 import {
@@ -26,9 +28,11 @@ import {
   createNamespace,
   isValidNamespaceBinding,
   getKeyValue,
+  isKeyValue,
+  unexpectedKeyValueProps,
 } from "./kv";
 import { getPackageManager } from "./package-manager";
-import { pages } from "./pages";
+import { pages, pagesBetaWarning } from "./pages";
 import { formatMessage, ParseError, parseJSON, readFileSync } from "./parse";
 import publish from "./publish";
 import { createR2Bucket, deleteR2Bucket, listR2Buckets } from "./r2";
@@ -43,7 +47,6 @@ import {
   login,
   logout,
   listScopes,
-  initialise as initialiseUserConfig,
   loginOrRefreshIfRequired,
   getAccountId,
   validateScopeKeys,
@@ -53,6 +56,7 @@ import { whoami } from "./whoami";
 import type { Config } from "./config";
 import type { TailCLIFilters } from "./tail";
 import type { RawData } from "ws";
+import type { CommandModule } from "yargs";
 import type Yargs from "yargs";
 
 type ConfigPath = string | undefined;
@@ -79,25 +83,106 @@ ${TOML.stringify({ rules: config.build.upload.rules })}`
   return rules;
 }
 
-function isLegacyEnv(args: unknown, config: Config): boolean {
-  return (
-    (args as { "legacy-env": boolean | undefined })["legacy-env"] ??
-    config.legacy_env
+function printWranglerBanner() {
+  // Let's not print this in tests
+  if (typeof jest !== "undefined") {
+    return;
+  }
+  const text = ` ⛅️ wrangler ${wranglerVersion} `;
+
+  console.log(
+    text +
+      "\n" +
+      (supportsColor.stdout
+        ? chalk.hex("#FF8800")("-".repeat(text.length))
+        : "-".repeat(text.length))
   );
 }
 
+function isLegacyEnv(args: unknown, config: Config): boolean {
+  return config.legacy_env;
+}
+
 function getScriptName(
   args: { name: string | undefined; env: string | undefined },
   config: Config
 ): string | undefined {
-  const shortScriptName = args.name ?? config.name;
-  if (!shortScriptName) {
-    return;
+  if (args.name && isLegacyEnv(args, config) && args.env) {
+    throw new CommandLineArgsError(
+      "In legacy environment mode you cannot use --name and --env together. If you want to specify a Worker name for a specific environment you can add the following to your wrangler.toml config:" +
+        `
+    [env.${args.env}]
+    name = "${args.name}"
+    `
+    );
+  }
+
+  return args.name ?? config.name;
+}
+
+/**
+ * Alternative to the getScriptName() because special Legacy cases allowed "name", and "env" together in Wrangler1
+ */
+function getLegacyScriptName(
+  args: { name: string | undefined; env: string | undefined },
+  config: Config
+) {
+  return args.name && args.env && isLegacyEnv(args, config)
+    ? `${args.name}-${args.env}`
+    : args.name ?? config.name;
+}
+
+/**
+ * Ensure that a user is logged in, and a valid account_id is available.
+ */
+async function requireAuth(
+  config: Config,
+  isInteractive = true
+): Promise<string> {
+  const loggedIn = await loginOrRefreshIfRequired(isInteractive);
+  if (!loggedIn) {
+    // didn't login, let's just quit
+    throw new Error("Did not login, quitting...");
   }
+  const accountId = config.account_id || (await getAccountId(isInteractive));
+  if (!accountId) {
+    throw new Error("No account id found, quitting...");
+  }
+
+  return accountId;
+}
+
+/**
+ * Get a promise to the streamed input from stdin.
+ *
+ * This function can be used to grab the incoming stream of data from, say,
+ * piping the output of another process into the wrangler process.
+ */
+function readFromStdin(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const stdin = process.stdin;
+    const chunks: string[] = [];
+
+    // When there is data ready to be read, the `readable` event will be triggered.
+    // In the handler for `readable` we call `read()` over and over until all the available data has been read.
+    stdin.on("readable", () => {
+      let chunk;
+      while (null !== (chunk = stdin.read())) {
+        chunks.push(chunk);
+      }
+    });
+
+    // When the streamed data is complete the `end` event will be triggered.
+    // In the handler for `end` we join the chunks together and resolve the promise.
+    stdin.on("end", () => {
+      resolve(chunks.join(""));
+    });
 
-  return isLegacyEnv(args, config)
-    ? `${shortScriptName}${args.env ? `-${args.env}` : ""}`
-    : shortScriptName;
+    // If there is an `error` event then the handler will reject the promise.
+    stdin.on("error", (err) => {
+      reject(err);
+    });
+  });
 }
 
 // a helper to demand one of a set of options
@@ -134,6 +219,7 @@ class DeprecationError extends Error {
 
 export async function main(argv: string[]): Promise<void> {
   const wrangler = makeCLI(argv)
+    .strict()
     // We handle errors ourselves in a try-catch around `yargs.parse`.
     // If you want the "help info" to be displayed then throw an instance of `CommandLineArgsError`.
     // Otherwise we just log the error that was thrown without any "help info".
@@ -148,7 +234,15 @@ export async function main(argv: string[]): Promise<void> {
     .scriptName("wrangler")
     .wrap(null);
 
-  // the default is to simply print the help menu
+  // Default help command that supports the subcommands
+  const subHelp: CommandModule = {
+    command: ["*"],
+    handler: async (args) => {
+      setImmediate(() =>
+        wrangler.parse([...args._.map((a) => `${a}`), "--help"])
+      );
+    },
+  };
   wrangler.command(
     ["*"],
     false,
@@ -189,7 +283,7 @@ export async function main(argv: string[]): Promise<void> {
     () => {
       // "👯 [DEPRECATED]. Scaffold a Cloudflare Workers project from a public GitHub repository.",
       throw new DeprecationError(
-        "`wrangler generate` has been deprecated, please refer to TODO://some/path for alternatives"
+        "`wrangler generate` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#generate for alternatives"
       );
     }
   );
@@ -204,6 +298,12 @@ export async function main(argv: string[]): Promise<void> {
           describe: "The name of your worker",
           type: "string",
         })
+        .option("type", {
+          describe: "The type of worker to create",
+          type: "string",
+          choices: ["rust", "javascript", "webpack"],
+          deprecated: true,
+        })
         .option("yes", {
           describe: 'Answer "yes" to any prompts for new projects',
           type: "boolean",
@@ -211,7 +311,8 @@ export async function main(argv: string[]): Promise<void> {
         });
     },
     async (args) => {
-      if ("type" in args) {
+      printWranglerBanner();
+      if (args.type) {
         let message = "The --type option is no longer supported.";
         if (args.type === "webpack") {
           message +=
@@ -517,7 +618,7 @@ export async function main(argv: string[]): Promise<void> {
     () => {
       // "[DEPRECATED] 🦀 Build your project (if applicable)",
       throw new DeprecationError(
-        "`wrangler build` has been deprecated, please refer to TODO://some/path for alternatives"
+        "`wrangler build` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#build for alternatives"
       );
     }
   );
@@ -544,6 +645,7 @@ export async function main(argv: string[]): Promise<void> {
       // TODO: scopes
     },
     async (args) => {
+      printWranglerBanner();
       if (args["scopes-list"]) {
         listScopes();
         return;
@@ -578,6 +680,7 @@ export async function main(argv: string[]): Promise<void> {
     // "🚪 Logout from Cloudflare",
     () => {},
     async () => {
+      printWranglerBanner();
       await logout();
     }
   );
@@ -588,6 +691,7 @@ export async function main(argv: string[]): Promise<void> {
     "🕵️  Retrieve your user info and test your auth config",
     () => {},
     async () => {
+      printWranglerBanner();
       await whoami();
     }
   );
@@ -600,7 +704,7 @@ export async function main(argv: string[]): Promise<void> {
     () => {
       // "🕵️  Authenticate Wrangler with a Cloudflare API Token",
       throw new DeprecationError(
-        "`wrangler config` has been deprecated, please refer to TODO://some/path for alternatives"
+        "`wrangler config` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#config for alternatives"
       );
     }
   );
@@ -626,6 +730,7 @@ export async function main(argv: string[]): Promise<void> {
         .option("env", {
           describe: "Perform on a specific environment",
           type: "string",
+          alias: "e",
         })
         .option("compatibility-date", {
           describe: "Date to use for compatibility checks",
@@ -642,9 +747,8 @@ export async function main(argv: string[]): Promise<void> {
           default: true,
         })
         .option("ip", {
-          describe: "IP address to listen on",
+          describe: "IP address to listen on, defaults to `localhost`",
           type: "string",
-          default: "127.0.0.1",
         })
         .option("port", {
           describe: "Port to listen on",
@@ -654,15 +758,19 @@ export async function main(argv: string[]): Promise<void> {
           describe: "Port for devtools to connect to",
           type: "number",
         })
+        .option("routes", {
+          describe: "Routes to upload",
+          alias: "route",
+          type: "array",
+        })
         .option("host", {
           type: "string",
           describe:
             "Host to forward requests to, defaults to the zone of project",
         })
         .option("local-protocol", {
-          default: "http",
           describe: "Protocol to listen to requests on, defaults to http.",
-          choices: ["http", "https"],
+          choices: ["http", "https"] as const,
         })
         .option("experimental-public", {
           describe: "Static assets to be served",
@@ -685,10 +793,9 @@ export async function main(argv: string[]): Promise<void> {
           array: true,
         })
         .option("upstream-protocol", {
-          default: "https",
           describe:
             "Protocol to forward requests to host on, defaults to https.",
-          choices: ["http", "https"],
+          choices: ["http", "https"] as const,
         })
         .option("jsx-factory", {
           describe: "The function that is called for each JSX element",
@@ -698,6 +805,10 @@ export async function main(argv: string[]): Promise<void> {
           describe: "The function that is called for each JSX fragment",
           type: "string",
         })
+        .option("tsconfig", {
+          describe: "Path to a custom tsconfig.json file",
+          type: "string",
+        })
         .option("local", {
           alias: "l",
           describe: "Run on my machine",
@@ -710,11 +821,12 @@ export async function main(argv: string[]): Promise<void> {
         });
     },
     async (args) => {
-      const config = readConfig(
+      printWranglerBanner();
+      const configPath =
         (args.config as ConfigPath) ||
-          (args.script && findWranglerToml(path.dirname(args.script)))
-      );
-      const entry = getEntry(config, "dev", args.script);
+        (args.script && findWranglerToml(path.dirname(args.script)));
+      const config = readConfig(configPath, args);
+      const entry = await getEntry(args, config, "dev");
 
       if (args["experimental-public"]) {
         console.warn(
@@ -728,52 +840,112 @@ export async function main(argv: string[]): Promise<void> {
         );
       }
 
-      if (config.site?.["entry-point"]) {
+      const upstreamProtocol =
+        (args["upstream-protocol"] as "http" | "https") ||
+        config.dev.upstream_protocol;
+      if (upstreamProtocol === "http") {
         console.warn(
-          "Deprecation notice: The `site.entry-point` config field is no longer used.\n" +
-            "The entry-point is specified via the command line (e.g. `wrangler dev path/to/script`).\n" +
-            "Please remove the `site.entry-point` field from the `wrangler.toml` file."
+          "Setting upstream-protocol to http is not currently implemented.\n" +
+            "If this is required in your project, please add your use case to the following issue:\n" +
+            "https://github.com/cloudflare/wrangler2/issues/583."
         );
       }
 
-      if (!args.local) {
-        // -- snip, extract --
-        const loggedIn = await loginOrRefreshIfRequired();
-        if (!loggedIn) {
-          // didn't login, let's just quit
-          console.log("Did not login, quitting...");
-          return;
-        }
+      const accountId = !args.local ? await requireAuth(config) : undefined;
 
-        if (!config.account_id) {
-          config.account_id = await getAccountId();
-          if (!config.account_id) {
-            throw new Error("No account id found, quitting...");
-          }
+      // TODO: if worker_dev = false and no routes, then error (only for dev)
+
+      /**
+       * Given something that resembles a URL,
+       * try to extract a host from it
+       */
+      function getHost(urlLike: string): string | undefined {
+        if (
+          !(urlLike.startsWith("http://") || urlLike.startsWith("https://"))
+        ) {
+          urlLike = "http://" + urlLike;
         }
-        // -- snip, end --
+        return new URL(urlLike).host;
       }
 
-      const environments = config.env ?? {};
-      const envRootObj = args.env ? environments[args.env] || {} : config;
+      /**
+       * Given something that resembles a host,
+       * try to infer a zone id from it
+       */
+      async function getZoneId(host: string): Promise<string | undefined> {
+        const zones = await fetchResult<{ id: string }[]>(
+          `/zones`,
+          {},
+          new URLSearchParams({ name: host })
+        );
+        return zones[0]?.id;
+      }
+
+      // When we're given a host (in one of the above ways), we do 2 things:
+      // - We try to extract a host from it
+      // - We try to get a zone id from the host
+      //
+      // So it turns out it's particularly hard to get a 'valid' domain
+      // from a string, so we don't even try to validate TLDs, etc.
+      // Once we get something that looks like w.x.y.z-ish, we then try to
+      // get a zone id for it, by lopping off subdomains until we get a hit
+      // from the API. That's it!
+
+      let zone: { host: string; id: string } | undefined;
+
+      if (!args.local) {
+        const hostLike =
+          args.host ||
+          config.dev.host ||
+          (args.routes && args.routes[0]) ||
+          config.route ||
+          (config.routes && config.routes[0]);
+        const host =
+          typeof hostLike === "string" ? getHost(hostLike) : undefined;
+        let zoneId: string | undefined;
+        const hostPieces =
+          typeof host === "string" ? host.split(".") : undefined;
+        while (hostPieces && hostPieces.length > 1) {
+          zoneId = await getZoneId(hostPieces.join("."));
+          if (zoneId) break;
+          hostPieces.shift();
+        }
+        if (host && !zoneId) {
+          throw new Error(`Could not find zone for ${hostLike}`);
+        }
+        zone =
+          typeof zoneId === "string" && typeof host === "string"
+            ? {
+                host,
+                id: zoneId,
+              }
+            : undefined;
+      }
 
       const { waitUntilExit } = render(
         <Dev
           name={getScriptName(args, config)}
           entry={entry}
           env={args.env}
-          zone={undefined}
+          zone={zone}
           rules={getRules(config)}
           legacyEnv={isLegacyEnv(args, config)}
-          buildCommand={config.build || {}}
-          format={args.format || config.build?.upload?.format}
+          build={config.build || {}}
           initialMode={args.local ? "local" : "remote"}
-          jsxFactory={args["jsx-factory"] || envRootObj?.jsx_factory}
-          jsxFragment={args["jsx-fragment"] || envRootObj?.jsx_fragment}
+          jsxFactory={args["jsx-factory"] || config.jsx_factory}
+          jsxFragment={args["jsx-fragment"] || config.jsx_fragment}
+          tsconfig={args.tsconfig ?? config.tsconfig}
+          upstreamProtocol={upstreamProtocol}
+          localProtocol={
+            // The typings are not quite clever enough to handle element accesses, only property accesses,
+            // so we need to cast here.
+            (args["local-protocol"] as "http" | "https") ||
+            config.dev.local_protocol
+          }
           enableLocalPersistence={
             args["experimental-enable-local-persistence"] || false
           }
-          accountId={config.account_id}
+          accountId={accountId}
           assetPaths={getAssetPaths(
             config,
             args.site,
@@ -783,6 +955,7 @@ export async function main(argv: string[]): Promise<void> {
           port={
             args.port || config.dev?.port || (await getPort({ port: 8787 }))
           }
+          ip={args.ip || config.dev.ip}
           inspectorPort={
             args["inspector-port"] ?? (await getPort({ port: 9229 }))
           }
@@ -796,9 +969,9 @@ export async function main(argv: string[]): Promise<void> {
             (args["compatibility-flags"] as string[]) ||
             config.compatibility_flags
           }
-          usageModel={envRootObj.usage_model}
+          usageModel={config.usage_model}
           bindings={{
-            kv_namespaces: envRootObj.kv_namespaces?.map(
+            kv_namespaces: config.kv_namespaces?.map(
               ({ binding, preview_id, id: _id }) => {
                 // In `dev`, we make folks use a separate kv namespace called
                 // `preview_id` instead of `id` so that they don't
@@ -819,12 +992,12 @@ export async function main(argv: string[]): Promise<void> {
                 };
               }
             ),
-            vars: envRootObj.vars,
+            vars: config.vars,
             wasm_modules: config.wasm_modules,
             text_blobs: config.text_blobs,
-            durable_objects: envRootObj.durable_objects,
-            r2_buckets: envRootObj.r2_buckets,
-            unsafe: envRootObj.unsafe?.bindings,
+            durable_objects: config.durable_objects,
+            r2_buckets: config.r2_buckets,
+            unsafe: config.unsafe?.bindings,
           }}
         />
       );
@@ -841,6 +1014,7 @@ export async function main(argv: string[]): Promise<void> {
         .option("env", {
           type: "string",
           describe: "Perform on a specific environment",
+          alias: "e",
         })
         .positional("script", {
           describe: "The path to an entry point for your worker",
@@ -905,9 +1079,14 @@ export async function main(argv: string[]): Promise<void> {
         .option("jsx-fragment", {
           describe: "The function that is called for each JSX fragment",
           type: "string",
+        })
+        .option("tsconfig", {
+          describe: "Path to a custom tsconfig.json file",
+          type: "string",
         });
     },
     async (args) => {
+      printWranglerBanner();
       if (args["experimental-public"]) {
         console.warn(
           "🚨  The --experimental-public field is experimental and will change in the future."
@@ -919,11 +1098,11 @@ export async function main(argv: string[]): Promise<void> {
         );
       }
 
-      const config = readConfig(
+      const configPath =
         (args.config as ConfigPath) ||
-          (args.script && findWranglerToml(path.dirname(args.script)))
-      );
-      const entry = getEntry(config, "publish", args.script);
+        (args.script && findWranglerToml(path.dirname(args.script)));
+      const config = readConfig(configPath, args);
+      const entry = await getEntry(args, config, "publish");
 
       if (args.latest) {
         console.warn(
@@ -931,21 +1110,7 @@ export async function main(argv: string[]): Promise<void> {
         );
       }
 
-      // -- snip, extract --
-      const loggedIn = await loginOrRefreshIfRequired();
-      if (!loggedIn) {
-        // didn't login, let's just quit
-        console.log("Did not login, quitting...");
-        return;
-      }
-
-      if (!config.account_id) {
-        config.account_id = await getAccountId();
-        if (!config.account_id) {
-          throw new Error("No account id found, quitting...");
-        }
-      }
-      // -- snip, end --
+      const accountId = await requireAuth(config);
 
       const assetPaths = getAssetPaths(
         config,
@@ -955,9 +1120,9 @@ export async function main(argv: string[]): Promise<void> {
       );
       await publish({
         config,
+        accountId,
         name: getScriptName(args, config),
         rules: getRules(config),
-        format: args.format || config.build?.upload?.format,
         entry,
         env: args.env,
         compatibilityDate: args.latest
@@ -967,6 +1132,7 @@ export async function main(argv: string[]): Promise<void> {
         triggers: args.triggers,
         jsxFactory: args["jsx-factory"],
         jsxFragment: args["jsx-fragment"],
+        tsconfig: args.tsconfig,
         routes: args.routes,
         assetPaths,
         legacyEnv: isLegacyEnv(args, config),
@@ -1023,6 +1189,7 @@ export async function main(argv: string[]): Promise<void> {
           .option("env", {
             type: "string",
             describe: "Perform on a specific environment",
+            alias: "e",
           })
           .option("debug", {
             type: "boolean",
@@ -1034,31 +1201,18 @@ export async function main(argv: string[]): Promise<void> {
       );
     },
     async (args) => {
-      const config = readConfig(args.config as ConfigPath);
+      if (args.format === "pretty") {
+        printWranglerBanner();
+      }
+      const config = readConfig(args.config as ConfigPath, args);
 
-      const scriptName = getScriptName(args, config);
+      const scriptName = getLegacyScriptName(args, config);
 
       if (!scriptName) {
         throw new Error("Missing script name");
       }
 
-      // -- snip, extract --
-      const loggedIn = await loginOrRefreshIfRequired();
-      if (!loggedIn) {
-        // didn't login, let's just quit
-        console.log("Did not login, quitting...");
-        return;
-      }
-
-      if (!config.account_id) {
-        config.account_id = await getAccountId();
-        if (!config.account_id) {
-          throw new Error("No account id found, quitting...");
-        }
-      }
-      // -- snip, end --
-
-      const accountId = config.account_id;
+      const accountId = await requireAuth(config);
 
       const cliFilters: TailCLIFilters = {
         status: args.status as ("ok" | "error" | "canceled")[],
@@ -1163,27 +1317,10 @@ export async function main(argv: string[]): Promise<void> {
           "***************************************************\n"
       );
 
-      const config = readConfig(args.config as ConfigPath);
-      const entry = getEntry(config, "dev");
-
-      // -- snip, extract --
-      const loggedIn = await loginOrRefreshIfRequired();
-      if (!loggedIn) {
-        // didn't login, let's just quit
-        console.log("Did not login, quitting...");
-        return;
-      }
-
-      if (!config.account_id) {
-        config.account_id = await getAccountId();
-        if (!config.account_id) {
-          throw new Error("No account id found, quitting...");
-        }
-      }
-      // -- snip, end --
+      const config = readConfig(args.config as ConfigPath, args);
+      const entry = await getEntry({}, config, "dev");
 
-      const environments = config.env ?? {};
-      const envRootObj = args.env ? environments[args.env] || {} : config;
+      const accountId = await requireAuth(config);
 
       const { waitUntilExit } = render(
         <Dev
@@ -1193,15 +1330,18 @@ export async function main(argv: string[]): Promise<void> {
           env={args.env}
           zone={undefined}
           legacyEnv={isLegacyEnv(args, config)}
-          buildCommand={config.build || {}}
-          format={config.build?.upload?.format}
+          build={config.build || {}}
           initialMode={args.local ? "local" : "remote"}
-          jsxFactory={envRootObj?.jsx_factory}
-          jsxFragment={envRootObj?.jsx_fragment}
+          jsxFactory={config.jsx_factory}
+          jsxFragment={config.jsx_fragment}
+          tsconfig={config.tsconfig}
+          upstreamProtocol={config.dev.upstream_protocol}
+          localProtocol={config.dev.local_protocol}
           enableLocalPersistence={false}
-          accountId={config.account_id}
+          accountId={accountId}
           assetPaths={undefined}
           port={config.dev?.port}
+          ip={config.dev.ip}
           public={undefined}
           compatibilityDate={
             config.compatibility_date ||
@@ -1213,7 +1353,7 @@ export async function main(argv: string[]): Promise<void> {
           }
           usageModel={config.usage_model}
           bindings={{
-            kv_namespaces: envRootObj.kv_namespaces?.map(
+            kv_namespaces: config.kv_namespaces?.map(
               ({ binding, preview_id, id: _id }) => {
                 // In `dev`, we make folks use a separate kv namespace called
                 // `preview_id` instead of `id` so that they don't
@@ -1234,12 +1374,12 @@ export async function main(argv: string[]): Promise<void> {
                 };
               }
             ),
-            vars: envRootObj.vars,
+            vars: config.vars,
             wasm_modules: config.wasm_modules,
             text_blobs: config.text_blobs,
-            durable_objects: envRootObj.durable_objects,
-            r2_buckets: envRootObj.r2_buckets,
-            unsafe: envRootObj.unsafe?.bindings,
+            durable_objects: config.durable_objects,
+            r2_buckets: config.r2_buckets,
+            unsafe: config.unsafe?.bindings,
           }}
           inspectorPort={await getPort({ port: 9229 })}
         />
@@ -1248,7 +1388,7 @@ export async function main(argv: string[]): Promise<void> {
     }
   );
 
-  // route
+  // [DEPRECATED] route
   wrangler.command(
     "route",
     false, // I think we want to hide this command
@@ -1273,21 +1413,21 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
               });
           },
-          async (args) => {
-            console.log(":route list", args);
-            // TODO: use environment (current wrangler doesn't do so?)
-            // TODO: don't get `zone_id` from config at all and require the command line arg `--zone`.
-            const config = readConfig(args.config as ConfigPath);
-            const zone = args.zone || config.zone_id;
-            if (!zone) {
-              throw new Error("missing zone id");
-            }
-
-            console.log(await fetchResult(`/zones/${zone}/workers/routes`));
+          () => {
+            // "👯 [DEPRECATED]. Use wrangler.toml to manage routes.
+            const deprecationNotice =
+              "`wrangler route list` has been deprecated.";
+            const futureRoutes =
+              "Refer to wrangler.toml for a list of routes the worker will be deployed to upon publishing.";
+            const presentRoutes =
+              "Refer to the Cloudflare Dashboard to see the routes this worker is currently running on.";
+            throw new DeprecationError(
+              `${deprecationNotice}\n${futureRoutes}\n${presentRoutes}`
+            );
           }
         )
         .command(
-          "delete <id>",
+          "delete [id]",
           "Delete a route associated with a zone",
           (yargs) => {
             return yargs
@@ -1304,22 +1444,22 @@ export async function main(argv: string[]): Promise<void> {
                 describe: "Perform on a specific environment",
               });
           },
-          async (args) => {
-            console.log(":route delete", args);
-            // TODO: use environment (current wrangler doesn't do so?)
-            const config = readConfig(args.config as ConfigPath);
-            const zone = args.zone || config.zone_id;
-            if (!zone) {
-              throw new Error("missing zone id");
-            }
-
-            console.log(
-              await fetchResult(`/zones/${zone}/workers/routes/${args.id}`, {
-                method: "DELETE",
-              })
-            );
+          () => {
+            // "👯 [DEPRECATED]. Use wrangler.toml to manage routes.
+            const deprecationNotice =
+              "`wrangler route delete` has been deprecated.";
+            const shouldDo =
+              "Remove the unwanted route(s) from wrangler.toml and run `wrangler publish` to remove your worker from those routes.";
+            throw new DeprecationError(`${deprecationNotice}\n${shouldDo}`);
           }
         );
+    },
+    () => {
+      // "👯 [DEPRECATED]. Use wrangler.toml to manage routes.
+      const deprecationNotice = "`wrangler route` has been deprecated.";
+      const shouldDo =
+        "Please use wrangler.toml and/or `wrangler publish --routes` to modify routes";
+      throw new DeprecationError(`${deprecationNotice}\n${shouldDo}`);
     }
   );
 
@@ -1333,7 +1473,7 @@ export async function main(argv: string[]): Promise<void> {
     },
     () => {
       throw new DeprecationError(
-        "`wrangler subdomain` has been deprecated, please refer to TODO://some/path for alternatives"
+        "`wrangler subdomain` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#subdomain for alternatives"
       );
     }
   );
@@ -1344,6 +1484,7 @@ export async function main(argv: string[]): Promise<void> {
     "🤫 Generate a secret that can be referenced in the worker script",
     (secretYargs) => {
       return secretYargs
+        .command(subHelp)
         .command(
           "put <key>",
           "Create or update a secret variable for a script",
@@ -1361,36 +1502,24 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe:
                   "Binds the secret to the Worker of the specific environment",
+                alias: "e",
               });
           },
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            printWranglerBanner();
+            const config = readConfig(args.config as ConfigPath, args);
 
-            const scriptName = getScriptName(args, config);
+            const scriptName = getLegacyScriptName(args, config);
             if (!scriptName) {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
+            const isInteractive = process.stdin.isTTY;
+            const accountId = await requireAuth(config, isInteractive);
 
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
-
-            const secretValue = await prompt(
-              "Enter a secret value:",
-              "password"
-            );
+            const secretValue = isInteractive
+              ? await prompt("Enter a secret value:", "password")
+              : await readFromStdin();
 
             console.log(
               `🌀 Creating the secret for script ${scriptName} ${
@@ -1401,8 +1530,8 @@ export async function main(argv: string[]): Promise<void> {
             async function submitSecret() {
               const url =
                 !args.env || isLegacyEnv(args, config)
-                  ? `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`
-                  : `/accounts/${config.account_id}/workers/services/${scriptName}/environments/${args.env}/secrets`;
+                  ? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets`
+                  : `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/secrets`;
 
               return await fetchResult(url, {
                 method: "PUT",
@@ -1415,49 +1544,61 @@ export async function main(argv: string[]): Promise<void> {
               });
             }
 
+            const createDraftWorker = async () => {
+              // TODO: log a warning
+              await fetchResult(
+                !args["legacy-env"] && args.env
+                  ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}`
+                  : `/accounts/${accountId}/workers/scripts/${scriptName}`,
+                {
+                  method: "PUT",
+                  body: createWorkerUploadForm({
+                    name: scriptName,
+                    main: {
+                      name: scriptName,
+                      content: `export default { fetch() {} }`,
+                      type: "esm",
+                    },
+                    bindings: {
+                      kv_namespaces: [],
+                      vars: {},
+                      durable_objects: { bindings: [] },
+                      r2_buckets: [],
+                      wasm_modules: {},
+                      text_blobs: {},
+                      unsafe: [],
+                    },
+                    modules: [],
+                    migrations: undefined,
+                    compatibility_date: undefined,
+                    compatibility_flags: undefined,
+                    usage_model: undefined,
+                  }),
+                }
+              );
+            };
+
+            function isMissingWorkerError(e: unknown): e is { code: 10007 } {
+              return (
+                typeof e === "object" &&
+                e !== null &&
+                (e as { code: 10007 }).code === 10007
+              );
+            }
+
             try {
               await submitSecret();
             } catch (e) {
-              // @ts-expect-error non-standard property on Error
-              if (e.code === 10007) {
-                // upload a draft worker
-                // TODO: log a warning
-                await fetchResult(
-                  !args["legacy-env"] && args.env
-                    ? `/accounts/${config.account_id}/workers/services/${scriptName}/environments/${args.env}`
-                    : `/accounts/${config.account_id}/workers/scripts/${scriptName}`,
-                  {
-                    method: "PUT",
-                    body: toFormData({
-                      name: scriptName,
-                      main: {
-                        name: scriptName,
-                        content: `export default { fetch() {} }`,
-                        type: "esm",
-                      },
-                      bindings: {
-                        kv_namespaces: [],
-                        vars: {},
-                        durable_objects: { bindings: [] },
-                        r2_buckets: [],
-                        wasm_modules: {},
-                        text_blobs: {},
-                        unsafe: [],
-                      },
-                      modules: [],
-                      migrations: undefined,
-                      compatibility_date: undefined,
-                      compatibility_flags: undefined,
-                      usage_model: undefined,
-                    }),
-                  }
-                );
-
-                // and then try again
+              if (isMissingWorkerError(e)) {
+                // create a draft worker and try again
+                await createDraftWorker();
                 await submitSecret();
                 // TODO: delete the draft worker if this failed too?
+              } else {
+                throw e;
               }
             }
+
             console.log(`✨ Success! Uploaded secret ${args.key}`);
           }
         )
@@ -1465,6 +1606,7 @@ export async function main(argv: string[]): Promise<void> {
           "delete <key>",
           "Delete a secret variable from a script",
           (yargs) => {
+            printWranglerBanner();
             return yargs
               .positional("key", {
                 describe: "The variable name to be accessible in the script",
@@ -1478,31 +1620,18 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe:
                   "Binds the secret to the Worker of the specific environment",
+                alias: "e",
               });
           },
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-            const scriptName = getScriptName(args, config);
+            const scriptName = getLegacyScriptName(args, config);
             if (!scriptName) {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             if (
               await confirm(
@@ -1521,8 +1650,8 @@ export async function main(argv: string[]): Promise<void> {
 
               const url =
                 !args.env || isLegacyEnv(args, config)
-                  ? `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`
-                  : `/accounts/${config.account_id}/workers/services/${scriptName}/environments/${args.env}/secrets`;
+                  ? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets`
+                  : `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/secrets`;
 
               await fetchResult(`${url}/${args.key}`, { method: "DELETE" });
               console.log(`✨ Success! Deleted secret ${args.key}`);
@@ -1542,36 +1671,23 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe:
                   "Binds the secret to the Worker of the specific environment.",
+                alias: "e",
               });
           },
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-            const scriptName = getScriptName(args, config);
+            const scriptName = getLegacyScriptName(args, config);
             if (!scriptName) {
               throw new Error("Missing script name");
             }
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             const url =
               !args.env || isLegacyEnv(args, config)
-                ? `/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`
-                : `/accounts/${config.account_id}/workers/services/${scriptName}/environments/${args.env}/secrets`;
+                ? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets`
+                : `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/secrets`;
 
             console.log(JSON.stringify(await fetchResult(url), null, "  "));
           }
@@ -1586,6 +1702,7 @@ export async function main(argv: string[]): Promise<void> {
     "🗂️  Interact with your Workers KV Namespaces",
     (namespaceYargs) => {
       return namespaceYargs
+        .command(subHelp)
         .command(
           "create <namespace>",
           "Create a new namespace",
@@ -1599,6 +1716,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1606,12 +1724,7 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async (args) => {
-            if (args._.length > 2) {
-              const extraArgs = args._.slice(2).join(" ");
-              throw new CommandLineArgsError(
-                `Unexpected additional positional arguments "${extraArgs}".`
-              );
-            }
+            printWranglerBanner();
 
             if (!isValidNamespaceBinding(args.namespace)) {
               throw new CommandLineArgsError(
@@ -1619,7 +1732,7 @@ export async function main(argv: string[]): Promise<void> {
               );
             }
 
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             if (!config.name) {
               console.warn(
                 "No configured name present, using `worker` as a prefix for the title"
@@ -1631,26 +1744,12 @@ export async function main(argv: string[]): Promise<void> {
             const preview = args.preview ? "_preview" : "";
             const title = `${name}${environment}-${args.namespace}${preview}`;
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             // TODO: generate a binding name stripping non alphanumeric chars
 
             console.log(`🌀 Creating namespace with title "${title}"`);
-            const namespaceId = await createNamespace(config.account_id, title);
+            const namespaceId = await createNamespace(accountId, title);
 
             console.log("✨ Success!");
             const envString = args.env ? ` under [env.${args.env}]` : "";
@@ -1670,32 +1769,14 @@ export async function main(argv: string[]): Promise<void> {
           "Outputs a list of all KV namespaces associated with your account id.",
           {},
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
-
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
+            const config = readConfig(args.config as ConfigPath, args);
 
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             // TODO: we should show bindings if they exist for given ids
 
             console.log(
-              JSON.stringify(
-                await listNamespaces(config.account_id),
-                null,
-                "  "
-              )
+              JSON.stringify(await listNamespaces(accountId), null, "  ")
             );
           }
         )
@@ -1716,6 +1797,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1723,7 +1805,8 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            printWranglerBanner();
+            const config = readConfig(args.config as ConfigPath, args);
 
             let id;
             try {
@@ -1734,24 +1817,10 @@ export async function main(argv: string[]): Promise<void> {
               );
             }
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             await fetchResult<{ id: string }>(
-              `/accounts/${config.account_id}/storage/kv/namespaces/${id}`,
+              `/accounts/${accountId}/storage/kv/namespaces/${id}`,
               { method: "DELETE" }
             );
 
@@ -1783,6 +1852,7 @@ export async function main(argv: string[]): Promise<void> {
     "🔑 Individually manage Workers KV key-value pairs",
     (kvKeyYargs) => {
       return kvKeyYargs
+        .command(subHelp)
         .command(
           "put <key> [value]",
           "Writes a single key/value pair to the given namespace.",
@@ -1809,6 +1879,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1830,7 +1901,8 @@ export async function main(argv: string[]): Promise<void> {
               .check(demandOneOfOption("value", "path"));
           },
           async ({ key, ttl, expiration, ...args }) => {
-            const config = readConfig(args.config as ConfigPath);
+            printWranglerBanner();
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
             // One of `args.path` and `args.value` must be defined
             const value = args.path
@@ -1848,23 +1920,11 @@ export async function main(argv: string[]): Promise<void> {
               );
             }
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
-            await putKeyValue(config.account_id, namespaceId, key, value, {
+            await putKeyValue(accountId, namespaceId, {
+              key,
+              value,
               expiration,
               expiration_ttl: ttl,
             });
@@ -1887,6 +1947,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1901,27 +1962,13 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ prefix, ...args }) => {
             // TODO: support for limit+cursor (pagination)
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             const results = await listNamespaceKeys(
-              config.account_id,
+              accountId,
               namespaceId,
               prefix
             );
@@ -1950,6 +1997,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1963,26 +2011,12 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async ({ key, ...args }) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
-            console.log(await getKeyValue(config.account_id, namespaceId, key));
+            console.log(await getKeyValue(accountId, namespaceId, key));
           }
         )
         .command(
@@ -2007,6 +2041,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -2014,31 +2049,18 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async ({ key, ...args }) => {
-            const config = readConfig(args.config as ConfigPath);
+            printWranglerBanner();
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
             console.log(
               `deleting the key "${key}" on namespace ${namespaceId}`
             );
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
-            }
-
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
-              }
-            }
-            // -- snip, end --
+            const accountId = await requireAuth(config);
 
             await fetchResult(
-              `/accounts/${config.account_id}/storage/kv/namespaces/${namespaceId}/values/${key}`,
+              `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`,
               { method: "DELETE" }
             );
           }
@@ -2052,6 +2074,7 @@ export async function main(argv: string[]): Promise<void> {
     "💪 Interact with multiple Workers KV key-value pairs at once",
     (kvBulkYargs) => {
       return kvBulkYargs
+        .command(subHelp)
         .command(
           "put <filename>",
           "Upload multiple key-value pairs to a namespace",
@@ -2074,6 +2097,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -2081,33 +2105,80 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async ({ filename, ...args }) => {
+            printWranglerBanner();
             // The simplest implementation I could think of.
             // This could be made more efficient with a streaming parser/uploader
             // but we'll do that in the future if needed.
 
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
             const content = parseJSON(readFileSync(filename), filename);
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
+            if (!Array.isArray(content)) {
+              throw new Error(
+                `Unexpected JSON input from "${filename}".\n` +
+                  `Expected an array of key-value objects but got type "${typeof content}".`
+              );
             }
 
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
+            const errors: string[] = [];
+            const warnings: string[] = [];
+            for (let i = 0; i < content.length; i++) {
+              const keyValue = content[i];
+              if (typeof keyValue !== "object") {
+                errors.push(
+                  `The item at index ${i} is type: "${typeof keyValue}" - ${JSON.stringify(
+                    keyValue
+                  )}`
+                );
+              } else if (!isKeyValue(keyValue)) {
+                errors.push(
+                  `The item at index ${i} is ${JSON.stringify(keyValue)}`
+                );
+              } else {
+                const props = unexpectedKeyValueProps(keyValue);
+                if (props.length > 0) {
+                  warnings.push(
+                    `The item at index ${i} contains unexpected properties: ${JSON.stringify(
+                      props
+                    )}.`
+                  );
+                }
               }
             }
-            // -- snip, end --
+            if (warnings.length > 0) {
+              console.warn(
+                `Unexpected key-value properties in "${filename}".\n` +
+                  warnings.join("\n")
+              );
+            }
+            if (errors.length > 0) {
+              throw new Error(
+                `Unexpected JSON input from "${filename}".\n` +
+                  `Each item in the array should be an object that matches:\n\n` +
+                  `interface KeyValue {\n` +
+                  `  key: string;\n` +
+                  `  value: string;\n` +
+                  `  expiration?: number;\n` +
+                  `  expiration_ttl?: number;\n` +
+                  `  metadata?: object;\n` +
+                  `  base64?: boolean;\n` +
+                  `}\n\n` +
+                  errors.join("\n")
+              );
+            }
 
-            console.log(
-              await putBulkKeyValue(config.account_id, namespaceId, content)
+            const accountId = await requireAuth(config);
+            await putBulkKeyValue(
+              accountId,
+              namespaceId,
+              content,
+              (index, total) => {
+                console.log(`Uploaded ${index} of ${total}.`);
+              }
             );
+
+            console.log("Success!");
           }
         )
         .command(
@@ -2132,156 +2203,148 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
                 describe: "Interact with a preview namespace",
+              })
+              .option("force", {
+                type: "boolean",
+                alias: "f",
+                describe: "Do not ask for confirmation before deleting",
               });
           },
           async ({ filename, ...args }) => {
-            const config = readConfig(args.config as ConfigPath);
+            printWranglerBanner();
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
-            const content = parseJSON(readFileSync(filename), filename);
 
-            // -- snip, extract --
-            const loggedIn = await loginOrRefreshIfRequired();
-            if (!loggedIn) {
-              // didn't login, let's just quit
-              console.log("Did not login, quitting...");
-              return;
+            if (!args.force) {
+              const result = await confirm(
+                `Are you sure you want to delete all the keys read from "${filename}" from kv-namespace with id "${namespaceId}"?`
+              );
+              if (!result) {
+                console.log(`Not deleting keys read from "${filename}".`);
+                return;
+              }
+            }
+
+            const content = parseJSON(
+              readFileSync(filename),
+              filename
+            ) as string[];
+
+            if (!Array.isArray(content)) {
+              throw new Error(
+                `Unexpected JSON input from "${filename}".\n` +
+                  `Expected an array of strings but got:\n${content}`
+              );
             }
 
-            if (!config.account_id) {
-              config.account_id = await getAccountId();
-              if (!config.account_id) {
-                throw new Error("No account id found, quitting...");
+            const errors: string[] = [];
+            for (let i = 0; i < content.length; i++) {
+              const key = content[i];
+              if (typeof key !== "string") {
+                errors.push(
+                  `The item at index ${i} is type: "${typeof key}" - ${JSON.stringify(
+                    key
+                  )}`
+                );
               }
             }
-            // -- snip, end --
+            if (errors.length > 0) {
+              throw new Error(
+                `Unexpected JSON input from "${filename}".\n` +
+                  `Expected an array of strings.\n` +
+                  errors.join("\n")
+              );
+            }
 
-            console.log(
-              await deleteBulkKeyValue(config.account_id, namespaceId, content)
+            const accountId = await requireAuth(config);
+
+            await deleteBulkKeyValue(
+              accountId,
+              namespaceId,
+              content,
+              (index, total) => {
+                console.log(`Deleted ${index} of ${total}.`);
+              }
             );
+
+            console.log("Success!");
           }
         );
     }
   );
 
-  wrangler.command("pages", "⚡️ Configure Cloudflare Pages", pages);
+  wrangler.command(
+    "pages",
+    "⚡️ Configure Cloudflare Pages",
+    async (pagesYargs) => {
+      await pages(pagesYargs.command(subHelp).epilogue(pagesBetaWarning));
+    }
+  );
 
   wrangler.command("r2", "📦 Interact with an R2 store", (r2Yargs) => {
-    return r2Yargs.command("bucket", "Manage R2 buckets", (r2BucketYargs) => {
-      r2BucketYargs.command(
-        "create <name>",
-        "Create a new R2 bucket",
-        (yargs) => {
-          return yargs.positional("name", {
-            describe: "The name of the new bucket",
-            type: "string",
-            demandOption: true,
-          });
-        },
-        async (args) => {
-          // We expect three values in `_`: `r2`, `bucket`, `create`.
-          if (args._.length > 3) {
-            const extraArgs = args._.slice(3).join(" ");
-            throw new CommandLineArgsError(
-              `Unexpected additional positional arguments "${extraArgs}".`
-            );
-          }
+    return r2Yargs
+      .command(subHelp)
+      .command("bucket", "Manage R2 buckets", (r2BucketYargs) => {
+        r2BucketYargs.command(
+          "create <name>",
+          "Create a new R2 bucket",
+          (yargs) => {
+            return yargs.positional("name", {
+              describe: "The name of the new bucket",
+              type: "string",
+              demandOption: true,
+            });
+          },
+          async (args) => {
+            printWranglerBanner();
 
-          const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-          // -- snip, extract --
-          const loggedIn = await loginOrRefreshIfRequired();
-          if (!loggedIn) {
-            // didn't login, let's just quit
-            console.log("Did not login, quitting...");
-            return;
-          }
+            const accountId = await requireAuth(config);
 
-          if (!config.account_id) {
-            config.account_id = await getAccountId();
-            if (!config.account_id) {
-              throw new Error("No account id found, quitting...");
-            }
+            console.log(`Creating bucket ${args.name}.`);
+            await createR2Bucket(accountId, args.name);
+            console.log(`Created bucket ${args.name}.`);
           }
-          // -- snip, end --
-
-          console.log(`Creating bucket ${args.name}.`);
-          await createR2Bucket(config.account_id, args.name);
-          console.log(`Created bucket ${args.name}.`);
-        }
-      );
-
-      r2BucketYargs.command("list", "List R2 buckets", {}, async (args) => {
-        const config = readConfig(args.config as ConfigPath);
+        );
 
-        // -- snip, extract --
-        const loggedIn = await loginOrRefreshIfRequired();
-        if (!loggedIn) {
-          // didn't login, let's just quit
-          console.log("Did not login, quitting...");
-          return;
-        }
+        r2BucketYargs.command("list", "List R2 buckets", {}, async (args) => {
+          const config = readConfig(args.config as ConfigPath, args);
 
-        if (!config.account_id) {
-          config.account_id = await getAccountId();
-          if (!config.account_id) {
-            throw new Error("No account id found, quitting...");
-          }
-        }
-        // -- snip, end --
+          const accountId = await requireAuth(config);
 
-        console.log(
-          JSON.stringify(await listR2Buckets(config.account_id), null, 2)
-        );
-      });
+          console.log(JSON.stringify(await listR2Buckets(accountId), null, 2));
+        });
 
-      r2BucketYargs.command(
-        "delete <name>",
-        "Delete an R2 bucket",
-        (yargs) => {
-          return yargs.positional("name", {
-            describe: "The name of the bucket to delete",
-            type: "string",
-            demandOption: true,
-          });
-        },
-        async (args) => {
-          // We expect three values in `_`: `r2`, `bucket`, `delete`.
-          if (args._.length > 3) {
-            const extraArgs = args._.slice(3).join(" ");
-            throw new CommandLineArgsError(
-              `Unexpected additional positional arguments "${extraArgs}".`
-            );
-          }
+        r2BucketYargs.command(
+          "delete <name>",
+          "Delete an R2 bucket",
+          (yargs) => {
+            return yargs.positional("name", {
+              describe: "The name of the bucket to delete",
+              type: "string",
+              demandOption: true,
+            });
+          },
+          async (args) => {
+            printWranglerBanner();
 
-          const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-          // -- snip, extract --
-          const loggedIn = await loginOrRefreshIfRequired();
-          if (!loggedIn) {
-            // didn't login, let's just quit
-            console.log("Did not login, quitting...");
-            return;
-          }
+            const accountId = await requireAuth(config);
 
-          if (!config.account_id) {
-            config.account_id = await getAccountId();
-            if (!config.account_id) {
-              throw new Error("No account id found, quitting...");
-            }
+            console.log(`Deleting bucket ${args.name}.`);
+            await deleteR2Bucket(accountId, args.name);
+            console.log(`Deleted bucket ${args.name}.`);
           }
-          // -- snip, end --
-
-          console.log(`Deleting bucket ${args.name}.`);
-          await deleteR2Bucket(config.account_id, args.name);
-          console.log(`Deleted bucket ${args.name}.`);
-        }
-      );
-      return r2BucketYargs;
-    });
+        );
+        return r2BucketYargs;
+      });
   });
 
   wrangler
@@ -2301,7 +2364,6 @@ export async function main(argv: string[]): Promise<void> {
   wrangler.exitProcess(false);
 
   try {
-    await initialiseUserConfig();
     await wrangler.parse();
   } catch (e) {
     if (e instanceof CommandLineArgsError) {