create-svc 0.1.14 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",
@@ -50,8 +50,6 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.4.0",
-    "@google-cloud/billing": "^5.1.2",
-    "@google-cloud/resource-manager": "^6.2.2",
     "@neondatabase/api-client": "^2.7.1",
     "picocolors": "^1.1.1"
   }

package/src/cli.ts

@@ -1,16 +1,4 @@
-import {
-  autocomplete,
-  cancel,
-  confirm,
-  intro,
-  isCancel,
-  log,
-  note,
-  outro,
-  select,
-  spinner,
-  text,
-} from "@clack/prompts";
+import { autocomplete, cancel, intro, isCancel, log, note, outro, select, spinner, text } from "@clack/prompts";
 import pc from "picocolors";
 import { readdirSync } from "node:fs";
 import { basename, dirname, resolve } from "node:path";
@@ -68,7 +56,25 @@ type DiscoveryState = {
   warnings: string[];
 };
 
+type GcpSelection = {
+  mode: GcpProjectMode;
+  projectId: string;
+  projectName: string;
+};
+
+type InteractiveStep = "serviceName" | "target" | "runtime" | "framework" | "modulePath" | "gcp" | "confirm";
+
+type InteractiveState = {
+  serviceName?: string;
+  target?: DeployTarget;
+  runtime?: Runtime;
+  framework?: Framework;
+  modulePath?: string;
+  gcpSelection?: GcpSelection;
+};
+
 const DEFAULT_REGION = "us-west1";
