hatchkit 0.1.47 → 0.2.2

package/dist/adopt.d.ts

@@ -1,4 +1,5 @@
-import type { Feature } from "./prompts.js";
+import type { DeploymentMode, Feature, Surface } from "./prompts.js";
+import { type ProvisionService } from "./provision/index.js";
 import { type ProjectManifest } from "./scaffold/manifest.js";
 export interface DetectedState {
     /** Absolute path to the project root. */
@@ -74,9 +75,68 @@ export interface DetectedState {
      *  the user already chose, instead of starting from blank. */
     existingManifest?: ProjectManifest;
 }
+type AdoptSurface = Surface;
+type AdoptDeploymentMode = DeploymentMode;
+export interface AdoptPlan {
+    name: string;
+    domain: string;
+    /** One-liner that ends up on the Coolify project + application
+     *  pages (instead of the generic "Adopted by hatchkit" blurb).
+     *  Empty string means "no override" — wireProjectIntoCoolify will
+     *  use the default on first create and leave any existing
+     *  description untouched on reconcile. */
+    description: string;
+    features: Feature[];
+    /** What kind of project this is — drives where env files go, which
+     *  Coolify build-pack we ask for, and which surfaces `hatchkit add`
+     *  provisions clients into. */
+    surfaces: AdoptSurface;
+    /** Where this project will run. Coolify is the default for full-
+     *  stack and server-only adopts; gh-pages is only offered when
+     *  surfaces is client-only (Pages can't host a backend). Switches
+     *  the second half of executePlan from Coolify wiring to
+     *  `runPagesSetupProgrammatic`. */
+    deploymentMode: AdoptDeploymentMode;
+    /** Required when `surfaces !== "client-only"`. */
+    serverDir?: string;
+    /** Required when `surfaces !== "server-only"`. */
+    clientDir?: string;
+    /** Always-on side effect — initialize dotenvx encryption if the
+     *  server dir doesn't already have an encrypted .env.production. */
+    bootstrapDotenvx: boolean;
+    /** Initialize git + create a GitHub remote (private repo). Skipped
+     *  silently when a remote already exists. */
+    setupGitHub: boolean;
+    /** Wire the repo into the user's existing Coolify + DNS via direct
+     *  API calls (no Terraform / no submodule). Defaults ON when there's
+     *  no Coolify app match yet. */
+    wireCoolify: boolean;
+    /** Whether to treat the GitHub repo as private when wiring Coolify.
+     *  Private → Coolify clones via the configured GitHub App's SSH
+     *  deploy key. Public → Coolify clones via HTTPS, no auth needed.
+     *  Defaulted from `gh repo view --json visibility` when the remote
+     *  exists; defaults to true when adopt is creating a fresh
+     *  `--private` repo. Picking the wrong value is the #1 cause of
+     *  "Permission denied (publickey)" deploy failures, hence its own
+     *  stepper row instead of being silently inferred from setupGitHub. */
+    isPrivate: boolean;
+    /** Container port the app exposes — defaults to "3000". */
+    appPort: string;
+    /** Scaffold the build pipeline (Dockerfile + docker-compose.yml +
+     *  .github/workflows/deploy.yml) when those files don't exist yet.
+     *  Always coupled with wireCoolify since the compose file is what
+     *  Coolify reads. The detection step ensures this is a no-op when
+     *  the user already has their own. */
+    scaffoldBuildPipeline: boolean;
+    /** Provisioning to run after manifest write. */
+    services: ProvisionService[];
+    /** Push dotenvx key to Coolify after everything's written. */
+    pushKey: boolean;
+}
 export declare function runAdopt(cwd: string, opts?: {
     resume?: boolean;
     regeneratePipeline?: boolean;
 }): Promise<void>;
 export declare function detectProject(projectDir: string): Promise<DetectedState>;
+export {};
 //# sourceMappingURL=adopt.d.ts.map

package/dist/adopt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adopt.d.ts","sourceRoot":"","sources":["../src/adopt.ts"],"names":[],"mappings":"AAkDA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,cAAc,CAAC;AAIxD,OAAO,EAEL,KAAK,eAAe,EAGrB,MAAM,wBAAwB,CAAC;AAoBhC,MAAM,WAAW,aAAa;IAC5B,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;iEAE6D;IAC7D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;uEACmE;IACnE,WAAW,EAAE,OAAO,CAAC;IACrB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;oCAWgC;IAChC,sBAAsB,EAAE,OAAO,CAAC;IAChC;;;;;qDAKiD;IACjD,yBAAyB,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,kBAAkB,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC/E,yEAAyE;IACzE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB;8DAC0D;IAC1D,kBAAkB,EAAE,OAAO,CAAC;IAC5B,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IACpB,sCAAsC;IACtC,eAAe,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD;;oCAEgC;IAChC,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;6BAGyB;IACzB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,0CAA0C;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;sDAGkD;IAClD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;kEAE8D;IAC9D,gBAAgB,CAAC,EAAE,eAAe,CAAC;CACpC;AA+DD,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5D,OAAO,CAAC,IAAI,CAAC,CA6Lf;AAMD,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAkM9E"}
+{"version":3,"file":"adopt.d.ts","sourceRoot":"","sources":["../src/adopt.ts"],"names":[],"mappings":"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"}

package/dist/adopt.js

@@ -35,13 +35,15 @@
  */
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join, relative } from "node:path";
-import { Separator, confirm, input, select } from "@inquirer/prompts";
+import { confirm, input, select } from "@inquirer/prompts";
 import chalk from "chalk";
 import { ensureGitHub, getCoolifyConfig, getGhcrConfig } from "./config.js";
 import { ghSecretExists, ownerFromRemote, repoSlugFromRemote, setCoolifyDeploySecrets, } from "./deploy/gh-actions-secrets.js";
 import { pushInitialBranch } from "./deploy/github.js";
 import { pushProjectKeyToCoolify, pushProjectKeyToGh } from "./deploy/keys.js";
 import { handleAdoptFailure } from "./deploy/rollback.js";
