convex 1.36.1 → 1.37.0

package/dist/cli.bundle.cjs

@@ -28695,7 +28695,7 @@ var version;
 var init_index = __esm({
   "src/index.ts"() {
     "use strict";
-    version = "1.36.1";
+    version = "1.37.0";
   }
 });
 
@@ -62688,13 +62688,10 @@ async function createRedirectURI(ctx, apiKey, uri) {
     }
   );
   if (!response.ok) {
-    if (response.status === 422) {
-      const errorText2 = await response.text();
-      if (errorText2.includes("already exists")) {
-        return { modified: false };
-      }
-    }
     const errorText = await response.text();
+    if (response.status === 422 && errorText.includes("already exists")) {
+      return { modified: false };
+    }
     return await ctx.crash({
       exitCode: 1,
       errorType: "fatal",
@@ -62741,13 +62738,10 @@ async function createCORSOrigin(ctx, apiKey, origin) {
     }
   );
   if (!response.ok) {
-    if (response.status === 409) {
-      const errorText2 = await response.text();
-      if (errorText2.includes("duplicate_cors_origin") || errorText2.includes("already exists")) {
-        return { modified: false };
-      }
-    }
     const errorText = await response.text();
+    if (response.status === 409 && (errorText.includes("duplicate_cors_origin") || errorText.includes("already exists"))) {
+      return { modified: false };
+    }
     return await ctx.crash({
       exitCode: 1,
       errorType: "fatal",
@@ -77820,13 +77814,19 @@ function convexAiMarkdownBody(convexDir) {
   const normalizedConvexDir = convexDir.replaceAll("\\", "/");
   return `This project uses [Convex](https://convex.dev) as its backend.
 
-When working on Convex code, **always read \`${normalizedConvexDir}/_generated/ai/guidelines.md\` first** for important guidelines on how to correctly use Convex APIs and patterns. The file contains rules that override what you may have learned about Convex from training data.
+When working on Convex code, **always read
+\`${normalizedConvexDir}/_generated/ai/guidelines.md\` first** for important guidelines on
+how to correctly use Convex APIs and patterns. The file contains rules that
+override what you may have learned about Convex from training data.
 
-Convex agent skills for common tasks can be installed by running \`npx convex ai-files install\`.`;
+Convex agent skills for common tasks can be installed by running
+\`npx convex ai-files install\`.`;
 }
 function agentsMdConvexSection(convexDir) {
   return `${AGENTS_MD_START_MARKER}
+
 ${convexAiMarkdownBody(convexDir)}
+
 ${AGENTS_MD_END_MARKER}`;
 }
 var AGENTS_MD_START_MARKER, AGENTS_MD_END_MARKER;
@@ -77893,7 +77893,9 @@ var init_agentsmd2 = __esm({
 // src/cli/codegen_templates/claudemd.ts
 function claudeMdConvexSection(convexDir) {
   return `${CLAUDE_MD_START_MARKER}
+
 ${convexAiMarkdownBody(convexDir)}
+
 ${CLAUDE_MD_END_MARKER}`;
 }
 var CLAUDE_MD_START_MARKER, CLAUDE_MD_END_MARKER;
@@ -78784,9 +78786,9 @@ var require_balanced_match = __commonJS({
   }
 });
 
-// ../common/temp/node_modules/.pnpm/brace-expansion@1.1.13/node_modules/brace-expansion/index.js
+// ../common/temp/node_modules/.pnpm/brace-expansion@1.1.12/node_modules/brace-expansion/index.js
 var require_brace_expansion = __commonJS({
-  "../common/temp/node_modules/.pnpm/brace-expansion@1.1.13/node_modules/brace-expansion/index.js"(exports2, module2) {
+  "../common/temp/node_modules/.pnpm/brace-expansion@1.1.12/node_modules/brace-expansion/index.js"(exports2, module2) {
     var concatMap = require_concat_map();
     var balanced = require_balanced_match();
     module2.exports = expandTop;
@@ -78881,7 +78883,7 @@ var require_brace_expansion = __commonJS({
         var x = numeric(n[0]);
         var y = numeric(n[1]);
         var width = Math.max(n[0].length, n[1].length);
-        var incr = n.length == 3 ? Math.max(Math.abs(numeric(n[2])), 1) : 1;
+        var incr = n.length == 3 ? Math.abs(numeric(n[2])) : 1;
         var test = lte;
         var reverse = y < x;
         if (reverse) {
@@ -133911,14 +133913,6 @@ async function selectExistingProject(ctx, chosenConfiguration, config3) {
     forceDevDeployment: config3.local ? "local" : config3.cloud ? "cloud" : void 0
   });
   logFinishedStep(`Reinitialized project ${chalkStderr.bold(projectSlug)}`);
-  const { configPath, projectConfig } = await readProjectConfig(ctx);
-  const folder = functionsDir(configPath, projectConfig);
-  await attemptSetupAiFiles({
-    ctx,
-    aiFilesConfig: projectConfig.aiFiles,
-    convexDir: import_path31.default.resolve(folder),
-    projectDir: import_path31.default.resolve(import_path31.default.dirname(configPath))
-  });
   return { teamSlug, projectSlug, devDeployment };
 }
 async function askToConfigure(ctx) {
@@ -134037,7 +134031,7 @@ async function warn(ctx, options) {
   );
 }
 async function teamUsageState(ctx, teamId) {
-  const { usageState } = await bigBrainAPI({
+  const { usageState } = await bigBrainAPIMaybeThrows({
     ctx,
     method: "GET",
     path: "dashboard/teams/" + teamId + "/usage/team_usage_state"
@@ -134045,7 +134039,7 @@ async function teamUsageState(ctx, teamId) {
   return usageState;
 }
 async function teamSpendingLimitsState(ctx, teamId) {
-  const response = await bigBrainAPI({
+  const response = await bigBrainAPIMaybeThrows({
     ctx,
     method: "GET",
     path: "dashboard/teams/" + teamId + "/get_spending_limits"
@@ -134058,10 +134052,17 @@ async function usageStateWarning(ctx, targetDeployment) {
     return;
   }
   const { teamId, team } = await fetchTeamAndProject(ctx, targetDeployment);
-  const [usageState, spendingLimitsState] = await Promise.all([
-    teamUsageState(ctx, teamId),
-    teamSpendingLimitsState(ctx, teamId)
-  ]);
+  let usageState;
+  let spendingLimitsState;
+  try {
+    [usageState, spendingLimitsState] = await Promise.all([
+      teamUsageState(ctx, teamId),
+      teamSpendingLimitsState(ctx, teamId)
+    ]);
+  } catch (err) {
+    logVerbose("Skipping usage state warning:", err);
+    return;
+  }
   if (spendingLimitsState === "Disabled") {
     await warn(ctx, {
       title: "Your projects are disabled because you exceeded your spending limit.",
@@ -136314,7 +136315,7 @@ function addEnvDefaultOptions(cmd) {
   return cmd.addOption(
     new Option(
       "--type <type>",
-      "Manage default env vars for the given deployment type instead of inferring from the current deployment."
+      "Manage default env vars for the given deployment type (dev, preview, prod) instead of inferring from the current deployment."
     )
   ).addOption(
     new Option(
@@ -147523,8 +147524,157 @@ function defaultRef(branch, deploymentType) {
   return ref;
 }
 
+// src/cli/deploymentTokenCreate.ts
+init_source();
+init_log();
+init_api3();
+init_envvars();
+init_utils5();
+var deploymentTokenCreate = new Command("create").summary("Create an access token").description(
+  `Creates a deploy key that, when set as ${chalkStderr.bold(CONVEX_DEPLOY_KEY_ENV_VAR_NAME)}, scopes all commands to the target deployment. Defaults to the current deployment if '--deployment' isn't passed
+
+  Print a new deploy key to stdout:           \`npx convex deployment token create my-token\`
+  Save a new deploy key in ${ENV_VAR_FILE_PATH}:        \`npx convex deployment token create my-token --save-env\`
+  Save a new deploy key in a custom env file: \`npx convex deployment token create ci-token --save-env .env.production\`
+  Create a key for the project's prod:        \`npx convex deployment token create ci-token --deployment prod\`
+`
+).argument("<name>", "Name for the new deploy key").allowExcessArguments(false).option(
+  "--save-env [path]",
+  `Save the new key as ${CONVEX_DEPLOY_KEY_ENV_VAR_NAME} in an env file instead of printing it. Defaults to ${ENV_VAR_FILE_PATH}.`
+).addDeploymentSelectionOptions(actionDescription("Create a deploy key for")).showHelpAfterError().action(async (name, options) => {
+  const ctx = await oneoffContext(options);
+  const auth2 = ctx.bigBrainAuth();
+  if (auth2 === null || auth2.kind !== "accessToken") {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: `Creating a deploy key currently requires being logged in with a personal access token. ${process.env[CONVEX_DEPLOY_KEY_ENV_VAR_NAME] ? `Unset ${CONVEX_DEPLOY_KEY_ENV_VAR_NAME}` : `Run ${chalkStderr.bold("npx convex login")}`} and try again.`
+    });
+  }
+  const deploymentSelection = await getDeploymentSelection(ctx, options);
+  const deployment2 = await loadSelectedDeploymentCredentials(
+    ctx,
+    deploymentSelection,
+    { ensureLocalRunning: false }
+  );
+  if (deployment2.deploymentFields === null) {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: "Cannot create a deploy key for a self-hosted deployment."
+    });
+  }
+  const { deploymentName, deploymentType } = deployment2.deploymentFields;
+  if (deploymentType === "local" || deploymentType === "anonymous") {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: `Cannot create a deploy key for a ${deploymentType} deployment.`
+    });
+  }
+  showSpinner(`Creating deploy key for ${deploymentName}...`);
+  const response = await typedPlatformClient(ctx).POST(
+    "/deployments/{deployment_name}/create_deploy_key",
+    {
+      params: { path: { deployment_name: deploymentName } },
+      body: { name }
+    }
+  );
+  const deployKey = response.data.deployKey;
+  if (options.saveEnv === void 0) {
+    logFinishedStep(`Created deploy key "${name}" for ${deploymentName}.`);
+    logOutput(deployKey);
+    return;
+  }
+  const envFile = typeof options.saveEnv === "string" ? options.saveEnv : ENV_VAR_FILE_PATH;
+  const existingFileContent = ctx.fs.exists(envFile) ? ctx.fs.readUtf8File(envFile) : null;
+  const updatedContent = changedEnvVarFile({
+    existingFileContent,
+    envVarName: CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
+    envVarValue: deployKey,
+    commentAfterValue: null,
+    commentOnPreviousLine: null
+  });
+  if (updatedContent === null) {
+    logFinishedStep(
+      `Deploy key for ${deploymentName} already present in ${envFile}; no changes made.`
+    );
+    return;
+  }
+  ctx.fs.writeUtf8File(envFile, updatedContent);
+  logFinishedStep(
+    `Saved deploy key "${name}" for ${deploymentName} as ${CONVEX_DEPLOY_KEY_ENV_VAR_NAME} in ${envFile}.`
+  );
+});
+
+// src/cli/deploymentTokenDelete.ts
+init_source();
+init_log();
+init_api3();
+init_utils5();
+var deploymentTokenDelete = new Command("delete").summary("Delete an access token").description(
+  "Delete an access token. Currently only deploy keys (deployment-scoped access tokens) are supported.\n\nThe positional `<nameOrToken>` can be the unique name of the deploy key (as passed to `token create`) or the deploy key value itself. The target deployment defaults to the currently-selected one; pass `--deployment` to target a different deployment.\n\n  Delete by name:  `npx convex deployment token delete my-token`\n  Delete by value: `npx convex deployment token delete 'dev:happy-animal-123|ey...'`\n  Target prod:     `npx convex deployment token delete ci-token --deployment prod`"
+).argument(
+  "<nameOrToken>",
+  "The unique name of the deploy key, or the deploy key value itself."
+).allowExcessArguments(false).addDeploymentSelectionOptions(actionDescription("Delete a deploy key for")).showHelpAfterError().action(async (nameOrToken, options) => {
+  const ctx = await oneoffContext(options);
+  const auth2 = ctx.bigBrainAuth();
+  if (auth2 === null || auth2.kind !== "accessToken") {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: `Deleting a deploy key requires being logged in with a personal access token. ${auth2 === null ? "Run " : `Unset ${CONVEX_DEPLOY_KEY_ENV_VAR_NAME} and run `}${chalkStderr.bold("npx convex login")} and try again.`
+    });
+  }
+  const deploymentSelection = await getDeploymentSelection(ctx, options);
+  const deployment2 = await loadSelectedDeploymentCredentials(
+    ctx,
+    deploymentSelection,
+    { ensureLocalRunning: false }
+  );
+  if (deployment2.deploymentFields === null) {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: "Cannot delete a deploy key for a self-hosted deployment."
+    });
+  }
+  const { deploymentName, deploymentType } = deployment2.deploymentFields;
+  if (deploymentType === "local" || deploymentType === "anonymous") {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: `Cannot delete a deploy key for a ${deploymentType} deployment.`
+    });
+  }
+  if (/^(dev|prod|preview|local):[^|]*$/.test(nameOrToken)) {
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: `"${nameOrToken}" looks like a partial deploy key \u2014 your shell likely consumed the \`|\` and everything after it. Wrap the value in single quotes (e.g. ${chalkStderr.bold(`npx convex deployment token delete '${nameOrToken}|...'`)}) and try again.`
+    });
+  }
+  const pipeIdx = nameOrToken.indexOf("|");
+  const id = pipeIdx >= 0 ? nameOrToken.slice(pipeIdx + 1) : nameOrToken;
+  showSpinner(`Deleting deploy key for ${deploymentName}...`);
+  await typedPlatformClient(ctx).POST(
+    "/deployments/{deployment_name}/delete_deploy_key",
+    {
+      params: { path: { deployment_name: deploymentName } },
+      body: { id }
+    }
+  );
+  logFinishedStep(`Deleted deploy key for ${deploymentName}.`);
+});
+
+// src/cli/deploymentToken.ts
+var deploymentToken = new Command("token").summary("Manage access tokens").description(
+  "Create and delete access tokens. Currently supports deploy keys."
+).addCommand(deploymentTokenCreate).addCommand(deploymentTokenDelete);
+
 // src/cli/deployment.ts
-var deployment = new Command("deployment").summary("Manage deployments").description("Manage deployments in your project.").addCommand(deploymentSelect).addCommand(deploymentCreate);
+var deployment = new Command("deployment").summary("Manage deployments").description("Manage deployments in your project.").addCommand(deploymentSelect).addCommand(deploymentCreate).addCommand(deploymentToken);
 
 // src/cli/aiFiles.ts
 var import_path34 = __toESM(require("path"), 1);