Merge pull request #54 from prisma/feat/j1-prod-deploy-gate-prework

feat: require --prod for production deploys

Author: luanvdw

docs/product/command-spec.md

@@ -610,7 +610,7 @@ prisma-cli app run --build-type nextjs
 prisma-cli app run --build-type bun --entry server.ts --port 3000
 ```
 
-## `prisma-cli app deploy --project <id-or-name> --create-project <name> --app <name> --branch <name> --framework <nextjs|hono|tanstack-start|bun> --entry <path> --http-port <port> --env <name=value>`
+## `prisma-cli app deploy --project <id-or-name> --create-project <name> --app <name> --branch <name> --framework <nextjs|hono|tanstack-start|bun> --entry <path> --http-port <port> --env <name=value> --prod`
 
 Purpose:
 
@@ -637,7 +637,10 @@ Behavior:
 - `--yes` alone does not choose Project scope; use `--project` or `--create-project`
 - `--project` and `--create-project` are mutually exclusive with each other and with `PRISMA_PROJECT_ID`
 - resolves or creates branch context from `--branch`, local Git branch, or `main`
+- treats only the resolved Branch `role` as production authority; branch name, `main`, `production`, and `isDefault` are not production authority
 - resolves or creates app context inside the resolved branch from `--app`, `PRISMA_APP_ID`, `package.json#name`, or current directory name
+- auto-promotes the first production deploy for an App without `--prod`
+- requires `--prod` for subsequent deploys to a production Branch; `--yes` only skips the confirmation prompt when `--prod` is also present
 - does not prompt when there is no real choice; zero matching apps creates the inferred app
 - writes `.prisma/local.json` after Project binding succeeds and before build/deploy starts, so retries after a failed deploy do not repeat setup
 - before asking `Customize build settings? (y/N)`, previews the detected framework and runtime so the user can see the defaults they are accepting or changing
@@ -662,6 +665,7 @@ prisma-cli app deploy --create-project my-app --yes
 prisma-cli app deploy --app my-app --env DATABASE_URL=postgresql://example
 prisma-cli app deploy --framework nextjs --http-port 3000
 prisma-cli app deploy --branch feat-login --framework hono --http-port 3000
