@rtrentjones/greenlight 0.2.24 → 0.2.26

package/assets/skills/provider-neon/SKILL.md

@@ -0,0 +1,65 @@
+---
+name: provider-neon
+description: How Neon works in a Greenlight setup — the `data: neon` store (serverless Postgres), git-style branch-per-env, scale-to-zero + auto-resume (so NO keepalive, unlike Supabase), pooled vs direct connection strings, the NEON_API_KEY, and migrations on a branch. Use when wiring a tool's database, choosing Neon vs Supabase, or a Neon apply.
+---
+
+# provider-neon
+
+`data: neon` is the **default Postgres** — for tools that need a SQL database and nothing else
+bundled. One Neon **project** per tool, **a branch per env** (git-style copy-on-write): `prod` is
+the project's default branch; `beta` is a child branch (separate data, instant to create). Compute
+**autosuspends and auto-resumes on the next connection**, so a Neon tool needs **no keepalive** —
+that's the whole reason Neon is preferred over Supabase, which pauses for 7 days and needs a manual
+unpause. Choose `supabase` only when you need bundled auth + storage + realtime together.
+
+## Token — `NEON_API_KEY`
+
+Console → Account settings → API keys. Account-level (configures the `neon` provider for every Neon
+tool, like `CLOUDFLARE_API_TOKEN`) — **not** per-tool. `greenlight add` verifies it against
+`/api/v2/projects` (HTTP 200). There is **no per-tool secret**: the role/password/connection strings
+are module OUTPUTS, not inputs.
+
+## Terraform module — `infra/modules/neon`
+
+Creates the project (default branch = prod) + a `neon_branch` per non-prod env (except `preview`,
+which is ephemeral/per-PR — created by CI, not Terraform). Outputs two per-env maps:
+- **`database_url[env]`** — the **pooled** (pgbouncer) string → `DATABASE_URL` for the serverless app.
+- **`direct_url[env]`** — the **direct** string → `DIRECT_URL` for migrations.
+
+The emitted `<name>.tf` wires `database_url["prod"]`/`["beta"]` into the Vercel env per target, so
+prod and beta hit **different branches**. Pin the provider `kislerdm/neon ~> 0.13`.
+
+## No keepalive
+
+Do **not** add a Neon tool to `module.keepalive.targets_json`. Neon resumes on connect — a request
+just wakes it. (`doctor` does not flag `data: neon` for keepalive; that exemption is intentional.)
+
+## Schema as code / migrations
+
+**Greenlight does NOT run migrations — by design.** The split:
+- **Schema** lives in the tool (an ORM — Drizzle/Prisma — or plain `.sql` migrations).
+- **Branch-per-env**: the TF module owns stable `prod`/`beta`; the **native Neon↔Vercel integration**
+  owns ephemeral per-PR preview branches (+ auto-injects `DATABASE_URL`). Don't put ephemeral branches
+  in Terraform.
+- **Execution**: the app's own build runs its migrate (`drizzle-kit migrate` / `prisma migrate deploy`)
+  against the wired **`DIRECT_URL`** — prod build → prod branch, preview build → preview branch. A
+  failed migrate fails the build = a natural gate.
+- **Greenlight's role**: the **dangerous-SQL gate**. Run `greenlight migrations scan` (no `<dir>` →
+  it auto-detects `supabase/migrations | migrations | drizzle/migrations | …`) in CI before the migrate.
+
+See [docs/migrations.md](../../../docs/migrations.md).
+
+## Sharing one DB + multi-account
+
+- **One DB, many services**: a second tool sets `dataShareWith: '<owner>'` (or `add … --share <owner>`)
+  — it creates no project and wires the owner's connection strings.
+- **A second Neon account**: `tokenOverrides: { NEON_API_KEY: 'NEON_API_KEY_X' }` → an aliased `neon`
+  provider authenticates that account. (A sharer can't also override — it uses the owner's account.)
+
+## MCP
+
+`.mcp.json` wires `neon` (hosted) with `Authorization: Bearer ${NEON_API_KEY}`. Run `/mcp` to auth.
+
+## Rule
+The **blog must never use a database** that can pause — but Neon's auto-resume makes it safe for
+*tools*; still, the apex blog stays `data: none` (D1/KV/external only). Neon is per-tool Postgres.

