create-svc 0.1.15 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",

package/src/post-scaffold.test.ts

@@ -4,16 +4,16 @@ import { buildDeploymentVerificationCommands, buildPostScaffoldCommands } from "
 describe("buildPostScaffoldCommands", () => {
   test("runs create and deploy for HTTP services", () => {
     expect(buildPostScaffoldCommands({ framework: "hono" })).toEqual([
-      { command: "bun", args: ["run", "service", "--", "create"] },
-      { command: "bun", args: ["run", "service", "--", "deploy"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "create"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "deploy"] },
     ]);
   });
 
   test("builds SDK artifacts before create and deploy for ConnectRPC services", () => {
     expect(buildPostScaffoldCommands({ framework: "connectrpc" })).toEqual([
-      { command: "bun", args: ["run", "service", "--", "sdk", "build"] },
-      { command: "bun", args: ["run", "service", "--", "create"] },
-      { command: "bun", args: ["run", "service", "--", "deploy"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "sdk", "build"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "create"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "deploy"] },
     ]);
   });
 });

package/src/post-scaffold.ts

@@ -55,9 +55,9 @@ export function buildDeploymentVerificationCommands(
 
 export function buildPostScaffoldCommands(config: Pick<ScaffoldConfig, "framework">): PostScaffoldCommand[] {
   return [
-    ...(config.framework === "connectrpc" ? [{ command: "bun", args: ["run", "service", "--", "sdk", "build"] }] : []),
-    { command: "bun", args: ["run", "service", "--", "create"] },
-    { command: "bun", args: ["run", "service", "--", "deploy"] },
+    ...(config.framework === "connectrpc" ? [{ command: "bun", args: ["./scripts/cloudrun/cli.ts", "sdk", "build"] }] : []),
+    { command: "bun", args: ["./scripts/cloudrun/cli.ts", "create"] },
+    { command: "bun", args: ["./scripts/cloudrun/cli.ts", "deploy"] },
   ];
 }
 

package/src/scaffold.test.ts

@@ -84,7 +84,7 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
 
     const deployScript = await Bun.file(join(generatedRoot, "scripts", "cloudrun", "lib.ts")).text();
     expect(deployScript).toContain('--billing-project", config.project.quotaProjectId');
-    expect(deployScript).toContain('config.project.mode === "use_existing"');
+    expect(deployScript).toContain('projectMode === "use_existing"');
     expect(deployScript).toContain("serviceDomain");
     expect(deployScript).toContain("ensureProductionDomainMapping");
     expect(deployScript).toContain('"domain-mappings",');
@@ -96,7 +96,10 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
     expect(await Bun.file(join(generatedRoot, "scripts", "cloudrun", "integrations.ts")).exists()).toBeFalse();
     const destroyScript = await Bun.file(join(generatedRoot, "scripts", "cloudrun", "cleanup.ts")).text();
     expect(destroyScript).toContain("assertOwnedResource");
-    expect(destroyScript).toContain("assertProductionDomainMappingOwned");
+    expect(destroyScript).toContain("Planning resources to destroy");
+    expect(destroyScript).toContain("Resources selected for destroy");
+    expect(destroyScript).toContain("Destroy cannot continue until resource discovery succeeds");
+    expect(destroyScript).toContain("deleteAuthResourceServer");
     expect(destroyScript).toContain("deleteGrafanaResources");
     expect(destroyScript).toContain('gcx", ["resources", "delete"');
     expect(destroyScript).toContain("config.temporal.apiKeySecretName");
@@ -135,6 +138,7 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
     expect(envExample).toContain("AUTH_ENABLED=false");
     expect(envExample).toContain("AUTH_AUDIENCE=api://dns-api");
     expect(envExample).toContain("CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID=");
+    expect(envExample).toContain("VAULT_AUTHCTL_ACCESS_PATH=prod/apps/auth/authctl/cloudflare-access");
     expect(envExample).toContain("TEMPORAL_API_KEY=");
     expect(envExample).toContain("The base waitlist service does not require");
     expect(envExample).not.toContain("ATTACHMENT_BUCKET=");
@@ -146,6 +150,8 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
 
     const localEnv = await Bun.file(join(generatedRoot, ".env.local")).text();
     expect(localEnv).toContain(`DATABASE_URL=postgres://postgres:postgres@127.0.0.1:${localPort}/dns_api?sslmode=disable`);
+    expect(localEnv).toContain("VAULT_AUTHCTL_ACCESS_PATH=prod/apps/auth/authctl/cloudflare-access");
+    expect(localEnv).toContain("VAULT_NEON_API_KEY_PATH=prod/providers/neon");
     expect(localEnv).not.toContain("ATTACHMENT_PUBLIC_BASE_URL=");
 
     const ciWorkflow = await Bun.file(join(generatedRoot, ".github", "workflows", "ci.yml")).text();
@@ -223,6 +229,9 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
       expect(authctlScript).toContain("resource-servers");
       expect(authctlScript).toContain("clients");
       expect(authctlScript).toContain("defaultClientTargetArgs");
+      expect(authctlScript).toContain("deleteAuthResourceServer");
+      expect(authctlScript).toContain("readAuthctlAccessVaultField");
+      expect(authctlScript).toContain("prod/apps/auth/authctl/cloudflare-access");
       expect(authctlScript).toContain('existsSync("./node_modules/.bin/authctl") ? "./node_modules/.bin/authctl" : Bun.which("authctl")');
       expect(authctlScript).not.toContain('defaultAuthResourceServerArgs(), "--yes", "--json"');
       const authScript = await Bun.file(join(generatedRoot, "src", "auth.ts")).text();

package/src/scaffold.ts

@@ -252,6 +252,14 @@ async function writeLocalEnvFile(targetDir: string, replacements: Record<string,
       "",
       "DATABASE_URL=postgres://{{LOCAL_DATABASE_USER}}:{{LOCAL_DATABASE_PASSWORD}}@127.0.0.1:{{LOCAL_DATABASE_PORT}}/{{LOCAL_DATABASE_NAME}}?sslmode=disable",
       "",
+      "VAULT_SECRET_MOUNT=secret",
+      "VAULT_AUTHCTL_ACCESS_PATH=prod/apps/auth/authctl/cloudflare-access",
+      "VAULT_AUTHCTL_ACCESS_BASE_URL_FIELD=AUTH_INTERNAL_BASE_URL",
+      "VAULT_AUTHCTL_ACCESS_CLIENT_ID_FIELD=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID",
+      "VAULT_AUTHCTL_ACCESS_CLIENT_SECRET_FIELD=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET",
+      "VAULT_NEON_API_KEY_PATH=prod/providers/neon",
+      "VAULT_NEON_API_KEY_FIELD=api_key",
+      "",
     ].join("\n"),
     replacements
   );

