feat(cli): add --branch to app remove to scope teardown to one branch

docs/product/command-spec.md

@@ -2228,16 +2228,18 @@ prisma-cli app rollback
 prisma-cli app rollback --app hello-world --to dep_123
 ```
 
-## `prisma-cli app remove [app] --app <name> -y --yes`
+## `prisma-cli app remove [app] --app <name> --branch <name> -y --yes`
 
 Purpose:
 
-- remove the app from the current branch
+- remove the app, and every deployment it owns, from the resolved branch
 
 Behavior:
 
 - requires auth and project context
-- resolves the selected app
+- resolves the selected app on the resolved branch
+- `--branch <name>` scopes the removal to that branch, honored as-is; an empty value is rejected rather than inferred
+- without `--branch`, the branch is inferred (active Git branch, else the project's default production branch), so automation that must not touch production should always pass `--branch`
 - requires confirmation unless `-y` or `--yes` is passed
 - clears local selected app state when the removed app was selected
 
@@ -2246,4 +2248,5 @@ Examples:
 ```bash
 prisma-cli app remove --app hello-world
 prisma-cli app remove --app hello-world --yes
+prisma-cli app remove --app hello-world --branch feature/foo --yes
 ```

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

@@ -835,18 +835,21 @@ function createRemoveCommand(runtime: CliRuntime): Command {
       "App target from prisma.compute.ts when the config defines multiple apps",
     )
     .addOption(new Option("--app <name>", "App name"))
-    .addOption(new Option("--project <id-or-name>", "Project id or name"));
+    .addOption(new Option("--project <id-or-name>", "Project id or name"))
+    .addOption(new Option("--branch <name>", "Branch name"));
   addGlobalFlags(command);
 
   command.action(async (configTarget: string | undefined, options) => {
     const appName = (options as { app?: string }).app;
     const projectRef = (options as { project?: string }).project;
+    const branchName = (options as { branch?: string }).branch;
 
     await runCommand<AppRemoveResult>(
       runtime,
       "app.remove",
       options as Record<string, unknown>,
-      (context) => runAppRemove(context, appName, projectRef, configTarget),
+      (context) =>
+        runAppRemove(context, appName, projectRef, configTarget, branchName),
       {
         renderHuman: (context, descriptor, result) =>
           renderAppRemove(context, descriptor, result),

packages/cli/src/controllers/app.ts

@@ -574,7 +574,7 @@
   });
 }
 
 async function runSingleAppDeploy(
   context: CommandContext,
   appName: string | undefined,
   options: AppDeployOptions | undefined,
@@ -1171,9 +1171,9 @@
         ...deployment.deployment,
         live: providerLiveDeploymentId
           ? deployment.deployment.id === providerLiveDeploymentId
           : knownLiveDeploymentId
             ? deployment.deployment.id === knownLiveDeploymentId
             : deployment.deployment.live,
       },
     },
     warnings: [],
@@ -1552,10 +1552,10 @@
       });
     }
 
     await sleep(
       Math.min(pollIntervalMs, Math.max(deadline - Date.now(), 0)),
       context.runtime.signal,
     );
     current = await target.provider
       .showDomain(current.id, { signal: context.runtime.signal })
       .catch((error) => {
@@ -2035,11 +2035,18 @@
   };
 }
 
+/**
+ * Removes an app and every deployment it owns in the resolved branch.
+ *
+ * @param branchName Scopes the removal to this branch. When omitted the branch
+ * is inferred from the local Git branch, falling back to the production branch.
+ */
 export async function runAppRemove(
   context: CommandContext,
   appName: string | undefined,
   projectRef?: string,
   configTarget?: string,
+  branchName?: string,
 ): Promise<CommandSuccess<AppRemoveResult>> {
   ensurePreviewAppMode(context);
 
@@ -2049,8 +2056,23 @@
     "remove",
   );
   appName = appName ?? compute.configAppName;
+  // A blank --branch must not fall through to inference, which can reach production.
+  if (branchName !== undefined && branchName.trim() === "") {
+    throw usageError(
+      "The --branch value cannot be empty",
+      "app remove scopes the removal to the given branch; an empty --branch would silently fall back to the inferred (possibly production) branch.",
+      "Pass a non-empty branch name, e.g. --branch <branch>, or omit --branch to use the inferred branch.",
+      ["prisma-cli app remove --app <name> --branch <branch>"],
+      "app",
+    );
+  }
+  const branch =
+    branchName !== undefined
+      ? await resolveDeployBranch(context, branchName)
+      : undefined;
   const { provider, target, projectId } =
     await requireProviderAndProjectContext(context, projectRef, {
+      branch,
       commandName: "app remove",
       projectDir: compute.projectDir,
     });
@@ -2117,7 +2139,7 @@
   const compute = await resolveComputeManagementContext(
     context,
     options?.configTarget,
     commandName.replace(/^app /, ""),
   );
   const branch = resolveDomainBranch(options?.branchName);
   if (toBranchKind(branch.name) !== "production") {
@@ -2250,7 +2272,7 @@
 }
 
 function normalizeDomainHostname(hostname: string): string {
   const normalized = hostname.trim().replace(/\.$/, "").toLowerCase();
   if (!isValidDomainHostname(normalized)) {
     throw new CliError({
       code: "DOMAIN_HOSTNAME_INVALID",
@@ -2285,14 +2307,14 @@
   }
 
   return labels.every((label) =>
     /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label),
   );
 }
 
 function sameDomainHostname(left: string, right: string): boolean {
   return (
     left.trim().replace(/\.$/, "").toLowerCase() ===
     right.trim().replace(/\.$/, "").toLowerCase()
   );
 }
 
@@ -2380,7 +2402,7 @@
   }
 }
 
 function domainCommandError(
   command: AppDomainCommand,
   error: unknown,
   hostname: string,
@@ -2517,7 +2539,7 @@
     text.includes("no cname") ||
     text.includes("cname record") ||
     text.includes("no a/aaaa") ||
     /\bcname(?:s)?\s+to\b/.test(text)
   );
 }
 
@@ -2582,7 +2604,7 @@
     return 0;
   }
 
   const match = /^(\d+)(ms|s|m|h)$/.exec(trimmed);
   if (!match) {
     throw usageError(
       `Invalid timeout "${value}"`,
@@ -2598,11 +2620,11 @@
   const multiplier =
     unit === "h"
       ? 60 * 60 * 1000
       : unit === "m"
         ? 60 * 1000
         : unit === "s"
           ? 1000
           : 1;
   return amount * multiplier;
 }
 
@@ -3377,7 +3399,7 @@
     listProjects: () =>
       listRealWorkspaceProjects(
         client,
         authState.workspace!,
         context.runtime.signal,
       ),
     commandName: options?.commandName,
@@ -3411,7 +3433,7 @@
   };
 }
 
 async function resolveDeployProjectContext(
   context: CommandContext,
   client: ManagementApiClient,
   provider: ReturnType<typeof createAppProvider>,
@@ -4095,7 +4117,7 @@
       continue;
     }
 
     const configFile = await detectFrameworkConfigFile(cwd, framework, signal);
     if (
       !configFile.exists &&
       !hasAnyPackageDependency(packageJson, framework.detectPackages)
@@ -4108,8 +4130,8 @@
     const annotation =
       framework.key === "nextjs" && configFile.standalone
         ? "standalone output detected"
         : configFile.exists
           ? `detected from ${path.basename(configFile.path!)}`
           : "detected from package.json";
 
     return {
@@ -4132,10 +4154,10 @@
     const filePath = path.join(cwd, candidate);
     signal.throwIfAborted();
     try {
       const content = await readFile(filePath, { encoding: "utf8", signal });
       return {
         exists: true,
         standalone: /\boutput\s*:\s*["'`]standalone["'`]/.test(content),
         path: filePath,
       };
     } catch (error) {

packages/cli/src/shell/command-meta.ts

@@ -639,10 +639,11 @@ const DESCRIPTORS: CommandDescriptor[] = [
   {
     id: "app.remove",
     path: ["prisma", "app", "remove"],
-    description: "Remove the app from the current branch",
+    description: "Remove the app from the resolved branch",
     examples: [
       "prisma-cli app remove --app hello-world",
       "prisma-cli app remove --app hello-world --yes",
+      "prisma-cli app remove --app hello-world --branch feature/foo --yes",
     ],
   },
   {

packages/cli/tests/app-controller.test.ts

@@ -6761,6 +6761,209 @@ describe("app controller", () => {
     ).resolves.toBeNull();
   });
 
+  it("remove scopes the app lookup to an explicit --branch", async () => {
+    const requireComputeAuth = vi.fn().mockResolvedValue(createProjectClient());
+    const listApps = vi.fn().mockResolvedValue([
+      {
+        id: "app_1",
+        name: "hello-world",
+        region: "eu-central-1",
+        liveDeploymentId: null,
+      },
+    ]);
+    const removeApp = vi.fn().mockResolvedValue({
+      id: "app_1",
+      name: "hello-world",
+    });
+
+    vi.doMock("../src/lib/auth/guard", () => ({
+      requireComputeAuth,
+    }));
+    vi.doMock("../src/lib/app/app-provider", () => ({
+      createAppProvider: vi.fn(() =>
+        withBranchDatabaseProviderDefaults({
+          resolveBranch: createResolveBranch(),
+          createProject: vi.fn(),
+          listApps,
+          removeApp,
+          promoteDeployment: vi.fn(),
+          deployApp: vi.fn(),
+          listDeployments: vi.fn(),
+          showDeployment: vi.fn(),
+        }),
+      ),
+    }));
+
+    const { createTempCwd, createTestCommandContext } = await import(
+      "./helpers"
+    );
+    const { runAppRemove } = await import("../src/controllers/app");
+    const cwd = await createTempCwd();
+    await writeLocalPin(cwd, { workspaceId: "ws_123", projectId: "proj_123" });
+    const stateDir = path.join(cwd, ".state");
+    const { context } = await createTestCommandContext({
+      cwd,
+      stateDir,
+      flags: {
+        yes: true,
+      },
+      env: {
+        ...process.env,
+        PRISMA_CLI_MOCK_FIXTURE_PATH: undefined,
+      },
+    });
+
+    await runAppRemove(context, "hello-world", undefined, undefined, "pr-42");
+
+    expect(listApps).toHaveBeenCalledWith(
+      "proj_123",
+      expect.objectContaining({ branchName: "pr-42" }),
+    );
+    expect(removeApp).toHaveBeenCalledWith("app_1", {
+      signal: context.runtime.signal,
+    });
+  });
+
+  it("remove rejects an explicitly empty --branch instead of inferring a branch", async () => {
+    const requireComputeAuth = vi.fn().mockResolvedValue(createProjectClient());
+    const listApps = vi.fn();
+    const removeApp = vi.fn();
+
+    vi.doMock("../src/lib/auth/guard", () => ({
+      requireComputeAuth,
+    }));
+    vi.doMock("../src/lib/app/app-provider", () => ({
+      createAppProvider: vi.fn(() =>
+        withBranchDatabaseProviderDefaults({
+          resolveBranch: createResolveBranch(),
+          createProject: vi.fn(),
+          listApps,
+          removeApp,
+          promoteDeployment: vi.fn(),
+          deployApp: vi.fn(),
+          listDeployments: vi.fn(),
+          showDeployment: vi.fn(),
+        }),
+      ),
+    }));
+
+    const { createTempCwd, createTestCommandContext } = await import(
+      "./helpers"
+    );
+    const { runAppRemove } = await import("../src/controllers/app");
+    const cwd = await createTempCwd();
+    await writeLocalPin(cwd, { workspaceId: "ws_123", projectId: "proj_123" });
+    const stateDir = path.join(cwd, ".state");
+    const { context } = await createTestCommandContext({
+      cwd,
+      stateDir,
+      flags: {
+        yes: true,
+      },
+      env: {
+        ...process.env,
+        PRISMA_CLI_MOCK_FIXTURE_PATH: undefined,
+      },
+    });
+
+    await expect(
+      runAppRemove(context, "hello-world", undefined, undefined, "   "),
+    ).rejects.toThrow(/branch value cannot be empty/i);
+    expect(listApps).not.toHaveBeenCalled();
+    expect(removeApp).not.toHaveBeenCalled();
+  });
+
+  it("app remove registers a --branch option (regression guard for the CLI wiring)", async () => {
+    const { createAppCommand } = await import("../src/commands/app");
+    const { createTempCwd, createTestCommandContext } = await import(
+      "./helpers"
+    );
+    const cwd = await createTempCwd();
+    const { context } = await createTestCommandContext({
+      cwd,
+      stateDir: path.join(cwd, ".state"),
+    });
+
+    const app = createAppCommand(context.runtime);
+    const remove = app.commands.find((command) => command.name() === "remove");
+
+    expect(remove).toBeDefined();
+    expect(remove?.options.some((option) => option.long === "--branch")).toBe(
+      true,
+    );
+  });
+
+  it("app remove forwards --branch from the parsed command through to the provider", async () => {
+    const requireComputeAuth = vi.fn().mockResolvedValue(createProjectClient());
+    const listApps = vi.fn().mockResolvedValue([
+      {
+        id: "app_1",
+        name: "hello-world",
+        region: "eu-central-1",
+        liveDeploymentId: null,
+      },
+    ]);
+    const removeApp = vi.fn().mockResolvedValue({
+      id: "app_1",
+      name: "hello-world",
+    });
+
+    vi.doMock("../src/lib/auth/guard", () => ({
+      requireComputeAuth,
+    }));
+    vi.doMock("../src/lib/app/app-provider", () => ({
+      createAppProvider: vi.fn(() =>
+        withBranchDatabaseProviderDefaults({
+          resolveBranch: createResolveBranch(),
+          createProject: vi.fn(),
+          listApps,
+          removeApp,
+          promoteDeployment: vi.fn(),
+          deployApp: vi.fn(),
+          listDeployments: vi.fn(),
+          showDeployment: vi.fn(),
+        }),
+      ),
+    }));
+
+    const { createAppCommand } = await import("../src/commands/app");
+    const { createTempCwd, createTestCommandContext } = await import(
+      "./helpers"
+    );
+    const cwd = await createTempCwd();
+    await writeLocalPin(cwd, { workspaceId: "ws_123", projectId: "proj_123" });
+    const { context } = await createTestCommandContext({
+      cwd,
+      stateDir: path.join(cwd, ".state"),
+      flags: {
+        yes: true,
+      },
+      env: {
+        ...process.env,
+        PRISMA_CLI_MOCK_FIXTURE_PATH: undefined,
+      },
+    });
+
+    const app = createAppCommand(context.runtime);
+    await app.parseAsync(
+      [
+        "remove",
+        "--app",
+        "hello-world",
+        "--branch",
+        "pr-42",
+        "--yes",
+        "--json",
+      ],
+      { from: "user" },
+    );
+
+    expect(listApps).toHaveBeenCalledWith(
+      "proj_123",
+      expect.objectContaining({ branchName: "pr-42" }),
+    );
+  });
+
   it("remove prompts for confirmation in interactive mode", async () => {
     const requireComputeAuth = vi.fn().mockResolvedValue(createProjectClient());
     const listApps = vi.fn().mockResolvedValue([

packages/cli/tests/app.test.ts

@@ -254,11 +254,14 @@ describe("app commands", () => {
 
     expect(removeHelp.exitCode).toBe(0);
     expect(removeHelp.stderr).toContain(
-      "Remove the app from the current branch",
+      "Remove the app from the resolved branch",
     );
     expect(removeHelp.stderr).toContain(
       "$ prisma-cli app remove --app hello-world",
     );
+    expect(removeHelp.stderr).toContain(
+      "$ prisma-cli app remove --app hello-world --branch feature/foo --yes",
+    );
   });
 
   it("does not register legacy app env commands", async () => {