Retry CLI push on environment variable race condition (#42429)

npx convex dev --once now retries on environment variable race condition, just like `npx convex dev` does

GitOrigin-RevId: 499f7c234835489a28503de1cc3c4eb595e75142

Author: thomasballinger

npm-packages/convex/src/cli/lib/config.ts

@@ -1089,6 +1089,16 @@ export function diffConfig(
   return { diffString: diff, stats };
 }
 
+/** Handle an error from
+ * legacy push path:
+ * - /api/push_config
+ * modern push paths:
+ * - /api/deploy2/start_push
+ * - /api/deploy2/finish_push
+ *
+ * finish_push errors are different from start_push errors and in theory could
+ * be handled differently, but starting over works for all of them.
+ */
 export async function handlePushConfigError(
   ctx: Context,
   error: unknown,
@@ -1176,6 +1186,19 @@ export async function handlePushConfigError(
     });
   }
 
+  if (data?.code === "RaceDetected") {
+    // Environment variables or schema changed during push. This is a transient
+    // error that should be retried immediately with exponential backoff.
+    const message =
+      data.message || "Schema or environment variables changed during push";
+    return await ctx.crash({
+      exitCode: 1,
+      errorType: "transient",
+      errForSentry: error,
+      printedMessage: chalk.yellow(message),
+    });
+  }
+
   if (data?.code === "InternalServerError") {
     if (deploymentName?.startsWith("local-")) {
       printLocalDeploymentOnError();

npm-packages/convex/src/cli/lib/deploy2.ts

@@ -238,6 +238,7 @@ export async function finishPush(
     url: string;
     dryRun: boolean;
     verbose?: boolean;
+    deploymentName: string | null;
   },
 ): Promise<FinishPushDiff> {
   changeSpinner("Finalizing push...");
@@ -262,8 +263,17 @@ export async function finishPush(
     });
     return finishPushDiff.parse(await response.json());
   } catch (error: unknown) {
-    logFailure("Error: Unable to finish push to " + options.url);
-    return await logAndHandleFetchError(ctx, error);
+    return await handlePushConfigError(
+      ctx,
+      error,
+      "Error: Unable to finish push to " + options.url,
+      options.deploymentName,
+      {
+        adminKey: options.adminKey,
+        deploymentUrl: options.url,
+        deploymentNotice: "",
+      },
+    );
   }
 }