package/templates/shared/README.md

@@ -104,14 +104,17 @@ The scaffold will use, in order:
 
 That keeps stable settings in the repo and keeps the token out of `~/.zshrc`.
 
-For production auth registration, `authctl` also needs the auth service's
-Cloudflare Access service token:
+For production auth registration, `authctl` loads the auth service's Cloudflare
+Access service token from Vault by default:
 
-```bash
-export AUTH_INTERNAL_BASE_URL="$(vault kv get -mount=secret -field=AUTH_INTERNAL_BASE_URL prod/apps/auth/authctl/cloudflare-access)"
-export CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID="$(vault kv get -mount=secret -field=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID prod/apps/auth/authctl/cloudflare-access)"
-export CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET="$(vault kv get -mount=secret -field=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET prod/apps/auth/authctl/cloudflare-access)"
-```
+- `VAULT_AUTHCTL_ACCESS_PATH` default `prod/apps/auth/authctl/cloudflare-access`
+- `VAULT_AUTHCTL_ACCESS_BASE_URL_FIELD` default `AUTH_INTERNAL_BASE_URL`
+- `VAULT_AUTHCTL_ACCESS_CLIENT_ID_FIELD` default `CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID`
+- `VAULT_AUTHCTL_ACCESS_CLIENT_SECRET_FIELD` default `CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET`
+
+Direct `AUTH_INTERNAL_BASE_URL`, `CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID`,
+and `CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET` env values still override
+Vault when set.
 
 Before first production create, verify the installed `authctl` exposes the
 resource-server control-plane command:
@@ -127,6 +130,7 @@ newer before running `{{COMMAND_BOOTSTRAP}}`.
 Optional remote-only Vault overrides for Neon admin key lookup:
 
 - `VAULT_SECRET_MOUNT` default `secret`