package/dist/bin.js

@@ -6,7 +6,7 @@ import {
   resolveUrl,
   scanSqlFiles,
   verifyAll
-} from "./chunk-2A7ZBBYN.js";
+} from "./chunk-HMU7D7R2.js";
 import "./chunk-HX7VA25D.js";
 import "./chunk-N3IKUCSF.js";
 import "./chunk-KP3Y6WRU.js";
@@ -64,6 +64,7 @@ function serializeTool(t) {
     const ov = Object.entries(t.tokenOverrides).map(([k, v]) => `${k}: ${q(v)}`).join(", ");
     parts.push(`tokenOverrides: { ${ov} }`);
   }
+  if (t.dataShareWith !== void 0) parts.push(`dataShareWith: ${q(t.dataShareWith)}`);
   return `    { ${parts.join(", ")} },`;
 }
 function serializeConfig(c) {
@@ -111,7 +112,8 @@ function addTool(config, t) {
         ...t.port !== void 0 ? { port: t.port } : {},
         ...t.preview ? { preview: t.preview } : {},
         ...t.tokens?.length ? { tokens: t.tokens } : {},
-        ...t.tokenOverrides && Object.keys(t.tokenOverrides).length ? { tokenOverrides: t.tokenOverrides } : {}
+        ...t.tokenOverrides && Object.keys(t.tokenOverrides).length ? { tokenOverrides: t.tokenOverrides } : {},
+        ...t.dataShareWith ? { dataShareWith: t.dataShareWith } : {}
       }
     ]
   };
@@ -139,7 +141,8 @@ function upsertTool(config, t) {
     ...t.port !== void 0 ? { port: t.port } : {},
     ...t.preview ? { preview: t.preview } : {},
     ...t.tokens?.length ? { tokens: t.tokens } : {},
-    ...t.tokenOverrides && Object.keys(t.tokenOverrides).length ? { tokenOverrides: t.tokenOverrides } : {}
+    ...t.tokenOverrides && Object.keys(t.tokenOverrides).length ? { tokenOverrides: t.tokenOverrides } : {},
+    ...t.dataShareWith ? { dataShareWith: t.dataShareWith } : {}
   };
   const tools = config.tools.some((x) => x.name === t.name) ? config.tools.map((x) => x.name === t.name ? entry : x) : [...config.tools, entry];
   const result = ConfigSchema.safeParse({ ...config, tools });
@@ -317,6 +320,37 @@ var PACKS = [
     skill: "provider-supabase",
     tfModules: ["supabase"]
   },
