@clubedge/create-clubedge-app 0.19.1 → 0.21.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to `create-clubedge-app` are documented here.
 
+## 0.21.0
+
+- Default to Starter `v0.16.0` (#52), which adds:
+  - Starter upgrades as pull requests: every project gets `.github/workflows/clubedge-upgrade.yml`, which checks every Monday for a newer Starter release and opens a pull request with `pnpm clubedge upgrade`'s result, the release notes, and anything left to resolve, so the project's own CI tests the upgrade before it is merged.
+  - GitHub Actions on their Node 24 versions in `ci.yml` and `deploy.yml`, with Linux jobs on Ubuntu 24.04.
+  - Steadier tests: PGlite starts once per test file, with room for slow CI runners.
+- Release tooling for maintainers (#51): `pnpm release patch|minor|major` opens the release pull request with a drafted changelog, `pnpm release tag` publishes it, and the Starter pin workflow opens a pull request when the Starter publishes a release.
+- CI names the generated project's failing check, in an annotation and the job summary (#50).
+
+## 0.20.0
+
+- Conflicts are easier to resolve after `add`, `remove`, and `upgrade`:
+  - The Starter's whole new version of each conflicted file is saved in `.clubedge/incoming/<file>`, and the report prints a `git diff --no-index` command to compare it with yours. Files left for you to check by hand get theirs too, when the Starter has one. Git ignores the folder; each change replaces the previous change's files.
+  - Without a module on the command line, the `add` and `remove` menus pick several modules at once; `add` then asks for each one's option, and the changes apply together.
+- Sharing a `try` preview:
+  - When the app is ready, `try` asks whether to share it. Claiming the VM, a free Railway sign-up, is what makes the URL work for anyone, so it opens the claim page. `--claim` does that without asking; scripts are never asked.
+  - The closing message explains Railway's "Access denied" page and prints a port-forward command that opens the app at http://localhost:3000 from any network.
+  - `try --status` shows the last VM's preview, time left, and claim link. It connects only while the VM is running, so it never creates a new one.
+- Release workflow: GitHub Actions on their Node 24 versions, Linux jobs on Ubuntu 24.04, a sturdier wait for npm in the smoke tests, and GitHub Release pages created from this changelog.
+- Still on Starter `v0.15.0`.
+
 ## 0.19.1
 
 - `try` now says who can open the preview as Railway does: until the VM is claimed, only the IP address that created it. Another device on mobile data, a VPN, or anyone you send the link to gets Railway's "Access denied" page; claiming makes the URL shareable.

package/README.md

@@ -127,7 +127,7 @@ pnpm dlx @clubedge/create-clubedge-app my-app --yes --no-git --framework tanstac
 pnpm dlx @clubedge/create-clubedge-app my-app --ref main
 
 # Reproduce a specific Starter release or commit
-pnpm dlx @clubedge/create-clubedge-app my-app --ref v0.15.0
+pnpm dlx @clubedge/create-clubedge-app my-app --ref v0.16.0
 pnpm dlx @clubedge/create-clubedge-app my-app --ref <commit-sha>
 
 # Test local Starter changes before releasing them
@@ -136,7 +136,7 @@ pnpm dlx @clubedge/create-clubedge-app my-app --template-dir ../clubedge-starter
 
 ## Change an existing project
 
-Inside a project created by the CLI, `add` and `remove` change modules, and `upgrade` moves the project to a newer Starter release. Projects from Starter v0.8.0 on have a `clubedge` script, so `pnpm clubedge add cache redis` works too. Without a module or option, `add` and `remove` ask for them:
+Inside a project created by the CLI, `add` and `remove` change modules, and `upgrade` moves the project to a newer Starter release. Projects from Starter v0.8.0 on have a `clubedge` script, so `pnpm clubedge add cache redis` works too. Without a module or option, `add` and `remove` ask for them, with a list where you can pick several modules at once:
 
 ```sh
 pnpm clubedge add                                            # choose a module and option from a list
@@ -146,13 +146,13 @@ pnpm clubedge add email resend payments stripe              # several modules as
 pnpm clubedge remove storage payments
 pnpm dlx @clubedge/create-clubedge-app add infra local --dry-run
 pnpm dlx @clubedge/create-clubedge-app@latest upgrade        # to the newest CLI's Starter release
-pnpm dlx @clubedge/create-clubedge-app upgrade --ref v0.15.0 # or a specific tag, branch, or commit
+pnpm dlx @clubedge/create-clubedge-app upgrade --ref v0.16.0 # or a specific tag, branch, or commit
 ```
 
 The CLI renders the project twice, from the Starter commit and modules recorded in your `package.json` and from the new state, and merges the difference into your project. The new state has other modules for `add` and `remove`, and the newer Starter with the same modules for `upgrade`. Modules a newer Starter introduces start as `none` where possible, so an upgrade never adds a service on its own.
 
 - Files you never changed are updated, added, or deleted.
-- Files you changed keep your edits. Where the module change touches the same lines, the file gets conflict markers (`<<<<<<< yours` ... `>>>>>>> clubedge`) for you to resolve.
+- Files you changed keep your edits. Where the module change touches the same lines, the file gets conflict markers (`<<<<<<< yours` ... `>>>>>>> clubedge`) for you to resolve. The Starter's whole new version of each such file is saved in `.clubedge/incoming/` to compare with yours (`git diff --no-index <file> .clubedge/incoming/<file>`); Git ignores that folder, so delete it when you are done.
 - Your own files are never touched.
 - `apps/web/.env.local` keeps your values. Values still at their generated defaults follow the new selection, and new variables are added.
 - `pnpm-lock.yaml` is replaced if you never changed your dependencies; otherwise `pnpm install` reconciles it.
@@ -187,34 +187,34 @@ The VM has no Docker, so the project uses `--infra local` (PGlite) and Better Au
 
 Inside a project, `pnpm clubedge try` uploads that project instead, to share work in progress without deploying it. It sends what Git would commit (tracked files, plus untracked ones that are not ignored) and never `.env` files other than examples, `node_modules`, or build output; on the VM, the env file is made from `.env.example` as `create` does. The project must use `infra local` or `none`, and not Supabase Auth; `pnpm clubedge add infra local` switches a Docker project. Add `--dry-run` to list the files without uploading anything.
 
-When the app is ready, the CLI opens the preview in your browser; `--no-open` turns that off. The CLI asks before creating anything (`--yes` agrees), keeps its own SSH key in your config directory (`~/.config/clubedge`, or `%APPDATA%\clubedge` on Windows) apart from `~/.ssh`, and connects only to Railway's known host key. Railway's [terms](https://railway.com/legal/terms) apply, and Railway can change or pause its free VM.
+When the app is ready, the CLI opens the preview in your browser (`--no-open` turns that off) and asks whether to share it: claiming the VM, a free Railway sign-up, is what makes the URL work for anyone. `--claim` opens the claim page without asking. `try --status` shows the last VM's preview, time left, and claim link; it connects only while the VM is running, so it never creates a new one. To open the app from another network yourself, forward it: `ssh -i <key> -N -L 3000:127.0.0.1:3000 railway.new`, then http://localhost:3000 (the CLI prints the exact command). The CLI asks before creating anything (`--yes` agrees), keeps its own SSH key in your config directory (`~/.config/clubedge`, or `%APPDATA%\clubedge` on Windows) apart from `~/.ssh`, and connects only to Railway's known host key. Railway's [terms](https://railway.com/legal/terms) apply, and Railway can change or pause its free VM.
 
 ## Version relationship
 
 Each CLI release is tested against one specific Starter release:
 
 ```text
-create-clubedge-app v0.19.1
+create-clubedge-app v0.21.0
         |
         v
-Clubedge Starter v0.15.0
-commit 239f9e9fd575165d72f70a91592cafbd43bb7574
+Clubedge Starter v0.16.0
+commit e233aa68ddc8c21df6cf2b01b9e26876d2e4aeca
 ```
 
 The current relationship is:
 
 | CLI release | Default Starter release | Meaning |
 | --- | --- | --- |
-| `create-clubedge-app@0.19.1` | `clubedge-starter@v0.15.0` | The CLI's required, tested default |
+| `create-clubedge-app@0.21.0` | `clubedge-starter@v0.16.0` | The CLI's required, tested default |
 
 This means the same CLI version always scaffolds the same Starter revision by default. The CLI does not silently follow Starter `main`.
 
-The `v0.15.0` tag is expected to resolve to commit
-`239f9e9fd575165d72f70a91592cafbd43bb7574`. The CLI verifies this before
+The `v0.16.0` tag is expected to resolve to commit
+`e233aa68ddc8c21df6cf2b01b9e26876d2e4aeca`. The CLI verifies this before
 scaffolding with the default reference and fails rather than silently using a
 moved tag.
 
-When the Starter changes, its maintainers first publish a new versioned release, such as `v0.15.0`. The CLI is then updated to use that release, all generated-project checks must pass, and a new CLI version is published. This keeps Starter and CLI releases independently versioned while preserving a tested compatibility relationship.
+When the Starter changes, its maintainers first publish a new versioned release, such as `v0.16.0`. The CLI is then updated to use that release, all generated-project checks must pass, and a new CLI version is published. This keeps Starter and CLI releases independently versioned while preserving a tested compatibility relationship.
 
 Every generated project records its CLI version, Starter repository, Starter ref, Starter commit, framework, and modules in `package.json` and `README.md`.
 
@@ -269,15 +269,15 @@ CI packs the CLI with `npm pack`, scaffolds clean projects from the packed tarba
 1. Make and validate changes in `clubedge-starter`.
 2. Run lint, typecheck, unit tests, browser tests, and production build.
 3. Update the Starter package versions.
-4. Commit `main`, create a release tag such as `v0.15.0`, and publish the Starter release.
+4. Commit `main`, create a release tag such as `v0.16.0`, and publish the Starter release.
 
 ### CLI maintainers
 
-1. Set `clubedge.starterRef` and `clubedge.starterCommit` in [`package.json`](package.json) to the new tested Starter tag, and bump `version`.
-2. Update the version relationship table and changelog.
-3. Generate a clean project from that exact tag.
-4. Run install, lint, typecheck, unit tests, browser tests, production build, and runtime smoke checks.
-5. Publish a new CLI version only after the generated-project verification passes.
+1. When the Starter publishes a release, the [Starter pin](.github/workflows/starter-pin.yml) workflow opens a pull request that moves `clubedge.starterRef` and `clubedge.starterCommit` in [`package.json`](package.json), and the docs that name them, to the new tag (daily, or run it by hand; locally: `pnpm release pin vX.Y.Z`). Its CI generates clean projects from that exact tag and runs install, lint, typecheck, unit tests, browser tests, production build, and runtime smoke checks. Merge it once they pass.
+2. `pnpm release patch|minor|major` (from an up-to-date `main`; add `--dry-run` to preview) opens the release pull request: it bumps `version`, updates the version relationship here and in CONTRIBUTING, adds the release table rows for a minor or major release, and drafts the changelog entry from the pull requests merged since the last tag. Edit the draft in that pull request: it becomes the GitHub Release page.
+3. After it is merged, `pnpm release tag` tags `main`. The Release workflow checks and publishes it to npm, creates the GitHub Release page from the changelog entry, and smoke-tests the published package.
+
+The pin workflow needs **Settings → Actions → General → Allow GitHub Actions to create and approve pull requests**, or a `STARTER_PIN_TOKEN` secret (a fine-grained token with contents and pull requests write), which also lets its pull request start CI by itself.
 
 The required CI job always tests the pinned default. The scheduled compatibility job tests Starter `main` early, but unreleased Starter changes must not change the stable CLI default.
 
@@ -298,6 +298,8 @@ Each phase ends with a Starter release and a CLI release pinned to it. The full
 | 0.17.0 | v0.15.0 | Docs-style dashboard: sidebar with a section switcher and account card, page in a scrolling card, phone drawer |
 | 0.18.0 | v0.15.0 | `try`: a new project on a free, temporary Railway VM, with a preview URL and a claim link (experimental) |
 | 0.19.0 | v0.15.0 | `pnpm clubedge try` uploads an existing project to the VM; the preview opens in the browser |
+| 0.20.0 | v0.15.0 | The Starter's version of each conflicted file in `.clubedge/incoming/`, several modules at once, sharing a `try` preview by claiming the VM, `try --status` |
+| 0.21.0 | v0.16.0 | Starter v0.16.0: upgrades delivered as pull requests, Node 24 actions; release tooling for maintainers |
 | next | | Show the Starter's version of a conflicted file next to yours |
 
 ## Community

package/dist/cli/args.js

@@ -14,6 +14,8 @@ const OPTIONS = {
     force: { type: "boolean", default: false },
     services: { type: "boolean", default: true },
     open: { type: "boolean", default: true },
+    claim: { type: "boolean", default: false },
+    status: { type: "boolean", default: false },
     help: { type: "boolean", short: "h", default: false },
     version: { type: "boolean", short: "v", default: false },
 };
@@ -87,6 +89,9 @@ export function parseCliArgs(argv) {
     if (!creates && command.name !== "upgrade" && values.ref !== undefined) {
         throw new UsageError("--ref only applies when creating or upgrading a project.");
     }
+    if (command.name !== "try" && (values.claim || values.status)) {
+        throw new UsageError("--claim and --status only apply to try.");
+    }
     if (command.name === "try" && values["template-dir"] !== undefined) {
         throw new UsageError("--template-dir does not apply to try: the VM downloads the Starter itself.");
     }
@@ -113,6 +118,8 @@ export function parseCliArgs(argv) {
         force: values.force,
         services: values.services,
         open: values.open,
+        claim: values.claim,
+        status: values.status,
         help: values.help,
         version: values.version,
     };

package/dist/cli/ui.js

@@ -124,6 +124,8 @@ ${selectionHelp(manifest)}
   --force                 add/remove: change a project with uncommitted changes or without Git
   --no-services           doctor: skip pnpm check:services
   --no-open               try: do not open the preview in the browser
+  --claim                 try: open the page that claims the VM, to share the preview
+  --status                try: the last VM's preview, time left, and claim link
   -y, --yes               Accept defaults and never prompt (default directory: my-app)
   --no-install            Skip dependency installation
   --no-git                Skip Git repository initialization

package/dist/core/merge.js

@@ -53,9 +53,11 @@ export function mergeText(current, base, target) {
 function merged(path, current, base, target, binaryReason) {
     const result = mergeText(current, base, target);
     if (!result)
-        return { path, kind: "keep", reason: binaryReason };
+        return { path, kind: "keep", reason: binaryReason, incoming: target };
     const content = withLineEndings(result.text, current);
-    return { path, kind: result.conflict ? "conflict" : "merge", content };
+    if (result.conflict)
+        return { path, kind: "conflict", content, incoming: withLineEndings(normalize(target), current) };
+    return { path, kind: "merge", content };
 }
 /**
  * Decides what happens to every file the base or the target contains. Files only the project
@@ -89,7 +91,12 @@ export function planMerge(base, target, current) {
         }
         if (before && after) {
             if (!mine) {
-                actions.push({ path, kind: "keep", reason: "You deleted this file, and the new selection changes it. Restore it if you need the change." });
+                actions.push({
+                    path,
+                    kind: "keep",
+                    reason: "You deleted this file, and the new selection changes it. Restore it if you need the change.",
+                    incoming: after,
+                });
             }
             else if (sameContent(mine, before)) {
                 const content = isBinary(after) ? after : withLineEndings(normalize(after), mine);

package/dist/core/railway.js

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import process from "node:process";
 import { UsageError } from "../cli/args.js";
 /*
@@ -61,6 +61,27 @@ export function railwayKeyPath(env = process.env, platform = process.platform) {
     const configHome = env.XDG_CONFIG_HOME || (platform === "win32" && env.APPDATA ? env.APPDATA : join(homedir(), ".config"));
     return join(configHome, "clubedge", "railway_ed25519");
 }
+/** Saved next to the CLI's key, in its config directory. */
+export function lastVmPath(env = process.env, platform = process.platform) {
+    return join(dirname(railwayKeyPath(env, platform)), "railway-vm.json");
+}
+/** Railway keeps an unclaimed VM claimable for 24 hours after its build window. */
+export const claimWindowMs = 24 * 60 * 60 * 1000;
+/**
+ * Where a VM stands: running (inside its 60 minutes), claimable (past them, still claimable), or
+ * gone. Connecting to a VM that is gone would create a new one, so status never does.
+ */
+export function vmPhase(vm, now = new Date()) {
+    const expires = new Date(vm.expiresAt).getTime();
+    const claimUntil = new Date(expires + claimWindowMs);
+    const minutesLeft = Math.max(0, Math.round((expires - now.getTime()) / 60_000));
+    const phase = now.getTime() < expires ? "running" : now.getTime() < claimUntil.getTime() ? "claimable" : "gone";
+    return { phase, minutesLeft, claimUntil };
+}
+/** A local port forward to the app on the VM: works from this machine whatever its IP, nothing shared. */
+export function portForwardCommand(keyPath) {
+    return `ssh -i "${keyPath}" -N -L 3000:127.0.0.1:3000 ${railwayHost}`;
+}
 /**
  * The modules for a project on the VM. It has no Docker, so the database is PGlite (--infra
  * local) and sign-in is Better Auth; email is off, since nothing there receives it. Flags the

package/dist/core/update.js

@@ -7,6 +7,11 @@ import { updateEnvFile } from "./env.js";
 import { planMerge, sameContent } from "./merge.js";
 import { readProjectFiles, renderProject } from "./project.js";
 const LOCKFILE = "pnpm-lock.yaml";
+/**
+ * Where the Starter's versions of files left to resolve are saved, next to the project's own,
+ * for comparing by hand. The folder ignores itself, so it never shows in git status or a commit.
+ */
+export const INCOMING_DIR = ".clubedge/incoming";
 export async function planUpdate(project, base, target) {
     const render = (side) => renderProject({
         source: side.source,
@@ -64,8 +69,28 @@ async function removeEmptyFolders(root, path) {
         folder = dirname(folder);
     }
 }
+/** The Starter's version of each file left for you: conflicts, and kept files it has a version of. */
+export function incomingFiles(plan) {
+    return plan.actions.flatMap((action) => (action.kind === "conflict" || action.kind === "keep") && action.incoming ? [{ path: action.path, content: action.incoming }] : []);
+}
+/** Replaces the previous change's incoming files with this change's. */
+async function writeIncoming(plan) {
+    const folder = join(plan.project.root, INCOMING_DIR);
+    await rm(folder, { recursive: true, force: true });
+    const files = incomingFiles(plan);
+    if (!files.length)
+        return;
+    await mkdir(dirname(folder), { recursive: true });
+    await writeFile(join(dirname(folder), ".gitignore"), "# Written by create-clubedge-app: the Starter's versions of files to compare. Delete when done.\n*\n");
+    for (const file of files) {
+        const path = join(folder, file.path);
+        await mkdir(dirname(path), { recursive: true });
+        await writeFile(path, file.content);
+    }
+}
 export async function applyUpdate(plan) {
     const { root } = plan.project;
+    await writeIncoming(plan);
     for (const action of plan.actions) {
         const path = join(root, action.path);
         if (action.kind === "delete") {

package/dist/modify.js

@@ -1,7 +1,7 @@
 // `add`, `remove`, and `upgrade` change an existing project. The project's recorded Starter
 // commit and modules (base) and the new state (target: other modules, or a newer Starter) are
 // rendered in memory, and the difference is merged into the project (see core/update.ts).
-import { confirm, isCancel, log, outro, select, spinner } from "@clack/prompts";
+import { confirm, isCancel, log, multiselect, outro, select, spinner } from "@clack/prompts";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import process from "node:process";
@@ -14,7 +14,7 @@ import { describeReleases, fetchReleases, releasesBetween } from "./core/release
 import { selectModules } from "./core/plan.js";
 import { readProject } from "./core/project.js";
 import { downloadGitHubTemplate, readDirectoryTemplate, resolveTemplateSource, } from "./core/source.js";
-import { applyUpdate, planUpdate } from "./core/update.js";
+import { applyUpdate, INCOMING_DIR, planUpdate } from "./core/update.js";
 import { cliVersion, starterPin } from "./package-info.js";
 import { installDependencies, resolvePnpm } from "./steps/install.js";
 import { commandSucceeds, runCapture } from "./utils/process.js";
@@ -99,13 +99,17 @@ export async function completeCommand(manifest, project, command, interactive) {
             ? "Usage: add <module> <option>, for example: add cache redis. Run it in a terminal to choose from a list."
             : "Usage: remove <module>, for example: remove storage. Run it in a terminal to choose from a list.");
     }
-    let moduleId = command.name === "add" ? command.changes[0]?.module : undefined;
-    if (!moduleId) {
+    // The modules: named on the command line, or picked from a list (several at once).
+    let moduleIds = command.name === "add" ? command.changes.map((change) => change.module) : [];
+    if (!moduleIds.length) {
         const choices = Object.entries(manifest.modules).filter(([id, module]) => command.name === "add" ? true : Boolean(module.options.none) && project.modules[id] !== "none");
         if (!choices.length)
             throw new UsageError("No module can be removed: every removable module is already none.");
-        const value = await select({
-            message: command.name === "add" ? "Which module do you want to add or switch?" : "Which module do you want to remove?",
+        const value = await multiselect({
+            message: command.name === "add"
+                ? "Which modules do you want to add or switch? (space to pick, enter to confirm)"
+                : "Which modules do you want to remove? (space to pick, enter to confirm)",
+            required: true,
             options: choices.map(([id, module]) => ({
                 value: id,
                 label: module.name,
@@ -114,28 +118,39 @@ export async function completeCommand(manifest, project, command, interactive) {
         });
         if (isCancel(value))
             return null;
-        moduleId = value;
+        moduleIds = value;
     }
     if (command.name === "remove")
-        return { name: "remove", modules: [moduleId] };
-    const module = manifest.modules[moduleId];
-    if (!module) {
-        throw new UsageError(`Unknown module "${moduleId}". Choose one of: ${Object.keys(manifest.modules).join(", ")}.`);
+        return { name: "remove", modules: moduleIds };
+    // Then an option for each module that was not given one. They apply together, so options that
+    // only work together (Supabase Auth with Supabase Storage) can be picked in one go.
+    const changes = [];
+    for (const moduleId of moduleIds) {
+        const given = command.changes.find((change) => change.module === moduleId)?.option;
+        if (given) {
+            changes.push({ module: moduleId, option: given });
+            continue;
+        }
+        const module = manifest.modules[moduleId];
+        if (!module) {
+            throw new UsageError(`Unknown module "${moduleId}". Choose one of: ${Object.keys(manifest.modules).join(", ")}.`);
+        }
+        const options = Object.keys(module.options).filter((id) => id !== project.modules[moduleId] && (moduleIds.length > 1 || available(manifest, project, moduleId, id)));
+        if (!options.length)
+            throw new UsageError(`${module.name} has no other option this project can use.`);
+        const option = await select({
+            message: `${module.name}: which option?`,
+            options: options.map((id) => ({
+                value: id,
+                label: module.options[id].name,
+                ...(id === module.default ? { hint: "default" } : {}),
+            })),
+        });
+        if (isCancel(option))
+            return null;
+        changes.push({ module: moduleId, option });
     }
-    const options = Object.keys(module.options).filter((id) => id !== project.modules[moduleId] && available(manifest, project, moduleId, id));
-    if (!options.length)
-        throw new UsageError(`${module.name} has no other option this project can use.`);
-    const option = await select({
-        message: `${module.name}: which option?`,
-        options: options.map((id) => ({
-            value: id,
-            label: module.options[id].name,
-            ...(id === module.default ? { hint: "default" } : {}),
-        })),
-    });
-    if (isCancel(option))
-        return null;
-    return { name: "add", changes: [{ module: moduleId, option }] };
+    return { name: "add", changes };
 }
 /**
  * The selection after add or remove, validated against the Starter's manifest. Every change
@@ -213,17 +228,24 @@ function describe(plan) {
 function report(plan) {
     const conflicts = plan.actions.filter((action) => action.kind === "conflict");
     const kept = plan.actions.filter((action) => action.kind === "keep");
+    const incoming = (path) => `${INCOMING_DIR}/${path}`;
     if (conflicts.length) {
         const blocks = conflicts.map((action) => countConflicts(action.content));
         const total = blocks.reduce((sum, count) => sum + count, 0);
+        const first = conflicts[0].path;
         log.warn(`Resolve ${total} ${total === 1 ? "conflict" : "conflicts"} in ${conflicts.length} ${conflicts.length === 1 ? "file" : "files"}. ` +
             "Each is marked <<<<<<< yours ... ======= ... >>>>>>> clubedge: keep your lines, the Starter's, or a mix, then delete the markers.\n" +
             conflicts
                 .map((action, i) => `  ${action.path} ${dim(`(${blocks[i]} ${blocks[i] === 1 ? "block" : "blocks"})`)}`)
-                .join("\n"));
+                .join("\n") +
+            `\n\nThe Starter's whole new version of each is in ${INCOMING_DIR}/, to compare with yours:\n` +
+            `  git diff --no-index ${first} ${incoming(first)}\n` +
+            dim(`Git ignores ${INCOMING_DIR.split("/")[0]}/; delete it when you are done.`));
     }
     if (kept.length) {
-        log.info(`Check these files by hand:\n${kept.map((action) => `  ${action.path}: ${action.reason}`).join("\n")}`);
+        log.info(`Check these files by hand:\n${kept
+            .map((action) => `  ${action.path}: ${action.reason}${action.incoming ? dim(` The Starter's version: ${incoming(action.path)}`) : ""}`)
+            .join("\n")}`);
     }
     if (plan.env && !plan.env.update) {
         log.info(`${plan.env.path} does not exist yet; create it from the example file.`);

package/dist/try.js

@@ -1,4 +1,4 @@
-import { cancel, confirm, isCancel, log, note, outro, spinner } from "@clack/prompts";
+import { cancel, confirm, isCancel, log, note, outro, select, spinner } from "@clack/prompts";
 import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
 import { userInfo } from "node:os";
 import { dirname } from "node:path";
@@ -6,7 +6,7 @@ import process from "node:process";
 import ssh2 from "ssh2";
 import { UsageError } from "./cli/args.js";
 import { bold, dim } from "./cli/ui.js";
-import { hostKeyFingerprint, parseRailwayStatus, projectTryProblem, proxySource, railwayFreeVmUrl, railwayHost, railwayKeyPath, railwayTermsUrl, remoteArchivePath, remoteDevLog, remoteLog, remoteName, remoteProxyPath, remoteScriptPath, shellQuote, trustedHostKeys, tryCreateArgs, tryModules, tryScript, } from "./core/railway.js";
+import { hostKeyFingerprint, lastVmPath, portForwardCommand, parseRailwayStatus, projectTryProblem, proxySource, railwayFreeVmUrl, railwayHost, railwayKeyPath, railwayTermsUrl, remoteArchivePath, remoteDevLog, remoteLog, remoteName, remoteProxyPath, remoteScriptPath, shellQuote, trustedHostKeys, tryCreateArgs, tryModules, tryScript, vmPhase, } from "./core/railway.js";
 import { ProjectError, readProject } from "./core/project.js";
 import { uploadableFiles } from "./core/upload.js";
 import { cliVersion } from "./package-info.js";
@@ -177,7 +177,94 @@ async function agree(args, keyPath, what) {
     const answer = await confirm({ message: "Create the VM?", initialValue: true });
     return !isCancel(answer) && answer;
 }
+async function saveLastVm(vm) {
+    const path = lastVmPath();
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, `${JSON.stringify(vm, null, 2)}\n`);
+}
+async function readLastVm() {
+    try {
+        return JSON.parse(await readFile(lastVmPath(), "utf8"));
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Claiming moves the VM into a Railway account, which is what makes the preview shareable: offer
+ * it at a terminal, or open it straight away with --claim. Nothing happens in scripts without it.
+ */
+async function offerClaim(args, atTerminal, claimUrl) {
+    let claim = args.claim;
+    if (!claim && atTerminal && !args.yes) {
+        const answer = await select({
+            message: "Share the preview with others?",
+            initialValue: "later",
+            options: [
+                { value: "later", label: "Not now", hint: "only you can open it, from this connection" },
+                { value: "claim", label: "Claim the VM", hint: "free Railway sign-up; then the URL works for anyone" },
+            ],
+        });
+        claim = !isCancel(answer) && answer === "claim";
+    }
+    if (!claim)
+        return;
+    if (atTerminal && (await openUrl(claimUrl)))
+        log.info("Opened the claim page. Sign up, pick a workspace, and the VM, its files, and its URL move to your account.");
+    else
+        log.info(`Claim the VM here: ${claimUrl}`);
+}
+/**
+ * The last VM, from what the CLI saved: its preview, time left, and claim link. It connects only
+ * while the VM is inside its 60 minutes, since connecting to a VM that is gone creates a new one.
+ */
+async function showStatus(keyPath) {
+    const last = await readLastVm();
+    if (!last) {
+        outro("No VM yet. Run try to create one.");
+        return;
+    }
+    const { phase, minutesLeft: left, claimUntil } = vmPhase(last);
+    if (phase === "gone") {
+        outro(`The last VM is gone: its claim window ended ${claimUntil.toLocaleString()}. Run try to create a new one.`);
+        return;
+    }
+    let app = dim("not checked");
+    if (phase === "running") {
+        const progress = spinner();
+        progress.start("Checking the app on the VM");
+        try {
+            const connection = await connect(await readFile(keyPath, "utf8"));
+            try {
+                const { stdout } = await exec(connection, "curl -s -o /dev/null -w '%{http_code}' http://127.0.0.1:3000/ || true");
+                app = /^[1-4]\d\d$/.test(stdout.trim()) ? "running" : "not answering";
+            }
+            finally {
+                connection.end();
+            }
+            progress.stop("Checked the app");
+        }
+        catch (error) {
+            progress.stop("Could not reach the VM");
+            app = dim(error instanceof Error ? error.message : String(error));
+        }
+    }
+    note([
+        `${bold("Preview")}  ${last.previewUrl}`,
+        `${bold("Project")}  ${last.directory}`,
+        `${bold("App")}      ${phase === "running" ? app : "stopped: the 60 minutes are over"}`,
+        phase === "running"
+            ? `${bold("Time")}     ${left} minutes left (until ${new Date(last.expiresAt).toLocaleTimeString()})`
+            : `${bold("Time")}     claimable until ${claimUntil.toLocaleString()}`,
+        `${bold("Claim")}    ${last.claimUrl}`,
+    ].join("\n"), "Your VM on Railway");
+    outro(phase === "running"
+        ? "Until you claim the VM, only this IP address can open the preview. Claim it to share the URL."
+        : "Claim the VM to keep it: its files and URL move to your Railway account.");
+}
 export async function tryOnRailway(args) {
+    if (args.status)
+        return await showStatus(railwayKeyPath());
     const what = await plan(args);
     const keyPath = railwayKeyPath();
     if (args.dryRun) {
@@ -255,14 +342,19 @@ export async function tryOnRailway(args) {
             `${bold("Claim")}    ${vm.claimUrl}`,
         ].join("\n"), "Your app on Railway");
         log.warn("Keep the claim link private: whoever opens it takes over the VM, its files, and its URL.");
-        // Only for a person at a terminal: scripts and CI get the URL above, and nothing opens.
-        if (args.open && process.stdout.isTTY && (await openUrl(vm.previewUrl)))
+        await saveLastVm({ previewUrl: vm.previewUrl, claimUrl: vm.claimUrl, expiresAt: vm.expiresAt.toISOString(), directory: `/app/${directory}` });
+        // Only for a person at a terminal: scripts and CI get the URLs above, and nothing opens.
+        const atTerminal = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+        if (args.open && atTerminal && (await openUrl(vm.previewUrl)))
             log.info("Opened the preview in your browser.");
+        await offerClaim(args, atTerminal, vm.claimUrl);
         outro([
-            "Until you claim the VM, the preview opens only from the IP address that created it. Claiming moves it to your Railway account and makes the URL shareable.",
+            "Until you claim the VM, only you can open the preview, from the IP address that created it. Another device on mobile data, a VPN, or anyone you send it to gets Railway's \"Access denied\" page. Claiming makes the URL shareable.",
             "",
-            `${dim("Shell")}  ssh -i "${keyPath}" ${railwayHost}`,
-            `${dim("Logs")}   ssh -i "${keyPath}" ${railwayHost} tail -f ${remoteDevLog}`,
+            `${dim("Status")}   ${dim("pnpm dlx @clubedge/create-clubedge-app try --status")}`,
+            `${dim("Local")}    ${portForwardCommand(keyPath)}  ${dim("then http://localhost:3000, from any network")}`,
+            `${dim("Shell")}    ssh -i "${keyPath}" ${railwayHost}`,
+            `${dim("Logs")}     ssh -i "${keyPath}" ${railwayHost} tail -f ${remoteDevLog}`,
         ].join("\n"));
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/create-clubedge-app",
-  "version": "0.19.1",
+  "version": "0.21.0",
   "description": "Create a Next.js or TanStack Start application from the Clubedge Starter reference implementation.",
   "type": "module",
   "packageManager": "pnpm@10.9.0",
@@ -22,8 +22,8 @@
   },
   "clubedge": {
     "starterRepository": "Clubedge/clubedge-starter",
-    "starterRef": "v0.15.0",
-    "starterCommit": "239f9e9fd575165d72f70a91592cafbd43bb7574"
+    "starterRef": "v0.16.0",
+    "starterCommit": "e233aa68ddc8c21df6cf2b01b9e26876d2e4aeca"
   },
   "license": "Apache-2.0",
   "repository": {
@@ -48,7 +48,8 @@
     "test": "vitest run",
     "bundle-template": "node scripts/bundle-template.mjs",
     "start": "pnpm build && node ./bin/create.mjs",
-    "prepack": "pnpm build"
+    "prepack": "pnpm build",
+    "release": "node scripts/release.mjs"
   },
   "dependencies": {
     "@clack/prompts": "^1.8.1",

package/template/.github/workflows/ci.yml

@@ -8,13 +8,13 @@ permissions:
   contents: read
 jobs:
   verify:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/postgres
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: 22
           cache: pnpm
@@ -44,11 +44,11 @@ jobs:
       - run: pnpm audit --audit-level high
 
   e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: 22
           cache: pnpm
@@ -57,7 +57,7 @@ jobs:
       - run: pnpm test:e2e
 
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:17
@@ -70,7 +70,7 @@ jobs:
         options: >-
           --health-cmd pg_isready --health-interval 5s --health-timeout 5s --health-retries 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - name: Build the production image
         run: docker build --tag app:ci .
       - name: Run the image's migrations twice; the second run changes nothing

package/template/.github/workflows/clubedge-upgrade.yml

@@ -0,0 +1,134 @@
+name: Starter upgrade
+
+# Checks every Monday for a newer Clubedge Starter release. When there is one, it runs
+# `pnpm clubedge upgrade` and opens a pull request with the release notes and anything left for
+# you to resolve, so your CI tests the upgrade before you merge it. Run it by hand from the
+# Actions tab, or delete this file to turn it off.
+#
+# It needs Settings -> Actions -> General -> "Allow GitHub Actions to create and approve pull
+# requests", or a CLUBEDGE_UPGRADE_TOKEN secret (a fine-grained token with contents and pull
+# requests write), which also lets the pull request start your CI by itself.
+on:
+  schedule:
+    - cron: "17 7 * * 1"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: write
+
+concurrency:
+  group: clubedge-upgrade
+  cancel-in-progress: false
+
+jobs:
+  upgrade:
+    # The Starter's own repository is the template every project comes from, not a project.
+    if: github.repository != 'Clubedge/clubedge-starter'
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
+      - uses: actions/setup-node@v7
+        with:
+          node-version: 22
+      - name: Upgrade to the newest Starter release
+        id: upgrade
+        shell: bash
+        run: |
+          before=$(node -p "require('./package.json').clubedge?.starterRef ?? ''")
+          if [ -z "$before" ]; then
+            echo "package.json records no Starter release: this project was not created by create-clubedge-app."
+            exit 1
+          fi
+          # The newest CLI upgrades to the Starter release it is pinned to.
+          pnpm dlx @clubedge/create-clubedge-app@latest upgrade --no-install 2>&1 | tee "$RUNNER_TEMP/upgrade.log"
+          after=$(node -p "require('./package.json').clubedge.starterRef")
+          if [ "$after" = "$before" ] && [ -z "$(git status --porcelain)" ]; then
+            echo "Already on the newest Starter release, $before."
+            exit 0
+          fi
+          branch="clubedge/upgrade-$after"
+          if git ls-remote --exit-code --heads origin "$branch" >/dev/null; then
+            echo "$branch already exists: its pull request is open, or was closed on purpose."
+            exit 0
+          fi
+          # The lockfile follows the upgraded package.json files; a conflict there can stop it.
+          install="updated"
+          pnpm install --no-frozen-lockfile >"$RUNNER_TEMP/install.log" 2>&1 || install="failed"
+          {
+            echo "before=$before"
+            echo "after=$after"
+            echo "branch=$branch"
+            echo "install=$install"
+            if [ -d .clubedge/incoming ]; then echo "incoming=true"; fi
+          } >>"$GITHUB_OUTPUT"
+      - name: Keep the Starter's versions of conflicted files
+        if: steps.upgrade.outputs.incoming == 'true'
+        uses: actions/upload-artifact@v7
+        with:
+          name: starter-versions
+          path: .clubedge/incoming/
+          include-hidden-files: true
+      - name: Open the pull request
+        if: steps.upgrade.outputs.branch != ''
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.CLUBEDGE_UPGRADE_TOKEN || github.token }}
+          OWN_TOKEN: ${{ secrets.CLUBEDGE_UPGRADE_TOKEN != '' }}
+          BEFORE: ${{ steps.upgrade.outputs.before }}
+          AFTER: ${{ steps.upgrade.outputs.after }}
+          BRANCH: ${{ steps.upgrade.outputs.branch }}
+          INSTALL: ${{ steps.upgrade.outputs.install }}
+          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git switch --create "$BRANCH"
+          git add --all
+          git commit --quiet --message "chore: upgrade to Clubedge Starter $AFTER"
+          git push --quiet --set-upstream origin "$BRANCH"
+
+          repository=$(node -p "require('./package.json').clubedge.starterRepository ?? 'Clubedge/clubedge-starter'")
+          conflicts=$(git grep -l '^<<<<<<< yours' -- . || true)
+          {
+            echo "Upgrades this project from Clubedge Starter \`$BEFORE\` to [\`$AFTER\`](https://github.com/$repository/releases/tag/$AFTER), with \`pnpm clubedge upgrade\`. Your own edits are merged in; files you never changed take the new version."
+            echo
+            if [ -n "$conflicts" ]; then
+              echo "### Conflicts to resolve"
+              echo
+              echo "These files have lines both you and the Starter changed, marked \`<<<<<<< yours\` ... \`>>>>>>> clubedge\`. Keep your lines, the Starter's, or a mix, then delete the markers:"
+              echo
+              printf -- '- `%s`\n' $conflicts
+              echo
+              echo "The Starter's whole new version of each is in the **starter-versions** artifact of [the run]($RUN_URL), to compare with yours."
+              echo
+            fi
+            if [ "$INSTALL" = "failed" ]; then
+              echo "### pnpm install"
+              echo
+              echo "\`pnpm install\` did not complete on the upgraded project, usually because of a conflict in a \`package.json\`. Resolve it, then run \`pnpm install\` and commit \`pnpm-lock.yaml\`."
+              echo
+            fi
+            echo "### Before merging"
+            echo
+            echo "- Read the [release notes](https://github.com/$repository/releases/tag/$AFTER) for anything to do by hand."
+            echo "- Run \`pnpm db:migrate\` for new migrations, and your tests."
+            echo
+            echo "<details><summary>Upgrade output</summary>"
+            echo
+            echo '```'
+            tail -n 80 "$RUNNER_TEMP/upgrade.log"
+            echo '```'
+            echo
+            echo "</details>"
+            echo
+            echo "Opened by the Starter upgrade workflow (\`.github/workflows/clubedge-upgrade.yml\`)."
+          } >"$RUNNER_TEMP/body.md"
+          gh pr create --base "${{ github.event.repository.default_branch }}" --head "$BRANCH" \
+            --title "chore: upgrade to Clubedge Starter $AFTER" --body-file "$RUNNER_TEMP/body.md"
+          # Pull requests opened with the default token start no workflows: start CI on the branch.
+          if [ "$OWN_TOKEN" != "true" ] && [ -f .github/workflows/ci.yml ]; then
+            gh workflow run ci.yml --ref "$BRANCH" || echo "Start CI on $BRANCH by hand."
+          fi

package/template/.github/workflows/deploy.yml

@@ -12,26 +12,26 @@ jobs:
   # Builds the production image and publishes it to this repository's GitHub Container Registry
   # as ghcr.io/<owner>/<repository>, tagged with the commit and latest. No secret is needed.
   image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/login-action@v3
+      - uses: actions/checkout@v7
+      - uses: docker/setup-buildx-action@v4
+      - uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
             type=sha
             type=raw,value=latest
-      - uses: docker/build-push-action@v6
+      - uses: docker/build-push-action@v7
         with:
           context: .
           push: true
@@ -40,9 +40,9 @@ jobs:
   # clubedge:end
   # clubedge:if deploy=fly
   fly:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: superfly/flyctl-actions/setup-flyctl@master
       # Builds on Fly's builders and runs the release command (migrations) before switching.
       - run: flyctl deploy --remote-only
@@ -51,9 +51,9 @@ jobs:
   # clubedge:end
   # clubedge:if deploy=railway
   railway:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       # Uploads this checkout; Railway builds the image and runs the pre-deploy migrations.
       - run: npx --yes @railway/cli@4 up --ci --service "$RAILWAY_SERVICE"
         env:
@@ -62,7 +62,7 @@ jobs:
   # clubedge:end
   # clubedge:if deploy=render
   render:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       # The service's deploy hook starts a deploy of its branch, with its pre-deploy migrations.
       - run: curl --fail --silent --show-error --request POST "$RENDER_DEPLOY_HOOK_URL"
@@ -71,15 +71,15 @@ jobs:
   # clubedge:end
   # clubedge:if deploy=vercel
   vercel:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
       VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: 22
           cache: pnpm
@@ -91,14 +91,14 @@ jobs:
   # clubedge:end
   # clubedge:if deploy=netlify
   netlify:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
       NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: 22
           cache: pnpm

package/template/apps/start/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/start",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template/apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/web",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "scripts": {

package/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clubedge-starter-v1",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "packageManager": "pnpm@10.9.0",

package/template/packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/auth",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template/packages/auth-better-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/auth-better-auth",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Better Auth adapter for @clubedge/auth, storing users and sessions in your own PostgreSQL.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/auth-supabase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/auth-supabase",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Supabase Auth adapter for @clubedge/auth.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/cache",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template/packages/cache-redis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/cache-redis",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Redis rate limiter and cache for @clubedge/cache.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/core",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template/packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/db",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template/packages/email/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/email",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Email interface, console and in-memory providers, and message templates.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/email-resend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/email-resend",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Resend provider for @clubedge/email, through Resend's HTTP API.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/email-smtp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/email-smtp",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "SMTP provider for @clubedge/email, for any SMTP server.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/jobs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/jobs",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Background jobs interface: job definitions, a queue contract, and an in-memory queue.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/jobs-pg-boss/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/jobs-pg-boss",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "pg-boss provider for @clubedge/jobs: a job queue stored in the project's PostgreSQL.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/local-db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/local-db",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "PostgreSQL for development without Docker: PGlite served over the PostgreSQL protocol.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/local-db/src/server.test.ts

@@ -8,11 +8,12 @@ describe("serveLocalPostgres", () => {
   let server: LocalPostgresServer;
   let url: string;
 
+  // Starting PGlite takes seconds on a busy CI runner.
   beforeAll(async () => {
     db = await PGlite.create();
     server = await serveLocalPostgres(db, { port: 0 });
     url = `postgresql://postgres:postgres@127.0.0.1:${server.port}/postgres`;
-  });
+  }, 30_000);
 
   afterAll(async () => {
     await server.close();
@@ -115,5 +116,5 @@ describe("LocalPostgresServer.close", () => {
       await client.end({ timeout: 0 });
       await db.close();
     }
-  });
+  }, 30_000);
 });

package/template/packages/observability/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/observability",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Observability interface: error reports and spans for @clubedge/core's telemetry hooks, and an in-memory provider for tests.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/observability-otel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/observability-otel",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "OpenTelemetry provider for @clubedge/observability: traces and error logs exported over OTLP to any collector.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/observability-sentry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/observability-sentry",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Sentry provider for @clubedge/observability: server and browser errors, traces, and source map uploads.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/payments/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/payments",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Provider-neutral payments: the PaymentProvider interface, billing logic, and subscription tables.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/payments/src/billing.test.ts

@@ -2,7 +2,7 @@ import { PGlite } from "@electric-sql/pglite";
 import { drizzle } from "drizzle-orm/pglite";
 import { migrate } from "drizzle-orm/pglite/migrator";
 import { fileURLToPath } from "node:url";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { users, type Database } from "@clubedge/db";
 import { createBilling, findSubscription, isEntitled, NoBillingAccountError } from "./billing";
 import { subscriptions } from "./schema";
@@ -10,7 +10,7 @@ import type { PaymentEvent, PaymentProvider, SubscriptionSnapshot } from "./type
 
 const folder = (path: string) => fileURLToPath(new URL(path, import.meta.url));
 
-/** A fresh PostgreSQL (PGlite) with the app's and the payment migrations applied. */
+/** A PostgreSQL (PGlite) with the app's and the payment migrations applied. */
 async function database() {
   const client = await PGlite.create();
   const db = drizzle({ client });
@@ -20,7 +20,19 @@ async function database() {
     migrationsTable: "__drizzle_migrations_payments",
   });
   // The query builder is the same as the postgres.js driver's that the app uses.
-  return db as unknown as Database;
+  return { client, db: db as unknown as Database };
+}
+
+/** Empties the app's tables; the migration records live in the drizzle schema and stay. */
+async function emptyTables(client: PGlite) {
+  const { rows } = await client.query<{ name: string }>(
+    "select tablename as name from pg_tables where schemaname = 'public'",
+  );
+  if (rows.length) {
+    await client.exec(
+      `truncate ${rows.map(({ name }) => `"${name}"`).join(", ")} restart identity cascade`,
+    );
+  }
 }
 
 /** A provider whose next webhook event the test chooses. */
@@ -53,11 +65,22 @@ const snapshot = (
 const request = { body: "{}", headers: new Headers() };
 
 describe("createBilling", () => {
+  let client: PGlite;
   let db: Database;
   let userId: string;
 
+  // One database for the file: starting PGlite and migrating takes seconds on a busy CI runner,
+  // so each test starts from empty tables instead of a new database.
+  beforeAll(async () => {
+    ({ client, db } = await database());
+  }, 60_000);
+
+  afterAll(async () => {
+    await client.close();
+  });
+
   beforeEach(async () => {
-    db = await database();
+    await emptyTables(client);
     const [user] = await db
       .insert(users)
       .values({ email: "ada@example.com" })

package/template/packages/payments-stripe/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/payments-stripe",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Stripe provider for @clubedge/payments: Checkout, the customer portal, and verified webhooks.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/storage",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template/packages/storage-s3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/storage-s3",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "S3-compatible adapter for @clubedge/storage.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/storage-supabase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/storage-supabase",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Supabase Storage adapter for @clubedge/storage.",
   "private": true,
   "license": "Apache-2.0",

package/template/packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clubedge/ui",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "license": "Apache-2.0",
   "type": "module",

package/template.lock.json

@@ -1,7 +1,7 @@
 {
   "repository": "Clubedge/clubedge-starter",
-  "ref": "v0.15.0",
-  "commit": "239f9e9fd575165d72f70a91592cafbd43bb7574",
+  "ref": "v0.16.0",
+  "commit": "e233aa68ddc8c21df6cf2b01b9e26876d2e4aeca",
   "files": [
     ".dockerignore",
     ".env.example",
@@ -11,6 +11,7 @@
     ".github/ISSUE_TEMPLATE/feature_request.yml",
     ".github/pull_request_template.md",
     ".github/workflows/ci.yml",
+    ".github/workflows/clubedge-upgrade.yml",
     ".github/workflows/deploy.yml",
     "_gitignore",
     ".prettierignore",