+- `VAULT_AUTHCTL_ACCESS_PATH` default `prod/apps/auth/authctl/cloudflare-access`
 - `VAULT_NEON_API_KEY_PATH` default `prod/providers/neon`
 - `VAULT_NEON_API_KEY_FIELD` default `api_key`
 

package/templates/shared/scripts/authctl.ts

@@ -58,10 +58,24 @@ export function runAuthCommand(args: string[]) {
         "authctl is installed but does not expose resource-server commands; install @anmho/authctl@0.1.1 or newer before managing auth resource servers"
       );
     }
-    if (action === "get" || action === "list") {
+    if (action === "get" || action === "list" || action === "delete") {
       if (!command.actions.includes(action)) {
         throw new Error(`authctl ${command.subject} does not expose ${action}`);
       }
+      if (action === "delete") {
+        authctl([
+          command.subject,
+          action,
+          "--resource-server",
+          serviceConfig.auth.resource_server.id,
+          "--stage",
+          serviceConfig.stage_default,
+          "--force",
+          "--json",
+          ...rest,
+        ]);
+        return `Auth resource server deleted: ${serviceConfig.auth.resource_server.id}`;
+      }
       authctl([command.subject, action, ...rest]);
       return `Auth resource server ${action} finished`;
     }
@@ -83,10 +97,32 @@ export function runAuthCommand(args: string[]) {
 
 export function ensureAuthResourceServer() {
   const command = ensureResourceServerCommandAvailable();
-  authctl([command.subject, command.mutationAction, ...defaultAuthResourceServerArgs(), "--json"]);
+  authctl([command.subject, command.mutationAction, ...defaultAuthResourceServerArgs(), "--json"], { quiet: true });
   return `Auth resource server ready: ${serviceConfig.auth.resource_server.audience}`;
 }
 
+export function deleteAuthResourceServer() {
+  const command = resolveResourceServerCommand();
+  if (!command?.actions.includes("delete")) {
+    return "authctl does not expose resource-server delete; auth resource server was not deleted";
+  }
+
+  authctl(
+    [
+      command.subject,
+      "delete",
+      "--resource-server",
+      serviceConfig.auth.resource_server.id,
+      "--stage",
+      serviceConfig.stage_default,
+      "--force",
+      "--json",
+    ],
+    { quiet: true }
+  );
+  return `Auth resource server deleted: ${serviceConfig.auth.resource_server.id}`;
+}
+
 export function runAuthDoctor(): AuthDoctorResult {
   if (!authctlPath()) {
     return {
@@ -185,7 +221,7 @@ function resolveResourceServerCommand(): ResourceServerCommand | undefined {
     if (!help.success || !output.includes(subject)) {
       continue;
     }
-    const actions = ["upsert", "create", "get", "list"].filter((candidate) => output.includes(candidate));
+    const actions = ["upsert", "create", "get", "list", "delete"].filter((candidate) => output.includes(candidate));
     const mutationAction = actions.includes("upsert") ? "upsert" : actions.includes("create") ? "create" : undefined;
     if (actions.length > 0) {
       return { subject, mutationAction, actions };
@@ -202,7 +238,7 @@ function authctl(args: string[], options: { allowFailure?: boolean; quiet?: bool
 
   const result = Bun.spawnSync([command, ...args], {
     cwd: process.cwd(),
-    env: process.env,
+    env: authctlEnvironment(),
     stdin: "inherit",
     stdout: "pipe",
     stderr: "pipe",
@@ -232,10 +268,9 @@ function formatAuthctlFailure(args: string[], output: CommandResult) {
     return [
       `authctl ${args.join(" ")} failed with exit code ${output.exitCode}`,
       "authctl reached the auth internal API, but Cloudflare Access rejected the request.",
-      "Export the authctl Cloudflare Access service token before running service create:",
-      '  export AUTH_INTERNAL_BASE_URL="$(vault kv get -mount=secret -field=AUTH_INTERNAL_BASE_URL prod/apps/auth/authctl/cloudflare-access)"',
-      '  export CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID="$(vault kv get -mount=secret -field=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID prod/apps/auth/authctl/cloudflare-access)"',
-      '  export CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET="$(vault kv get -mount=secret -field=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET prod/apps/auth/authctl/cloudflare-access)"',
+      "The service CLI tried to load the authctl Access token from Vault.",
+      "Verify `vault login` works and that this path is readable:",
+      "  secret/prod/apps/auth/authctl/cloudflare-access",
     ].join("\n");
   }
 
@@ -245,3 +280,58 @@ function formatAuthctlFailure(args: string[], output: CommandResult) {
 function authctlPath() {
   return existsSync("./node_modules/.bin/authctl") ? "./node_modules/.bin/authctl" : Bun.which("authctl");
 }
+
+function authctlEnvironment() {
+  const env = { ...process.env };
+  const fields = [
+    {
+      envName: "AUTH_INTERNAL_BASE_URL",
+      fieldEnvName: "VAULT_AUTHCTL_ACCESS_BASE_URL_FIELD",
+      defaultField: "AUTH_INTERNAL_BASE_URL",
+    },
+    {
+      envName: "CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID",
+      fieldEnvName: "VAULT_AUTHCTL_ACCESS_CLIENT_ID_FIELD",
+      defaultField: "CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID",
+    },
+    {
+      envName: "CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET",
+      fieldEnvName: "VAULT_AUTHCTL_ACCESS_CLIENT_SECRET_FIELD",
+      defaultField: "CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET",
+    },
+  ];
+
+  for (const field of fields) {
+    if (env[field.envName]?.trim()) {
+      continue;
+    }
+    const value = readAuthctlAccessVaultField(env, env[field.fieldEnvName]?.trim() || field.defaultField);
+    if (value) {
+      env[field.envName] = value;
+    }
+  }
+
+  return env;
+}
+
+function readAuthctlAccessVaultField(env: Record<string, string | undefined>, field: string) {
+  const vault = Bun.which("vault");
+  if (!vault) {
+    return "";
+  }
+
+  const mount = env.VAULT_AUTHCTL_ACCESS_MOUNT?.trim() || env.VAULT_SECRET_MOUNT?.trim() || "secret";
+  const path = env.VAULT_AUTHCTL_ACCESS_PATH?.trim() || "prod/apps/auth/authctl/cloudflare-access";
+  const result = Bun.spawnSync([vault, "kv", "get", `-mount=${mount}`, `-field=${field}`, path], {
+    cwd: process.cwd(),
+    env,
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+
+  if (!result.success || !result.stdout) {
+    return "";
+  }
+
+  return decoder.decode(result.stdout).trim();
+}

package/templates/shared/scripts/cloudrun/bootstrap.ts

@@ -17,13 +17,13 @@ import {
   runStep,
 } from "./lib";
 
-export async function bootstrap() {
+export async function bootstrap(options: { skipProjectSetup?: boolean } = {}) {
   requireCommand("gcloud");
   requireGcloudAuth();
 
-  await runStep("Ensuring GCP project", () => ensureProject());
-  await runStep("Attaching billing", () => attachBilling());
-  await runStep("Enabling required GCP APIs", () => gcloud(["services", "enable", ...config.requiredApis, "--project", config.project.id]));
+  if (!options.skipProjectSetup) {
+    await prepareGcpProject();
+  }
 
   await runStep("Ensuring runtime service account", () => {
     ensureServiceAccount(config.runtimeServiceAccount);
@@ -53,6 +53,12 @@ export async function bootstrap() {
   await runStep("Publishing Temporal secrets", () => publishTemporalSecrets());
 }
 
+export async function prepareGcpProject() {
+  await runStep("Ensuring GCP project", () => ensureProject());
+  await runStep("Attaching billing", () => attachBilling());
+  await runStep("Enabling required GCP APIs", () => gcloud(["services", "enable", ...config.requiredApis, "--project", config.project.id]));
+}
+
 function publishTemporalSecrets() {
   const temporal = resolveTemporalRuntimeConfig();
   const apiKey = process.env.TEMPORAL_API_KEY?.trim();

package/templates/shared/scripts/cloudrun/cleanup.ts

@@ -1,4 +1,5 @@
 import { confirm, isCancel, log } from "@clack/prompts";
+import { deleteAuthResourceServer } from "../authctl";
 import { config } from "./config";
 import { deleteBranch, deleteDatabase, listBranches, resolveNeonConfig } from "./neon";
 import {
@@ -11,6 +12,7 @@ import {
   describeCloudRunService,
   describeProductionDomainMapping,
   describeSecret,
+  formatError,
   listCloudRunServices,
   listSecrets,
   parseCleanupArgs,
@@ -34,18 +36,46 @@ function matchesSecretResource(name: string) {
   );
 }
 
+type PlannedResource = {
+  label: string;
+  detail?: string;
+};
+
+type DestroyPlan = {
+  resources: PlannedResource[];
+  skipped: PlannedResource[];
+  blockers: string[];
+  hasProductionDomainMapping: boolean;
+  serviceNames: string[];
+  secretNames: string[];
+  neon?: {
+    projectId: string;
+    baseBranchId: string;
+    databaseName: string;
+    branches: Array<{ id: string; name: string }>;
+  };
+};
+
 export async function cleanup(args = Bun.argv.slice(2)) {
   requireCommand("gcloud");
   requireGcloudAuth();
 
   const options = parseCleanupArgs(args);
+  const plan = await runStep("Planning resources to destroy", () => buildDestroyPlan(options.destroyProject));
+  printDestroyPlan(plan);
+  if (plan.blockers.length > 0) {
+    throw new Error(["Destroy cannot continue until resource discovery succeeds:", ...plan.blockers.map((blocker) => `- ${blocker}`)].join("\n"));
+  }
+
   await requireDestroyConfirmation(options.force);
 
-  await runStep(`Verifying production domain mapping ${config.domain.hostname}`, () => assertProductionDomainMappingOwned());
-  await runStep(`Deleting production domain mapping ${config.domain.hostname}`, () => deleteProductionDomainMapping());
+  await runStep(`Deleting auth resource server ${config.serviceName}`, () => deleteAuthResourceServer());
 
-  const services = await runStep("Finding Cloud Run services", () => listCloudRunServices());
-  const serviceNames = services.filter(matchesServiceResource);
+  if (plan.hasProductionDomainMapping) {
+    await runStep(`Deleting production domain mapping ${config.domain.hostname}`, () => deleteProductionDomainMapping());
+  }
+
+  const serviceNames = plan.serviceNames;
   await runStep("Deleting Cloud Run services", () => {
     for (const serviceName of serviceNames) {
       assertOwnedResource(`Cloud Run service ${serviceName}`, describeCloudRunService(serviceName));
@@ -53,8 +83,7 @@ export async function cleanup(args = Bun.argv.slice(2)) {
     }
   });
 
-  const secrets = await runStep("Finding service secrets", () => listSecrets());
-  const secretNames = secrets.filter(matchesSecretResource);
+  const secretNames = plan.secretNames;
   await runStep("Deleting service secrets", () => {
     for (const secretName of secretNames) {
       assertOwnedResource(`Secret ${secretName}`, describeSecret(secretName));
@@ -62,24 +91,15 @@ export async function cleanup(args = Bun.argv.slice(2)) {
     }
   });
 
-  try {
-    const neon = await runStep("Resolving Neon defaults", () => resolveNeonConfig());
-    const branches = await runStep("Finding Neon branches", () => listBranches(neon.projectId));
-    const disposableBranches = branches.filter(
-      (branch: { name: string }) =>
-        branch.name.startsWith(`${neon.previewBranchPrefix}-`) || branch.name.startsWith(`${neon.personalBranchPrefix}-`)
-    );
-
+  const neonPlan = plan.neon;
+  if (neonPlan) {
     await runStep("Deleting Neon preview and personal branches", async () => {
-      for (const branch of disposableBranches) {
-        await deleteBranch(neon.projectId, branch.id);
+      for (const branch of neonPlan.branches) {
+        await deleteBranch(neonPlan.projectId, branch.id);
       }
     });
 
-    await runStep("Deleting Neon service database", () => deleteDatabase(neon.projectId, neon.baseBranchId, neon.databaseName));
-  } catch (error) {
-    log.step("Skipping Neon cleanup because Neon is not configured");
-    log.step(error instanceof Error ? error.message : String(error));
+    await runStep("Deleting Neon service database", () => deleteDatabase(neonPlan.projectId, neonPlan.baseBranchId, neonPlan.databaseName));
   }
 
   await runStep("Deleting Grafana resources", async () => deleteGrafanaResources());
@@ -97,30 +117,144 @@ export async function cleanup(args = Bun.argv.slice(2)) {
   return `Destroy finished for ${config.serviceName}`;
 }
 
-async function deleteGrafanaResources() {
-  if (!(await Bun.file("./grafana").exists())) {
-    return "No grafana directory configured";
+async function buildDestroyPlan(destroyProject: boolean): Promise<DestroyPlan> {
+  const plan: DestroyPlan = {
+    resources: [
+      { label: `Auth resource server ${config.serviceName}`, detail: "stage prod" },
+      { label: `Runtime service account ${config.runtimeServiceAccount}`, detail: "if it exists" },
+    ],
+    skipped: [],
+    blockers: [],
+    hasProductionDomainMapping: false,
+    serviceNames: [],
+    secretNames: [],
+  };
+
+  planProductionDomainMapping(plan);
+  planCloudRunServices(plan);
+  planSecrets(plan);
+  await planNeon(plan);
+  await planGrafana(plan);
+
+  if (destroyProject) {
+    plan.resources.push({ label: `GCP project ${config.project.id}`, detail: "requested with --project" });
   }
-  if (!Bun.which("gcx")) {
-    return "gcx is not installed; Grafana resources were not deleted";
+
+  return plan;
+}
+
+function planProductionDomainMapping(plan: DestroyPlan) {
+  try {
+    const mapping = describeProductionDomainMapping();
+    if (!mapping) {
+      plan.skipped.push({ label: `Production domain mapping ${config.domain.hostname}`, detail: "not found" });
+      return;
+    }
+
+    const routeName = mapping.spec?.routeName;
+    if (routeName !== config.serviceName) {
+      plan.blockers.push(`${config.domain.hostname} maps to ${routeName || "an unknown service"}; refusing to delete ambiguous DNS mapping`);
+      return;
+    }
+
+    assertOwnedResource(`Cloud Run service ${routeName}`, describeCloudRunService(routeName));
+    plan.hasProductionDomainMapping = true;
+    plan.resources.push({ label: `Production domain mapping ${config.domain.hostname}`, detail: `routes to ${routeName}` });
+  } catch (error) {
+    plan.blockers.push(`Production domain mapping ${config.domain.hostname}: ${formatError(error)}`);
   }
+}
 
-  run("gcx", ["resources", "delete", "--path", "./grafana", "--yes", "--on-error", "ignore"]);
-  return "Grafana resources deleted from local manifests";
+function planCloudRunServices(plan: DestroyPlan) {
+  try {
+    plan.serviceNames = listCloudRunServices().filter(matchesServiceResource);
+    if (plan.serviceNames.length === 0) {
+      plan.skipped.push({ label: `Cloud Run services in ${config.project.id}/${config.region}`, detail: "none matched" });
+      return;
+    }
+    for (const serviceName of plan.serviceNames) {
+      plan.resources.push({ label: `Cloud Run service ${serviceName}`, detail: `${config.project.id}/${config.region}` });
+    }
+  } catch (error) {
+    plan.blockers.push(`Cloud Run services in ${config.project.id}/${config.region}: ${formatError(error)}`);
+  }
+}
+
+function planSecrets(plan: DestroyPlan) {
+  try {
+    plan.secretNames = listSecrets().filter(matchesSecretResource);
+    if (plan.secretNames.length === 0) {
+      plan.skipped.push({ label: `Secret Manager secrets in ${config.project.id}`, detail: "none matched" });
+      return;
+    }
+    for (const secretName of plan.secretNames) {
+      plan.resources.push({ label: `Secret Manager secret ${secretName}`, detail: config.project.id });
+    }
+  } catch (error) {
+    plan.blockers.push(`Secret Manager secrets in ${config.project.id}: ${formatError(error)}`);
+  }
+}
+
+async function planNeon(plan: DestroyPlan) {
+  try {
+    const neon = await resolveNeonConfig();
+    const branches = await listBranches(neon.projectId);
+    const disposableBranches = branches.filter(
+      (branch: { name: string }) =>
+        branch.name.startsWith(`${neon.previewBranchPrefix}-`) || branch.name.startsWith(`${neon.personalBranchPrefix}-`)
+    );
+
+    plan.neon = {
+      projectId: neon.projectId,
+      baseBranchId: neon.baseBranchId,
+      databaseName: neon.databaseName,
+      branches: disposableBranches,
+    };
+    plan.resources.push({ label: `Neon database ${neon.databaseName}`, detail: `${neon.projectId}/${neon.baseBranchName}` });
+    for (const branch of disposableBranches) {
+      plan.resources.push({ label: `Neon branch ${branch.name}`, detail: neon.projectId });
+    }
+  } catch (error) {
+    plan.skipped.push({ label: "Neon resources", detail: formatError(error) });
+  }
 }
 
-function assertProductionDomainMappingOwned() {
-  const mapping = describeProductionDomainMapping();
-  if (!mapping) {
+async function planGrafana(plan: DestroyPlan) {
+  if (!(await Bun.file("./grafana").exists())) {
+    plan.skipped.push({ label: "Grafana resources", detail: "no ./grafana directory" });
+    return;
+  }
+  if (!Bun.which("gcx")) {
+    plan.skipped.push({ label: "Grafana resources", detail: "gcx is not installed" });
     return;
   }
+  plan.resources.push({ label: "Grafana resources", detail: "./grafana manifests" });
+}
+
+function printDestroyPlan(plan: DestroyPlan) {
+  const lines = [
+    "Resources selected for destroy:",
+    ...plan.resources.map((resource) => `- ${resource.label}${resource.detail ? ` (${resource.detail})` : ""}`),
+  ];
+  if (plan.skipped.length > 0) {
+    lines.push("", "Skipped or not found:", ...plan.skipped.map((resource) => `- ${resource.label}${resource.detail ? ` (${resource.detail})` : ""}`));
+  }
+  if (plan.blockers.length > 0) {
+    lines.push("", "Discovery blockers:", ...plan.blockers.map((blocker) => `- ${blocker}`));
+  }
+  log.step(lines.join("\n"));
+}
 
-  const routeName = mapping.spec?.routeName;
-  if (routeName !== config.serviceName) {
-    throw new Error(`${config.domain.hostname} maps to ${routeName || "an unknown service"}; refusing to delete ambiguous DNS mapping`);
+async function deleteGrafanaResources() {
+  if (!(await Bun.file("./grafana").exists())) {
+    return "No grafana directory configured";
+  }
+  if (!Bun.which("gcx")) {
+    return "gcx is not installed; Grafana resources were not deleted";
   }
 
-  assertOwnedResource(`Cloud Run service ${routeName}`, describeCloudRunService(routeName));
+  run("gcx", ["resources", "delete", "--path", "./grafana", "--yes", "--on-error", "ignore"]);
+  return "Grafana resources deleted from local manifests";
 }
 
 async function requireDestroyConfirmation(force: boolean) {

package/templates/shared/scripts/cloudrun/cli.ts

@@ -2,7 +2,7 @@
 
 import { mkdir } from "node:fs/promises";
 import { ensureAuthResourceServer, runAuthCommand, runAuthDoctor } from "../authctl";
-import { bootstrap } from "./bootstrap";
+import { bootstrap, prepareGcpProject } from "./bootstrap";
 import { cleanup } from "./cleanup";
 import { deploy } from "./deploy";
 import { config } from "./config";
@@ -35,8 +35,9 @@ async function main(argv = Bun.argv.slice(2)) {
     await runMain("Create", async () => {
       assertServiceNameAvailable(config.serviceName);
       assertProductionDomainAvailable(config.serviceName);
+      await prepareGcpProject();
       await runStep("Registering auth resource server", () => ensureAuthResourceServer());
-      await bootstrap();
+      await bootstrap({ skipProjectSetup: true });
       const target = resolveDeploymentTarget("main");
       const databaseUrl = await runStep("Reading production database URL", () => accessSecretVersion(target.databaseSecretName));
       await runStep("Applying production migrations", () => runLanguageTask("migrate", { DATABASE_URL: databaseUrl }));

package/templates/shared/scripts/cloudrun/lib.ts

@@ -161,7 +161,8 @@ export function ensureProject() {
 }
 
 export function attachBilling() {
-  if (config.project.mode === "use_existing") {
+  const projectMode = config.project.mode as "create_new" | "use_existing";
+  if (projectMode === "use_existing") {
     return "Using existing project billing";
   }
   gcloud(["beta", "billing", "projects", "link", config.project.id, "--billing-account", config.project.billingAccount]);