+  {
+    id: "neon",
+    name: "Neon",
+    appliesTo: (t) => t.data === "neon",
+    guide: "docs/provider-tokens.md \u2014 NEON_API_KEY (project + branch management)",
+    setupUrl: "https://console.neon.tech/app/settings/api-keys",
+    tokens: [
+      {
+        // Shared account credential (configures the neon TF provider, like CLOUDFLARE_API_TOKEN) —
+        // NOT per-tool. The role password + connection string are module OUTPUTS, not inputs, so
+        // (unlike Supabase) there is no per-tool password variable to gather.
+        envVar: "NEON_API_KEY",
+        label: "Neon API key (project + branch management)",
+        verify: async (t) => {
+          const r = await fetch("https://console.neon.tech/api/v2/projects", {
+            headers: { Authorization: `Bearer ${t}` }
+          });
+          return { ok: okStatus(r), detail: `HTTP ${r.status}` };
+        }
+      }
+    ],
+    mcp: {
+      neon: {
+        type: "http",
+        url: "https://mcp.neon.tech/mcp",
+        headers: { Authorization: "Bearer ${NEON_API_KEY}" }
+      }
+    },
+    skill: "provider-neon",
+    tfModules: ["neon"]
+  },
   {
     id: "hcp",
     name: "HCP Terraform (remote state)",
@@ -444,7 +478,7 @@ function tokensForTool(tool) {
 }
 
 // src/version.ts
-var MODULE_REF = "v0.2.24";
+var MODULE_REF = "v0.2.26";
 var MODULE_SOURCE_BASE = "git::https://github.com/RTrentJones/greenlight.git//infra/modules";
 function moduleSource(module, ref = MODULE_REF) {
   return `${MODULE_SOURCE_BASE}/${module}?ref=${ref}`;
@@ -457,9 +491,12 @@ function emitToolTf(opts) {
   const port = opts.port ?? 8e3;
   const slug = opts.slug ?? `OWNER/${name}`;
   const useSupabase = data === "supabase";
+  const useNeon = data === "neon";
   const useVercel = target === "vercel";
   const useOci = target === "oci";
   const supabaseOverride = opts.tokenOverrides?.SUPABASE_ACCESS_TOKEN;
+  const neonOverride = opts.tokenOverrides?.NEON_API_KEY;
+  const neonOwner = opts.dataShareWith ?? name;
   const envList = envs.map((e) => `"${e}"`).join(", ");
   const blocks = [];
   const assumes = ["var.cloudflare_zone_id"];
@@ -467,9 +504,9 @@ function emitToolTf(opts) {
   if (useSupabase) assumes.push("var.supabase_organization_id");
   const ghcrOwner = (slug.split("/")[0] ?? "owner").toLowerCase();
   blocks.push(
-    `# ${name} \u2014 ${lane}/${target}${useSupabase ? "/supabase" : ""}, emitted by \`greenlight add\`.
+    `# ${name} \u2014 ${lane}/${target}${data && data !== "none" ? `/${data}` : ""}, emitted by \`greenlight add\`.
 # Review, then commit + push: the wrapper's infra.yml (HCP-backed) runs \`terraform apply\`.
-# Assumes infra/main.tf declares: ${[useVercel && "vercel", useSupabase && "supabase", useOci && "oci"].filter(Boolean).join(" + ") || "cloudflare + github"} provider(s)
+# Assumes infra/main.tf declares: ${[useVercel && "vercel", useSupabase && "supabase", useNeon && "neon", useOci && "oci"].filter(Boolean).join(" + ") || "cloudflare + github"} provider(s)
 # and the variables ${assumes.join(", ")}.${opts.external ? `
 # External tool: app code + deploy live in ${slug}; this manages only its infra here.` : ""}`
   );
@@ -508,6 +545,38 @@ variable "${name}_supabase_database_password" {
   type      = string
   sensitive = true
   default   = "import-placeholder" # ignored when importing an existing project
+}${overrideBlock}`);
+  }
+  if (useNeon && opts.dataShareWith) {
+    blocks.push(`# Shares the Neon project owned by "${opts.dataShareWith}" (one DB, many services).
+# No neon module here \u2014 the env wiring below reads module.${neonOwner}_neon.* (its prod/beta branches).`);
+  } else if (useNeon) {
+    const providersLine = neonOverride ? `
+  providers = { neon = neon.${name} }` : "";
+    const overrideBlock = neonOverride ? `
+
+# Multi-account: ${name}'s Neon lives in a SECOND account \u2014 an aliased provider authenticates with
+# its own token. In infra.yml: TF_VAR_${name}_neon_api_key: \${{ secrets.${neonOverride} }}
+provider "neon" {
+  alias   = "${name}"
+  api_key = var.${name}_neon_api_key
+}
+
+variable "${name}_neon_api_key" {
+  type        = string
+  sensitive   = true
+  description = "Neon API key for ${name}'s account (scoped secret ${neonOverride})."
+}` : "";
+    blocks.push(`# One Neon project, a branch per env (prod = the project's default branch; beta = a child
+# branch \u2014 copy-on-write, instant). Compute scales to zero and auto-resumes on the next connection,
+# so a Neon tool needs NO keepalive (the reason Neon is the default Postgres). NEON_API_KEY configures
+# the provider in main.tf; the connection strings are module OUTPUTS \u2014 no per-tool secret to gather.
+module "${name}_neon" {
+  source = "${moduleSource("neon", ref)}"${providersLine}
+
+  name   = "${name}"
+  region = "aws-us-east-1" # Neon region id, e.g. aws-us-east-1 / aws-us-west-2
+  envs   = [${envList}]
 }${overrideBlock}`);
   }
   if (useVercel) {
@@ -531,6 +600,24 @@ variable "${name}_supabase_database_password" {
     supa_url_beta     = module.${name}_supabase.url
     supa_anon_beta    = module.${name}_supabase.anon_key
     supa_service_beta = module.${name}_supabase.service_role_key
+  }` : useNeon ? `
+  environment = {
+    site_url_prod  = { key = "SITE_URL", target = ["production"], sensitive = false }
+    site_url_beta  = { key = "SITE_URL", target = ["preview"], sensitive = false }
+    db_url_prod    = { key = "DATABASE_URL", target = ["production"], sensitive = true }
+    db_direct_prod = { key = "DIRECT_URL", target = ["production"], sensitive = true }
+    db_url_beta    = { key = "DATABASE_URL", target = ["preview"], sensitive = true }
+    db_direct_beta = { key = "DIRECT_URL", target = ["preview"], sensitive = true }
+  }
+  # Pooled (DATABASE_URL) for the serverless app; direct (DIRECT_URL) for migrations. Prod hits the
+  # project's default branch; beta hits the "beta" branch \u2014 separate data, instant copy-on-write.
+  environment_values = {
+    site_url_prod  = "https://${name}.${domain}"
+    site_url_beta  = "https://beta.${name}.${domain}"
+    db_url_prod    = module.${neonOwner}_neon.database_url["prod"]
+    db_direct_prod = module.${neonOwner}_neon.direct_url["prod"]
+    db_url_beta    = module.${neonOwner}_neon.database_url["beta"]
+    db_direct_beta = module.${neonOwner}_neon.direct_url["beta"]
   }` : `
   # No managed data store \u2014 add environment/environment_values if the app needs vars.
   environment        = {}
@@ -640,10 +727,13 @@ function emitWrapperMainTf(opts) {
     req.push('    vercel     = { source = "vercel/vercel", version = "~> 3.0" }');
   if (need.has("supabase"))
     req.push('    supabase   = { source = "supabase/supabase", version = "~> 1.0" }');
+  if (need.has("neon"))
+    req.push('    neon       = { source = "kislerdm/neon", version = "~> 0.13" }');
   if (need.has("oci")) req.push('    oci        = { source = "oracle/oci", version = ">= 5.0" }');
   const providerBlocks = ['provider "cloudflare" {}', `provider "github" { owner = "${owner}" }`];
   if (need.has("vercel")) providerBlocks.push('provider "vercel" {}');
   if (need.has("supabase")) providerBlocks.push('provider "supabase" {}');
+  if (need.has("neon")) providerBlocks.push('provider "neon" { api_key = var.neon_api_key }');
   if (need.has("oci")) {
     providerBlocks.push(`provider "oci" {
   # trimspace guards against a trailing newline/space in a pasted secret (a malformed region
@@ -660,6 +750,9 @@ function emitWrapperMainTf(opts) {
   if (need.has("supabase")) {
     vars.push('variable "supabase_organization_id" { type = string }');
   }
+  if (need.has("neon")) {
+    vars.push('variable "neon_api_key" {\n  type      = string\n  sensitive = true\n}');
+  }
   if (need.has("oci")) {
     vars.push('variable "oci_tenancy_ocid" { type = string }');
     vars.push('variable "oci_user_ocid" { type = string }');
@@ -703,6 +796,7 @@ function providersForTool(tool) {
   const out = ["cloudflare", "github"];
   if (ids.has("vercel")) out.push("vercel");
   if (ids.has("supabase")) out.push("supabase");
+  if (ids.has("neon")) out.push("neon");
   if (ids.has("oci")) out.push("oci");
   return out;
 }
@@ -1057,7 +1151,7 @@ async function addCommand(args) {
   const name = args[0];
   if (!name || name.startsWith("-")) {
     throw new Error(
-      "usage: greenlight add <name> --lane <lane> --target <target> [--data <d>] [--auth <a>] [--envs beta,prod] [--port 8000]"
+      "usage: greenlight add <name> --lane <lane> --target <target> [--data <d>] [--auth <a>] [--envs beta,prod] [--port 8000] [--share <owner>]"
     );
   }
   const lane = flag2(args, "--lane");
@@ -1075,7 +1169,9 @@ async function addCommand(args) {
     data: flag2(args, "--data"),
     auth: flag2(args, "--auth"),
     envs: flag2(args, "--envs")?.split(","),
-    port: portFlag ? Number(portFlag) : void 0
+    port: portFlag ? Number(portFlag) : void 0,
+    // --share <owner>: this tool reads the owner's Neon DB instead of creating its own (one DB, many services).
+    dataShareWith: flag2(args, "--share")
   });
   const entry = next.tools.find((t) => t.name === name);
   const data = entry?.data ?? "none";
@@ -1124,7 +1220,8 @@ async function addCommand(args) {
         data,
         envs,
         port: entry?.port,
-        tokenOverrides: entry?.tokenOverrides
+        tokenOverrides: entry?.tokenOverrides,
+        dataShareWith: entry?.dataShareWith
       })
     );
     console.log(`\u2714 wrote infra/${name}.tf (modules: ${providers.join(", ")})`);
@@ -2457,19 +2554,30 @@ Next:
 }
 
 // src/commands/migrations.ts
-import { readFileSync as readFileSync7, readdirSync as readdirSync3 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync7, readdirSync as readdirSync3 } from "fs";
 import { join as join5 } from "path";
 var DEFAULT_DIR = "supabase/migrations";
+var CANDIDATE_DIRS = [
+  DEFAULT_DIR,
+  "migrations",
+  "drizzle/migrations",
+  "drizzle",
+  "db/migrations"
+];
+function resolveMigrationsDir(explicit, root = process.cwd()) {
+  if (explicit) return explicit;
+  return CANDIDATE_DIRS.find((d) => existsSync10(join5(root, d))) ?? DEFAULT_DIR;
+}
 async function migrationsCommand(args) {
   if (args[0] !== "scan") {
     console.log(
       `usage: greenlight migrations scan [<dir>] [--strict]
   scan SQL migrations for data-destroying / lock-heavy statements (the pre-apply gate).
-  default dir: ${DEFAULT_DIR}. Acknowledge an intentional op with \`-- greenlight:allow\`.`
+  no <dir> \u2192 auto-detects ${CANDIDATE_DIRS.join(" | ")}. Acknowledge an intentional op with \`-- greenlight:allow\`.`
     );
     process.exit(args[0] ? 1 : 0);
   }
-  const dir = args.slice(1).find((a) => !a.startsWith("-")) ?? DEFAULT_DIR;
+  const dir = resolveMigrationsDir(args.slice(1).find((a) => !a.startsWith("-")));
   const strict = args.includes("--strict");
   let names;
   try {

package/dist/{chunk-2A7ZBBYN.js → chunk-HMU7D7R2.js}

@@ -15,13 +15,13 @@ import { createJiti } from "jiti";
 import { z } from "zod";
 var LaneEnum = z.enum(["astro", "next", "mcp"]);
 var TargetEnum = z.enum(["workers", "vercel", "oci"]);
-var DataEnum = z.enum(["none", "d1", "kv", "supabase"]);
+var DataEnum = z.enum(["none", "d1", "kv", "supabase", "neon"]);
 var AuthEnum = z.enum(["none", "bearer", "oauth"]);
 var AccessEnum = z.enum(["public", "private"]);
 var EnvEnum = z.enum(["preview", "beta", "prod"]);
 var MATRIX = {
   astro: { targets: ["workers"], data: ["none", "d1", "kv"] },
-  next: { targets: ["vercel"], data: ["none", "supabase"] },
+  next: { targets: ["vercel"], data: ["none", "supabase", "neon"] },
   mcp: { targets: ["workers", "oci"], data: ["none"] }
 };
 var ToolSchema = z.object({
@@ -65,7 +65,12 @@ var ToolSchema = z.object({
   // var to an alternate secret name, so this tool authenticates that provider with a SECOND account
   // — e.g. { SUPABASE_ACCESS_TOKEN: 'SUPABASE_ACCESS_TOKEN_HEISTMIND' }. Absent ⇒ unchanged (the
   // default token). `add`/`adopt` emit an aliased provider + scoped var/secret for an overridden token.
-  tokenOverrides: z.record(z.string(), z.string()).optional()
+  tokenOverrides: z.record(z.string(), z.string()).optional(),
+  // Share another tool's data store instead of creating one (multiple services on one Neon DB).
+  // The value is the OWNER tool's name; this tool emits no data module and wires the owner's
+  // connection strings. Cross-tool validity (owner exists, same data, no chains) is checked on
+  // the whole config below.
+  dataShareWith: z.string().optional()
 }).superRefine((tool, ctx) => {
   const rule = MATRIX[tool.lane];
   if (!rule.targets.includes(tool.target)) {
@@ -89,6 +94,13 @@ var ToolSchema = z.object({
       message: 'private tools must set auth to "bearer" or "oauth", never "none"'
     });
   }
+  if (tool.dataShareWith && tool.data !== "neon") {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ["dataShareWith"],
+      message: 'dataShareWith currently supports data: "neon" only'
+    });
+  }
 });
 var BlogSchema = z.object({
   lane: z.literal("astro"),
@@ -104,6 +116,35 @@ var ConfigSchema = z.object({
   // Optional: a tool-only repo (a poly-repo consumer) has no blog.
   blog: BlogSchema.optional(),
   tools: z.array(ToolSchema).default([])
+}).superRefine((config, ctx) => {
+  for (const [i, tool] of config.tools.entries()) {
+    if (!tool.dataShareWith) continue;
+    const issue = (message) => ctx.addIssue({ code: z.ZodIssueCode.custom, path: ["tools", i, "dataShareWith"], message });
+    if (tool.dataShareWith === tool.name) {
+      issue(`"${tool.name}" cannot share a data store with itself`);
+      continue;
+    }
+    const owner = config.tools.find((t) => t.name === tool.dataShareWith);
+    if (!owner) {
+      issue(`dataShareWith "${tool.dataShareWith}" is not a tool in this manifest`);
+      continue;
+    }
+    if (owner.data !== tool.data) {
+      issue(
+        `"${tool.name}" (data: ${tool.data}) must share a tool with the same data \u2014 "${owner.name}" is ${owner.data}`
+      );
+    }
+    if (owner.dataShareWith) {
+      issue(
+        `cannot share with "${owner.name}" \u2014 it is itself a sharer (no chains); point at the owner`
+      );
+    }
+    if (tool.tokenOverrides?.NEON_API_KEY) {
+      issue(
+        `a sharer uses the owner's Neon account \u2014 remove the NEON_API_KEY override from "${tool.name}"`
+      );
+    }
+  }
 });
 
 // ../packages/shared/src/load.ts

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   defineConfig,
   defineVerify,
   loadConfig
-} from "./chunk-2A7ZBBYN.js";
+} from "./chunk-HMU7D7R2.js";
 import "./chunk-HX7VA25D.js";
 import "./chunk-N3IKUCSF.js";
 import "./chunk-KP3Y6WRU.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtrentjones/greenlight",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "Greenlight CLI — setup and lifecycle for the harness.",
   "license": "MIT",
   "repository": {
@@ -31,10 +31,10 @@
     "@anthropic-ai/sdk": "^0.69.0"
   },
   "devDependencies": {
-    "@rtrentjones/greenlight-adapters": "0.2.24",
-    "@rtrentjones/greenlight-loop": "0.2.24",
-    "@rtrentjones/greenlight-verify": "0.2.24",
-    "@rtrentjones/greenlight-shared": "0.2.24"
+    "@rtrentjones/greenlight-adapters": "0.2.26",
+    "@rtrentjones/greenlight-loop": "0.2.26",
+    "@rtrentjones/greenlight-shared": "0.2.26",
+    "@rtrentjones/greenlight-verify": "0.2.26"
   },
   "scripts": {
     "build": "node scripts/copy-assets.mjs && tsup",