vercel 46.0.0 → 46.0.2

package/dist/index.js

@@ -41527,6 +41527,261 @@ var init_print_indications = __esm({
   }
 });
 
+// src/util/oauth.ts
+async function as() {
+  if (!_as) {
+    const discoveryResponse = await discoveryEndpointRequest(VERCEL_ISSUER);
+    const [discoveryResponseError, as2] = await processDiscoveryEndpointResponse(discoveryResponse);
+    if (discoveryResponseError) {
+      throw discoveryResponseError;
+    }
+    _as = as2;
+  }
+  return _as;
+}
+async function discoveryEndpointRequest(issuer) {
+  return await (0, import_node_fetch.default)(new URL(".well-known/openid-configuration", issuer), {
+    headers: { "Content-Type": "application/json", "user-agent": userAgent }
+  });
+}
+async function processDiscoveryEndpointResponse(response) {
+  const json = await response.json();
+  if (!response.ok) {
+    return [new Error("Discovery endpoint request failed")];
+  }
+  if (typeof json !== "object" || json === null || !canParseURL(json.issuer) || !canParseURL(json.device_authorization_endpoint) || !canParseURL(json.token_endpoint) || !canParseURL(json.revocation_endpoint) || !canParseURL(json.jwks_uri) || !canParseURL(json.introspection_endpoint)) {
+    return [new TypeError("Invalid discovery response")];
+  }
+  const issuer = new URL(json.issuer);
+  if (issuer.href !== VERCEL_ISSUER.href) {
+    return [new Error("Issuer mismatch")];
+  }
+  return [
+    null,
+    {
+      issuer,
+      device_authorization_endpoint: new URL(
+        json.device_authorization_endpoint
+      ),
+      token_endpoint: new URL(json.token_endpoint),
+      revocation_endpoint: new URL(json.revocation_endpoint),
+      jwks_uri: new URL(json.jwks_uri),
+      introspection_endpoint: new URL(json.introspection_endpoint)
+    }
+  ];
+}
+async function deviceAuthorizationRequest() {
+  return await (0, import_node_fetch.default)((await as()).device_authorization_endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      "user-agent": userAgent
+    },
+    body: new URLSearchParams({
+      client_id: VERCEL_CLI_CLIENT_ID,
+      scope: "openid offline_access"
+    })
+  });
+}
+async function processDeviceAuthorizationResponse(response) {
+  const json = await response.json();
+  if (!response.ok) {
+    return [new OAuthError("Device authorization request failed", json)];
+  }
+  if (typeof json !== "object" || json === null)
+    return [new TypeError("Expected response to be an object")];
+  if (!("device_code" in json) || typeof json.device_code !== "string")
+    return [new TypeError("Expected `device_code` to be a string")];
+  if (!("user_code" in json) || typeof json.user_code !== "string")
+    return [new TypeError("Expected `user_code` to be a string")];
+  if (!("verification_uri" in json) || typeof json.verification_uri !== "string" || !canParseURL(json.verification_uri)) {
+    return [new TypeError("Expected `verification_uri` to be a string")];
+  }
+  if (!("verification_uri_complete" in json) || typeof json.verification_uri_complete !== "string" || !canParseURL(json.verification_uri_complete)) {
+    return [
+      new TypeError("Expected `verification_uri_complete` to be a string")
+    ];
+  }
+  if (!("expires_in" in json) || typeof json.expires_in !== "number")
+    return [new TypeError("Expected `expires_in` to be a number")];
+  if (!("interval" in json) || typeof json.interval !== "number")
+    return [new TypeError("Expected `interval` to be a number")];
+  return [
+    null,
+    {
+      device_code: json.device_code,
+      user_code: json.user_code,
+      verification_uri: json.verification_uri,
+      verification_uri_complete: json.verification_uri_complete,
+      expiresAt: Date.now() + json.expires_in * 1e3,
+      interval: json.interval
+    }
+  ];
+}
+async function deviceAccessTokenRequest(options) {
+  try {
+    return [
+      null,
+      await (0, import_node_fetch.default)((await as()).token_endpoint, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          "user-agent": userAgent
+        },
+        body: new URLSearchParams({
+          client_id: VERCEL_CLI_CLIENT_ID,
+          grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+          ...options
+        }),
+        // TODO: Drop `node-fetch` and just use `signal`
+        timeout: 10 * 1e3,
+        // @ts-expect-error: Signal is part of `fetch` spec, should drop `node-fetch`
+        signal: AbortSignal.timeout(10 * 1e3)
+      })
+    ];
+  } catch (error3) {
+    if (error3 instanceof Error)
+      return [error3];
+    return [
+      new Error("An unknown error occurred. See the logs for details.", {
+        cause: error3
+      })
+    ];
+  }
+}
+async function processTokenResponse(response) {
+  const json = await response.json();
+  if (!response.ok) {
+    return [new OAuthError("Device access token request failed", json)];
+  }
+  if (typeof json !== "object" || json === null)
+    return [new TypeError("Expected response to be an object")];
+  if (!("access_token" in json) || typeof json.access_token !== "string")
+    return [new TypeError("Expected `access_token` to be a string")];
+  if (!("token_type" in json) || json.token_type !== "Bearer")
+    return [new TypeError('Expected `token_type` to be "Bearer"')];
+  if (!("expires_in" in json) || typeof json.expires_in !== "number")
+    return [new TypeError("Expected `expires_in` to be a number")];
+  if ("refresh_token" in json && (typeof json.refresh_token !== "string" || !json.refresh_token))
+    return [new TypeError("Expected `refresh_token` to be a string")];
+  if ("scope" in json && typeof json.scope !== "string")
+    return [new TypeError("Expected `scope` to be a string")];
+  return [null, json];
+}
+async function revocationRequest(options) {
+  return await (0, import_node_fetch.default)((await as()).revocation_endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      "user-agent": userAgent
+    },
+    body: new URLSearchParams({ ...options, client_id: VERCEL_CLI_CLIENT_ID })
+  });
+}
+async function processRevocationResponse(response) {
+  if (response.ok)
+    return [null, null];
+  const json = await response.json();
+  return [new OAuthError("Revocation request failed", json)];
+}
+async function refreshTokenRequest(options) {
+  return await (0, import_node_fetch.default)((await as()).token_endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      "user-agent": ua_default
+    },
+    body: new URLSearchParams({
+      client_id: VERCEL_CLI_CLIENT_ID,
+      grant_type: "refresh_token",
+      ...options
+    })
+  });
+}
+function processOAuthErrorResponse(json) {
+  if (typeof json !== "object" || json === null)
+    return new TypeError("Expected response to be an object");
+  if (!("error" in json) || typeof json.error !== "string")
+    return new TypeError("Expected `error` to be a string");
+  if ("error_description" in json && typeof json.error_description !== "string")
+    return new TypeError("Expected `error_description` to be a string");
+  if ("error_uri" in json && typeof json.error_uri !== "string")
+    return new TypeError("Expected `error_uri` to be a string");
+  return json;
+}
+function isOAuthError(error3) {
+  return error3 instanceof OAuthError;
+}
+function canParseURL(url3) {
+  try {
+    return !!new URL(url3);
+  } catch {
+    return false;
+  }
+}
+async function inspectTokenRequest(token) {
+  return (0, import_node_fetch.default)((await as()).introspection_endpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      "user-agent": ua_default
+    },
+    body: new URLSearchParams({ token })
+  });
+}
+async function processInspectTokenResponse(response) {
+  try {
+    const token = await response.json();
+    if (!token || typeof token !== "object" || !("active" in token)) {
+      throw new IntrospectionError("Invalid token introspection response");
+    }
+    return [null, token];
+  } catch (cause) {
+    return [new IntrospectionError("Could not introspect token.", { cause })];
+  }
+}
+var import_node_fetch, import_os3, VERCEL_ISSUER, VERCEL_CLI_CLIENT_ID, userAgent, _as, OAuthError, IntrospectionError;
+var init_oauth = __esm({
+  "src/util/oauth.ts"() {
+    "use strict";
+    import_node_fetch = __toESM3(require_lib7());
+    init_ua();
+    import_os3 = require("os");
+    VERCEL_ISSUER = new URL("https://vercel.com");
+    VERCEL_CLI_CLIENT_ID = "cl_HYyOPBNtFMfHhaUn9L4QPfTZz6TP47bp";
+    userAgent = `${(0, import_os3.hostname)()} @ ${ua_default}`;
+    OAuthError = class extends Error {
+      constructor(message2, response) {
+        var __super = (...args) => {
+          super(...args);
+        };
+        const error3 = processOAuthErrorResponse(response);
+        if (error3 instanceof TypeError) {
+          const message3 = `Unexpected server response: ${JSON.stringify(response)}`;
+          __super(message3);
+          this.cause = new Error(message3, { cause: error3 });
+          this.code = "server_error";
+          return;
+        }
+        let cause = error3.error;
+        if (error3.error_description)
+          cause += `: ${error3.error_description}`;
+        if (error3.error_uri)
+          cause += ` (${error3.error_uri})`;
+        __super(message2, { cause });
+        this.cause = new Error(cause);
+        this.code = error3.error;
+      }
+    };
+    IntrospectionError = class extends Error {
+      constructor() {
+        super(...arguments);
+        this.name = "IntrospectionError";
+      }
+    };
+  }
+});
+
 // ../../node_modules/.pnpm/is-docker@2.2.1/node_modules/is-docker/index.js
 var require_is_docker = __commonJS2({
   "../../node_modules/.pnpm/is-docker@2.2.1/node_modules/is-docker/index.js"(exports2, module2) {
@@ -42185,7 +42440,7 @@ function verify(client2, verificationToken, email2, provider, ssoUserId) {
   }
   if (!client2.authConfig.token) {
     const hyphens = new RegExp("-", "g");
-    const host = (0, import_os3.hostname)().replace(hyphens, " ").replace(".local", "");
+    const host = (0, import_os4.hostname)().replace(hyphens, " ").replace(".local", "");
     const tokenName = `${getTitleName()} CLI on ${host} via ${provider}`;
     url3.searchParams.set("tokenName", tokenName);
   }
@@ -42194,12 +42449,12 @@ function verify(client2, verificationToken, email2, provider, ssoUserId) {
   }
   return client2.fetch(url3.href, { useCurrentTeam: false });
 }
-var import_url2, import_os3;
+var import_url2, import_os4;
 var init_verify = __esm({
   "src/util/login/verify.ts"() {
     "use strict";
     import_url2 = require("url");
-    import_os3 = require("os");
+    import_os4 = require("os");
     init_pkg_name();
   }
 });
@@ -42310,7 +42565,7 @@ var init_github = __esm({
   "src/util/login/github.ts"() {
     "use strict";
     import_url3 = require("url");
-    init_oauth();
+    init_oauth2();
   }
 });
 
@@ -42324,7 +42579,7 @@ var init_google = __esm({
   "src/util/login/google.ts"() {
     "use strict";
     import_url4 = require("url");
-    init_oauth();
+    init_oauth2();
   }
 });
 
@@ -42338,7 +42593,7 @@ var init_gitlab = __esm({
   "src/util/login/gitlab.ts"() {
     "use strict";
     import_url5 = require("url");
-    init_oauth();
+    init_oauth2();
   }
 });
 
@@ -42357,7 +42612,7 @@ var init_bitbucket = __esm({
   "src/util/login/bitbucket.ts"() {
     "use strict";
     import_url6 = require("url");
-    init_oauth();
+    init_oauth2();
   }
 });
 
@@ -42391,7 +42646,7 @@ async function prompt(client2, error3, outOfBand, ssoUserId) {
     const email2 = await readInput(client2, "Enter your email address:");
     result = await doEmailLogin(client2, email2, ssoUserId);
   } else if (choice === "saml") {
-    const slug = error3?.teamId || await readInput(client2, "Enter your Team slug:");
+    const slug = error3?.scope || error3?.teamId || await readInput(client2, "Enter your Team slug:");
     result = await doSamlLogin(client2, slug, outOfBand, ssoUserId);
   }
   return result;
@@ -42558,7 +42813,7 @@ function isSSH() {
   return Boolean(process.env.SSH_CLIENT || process.env.SSH_TTY);
 }
 var import_http, import_open, import_url7, import_async_listen, import_is_docker;
-var init_oauth = __esm({
+var init_oauth2 = __esm({
   "src/util/login/oauth.ts"() {
     "use strict";
     import_http = __toESM3(require("http"));
@@ -42576,17 +42831,53 @@ var init_oauth = __esm({
 });
 
 // src/util/login/saml.ts
-function doSamlLogin(client2, teamIdOrSlug, outOfBand, ssoUserId) {
+async function doSamlLogin(client2, teamIdOrSlug, outOfBand, ssoUserId) {
+  if (client2.authConfig.type === "oauth") {
+    const { session_id, client_id } = await decodeToken(client2);
+    const params2 = { session_id, client_id };
+    const url4 = new import_url8.URL(
+      `https://vercel.com/sso/${teamIdOrSlug}?${new URLSearchParams(params2).toString()}`
+    );
+    return doOauthLogin(
+      client2,
+      url4,
+      "SAML Single Sign-On",
+      outOfBand,
+      ssoUserId
+    );
+  }
   const url3 = new import_url8.URL("/auth/sso", client2.apiUrl);
   url3.searchParams.set("teamId", teamIdOrSlug);
   return doOauthLogin(client2, url3, "SAML Single Sign-On", outOfBand, ssoUserId);
 }
+async function decodeToken(client2) {
+  const { token } = client2.authConfig;
+  if (!token) {
+    throw new Error(
+      `No existing credentials found. Please run \`vercel login --future\`.`
+    );
+  }
+  const inspectResponse = await inspectTokenRequest(token);
+  const [inspectError, inspectResult] = await processInspectTokenResponse(inspectResponse);
+  if (inspectError)
+    throw inspectError;
+  if (!inspectResult.active || !inspectResult.session_id || !inspectResult.client_id) {
+    throw new Error(
+      `Invalid token type. Run \`vercel login --future\` to log-in and try again.`
+    );
+  }
+  return {
+    session_id: inspectResult.session_id,
+    client_id: inspectResult.client_id
+  };
+}
 var import_url8;
 var init_saml = __esm({
   "src/util/login/saml.ts"() {
     "use strict";
     import_url8 = require("url");
     init_oauth();
+    init_oauth2();
   }
 });
 
@@ -42597,7 +42888,7 @@ async function reauthenticate(client2, error3) {
       `You must re-authenticate with SAML to use ${(0, import_chalk16.bold)(error3.scope)} scope.`
     );
     if (await client2.input.confirm(`Log in with SAML?`, true)) {
-      return doSamlLogin(client2, error3.teamId);
+      return doSamlLogin(client2, error3.scope ?? error3.teamId);
     }
   } else {
     output_manager_default.log(`You must re-authenticate to use ${(0, import_chalk16.bold)(error3.scope)} scope.`);
@@ -60768,11 +61059,11 @@ var require_dist7 = __commonJS2({
 });
 
 // src/util/config/global-path.ts
-var import_os4, import_fs, import_path3, import_xdg_app_paths2, isDirectory, getGlobalPathConfig, global_path_default;
+var import_os5, import_fs, import_path3, import_xdg_app_paths2, isDirectory, getGlobalPathConfig, global_path_default;
 var init_global_path = __esm({
   "src/util/config/global-path.ts"() {
     "use strict";
-    import_os4 = require("os");
+    import_os5 = require("os");
     import_fs = __toESM3(require("fs"));
     import_path3 = __toESM3(require("path"));
     import_xdg_app_paths2 = __toESM3(require_xdg_app_paths());
@@ -60791,7 +61082,7 @@ var init_global_path = __esm({
       const possibleConfigPaths = [
         ...vercelDirectories,
         // latest vercel directory
-        import_path3.default.join((0, import_os4.homedir)(), ".now"),
+        import_path3.default.join((0, import_os5.homedir)(), ".now"),
         // legacy config in user's home directory
         ...(0, import_xdg_app_paths2.default)("now").dataDirs()
         // legacy XDG directory
@@ -60982,233 +61273,6 @@ var init_promise = __esm({
   }
 });
 
-// src/util/oauth.ts
-async function as() {
-  if (!_as) {
-    const discoveryResponse = await discoveryEndpointRequest(VERCEL_ISSUER);
-    const [discoveryResponseError, as2] = await processDiscoveryEndpointResponse(discoveryResponse);
-    if (discoveryResponseError) {
-      throw discoveryResponseError;
-    }
-    _as = as2;
-  }
-  return _as;
-}
-async function discoveryEndpointRequest(issuer) {
-  return await (0, import_node_fetch.default)(new URL(".well-known/openid-configuration", issuer), {
-    headers: { "Content-Type": "application/json", "user-agent": userAgent }
-  });
-}
-async function processDiscoveryEndpointResponse(response) {
-  const json = await response.json();
-  if (!response.ok) {
-    return [new Error("Discovery endpoint request failed")];
-  }
-  if (typeof json !== "object" || json === null || !canParseURL(json.issuer) || !canParseURL(json.device_authorization_endpoint) || !canParseURL(json.token_endpoint) || !canParseURL(json.revocation_endpoint) || !canParseURL(json.jwks_uri)) {
-    return [new TypeError("Invalid discovery response")];
-  }
-  const issuer = new URL(json.issuer);
-  if (issuer.href !== VERCEL_ISSUER.href) {
-    return [new Error("Issuer mismatch")];
-  }
-  return [
-    null,
-    {
-      issuer,
-      device_authorization_endpoint: new URL(
-        json.device_authorization_endpoint
-      ),
-      token_endpoint: new URL(json.token_endpoint),
-      revocation_endpoint: new URL(json.revocation_endpoint),
-      jwks_uri: new URL(json.jwks_uri)
-    }
-  ];
-}
-async function deviceAuthorizationRequest() {
-  return await (0, import_node_fetch.default)((await as()).device_authorization_endpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      "user-agent": userAgent
-    },
-    body: new URLSearchParams({
-      client_id: VERCEL_CLI_CLIENT_ID,
-      scope: "openid offline_access"
-    })
-  });
-}
-async function processDeviceAuthorizationResponse(response) {
-  const json = await response.json();
-  if (!response.ok) {
-    return [new OAuthError("Device authorization request failed", json)];
-  }
-  if (typeof json !== "object" || json === null)
-    return [new TypeError("Expected response to be an object")];
-  if (!("device_code" in json) || typeof json.device_code !== "string")
-    return [new TypeError("Expected `device_code` to be a string")];
-  if (!("user_code" in json) || typeof json.user_code !== "string")
-    return [new TypeError("Expected `user_code` to be a string")];
-  if (!("verification_uri" in json) || typeof json.verification_uri !== "string" || !canParseURL(json.verification_uri)) {
-    return [new TypeError("Expected `verification_uri` to be a string")];
-  }
-  if (!("verification_uri_complete" in json) || typeof json.verification_uri_complete !== "string" || !canParseURL(json.verification_uri_complete)) {
-    return [
-      new TypeError("Expected `verification_uri_complete` to be a string")
-    ];
-  }
-  if (!("expires_in" in json) || typeof json.expires_in !== "number")
-    return [new TypeError("Expected `expires_in` to be a number")];
-  if (!("interval" in json) || typeof json.interval !== "number")
-    return [new TypeError("Expected `interval` to be a number")];
-  return [
-    null,
-    {
-      device_code: json.device_code,
-      user_code: json.user_code,
-      verification_uri: json.verification_uri,
-      verification_uri_complete: json.verification_uri_complete,
-      expiresAt: Date.now() + json.expires_in * 1e3,
-      interval: json.interval
-    }
-  ];
-}
-async function deviceAccessTokenRequest(options) {
-  try {
-    return [
-      null,
-      await (0, import_node_fetch.default)((await as()).token_endpoint, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-          "user-agent": userAgent
-        },
-        body: new URLSearchParams({
-          client_id: VERCEL_CLI_CLIENT_ID,
-          grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-          ...options
-        }),
-        // TODO: Drop `node-fetch` and just use `signal`
-        timeout: 10 * 1e3,
-        // @ts-expect-error: Signal is part of `fetch` spec, should drop `node-fetch`
-        signal: AbortSignal.timeout(10 * 1e3)
-      })
-    ];
-  } catch (error3) {
-    if (error3 instanceof Error)
-      return [error3];
-    return [
-      new Error("An unknown error occurred. See the logs for details.", {
-        cause: error3
-      })
-    ];
-  }
-}
-async function processTokenResponse(response) {
-  const json = await response.json();
-  if (!response.ok) {
-    return [new OAuthError("Device access token request failed", json)];
-  }
-  if (typeof json !== "object" || json === null)
-    return [new TypeError("Expected response to be an object")];
-  if (!("access_token" in json) || typeof json.access_token !== "string")
-    return [new TypeError("Expected `access_token` to be a string")];
-  if (!("token_type" in json) || json.token_type !== "Bearer")
-    return [new TypeError('Expected `token_type` to be "Bearer"')];
-  if (!("expires_in" in json) || typeof json.expires_in !== "number")
-    return [new TypeError("Expected `expires_in` to be a number")];
-  if ("refresh_token" in json && (typeof json.refresh_token !== "string" || !json.refresh_token))
-    return [new TypeError("Expected `refresh_token` to be a string")];
-  if ("scope" in json && typeof json.scope !== "string")
-    return [new TypeError("Expected `scope` to be a string")];
-  return [null, json];
-}
-async function revocationRequest(options) {
-  return await (0, import_node_fetch.default)((await as()).revocation_endpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      "user-agent": userAgent
-    },
-    body: new URLSearchParams({ ...options, client_id: VERCEL_CLI_CLIENT_ID })
-  });
-}
-async function processRevocationResponse(response) {
-  if (response.ok)
-    return [null, null];
-  const json = await response.json();
-  return [new OAuthError("Revocation request failed", json)];
-}
-async function refreshTokenRequest(options) {
-  return await (0, import_node_fetch.default)((await as()).token_endpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      "user-agent": ua_default
-    },
-    body: new URLSearchParams({
-      client_id: VERCEL_CLI_CLIENT_ID,
-      grant_type: "refresh_token",
-      ...options
-    })
-  });
-}
-function processOAuthErrorResponse(json) {
-  if (typeof json !== "object" || json === null)
-    return new TypeError("Expected response to be an object");
-  if (!("error" in json) || typeof json.error !== "string")
-    return new TypeError("Expected `error` to be a string");
-  if ("error_description" in json && typeof json.error_description !== "string")
-    return new TypeError("Expected `error_description` to be a string");
-  if ("error_uri" in json && typeof json.error_uri !== "string")
-    return new TypeError("Expected `error_uri` to be a string");
-  return json;
-}
-function isOAuthError(error3) {
-  return error3 instanceof OAuthError;
-}
-function canParseURL(url3) {
-  try {
-    return !!new URL(url3);
-  } catch {
-    return false;
-  }
-}
-var import_node_fetch, import_os5, VERCEL_ISSUER, VERCEL_CLI_CLIENT_ID, userAgent, _as, OAuthError;
-var init_oauth2 = __esm({
-  "src/util/oauth.ts"() {
-    "use strict";
-    import_node_fetch = __toESM3(require_lib7());
-    init_ua();
-    import_os5 = require("os");
-    VERCEL_ISSUER = new URL("https://vercel.com");
-    VERCEL_CLI_CLIENT_ID = "cl_HYyOPBNtFMfHhaUn9L4QPfTZz6TP47bp";
-    userAgent = `${(0, import_os5.hostname)()} @ ${ua_default}`;
-    OAuthError = class extends Error {
-      constructor(message2, response) {
-        var __super = (...args) => {
-          super(...args);
-        };
-        const error3 = processOAuthErrorResponse(response);
-        if (error3 instanceof TypeError) {
-          const message3 = `Unexpected server response: ${JSON.stringify(response)}`;
-          __super(message3);
-          this.cause = new Error(message3, { cause: error3 });
-          this.code = "server_error";
-          return;
-        }
-        let cause = error3.error;
-        if (error3.error_description)
-          cause += `: ${error3.error_description}`;
-        if (error3.error_uri)
-          cause += ` (${error3.error_uri})`;
-        __super(message2, { cause });
-        this.cause = new Error(cause);
-        this.code = error3.error;
-      }
-    };
-  }
-});
-
 // src/util/client.ts
 function isOAuthAuth(authConfig) {
   return authConfig.type === "oauth";
@@ -61243,7 +61307,7 @@ var init_client = __esm({
     import_error_utils6 = __toESM3(require_dist2());
     init_sleep();
     init_output_manager();
-    init_oauth2();
+    init_oauth();
     isSAMLError = (v) => {
       return v && v.saml;
     };
@@ -61265,8 +61329,10 @@ var init_client = __esm({
             }
             throw error3;
           }
-          this.authConfig.token = result.token;
-          writeToAuthConfigFile(this.authConfig);
+          if (this.authConfig.type !== "oauth") {
+            this.authConfig.token = result.token;
+            writeToAuthConfigFile(this.authConfig);
+          }
         });
         this._onRetry = (error3) => {
           output_manager_default.debug(`Retrying: ${error3}
@@ -116668,6 +116734,45 @@ var require_frameworks = __commonJS2({
         dependency: "express",
         getOutputDirName: async () => "public"
       },
+      {
+        name: "xmcp",
+        slug: "xmcp",
+        logo: "https://api-frameworks.vercel.sh/framework-logos/xmcp.svg",
+        tagline: "The MCP framework for building AI-powered tools",
+        description: "A framework for building Model Context Protocol servers with zero configuration.",
+        website: "https://xmcp.dev",
+        detectors: {
+          some: [
+            {
+              path: "xmcp.config.ts"
+            },
+            {
+              path: "xmcp.config.js"
+            },
+            {
+              matchPackage: "xmcp"
+            }
+          ]
+        },
+        settings: {
+          installCommand: {
+            placeholder: "`yarn install`, `pnpm install`, `npm install`, or `bun install`"
+          },
+          buildCommand: {
+            placeholder: "`npm run build` or `xmcp build`",
+            value: "xmcp build --vercel"
+          },
+          devCommand: {
+            value: "xmcp dev",
+            placeholder: "xmcp dev"
+          },
+          outputDirectory: {
+            value: "dist"
+          }
+        },
+        dependency: "xmcp",
+        getOutputDirName: async () => "dist"
+      },
       {
         name: "Other",
         slug: null,
@@ -129843,15 +129948,15 @@ async function getStore2(client2, argv, rwToken) {
       method: "GET",
       accountId: link4.status === "linked" ? link4.org.id : void 0
     });
-    const dateTimeFormat3 = "MM/DD/YYYY HH:mm:ss.SS";
+    const dateTimeFormat2 = "MM/DD/YYYY HH:mm:ss.SS";
     const regionInfo = store2.store.region ? `
 Region: ${store2.store.region}` : "";
     output_manager_default.print(
       `Blob Store: ${import_chalk40.default.bold(store2.store.name)} (${import_chalk40.default.dim(store2.store.id)})
 Billing State: ${store2.store.billingState === "active" ? import_chalk40.default.green("Active") : import_chalk40.default.red("Inactive")}
 Size: ${(0, import_bytes3.default)(store2.store.size)}${regionInfo}
-Created At: ${(0, import_date_fns.format)(new Date(store2.store.createdAt), dateTimeFormat3)}
-Updated At: ${(0, import_date_fns.format)(new Date(store2.store.updatedAt), dateTimeFormat3)}
+Created At: ${(0, import_date_fns.format)(new Date(store2.store.createdAt), dateTimeFormat2)}
+Updated At: ${(0, import_date_fns.format)(new Date(store2.store.updatedAt), dateTimeFormat2)}
 `
     );
   } catch (err) {
@@ -146777,7 +146882,7 @@ async function main4(client2) {
   if (!subcommand && needHelp) {
     telemetry2.trackCliFlagHelp(cacheCommand.name);
     output_manager_default.print(help2(cacheCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   function printHelp(command) {
     telemetry2.trackCliFlagHelp(command.name, subcommandOriginal);
@@ -178214,7 +178319,7 @@ async function link3(client2) {
   if (parsedArgs.flags["--help"]) {
     telemetry2.trackCliFlagHelp("link");
     output_manager_default.print(help2(linkCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   telemetry2.trackCliFlagRepo(parsedArgs.flags["--repo"]);
   telemetry2.trackCliFlagYes(parsedArgs.flags["--yes"]);
@@ -178394,7 +178499,7 @@ async function list5(client2) {
   if (parsedArgs.flags["--help"]) {
     telemetry2.trackCliFlagHelp("list");
     print(help2(listCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   if (parsedArgs.args.length > 2) {
     error3(`${getCommandName("ls [app]")} accepts at most one argument`);
@@ -178810,7 +178915,13 @@ async function logs(client2) {
     }
     return 1;
   }
-  printDisclaimer(deployment);
+  output_manager_default.print(
+    `Displaying runtime logs for deployment ${deployment.url} (${import_chalk106.default.dim(
+      deployment.id
+    )}) starting from ${import_chalk106.default.bold((0, import_format3.default)(Date.now(), DATE_TIME_FORMAT))}
+
+`
+  );
   const abortController = new AbortController();
   return await displayRuntimeLogs(
     client2,
@@ -178822,19 +178933,7 @@ async function logs(client2) {
     abortController
   );
 }
-function printDisclaimer(deployment) {
-  output_manager_default.warn(
-    `This command now displays runtime logs. To access your build logs, run \`vercel inspect --logs ${deployment.url}\``
-  );
-  output_manager_default.print(
-    `Displaying runtime logs for deployment ${deployment.url} (${import_chalk106.default.dim(
-      deployment.id
-    )}) starting from ${import_chalk106.default.bold((0, import_format3.default)(Date.now(), dateTimeFormat2))}
-
-`
-  );
-}
-var import_error_utils30, import_chalk106, import_format3, deprecatedFlags, dateTimeFormat2;
+var import_error_utils30, import_chalk106, import_format3, deprecatedFlags, DATE_TIME_FORMAT;
 var init_logs3 = __esm({
   "src/commands/logs/index.ts"() {
     "use strict";
@@ -178864,7 +178963,7 @@ var init_logs3 = __esm({
       "--until",
       "--output"
     ];
-    dateTimeFormat2 = "MMM dd HH:mm:ss.SS";
+    DATE_TIME_FORMAT = "MMM dd HH:mm:ss.SS";
   }
 });
 
@@ -179343,7 +179442,7 @@ var init_future = __esm({
     init_pkg_name();
     init_emoji();
     init_humanize_path();
-    init_oauth2();
+    init_oauth();
     init_output_manager();
   }
 });
@@ -179375,7 +179474,7 @@ async function login3(client2) {
   if (parsedArgs.flags["--help"]) {
     telemetry2.trackCliFlagHelp("login");
     output_manager_default.print(help2(loginCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   if (parsedArgs.flags["--token"]) {
     output_manager_default.error('`--token` may not be used with the "login" command');
@@ -179510,7 +179609,7 @@ var init_future2 = __esm({
     "use strict";
     import_error_utils31 = __toESM3(require_dist2());
     init_pkg_name();
-    init_oauth2();
+    init_oauth();
     init_output_manager();
   }
 });
@@ -179538,7 +179637,7 @@ async function logout2(client2) {
   if (parsedArgs.flags["--help"]) {
     telemetry2.trackCliFlagHelp("logout");
     output_manager_default.print(help2(logoutCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   if (authConfig.type === "oauth") {
     return await logout(client2);
@@ -180423,13 +180522,13 @@ async function main15(client2) {
   if (!subcommand && needHelp) {
     telemetry2.trackCliFlagHelp("project");
     output_manager_default.print(help2(projectCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   function printHelp(command) {
     output_manager_default.print(
       help2(command, { parent: projectCommand, columns: client2.stderr.columns })
     );
-    return 2;
+    return 0;
   }
   if (!parsedArgs.args[1]) {
     subcommand = "list";
@@ -183887,7 +183986,7 @@ async function whoami(client2) {
   if (parsedArgs.flags["--help"]) {
     telemetry2.trackCliFlagHelp("whoami");
     output_manager_default.print(help2(whoamiCommand, { columns: client2.stderr.columns }));
-    return 2;
+    return 0;
   }
   const { contextName } = await getScope(client2, { getTeam: false });
   if (client2.stdout.isTTY) {
@@ -184873,7 +184972,7 @@ var main17 = async () => {
   const bareHelpSubcommand = targetOrSubcommand === "help" && !subSubCommand;
   if (bareHelpOption || bareHelpSubcommand) {
     output_manager_default.print(help());
-    return 2;
+    return 0;
   }
   try {
     await (0, import_fs_extra24.mkdirp)(VERCEL_DIR4);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "46.0.0",
+  "version": "46.0.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -28,7 +28,7 @@
     "@vercel/express": "0.0.6",
     "@vercel/hono": "0.0.14",
     "@vercel/hydrogen": "1.2.3",
-    "@vercel/next": "4.11.2",
+    "@vercel/next": "4.11.3",
     "@vercel/node": "5.3.13",
     "@vercel/python": "5.0.0",
     "@vercel/redwood": "2.3.4",
@@ -84,8 +84,8 @@
     "@vercel/client": "15.3.14",
     "@vercel/detect-agent": "0.2.0",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/frameworks": "3.7.7",
-    "@vercel/fs-detectors": "5.4.13",
+    "@vercel/frameworks": "3.8.0",
+    "@vercel/fs-detectors": "5.4.14",
     "@vercel/routing-utils": "5.1.1",
     "@vitest/expect": "2.1.3",
     "ajv": "6.12.3",