+import { adoptPlanToOnboardingPlan, onboardingPlanToAdoptPlan, renderOnboardingDeploymentModeSummary, renderOnboardingSurfaceSummary, summarizeOnboardingDomain, summarizeOnboardingFeatures, } from "./onboarding/plan.js";
+import { runProjectOnboardingReview, } from "./onboarding/review.js";
 import { runProvision } from "./provision/index.js";
 import { readEnvKeys } from "./provision/write-env.js";
 import { detectBuildPipeline, scaffoldBuildPipeline } from "./scaffold/build-pipeline.js";
@@ -152,7 +154,7 @@ export async function runAdopt(cwd, opts = {}) {
         // the cursor on the row in this case so the choice is explicit.
         scaffoldBuildPipeline: !state.unknownWorkspaceLayout,
         // Provisioning is opt-in. Each service mints real resources on a
-        // third-party (GlitchTip project, OpenPanel project, Resend API
+        // third-party (GlitchTip project, OpenPanel project, Plausible site, Resend API
         // key) and cleaning those up after the fact is a chore — better
         // to require an explicit tick than to surprise the user with three
         // new clients they didn't ask for. The user opens the "Provision
@@ -517,7 +519,9 @@ function detectFeatures(projectDir, serverDir) {
             "@sentry/nextjs" in deps ||
             "@openpanel/web" in deps ||
             "@openpanel/sdk" in deps ||
-            "@openpanel/nextjs" in deps) {
+            "@openpanel/nextjs" in deps ||
+            "plausible-tracker" in deps ||
+            "next-plausible" in deps) {
             found.add("analytics");
         }
         if ("@aws-sdk/client-s3" in deps || "minio" in deps)
@@ -541,7 +545,7 @@ function detectFeatures(projectDir, serverDir) {
             found.add("stripe");
         if (/REDIS_URL/.test(text))
             found.add("websocket");
-        if (/GLITCHTIP_DSN|SENTRY_DSN|OPENPANEL_/.test(text))
+        if (/GLITCHTIP_DSN|SENTRY_DSN|OPENPANEL_|PLAUSIBLE_/.test(text))
             found.add("analytics");
         if (/S3_BUCKET|S3_ENDPOINT/.test(text))
             found.add("s3");
@@ -610,66 +614,46 @@ function printDetected(state) {
     console.log();
 }
 async function reviewLoop(state, initial) {
-    let plan = initial;
-    console.log(chalk.dim("  Step through each row to confirm or change. Choose 'Adopt' when ready.\n"));
-    for (;;) {
-        const groups = buildAdoptGroups(state, plan);
-        const allSteps = groups.flatMap((g) => g.steps);
-        const firstUnset = allSteps.find((s) => !s.set);
-        const defaultKey = firstUnset?.key ?? "__adopt__";
-        const choices = [];
-        for (const group of groups) {
-            choices.push(new Separator(chalk.bold(`── ${group.title} ──`)));
-            for (const step of group.steps) {
-                const mark = step.set ? chalk.green("✓") : chalk.dim("·");
-                choices.push({
-                    name: `${mark}  ${step.label.padEnd(18)}${chalk.dim(` — ${step.summary}`)}`,
-                    value: step.key,
-                });
-            }
-        }
-        choices.push(new Separator(" "));
-        choices.push({
-            name: chalk.bold(chalk.green("✓  Adopt — apply changes")),
-            value: "__adopt__",
-        });
-        choices.push({ name: chalk.dim("✗  Cancel"), value: "__cancel__" });
-        const picked = await select({
-            message: "Next step:",
-            default: defaultKey,
-            pageSize: Math.min(30, choices.length),
-            choices,
-        });
-        if (picked === "__adopt__")
-            return plan;
-        if (picked === "__cancel__") {
-            console.log(chalk.dim("\n  Cancelled. Nothing was changed.\n"));
-            throw new Error("Adopt cancelled by user");
-        }
-        plan = await editAdoptStep(state, plan, picked);
-    }
+    let latestPlan = initial;
+    const reviewedPlan = await runProjectOnboardingReview({
+        initial: adoptPlanToOnboardingPlan(initial, state),
+        intro: chalk.dim("  Step through each row to confirm or change. Choose 'Adopt' when ready.\n"),
+        proceedLabel: "Adopt — apply changes",
+        cancelLabel: "Cancel",
+        cancelMessage: chalk.dim("\n  Cancelled. Nothing was changed.\n"),
+        buildGroups: (plan) => buildAdoptGroups(state, plan, onboardingPlanToAdoptPlan(plan, latestPlan, state)),
+        editStep: async (plan, picked) => {
+            const currentPlan = onboardingPlanToAdoptPlan(plan, latestPlan, state);
+            latestPlan = await editAdoptStep(state, currentPlan, picked);
+            return adoptPlanToOnboardingPlan(latestPlan, state);
+        },
+    });
+    return onboardingPlanToAdoptPlan(reviewedPlan, latestPlan, state);
 }
-function buildAdoptGroups(state, plan) {
+function buildAdoptGroups(state, onboarding, plan) {
     return [
         {
             title: "Project",
             steps: [
-                { key: "name", label: "Project name", set: !!plan.name, summary: plan.name || "(unset)" },
+                {
+                    key: "name",
+                    label: "Project name",
+                    set: !!onboarding.identity.name,
+                    summary: onboarding.identity.name || "(unset)",
+                },
                 {
                     key: "domain",
                     label: "Domain",
-                    set: !!plan.domain,
-                    summary: plan.domain
-                        ? `${plan.domain}  ${chalk.dim("→")}  https://${plan.domain}`
-                        : "(unset)",
+                    set: !!onboarding.identity.domain,
+                    summary: summarizeOnboardingDomain(onboarding),
                 },
                 (() => {
                     // Description is optional — empty is a valid choice that
                     // falls back to the generic "Adopted by hatchkit" blurb.
                     // We always render it as `set: true` so the cursor doesn't
                     // park on it; the user opens it explicitly when they care.
-                    const summary = plan.description
-                        ? truncate(plan.description, 60)
+                    const summary = onboarding.identity.description
+                        ? truncate(onboarding.identity.description, 60)
                         : state.packageDescription
                             ? chalk.dim(`(empty — defaults from package.json: "${truncate(state.packageDescription, 40)}")`)
                             : chalk.dim('(empty — defaults to "Adopted by hatchkit")');
@@ -694,11 +678,7 @@ function buildAdoptGroups(state, plan) {
                     const hasManifestSurfaces = !!state.existingManifest?.surfaces;
                     const detectionWasDefinitive = !!(state.serverDir || state.clientDir);
                     const inferred = !hasManifestSurfaces && !detectionWasDefinitive;
-                    const baseSummary = plan.surfaces === "server-only"
-                        ? "server only (backend / API)"
-                        : plan.surfaces === "client-only"
-                            ? "client only (static / SPA — no backend)"
-                            : "server + client";
+                    const baseSummary = renderOnboardingSurfaceSummary(onboarding.layout.surfaces);
                     return {
                         key: "surfaces",
                         label: "Surfaces",
@@ -710,23 +690,27 @@ function buildAdoptGroups(state, plan) {
                 // the chosen surface. Hiding instead of greying-out keeps the
                 // stepper consistent with the surfaces choice and avoids the
                 // "checkmark on a thing I can't unset" UX trap.
-                ...(plan.surfaces !== "client-only"
+                ...(onboarding.layout.surfaces !== "client-only"
                     ? [
                         {
                             key: "serverDir",
                             label: "Server env dir",
-                            set: !!plan.serverDir,
-                            summary: plan.serverDir ? relativeTo(plan.serverDir) : "(unset)",
+                            set: !!onboarding.layout.serverDir,
+                            summary: onboarding.layout.serverDir
+                                ? relativeTo(onboarding.layout.serverDir)
+                                : "(unset)",
                         },
                     ]
                     : []),
-                ...(plan.surfaces !== "server-only"
+                ...(onboarding.layout.surfaces !== "server-only"
                     ? [
                         {
                             key: "clientDir",
                             label: "Client env dir",
-                            set: !!plan.clientDir,
-                            summary: plan.clientDir ? relativeTo(plan.clientDir) : "(unset)",
+                            set: !!onboarding.layout.clientDir,
+                            summary: onboarding.layout.clientDir
+                                ? relativeTo(onboarding.layout.clientDir)
+                                : "(unset)",
                         },
                     ]
                     : []),
@@ -739,7 +723,7 @@ function buildAdoptGroups(state, plan) {
                     key: "features",
                     label: "Features",
                     set: true,
-                    summary: plan.features.length > 0 ? plan.features.join(", ") : chalk.dim("none"),
+                    summary: summarizeOnboardingFeatures(onboarding.provisioning.features),
                 },
             ],
         },
@@ -750,7 +734,7 @@ function buildAdoptGroups(state, plan) {
                     key: "bootstrapDotenvx",
                     label: "Initialize dotenvx",
                     set: true,
-                    summary: plan.bootstrapDotenvx
+                    summary: onboarding.env.bootstrapDotenvx
                         ? state.prodEnvIsEncrypted
                             ? chalk.dim("already encrypted — will skip")
                             : "yes — generate keypair + encrypt .env.production"
@@ -760,7 +744,7 @@ function buildAdoptGroups(state, plan) {
                     key: "setupGitHub",
                     label: "GitHub remote",
                     set: true,
-                    summary: plan.setupGitHub
+                    summary: onboarding.repo.setupGitHub
                         ? state.gitRemoteUrl
                             ? chalk.dim("already set — will skip")
                             : "yes — `gh repo create` + push"
@@ -774,7 +758,7 @@ function buildAdoptGroups(state, plan) {
         // configures the redeploy webhook + builds an image). gh-pages
         // ships its own workflow that uploads to Pages instead, so we
         // hide this group when the user picks Pages.
-        ...(plan.deploymentMode === "coolify"
+        ...(onboarding.deployment.mode === "coolify"
             ? [
                 {
                     title: "Build pipeline",
@@ -801,11 +785,11 @@ function buildAdoptGroups(state, plan) {
                     key: "deploymentMode",
                     label: "Deployment mode",
                     set: true,
-                    summary: renderAdoptDeploymentModeSummary(plan.deploymentMode, plan.surfaces),
+                    summary: renderOnboardingDeploymentModeSummary(onboarding.deployment.mode, onboarding.layout.surfaces),
                 },
                 // Coolify-specific rows — only shown when actually deploying
                 // to Coolify. gh-pages skips this branch entirely.
-                ...(plan.deploymentMode === "coolify"
+                ...(onboarding.deployment.mode === "coolify"
                     ? [
                         (() => {
                             // Visibility row. Picking the wrong path here is the #1
@@ -861,12 +845,14 @@ function buildAdoptGroups(state, plan) {
                     key: "services",
                     label: "Provision clients",
                     set: true,
-                    summary: plan.services.length > 0 ? plan.services.join(", ") : chalk.dim("skip provisioning"),
+                    summary: onboarding.provisioning.services.length > 0
+                        ? onboarding.provisioning.services.join(", ")
+                        : chalk.dim("skip provisioning"),
                 },
                 // `pushKey` only matters when a Coolify app is the deploy
                 // target — Pages reads no secrets from a Coolify env, so the
                 // row would just be noise on the gh-pages path.
-                ...(plan.deploymentMode === "coolify"
+                ...(onboarding.deployment.mode === "coolify"
                     ? [
                         {
                             key: "pushKey",
@@ -884,18 +870,6 @@ function buildAdoptGroups(state, plan) {
         },
     ];
 }
-function renderAdoptDeploymentModeSummary(mode, surfaces) {
-    switch (mode) {
-        case "coolify":
-            return "Coolify (full-stack on Hetzner)";
-        case "gh-pages":
-            return surfaces === "client-only"
-                ? "GitHub Pages (static)"
-                : chalk.yellow("GitHub Pages — needs surfaces=client-only");
-        case "scaffold-only":
-            return "scaffold only (no deploy)";
-    }
-}
 async function editAdoptStep(state, plan, step) {
     if (step === "name") {
         const name = (await input({
@@ -1067,6 +1041,11 @@ async function editAdoptStep(state, plan, step) {
                     value: "openpanel",
                     checked: plan.services.includes("openpanel"),
                 },
+                {
+                    name: "Plausible (web analytics)",
+                    value: "plausible",
+                    checked: plan.services.includes("plausible"),
+                },
                 {
                     name: "Resend (transactional email)",
                     value: "resend",
@@ -1077,6 +1056,11 @@ async function editAdoptStep(state, plan, step) {
                     value: "email",
                     checked: plan.services.includes("email"),
                 },
+                {
+                    name: "Google Search Console (DNS verification + domain property)",
+                    value: "search-console",
+                    checked: plan.services.includes("search-console"),
+                },
             ],
         });
         return { ...plan, services };
@@ -1167,9 +1151,11 @@ async function editAdoptStep(state, plan, step) {
 const RESUME_SERVICE_ENV_KEY = {
     glitchtip: { server: "GLITCHTIP_DSN", client: "PUBLIC_GLITCHTIP_DSN" },
     openpanel: { server: "OPENPANEL_CLIENT_ID", client: "PUBLIC_OPENPANEL_CLIENT_ID" },
+    plausible: { client: "NEXT_PUBLIC_PLAUSIBLE_DOMAIN" },
     resend: { server: "RESEND_API_KEY" },
     s3: { server: "R2_ENDPOINT" },
     email: {},
+    "search-console": {},
 };
 /** Filter the services list for `runProvision` on `--resume`: drop
  *  every service whose canonical env keys are already in the target
@@ -1660,12 +1646,14 @@ async function executePlan(state, plan, opts = { resume: false }) {
                             username: ghcrConfig?.username,
                         });
                         if (r.kind === "private-registered") {
-                            ledger.record({
-                                kind: "coolifyPrivateRegistry",
-                                uuid: r.registryUuid,
-                            });
+                            if (r.created) {
+                                ledger.record({
+                                    kind: "coolifyPrivateRegistry",
+                                    uuid: r.registryUuid,
+                                });
+                            }
                         }
-                        else if (r.kind !== "public-set") {
+                        else if (r.kind === "skipped" || r.kind === "failed") {
                             caveats.push({
                                 title: "GHCR pull credentials not configured",
                                 reason: r.reason,
@@ -1719,9 +1707,11 @@ async function executePlan(state, plan, opts = { resume: false }) {
                 services: resumeServices,
                 surfaces: {
                     mode: provisionMode,
+                    projectDir: state.projectDir,
                     serverEnvDir: plan.serverDir,
                     clientEnvDir: plan.clientDir,
                 },
+                domain: plan.domain,
                 // Record per-resource as runProvision creates them. Done via
                 // callback so a mid-loop failure (e.g. Resend after GlitchTip
                 // already succeeded) still leaves a complete trail of what
@@ -1733,9 +1723,23 @@ async function executePlan(state, plan, opts = { resume: false }) {
                     else if (event.service === "openpanel") {
                         ledger.record({ kind: "openpanel", project: event.project });
                     }
+                    else if (event.service === "plausible") {
+                        ledger.record({ kind: "plausible", project: event.project });
+                    }
                     else if (event.service === "resend") {
                         ledger.record({ kind: "resend", client: event.client });
                     }
+                    else if (event.service === "search-console") {
+                        if (event.dnsRecord?.created) {
+                            ledger.record({
+                                kind: "cloudflareDnsRecord",
+                                zoneId: event.dnsRecord.zoneId,
+                                recordId: event.dnsRecord.id,
+                                name: event.dnsRecord.name,
+                                type: event.dnsRecord.type,
+                            });
+                        }
+                    }
                     else if (event.service === "email") {
                         // Email setup creates three kinds of mutable state on
                         // Cloudflare: the destination address (account-scoped), the