@samebase/convex-hosting 0.14.0 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 0.15.0
+
+- A request reads no database. The deploy writes the version's assets into
+  `.convex-hosting/version.js` (each path's content hash, content type, and stored file, in the
+  layout of Cloudflare's asset manifest), and the HTTP action answers from them. A page, a miss, a
+  redirect, a 304, and a session refresh cost one function call, the HTTP action, where they cost
+  two; an answer with a body costs two, the action and the download of the file, where it cost
+  three. The component's `route` query is gone.
+- Breaking: `routeAll` takes one object, with every input named, and the assets in place of the
+  version id:
+
+  ```ts
+  import { assets } from "../.convex-hosting/version.js";
+
+  routeAll({ http, component: components.hosting, assets, worker: server });
+  ```
+
+  A files-only site leaves `worker` out. `assets` and `worker` are Cloudflare's names: the static
+  assets of a Worker, and the Worker script. The file exports only `assets`: the query that reloads
+  open tabs reads `assets.versionId` in place of `versionId`. A test that mocks the version module
+  adds `assets: { format: 1, versionId: "test", markToken: "test", files: null }`.
+
+- After the push, `deploy` sends one request with the version's mark token, and the code that
+  answers marks its version live; before, the first request did. `markLive` answers what it did and
+  never throws. It takes the time the request arrived and refuses a mark when another version went
+  live after it: a mark that was still running when another deploy's push and mark landed deleted
+  the entries of the version that serves.
+- A first install pushes twice: once to install the component, and once after the upload, to serve
+  the site.
+- A version file uploaded to another deployment, such as production's pushed to development by a
+  running `npx convex dev`, answers 404 naming that deployment.
+
 ## 0.14.0
 
 - The README, which this package ships, starts with what the component is, who it is for, and the

package/README.md

@@ -6,15 +6,18 @@ A [Convex component](https://www.convex.dev/components/samebase/convex-hosting)
 app's built files and server-rendered pages from the deployment that runs its backend, at
 `https://<deployment>.convex.site`.
 
-Use it when the backend is on Convex and the frontend should be served from the same deployment,
-including a [TanStack Start](https://tanstack.com/start) app with server-side rendering.
+Use it when the backend is on Convex and the frontend should be served from the same deployment: a
+[TanStack Start](https://tanstack.com/start) app whose pages render on the server, or a files-only
+site.
 
 ## Quick start
 
-Requires Node 22 or later and `convex` 1.46 or later.
+Requires Node 22 or later and `convex` 1.46 or later. These steps set up a
+[TanStack Start](https://tanstack.com/start) app whose pages render on the server; a site without a
+server skips the three server steps, see [Files only](#files-only).
 
 ```sh
-npm install @samebase/convex-hosting
+npm install @samebase/convex-hosting @samebase/convex-hosting-tanstack-start
 ```
 
 `convex/convex.config.ts` mounts the component:
@@ -29,18 +32,38 @@ app.use(hosting);
 export default app;
 ```
 
-`convex/http.ts` registers the site, every method at every path, as every request reaches a
-Cloudflare Worker:
+`vite.config.ts` adds the adapter's plugin before TanStack Start's. It builds `src/server.ts` as the
+server entry and sets the build up for Convex's runtime:
+
+```ts
+import { convexSsr } from "@samebase/convex-hosting-tanstack-start/vite";
+
+export default defineConfig({
+  plugins: [convexSsr(), tanstackStart(), react()],
+});
+```
+
+`src/server.ts` is that entry. The adapter's handler renders every request that no file answers:
+
+```ts
+export { default } from "@samebase/convex-hosting-tanstack-start/server";
+```
+
+`convex/http.ts` registers the site, every method at every path: a file for a path that has one, the
+server build for every other request, as a Cloudflare Worker with static assets does:
 
 ```ts
 import { httpRouter } from "convex/server";
 import { routeAll } from "@samebase/convex-hosting";
 import { components } from "./_generated/api.js";
-import { versionId } from "../.convex-hosting/version.js";
+import { assets } from "../.convex-hosting/version.js";
+// Type only, nothing is bundled: the server build imported below.
+import type {} from "@samebase/convex-hosting-tanstack-start/server-build";
+import server from "../dist/server/server.js";
 
 const http = httpRouter();
 
-routeAll(http, components.hosting, versionId);
+routeAll({ http, component: components.hosting, assets, worker: server });
 
 export default http;
 ```
@@ -48,38 +71,48 @@ export default http;
 Deploy:
 
 ```sh
-npx convex-hosting deploy --build "vite build" --dist dist
+npx convex-hosting deploy --build "vite build" --dist dist/client
 ```
 
-It builds, uploads `dist`, pushes the functions, and prints
-`Deployed version <id> to https://<deployment>.convex.site.` A site with no build omits `--build`; a
-single-page app adds `--not-found-handling single-page-application`. Deploy production with this
-command, never with a plain `npx convex deploy`: a plain push names the version of this checkout's
-last deploy, often another deployment's, and the site answers 404 until the next
-`convex-hosting deploy`.
+It builds, uploads `dist/client`, pushes the functions with the server build, and prints
+`Deployed version <id> to https://<deployment>.convex.site.` Deploy production with this command,
+never with a plain `npx convex deploy`: a plain push names the version of this checkout's last
+deploy, often another deployment's, and the site answers 404 until the next `convex-hosting deploy`.
 
 On a fresh clone, the first push of `npx convex dev` fails: `convex/http.ts` imports
-`.convex-hosting/version.js`, which only a deploy writes. `npx convex dev` keeps running after that
-error, so the first run is two terminals, for a cloud, local, or anonymous deployment alike:
+`.convex-hosting/version.js` and `dist/server/server.js`, which only a deploy writes.
+`npx convex dev` keeps running after that error, so the first run is two terminals, for a cloud,
+local, or anonymous deployment alike:
 
 ```sh
 npx convex dev   # creates your dev deployment and .env.local; keep it running
 ```
 
 ```sh
-npx convex-hosting deploy --dev --build "vite build" --dist dist
+npx convex-hosting deploy --dev --build "vite build" --dist dist/client
 ```
 
-The deploy writes the version file and pushes; the watcher in the first terminal shows its error
-until the next change under `convex/`, and works as usual from then on.
+The deploy writes the version file, builds, and pushes; the watcher in the first terminal shows its
+error until the next change under `convex/`, and works as usual from then on.
+
+The pages get the request's data, such as a session, through a `src/server.ts` that wraps the
+adapter's handler and passes a `context`; the
+[adapter's README](https://github.com/samebase/convex-hosting/tree/main/packages/convex-hosting-tanstack-start)
+has that, the loaders, and the settings. Convex Auth sessions in httpOnly cookies come from
+[`@samebase/convex-auth-tanstack-start`](https://github.com/samebase/convex-hosting/tree/main/packages/convex-auth-tanstack-start),
+which runs on any host; the
+[tanstack-ssr example](https://github.com/samebase/convex-hosting/tree/main/examples/tanstack-ssr)
+wires both.
 
-## Server-rendered pages
+## Files only
 
-An app that renders pages passes its server entry as the fourth argument of `routeAll`. The entry
-takes the place of a Worker script: an object with `fetch(request)` that answers what no file
-answers. TanStack Start has
-[an adapter](https://github.com/samebase/convex-hosting/tree/main/packages/convex-hosting-tanstack-start),
-with streamed pages, server functions, server routes, request middleware, and cookie sessions.
+A site without a server leaves `worker` out,
+`routeAll({ http, component: components.hosting, assets })`, needs no adapter package, and deploys
+its build directory: `--dist dist` after a `vite build`, or `--dist public` with no `--build` at
+all. A single-page app adds `--not-found-handling single-page-application`. The
+[tanstack-spa](https://github.com/samebase/convex-hosting/tree/main/examples/tanstack-spa) and
+[hello-world-assets-only](https://github.com/samebase/convex-hosting/tree/main/examples/hello-world-assets-only)
+examples are such sites.
 
 ## Examples
 
@@ -128,7 +161,7 @@ inside a Convex HTTP action, so `_headers`, `_redirects`, `.assetsignore`, `html
 `not_found_handling` mean what they mean on Cloudflare.
 
 This repository's CI runs Cloudflare's own tests against it: its
-[196 cases](https://github.com/samebase/convex-hosting/blob/main/packages/convex-hosting/src/component/conformance.test.ts)
+[196 cases](https://github.com/samebase/convex-hosting/blob/main/packages/convex-hosting/src/client/answer.test.ts)
 for `html_handling` and path encoding, and its
 [integration test](https://github.com/samebase/convex-hosting/tree/main/packages/convex-hosting/src/workers-sdk/fixtures/workers-with-assets-only)
 for a files-only site, with its imports pointed at this package, on a local Convex deployment.
@@ -152,13 +185,15 @@ lists what differs and how to move an app.
 On Cloudflare, `wrangler deploy` uploads the files and the Worker code as one version, so the switch
 is atomic. Here two systems hold the two halves: the component's storage holds the files, and
 `npx convex deploy` pushes the code. `deploy` binds them the same way. It uploads the files as a new
-version, writes that version's id to `.convex-hosting/version.js`, and then pushes the code, which
-imports the file and asks the component for exactly that version. The push is the switch: no pointer
-moves in a second step, so there is no moment when new code serves old files, and no page refers to
-a file that is not uploaded yet. The first request the new code serves marks its version live and
-deletes the versions that were live before it. A version whose push never came is deleted at a later
-switch, once it is a day old; nothing is deleted by the clock alone. The one rule: run one deploy at
-a time per deployment. The
+version, writes that version's id and its files (each path's stored file, in the layout of
+Cloudflare's asset manifest) to `.convex-hosting/version.js`, and then pushes the code, which
+imports the file. The push is the switch: no pointer moves in a second step, so there is no moment
+when new code serves old files, and no page refers to a file that is not uploaded yet. A request
+reads no database: it costs one function call, the HTTP action, and a file adds the download of its
+bytes, which Convex counts as a call too. After the push, `deploy` asks the served code to mark its
+version live, which deletes the versions that were live before it. A version whose push never came
+is deleted at a later switch, once it is a day old; nothing is deleted by the clock alone. The one
+rule: run one deploy at a time per deployment. The
 [design](https://github.com/samebase/convex-hosting/blob/main/docs/design.md#orderings-and-timing)
 works through every interleaving.
 

package/dist/cli/convex.d.ts

@@ -66,6 +66,12 @@ export declare function probeComponent(cli: Cli, target: Target): Promise<string
  * and it is the custom domain when the dashboard's "Override Environment Variables" sets one.
  */
 export declare function siteUrl(cli: Cli, flags: string[]): Promise<string>;
+/**
+ * Evaluates `code` as an inline query in the component and validates its result. An inline query
+ * runs whatever release of this package the component's functions are, so the upload of a new
+ * release reads with it before the push has installed the new functions.
+ */
+export declare function runComponentQuery<T>(cli: Cli, target: Target, code: string, result: z.ZodType<T>): Promise<T>;
 /**
  * Runs a function of the component with `npx convex run` and validates its result. The Convex CLI
  * prints the result as JSON from another process, so `result` checks it at runtime; its type makes

package/dist/cli/convex.js

@@ -14,7 +14,9 @@ export const nodeCli = {
     cwd: process.cwd(),
     env: process.env,
     convex: (args) => new Promise((resolve) => {
-        execFile(process.execPath, [convexBin(process.cwd()), ...args], { encoding: "utf8" }, (error, stdout, stderr) => {
+        execFile(process.execPath, [convexBin(process.cwd()), ...args], 
+        // A page of storage URLs can pass Node's default of 1 MiB.
+        { encoding: "utf8", maxBuffer: 64 * 1024 * 1024 }, (error, stdout, stderr) => {
             const exitCode = error === null ? 0 : typeof error.code === "number" ? error.code : 1;
             resolve({ exitCode, stdout, stderr });
         });
@@ -103,6 +105,25 @@ export async function siteUrl(cli, flags) {
     }
     return z.string().parse(JSON.parse(stdout));
 }
+/**
+ * Evaluates `code` as an inline query in the component and validates its result. An inline query
+ * runs whatever release of this package the component's functions are, so the upload of a new
+ * release reads with it before the push has installed the new functions.
+ */
+export async function runComponentQuery(cli, target, code, result) {
+    const { exitCode, stdout, stderr } = await cli.convex([
+        "run",
+        "--component",
+        target.component,
+        "--inline-query",
+        code,
+        ...target.flags,
+    ]);
+    if (exitCode !== 0) {
+        throw new Error(stderr.trim() || stdout.trim() || `npx convex run --inline-query exited with ${exitCode}.`);
+    }
+    return result.parse(JSON.parse(stdout));
+}
 /**
  * Runs a function of the component with `npx convex run` and validates its result. The Convex CLI
  * prints the result as JSON from another process, so `result` checks it at runtime; its type makes

package/dist/cli/convex.js.map

@@ -1 +1 @@
-{"version":3,"file":"convex.js","sourceRoot":"","sources":["../../src/cli/convex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"convex.js","sourceRoot":"","sources":["../../src/cli/convex.ts"],"names":[],"mappings":"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"}

package/dist/cli/files.js

@@ -4,7 +4,7 @@ import { join, relative } from "node:path";
 import { constructHeaders, constructRedirects, } from "../workers-sdk/packages/workers-shared/utils/configuration/constructConfiguration.js";
 import { parseHeaders } from "../workers-sdk/packages/workers-shared/utils/configuration/parseHeaders.js";
 import { parseRedirects } from "../workers-sdk/packages/workers-shared/utils/configuration/parseRedirects.js";
-import { HEADERS_FILENAME, MAX_ASSET_SIZE, REDIRECTS_FILENAME, } from "../workers-sdk/packages/workers-shared/utils/constants.js";
+import { HEADERS_FILENAME, MAX_ASSET_COUNT, MAX_ASSET_SIZE, REDIRECTS_FILENAME, } from "../workers-sdk/packages/workers-shared/utils/constants.js";
 import { createAssetsIgnoreFunction, getContentType, maybeGetFile, normalizeFilePath, } from "../workers-sdk/packages/workers-shared/utils/helpers.js";
 /**
  * Convex limits a document to 1 MiB. The version document holds the config next to two short
@@ -45,6 +45,11 @@ export async function readDist(dist, handling, log) {
                 walk(file);
             }
             else if (stats.isFile() && !assetsIgnoreFunction(ignorePath)) {
+                // Cloudflare's limit per Worker version on its Paid plan, 100,000 files.
+                if (entries.length === MAX_ASSET_COUNT) {
+                    throw new Error(`${dist} has more than ${MAX_ASSET_COUNT.toLocaleString("en-US")} files, Cloudflare's ` +
+                        "limit per Worker version. List the files that are not served in .assetsignore.");
+                }
                 const bytes = readFileSync(file);
                 // Cloudflare's limit per asset, 25 MiB. The HTTP action that serves a file cannot answer
                 // more than Convex's 100 MiB response limit anyway.

package/dist/cli/files.js.map

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/cli/files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/cli/files.ts"],"names":[],"mappings":"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"}

package/dist/cli/main.js

@@ -1,13 +1,16 @@
 import { randomUUID } from "node:crypto";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync, } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync, } from "node:fs";
 import { join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
 import { z } from "zod";
+import { ASSETS_FORMAT, MARK_HEADER, MARK_PATH, } from "../client/manifest.js";
 import { internal } from "../component/_generated/api.js";
 import { AssetConfigSchema } from "../workers-sdk/packages/workers-shared/utils/types.js";
-import { deploymentSelector, probeComponent, readConvexEnv, runComponent, siteUrl, } from "./convex.js";
+import { deploymentSelector, probeComponent, readConvexEnv, runComponent, runComponentQuery, siteUrl, } from "./convex.js";
 import { readDist } from "./files.js";
+import { buildAssetFiles } from "./manifest.js";
+import { siteConfig } from "./site-config.js";
 const USAGE = `Usage:
   convex-hosting deploy --dist <dir> [options]
       Runs the build, if any, stores the site files, and pushes the functions. The push switches
@@ -35,6 +38,11 @@ export const VERSION_FILE = join(STATE_DIR, "version.js");
  * `deploy` then uploads after the push.
  */
 const FIRST_INSTALL_MARKER = join(STATE_DIR, "first-install");
+/**
+ * Entries per inline query that reads the storage URLs: 2,000 entries and their `_storage`
+ * documents are 4,000 of the 32,000 documents a query may read, and about 300 KB of result.
+ */
+const URL_PAGE = 2000;
 /** Files that the upload sends to storage at once. */
 const UPLOAD_CONCURRENCY = 4;
 /**
@@ -132,9 +140,9 @@ function quote(arg) {
     return process.platform === "win32" ? `"${arg}"` : `'${arg.replaceAll("'", `'\\''`)}'`;
 }
 /**
- * Builds, uploads, writes the version file, and pushes. The push is the switch: the first request
- * that the new code serves marks its version live. Then it reports the site URL, for a person and,
- * through `$GITHUB_OUTPUT`, for the next step of a GitHub Actions job.
+ * Builds, uploads, writes the version file, and pushes. The push is the switch. Then it asks the
+ * served code to mark its version live, and reports the site URL, for a person and, through
+ * `$GITHUB_OUTPUT`, for the next step of a GitHub Actions job.
  */
 async function deploy(cli, options, build) {
     // A deploy key wins over every selector in the Convex CLI, so a production key in the environment
@@ -187,6 +195,7 @@ async function deploy(cli, options, build) {
         const message = error instanceof Error ? error.message : String(error);
         throw new Error(`Deployed version ${versionId}, but reading the site URL failed: ${message}`);
     }
+    await markServedVersion(cli, url, readVersionFile(cli));
     cli.log(`Deployed version ${versionId} to ${url}.`);
     if (cli.env.GITHUB_OUTPUT)
         appendFileSync(cli.env.GITHUB_OUTPUT, `url=${url}\n`);
@@ -197,7 +206,7 @@ async function deploy(cli, options, build) {
  * reads `VITE_CONVEX_URL`). Then the upload runs here, and `npx convex run --push` pushes, with an inline
  * query at the app's root, which exists before the push installs the component. It works whether
  * or not `npx convex dev` runs; `npx convex dev --once` refuses while it runs a local deployment's
- * backend.
+ * backend. A first install pushes, uploads, and pushes again.
  */
 async function deployDev(cli, options, target, versionId, build) {
     if (build !== undefined) {
@@ -208,13 +217,21 @@ async function deployDev(cli, options, target, versionId, build) {
     const missing = await upload(cli, options, target, versionId);
     if (missing !== undefined)
         cli.log(notInstalledYet(options.component));
+    await pushDev(cli);
+    if (missing !== undefined) {
+        await uploadAfterPush(cli, options, target, versionId);
+        await pushDev(cli);
+    }
+}
+async function pushDev(cli) {
     const exitCode = await cli.convexInherited(["run", "--push", "--inline-query", "null"]);
     if (exitCode !== 0)
         throw new Error(`npx convex run --push failed with exit code ${exitCode}.`);
-    if (missing !== undefined)
-        await uploadAfterPush(cli, options, target, versionId);
 }
-/** Production or a preview: the build, if any, and the upload run inside `npx convex deploy --cmd`. */
+/**
+ * Production or a preview: the build, if any, and the upload run inside `npx convex deploy --cmd`.
+ * A first install uploads after that push and pushes again with `npx convex deploy`.
+ */
 async function deployWithConvexDeploy(cli, options, target, versionId, build) {
     const marker = join(cli.cwd, FIRST_INSTALL_MARKER);
     rmSync(marker, { force: true });
@@ -250,8 +267,12 @@ async function deployWithConvexDeploy(cli, options, target, versionId, build) {
     rmSync(marker, { force: true });
     if (exitCode !== 0)
         throw new Error(`npx convex deploy failed with exit code ${exitCode}.`);
-    if (firstInstall)
+    if (firstInstall) {
         await uploadAfterPush(cli, options, target, versionId);
+        const again = await cli.convexInherited(["deploy", ...deployFlags]);
+        if (again !== 0)
+            throw new Error(`npx convex deploy failed with exit code ${again}.`);
+    }
 }
 /** The upload inside `npx convex deploy --cmd`. On a first install, `deploy` uploads after the push. */
 async function uploadInsideDeploy(cli, options, versionId) {
@@ -265,7 +286,7 @@ async function uploadInsideDeploy(cli, options, versionId) {
     }
 }
 function notInstalledYet(component) {
-    return `The component "${component}" is not installed yet. The push installs it, and the upload runs after the push.`;
+    return `The component "${component}" is not installed yet. The push installs it, the upload runs after the push, and a second push serves the site.`;
 }
 /** The upload of a first install, after the push. The probe's output shows a mistyped `--component`. */
 async function uploadAfterPush(cli, options, target, versionId) {
@@ -276,17 +297,19 @@ async function uploadAfterPush(cli, options, target, versionId) {
     }
 }
 /**
- * Uploads `--dist` as version `versionId` and writes the version file. When the component is not
- * installed yet, it writes only the version file, so that the push that follows installs the
- * component, and returns the probe's output.
+ * Uploads `--dist` as version `versionId` and writes the version file with the site's files. When
+ * the component is not installed yet, it writes a version file without files, which serves
+ * nothing, so that the push that follows installs the component, and returns the probe's output.
  */
 async function upload(cli, options, target, versionId) {
     const dist = resolve(cli.cwd, options.dist);
     const { config, entries } = await readDist(dist, options, cli.log);
     const generateUploadUrls = (count) => runComponent(cli, target, internal.lib.generateUploadUrls, { count }, z.array(z.string()).length(count));
+    // The CLI sends it after the push; see `MARK_HEADER`.
+    const markToken = randomUUID();
     const missing = await probeComponent(cli, target);
     if (missing !== undefined) {
-        writeVersionFile(cli, versionId);
+        writeVersionFile(cli, { format: ASSETS_FORMAT, versionId, markToken, files: null });
         return missing;
     }
     cli.log(`Uploading version ${versionId}: ${entries.length} files.`);
@@ -350,21 +373,116 @@ async function upload(cli, options, target, versionId) {
         await record(uploaded);
     }
     await runComponent(cli, target, internal.lib.finishVersion, { versionId }, z.null());
-    writeVersionFile(cli, versionId);
+    const files = await assetFiles(cli, target, versionId, config, entries);
+    writeVersionFile(cli, { format: ASSETS_FORMAT, versionId, markToken, files });
     cli.log(`Uploaded version ${versionId} and wrote ${VERSION_FILE}.`);
     return undefined;
 }
-function writeVersionFile(cli, versionId) {
-    writeStateFile(cli, VERSION_FILE, `export const versionId = ${JSON.stringify(versionId)};\n`);
+/**
+ * The files of the site that serving reads: the storage URL of each entry, which only the
+ * component can make, read with inline queries in the component, which work whatever release of
+ * this package its functions are, and the deployment's `CONVEX_CLOUD_URL`, their origin.
+ */
+async function assetFiles(cli, target, versionId, config, entries) {
+    const urls = new Map();
+    let cloudUrl = "";
+    let after = "";
+    for (;;) {
+        const page = await runComponentQuery(cli, target, `const rows = await ctx.db.query("entries").withIndex("by_version_path", (q) => ` +
+            `q.eq("versionId", ${JSON.stringify(versionId)}).gt("path", ${JSON.stringify(after)}))` +
+            `.take(${URL_PAGE}); return { cloudUrl: process.env.CONVEX_CLOUD_URL, files: await ` +
+            `Promise.all(rows.map(async (row) => [row.path, await ctx.storage.getUrl(row.storageId)])) };`, z.object({
+            cloudUrl: z.string(),
+            files: z.array(z.tuple([z.string(), z.string().nullable()])),
+        }));
+        cloudUrl = page.cloudUrl;
+        for (const [path, url] of page.files) {
+            if (url === null) {
+                throw new Error(`The stored file of ${path} is gone, deleted by the age rule; run the deploy again.`);
+            }
+            urls.set(path, url);
+        }
+        if (page.files.length < URL_PAGE)
+            break;
+        after = page.files[page.files.length - 1][0];
+    }
+    return buildAssetFiles(cloudUrl, siteConfig(config), entries.map(({ path, sha256, contentType }) => {
+        const url = urls.get(path);
+        if (url === undefined)
+            throw new Error(`Version ${versionId} has no entry for ${path}.`);
+        return { path, sha256, contentType, url };
+    }));
 }
-/** Writes a file of the state folder, and the folder's `.gitignore` when it is absent. */
+/** The line of the version file that holds the assets. */
+const ASSETS_LINE = "export const assets = ";
+/**
+ * Writes the version file. The assets carry their type as JSDoc: Convex's default
+ * `convex/tsconfig.json` sets `allowJs`, so tsc reads this file instead of the package's
+ * declaration, and would infer `string` where `Assets` has a union of literals.
+ */
+function writeVersionFile(cli, assets) {
+    writeStateFile(cli, VERSION_FILE, `/** @type {import("@samebase/convex-hosting").Assets} */\n` +
+        `${ASSETS_LINE}${JSON.stringify(assets)};\n`);
+}
+/** The id and the mark token of the assets in the version file that the upload wrote. */
+function readVersionFile(cli) {
+    const line = readFileSync(join(cli.cwd, VERSION_FILE), "utf8")
+        .split("\n")
+        .find((text) => text.startsWith(ASSETS_LINE));
+    if (line === undefined)
+        throw new Error(`${VERSION_FILE} has no assets.`);
+    return z
+        .object({ versionId: z.string(), markToken: z.string() })
+        .parse(JSON.parse(line.slice(ASSETS_LINE.length, -1)));
+}
+/**
+ * Asks the code that the deployment serves to mark its version live, with the site's mark token,
+ * which only the code of this deploy has. A failure deletes nothing: the versions live before stay
+ * until a later deploy marks its own, so it is reported, and the deploy succeeds.
+ */
+async function markServedVersion(cli, url, site) {
+    const later = `Version ${site.versionId} serves, and the next deploy deletes the files of the versions before it.`;
+    let answer;
+    try {
+        // A redirect would carry the token to another origin, so it counts as other code answering.
+        const response = await cli.fetch(url + MARK_PATH, {
+            method: "POST",
+            headers: { [MARK_HEADER]: site.markToken },
+            redirect: "manual",
+        });
+        // Other code answers the path with a page or a 404, which is no mark.
+        answer = response.ok ? await response.json().catch(() => null) : null;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        cli.log(`Asking the site to mark version ${site.versionId} live failed: ${message}. ${later}`);
+        return;
+    }
+    const parsed = z.object({ versionId: z.string(), result: z.string() }).safeParse(answer);
+    if (!parsed.success || parsed.data.versionId !== site.versionId) {
+        cli.log(`The site did not answer as version ${site.versionId}, so its code is not this deploy's.`);
+        return;
+    }
+    const { result } = parsed.data;
+    if (result === "superseded") {
+        cli.log(`Another version went live over ${site.versionId}, so a deploy overlapped this one; ${later}`);
+    }
+    else if (result !== "marked" && result !== "live") {
+        cli.log(`Version ${site.versionId} could not be marked live: it is ${result}.`);
+    }
+}
+/**
+ * Writes a file of the state folder, and the folder's `.gitignore` when it is absent. It writes a
+ * temporary file and renames it, so a running `npx convex dev` never reads half a file.
+ */
 function writeStateFile(cli, path, body) {
     const gitignore = join(cli.cwd, STATE_DIR, ".gitignore");
     if (!existsSync(gitignore)) {
         mkdirSync(join(cli.cwd, STATE_DIR), { recursive: true });
         writeFileSync(gitignore, "*\n");
     }
-    writeFileSync(join(cli.cwd, path), body);
+    writeFileSync(join(cli.cwd, `${path}.tmp`), body);
+    renameSync(join(cli.cwd, `${path}.tmp`), join(cli.cwd, path));
 }
 /** Stores one file through an upload URL and returns its storage id; `what` names it in errors. */
 async function store(cli, url, body, contentType, what) {