convex 1.37.0 → 1.38.0

package/dist/cjs/cli/lib/localDeployment/localDeployment.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var localDeployment_exports = {};
 __export(localDeployment_exports, {
   handleLocalDeployment: () => handleLocalDeployment,
+  importDefaultEnvVars: () => importDefaultEnvVars,
   loadLocalDeploymentCredentials: () => loadLocalDeploymentCredentials
 });
 module.exports = __toCommonJS(localDeployment_exports);
@@ -31,6 +32,9 @@ var import_prompts = require("../utils/prompts.js");
 var import_errors = require("./errors.js");
 var import_utils = require("./utils.js");
 var import_download = require("./download.js");
+var import_defaultEnv = require("../defaultEnv.js");
+var import_env = require("../env.js");
+var import_deploymentSelection = require("../deploymentSelection.js");
 async function handleLocalDeployment(ctx, options) {
   if (await (0, import_utils.isOffline)()) {
     return handleOffline(ctx, options);
@@ -39,7 +43,8 @@ async function handleLocalDeployment(ctx, options) {
     projectSlug: options.projectSlug,
     teamSlug: options.teamSlug
   });
-  if (existingDeploymentForProject === null) {
+  const isFirstTime = existingDeploymentForProject === null;
+  if (isFirstTime) {
     (0, import_utils.printLocalDeploymentWelcomeMessage)();
   }
   ctx.registerCleanup(async (_exitCode, err) => {
@@ -65,10 +70,10 @@ async function handleLocalDeployment(ctx, options) {
       allowedVersion: existingDeploymentForProject?.config.backendVersion
     } : { kind: "version", version: options.backendVersion }
   );
-  const { cloudPort, sitePort } = await (0, import_utils.chooseLocalBackendPorts)(
-    ctx,
-    options.ports
-  );
+  const { cloudPort, sitePort } = await (0, import_utils.chooseLocalBackendPorts)(ctx, {
+    requestedPorts: options.ports,
+    suggestedPorts: existingDeploymentForProject?.config.ports
+  });
   const { deploymentName, adminKey } = await (0, import_bigBrain.bigBrainStart)(ctx, {
     port: cloudPort,
     projectSlug: options.projectSlug,
@@ -99,6 +104,15 @@ async function handleLocalDeployment(ctx, options) {
     instanceSecret: import_utils.LOCAL_BACKEND_INSTANCE_SECRET,
     forceUpgrade: options.forceUpgrade
   });
+  if (isFirstTime) {
+    await importDefaultEnvVars(ctx, {
+      teamSlug: options.teamSlug,
+      projectSlug: options.projectSlug,
+      deploymentName,
+      deploymentUrl: (0, import_run.localDeploymentUrl)(cloudPort),
+      adminKey
+    });
+  }
   let activityTimeout = null;
   const scheduleActivityPing = () => {
     activityTimeout = setTimeout(async () => {
@@ -153,10 +167,11 @@ async function handleOffline(ctx, options) {
     kind: "version",
     version: config.backendVersion
   });
-  const { cloudPort, sitePort } = await (0, import_utils.chooseLocalBackendPorts)(
-    ctx,
-    options.ports
-  );
+  const { cloudPort, sitePort } = await (0, import_utils.chooseLocalBackendPorts)(ctx, {
+    requestedPorts: options.ports
+    // FIXME: This doesn’t try to reuse the ports already assigned in the config.
+    // Please update this if we ever support offline mode (currently this is dead code).
+  });
   (0, import_filePaths.saveDeploymentConfig)(ctx, "local", deploymentName, config);
   await (0, import_run.runLocalBackend)(ctx, {
     binaryPath,
@@ -270,4 +285,44 @@ async function chooseFromExistingLocalDeployments(ctx) {
     }))
   });
 }
+async function importDefaultEnvVars(ctx, {
+  teamSlug,
+  projectSlug,
+  deploymentName,
+  deploymentUrl,
+  adminKey
+}) {
+  (0, import_log.showSpinner)("Importing default env vars...");
+  const project = await (0, import_deploymentSelection.getProjectDetails)(ctx, {
+    kind: "teamAndProjectSlugs",
+    teamSlug,
+    projectSlug
+  });
+  const defaults = await (0, import_defaultEnv.defaultEnvBackend)(ctx, project.id, "dev").list();
+  if (defaults.length === 0) {
+    (0, import_log.logFinishedStep)("No default env vars to import.");
+    return;
+  }
+  const deployment = {
+    deploymentUrl,
+    deploymentFields: {
+      deploymentName,
+      deploymentType: "local",
+      projectSlug,
+      teamSlug
+    }
+  };
+  await (0, import_run.withRunningBackend)({
+    ctx,
+    deployment,
+    action: async () => {
+      await (0, import_env.deploymentEnvBackend)(ctx, { deploymentUrl, adminKey }).update(
+        defaults.map((v) => ({ name: v.name, value: v.value }))
+      );
+      (0, import_log.logFinishedStep)(
+        `Imported ${defaults.length} environment ${defaults.length === 1 ? "variable" : "variables"} from default environment variables: ${defaults.map((v) => v.name).join(", ")}`
+      );
+    }
+  });
+}
 //# sourceMappingURL=localDeployment.js.map

package/dist/cjs/cli/lib/localDeployment/localDeployment.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lib/localDeployment/localDeployment.ts"],
-  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport { logVerbose } from \"../../../bundler/log.js\";\nimport {\n  bigBrainPause,\n  bigBrainRecordActivity,\n  bigBrainStart,\n} from \"./bigBrain.js\";\nimport {\n  LocalDeploymentConfig,\n  loadDeploymentConfig,\n  loadDeploymentConfigFromDir,\n  loadProjectLocalConfig,\n  legacyDeploymentStateDir,\n  rootDeploymentStateDir,\n  saveDeploymentConfig,\n} from \"./filePaths.js\";\nimport {\n  ensureBackendRunning,\n  ensureBackendStopped,\n  localDeploymentUrl,\n  runLocalBackend,\n} from \"./run.js\";\nimport { handlePotentialUpgrade } from \"./upgrade.js\";\nimport { OnDeploymentActivityFunc } from \"../deployment.js\";\nimport { promptSearch } from \"../utils/prompts.js\";\nimport { LocalDeploymentError, printLocalDeploymentOnError } from \"./errors.js\";\nimport {\n  chooseLocalBackendPorts,\n  printLocalDeploymentWelcomeMessage,\n  isOffline,\n  LOCAL_BACKEND_INSTANCE_SECRET,\n} from \"./utils.js\";\nimport { ensureBackendBinaryDownloaded } from \"./download.js\";\nexport type DeploymentDetails = {\n  deploymentName: string;\n  deploymentUrl: string;\n  adminKey: string;\n  onActivity: OnDeploymentActivityFunc;\n};\n\nexport async function handleLocalDeployment(\n  ctx: Context,\n  options: {\n    teamSlug: string;\n    projectSlug: string;\n    ports?:\n      | {\n          cloud: number;\n          site: number;\n        }\n      | undefined;\n    backendVersion?: string | undefined;\n    forceUpgrade: boolean;\n  },\n): Promise<DeploymentDetails> {\n  if (await isOffline()) {\n    return handleOffline(ctx, options);\n  }\n\n  const existingDeploymentForProject = await getExistingDeployment(ctx, {\n    projectSlug: options.projectSlug,\n    teamSlug: options.teamSlug,\n  });\n  if (existingDeploymentForProject === null) {\n    printLocalDeploymentWelcomeMessage();\n  }\n  ctx.registerCleanup(async (_exitCode, err) => {\n    if (err instanceof LocalDeploymentError) {\n      printLocalDeploymentOnError();\n    }\n  });\n  if (existingDeploymentForProject !== null) {\n    logVerbose(`Found existing deployment for project ${options.projectSlug}`);\n    // If it's still running for some reason, exit and tell the user to kill it.\n    // It's fine if a different backend is running on these ports though since we'll\n    // pick new ones.\n    await ensureBackendStopped(ctx, {\n      ports: {\n        cloud: existingDeploymentForProject.config.ports.cloud,\n      },\n      maxTimeSecs: 5,\n      deploymentName: existingDeploymentForProject.deploymentName,\n      allowOtherDeployments: true,\n    });\n  }\n\n  const { binaryPath, version } = await ensureBackendBinaryDownloaded(\n    ctx,\n    options.backendVersion === undefined\n      ? {\n          kind: \"latest\",\n          allowedVersion: existingDeploymentForProject?.config.backendVersion,\n        }\n      : { kind: \"version\", version: options.backendVersion },\n  );\n  const { cloudPort, sitePort } = await chooseLocalBackendPorts(\n    ctx,\n    options.ports,\n  );\n  const { deploymentName, adminKey } = await bigBrainStart(ctx, {\n    port: cloudPort,\n    projectSlug: options.projectSlug,\n    teamSlug: options.teamSlug,\n    instanceName: existingDeploymentForProject?.deploymentName ?? null,\n  });\n  const onActivity = async (isOffline: boolean, _wasOffline: boolean) => {\n    await ensureBackendRunning(ctx, {\n      cloudPort,\n      deploymentName,\n      maxTimeSecs: 5,\n    });\n    if (isOffline) {\n      return;\n    }\n    await bigBrainRecordActivity(ctx, {\n      instanceName: deploymentName,\n    });\n  };\n\n  const { cleanupHandle } = await handlePotentialUpgrade(ctx, {\n    deploymentKind: \"local\",\n    deploymentName,\n    oldVersion: existingDeploymentForProject?.config.backendVersion ?? null,\n    newBinaryPath: binaryPath,\n    newVersion: version,\n    ports: { cloud: cloudPort, site: sitePort },\n    adminKey,\n    instanceSecret: LOCAL_BACKEND_INSTANCE_SECRET,\n    forceUpgrade: options.forceUpgrade,\n  });\n\n  // Periodically report activity to BigBrain every 60 seconds.\n  // Uses self-scheduling setTimeout to avoid overlapping requests.\n  let activityTimeout: ReturnType<typeof setTimeout> | null = null;\n  const scheduleActivityPing = () => {\n    activityTimeout = setTimeout(async () => {\n      try {\n        await bigBrainRecordActivity(ctx, {\n          instanceName: deploymentName,\n        });\n      } catch {\n        // Best-effort: don't crash on failed pings\n      }\n      scheduleActivityPing();\n    }, 60_000);\n  };\n  scheduleActivityPing();\n\n  const cleanupFunc = ctx.removeCleanup(cleanupHandle);\n  ctx.registerCleanup(async (exitCode, err) => {\n    if (activityTimeout !== null) {\n      clearTimeout(activityTimeout);\n    }\n    if (cleanupFunc !== null) {\n      await cleanupFunc(exitCode, err);\n    }\n    await bigBrainPause(ctx, {\n      projectSlug: options.projectSlug,\n      teamSlug: options.teamSlug,\n    });\n  });\n\n  return {\n    adminKey,\n    deploymentName,\n    deploymentUrl: localDeploymentUrl(cloudPort),\n    onActivity,\n  };\n}\n\nexport async function loadLocalDeploymentCredentials(\n  ctx: Context,\n  deploymentName: string,\n): Promise<{\n  deploymentName: string;\n  deploymentUrl: string;\n  adminKey: string;\n}> {\n  const config = loadDeploymentConfig(ctx, \"local\", deploymentName);\n  if (config === null) {\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage:\n        \"Failed to load deployment config - try running `npx convex dev --configure`\",\n    });\n  }\n  return {\n    deploymentName,\n    deploymentUrl: localDeploymentUrl(config.ports.cloud),\n    adminKey: config.adminKey,\n  };\n}\n\nasync function handleOffline(\n  ctx: Context,\n  options: {\n    teamSlug: string;\n    projectSlug: string;\n    ports?: { cloud: number; site: number } | undefined;\n  },\n): Promise<DeploymentDetails> {\n  const { deploymentName, config } =\n    await chooseFromExistingLocalDeployments(ctx);\n  const { binaryPath } = await ensureBackendBinaryDownloaded(ctx, {\n    kind: \"version\",\n    version: config.backendVersion,\n  });\n  const { cloudPort, sitePort } = await chooseLocalBackendPorts(\n    ctx,\n    options.ports,\n  );\n  saveDeploymentConfig(ctx, \"local\", deploymentName, config);\n  await runLocalBackend(ctx, {\n    binaryPath,\n    ports: { cloud: cloudPort, site: sitePort },\n    deploymentName,\n    deploymentKind: \"local\",\n    instanceSecret: LOCAL_BACKEND_INSTANCE_SECRET,\n    isLatestVersion: false,\n  });\n  return {\n    adminKey: config.adminKey,\n    deploymentName,\n    deploymentUrl: localDeploymentUrl(cloudPort),\n    onActivity: async (isOffline: boolean, wasOffline: boolean) => {\n      await ensureBackendRunning(ctx, {\n        cloudPort,\n        deploymentName,\n        maxTimeSecs: 5,\n      });\n      if (isOffline) {\n        return;\n      }\n      if (wasOffline) {\n        await bigBrainStart(ctx, {\n          port: cloudPort,\n          projectSlug: options.projectSlug,\n          teamSlug: options.teamSlug,\n          instanceName: deploymentName,\n        });\n      }\n      await bigBrainRecordActivity(ctx, {\n        instanceName: deploymentName,\n      });\n    },\n  };\n}\n\nasync function getExistingDeployment(\n  ctx: Context,\n  options: {\n    projectSlug: string;\n    teamSlug: string;\n  },\n): Promise<{ deploymentName: string; config: LocalDeploymentConfig } | null> {\n  const { projectSlug, teamSlug } = options;\n\n  // Check project-local storage first - this is the new default location\n  const projectLocal = loadProjectLocalConfig(ctx);\n  if (projectLocal !== null) {\n    // Verify this deployment is for the expected project (matches the naming pattern)\n    const expectedPrefix = `local-${teamSlug.replace(/-/g, \"_\")}-${projectSlug.replace(/-/g, \"_\")}`;\n    if (projectLocal.deploymentName.startsWith(expectedPrefix)) {\n      return projectLocal;\n    }\n    logVerbose(\n      `Project-local deployment ${projectLocal.deploymentName} doesn't match expected prefix ${expectedPrefix}`,\n    );\n  }\n\n  // Fall back to checking legacy home directory\n  const prefix = `local-${teamSlug.replace(/-/g, \"_\")}-${projectSlug.replace(/-/g, \"_\")}`;\n  const legacyDeployments = await getLegacyLocalDeployments(ctx);\n  const existingDeploymentForProject = legacyDeployments.find((d) =>\n    d.deploymentName.startsWith(prefix),\n  );\n  if (existingDeploymentForProject === undefined) {\n    return null;\n  }\n  return {\n    deploymentName: existingDeploymentForProject.deploymentName,\n    config: existingDeploymentForProject.config,\n  };\n}\n\n/**\n * Get local deployments from the legacy home directory location.\n * This is used for backward compatibility and for listing deployments in offline mode.\n */\nasync function getLegacyLocalDeployments(ctx: Context): Promise<\n  Array<{\n    deploymentName: string;\n    config: LocalDeploymentConfig;\n  }>\n> {\n  const dir = rootDeploymentStateDir(\"local\");\n  if (!ctx.fs.exists(dir)) {\n    return [];\n  }\n  const deploymentNames = ctx.fs\n    .listDir(dir)\n    .map((d) => d.name)\n    .filter((d) => d.startsWith(\"local-\"));\n  return deploymentNames.flatMap((deploymentName) => {\n    const legacyDir = legacyDeploymentStateDir(\"local\", deploymentName);\n    const config = loadDeploymentConfigFromDir(ctx, legacyDir);\n    if (config !== null) {\n      return [{ deploymentName, config }];\n    }\n    return [];\n  });\n}\n\n/**\n * Get all local deployments from both project-local and legacy locations.\n */\nasync function getLocalDeployments(ctx: Context): Promise<\n  Array<{\n    deploymentName: string;\n    config: LocalDeploymentConfig;\n  }>\n> {\n  const deployments: Array<{\n    deploymentName: string;\n    config: LocalDeploymentConfig;\n  }> = [];\n\n  // Check project-local storage\n  const projectLocal = loadProjectLocalConfig(ctx);\n  if (\n    projectLocal !== null &&\n    projectLocal.deploymentName.startsWith(\"local-\")\n  ) {\n    deployments.push(projectLocal);\n  }\n\n  // Also include legacy deployments (but avoid duplicates)\n  const legacyDeployments = await getLegacyLocalDeployments(ctx);\n  for (const legacy of legacyDeployments) {\n    if (!deployments.some((d) => d.deploymentName === legacy.deploymentName)) {\n      deployments.push(legacy);\n    }\n  }\n\n  return deployments;\n}\n\nasync function chooseFromExistingLocalDeployments(ctx: Context): Promise<{\n  deploymentName: string;\n  config: LocalDeploymentConfig;\n}> {\n  const localDeployments = await getLocalDeployments(ctx);\n\n  if (localDeployments.length === 0) {\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage:\n        \"No local deployments found. Please run `npx convex dev` while online first.\",\n    });\n  }\n\n  // Auto-select if there's only one deployment\n  if (localDeployments.length === 1) {\n    logVerbose(\n      `Auto-selecting the only local deployment: ${localDeployments[0].deploymentName}`,\n    );\n    return localDeployments[0];\n  }\n\n  // Multiple deployments (legacy) - prompt user to choose\n  return promptSearch(ctx, {\n    message: \"Choose from an existing local deployment:\",\n    choices: localDeployments.map((d) => ({\n      name: d.deploymentName,\n      value: d,\n    })),\n  });\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport {\n  logFinishedStep,\n  logVerbose,\n  showSpinner,\n} from \"../../../bundler/log.js\";\nimport {\n  bigBrainPause,\n  bigBrainRecordActivity,\n  bigBrainStart,\n} from \"./bigBrain.js\";\nimport {\n  LocalDeploymentConfig,\n  loadDeploymentConfig,\n  loadDeploymentConfigFromDir,\n  loadProjectLocalConfig,\n  legacyDeploymentStateDir,\n  rootDeploymentStateDir,\n  saveDeploymentConfig,\n} from \"./filePaths.js\";\nimport {\n  ensureBackendRunning,\n  ensureBackendStopped,\n  localDeploymentUrl,\n  runLocalBackend,\n  withRunningBackend,\n} from \"./run.js\";\nimport { handlePotentialUpgrade } from \"./upgrade.js\";\nimport { OnDeploymentActivityFunc } from \"../deployment.js\";\nimport { promptSearch } from \"../utils/prompts.js\";\nimport { LocalDeploymentError, printLocalDeploymentOnError } from \"./errors.js\";\nimport {\n  chooseLocalBackendPorts,\n  printLocalDeploymentWelcomeMessage,\n  isOffline,\n  LOCAL_BACKEND_INSTANCE_SECRET,\n} from \"./utils.js\";\nimport { ensureBackendBinaryDownloaded } from \"./download.js\";\nimport { defaultEnvBackend } from \"../defaultEnv.js\";\nimport { deploymentEnvBackend } from \"../env.js\";\nimport { getProjectDetails } from \"../deploymentSelection.js\";\n\nexport type DeploymentDetails = {\n  deploymentName: string;\n  deploymentUrl: string;\n  adminKey: string;\n  onActivity: OnDeploymentActivityFunc;\n};\n\nexport async function handleLocalDeployment(\n  ctx: Context,\n  options: {\n    teamSlug: string;\n    projectSlug: string;\n    ports?:\n      | {\n          cloud: number;\n          site: number;\n        }\n      | undefined;\n    backendVersion?: string | undefined;\n    forceUpgrade: boolean;\n  },\n): Promise<DeploymentDetails> {\n  if (await isOffline()) {\n    return handleOffline(ctx, options);\n  }\n\n  const existingDeploymentForProject = await getExistingDeployment(ctx, {\n    projectSlug: options.projectSlug,\n    teamSlug: options.teamSlug,\n  });\n  const isFirstTime = existingDeploymentForProject === null;\n  if (isFirstTime) {\n    printLocalDeploymentWelcomeMessage();\n  }\n  ctx.registerCleanup(async (_exitCode, err) => {\n    if (err instanceof LocalDeploymentError) {\n      printLocalDeploymentOnError();\n    }\n  });\n  if (existingDeploymentForProject !== null) {\n    logVerbose(`Found existing deployment for project ${options.projectSlug}`);\n    // If it's still running for some reason, exit and tell the user to kill it.\n    // It's fine if a different backend is running on these ports though since we'll\n    // pick new ones.\n    await ensureBackendStopped(ctx, {\n      ports: {\n        cloud: existingDeploymentForProject.config.ports.cloud,\n      },\n      maxTimeSecs: 5,\n      deploymentName: existingDeploymentForProject.deploymentName,\n      allowOtherDeployments: true,\n    });\n  }\n\n  const { binaryPath, version } = await ensureBackendBinaryDownloaded(\n    ctx,\n    options.backendVersion === undefined\n      ? {\n          kind: \"latest\",\n          allowedVersion: existingDeploymentForProject?.config.backendVersion,\n        }\n      : { kind: \"version\", version: options.backendVersion },\n  );\n  const { cloudPort, sitePort } = await chooseLocalBackendPorts(ctx, {\n    requestedPorts: options.ports,\n    suggestedPorts: existingDeploymentForProject?.config.ports,\n  });\n  const { deploymentName, adminKey } = await bigBrainStart(ctx, {\n    port: cloudPort,\n    projectSlug: options.projectSlug,\n    teamSlug: options.teamSlug,\n    instanceName: existingDeploymentForProject?.deploymentName ?? null,\n  });\n  const onActivity = async (isOffline: boolean, _wasOffline: boolean) => {\n    await ensureBackendRunning(ctx, {\n      cloudPort,\n      deploymentName,\n      maxTimeSecs: 5,\n    });\n    if (isOffline) {\n      return;\n    }\n    await bigBrainRecordActivity(ctx, {\n      instanceName: deploymentName,\n    });\n  };\n\n  const { cleanupHandle } = await handlePotentialUpgrade(ctx, {\n    deploymentKind: \"local\",\n    deploymentName,\n    oldVersion: existingDeploymentForProject?.config.backendVersion ?? null,\n    newBinaryPath: binaryPath,\n    newVersion: version,\n    ports: { cloud: cloudPort, site: sitePort },\n    adminKey,\n    instanceSecret: LOCAL_BACKEND_INSTANCE_SECRET,\n    forceUpgrade: options.forceUpgrade,\n  });\n\n  if (isFirstTime) {\n    await importDefaultEnvVars(ctx, {\n      teamSlug: options.teamSlug,\n      projectSlug: options.projectSlug,\n      deploymentName,\n      deploymentUrl: localDeploymentUrl(cloudPort),\n      adminKey,\n    });\n  }\n\n  // Periodically report activity to BigBrain every 60 seconds.\n  // Uses self-scheduling setTimeout to avoid overlapping requests.\n  let activityTimeout: ReturnType<typeof setTimeout> | null = null;\n  const scheduleActivityPing = () => {\n    activityTimeout = setTimeout(async () => {\n      try {\n        await bigBrainRecordActivity(ctx, {\n          instanceName: deploymentName,\n        });\n      } catch {\n        // Best-effort: don't crash on failed pings\n      }\n      scheduleActivityPing();\n    }, 60_000);\n  };\n  scheduleActivityPing();\n\n  const cleanupFunc = ctx.removeCleanup(cleanupHandle);\n  ctx.registerCleanup(async (exitCode, err) => {\n    if (activityTimeout !== null) {\n      clearTimeout(activityTimeout);\n    }\n    if (cleanupFunc !== null) {\n      await cleanupFunc(exitCode, err);\n    }\n    await bigBrainPause(ctx, {\n      projectSlug: options.projectSlug,\n      teamSlug: options.teamSlug,\n    });\n  });\n\n  return {\n    adminKey,\n    deploymentName,\n    deploymentUrl: localDeploymentUrl(cloudPort),\n    onActivity,\n  };\n}\n\nexport async function loadLocalDeploymentCredentials(\n  ctx: Context,\n  deploymentName: string,\n): Promise<{\n  deploymentName: string;\n  deploymentUrl: string;\n  adminKey: string;\n}> {\n  const config = loadDeploymentConfig(ctx, \"local\", deploymentName);\n  if (config === null) {\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage:\n        \"Failed to load deployment config - try running `npx convex dev --configure`\",\n    });\n  }\n  return {\n    deploymentName,\n    deploymentUrl: localDeploymentUrl(config.ports.cloud),\n    adminKey: config.adminKey,\n  };\n}\n\nasync function handleOffline(\n  ctx: Context,\n  options: {\n    teamSlug: string;\n    projectSlug: string;\n    ports?: { cloud: number; site: number } | undefined;\n  },\n): Promise<DeploymentDetails> {\n  const { deploymentName, config } =\n    await chooseFromExistingLocalDeployments(ctx);\n  const { binaryPath } = await ensureBackendBinaryDownloaded(ctx, {\n    kind: \"version\",\n    version: config.backendVersion,\n  });\n  const { cloudPort, sitePort } = await chooseLocalBackendPorts(ctx, {\n    requestedPorts: options.ports,\n    // FIXME: This doesn\u2019t try to reuse the ports already assigned in the config.\n    // Please update this if we ever support offline mode (currently this is dead code).\n  });\n  saveDeploymentConfig(ctx, \"local\", deploymentName, config);\n  await runLocalBackend(ctx, {\n    binaryPath,\n    ports: { cloud: cloudPort, site: sitePort },\n    deploymentName,\n    deploymentKind: \"local\",\n    instanceSecret: LOCAL_BACKEND_INSTANCE_SECRET,\n    isLatestVersion: false,\n  });\n  return {\n    adminKey: config.adminKey,\n    deploymentName,\n    deploymentUrl: localDeploymentUrl(cloudPort),\n    onActivity: async (isOffline: boolean, wasOffline: boolean) => {\n      await ensureBackendRunning(ctx, {\n        cloudPort,\n        deploymentName,\n        maxTimeSecs: 5,\n      });\n      if (isOffline) {\n        return;\n      }\n      if (wasOffline) {\n        await bigBrainStart(ctx, {\n          port: cloudPort,\n          projectSlug: options.projectSlug,\n          teamSlug: options.teamSlug,\n          instanceName: deploymentName,\n        });\n      }\n      await bigBrainRecordActivity(ctx, {\n        instanceName: deploymentName,\n      });\n    },\n  };\n}\n\nasync function getExistingDeployment(\n  ctx: Context,\n  options: {\n    projectSlug: string;\n    teamSlug: string;\n  },\n): Promise<{ deploymentName: string; config: LocalDeploymentConfig } | null> {\n  const { projectSlug, teamSlug } = options;\n\n  // Check project-local storage first - this is the new default location\n  const projectLocal = loadProjectLocalConfig(ctx);\n  if (projectLocal !== null) {\n    // Verify this deployment is for the expected project (matches the naming pattern)\n    const expectedPrefix = `local-${teamSlug.replace(/-/g, \"_\")}-${projectSlug.replace(/-/g, \"_\")}`;\n    if (projectLocal.deploymentName.startsWith(expectedPrefix)) {\n      return projectLocal;\n    }\n    logVerbose(\n      `Project-local deployment ${projectLocal.deploymentName} doesn't match expected prefix ${expectedPrefix}`,\n    );\n  }\n\n  // Fall back to checking legacy home directory\n  const prefix = `local-${teamSlug.replace(/-/g, \"_\")}-${projectSlug.replace(/-/g, \"_\")}`;\n  const legacyDeployments = await getLegacyLocalDeployments(ctx);\n  const existingDeploymentForProject = legacyDeployments.find((d) =>\n    d.deploymentName.startsWith(prefix),\n  );\n  if (existingDeploymentForProject === undefined) {\n    return null;\n  }\n  return {\n    deploymentName: existingDeploymentForProject.deploymentName,\n    config: existingDeploymentForProject.config,\n  };\n}\n\n/**\n * Get local deployments from the legacy home directory location.\n * This is used for backward compatibility and for listing deployments in offline mode.\n */\nasync function getLegacyLocalDeployments(ctx: Context): Promise<\n  Array<{\n    deploymentName: string;\n    config: LocalDeploymentConfig;\n  }>\n> {\n  const dir = rootDeploymentStateDir(\"local\");\n  if (!ctx.fs.exists(dir)) {\n    return [];\n  }\n  const deploymentNames = ctx.fs\n    .listDir(dir)\n    .map((d) => d.name)\n    .filter((d) => d.startsWith(\"local-\"));\n  return deploymentNames.flatMap((deploymentName) => {\n    const legacyDir = legacyDeploymentStateDir(\"local\", deploymentName);\n    const config = loadDeploymentConfigFromDir(ctx, legacyDir);\n    if (config !== null) {\n      return [{ deploymentName, config }];\n    }\n    return [];\n  });\n}\n\n/**\n * Get all local deployments from both project-local and legacy locations.\n */\nasync function getLocalDeployments(ctx: Context): Promise<\n  Array<{\n    deploymentName: string;\n    config: LocalDeploymentConfig;\n  }>\n> {\n  const deployments: Array<{\n    deploymentName: string;\n    config: LocalDeploymentConfig;\n  }> = [];\n\n  // Check project-local storage\n  const projectLocal = loadProjectLocalConfig(ctx);\n  if (\n    projectLocal !== null &&\n    projectLocal.deploymentName.startsWith(\"local-\")\n  ) {\n    deployments.push(projectLocal);\n  }\n\n  // Also include legacy deployments (but avoid duplicates)\n  const legacyDeployments = await getLegacyLocalDeployments(ctx);\n  for (const legacy of legacyDeployments) {\n    if (!deployments.some((d) => d.deploymentName === legacy.deploymentName)) {\n      deployments.push(legacy);\n    }\n  }\n\n  return deployments;\n}\n\nasync function chooseFromExistingLocalDeployments(ctx: Context): Promise<{\n  deploymentName: string;\n  config: LocalDeploymentConfig;\n}> {\n  const localDeployments = await getLocalDeployments(ctx);\n\n  if (localDeployments.length === 0) {\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage:\n        \"No local deployments found. Please run `npx convex dev` while online first.\",\n    });\n  }\n\n  // Auto-select if there's only one deployment\n  if (localDeployments.length === 1) {\n    logVerbose(\n      `Auto-selecting the only local deployment: ${localDeployments[0].deploymentName}`,\n    );\n    return localDeployments[0];\n  }\n\n  // Multiple deployments (legacy) - prompt user to choose\n  return promptSearch(ctx, {\n    message: \"Choose from an existing local deployment:\",\n    choices: localDeployments.map((d) => ({\n      name: d.deploymentName,\n      value: d,\n    })),\n  });\n}\n\n/** Copies the default dev env vars from big brain the first time the local dev backend is started */\nexport async function importDefaultEnvVars(\n  ctx: Context,\n  {\n    teamSlug,\n    projectSlug,\n    deploymentName,\n    deploymentUrl,\n    adminKey,\n  }: {\n    teamSlug: string;\n    projectSlug: string;\n    deploymentName: string;\n    deploymentUrl: string;\n    adminKey: string;\n  },\n) {\n  showSpinner(\"Importing default env vars...\");\n\n  const project = await getProjectDetails(ctx, {\n    kind: \"teamAndProjectSlugs\",\n    teamSlug,\n    projectSlug,\n  });\n  const defaults = await defaultEnvBackend(ctx, project.id, \"dev\").list();\n  if (defaults.length === 0) {\n    logFinishedStep(\"No default env vars to import.\");\n    return;\n  }\n\n  const deployment = {\n    deploymentUrl,\n    deploymentFields: {\n      deploymentName,\n      deploymentType: \"local\" as const,\n      projectSlug,\n      teamSlug,\n    },\n  };\n\n  await withRunningBackend({\n    ctx,\n    deployment,\n    action: async () => {\n      await deploymentEnvBackend(ctx, { deploymentUrl, adminKey }).update(\n        defaults.map((v) => ({ name: v.name, value: v.value })),\n      );\n      logFinishedStep(\n        `Imported ${defaults.length} environment ${defaults.length === 1 ? \"variable\" : \"variables\"} from default environment variables: ${defaults.map((v) => v.name).join(\", \")}`,\n      );\n    },\n  });\n}\n"],
+  "mappings": "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",
   "names": ["isOffline"]
 }

package/dist/cjs/cli/lib/localDeployment/utils.js

@@ -43,6 +43,7 @@ var import_chalk = require("chalk");
 async function choosePorts(ctx, {
   count,
   requestedPorts,
+  suggestedPorts,
   startPort
 }) {
   const ports = [];
@@ -59,6 +60,14 @@ async function choosePorts(ctx, {
       }
       ports.push(port);
     } else {
+      const suggestedPort = suggestedPorts?.[ports.length] ?? null;
+      if (suggestedPort !== null) {
+        const port2 = await (0, import_detect_port.detect)(suggestedPort);
+        if (port2 === suggestedPort) {
+          ports.push(suggestedPort);
+          continue;
+        }
+      }
       const portToTry = ports.length > 0 ? ports[ports.length - 1] + 1 : startPort;
       const port = await (0, import_detect_port.detect)(portToTry);
       ports.push(port);
@@ -66,11 +75,19 @@ async function choosePorts(ctx, {
   }
   return ports;
 }
-async function chooseLocalBackendPorts(ctx, ports) {
+async function chooseLocalBackendPorts(ctx, options) {
+  const { suggestedPorts, requestedPorts } = options ?? {};
   const [cloudPort, sitePort] = await choosePorts(ctx, {
     count: 2,
     startPort: 3210,
-    requestedPorts: [ports?.cloud ?? null, ports?.site ?? null]
+    requestedPorts: [
+      requestedPorts?.cloud ?? null,
+      requestedPorts?.site ?? null
+    ],
+    suggestedPorts: [
+      suggestedPorts?.cloud ?? null,
+      suggestedPorts?.site ?? null
+    ]
   });
   return { cloudPort, sitePort };
 }
@@ -86,11 +103,6 @@ function printLocalDeploymentWelcomeMessage() {
       "To learn more, read the docs: https://docs.convex.dev/cli/local-deployments"
     )
   );
-  (0, import_log.logMessage)(
-    import_chalk.chalkStderr.cyan(
-      "To opt out at any time, run `npx convex disable-local-deployments`"
-    )
-  );
 }
 function generateInstanceSecret() {
   return import_crypto.default.randomBytes(32).toString("hex");

package/dist/cjs/cli/lib/localDeployment/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lib/localDeployment/utils.ts"],
-  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport { logMessage } from \"../../../bundler/log.js\";\nimport { detect } from \"detect-port\";\nimport crypto from \"crypto\";\nimport { chalkStderr } from \"chalk\";\n\nexport async function choosePorts(\n  ctx: Context,\n  {\n    count,\n    requestedPorts,\n    startPort,\n  }: {\n    count: number;\n    requestedPorts?: Array<number | null>;\n    startPort: number;\n  },\n): Promise<Array<number>> {\n  const ports: Array<number> = [];\n  for (let i = 0; i < count; i++) {\n    const requestedPort = requestedPorts?.[i];\n    if (requestedPort !== null) {\n      const port = await detect(requestedPort);\n      if (port !== requestedPort) {\n        return ctx.crash({\n          exitCode: 1,\n          errorType: \"fatal\",\n          printedMessage: `Requested port ${requestedPort} is not available`,\n        });\n      }\n      ports.push(port);\n    } else {\n      const portToTry =\n        ports.length > 0 ? ports[ports.length - 1] + 1 : startPort;\n      const port = await detect(portToTry);\n      ports.push(port);\n    }\n  }\n  return ports;\n}\n\nexport async function chooseLocalBackendPorts(\n  ctx: Context,\n  ports?: { cloud?: number | null; site?: number | null },\n): Promise<{ cloudPort: number; sitePort: number }> {\n  const [cloudPort, sitePort] = await choosePorts(ctx, {\n    count: 2,\n    startPort: 3210,\n    requestedPorts: [ports?.cloud ?? null, ports?.site ?? null],\n  });\n  return { cloudPort, sitePort };\n}\n\nexport async function isOffline(): Promise<boolean> {\n  // TODO(ENG-7080) -- implement this for real\n  return false;\n}\n\nexport function printLocalDeploymentWelcomeMessage() {\n  logMessage(\n    chalkStderr.cyan(\"You're trying out the beta local deployment feature!\"),\n  );\n  logMessage(\n    chalkStderr.cyan(\n      \"To learn more, read the docs: https://docs.convex.dev/cli/local-deployments\",\n    ),\n  );\n  logMessage(\n    chalkStderr.cyan(\n      \"To opt out at any time, run `npx convex disable-local-deployments`\",\n    ),\n  );\n}\n\nexport function generateInstanceSecret(): string {\n  return crypto.randomBytes(32).toString(\"hex\");\n}\n\nexport const LOCAL_BACKEND_INSTANCE_SECRET =\n  \"4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974\";\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAA2B;AAC3B,yBAAuB;AACvB,oBAAmB;AACnB,mBAA4B;AAE5B,eAAsB,YACpB,KACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AACF,GAKwB;AACxB,QAAM,QAAuB,CAAC;AAC9B,WAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,UAAM,gBAAgB,iBAAiB,CAAC;AACxC,QAAI,kBAAkB,MAAM;AAC1B,YAAM,OAAO,UAAM,2BAAO,aAAa;AACvC,UAAI,SAAS,eAAe;AAC1B,eAAO,IAAI,MAAM;AAAA,UACf,UAAU;AAAA,UACV,WAAW;AAAA,UACX,gBAAgB,kBAAkB,aAAa;AAAA,QACjD,CAAC;AAAA,MACH;AACA,YAAM,KAAK,IAAI;AAAA,IACjB,OAAO;AACL,YAAM,YACJ,MAAM,SAAS,IAAI,MAAM,MAAM,SAAS,CAAC,IAAI,IAAI;AACnD,YAAM,OAAO,UAAM,2BAAO,SAAS;AACnC,YAAM,KAAK,IAAI;AAAA,IACjB;AAAA,EACF;AACA,SAAO;AACT;AAEA,eAAsB,wBACpB,KACA,OACkD;AAClD,QAAM,CAAC,WAAW,QAAQ,IAAI,MAAM,YAAY,KAAK;AAAA,IACnD,OAAO;AAAA,IACP,WAAW;AAAA,IACX,gBAAgB,CAAC,OAAO,SAAS,MAAM,OAAO,QAAQ,IAAI;AAAA,EAC5D,CAAC;AACD,SAAO,EAAE,WAAW,SAAS;AAC/B;AAEA,eAAsB,YAA8B;AAElD,SAAO;AACT;AAEO,SAAS,qCAAqC;AACnD;AAAA,IACE,yBAAY,KAAK,sDAAsD;AAAA,EACzE;AACA;AAAA,IACE,yBAAY;AAAA,MACV;AAAA,IACF;AAAA,EACF;AACA;AAAA,IACE,yBAAY;AAAA,MACV;AAAA,IACF;AAAA,EACF;AACF;AAEO,SAAS,yBAAiC;AAC/C,SAAO,cAAAA,QAAO,YAAY,EAAE,EAAE,SAAS,KAAK;AAC9C;AAEO,MAAM,gCACX;",
-  "names": ["crypto"]
+  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport { logMessage } from \"../../../bundler/log.js\";\nimport { detect } from \"detect-port\";\nimport crypto from \"crypto\";\nimport { chalkStderr } from \"chalk\";\n\nexport async function choosePorts(\n  ctx: Context,\n  {\n    count,\n    requestedPorts,\n    suggestedPorts,\n    startPort,\n  }: {\n    count: number;\n    /** Ports that must mandatorily be used when provided. */\n    requestedPorts?: Array<number | null>;\n    /** Ports that will be tried preferentially when provided, but are not required. */\n    suggestedPorts?: Array<number | null>;\n    startPort: number;\n  },\n): Promise<Array<number>> {\n  const ports: Array<number> = [];\n  for (let i = 0; i < count; i++) {\n    const requestedPort = requestedPorts?.[i];\n    if (requestedPort !== null) {\n      const port = await detect(requestedPort);\n      if (port !== requestedPort) {\n        return ctx.crash({\n          exitCode: 1,\n          errorType: \"fatal\",\n          printedMessage: `Requested port ${requestedPort} is not available`,\n        });\n      }\n      ports.push(port);\n    } else {\n      const suggestedPort = suggestedPorts?.[ports.length] ?? null;\n      if (suggestedPort !== null) {\n        const port = await detect(suggestedPort);\n        if (port === suggestedPort) {\n          ports.push(suggestedPort);\n          continue;\n        }\n      }\n\n      const portToTry =\n        ports.length > 0 ? ports[ports.length - 1] + 1 : startPort;\n      const port = await detect(portToTry);\n      ports.push(port);\n    }\n  }\n  return ports;\n}\n\nexport async function chooseLocalBackendPorts(\n  ctx: Context,\n  options?: {\n    suggestedPorts?:\n      | { cloud?: number | null; site?: number | null }\n      | undefined;\n    requestedPorts?:\n      | { cloud?: number | null; site?: number | null }\n      | undefined;\n  },\n): Promise<{ cloudPort: number; sitePort: number }> {\n  const { suggestedPorts, requestedPorts } = options ?? {};\n\n  const [cloudPort, sitePort] = await choosePorts(ctx, {\n    count: 2,\n    startPort: 3210,\n    requestedPorts: [\n      requestedPorts?.cloud ?? null,\n      requestedPorts?.site ?? null,\n    ],\n    suggestedPorts: [\n      suggestedPorts?.cloud ?? null,\n      suggestedPorts?.site ?? null,\n    ],\n  });\n  return { cloudPort, sitePort };\n}\n\nexport async function isOffline(): Promise<boolean> {\n  // TODO(ENG-7080) -- implement this for real\n  return false;\n}\n\nexport function printLocalDeploymentWelcomeMessage() {\n  logMessage(\n    chalkStderr.cyan(\"You're trying out the beta local deployment feature!\"),\n  );\n  logMessage(\n    chalkStderr.cyan(\n      \"To learn more, read the docs: https://docs.convex.dev/cli/local-deployments\",\n    ),\n  );\n}\n\nexport function generateInstanceSecret(): string {\n  return crypto.randomBytes(32).toString(\"hex\");\n}\n\nexport const LOCAL_BACKEND_INSTANCE_SECRET =\n  \"4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAA2B;AAC3B,yBAAuB;AACvB,oBAAmB;AACnB,mBAA4B;AAE5B,eAAsB,YACpB,KACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAQwB;AACxB,QAAM,QAAuB,CAAC;AAC9B,WAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,UAAM,gBAAgB,iBAAiB,CAAC;AACxC,QAAI,kBAAkB,MAAM;AAC1B,YAAM,OAAO,UAAM,2BAAO,aAAa;AACvC,UAAI,SAAS,eAAe;AAC1B,eAAO,IAAI,MAAM;AAAA,UACf,UAAU;AAAA,UACV,WAAW;AAAA,UACX,gBAAgB,kBAAkB,aAAa;AAAA,QACjD,CAAC;AAAA,MACH;AACA,YAAM,KAAK,IAAI;AAAA,IACjB,OAAO;AACL,YAAM,gBAAgB,iBAAiB,MAAM,MAAM,KAAK;AACxD,UAAI,kBAAkB,MAAM;AAC1B,cAAMA,QAAO,UAAM,2BAAO,aAAa;AACvC,YAAIA,UAAS,eAAe;AAC1B,gBAAM,KAAK,aAAa;AACxB;AAAA,QACF;AAAA,MACF;AAEA,YAAM,YACJ,MAAM,SAAS,IAAI,MAAM,MAAM,SAAS,CAAC,IAAI,IAAI;AACnD,YAAM,OAAO,UAAM,2BAAO,SAAS;AACnC,YAAM,KAAK,IAAI;AAAA,IACjB;AAAA,EACF;AACA,SAAO;AACT;AAEA,eAAsB,wBACpB,KACA,SAQkD;AAClD,QAAM,EAAE,gBAAgB,eAAe,IAAI,WAAW,CAAC;AAEvD,QAAM,CAAC,WAAW,QAAQ,IAAI,MAAM,YAAY,KAAK;AAAA,IACnD,OAAO;AAAA,IACP,WAAW;AAAA,IACX,gBAAgB;AAAA,MACd,gBAAgB,SAAS;AAAA,MACzB,gBAAgB,QAAQ;AAAA,IAC1B;AAAA,IACA,gBAAgB;AAAA,MACd,gBAAgB,SAAS;AAAA,MACzB,gBAAgB,QAAQ;AAAA,IAC1B;AAAA,EACF,CAAC;AACD,SAAO,EAAE,WAAW,SAAS;AAC/B;AAEA,eAAsB,YAA8B;AAElD,SAAO;AACT;AAEO,SAAS,qCAAqC;AACnD;AAAA,IACE,yBAAY,KAAK,sDAAsD;AAAA,EACzE;AACA;AAAA,IACE,yBAAY;AAAA,MACV;AAAA,IACF;AAAA,EACF;AACF;AAEO,SAAS,yBAAiC;AAC/C,SAAO,cAAAC,QAAO,YAAY,EAAE,EAAE,SAAS,KAAK;AAC9C;AAEO,MAAM,gCACX;",
+  "names": ["port", "crypto"]
 }

package/dist/cjs/cli/lib/utils/globalConfig.js

@@ -44,8 +44,7 @@ function globalConfigPath() {
   return import_path.default.join((0, import_utils.rootDirectory)(), "config.json");
 }
 const schema = import_zod.z.object({
-  accessToken: import_zod.z.string().min(1),
-  optOutOfLocalDevDeploymentsUntilBetaOver: import_zod.z.boolean().optional()
+  accessToken: import_zod.z.string().min(1)
 });
 function readGlobalConfig(ctx) {
   const configPath = globalConfigPath();

package/dist/cjs/cli/lib/utils/globalConfig.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lib/utils/globalConfig.ts"],
-  "sourcesContent": ["import { chalkStderr } from \"chalk\";\nimport os from \"os\";\nimport path from \"path\";\nimport { rootDirectory } from \"./utils.js\";\nimport { Context } from \"../../../bundler/context.js\";\nimport { logError, logVerbose } from \"../../../bundler/log.js\";\nimport { z } from \"zod\";\n\nexport function globalConfigPath(): string {\n  return path.join(rootDirectory(), \"config.json\");\n}\n\n// GlobalConfig is stored in a file that very old versions of Convex also need to access.\n// Everything besides accessToken must be optional forever.\n// GlobalConfig is deleted on logout. It is primarily used for the accessToken.\nexport type GlobalConfig = {\n  accessToken: string;\n  // Means \"Don't use local dev unless CLI version is at least 1.19\" (actual version TBD)\n  optOutOfLocalDevDeploymentsUntilBetaOver?: boolean | undefined;\n};\n\nconst schema = z.object({\n  accessToken: z.string().min(1),\n  optOutOfLocalDevDeploymentsUntilBetaOver: z.boolean().optional(),\n});\n\nexport function readGlobalConfig(ctx: Context): GlobalConfig | null {\n  const configPath = globalConfigPath();\n  let configFile;\n  try {\n    configFile = ctx.fs.readUtf8File(configPath);\n  } catch {\n    return null;\n  }\n  try {\n    const storedConfig = JSON.parse(configFile);\n    const config: GlobalConfig = schema.parse(storedConfig);\n    return config;\n  } catch (err) {\n    // Print an error and act as if the file does not exist.\n    logError(\n      chalkStderr.red(\n        `Failed to parse global config in ${configPath} with error ${\n          err as any\n        }.`,\n      ),\n    );\n    return null;\n  }\n}\n\n/** Write the global config, preserving existing properties we don't understand. */\nexport async function modifyGlobalConfig(ctx: Context, config: GlobalConfig) {\n  const configPath = globalConfigPath();\n  let configFile;\n  try {\n    configFile = ctx.fs.readUtf8File(configPath);\n    // totally fine for it not to exist\n    // eslint-disable-next-line no-empty\n  } catch {}\n  // storedConfig may contain properties this version of the CLI doesn't understand.\n  let storedConfig = {};\n  if (configFile) {\n    try {\n      storedConfig = JSON.parse(configFile);\n      schema.parse(storedConfig);\n    } catch (err) {\n      logError(\n        chalkStderr.red(\n          `Failed to parse global config in ${configPath} with error ${\n            err as any\n          }.`,\n        ),\n      );\n      storedConfig = {};\n    }\n  }\n  const newConfig: GlobalConfig = { ...storedConfig, ...config };\n  await overrwriteGlobalConfig(ctx, newConfig);\n}\n\n/** Write global config, overwriting any existing settings. */\nasync function overrwriteGlobalConfig(ctx: Context, config: GlobalConfig) {\n  const dirName = rootDirectory();\n  ctx.fs.mkdir(dirName, { allowExisting: true });\n  const path = globalConfigPath();\n  try {\n    ctx.fs.writeUtf8File(path, JSON.stringify(config, null, 2));\n  } catch (err) {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"invalid filesystem data\",\n      errForSentry: err,\n      printedMessage: chalkStderr.red(\n        `Failed to write auth config to ${path} with error: ${err as any}`,\n      ),\n    });\n  }\n  logVerbose(`Saved credentials to ${formatPathForPrinting(path)}`);\n}\n\nexport function formatPathForPrinting(path: string) {\n  const homedir = os.homedir();\n  if (process.platform === \"darwin\" && path.startsWith(homedir)) {\n    return path.replace(homedir, \"~\");\n  }\n  return path;\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA4B;AAC5B,gBAAe;AACf,kBAAiB;AACjB,mBAA8B;AAE9B,iBAAqC;AACrC,iBAAkB;AAEX,SAAS,mBAA2B;AACzC,SAAO,YAAAA,QAAK,SAAK,4BAAc,GAAG,aAAa;AACjD;AAWA,MAAM,SAAS,aAAE,OAAO;AAAA,EACtB,aAAa,aAAE,OAAO,EAAE,IAAI,CAAC;AAAA,EAC7B,0CAA0C,aAAE,QAAQ,EAAE,SAAS;AACjE,CAAC;AAEM,SAAS,iBAAiB,KAAmC;AAClE,QAAM,aAAa,iBAAiB;AACpC,MAAI;AACJ,MAAI;AACF,iBAAa,IAAI,GAAG,aAAa,UAAU;AAAA,EAC7C,QAAQ;AACN,WAAO;AAAA,EACT;AACA,MAAI;AACF,UAAM,eAAe,KAAK,MAAM,UAAU;AAC1C,UAAM,SAAuB,OAAO,MAAM,YAAY;AACtD,WAAO;AAAA,EACT,SAAS,KAAK;AAEZ;AAAA,MACE,yBAAY;AAAA,QACV,oCAAoC,UAAU,eAC5C,GACF;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;AAGA,eAAsB,mBAAmB,KAAc,QAAsB;AAC3E,QAAM,aAAa,iBAAiB;AACpC,MAAI;AACJ,MAAI;AACF,iBAAa,IAAI,GAAG,aAAa,UAAU;AAAA,EAG7C,QAAQ;AAAA,EAAC;AAET,MAAI,eAAe,CAAC;AACpB,MAAI,YAAY;AACd,QAAI;AACF,qBAAe,KAAK,MAAM,UAAU;AACpC,aAAO,MAAM,YAAY;AAAA,IAC3B,SAAS,KAAK;AACZ;AAAA,QACE,yBAAY;AAAA,UACV,oCAAoC,UAAU,eAC5C,GACF;AAAA,QACF;AAAA,MACF;AACA,qBAAe,CAAC;AAAA,IAClB;AAAA,EACF;AACA,QAAM,YAA0B,EAAE,GAAG,cAAc,GAAG,OAAO;AAC7D,QAAM,uBAAuB,KAAK,SAAS;AAC7C;AAGA,eAAe,uBAAuB,KAAc,QAAsB;AACxE,QAAM,cAAU,4BAAc;AAC9B,MAAI,GAAG,MAAM,SAAS,EAAE,eAAe,KAAK,CAAC;AAC7C,QAAMA,QAAO,iBAAiB;AAC9B,MAAI;AACF,QAAI,GAAG,cAAcA,OAAM,KAAK,UAAU,QAAQ,MAAM,CAAC,CAAC;AAAA,EAC5D,SAAS,KAAK;AACZ,WAAO,MAAM,IAAI,MAAM;AAAA,MACrB,UAAU;AAAA,MACV,WAAW;AAAA,MACX,cAAc;AAAA,MACd,gBAAgB,yBAAY;AAAA,QAC1B,kCAAkCA,KAAI,gBAAgB,GAAU;AAAA,MAClE;AAAA,IACF,CAAC;AAAA,EACH;AACA,6BAAW,wBAAwB,sBAAsBA,KAAI,CAAC,EAAE;AAClE;AAEO,SAAS,sBAAsBA,OAAc;AAClD,QAAM,UAAU,UAAAC,QAAG,QAAQ;AAC3B,MAAI,QAAQ,aAAa,YAAYD,MAAK,WAAW,OAAO,GAAG;AAC7D,WAAOA,MAAK,QAAQ,SAAS,GAAG;AAAA,EAClC;AACA,SAAOA;AACT;",
+  "sourcesContent": ["import { chalkStderr } from \"chalk\";\nimport os from \"os\";\nimport path from \"path\";\nimport { rootDirectory } from \"./utils.js\";\nimport { Context } from \"../../../bundler/context.js\";\nimport { logError, logVerbose } from \"../../../bundler/log.js\";\nimport { z } from \"zod\";\n\nexport function globalConfigPath(): string {\n  return path.join(rootDirectory(), \"config.json\");\n}\n\n// GlobalConfig is stored in a file that very old versions of Convex also need to access.\n// Everything besides accessToken must be optional forever.\n// GlobalConfig is deleted on logout. It is primarily used for the accessToken.\nexport type GlobalConfig = {\n  accessToken: string;\n};\n\nconst schema = z.object({\n  accessToken: z.string().min(1),\n});\n\nexport function readGlobalConfig(ctx: Context): GlobalConfig | null {\n  const configPath = globalConfigPath();\n  let configFile;\n  try {\n    configFile = ctx.fs.readUtf8File(configPath);\n  } catch {\n    return null;\n  }\n  try {\n    const storedConfig = JSON.parse(configFile);\n    const config: GlobalConfig = schema.parse(storedConfig);\n    return config;\n  } catch (err) {\n    // Print an error and act as if the file does not exist.\n    logError(\n      chalkStderr.red(\n        `Failed to parse global config in ${configPath} with error ${\n          err as any\n        }.`,\n      ),\n    );\n    return null;\n  }\n}\n\n/** Write the global config, preserving existing properties we don't understand. */\nexport async function modifyGlobalConfig(ctx: Context, config: GlobalConfig) {\n  const configPath = globalConfigPath();\n  let configFile;\n  try {\n    configFile = ctx.fs.readUtf8File(configPath);\n    // totally fine for it not to exist\n    // eslint-disable-next-line no-empty\n  } catch {}\n  // storedConfig may contain properties this version of the CLI doesn't understand.\n  let storedConfig = {};\n  if (configFile) {\n    try {\n      storedConfig = JSON.parse(configFile);\n      schema.parse(storedConfig);\n    } catch (err) {\n      logError(\n        chalkStderr.red(\n          `Failed to parse global config in ${configPath} with error ${\n            err as any\n          }.`,\n        ),\n      );\n      storedConfig = {};\n    }\n  }\n  const newConfig: GlobalConfig = { ...storedConfig, ...config };\n  await overrwriteGlobalConfig(ctx, newConfig);\n}\n\n/** Write global config, overwriting any existing settings. */\nasync function overrwriteGlobalConfig(ctx: Context, config: GlobalConfig) {\n  const dirName = rootDirectory();\n  ctx.fs.mkdir(dirName, { allowExisting: true });\n  const path = globalConfigPath();\n  try {\n    ctx.fs.writeUtf8File(path, JSON.stringify(config, null, 2));\n  } catch (err) {\n    return await ctx.crash({\n      exitCode: 1,\n      errorType: \"invalid filesystem data\",\n      errForSentry: err,\n      printedMessage: chalkStderr.red(\n        `Failed to write auth config to ${path} with error: ${err as any}`,\n      ),\n    });\n  }\n  logVerbose(`Saved credentials to ${formatPathForPrinting(path)}`);\n}\n\nexport function formatPathForPrinting(path: string) {\n  const homedir = os.homedir();\n  if (process.platform === \"darwin\" && path.startsWith(homedir)) {\n    return path.replace(homedir, \"~\");\n  }\n  return path;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA4B;AAC5B,gBAAe;AACf,kBAAiB;AACjB,mBAA8B;AAE9B,iBAAqC;AACrC,iBAAkB;AAEX,SAAS,mBAA2B;AACzC,SAAO,YAAAA,QAAK,SAAK,4BAAc,GAAG,aAAa;AACjD;AASA,MAAM,SAAS,aAAE,OAAO;AAAA,EACtB,aAAa,aAAE,OAAO,EAAE,IAAI,CAAC;AAC/B,CAAC;AAEM,SAAS,iBAAiB,KAAmC;AAClE,QAAM,aAAa,iBAAiB;AACpC,MAAI;AACJ,MAAI;AACF,iBAAa,IAAI,GAAG,aAAa,UAAU;AAAA,EAC7C,QAAQ;AACN,WAAO;AAAA,EACT;AACA,MAAI;AACF,UAAM,eAAe,KAAK,MAAM,UAAU;AAC1C,UAAM,SAAuB,OAAO,MAAM,YAAY;AACtD,WAAO;AAAA,EACT,SAAS,KAAK;AAEZ;AAAA,MACE,yBAAY;AAAA,QACV,oCAAoC,UAAU,eAC5C,GACF;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;AAGA,eAAsB,mBAAmB,KAAc,QAAsB;AAC3E,QAAM,aAAa,iBAAiB;AACpC,MAAI;AACJ,MAAI;AACF,iBAAa,IAAI,GAAG,aAAa,UAAU;AAAA,EAG7C,QAAQ;AAAA,EAAC;AAET,MAAI,eAAe,CAAC;AACpB,MAAI,YAAY;AACd,QAAI;AACF,qBAAe,KAAK,MAAM,UAAU;AACpC,aAAO,MAAM,YAAY;AAAA,IAC3B,SAAS,KAAK;AACZ;AAAA,QACE,yBAAY;AAAA,UACV,oCAAoC,UAAU,eAC5C,GACF;AAAA,QACF;AAAA,MACF;AACA,qBAAe,CAAC;AAAA,IAClB;AAAA,EACF;AACA,QAAM,YAA0B,EAAE,GAAG,cAAc,GAAG,OAAO;AAC7D,QAAM,uBAAuB,KAAK,SAAS;AAC7C;AAGA,eAAe,uBAAuB,KAAc,QAAsB;AACxE,QAAM,cAAU,4BAAc;AAC9B,MAAI,GAAG,MAAM,SAAS,EAAE,eAAe,KAAK,CAAC;AAC7C,QAAMA,QAAO,iBAAiB;AAC9B,MAAI;AACF,QAAI,GAAG,cAAcA,OAAM,KAAK,UAAU,QAAQ,MAAM,CAAC,CAAC;AAAA,EAC5D,SAAS,KAAK;AACZ,WAAO,MAAM,IAAI,MAAM;AAAA,MACrB,UAAU;AAAA,MACV,WAAW;AAAA,MACX,cAAc;AAAA,MACd,gBAAgB,yBAAY;AAAA,QAC1B,kCAAkCA,KAAI,gBAAgB,GAAU;AAAA,MAClE;AAAA,IACF,CAAC;AAAA,EACH;AACA,6BAAW,wBAAwB,sBAAsBA,KAAI,CAAC,EAAE;AAClE;AAEO,SAAS,sBAAsBA,OAAc;AAClD,QAAM,UAAU,UAAAC,QAAG,QAAQ;AAC3B,MAAI,QAAQ,aAAa,YAAYD,MAAK,WAAW,OAAO,GAAG;AAC7D,WAAOA,MAAK,QAAQ,SAAS,GAAG;AAAA,EAClC;AACA,SAAOA;AACT;",
   "names": ["path", "os"]
 }

package/dist/cjs/cli/lib/utils/utils.js

@@ -32,6 +32,7 @@ var utils_exports = {};
 __export(utils_exports, {
   BIG_BRAIN_URL: () => BIG_BRAIN_URL,
   CONVEX_DEPLOYMENT_ENV_VAR_NAME: () => CONVEX_DEPLOYMENT_ENV_VAR_NAME,
+  CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME: () => CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME,
   CONVEX_DEPLOY_KEY_ENV_VAR_NAME: () => CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
   CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME: () => CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME,
   CONVEX_SELF_HOSTED_URL_VAR_NAME: () => CONVEX_SELF_HOSTED_URL_VAR_NAME,
@@ -65,6 +66,7 @@ __export(utils_exports, {
   processDeployKeyValue: () => processDeployKeyValue,
   productionProvisionHost: () => productionProvisionHost,
   provisionHost: () => provisionHost,
+  readDeployKeyFromEnv: () => readDeployKeyFromEnv,
   rootDirectory: () => rootDirectory,
   selectDevDeploymentType: () => selectDevDeploymentType,
   selectRegion: () => selectRegion,
@@ -99,6 +101,7 @@ const BIG_BRAIN_URL = `${provisionHost}/api/`;
 const PLATFORM_MANAGEMENT_API_URL = `${provisionHost}/v1/`;
 const ENV_VAR_FILE_PATH = ".env.local";
 const CONVEX_DEPLOY_KEY_ENV_VAR_NAME = "CONVEX_DEPLOY_KEY";
+const CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME = "CONVEX_DEPLOYMENT_TOKEN";
 const CONVEX_DEPLOYMENT_ENV_VAR_NAME = "CONVEX_DEPLOYMENT";
 const CONVEX_SELF_HOSTED_URL_VAR_NAME = "CONVEX_SELF_HOSTED_URL";
 const CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME = "CONVEX_SELF_HOSTED_ADMIN_KEY";
@@ -123,6 +126,11 @@ async function processDeployKeyValue(ctx, deployKey) {
   }
   return deployKey;
 }
+function readDeployKeyFromEnv(getEnv) {
+  const fromDeployKey = getEnv(CONVEX_DEPLOY_KEY_ENV_VAR_NAME);
+  const fromToken = getEnv(CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME);
+  return fromDeployKey || fromToken || void 0;
+}
 function parsePositiveInteger(value) {
   const parsedValue = parseInteger(value);
   if (parsedValue <= 0) {