+prisma-cli app deploy --prod --yes
 prisma-cli app deploy --framework bun --entry src/server.ts --http-port 3000
 prisma-cli app deploy --entry src/server.ts --http-port 3000
 ```

docs/product/error-conventions.md

@@ -172,6 +172,7 @@ These codes are the minimum stable set for the MVP:
 - `DEPLOYMENT_NOT_FOUND`
 - `NO_DEPLOYMENTS`
 - `NO_PREVIOUS_DEPLOYMENT`
+- `PROD_DEPLOY_REQUIRES_FLAG`
 - `PROMOTE_SOURCE_INVALID`
 - `ROLLBACK_UNAVAILABLE`
 - `CONFIRMATION_REQUIRED`
@@ -213,6 +214,7 @@ Recommended meanings:
 - `DEPLOYMENT_NOT_FOUND`: requested deployment id does not exist
 - `NO_DEPLOYMENTS`: command resolved a branch or app but found no deployments
 - `NO_PREVIOUS_DEPLOYMENT`: rollback could not find an earlier deployment for the selected app
+- `PROD_DEPLOY_REQUIRES_FLAG`: app deploy resolved a production Branch with a prior production deployment, but `--prod` was not passed
 - `PROMOTE_SOURCE_INVALID`: source for promote is missing, invalid, or not promotable
 - `ROLLBACK_UNAVAILABLE`: no previous healthy production deployment exists
 - `CONFIRMATION_REQUIRED`: command cannot continue without confirmation in the current mode

packages/cli/src/commands/app/index.ts

@@ -181,7 +181,8 @@ function createDeployCommand(runtime: CliRuntime): Command {
     .addOption(
       new Option("--env <name=value>", "Environment variable")
         .argParser(collectRepeatableValues),
-    );
+    )
+    .addOption(new Option("--prod", "Confirm intent to deploy to production"));
   addGlobalFlags(command);
 
   command.action(async (options) => {
@@ -193,6 +194,7 @@ function createDeployCommand(runtime: CliRuntime): Command {
     const envAssignments = (options as { env?: string[] }).env;
     const projectRef = (options as { project?: string }).project;
     const createProjectName = (options as { createProject?: string }).createProject;
+    const prod = (options as { prod?: boolean }).prod;
 
     await runCommand<AppDeployResult>(
       runtime,
@@ -206,6 +208,7 @@ function createDeployCommand(runtime: CliRuntime): Command {
         framework,
         httpPort,
         envAssignments,
+        prod: prod === true,
       }),
       {
         renderHuman: (context, descriptor, result) => renderAppDeploy(context, descriptor, result),

packages/cli/src/controllers/app.ts

@@ -90,6 +90,7 @@ import {
   type PreviewAppRecord,
   type PreviewDomainRecord,
 } from "../lib/app/preview-provider";
+import { enforceProductionDeployGate } from "../lib/app/production-deploy-gate";
 import { formatDomainFailureFix } from "../lib/app/domain-guidance";
 import { requireAuthenticatedAuthState } from "./auth";
 import { listRealWorkspaceProjects } from "./project";
@@ -221,6 +222,7 @@ export async function runAppDeploy(
     framework?: string;
     httpPort?: string;
     envAssignments?: string[];
+    prod?: boolean;
   },
 ): Promise<CommandSuccess<AppDeployResult>> {
   ensurePreviewAppMode(context);
@@ -304,6 +306,13 @@ export async function runAppDeploy(
   framework = customized.framework;
   runtime = customized.runtime;
 
+  await enforceProductionDeployGate(context, provider, {
+    appId: selectedApp.appId,
+    appName: selectedApp.displayName,
+    branchKind: target.branch.kind,
+    prod: options?.prod === true,
+  });
+
   // Customization can switch from a Bun-compatible framework to one that
   // derives its entrypoint from build output, so validate --entry again after it.
   const buildType = framework.buildType;
@@ -2301,7 +2310,7 @@ async function resolveDeployProjectContext(
 
   if (explicitProject) {
     const project = resolveProjectForSetup(explicitProject, projects, workspace);
-    return withDeployBranch({
+    return withRemoteDeployBranch(provider, {
       workspace,
       project: toProjectSummary(project),
       resolution: {
@@ -2310,7 +2319,7 @@ async function resolveDeployProjectContext(
         targetNameSource: "explicit",
       },
       localPinAction: "linked",
-    }, branch);
+    }, branch, context.runtime.signal);
   }
 
   if (options.createProjectName) {
@@ -2320,7 +2329,7 @@ async function resolveDeployProjectContext(
     }
 
     const created = await createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal);
-    return withDeployBranch({
+    return withRemoteDeployBranch(provider, {
       workspace,
       project: toProjectSummary(created),
       resolution: {
@@ -2329,23 +2338,23 @@ async function resolveDeployProjectContext(
         targetNameSource: "explicit",
       },
       localPinAction: "created",
-    }, branch);
+    }, branch, context.runtime.signal);
   }
 
   if (options.envProjectId) {
     const project = projects.find((candidate) => candidate.id === options.envProjectId);
     if (!project) {
       throw projectNotFoundError(options.envProjectId, workspace);
     }
-    return withDeployBranch({
+    return withRemoteDeployBranch(provider, {
       workspace,
       project: toProjectSummary(project),
       resolution: {
         projectSource: "env",
         targetName: options.envProjectId,
         targetNameSource: "env",
       },
-    }, branch);
+    }, branch, context.runtime.signal);
   }
 
   const localPin = options.localPin;
@@ -2359,33 +2368,33 @@ async function resolveDeployProjectContext(
       throw localResolutionPinStaleError();
     }
 
-    return withDeployBranch({
+    return withRemoteDeployBranch(provider, {
       workspace,
       project: toProjectSummary(project),
       resolution: {
         projectSource: "local-pin",
         targetName: project.name,
         targetNameSource: "local-pin",
       },
-    }, branch);
+    }, branch, context.runtime.signal);
   }
 
   const platformMapping = await resolveDurablePlatformMapping();
   if (platformMapping && platformMapping.workspace.id === workspace.id) {
-    return withDeployBranch({
+    return withRemoteDeployBranch(provider, {
       workspace,
       project: toProjectSummary(platformMapping),
       resolution: {
         projectSource: "platform-mapping",
         targetName: platformMapping.name,
         targetNameSource: "platform-mapping",
       },
-    }, branch);
+    }, branch, context.runtime.signal);
   }
 
   if (canPrompt(context) && !context.flags.yes) {
     const resolved = await resolveInteractiveDeployProjectSetup(context, provider, workspace, projects);
-    return withDeployBranch(resolved, branch);
+    return withRemoteDeployBranch(provider, resolved, branch, context.runtime.signal);
   }
 
   const suggestedName = await inferTargetName(context.runtime.cwd, context.runtime.signal);
@@ -2446,15 +2455,22 @@ async function createProjectForDeploySetup(
   };
 }
 
-function withDeployBranch(
+async function withRemoteDeployBranch(
+  provider: ReturnType<typeof createPreviewAppProvider>,
   target: Omit<ResolvedAppProjectContext, "branch">,
   branch: ResolvedDeployBranch,
-): ResolvedAppProjectContext {
+  signal: AbortSignal,
+): Promise<ResolvedAppProjectContext> {
+  const remoteBranch = await provider.resolveBranch(target.project.id, {
+    branchName: branch.name,
+    signal,
+  });
+
   return {
     ...target,
     branch: {
-      name: branch.name,
-      kind: toBranchKind(branch.name),
+      name: remoteBranch.name,
+      kind: remoteBranch.role,
     },
   };
 }

packages/cli/src/lib/app/preview-provider.ts

@@ -7,6 +7,7 @@ import type { ManagementApiClient } from "@prisma/management-api-sdk";
 import { envVarNames } from "./env-vars";
 import { PreviewBuildStrategy } from "./preview-build";
 import type { PreviewBuildType } from "./preview-build";
+import type { BranchKind } from "../../types/branch";
 
 export interface PreviewAppRecord {
   id: string;
@@ -22,6 +23,12 @@ export interface PreviewProjectRecord {
   name: string;
 }
 
+export interface PreviewBranchRecord {
+  id: string;
+  name: string;
+  role: BranchKind;
+}
+
 export interface PreviewDeploymentRecord {
   id: string;
   status: string;
@@ -105,6 +112,7 @@ export class PreviewDomainApiError extends Error {
 
 export interface PreviewAppProvider {
   createProject(options: { name: string; signal?: AbortSignal }): Promise<PreviewProjectRecord>;
+  resolveBranch(projectId: string, options: { branchName: string; signal?: AbortSignal }): Promise<PreviewBranchRecord>;
   listApps(projectId: string, options?: { branchName?: string; signal?: AbortSignal }): Promise<PreviewAppRecord[]>;
   removeApp(appId: string, options?: { signal?: AbortSignal }): Promise<PreviewRemovedAppRecord>;
   listDomains(appId: string, options?: { signal?: AbortSignal }): Promise<PreviewDomainRecord[]>;
@@ -181,12 +189,26 @@ export function createPreviewAppProvider(
 
     async listApps(projectId, options) {
       return listComputeServices(client, {
-          projectId,
-          branchGitName: options?.branchName,
-          signal: options?.signal,
+        projectId,
+        branchGitName: options?.branchName,
+        signal: options?.signal,
       });
     },
 
+    async resolveBranch(projectId, options) {
+      const branch = await resolveOrCreateBranch(client, {
+        projectId,
+        gitName: options.branchName,
+        signal: options.signal,
+      });
+
+      return {
+        id: branch.id,
+        name: branch.gitName,
+        role: branch.role,
+      };
+    },
+
     async removeApp(appId, options) {
       const appResult = await sdk.showService({ serviceId: appId, signal: options?.signal });
       if (appResult.isErr()) {
@@ -556,6 +578,7 @@ interface RawBranchRecord {
   id: string;
   gitName: string;
   isDefault: boolean;
+  role: BranchKind;
 }
 
 interface RawComputeServiceRecord {
@@ -621,7 +644,12 @@ async function listBranches(
     throw apiCallError("Failed to list branches", result.response, result.error);
   }
 
-  return result.data.data as RawBranchRecord[];
+  return result.data.data.map((branch) => ({
+    id: branch.id,
+    gitName: branch.gitName,
+    isDefault: branch.isDefault,
+    role: branch.role,
+  }));
 }
 
 async function resolveOrCreateBranch(
@@ -643,7 +671,6 @@ async function resolveOrCreateBranch(
     },
     body: {
       gitName: options.gitName,
-      isDefault: options.gitName === "main",
     },
     signal: options.signal,
   });
@@ -658,7 +685,13 @@ async function resolveOrCreateBranch(
     throw apiCallError(`Failed to create branch "${options.gitName}"`, result.response, result.error);
   }
 
-  return result.data.data as RawBranchRecord;
+  const branch = result.data.data;
+  return {
+    id: branch.id,
+    gitName: branch.gitName,
+    isDefault: branch.isDefault,
+    role: branch.role,
+  };
 }
 
 async function listComputeServices(