+const BACK = "__back__" as const;
 
 export async function run(argv: string[]) {
   try {
@@ -376,9 +382,11 @@ export function parseArgs(argv: string[]): ParsedArgs {
 
 export async function resolveConfig(args: ParsedArgs): Promise<ScaffoldConfig> {
   const inferredName = slugify(args.serviceName ?? basename(args.directory ?? "my-service"));
-  const serviceName = args.yes
-    ? inferredName
-    : await promptText("Service name", inferredName, (value) => validateServiceNameInput(value, args.directory));
+  if (!args.yes) {
+    return resolveInteractiveConfig(args, inferredName);
+  }
+
+  const serviceName = inferredName;
   const directory = args.directory ?? serviceName;
   const targetDir = resolve(process.cwd(), directory);
   await assertTargetDirectoryIsEmpty(targetDir);
@@ -392,22 +400,14 @@ export async function resolveConfig(args: ParsedArgs): Promise<ScaffoldConfig> {
   const modulePath = await resolveModulePath(args, runtime, defaults.modulePath);
   const discovery = await waitForDiscovery(discoveryPromise);
   const gcpSelection = await resolveGcpSelection(args, defaults, discovery);
+  if (gcpSelection === BACK) {
+    throw new Error("Unexpected back navigation in non-interactive config");
+  }
   const region = args.region ?? DEFAULT_REGION;
   const billingAccount = chooseBillingAccount(args.billingAccount, discovery.billingAccounts);
   const autoDeploy = resolveAutoDeploy(args.autoDeploy);
   const git = buildGitBootstrapConfig(serviceName, args.noGit);
 
-  if (!args.yes) {
-    const okay = await confirm({
-      message: "Create the scaffold with these defaults?",
-      initialValue: true,
-    });
-    if (isCancel(okay) || !okay) {
-      cancel("Aborted");
-      process.exit(1);
-    }
-  }
-
   for (const warning of discovery.warnings) {
     log.warn(warning);
   }
@@ -434,6 +434,226 @@ export async function resolveConfig(args: ParsedArgs): Promise<ScaffoldConfig> {
   };
 }
 
+async function resolveInteractiveConfig(args: ParsedArgs, initialServiceName: string): Promise<ScaffoldConfig> {
+  const state: InteractiveState = {
+    serviceName: args.serviceName ? slugify(args.serviceName) : undefined,
+    target: args.target,
+    runtime: args.runtime,
+    framework: args.framework,
+    modulePath: args.modulePath,
+  };
+  let serviceNameDraft = state.serviceName ?? initialServiceName;
+  let discovery: DiscoveryState | undefined;
+  const discoveryPromise = discoverCloudInputs();
+  let step: InteractiveStep = state.serviceName ? "target" : "serviceName";
+
+  while (true) {
+    if (step === "serviceName") {
+      const value = await promptText("Service name", serviceNameDraft, (input) => validateServiceNameInput(input, args.directory));
+      serviceNameDraft = value;
+      state.serviceName = value;
+      step = "target";
+      continue;
+    }
+
+    if (!state.serviceName) {
+      step = "serviceName";
+      continue;
+    }
+
+    const defaults = deriveDefaults(state.serviceName);
+
+    if (step === "target") {
+      if (args.target) {
+        state.target = args.target;
+      } else {
+        const value = await promptSelectWithBack<DeployTarget>(
+          "Deploy target",
+          [
+            { value: "cloudrun", label: "Cloud Run", hint: "Default" },
+            { value: "workers", label: "Cloudflare Workers" },
+          ],
+          "cloudrun",
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.target = value;
+        state.runtime = undefined;
+        state.framework = undefined;
+      }
+      step = "runtime";
+      continue;
+    }
+
+    if (step === "runtime") {
+      if (!state.target) {
+        step = "target";
+        continue;
+      }
+      if (state.target === "workers") {
+        state.runtime = "bun";
+      } else if (args.runtime) {
+        state.runtime = args.runtime;
+      } else {
+        const value = await promptSelectWithBack<Runtime>(
+          "Runtime",
+          [
+            { value: "go", label: "Go", hint: "Default" },
+            { value: "bun", label: "Bun" },
+          ],
+          "go",
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.runtime = value;
+        state.framework = undefined;
+      }
+      step = "framework";
+      continue;
+    }
+
+    if (step === "framework") {
+      if (!state.target || !state.runtime) {
+        step = state.target ? "runtime" : "target";
+        continue;
+      }
+      const allowed = frameworksForTargetRuntime(state.target, state.runtime);
+      if (args.framework) {
+        if (!allowed.some((framework) => framework === args.framework)) {
+          throw new Error(`Framework ${args.framework} is not valid for target ${state.target} and runtime ${state.runtime}`);
+        }
+        state.framework = args.framework;
+      } else {
+        const value = await promptSelectWithBack<Framework>(
+          "Framework",
+          allowed.map((framework, index) => ({
+            value: framework,
+            label: framework,
+            hint: index === 0 ? "Default" : undefined,
+          })),
+          allowed[0],
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.framework = value;
+      }
+      step = "modulePath";
+      continue;
+    }
+
+    if (step === "modulePath") {
+      if (!state.runtime) {
+        step = "runtime";
+        continue;
+      }
+      if (state.runtime !== "go") {
+        state.modulePath = args.modulePath ?? defaults.modulePath;
+      } else if (args.modulePath) {
+        state.modulePath = args.modulePath.trim();
+      } else {
+        const value = await promptTextWithBack(
+          "Go module path",
+          state.modulePath ?? defaults.modulePath,
+          (input) => {
+            if (!input.trim()) {
+              return "Go module path is required";
+            }
+            return true;
+          },
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.modulePath = value;
+      }
+      step = "gcp";
+      continue;
+    }
+
+    if (step === "gcp") {
+      discovery ??= await waitForDiscovery(discoveryPromise);
+      const value = await resolveGcpSelection(args, defaults, discovery, {
+        allowBack: Boolean(previousPromptStep(step, args, state)),
+      });
+      if (value === BACK) {
+        step = previousPromptStep(step, args, state) ?? step;
+        continue;
+      }
+      state.gcpSelection = value;
+      step = "confirm";
+      continue;
+    }
+
+    if (step === "confirm") {
+      if (!state.target || !state.runtime || !state.framework || !state.modulePath || !state.gcpSelection) {
+        step = "serviceName";
+        continue;
+      }
+      const value = await promptSelectWithBack<"create">(
+        "Create the scaffold with these defaults?",
+        [{ value: "create", label: "Create scaffold", hint: "Default" }],
+        "create",
+        step,
+        args,
+        state
+      );
+      if (value === BACK) {
+        step = previousPromptStep(step, args, state) ?? step;
+        continue;
+      }
+
+      const directory = args.directory ?? state.serviceName;
+      const targetDir = resolve(process.cwd(), directory);
+      await assertTargetDirectoryIsEmpty(targetDir);
+      const billingAccount = chooseBillingAccount(args.billingAccount, discovery?.billingAccounts ?? []);
+
+      for (const warning of discovery?.warnings ?? []) {
+        log.warn(warning);
+      }
+
+      return {
+        directory,
+        serviceName: state.serviceName,
+        modulePath: state.modulePath,
+        target: state.target,
+        runtime: state.runtime,
+        framework: state.framework,
+        profile: args.profile,
+        region: args.region ?? DEFAULT_REGION,
+        gcpProjectMode: state.gcpSelection.mode,
+        gcpProject: state.gcpSelection.projectId,
+        gcpProjectName: state.gcpSelection.projectName,
+        billingAccount,
+        quotaProjectId: args.quotaProjectId ?? QUOTA_PROJECT_DEFAULT,
+        autoDeploy: resolveAutoDeploy(args.autoDeploy),
+        git: buildGitBootstrapConfig(state.serviceName, args.noGit),
+        neonDatabaseName: defaults.neonDatabaseName,
+        apiHostname: defaults.apiHostname,
+        generatorRoot: resolve(dirname(fileURLToPath(import.meta.url)), ".."),
+      };
+    }
+  }
+}
+
 async function waitForDiscovery(discoveryPromise: Promise<DiscoveryState>) {
   const indicator = spinner();
   indicator.start("Discovering GCP defaults");
@@ -561,8 +781,9 @@ async function resolveModulePath(args: ParsedArgs, runtime: Runtime, initialValu
 async function resolveGcpSelection(
   args: ParsedArgs,
   defaults: ReturnType<typeof deriveDefaults>,
-  discovery: DiscoveryState
-) {
+  discovery: DiscoveryState,
+  options: { allowBack?: boolean } = {}
+): Promise<GcpSelection | typeof BACK> {
   if (args.gcpProjectMode && args.gcpProject) {
     const existing = discovery.projects.find((project) => matchesProject(project, args.gcpProject ?? ""));
     return {
@@ -601,6 +822,15 @@ async function resolveGcpSelection(
     message: "GCP project",
     initialValue: "create_new",
     options: [
+      ...(options.allowBack
+        ? [
+            {
+              value: BACK,
+              label: "Back",
+              hint: "Return to previous step",
+            },
+          ]
+        : []),
       {
         value: "create_new",
         label: `Create new project: ${defaults.projectName} (${defaults.projectId})`,
@@ -620,6 +850,10 @@ async function resolveGcpSelection(
     process.exit(1);
   }
 
+  if (mode === BACK) {
+    return BACK;
+  }
+
   if (mode === "create_new") {
     return {
       mode: "create_new" as const,
@@ -632,7 +866,10 @@ async function resolveGcpSelection(
     throw new Error("No existing GCP projects were discovered");
   }
 
-  const selected = await promptForExistingProject(discovery.projects);
+  const selected = await promptForExistingProject(discovery.projects, options);
+  if (selected === BACK) {
+    return BACK;
+  }
   if (!selected) {
     return resolveGcpSelection(
       {
@@ -641,7 +878,8 @@ async function resolveGcpSelection(
         gcpProject: undefined,
       },
       defaults,
-      discovery
+      discovery,
+      options
     );
   }
 
@@ -717,6 +955,108 @@ async function promptText(
   return value.trim();
 }
 
+async function promptTextWithBack(
+  message: string,
+  initialValue: string,
+  validate: (value: string) => true | string,
+  step: InteractiveStep,
+  args: ParsedArgs,
+  state: InteractiveState
+): Promise<string | typeof BACK> {
+  const allowBack = Boolean(previousPromptStep(step, args, state));
+  const value = await text({
+    message: allowBack ? `${message} (type "back" to return)` : message,
+    initialValue,
+    validate: (input) => {
+      const normalized = (input ?? "").trim().toLowerCase();
+      if (allowBack && (normalized === "back" || normalized === "<")) {
+        return undefined;
+      }
+      return normalizeValidationResult(validate((input ?? "").trim()));
+    },
+  });
+
+  if (isCancel(value)) {
+    cancel("Aborted");
+    process.exit(1);
+  }
+
+  const trimmed = value.trim();
+  if (allowBack && (trimmed.toLowerCase() === "back" || trimmed === "<")) {
+    return BACK;
+  }
+
+  return trimmed;
+}
+
+async function promptSelectWithBack<Value extends string>(
+  message: string,
+  options: Array<{ value: Value; label?: string; hint?: string; disabled?: boolean }>,
+  initialValue: Value | undefined,
+  step: InteractiveStep,
+  args: ParsedArgs,
+  state: InteractiveState
+): Promise<Value | typeof BACK> {
+  const allowBack = Boolean(previousPromptStep(step, args, state));
+  const value = await select<Value | typeof BACK>({
+    message,
+    initialValue,
+    options: [
+      ...(allowBack
+        ? [
+            {
+              value: BACK,
+              label: "Back",
+              hint: "Return to previous step",
+            },
+          ]
+        : []),
+      ...options,
+    ] as any,
+  });
+
+  if (isCancel(value)) {
+    cancel("Aborted");
+    process.exit(1);
+  }
+
+  return value;
+}
+
+function previousPromptStep(step: InteractiveStep, args: ParsedArgs, state: InteractiveState): InteractiveStep | undefined {
+  const steps: InteractiveStep[] = ["serviceName", "target", "runtime", "framework", "modulePath", "gcp", "confirm"];
+  const currentIndex = steps.indexOf(step);
+  for (let index = currentIndex - 1; index >= 0; index -= 1) {
+    const candidate = steps[index];
+    if (candidate && isPromptableStep(candidate, args, state)) {
+      return candidate;
+    }
+  }
+  return undefined;
+}
+
+function isPromptableStep(step: InteractiveStep, args: ParsedArgs, state: InteractiveState) {
+  if (step === "serviceName") {
+    return !args.serviceName;
+  }
+  if (step === "target") {
+    return !args.target;
+  }
+  if (step === "runtime") {
+    return state.target !== "workers" && !args.runtime;
+  }
+  if (step === "framework") {
+    return !args.framework;
+  }
+  if (step === "modulePath") {
+    return state.runtime === "go" && !args.modulePath;
+  }
+  if (step === "gcp") {
+    return !args.gcpProjectMode;
+  }
+  return step === "confirm";
+}
+
 function formatError(error: unknown) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -731,17 +1071,21 @@ function handleCliError(error: unknown) {
   process.exit(1);
 }
 
-async function promptForExistingProject(projects: GcpProject[]) {
+async function promptForExistingProject(projects: GcpProject[], options: { allowBack?: boolean } = {}) {
   const value = await autocomplete({
     message: "Existing GCP project",
     placeholder: "Search by project name or id",
     maxItems: 10,
     options: [
-      {
-        value: "__back__",
-        label: "Back",
-        hint: "Return to project mode",
-      },
+      ...(options.allowBack
+        ? [
+            {
+              value: BACK,
+              label: "Back",
+              hint: "Return to project mode",
+            },
+          ]
+        : []),
       ...projects.map((project) => ({
         value: project.projectId,
         label: project.name,
@@ -755,8 +1099,8 @@ async function promptForExistingProject(projects: GcpProject[]) {
     process.exit(1);
   }
 
-  if (value === "__back__") {
-    return undefined;
+  if (value === BACK) {
+    return BACK;
   }
 
   const project = projects.find((candidate) => candidate.projectId === value);

package/src/gcp.ts

@@ -1,6 +1,3 @@
-import { CloudBillingClient } from "@google-cloud/billing";
-import { ProjectsClient } from "@google-cloud/resource-manager";
-
 export type GcpProject = {
   projectId: string;
   name: string;
@@ -20,58 +17,29 @@ export type GcpApi = {
   attachBillingAccount(projectId: string, billingAccountName: string): Promise<void>;
 };
 
-export function createGcpApi(
-  projectsClient = new ProjectsClient(),
-  billingClient = new CloudBillingClient()
-): GcpApi {
+export function createGcpApi(): GcpApi {
   return {
     async listProjects() {
-      const projects: GcpProject[] = [];
-      for await (const project of projectsClient.searchProjectsAsync({}, { autoPaginate: false })) {
-        projects.push({
-          projectId: project.projectId ?? "",
-          name: project.displayName ?? project.projectId ?? "",
-          lifecycleState: `${project.state ?? ""}`,
-        });
-      }
-
-      return projects
-        .filter((project) => project.projectId && project.lifecycleState !== "DELETE_REQUESTED")
-        .sort((left, right) => left.name.localeCompare(right.name));
+      return parseJson<GcpProject[]>(
+        runGcloud(["projects", "list", "--format=json(projectId,name,lifecycleState)"]).stdout,
+        "GCP project discovery"
+      );
     },
 
     async listBillingAccounts() {
-      const accounts: BillingAccount[] = [];
-      for await (const account of billingClient.listBillingAccountsAsync({}, { autoPaginate: false })) {
-        accounts.push({
-          name: account.name ?? "",
-          displayName: account.displayName ?? account.name ?? "",
-          open: Boolean(account.open),
-        });
-      }
-
-      return accounts
-        .filter((account) => account.name && account.open)
-        .sort((left, right) => left.displayName.localeCompare(right.displayName));
+      return parseJson<BillingAccount[]>(
+        runGcloud(["billing", "accounts", "list", "--format=json(name,displayName,open)"]).stdout,
+        "billing account discovery"
+      );
     },
 
     async createProject(projectId: string, name: string) {
-      const [operation] = await projectsClient.createProject({
-        project: {
-          projectId,
-          displayName: name,
-        },
-      });
-      await operation.promise();
+      runGcloud(["projects", "create", projectId, "--name", name]);
     },
 
     async attachBillingAccount(projectId: string, billingAccountName: string) {
-      await billingClient.updateProjectBillingInfo({
-        name: `projects/${projectId}`,
-        projectBillingInfo: {
-          billingAccountName,
-        },
-      });
+      const account = billingAccountName.replace(/^billingAccounts\//, "");
+      runGcloud(["billing", "projects", "link", projectId, "--billing-account", account]);
     },
   };
 }
@@ -95,3 +63,26 @@ export async function createProject(projectId: string, name: string, api = creat
 export async function attachBillingAccount(projectId: string, billingAccountName: string, api = createGcpApi()) {
   await api.attachBillingAccount(projectId, billingAccountName);
 }
+
+function runGcloud(args: string[]) {
+  const result = Bun.spawnSync(["gcloud", ...args], {
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+
+  if (result.exitCode !== 0) {
+    throw new Error(result.stderr.toString().trim() || `gcloud ${args.join(" ")} failed`);
+  }
+
+  return {
+    stdout: result.stdout.toString(),
+  };
+}
+
+function parseJson<T>(value: string, label: string): T {
+  try {
+    return JSON.parse(value) as T;
+  } catch (error) {
+    throw new Error(`Unable to parse ${label} output: ${(error as Error).message}`);
+  }
+}

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`;
     }
@@ -87,6 +101,25 @@ export function ensureAuthResourceServer() {
   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",
+  ]);
+  return `Auth resource server deleted: ${serviceConfig.auth.resource_server.id}`;
+}
+
 export function runAuthDoctor(): AuthDoctorResult {
   if (!authctlPath()) {
     return {
@@ -185,7 +218,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 +235,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",
@@ -216,7 +249,7 @@ function authctl(args: string[], options: { allowFailure?: boolean; quiet?: bool
   };
 
   if (!output.success && !options.allowFailure) {
-    throw new Error(`authctl ${args.join(" ")} failed with exit code ${output.exitCode}\n${output.stderr || output.stdout}`);
+    throw new Error(formatAuthctlFailure(args, output));
   }
 
   if (output.stdout && !options.quiet) {
@@ -226,6 +259,76 @@ function authctl(args: string[], options: { allowFailure?: boolean; quiet?: bool
   return output;
 }
 
+function formatAuthctlFailure(args: string[], output: CommandResult) {
+  const detail = output.stderr || output.stdout;
+  if (detail.includes("status_code\":401") || detail.includes("Forbidden. You don't have permission")) {
+    return [
+      `authctl ${args.join(" ")} failed with exit code ${output.exitCode}`,
+      "authctl reached the auth internal API, but Cloudflare Access rejected the request.",
+      "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");
+  }
+
+  return `authctl ${args.join(" ")} failed with exit code ${output.exitCode}\n${detail}`;
+}
+
 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/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/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]);