vercel 54.21.1 → 56.0.0

package/dist/chunks/{chunk-I4NRKN2Z.js → chunk-THMFJODG.js}

@@ -9,7 +9,7 @@ import {
   getPreservedArgsForEnvPull,
   outputActionRequired,
   outputAgentError
-} from "./chunk-2QBF3ZL3.js";
+} from "./chunk-CB3I3QIT.js";
 import {
   TelemetryClient,
   require_dist as require_dist2,
@@ -8431,14 +8431,14 @@ var require_templates = __commonJS({
       }
       return results;
     }
-    function buildStyle(chalk14, styles) {
+    function buildStyle(chalk15, styles) {
       const enabled = {};
       for (const layer of styles) {
         for (const style of layer.styles) {
           enabled[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk14;
+      let current = chalk15;
       for (const [styleName, styles2] of Object.entries(enabled)) {
         if (!Array.isArray(styles2)) {
           continue;
@@ -8450,7 +8450,7 @@ var require_templates = __commonJS({
       }
       return current;
     }
-    module.exports = (chalk14, temporary) => {
+    module.exports = (chalk15, temporary) => {
       const styles = [];
       const chunks = [];
       let chunk = [];
@@ -8460,13 +8460,13 @@ var require_templates = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks.push(styles.length === 0 ? string : buildStyle(chalk14, styles)(string));
+          chunks.push(styles.length === 0 ? string : buildStyle(chalk15, styles)(string));
           styles.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk14, styles)(chunk.join("")));
+          chunks.push(buildStyle(chalk15, styles)(chunk.join("")));
           chunk = [];
           styles.pop();
         } else {
@@ -8514,16 +8514,16 @@ var require_source2 = __commonJS({
       }
     };
     var chalkFactory = (options) => {
-      const chalk15 = {};
-      applyOptions(chalk15, options);
-      chalk15.template = (...arguments_) => chalkTag(chalk15.template, ...arguments_);
-      Object.setPrototypeOf(chalk15, Chalk.prototype);
-      Object.setPrototypeOf(chalk15.template, chalk15);
-      chalk15.template.constructor = () => {
+      const chalk16 = {};
+      applyOptions(chalk16, options);
+      chalk16.template = (...arguments_) => chalkTag(chalk16.template, ...arguments_);
+      Object.setPrototypeOf(chalk16, Chalk.prototype);
+      Object.setPrototypeOf(chalk16.template, chalk16);
+      chalk16.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk15.template.Instance = ChalkClass;
-      return chalk15.template;
+      chalk16.template.Instance = ChalkClass;
+      return chalk16.template;
     };
     function Chalk(options) {
       return chalkFactory(options);
@@ -8634,7 +8634,7 @@ var require_source2 = __commonJS({
       return openAll + string + closeAll;
     };
     var template;
-    var chalkTag = (chalk15, ...strings) => {
+    var chalkTag = (chalk16, ...strings) => {
       const [firstString] = strings;
       if (!isArray(firstString) || !isArray(firstString.raw)) {
         return strings.join(" ");
@@ -8650,14 +8650,14 @@ var require_source2 = __commonJS({
       if (template === void 0) {
         template = require_templates();
       }
-      return template(chalk15, parts.join(""));
+      return template(chalk16, parts.join(""));
     };
     Object.defineProperties(Chalk.prototype, styles);
-    var chalk14 = Chalk();
-    chalk14.supportsColor = stdoutColor;
-    chalk14.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
-    chalk14.stderr.supportsColor = stderrColor;
-    module.exports = chalk14;
+    var chalk15 = Chalk();
+    chalk15.supportsColor = stdoutColor;
+    chalk15.stderr = Chalk({ level: stderrColor ? stderrColor.level : 0 });
+    chalk15.stderr.supportsColor = stderrColor;
+    module.exports = chalk15;
   }
 });
 
@@ -15702,6 +15702,52 @@ var require_frameworks = __commonJS({
         },
         getOutputDirName: async () => "dist"
       },
+      {
+        name: "TanStack Start",
+        slug: "tanstack-start-lovable",
+        logo: "https://api-frameworks.vercel.sh/framework-logos/tanstack-start.svg",
+        darkModeLogo: "https://api-frameworks.vercel.sh/framework-logos/tanstack-start-dark.svg",
+        platform: {
+          name: "lovable",
+          logo: "https://api-frameworks.vercel.sh/framework-logos/lovable.svg"
+        },
+        tagline: "Full-stack Framework powered by TanStack Router imported from Lovable",
+        description: "Full-document SSR, Streaming, Server Functions, bundling and more, imported from Lovable",
+        website: "https://lovable.dev/",
+        supersedes: ["tanstack-start", "ionic-react", "vite"],
+        detectors: {
+          every: [
+            {
+              matchPackage: "@lovable.dev/vite-tanstack-config"
+            }
+          ],
+          some: [
+            {
+              matchPackage: "@tanstack/react-start"
+            },
+            {
+              matchPackage: "@tanstack/solid-start"
+            }
+          ]
+        },
+        settings: {
+          installCommand: {
+            placeholder: "`yarn install`, `pnpm install`, `npm install`, or `bun install`"
+          },
+          buildCommand: {
+            placeholder: "`npm run build` or `vite build`",
+            value: "vite build"
+          },
+          devCommand: {
+            placeholder: "vite",
+            value: "vite --port $PORT"
+          },
+          outputDirectory: {
+            value: "dist"
+          }
+        },
+        getOutputDirName: async () => "dist"
+      },
       {
         name: "VitePress",
         slug: "vitepress",
@@ -23071,14 +23117,14 @@ var require_utils3 = __commonJS({
     __export2(utils_exports, {
       DETECTION_FRAMEWORKS: () => DETECTION_FRAMEWORKS,
       INTERNAL_QUEUES_PREFIX: () => INTERNAL_QUEUES_PREFIX,
-      INTERNAL_SERVICE_PREFIX: () => import_build_utils6.INTERNAL_SERVICE_PREFIX,
+      INTERNAL_SERVICE_PREFIX: () => import_build_utils7.INTERNAL_SERVICE_PREFIX,
       assignMountPaths: () => assignMountPaths,
       combineBuildCommand: () => combineBuildCommand,
       filterFrameworksByRuntime: () => filterFrameworksByRuntime,
       getBuilderForRuntime: () => getBuilderForRuntime,
-      getInternalServiceCronPath: () => import_build_utils6.getInternalServiceCronPath,
-      getInternalServiceCronPathPrefix: () => import_build_utils6.getInternalServiceCronPathPrefix,
-      getInternalServiceFunctionPath: () => import_build_utils6.getInternalServiceFunctionPath,
+      getInternalServiceCronPath: () => import_build_utils7.getInternalServiceCronPath,
+      getInternalServiceCronPathPrefix: () => import_build_utils7.getInternalServiceCronPathPrefix,
+      getInternalServiceFunctionPath: () => import_build_utils7.getInternalServiceFunctionPath,
       getInternalServiceWorkerPath: () => getInternalServiceWorkerPath2,
       getInternalServiceWorkerPathPrefix: () => getInternalServiceWorkerPathPrefix2,
       hasFile: () => hasFile,
@@ -23093,7 +23139,7 @@ var require_utils3 = __commonJS({
     });
     module.exports = __toCommonJS2(utils_exports);
     var import_framework_helpers = __require("@vercel/build-utils/dist/framework-helpers");
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_frameworks2 = require_frameworks();
     var import_types = require_types3();
     var DETECTION_FRAMEWORKS = import_frameworks2.frameworkList.filter(
@@ -23116,7 +23162,7 @@ var require_utils3 = __commonJS({
       return normalized || "index";
     }
     function getInternalServiceWorkerPathPrefix2(serviceName) {
-      return `${import_build_utils6.INTERNAL_SERVICE_PREFIX}/${serviceName}/workers`;
+      return `${import_build_utils7.INTERNAL_SERVICE_PREFIX}/${serviceName}/workers`;
     }
     function getInternalServiceWorkerPath2(serviceName, entrypoint, handler = "worker") {
       const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
@@ -23190,6 +23236,9 @@ var require_utils3 = __commonJS({
         }
       }
       if (config.entrypoint) {
+        if (config.entrypoint === "pyproject.toml" || config.entrypoint.endsWith("/pyproject.toml")) {
+          return "python";
+        }
         for (const [ext, runtime] of Object.entries(import_types.ENTRYPOINT_EXTENSIONS)) {
           if (config.entrypoint.endsWith(ext)) {
             return runtime;
@@ -23567,7 +23616,7 @@ var require_resolve2 = __commonJS({
     });
     module.exports = __toCommonJS2(resolve_exports);
     var import_path12 = __require("path");
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_types = require_types3();
     var import_utils4 = require_utils3();
     var import_frameworks2 = require_frameworks();
@@ -23876,8 +23925,8 @@ var require_resolve2 = __commonJS({
         trigger: effectiveTrigger
       };
       const isJobService = serviceType === "job" || serviceType === "cron";
-      const isScheduleJobService = (0, import_build_utils6.isScheduleTriggeredService)(effectiveService);
-      const isQueueJobService = serviceType === "job" && (0, import_build_utils6.isQueueTriggeredService)(effectiveService);
+      const isScheduleJobService = (0, import_build_utils7.isScheduleTriggeredService)(effectiveService);
+      const isQueueJobService = serviceType === "job" && (0, import_build_utils7.isQueueTriggeredService)(effectiveService);
       const isWorkflowService = serviceType === "job" && effectiveTrigger === "workflow";
       const isNonWebService = serviceType === "worker" || isJobService;
       const serviceTypeLabel = isJobService ? "Job" : serviceType === "worker" ? "Worker" : "Web";
@@ -23931,10 +23980,10 @@ var require_resolve2 = __commonJS({
           serviceName: name
         };
       }
-      if (serviceType === "job" && effectiveTrigger && !import_build_utils6.JOB_TRIGGERS.includes(effectiveTrigger)) {
+      if (serviceType === "job" && effectiveTrigger && !import_build_utils7.JOB_TRIGGERS.includes(effectiveTrigger)) {
         return {
           code: "INVALID_JOB_TRIGGER",
-          message: `Job service "${name}" has invalid trigger "${effectiveTrigger}". Expected ${import_build_utils6.JOB_TRIGGERS.map((t) => `"${t}"`).join(", ")}.`,
+          message: `Job service "${name}" has invalid trigger "${effectiveTrigger}". Expected ${import_build_utils7.JOB_TRIGGERS.map((t) => `"${t}"`).join(", ")}.`,
           serviceName: name
         };
       }
@@ -24163,7 +24212,7 @@ var require_resolve2 = __commonJS({
           workspace = workspace === "." ? normalizedRoot : import_path12.posix.join(normalizedRoot, workspace);
         }
       }
-      const topics = type === "worker" ? (0, import_build_utils6.getServiceQueueTopics)({ type, topics: config.topics }) : trigger === "queue" ? config.topics : trigger === "workflow" ? ["__wkf_*"] : void 0;
+      const topics = type === "worker" ? (0, import_build_utils7.getServiceQueueTopics)({ type, topics: config.topics }) : trigger === "queue" ? config.topics : trigger === "workflow" ? ["__wkf_*"] : void 0;
       let builderUse;
       let builderSrc;
       const frameworkDefinition = config.framework ? frameworksBySlug.get(config.framework) : void 0;
@@ -24171,7 +24220,7 @@ var require_resolve2 = __commonJS({
         builderUse = config.builder;
         builderSrc = resolvedEntrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
       } else if (config.framework) {
-        const isCronService = (0, import_build_utils6.isScheduleTriggeredService)({ type, trigger });
+        const isCronService = (0, import_build_utils7.isScheduleTriggeredService)({ type, trigger });
         if ((0, import_build_utils22.isNodeBackendFramework)(config.framework) && (type === "web" || isCronService)) {
           builderUse = "@vercel/backends";
         } else {
@@ -24185,7 +24234,7 @@ var require_resolve2 = __commonJS({
           );
         }
         if (inferredRuntime === "node") {
-          const isCronService = (0, import_build_utils6.isScheduleTriggeredService)({ type, trigger });
+          const isCronService = (0, import_build_utils7.isScheduleTriggeredService)({ type, trigger });
           builderUse = type === "web" || isCronService ? "@vercel/backends" : "@vercel/node";
         } else {
           builderUse = (0, import_utils4.getBuilderForRuntime)(inferredRuntime);
@@ -24469,7 +24518,7 @@ var require_resolve_v2 = __commonJS({
     });
     module.exports = __toCommonJS2(resolve_v2_exports);
     var import_path12 = __require("path");
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_frameworks2 = require_frameworks();
     var import_types = require_types3();
     var import_resolve = require_resolve2();
@@ -24714,7 +24763,7 @@ var require_resolve_v2 = __commonJS({
       let builderUse;
       let builderSrc;
       if (framework) {
-        builderUse = (0, import_build_utils6.isNodeBackendFramework)(framework) ? "@vercel/backends" : frameworkDefinition?.useRuntime?.use || "@vercel/static-build";
+        builderUse = (0, import_build_utils7.isNodeBackendFramework)(framework) ? "@vercel/backends" : frameworkDefinition?.useRuntime?.use || "@vercel/static-build";
         builderSrc = entrypointFile || frameworkDefinition?.useRuntime?.src || "package.json";
       } else {
         if (!inferredRuntime) {
@@ -28725,7 +28774,7 @@ var require_detect_services = __commonJS({
       generateServicesRoutes: () => generateServicesRoutes2
     });
     module.exports = __toCommonJS2(detect_services_exports);
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_routing_utils2 = require_dist5();
     var import_utils4 = require_utils3();
     var import_resolve = require_resolve2();
@@ -28998,7 +29047,7 @@ var require_detect_services = __commonJS({
       });
     }
     function generateServicesRoutes2(allServices) {
-      const services = allServices.filter(import_build_utils6.isExperimentalService);
+      const services = allServices.filter(import_build_utils7.isExperimentalService);
       const hostRewrites = [];
       const rewrites = [];
       const defaults = [];
@@ -29073,7 +29122,7 @@ var require_detect_services = __commonJS({
           }
         }
       }
-      const cronServices = services.filter(import_build_utils6.isScheduleTriggeredService);
+      const cronServices = services.filter(import_build_utils7.isScheduleTriggeredService);
       for (const service of cronServices) {
         const cronPrefix = (0, import_utils4.getInternalServiceCronPathPrefix)(service.name);
         const functionPath = (0, import_utils4.getInternalServiceFunctionPath)(service.name);
@@ -29527,7 +29576,7 @@ var require_detect_builders = __commonJS({
     var import_path12 = __require("path");
     var import_frameworks2 = require_frameworks();
     var import_is_official_runtime = require_is_official_runtime();
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_get_services_builders = require_get_services_builders();
     var REGEX_MIDDLEWARE_FILES = "middleware.[jt]s";
     var REGEX_VERCEL_PLATFORM_FILES = [
@@ -29834,7 +29883,7 @@ var require_detect_builders = __commonJS({
       }
       if (fileName.endsWith(".py") && options.workPath) {
         const fsPath = (0, import_path12.join)(options.workPath, fileName);
-        const isEntrypoint = await (0, import_build_utils6.isPythonEntrypoint)({ fsPath });
+        const isEntrypoint = await (0, import_build_utils7.isPythonEntrypoint)({ fsPath });
         if (!isEntrypoint) {
           return null;
         }
@@ -29842,7 +29891,7 @@ var require_detect_builders = __commonJS({
       const nodeExtensions = [".js", ".mjs", ".ts", ".tsx"];
       if (fileName.startsWith("api/") && process.env.VERCEL_NODE_FILTER_ENTRYPOINTS === "1" && nodeExtensions.some((ext) => fileName.endsWith(ext)) && options.workPath) {
         const fsPath = (0, import_path12.join)(options.workPath, fileName);
-        const isEntrypoint = await (0, import_build_utils6.isNodeEntrypoint)({ fsPath });
+        const isEntrypoint = await (0, import_build_utils7.isNodeEntrypoint)({ fsPath });
         if (!isEntrypoint) {
           return null;
         }
@@ -29952,8 +30001,8 @@ var require_detect_builders = __commonJS({
       const f = slugToFramework.get(framework || "");
       if (f && f.useRuntime) {
         const { src, use } = f.useRuntime;
-        const shouldUseUnifiedBackend = (0, import_build_utils6.isExperimentalBackendsEnabled)() && import_build_utils6.BACKEND_BUILDERS.includes(use);
-        const finalUse = shouldUseUnifiedBackend ? import_build_utils6.UNIFIED_BACKEND_BUILDER : use;
+        const shouldUseUnifiedBackend = (0, import_build_utils7.isExperimentalBackendsEnabled)() && import_build_utils7.BACKEND_BUILDERS.includes(use);
+        const finalUse = shouldUseUnifiedBackend ? import_build_utils7.UNIFIED_BACKEND_BUILDER : use;
         return { src, use: `${finalUse}${withTag}`, config };
       }
       const entrypoints = /* @__PURE__ */ new Set([
@@ -29998,7 +30047,7 @@ var require_detect_builders = __commonJS({
             message: "Function must contain at least one property."
           };
         }
-        const maxDurationLimit = (0, import_build_utils6.getMaxDurationLimit)();
+        const maxDurationLimit = (0, import_build_utils7.getMaxDurationLimit)();
         if (func.maxDuration !== void 0 && func.maxDuration !== "max" && (func.maxDuration < 1 || maxDurationLimit !== void 0 && func.maxDuration > maxDurationLimit || !Number.isInteger(func.maxDuration))) {
           return {
             code: "invalid_function_duration",
@@ -34862,8 +34911,8 @@ var require_dist6 = __commonJS({
       getServicesBuilders: () => import_get_services_builders.getServicesBuilders,
       getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
       getWorkspaces: () => import_get_workspaces.getWorkspaces,
-      isExperimentalService: () => import_build_utils6.isExperimentalService,
-      isExperimentalServiceV2: () => import_build_utils6.isExperimentalServiceV2,
+      isExperimentalService: () => import_build_utils7.isExperimentalService,
+      isExperimentalServiceV2: () => import_build_utils7.isExperimentalServiceV2,
       isOfficialRuntime: () => import_is_official_runtime.isOfficialRuntime,
       isRouteOwningBuilder: () => import_utils4.isRouteOwningBuilder,
       isStaticBuild: () => import_utils4.isStaticBuild,
@@ -34879,7 +34928,7 @@ var require_dist6 = __commonJS({
     var import_detect_builders = require_detect_builders();
     var import_detect_services2 = require_detect_services();
     var import_resolve_v2 = require_resolve_v2();
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_auto_detect = require_auto_detect();
     var import_utils4 = require_utils3();
     var import_get_services_builders = require_get_services_builders();
@@ -40902,7 +40951,7 @@ var require_package = __commonJS({
   "../client/package.json"(exports, module) {
     module.exports = {
       name: "@vercel/client",
-      version: "17.6.3",
+      version: "17.6.5",
       main: "dist/index.js",
       typings: "dist/index.d.ts",
       homepage: "https://vercel.com",
@@ -48823,7 +48872,7 @@ var require_utils10 = __commonJS({
     var import_url4 = __require("url");
     var import_ignore = __toESM2(require_ignore());
     var import_pkg2 = require_pkg();
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_async_sema = require_lib6();
     var import_fs_extra9 = require_lib5();
     var import_readdir_recursive = __toESM2(require_readdir_recursive());
@@ -49057,7 +49106,7 @@ var require_utils10 = __commonJS({
               maybeRead((0, import_path12.join)(cwd2, ".nowignore"), "")
             ]);
             if (vercelignore && nowignore) {
-              throw new import_build_utils6.NowBuildError({
+              throw new import_build_utils7.NowBuildError({
                 code: "CONFLICTING_IGNORE_FILES",
                 message: "Cannot use both a `.vercelignore` and `.nowignore` file. Please delete the `.nowignore` file.",
                 link: "https://vercel.link/combining-old-and-new-config"
@@ -49101,10 +49150,13 @@ ${clearRelative(ignoreFile)}`);
       };
       debug(`${opts.method || "GET"} ${url}`);
       time = Date.now();
-      const res = await (0, import_node_fetch.default)(url, opts);
-      debug(`DONE in ${Date.now() - time}ms: ${opts.method || "GET"} ${url}`);
-      semaphore.release();
-      return res;
+      try {
+        const res = await (0, import_node_fetch.default)(url, opts);
+        debug(`DONE in ${Date.now() - time}ms: ${opts.method || "GET"} ${url}`);
+        return res;
+      } finally {
+        semaphore.release();
+      }
     };
     var isWin = process.platform.includes("win");
     var prepareFiles = (files, clientOptions) => {
@@ -49241,6 +49293,36 @@ var require_check_deployment_status = __commonJS({
     var RETRY_DELAY_MIN_MS = 5e3;
     var RETRY_DELAY_SKEW_MS = 3e4;
     var RETRY_DELAY_DEFAULT_MS = 5e3;
+    function getAliasAssignedEvent(signal, deploymentId) {
+      if (!signal?.aborted)
+        return;
+      const event = signal.reason;
+      if (event?.type === "alias-assigned" && event.deploymentId === deploymentId && typeof event.date === "number" && Array.isArray(event.alias) && "aliasError" in event && "aliasWarning" in event) {
+        return event;
+      }
+      return void 0;
+    }
+    async function sleepUntilAliasAssigned(duration, signal, deploymentId) {
+      if (getAliasAssignedEvent(signal, deploymentId))
+        return;
+      if (!signal || signal.aborted) {
+        await (0, import_sleep_promise.default)(duration);
+        return;
+      }
+      await new Promise((resolve4) => {
+        const timeout = setTimeout(finish, duration);
+        function finish() {
+          clearTimeout(timeout);
+          signal?.removeEventListener("abort", onAbort);
+          resolve4();
+        }
+        function onAbort() {
+          if (getAliasAssignedEvent(signal, deploymentId))
+            finish();
+        }
+        signal.addEventListener("abort", onAbort, { once: true });
+      });
+    }
     function parseRetryAfterMs(response) {
       if (response.status === 429 || response.status === 503) {
         let header = response.headers.get("Retry-After");
@@ -49270,6 +49352,8 @@ var require_check_deployment_status = __commonJS({
       const { token, teamId, apiUrl, userAgent: userAgent2 } = clientOptions;
       const debug = (0, import_utils22.createDebug)(clientOptions.debug);
       let deploymentState = deployment;
+      const deploymentId = deployment.id || deployment.deploymentId;
+      let aliasAssignedSignal = clientOptions.aliasAssignedSignal;
       const apiDeployments = (0, import_utils4.getApiDeploymentsUrl)();
       if ((0, import_ready_state.isDone)(deploymentState) && (0, import_ready_state.isAliasAssigned)(deploymentState)) {
         debug(
@@ -49280,109 +49364,172 @@ var require_check_deployment_status = __commonJS({
       debug("Waiting for builds and the deployment to complete...");
       const finishedEvents = /* @__PURE__ */ new Set();
       const startTime = Date.now();
-      while (true) {
-        let deploymentResponse;
-        let retriesLeft = RETRY_COUNT;
+      polling:
         while (true) {
-          deploymentResponse = await (0, import_utils4.fetchApi)(
-            `${apiDeployments}/${deployment.id || deployment.deploymentId}${teamId ? `?teamId=${teamId}` : ""}`,
-            token,
-            { apiUrl, userAgent: userAgent2, agent: clientOptions.agent }
+          const aliasAssignedEvent = getAliasAssignedEvent(
+            aliasAssignedSignal,
+            deploymentId
           );
-          retriesLeft--;
-          if (retriesLeft == 0) {
+          if (aliasAssignedEvent) {
+            deploymentState = {
+              ...deploymentState,
+              readyState: "READY",
+              aliasAssigned: aliasAssignedEvent.date,
+              alias: aliasAssignedEvent.alias,
+              aliasError: aliasAssignedEvent.aliasError,
+              aliasWarning: aliasAssignedEvent.aliasWarning
+            };
+            if (!finishedEvents.has("ready")) {
+              debug("Deployment state changed to READY");
+              finishedEvents.add("ready");
+              yield { type: "ready", payload: deploymentState };
+            }
+            debug("Deployment alias assigned from event stream");
+            return yield { type: "alias-assigned", payload: deploymentState };
+          }
+          let deploymentResponse;
+          let retriesLeft = RETRY_COUNT;
+          while (true) {
+            try {
+              deploymentResponse = await (0, import_utils4.fetchApi)(
+                `${apiDeployments}/${deploymentId}${teamId ? `?teamId=${teamId}` : ""}`,
+                token,
+                {
+                  apiUrl,
+                  userAgent: userAgent2,
+                  agent: clientOptions.agent,
+                  // node-fetch's bundled AbortSignal type predates the native one.
+                  signal: aliasAssignedSignal
+                }
+              );
+            } catch (error) {
+              if (getAliasAssignedEvent(aliasAssignedSignal, deploymentId)) {
+                continue polling;
+              }
+              if (aliasAssignedSignal?.aborted) {
+                aliasAssignedSignal = void 0;
+                continue polling;
+              }
+              throw error;
+            }
+            if (getAliasAssignedEvent(aliasAssignedSignal, deploymentId)) {
+              continue polling;
+            }
+            retriesLeft--;
+            if (retriesLeft == 0) {
+              break;
+            }
+            const retryAfterMs = parseRetryAfterMs(deploymentResponse);
+            if (retryAfterMs != null) {
+              const randomSkewMs = Math.floor(RETRY_DELAY_SKEW_MS * Math.random());
+              debug(
+                `Received a transient error or rate limit (HTTP ${deploymentResponse.status}) while querying deployment status, retrying after ${retryAfterMs + randomSkewMs}ms (${retryAfterMs} + ${randomSkewMs}ms of random skew)`
+              );
+              await sleepUntilAliasAssigned(
+                retryAfterMs + randomSkewMs,
+                aliasAssignedSignal,
+                deploymentId
+              );
+              if (getAliasAssignedEvent(aliasAssignedSignal, deploymentId)) {
+                continue polling;
+              }
+              continue;
+            }
             break;
           }
-          const retryAfterMs = parseRetryAfterMs(deploymentResponse);
-          if (retryAfterMs != null) {
-            const randomSkewMs = Math.floor(RETRY_DELAY_SKEW_MS * Math.random());
-            debug(
-              `Received a transient error or rate limit (HTTP ${deploymentResponse.status}) while querying deployment status, retrying after ${retryAfterMs + randomSkewMs}ms (${retryAfterMs} + ${randomSkewMs}ms of random skew)`
-            );
-            await (0, import_sleep_promise.default)(retryAfterMs + randomSkewMs);
-            continue;
+          let deploymentUpdate;
+          try {
+            deploymentUpdate = await deploymentResponse.json();
+          } catch (error) {
+            if (getAliasAssignedEvent(aliasAssignedSignal, deploymentId))
+              continue;
+            if (aliasAssignedSignal?.aborted) {
+              aliasAssignedSignal = void 0;
+              continue;
+            }
+            throw error;
           }
-          break;
-        }
-        const deploymentUpdate = await deploymentResponse.json();
-        if (deploymentUpdate.error) {
-          debug("Deployment status check has errorred");
-          return yield { type: "error", payload: deploymentUpdate.error };
-        }
-        if (deploymentUpdate.readyState === "BUILDING" && !finishedEvents.has("building")) {
-          debug("Deployment state changed to BUILDING");
-          finishedEvents.add("building");
-          yield { type: "building", payload: deploymentUpdate };
-        }
-        if (deploymentUpdate.readyState === "CANCELED" && !finishedEvents.has("canceled")) {
-          debug("Deployment state changed to CANCELED");
-          finishedEvents.add("canceled");
-          yield { type: "canceled", payload: deploymentUpdate };
-        }
-        if ((0, import_ready_state.isReady)(deploymentUpdate) && !finishedEvents.has("ready")) {
-          debug("Deployment state changed to READY");
-          finishedEvents.add("ready");
-          yield { type: "ready", payload: deploymentUpdate };
-        }
-        if (deploymentUpdate.checksState !== void 0) {
-          if (deploymentUpdate.checksState === "completed" && !finishedEvents.has("checks-completed")) {
-            finishedEvents.add("checks-completed");
-            if (deploymentUpdate.checksConclusion === "succeeded") {
-              yield {
-                type: "checks-conclusion-succeeded",
-                payload: deploymentUpdate
-              };
-            } else if (deploymentUpdate.checksConclusion === "failed") {
-              yield { type: "checks-conclusion-failed", payload: deploymentUpdate };
-            } else if (deploymentUpdate.checksConclusion === "skipped") {
-              yield {
-                type: "checks-conclusion-skipped",
-                payload: deploymentUpdate
-              };
-            } else if (deploymentUpdate.checksConclusion === "canceled") {
-              yield {
-                type: "checks-conclusion-canceled",
-                payload: deploymentUpdate
-              };
+          if (getAliasAssignedEvent(aliasAssignedSignal, deploymentId))
+            continue;
+          if (deploymentUpdate.error) {
+            debug("Deployment status check has errorred");
+            return yield { type: "error", payload: deploymentUpdate.error };
+          }
+          deploymentState = deploymentUpdate;
+          if (deploymentUpdate.readyState === "BUILDING" && !finishedEvents.has("building")) {
+            debug("Deployment state changed to BUILDING");
+            finishedEvents.add("building");
+            yield { type: "building", payload: deploymentUpdate };
+          }
+          if (deploymentUpdate.readyState === "CANCELED" && !finishedEvents.has("canceled")) {
+            debug("Deployment state changed to CANCELED");
+            finishedEvents.add("canceled");
+            yield { type: "canceled", payload: deploymentUpdate };
+          }
+          if ((0, import_ready_state.isReady)(deploymentUpdate) && !finishedEvents.has("ready")) {
+            debug("Deployment state changed to READY");
+            finishedEvents.add("ready");
+            yield { type: "ready", payload: deploymentUpdate };
+          }
+          if (deploymentUpdate.checksState !== void 0) {
+            if (deploymentUpdate.checksState === "completed" && !finishedEvents.has("checks-completed")) {
+              finishedEvents.add("checks-completed");
+              if (deploymentUpdate.checksConclusion === "succeeded") {
+                yield {
+                  type: "checks-conclusion-succeeded",
+                  payload: deploymentUpdate
+                };
+              } else if (deploymentUpdate.checksConclusion === "failed") {
+                yield { type: "checks-conclusion-failed", payload: deploymentUpdate };
+              } else if (deploymentUpdate.checksConclusion === "skipped") {
+                yield {
+                  type: "checks-conclusion-skipped",
+                  payload: deploymentUpdate
+                };
+              } else if (deploymentUpdate.checksConclusion === "canceled") {
+                yield {
+                  type: "checks-conclusion-canceled",
+                  payload: deploymentUpdate
+                };
+              }
+            }
+            if (deploymentUpdate.checksState === "registered" && !finishedEvents.has("checks-registered")) {
+              finishedEvents.add("checks-registered");
+              yield { type: "checks-registered", payload: deploymentUpdate };
+            }
+            if (deploymentUpdate.checksState === "running" && !finishedEvents.has("checks-running")) {
+              finishedEvents.add("checks-running");
+              yield { type: "checks-running", payload: deploymentUpdate };
             }
           }
-          if (deploymentUpdate.checksState === "registered" && !finishedEvents.has("checks-registered")) {
-            finishedEvents.add("checks-registered");
-            yield { type: "checks-registered", payload: deploymentUpdate };
+          if (deploymentUpdate.checks?.["deployment-alias"]?.state === "failed" && !finishedEvents.has("checks-v2-failed")) {
+            debug("v2 deployment-alias check failed");
+            finishedEvents.add("checks-v2-failed");
+            return yield {
+              type: "checks-v2-failed",
+              payload: deploymentUpdate
+            };
           }
-          if (deploymentUpdate.checksState === "running" && !finishedEvents.has("checks-running")) {
-            finishedEvents.add("checks-running");
-            yield { type: "checks-running", payload: deploymentUpdate };
+          if ((0, import_ready_state.isAliasAssigned)(deploymentUpdate)) {
+            debug("Deployment alias assigned");
+            return yield { type: "alias-assigned", payload: deploymentUpdate };
           }
+          if ((0, import_ready_state.isAliasError)(deploymentUpdate)) {
+            return yield { type: "error", payload: deploymentUpdate.aliasError };
+          }
+          if (deploymentUpdate.readyState === "ERROR" && deploymentUpdate.errorCode === "BUILD_FAILED") {
+            return yield { type: "error", payload: deploymentUpdate };
+          }
+          if ((0, import_ready_state.isFailed)(deploymentUpdate)) {
+            return yield {
+              type: "error",
+              payload: deploymentUpdate.error || deploymentUpdate
+            };
+          }
+          const elapsed = Date.now() - startTime;
+          const duration = (0, import_get_polling_delay.getPollingDelay)(elapsed);
+          await sleepUntilAliasAssigned(duration, aliasAssignedSignal, deploymentId);
         }
-        if (deploymentUpdate.checks?.["deployment-alias"]?.state === "failed" && !finishedEvents.has("checks-v2-failed")) {
-          debug("v2 deployment-alias check failed");
-          finishedEvents.add("checks-v2-failed");
-          return yield {
-            type: "checks-v2-failed",
-            payload: deploymentUpdate
-          };
-        }
-        if ((0, import_ready_state.isAliasAssigned)(deploymentUpdate)) {
-          debug("Deployment alias assigned");
-          return yield { type: "alias-assigned", payload: deploymentUpdate };
-        }
-        if ((0, import_ready_state.isAliasError)(deploymentUpdate)) {
-          return yield { type: "error", payload: deploymentUpdate.aliasError };
-        }
-        if (deploymentUpdate.readyState === "ERROR" && deploymentUpdate.errorCode === "BUILD_FAILED") {
-          return yield { type: "error", payload: deploymentUpdate };
-        }
-        if ((0, import_ready_state.isFailed)(deploymentUpdate)) {
-          return yield {
-            type: "error",
-            payload: deploymentUpdate.error || deploymentUpdate
-          };
-        }
-        const elapsed = Date.now() - startTime;
-        const duration = (0, import_get_polling_delay.getPollingDelay)(elapsed);
-        await (0, import_sleep_promise.default)(duration);
-      }
     }
   }
 });
@@ -55530,7 +55677,7 @@ var require_archive = __commonJS({
     module.exports = __toCommonJS2(archive_exports);
     var import_node_path2 = __require("path");
     var import_node_zlib = __require("zlib");
-    var import_build_utils6 = __require("@vercel/build-utils");
+    var import_build_utils7 = __require("@vercel/build-utils");
     var import_tar_fs = __toESM2(require_tar_fs());
     var import_hashes = require_hashes();
     async function createTgzFiles(workPath, fileList, debug, exclude) {
@@ -55539,7 +55686,7 @@ var require_archive = __commonJS({
       const tarStream = import_tar_fs.default.pack(workPath, {
         entries: filesToArchive.map((file) => (0, import_node_path2.relative)(workPath, file))
       }).pipe((0, import_node_zlib.createGzip)());
-      const chunkedTarBuffers = await (0, import_build_utils6.streamToBufferChunks)(tarStream);
+      const chunkedTarBuffers = await (0, import_build_utils7.streamToBufferChunks)(tarStream);
       debug?.(`Packed tarball into ${chunkedTarBuffers.length} chunks`);
       return new Map(
         chunkedTarBuffers.map((chunk, index) => [
@@ -56248,11 +56395,11 @@ function isDirectory(targetPath) {
 }
 
 // src/util/projects/link.ts
-import { NowBuildError as NowBuildError2, getPlatformEnv } from "@vercel/build-utils";
+import { NowBuildError as NowBuildError2, getPlatformEnv as getPlatformEnv2 } from "@vercel/build-utils";
 var import_error_utils4 = __toESM(require_dist(), 1);
 
 // src/util/link/repo.ts
-var import_chalk7 = __toESM(require_source(), 1);
+var import_chalk9 = __toESM(require_source(), 1);
 
 // ../../node_modules/.pnpm/@inquirer+core@7.1.3/node_modules/@inquirer/core/dist/esm/lib/key.mjs
 var isUpKey = (key) => (
@@ -57622,6 +57769,9 @@ async function getOriginUrl(configPath) {
   return null;
 }
 
+// src/util/input/select-org.ts
+var import_chalk6 = __toESM(require_source(), 1);
+
 // src/util/teams/get-teams.ts
 import { URLSearchParams as URLSearchParams2 } from "url";
 async function getTeams(client, opts = {}) {
@@ -57681,6 +57831,27 @@ async function fetchTeams(client, opts = {}) {
   }
 }
 
+// src/util/input/select-org.ts
+import { getPlatformEnv } from "@vercel/build-utils";
+
+// src/util/output/param.ts
+var import_chalk4 = __toESM(require_source(), 1);
+function param(text) {
+  return `${import_chalk4.default.gray('"')}${import_chalk4.default.bold(text)}${import_chalk4.default.gray('"')}`;
+}
+
+// src/util/output/print-aligned-label.ts
+var import_chalk5 = __toESM(require_source(), 1);
+var ALIGNED_LABEL_WIDTH = 16;
+function printAlignedLabel(label, value, options = {}) {
+  const gutter = options.gutter === "\u2713" ? import_chalk5.default.green("\u2713") : options.gutter;
+  const prefix = gutter ? `${gutter} ` : "  ";
+  output_manager_default.print(
+    `${prefix}${import_chalk5.default.bold(label.padEnd(ALIGNED_LABEL_WIDTH))}${import_chalk5.default.bold(value)}
+`
+  );
+}
+
 // src/util/input/select-org.ts
 function getScopeOrTeamFromArgv(argv) {
   const args = argv.slice(2);
@@ -57702,44 +57873,10 @@ function getScopeOrTeamFromArgv(argv) {
   }
   return null;
 }
-async function selectOrg(client, question, autoConfirm) {
+async function selectOrg(client, question, autoConfirm, searchable = false, meta) {
   const {
     config: { currentTeam }
   } = client;
-  if (autoConfirm && !client.nonInteractive) {
-    if (currentTeam) {
-      output_manager_default.spinner("Loading team\u2026", 1e3);
-      try {
-        const team = await getTeamById(client, currentTeam);
-        return { type: "team", id: team.id, slug: team.slug };
-      } catch (err) {
-        output_manager_default.debug(`Unable to load current team directly: ${err}`);
-      } finally {
-        output_manager_default.stopSpinner();
-      }
-    }
-    output_manager_default.spinner("Loading user\u2026", 1e3);
-    let user2;
-    try {
-      user2 = await getUser(client);
-    } finally {
-      output_manager_default.stopSpinner();
-    }
-    if (user2.version !== "northstar") {
-      return { type: "user", id: user2.id, slug: user2.username };
-    }
-    if (user2.defaultTeamId) {
-      output_manager_default.spinner("Loading team\u2026", 1e3);
-      try {
-        const team = await getTeamById(client, user2.defaultTeamId);
-        return { type: "team", id: team.id, slug: team.slug };
-      } catch (err) {
-        output_manager_default.debug(`Unable to load default team directly: ${err}`);
-      } finally {
-        output_manager_default.stopSpinner();
-      }
-    }
-  }
   output_manager_default.spinner("Loading teams\u2026", 1e3);
   let user;
   let teams;
@@ -57748,16 +57885,36 @@ async function selectOrg(client, question, autoConfirm) {
   } finally {
     output_manager_default.stopSpinner();
   }
+  const formatChoiceName = (name, slug, isCurrent, limited) => {
+    let title2 = `${name} (${slug})`;
+    if (isCurrent) {
+      title2 += ` ${import_chalk6.default.bold("(current)")}`;
+    }
+    if (limited) {
+      title2 += ` ${emoji("locked")}`;
+    }
+    return title2;
+  };
   const personalAccountChoice = user.version === "northstar" ? [] : [
     {
-      name: user.name || user.username,
+      name: formatChoiceName(
+        user.name || user.username,
+        user.username,
+        !currentTeam,
+        user.limited
+      ),
       value: { type: "user", id: user.id, slug: user.username }
     }
   ];
   const choices = [
     ...personalAccountChoice,
     ...teams.sort((a) => a.id === user.defaultTeamId ? -1 : 1).map((team) => ({
-      name: team.name || team.slug,
+      name: formatChoiceName(
+        team.name || team.slug,
+        team.slug,
+        team.id === currentTeam,
+        team.limited
+      ),
       value: { type: "team", id: team.id, slug: team.slug }
     }))
   ];
@@ -57765,19 +57922,30 @@ async function selectOrg(client, question, autoConfirm) {
     choices.findIndex((choice) => choice.value.id === currentTeam),
     0
   );
-  if (client.nonInteractive) {
-    if (currentTeam) {
-      const match = choices.find((c) => c.value.id === currentTeam);
-      if (match)
-        return match.value;
-    }
-    const explicitScope = getScopeOrTeamFromArgv(client.argv);
-    if (explicitScope) {
-      const match = choices.find(
-        (c) => c.value.id === explicitScope || c.value.slug === explicitScope
-      );
-      if (match)
-        return match.value;
+  if (meta) {
+    meta.choiceCount = choices.length;
+  }
+  const localConfigScope = client.localConfig?.scope;
+  const explicitScope = getScopeOrTeamFromArgv(client.argv) ?? (typeof localConfigScope === "string" ? localConfigScope : null) ?? getPlatformEnv("ORG_ID") ?? null;
+  const matchExplicitScope = () => {
+    if (!explicitScope)
+      return void 0;
+    const match = choices.find(
+      (c) => c.value.id === explicitScope || c.value.slug === explicitScope
+    );
+    if (match)
+      return match.value;
+    if (user.id === explicitScope || user.email === explicitScope || user.username === explicitScope) {
+      return choices.find((c) => c.value.type === "user")?.value;
+    }
+    return void 0;
+  };
+  if (client.nonInteractive || !client.stdin.isTTY) {
+    const match = matchExplicitScope();
+    if (match)
+      return match;
+    if (choices.length === 1) {
+      return choices[0].value;
     }
     const actionRequired = {
       status: "action_required",
@@ -57792,15 +57960,44 @@ async function selectOrg(client, question, autoConfirm) {
       }))
     };
     outputActionRequired(client, actionRequired);
+    output_manager_default.error(
+      choices.length > 0 ? `Multiple teams found. Teams are never auto-selected when the CLI runs without an interactive terminal. Re-run this command with ${param(
+        "--team <slug>"
+      )}, or run ${getCommandName("teams ls")} to list your teams.` : "No teams available."
+    );
     process.exit(1);
   }
-  if (autoConfirm) {
-    return choices[defaultChoiceIndex].value;
+  const explicitOrg = matchExplicitScope();
+  if (explicitOrg) {
+    return explicitOrg;
   }
-  return await client.input.select({
-    message: question,
-    choices,
-    default: choices[defaultChoiceIndex].value
+  if (choices.length === 1) {
+    printAlignedLabel("Team", choices[0].value.slug);
+    return choices[0].value;
+  }
+  if (!searchable) {
+    return await client.input.select({
+      message: question,
+      choices,
+      default: choices[defaultChoiceIndex].value
+    });
+  }
+  const defaultChoice = choices[defaultChoiceIndex];
+  const initialChoices = defaultChoice ? [defaultChoice, ...choices.filter((choice) => choice !== defaultChoice)] : choices;
+  const pageSize = 15;
+  const countHint = choices.length > pageSize ? ` ${import_chalk6.default.dim(`(${choices.length} teams)`)}` : "";
+  return await client.input.search({
+    message: `${question}${countHint}`,
+    pageSize,
+    source: (term) => {
+      const searchTerm = term?.trim().toLowerCase();
+      if (!searchTerm) {
+        return initialChoices;
+      }
+      return choices.filter(
+        (choice) => choice.name.toLowerCase().includes(searchTerm) || choice.value.slug.toLowerCase().includes(searchTerm)
+      );
+    }
   });
 }
 
@@ -57885,16 +58082,16 @@ function repoInfoToUrl(info) {
 }
 
 // src/util/git/connect-git-provider.ts
-var import_chalk5 = __toESM(require_source(), 1);
+var import_chalk8 = __toESM(require_source(), 1);
 import { URL as URL2 } from "url";
 
 // ../../node_modules/.pnpm/@inquirer+select@2.2.2/node_modules/@inquirer/select/dist/esm/index.mjs
-var import_chalk4 = __toESM(require_source2(), 1);
+var import_chalk7 = __toESM(require_source2(), 1);
 var import_figures3 = __toESM(require_figures(), 1);
 var import_ansi_escapes3 = __toESM(require_ansi_escapes(), 1);
 var selectTheme = {
   icon: { cursor: import_figures3.default.pointer },
-  style: { disabled: (text) => import_chalk4.default.dim(`- ${text}`) }
+  style: { disabled: (text) => import_chalk7.default.dim(`- ${text}`) }
 };
 function isSelectable2(item) {
   return !Separator.isSeparator(item) && !item.disabled;
@@ -58110,7 +58307,7 @@ async function connectGitProvider(client, projectId, type, repo) {
     const apiError = isAPIError(err);
     if (apiError && (err.action === "Install GitHub App" || err.code === "repo_not_found")) {
       output_manager_default.error(
-        `Failed to connect ${import_chalk5.default.cyan(
+        `Failed to connect ${import_chalk8.default.cyan(
           repo
         )} to project. Make sure there aren't any typos and that you have access to the repository if it's private.`
       );
@@ -58132,7 +58329,7 @@ ${ctaLabel}: ${link_default(ctaUrl)}`;
       output_manager_default.error(message);
     } else if (apiError && err.action === "Add a Login Connection") {
       output_manager_default.error(
-        err.message.replace(repo, import_chalk5.default.cyan(repo)) + `
+        err.message.replace(repo, import_chalk8.default.cyan(repo)) + `
 Visit ${link_default(err.link)} for more information.`
       );
     } else {
@@ -58203,7 +58400,7 @@ function parseRepoUrl(originUrl) {
 }
 function printRemoteUrls(remoteUrls) {
   for (const [name, url] of Object.entries(remoteUrls)) {
-    output_manager_default.print(`  \u2022 ${name}: ${import_chalk5.default.cyan(url)}
+    output_manager_default.print(`  \u2022 ${name}: ${import_chalk8.default.cyan(url)}
 `);
   }
 }
@@ -58211,7 +58408,7 @@ async function selectRemoteUrl(client, remoteUrls) {
   const choices = [];
   for (const [urlKey, urlValue] of Object.entries(remoteUrls)) {
     choices.push({
-      name: `${urlValue} ${import_chalk5.default.gray(`(${urlKey})`)}`,
+      name: `${urlValue} ${import_chalk8.default.gray(`(${urlKey})`)}`,
       value: urlValue,
       short: urlKey
     });
@@ -58235,7 +58432,7 @@ async function selectAndParseRemoteUrl(client, remoteUrls) {
   }
   const repoInfo = parseRepoUrl(remoteUrl);
   if (!repoInfo) {
-    output_manager_default.log(`Connecting Git repository: ${import_chalk5.default.cyan(remoteUrl)}`);
+    output_manager_default.log(`Connecting Git repository: ${import_chalk8.default.cyan(remoteUrl)}`);
     output_manager_default.error(
       `Failed to parse Git repo data from the following remote URL: ${link_default(
         remoteUrl
@@ -58258,7 +58455,7 @@ async function checkExistsAndConnect({
 }) {
   const displayUrl = buildRepoUrl(provider, gitOrg, repo) || repoPath;
   output_manager_default.log(
-    `Connecting ${formatProvider(provider)} repository: ${import_chalk5.default.cyan(displayUrl)}`
+    `Connecting ${formatProvider(provider)} repository: ${import_chalk8.default.cyan(displayUrl)}`
   );
   if (!gitProviderLink) {
     const connect = await connectGitProvider(
@@ -58278,7 +58475,7 @@ async function checkExistsAndConnect({
     const isSameRepo = connectedProvider === provider && connectedOrg === gitOrg && connectedRepo === repo;
     if (isSameRepo) {
       output_manager_default.log(
-        `${import_chalk5.default.cyan(connectedRepoPath)} is already connected to your project.`
+        `${import_chalk8.default.cyan(connectedRepoPath)} is already connected to your project.`
       );
       return 1;
     }
@@ -58310,7 +58507,7 @@ async function confirmRepoConnect(client, yes, connectedProvider, connectedRepoP
     shouldReplaceProject = await client.input.confirm(
       `Looks like you already have a ${formatProvider(
         connectedProvider
-      )} repository connected: ${import_chalk5.default.cyan(
+      )} repository connected: ${import_chalk8.default.cyan(
         connectedRepoPath
       )}. Do you want to replace it?`,
       true
@@ -58370,18 +58567,6 @@ function getGitConfigPath(opts) {
   return join4(absoluteGitCommonDir, "config");
 }
 
-// src/util/output/print-aligned-label.ts
-var import_chalk6 = __toESM(require_source(), 1);
-var ALIGNED_LABEL_WIDTH = 16;
-function printAlignedLabel(label, value, options = {}) {
-  const gutter = options.gutter === "\u2713" ? import_chalk6.default.green("\u2713") : options.gutter;
-  const prefix = gutter ? `${gutter} ` : "  ";
-  output_manager_default.print(
-    `${prefix}${import_chalk6.default.bold(label.padEnd(ALIGNED_LABEL_WIDTH))}${import_chalk6.default.bold(value)}
-`
-  );
-}
-
 // src/util/link/repo.ts
 var home = homedir2();
 async function getRepoLink(client, cwd) {
@@ -58492,9 +58677,9 @@ async function discoverRepoProjects(client, rootPath, {
     return /* @__PURE__ */ new Map();
   });
   const promptAction = existingRemoteName ? "add" : "link";
-  const confirmMessage = promptAction === "add" ? `Add Project(s) for Git repository at ${import_chalk7.default.dim(
+  const confirmMessage = promptAction === "add" ? `Add Project(s) for Git repository at ${import_chalk9.default.dim(
     `"${humanizePath(rootPath)}"`
-  )}?` : `Link Git repository at ${import_chalk7.default.dim(
+  )}?` : `Link Git repository at ${import_chalk9.default.dim(
     `"${humanizePath(rootPath)}"`
   )} to your Project(s)?`;
   const shouldLink = yes || await client.input.confirm(confirmMessage, true);
@@ -58521,7 +58706,7 @@ async function discoverRepoProjects(client, rootPath, {
     fallback: () => link_default(repoUrl)
   });
   output_manager_default.spinner(
-    `Fetching Projects for ${repoUrlLink} under ${import_chalk7.default.bold(org.slug)}\u2026`
+    `Fetching Projects for ${repoUrlLink} under ${import_chalk9.default.bold(org.slug)}\u2026`
   );
   const detectedProjects = await detectedProjectsPromise;
   let projects = await fetchProjectsForRepoUrl(client, repoUrl, org.id);
@@ -58536,7 +58721,7 @@ async function discoverRepoProjects(client, rootPath, {
   }
   if (projects.length === 0) {
     output_manager_default.print(
-      `  No Projects are linked to ${repoUrlLink} under ${import_chalk7.default.bold(org.slug)}.
+      `  No Projects are linked to ${repoUrlLink} under ${import_chalk9.default.bold(org.slug)}.
 `
     );
   } else {
@@ -58545,7 +58730,7 @@ async function discoverRepoProjects(client, rootPath, {
         "Project",
         projects.length,
         true
-      )} linked to ${repoUrlLink} under ${import_chalk7.default.bold(org.slug)}
+      )} linked to ${repoUrlLink} under ${import_chalk9.default.bold(org.slug)}
 `
     );
   }
@@ -58583,7 +58768,7 @@ async function discoverRepoProjects(client, rootPath, {
         ...projects.map((project) => {
           const dir = project.rootDirectory || ".";
           return {
-            name: `${org.slug}/${project.name} ${import_chalk7.default.gray(`(${dir})`)}`,
+            name: `${org.slug}/${project.name} ${import_chalk9.default.gray(`(${dir})`)}`,
             value: project,
             checked: true
           };
@@ -58598,7 +58783,7 @@ async function discoverRepoProjects(client, rootPath, {
               ].filter(Boolean).join("-")
             );
             return {
-              name: `${org.slug}/${name} ${import_chalk7.default.gray(`(${rootDirectory || "."} \xB7 ${framework.name})`)}`,
+              name: `${org.slug}/${name} ${import_chalk9.default.gray(`(${rootDirectory || "."} \xB7 ${framework.name})`)}`,
               value: {
                 newProject: true,
                 rootDirectory,
@@ -58806,17 +58991,11 @@ function findProjectsFromPath(projects, path) {
 }
 
 // src/commands/env/pull.ts
-var import_chalk12 = __toESM(require_source(), 1);
+var import_chalk13 = __toESM(require_source(), 1);
 var import_fs_extra5 = __toESM(require_lib2(), 1);
 import { closeSync, openSync, readSync } from "fs";
 import { resolve as resolve3 } from "path";
 
-// src/util/output/param.ts
-var import_chalk8 = __toESM(require_source(), 1);
-function param(text) {
-  return `${import_chalk8.default.gray('"')}${import_chalk8.default.bold(text)}${import_chalk8.default.gray('"')}`;
-}
-
 // src/util/env/get-env-records.ts
 import { URLSearchParams as URLSearchParams3 } from "url";
 async function getEnvRecords(client, projectId, source, {
@@ -58901,7 +59080,7 @@ var parseEnv = (env) => {
 };
 
 // src/util/env/diff-env-files.ts
-var import_chalk9 = __toESM(require_source(), 1);
+var import_chalk10 = __toESM(require_source(), 1);
 async function createEnvObject(envPath) {
   const envArr = (await (0, import_fs_extra4.readFile)(envPath, "utf-8")).replace(/"/g, "").split(/\r?\n|\r/).filter((line) => /^[^#]/.test(line)).filter((line) => /=/i.test(line));
   const parsedEnv = parseEnv(envArr);
@@ -58932,10 +59111,10 @@ function findChanges(oldEnv, newEnv) {
 function buildDeltaString(oldEnv, newEnv) {
   const { added, changed, removed } = findChanges(oldEnv, newEnv);
   let deltaString = "";
-  deltaString += import_chalk9.default.green(addDeltaSection("+", changed, true));
-  deltaString += import_chalk9.default.green(addDeltaSection("+", added));
-  deltaString += import_chalk9.default.red(addDeltaSection("-", removed));
-  return deltaString ? import_chalk9.default.gray("  Changes:\n") + deltaString + "\n" : deltaString;
+  deltaString += import_chalk10.default.green(addDeltaSection("+", changed, true));
+  deltaString += import_chalk10.default.green(addDeltaSection("+", added));
+  deltaString += import_chalk10.default.red(addDeltaSection("-", removed));
+  return deltaString ? import_chalk10.default.gray("  Changes:\n") + deltaString + "\n" : deltaString;
 }
 function addDeltaSection(prefix, arr, changed = false) {
   if (arr.length === 0)
@@ -58983,12 +59162,12 @@ var import_error_utils2 = __toESM(require_dist(), 1);
 var import_json_parse_better_errors = __toESM(require_json_parse_better_errors(), 1);
 
 // src/util/projects/format-project.ts
-var import_chalk10 = __toESM(require_source(), 1);
+var import_chalk11 = __toESM(require_source(), 1);
 function formatProject(orgSlug, projectSlug, options) {
   const orgProjectSlug = `${orgSlug}/${projectSlug}`;
   const projectUrl = `https://vercel.com/${orgProjectSlug}`;
-  const projectSlugLink = output_manager_default.link(import_chalk10.default.bold(orgProjectSlug), projectUrl, {
-    fallback: () => import_chalk10.default.bold(orgProjectSlug),
+  const projectSlugLink = output_manager_default.link(import_chalk11.default.bold(orgProjectSlug), projectUrl, {
+    fallback: () => import_chalk11.default.bold(orgProjectSlug),
     color: false,
     ...options
   });
@@ -59441,7 +59620,7 @@ function parseTarget({
 }
 
 // src/commands/login/future.ts
-var import_chalk11 = __toESM(require_source(), 1);
+var import_chalk12 = __toESM(require_source(), 1);
 var open = __toESM(require_open(), 1);
 var import_ansi_escapes4 = __toESM(require_ansi_escapes(), 1);
 import readline3 from "readline";
@@ -59722,13 +59901,13 @@ async function performDeviceCodeFlow(client, options) {
   const shouldSkipBrowser = process.env.CI && !isCursorAgent;
   output_manager_default.log(
     `
-  Visit ${import_chalk11.default.bold(
+  Visit ${import_chalk12.default.bold(
       output_manager_default.link(
         verification_uri.replace("https://", ""),
         verification_uri_complete,
         { color: false, fallback: () => verification_uri_complete }
       )
-    )}${output_manager_default.supportsHyperlink ? ` and enter ${import_chalk11.default.bold(user_code)}` : ""}
+    )}${output_manager_default.supportsHyperlink ? ` and enter ${import_chalk12.default.bold(user_code)}` : ""}
 `
   );
   if (!shouldSkipBrowser) {
@@ -59742,7 +59921,7 @@ async function performDeviceCodeFlow(client, options) {
       if (client.isAgent && client.nonInteractive) {
         output_manager_default.log(
           `
-${import_chalk11.default.yellow("\u26A0")} ${import_chalk11.default.bold("Browser could not be opened automatically.")}
+${import_chalk12.default.yellow("\u26A0")} ${import_chalk12.default.bold("Browser could not be opened automatically.")}
 `
         );
         output_manager_default.log(
@@ -59840,12 +60019,12 @@ async function login(client, telemetry) {
   client.writeToConfigFile();
   output_manager_default.debug(`Saved credentials in "${humanizePath(client.getGlobalPathConfig())}"`);
   output_manager_default.print(`
-  ${import_chalk11.default.cyan("Congratulations!")} You are now signed in.
+  ${import_chalk12.default.cyan("Congratulations!")} You are now signed in.
 
   To deploy something, run ${getCommandName()}.
 
   ${emoji("tip")} To deploy every commit automatically,
-  connect a Git Repository (${import_chalk11.default.bold(output_manager_default.link("vercel.link/git", "https://vercel.link/git", { color: false }))}).
+  connect a Git Repository (${import_chalk12.default.bold(output_manager_default.link("vercel.link/git", "https://vercel.link/git", { color: false }))}).
 `);
   telemetry.trackState("success");
   return 0;
@@ -59977,7 +60156,7 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   const head = tryReadHeadSync(fullPath, Buffer.byteLength(CONTENTS_PREFIX));
   const exists = typeof head !== "undefined";
   if (head === CONTENTS_PREFIX && !oidcTokenOnly) {
-    output_manager_default.log(`Overwriting existing ${import_chalk12.default.bold(filename)} file`);
+    output_manager_default.log(`Overwriting existing ${import_chalk13.default.bold(filename)} file`);
   } else if (exists && !skipConfirmation && !oidcTokenOnly) {
     if (client.nonInteractive) {
       outputActionRequired(client, {
@@ -60005,13 +60184,13 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
     }
   }
   const projectSlugLink = formatProject(link.org.slug, link.project.name);
-  const downloadMessage = oidcTokenOnly ? `Downloading a fresh \`${import_chalk12.default.cyan(
+  const downloadMessage = oidcTokenOnly ? `Downloading a fresh \`${import_chalk13.default.cyan(
     VERCEL_OIDC_TOKEN
-  )}\` for ${projectSlugLink}` : gitBranch ? `Downloading \`${import_chalk12.default.cyan(
+  )}\` for ${projectSlugLink}` : gitBranch ? `Downloading \`${import_chalk13.default.cyan(
     environment
-  )}\` environment variables for ${projectSlugLink} and any overrides for branch ${import_chalk12.default.cyan(
+  )}\` environment variables for ${projectSlugLink} and any overrides for branch ${import_chalk13.default.cyan(
     gitBranch
-  )}` : `Downloading \`${import_chalk12.default.cyan(
+  )}` : `Downloading \`${import_chalk13.default.cyan(
     environment
   )}\` environment variables for ${projectSlugLink}`;
   output_manager_default.log(downloadMessage);
@@ -60026,13 +60205,10 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   let oldEnv;
   if (exists && !oidcTokenOnly) {
     oldEnv = await createEnvObject(fullPath);
-    if (oldEnv) {
-      const newEnv = (0, import_json_parse_better_errors.default)(JSON.stringify(records).replace(/\\"/g, ""));
-      deltaString = buildDeltaString(oldEnv, newEnv);
-    }
   }
   let contents;
   let fileChanged = true;
+  const keptLocalKeys = [];
   if (oidcTokenOnly) {
     const existingContents = exists ? await (0, import_fs_extra5.readFile)(fullPath, "utf8") : "";
     contents = updateOidcTokenContents(
@@ -60041,7 +60217,22 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
     );
     fileChanged = contents !== existingContents;
   } else {
-    contents = CONTENTS_PREFIX + Object.keys(records).sort().filter((key) => !VARIABLES_TO_IGNORE.includes(key)).map((key) => `${key}="${escapeValue2(records[key])}"`).join("\n") + "\n";
+    const mergedRecords = { ...records };
+    if (oldEnv) {
+      for (const [key, value] of Object.entries(oldEnv)) {
+        if (!(key in mergedRecords) && key !== VERCEL_OIDC_TOKEN && !VARIABLES_TO_IGNORE.includes(key)) {
+          mergedRecords[key] = value;
+          keptLocalKeys.push(key);
+        }
+      }
+    }
+    contents = CONTENTS_PREFIX + Object.keys(mergedRecords).sort().filter((key) => !VARIABLES_TO_IGNORE.includes(key)).map((key) => `${key}="${escapeValue2(mergedRecords[key])}"`).join("\n") + "\n";
+    if (oldEnv) {
+      const newEnv = (0, import_json_parse_better_errors.default)(
+        JSON.stringify(mergedRecords).replace(/\\"/g, "")
+      );
+      deltaString = buildDeltaString(oldEnv, newEnv);
+    }
   }
   if (fileChanged) {
     await (0, import_fs_extra5.outputFile)(fullPath, contents, "utf8");
@@ -60051,6 +60242,13 @@ async function envPullCommandLogic(client, filename, skipConfirmation, environme
   } else if (oldEnv && exists) {
     output_manager_default.log("No changes found.");
   }
+  if (keptLocalKeys.length > 0) {
+    output_manager_default.log(
+      `Kept ${keptLocalKeys.sort().map((key) => import_chalk13.default.bold(key)).join(", ")} (defined locally, not found in the ${import_chalk13.default.cyan(
+        environment
+      )} Environment)`
+    );
+  }
   let isGitIgnoreUpdated = false;
   const fileExistsAfterPull = exists || contents.length > 0;
   if (filename === ".env.local" && fileExistsAfterPull) {
@@ -60125,7 +60323,7 @@ function escapeValue2(value) {
 }
 
 // src/util/projects/find-project-root.ts
-var import_chalk13 = __toESM(require_source(), 1);
+var import_chalk14 = __toESM(require_source(), 1);
 var import_fs_extra7 = __toESM(require_lib2(), 1);
 import { stat } from "fs/promises";
 import { join as join8, dirname } from "path";
@@ -61072,7 +61270,7 @@ async function resolveProjectCwd(cwd) {
   }
   const result = await tryDetectServices(projectRoot);
   if (result && (result.services?.length ?? 0) > 0) {
-    output_manager_default.debug(`Running from project root: ${import_chalk13.default.cyan(projectRoot)}`);
+    output_manager_default.debug(`Running from project root: ${import_chalk14.default.cyan(projectRoot)}`);
     return projectRoot;
   }
   return cwd;
@@ -61226,8 +61424,8 @@ async function getLinkFromDir(dir) {
   }
 }
 async function hasProjectLink(client, projectLink, path) {
-  const VERCEL_ORG_ID = getPlatformEnv("ORG_ID");
-  const VERCEL_PROJECT_ID = getPlatformEnv("PROJECT_ID");
+  const VERCEL_ORG_ID = getPlatformEnv2("ORG_ID");
+  const VERCEL_PROJECT_ID = getPlatformEnv2("PROJECT_ID");
   if (VERCEL_ORG_ID === projectLink.orgId && VERCEL_PROJECT_ID === projectLink.projectId) {
     return true;
   }
@@ -61256,8 +61454,8 @@ async function hasProjectLink(client, projectLink, path) {
 }
 async function getLinkedProject(client, path = client.cwd, projectName, apiFallback) {
   path = await resolveProjectCwd(path);
-  const VERCEL_ORG_ID = getPlatformEnv("ORG_ID");
-  const VERCEL_PROJECT_ID = getPlatformEnv("PROJECT_ID");
+  const VERCEL_ORG_ID = getPlatformEnv2("ORG_ID");
+  const VERCEL_PROJECT_ID = getPlatformEnv2("PROJECT_ID");
   const shouldUseEnv = Boolean(VERCEL_ORG_ID && VERCEL_PROJECT_ID);
   if ((VERCEL_ORG_ID || VERCEL_PROJECT_ID) && !shouldUseEnv) {
     output_manager_default.error(
@@ -61780,6 +61978,7 @@ export {
   onExit,
   createPrompt,
   esm_default,
+  Separator,
   esm_default2,
   esm_default3,
   ua_default,
@@ -61790,6 +61989,9 @@ export {
   refreshTokenRequest,
   performDeviceCodeFlow,
   login,
+  modify,
+  applyEdits,
+  init_main,
   require_inherits,
   require_tar_fs,
   require_dist7 as require_dist,
@@ -61802,6 +62004,8 @@ export {
   createGitMeta,
   parseGitConfig,
   pluckRemoteUrls,
+  ALIGNED_LABEL_WIDTH,
+  printAlignedLabel,
   selectOrg,
   createProject,
   require_frameworks,
@@ -61816,7 +62020,6 @@ export {
   printRemoteUrls,
   selectAndParseRemoteUrl,
   checkExistsAndConnect,
-  printAlignedLabel,
   getRepoLink,
   resolveGitRemote,
   fetchProjectsForRepoUrl,