@micacms/runtime 0.4.1 → 0.5.0-rc.2

package/dist/routes/admin-staging.js

@@ -1,23 +1,22 @@
 /**
- * Admin staging routes — the pending change set, and Publish.
- *
- * Thin, like the content routes: the two staging implementations own every
- * rule, and what happens here is parsing and the mapping of their refusals
- * onto the API's error envelope.
- *
- * `committed-pending-push` is a 200, deliberately. The commit is real and the
- * state is recoverable by design; an error status would make the editor treat
- * a publication that half-happened as one that did not happen at all.
+ * Admin routes for the pending changes and Publish. Sync and conflict
+ * resolution exist only for a clone that Mica keeps. `committed-pending-push`
+ * is a 200: the commit is real, and an error status would tell the editor that
+ * nothing happened.
  */
-import { ConflictError } from "@micacms/connectors";
 import { Hono } from "hono";
 import { z } from "zod";
-import { ApiError, badRequest } from "../lib/errors.js";
 import { actorOf } from "../http.js";
+import { ApiError, badRequest } from "../lib/errors.js";
+import { ConflictError } from "../workspace/files.js";
 const publishSchema = z.object({
     message: z.string().max(500),
-    /** The base revision the editor reviewed. Null where the workspace has none. */
-    expectedBase: z.string().nullable().optional(),
+    /** The reviewed paths, with the revision each had in the review. */
+    paths: z.record(z.string().min(1), z.string().nullable()),
+});
+const resolveSchema = z.object({
+    group: z.string().min(1),
+    choice: z.enum(["mine", "website"]),
 });
 const discardSchema = z.object({ paths: z.array(z.string().min(1)).min(1).max(2000) });
 const compareSchema = z.discriminatedUnion("kind", [
@@ -52,8 +51,7 @@ export function adminStagingRoutes() {
         const { staging } = c.get("ctx").services;
         return c.json(await staging.status());
     });
-    // The document one pending change touches, before and after that change —
-    // raw data on both sides; the editor renders the comparison from the model.
+    // Raw data before and after one pending change; the editor renders the comparison.
     app.get("/changes/compare", async (c) => {
         const { staging } = c.get("ctx").services;
         const parsed = compareSchema.safeParse({
@@ -65,7 +63,8 @@ export function adminStagingRoutes() {
         });
         if (!parsed.success)
             throw badRequest("The compare target is malformed.");
-        return c.json(await staging.compare(parsed.data));
+        const against = c.req.query("against") === "origin" ? "origin" : "head";
+        return c.json(await staging.compare(parsed.data, against));
     });
     app.post("/publish", async (c) => {
         const { staging } = c.get("ctx").services;
@@ -75,8 +74,8 @@ export function adminStagingRoutes() {
         const actor = actorOf(c);
         const result = await handled(() => staging.publish({
             message: parsed.data.message,
-            expectedBase: parsed.data.expectedBase ?? null,
-            author: actor ? { name: actor.email, email: actor.email } : undefined,
+            paths: parsed.data.paths,
+            author: actor ? { name: actor.name || actor.email, email: actor.email } : undefined,
         }));
         return c.json(result);
     });
@@ -84,6 +83,20 @@ export function adminStagingRoutes() {
         const { staging } = c.get("ctx").services;
         return c.json(await handled(() => staging.push()));
     });
+    // "Try again" after a sync error.
+    app.post("/sync", async (c) => {
+        const { staging } = c.get("ctx").services;
+        await staging.sync();
+        return c.json(await staging.status());
+    });
+    app.post("/changes/resolve", async (c) => {
+        const { staging } = c.get("ctx").services;
+        const parsed = resolveSchema.safeParse(await jsonBody(c));
+        if (!parsed.success)
+            throw badRequest("Expected a group and a choice: mine or website.");
+        await handled(() => staging.resolve(parsed.data.group, parsed.data.choice));
+        return c.json(await staging.status());
+    });
     app.post("/changes/discard", async (c) => {
         const { staging } = c.get("ctx").services;
         const parsed = discardSchema.safeParse(await jsonBody(c));

package/dist/routes/admin-staging.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-staging.js","sourceRoot":"","sources":["../../src/routes/admin-staging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"admin-staging.js","sourceRoot":"","sources":["../../src/routes/admin-staging.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Admin routes for the pending changes and Publish. Sync and conflict\n * resolution exist only for a clone that Mica keeps. `committed-pending-push`\n * is a 200: the commit is real, and an error status would tell the editor that\n * nothing happened.\n */\n\nimport { Hono } from \"hono\";\nimport { z } from \"zod\";\n\nimport { actorOf, type Env } from \"../http.js\";\nimport { ApiError, badRequest } from \"../lib/errors.js\";\nimport { ConflictError } from \"../workspace/files.js\";\n\nconst publishSchema = z.object({\n  message: z.string().max(500),\n  /** The reviewed paths, with the revision each had in the review. */\n  paths: z.record(z.string().min(1), z.string().nullable()),\n});\n\nconst resolveSchema = z.object({\n  group: z.string().min(1),\n  choice: z.enum([\"mine\", \"website\"]),\n});\n\nconst discardSchema = z.object({ paths: z.array(z.string().min(1)).min(1).max(2000) });\n\nconst compareSchema = z.discriminatedUnion(\"kind\", [\n  z.object({\n    kind: z.literal(\"entry\"),\n    collection: z.string().min(1),\n    slug: z.string().min(1),\n    from: z.string().min(1).optional(),\n  }),\n  z.object({ kind: z.literal(\"singleton\"), name: z.string().min(1) }),\n  z.object({ kind: z.literal(\"order\"), collection: z.string().min(1) }),\n]);\n\nasync function jsonBody(c: { req: { json(): Promise<unknown> } }): Promise<unknown> {\n  return c.req.json().catch(() => {\n    throw badRequest(\"The request body must be valid JSON.\");\n  });\n}\n\n/** A repository conflict is 409 and recoverable — refresh, review, retry. */\nasync function handled<T>(run: () => Promise<T>): Promise<T> {\n  try {\n    return await run();\n  } catch (error) {\n    if (error instanceof ConflictError) throw new ApiError(\"conflict\", error.message);\n    throw error;\n  }\n}\n\nexport function adminStagingRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  app.get(\"/changes\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    return c.json(await staging.status());\n  });\n\n  // Raw data before and after one pending change; the editor renders the comparison.\n  app.get(\"/changes/compare\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = compareSchema.safeParse({\n      kind: c.req.query(\"kind\"),\n      collection: c.req.query(\"collection\"),\n      slug: c.req.query(\"slug\"),\n      from: c.req.query(\"from\"),\n      name: c.req.query(\"name\"),\n    });\n    if (!parsed.success) throw badRequest(\"The compare target is malformed.\");\n    const against = c.req.query(\"against\") === \"origin\" ? \"origin\" : \"head\";\n\n    return c.json(await staging.compare(parsed.data, against));\n  });\n\n  app.post(\"/publish\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = publishSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"The publish payload is malformed.\");\n\n    const actor = actorOf(c);\n    const result = await handled(() =>\n      staging.publish({\n        message: parsed.data.message,\n        paths: parsed.data.paths,\n        author: actor ? { name: actor.name || actor.email, email: actor.email } : undefined,\n      }),\n    );\n\n    return c.json(result);\n  });\n\n  app.post(\"/publish/push\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    return c.json(await handled(() => staging.push()));\n  });\n\n  // \"Try again\" after a sync error.\n  app.post(\"/sync\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    await staging.sync();\n    return c.json(await staging.status());\n  });\n\n  app.post(\"/changes/resolve\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = resolveSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"Expected a group and a choice: mine or website.\");\n\n    await handled(() => staging.resolve(parsed.data.group, parsed.data.choice));\n    return c.json(await staging.status());\n  });\n\n  app.post(\"/changes/discard\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = discardSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"Expected a list of change paths.\");\n\n    return c.json(await handled(() => staging.discard(parsed.data.paths)));\n  });\n\n  return app;\n}\n"]}

package/dist/routes/admin-system.d.ts

@@ -1,12 +1,6 @@
 /**
- * Schema, dashboard and system information.
- *
- * The schema endpoint is what makes the admin generic: the SPA ships no
- * knowledge of any particular collection, it renders whatever this returns.
- *
- * There is no publish route. Publishing is a commit, and the commit happened
- * when the editor pressed Save; what follows belongs to the repository's CI,
- * which Mica neither owns nor should pretend to.
+ * Schema, dashboard and system information. The SPA knows no collection; it
+ * renders what `/schema` returns.
  */
 import { Hono } from "hono";
 import type { Env } from "../http.js";

package/dist/routes/admin-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin-system.d.ts","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,CA6J7C"}
+{"version":3,"file":"admin-system.d.ts","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,CAgI7C"}

package/dist/routes/admin-system.js

@@ -1,12 +1,6 @@
 /**
- * Schema, dashboard and system information.
- *
- * The schema endpoint is what makes the admin generic: the SPA ships no
- * knowledge of any particular collection, it renders whatever this returns.
- *
- * There is no publish route. Publishing is a commit, and the commit happened
- * when the editor pressed Save; what follows belongs to the repository's CI,
- * which Mica neither owns nor should pretend to.
+ * Schema, dashboard and system information. The SPA knows no collection; it
+ * renders what `/schema` returns.
  */
 import { Hono } from "hono";
 import { listedFields, resolveSlugField, resolveTitleField } from "@micacms/core";
@@ -16,11 +10,7 @@ import { VERSION } from "../lib/version.js";
 import { formatBytes } from "../services/media.js";
 export function adminSystemRoutes() {
     const app = new Hono();
-    /**
-     * The content model, plus the few derived values the UI would otherwise have
-     * to recompute. Field descriptors are already plain data, so the model
-     * serialises as-is.
-     */
+    /** The content model, plus the derived values that the UI would otherwise recompute. */
     app.get("/schema", (c) => {
         const { site } = c.get("ctx");
         return c.json({
@@ -47,8 +37,6 @@ export function adminSystemRoutes() {
     app.get("/overview", async (c) => {
         const ctx = c.get("ctx");
         const { content, media } = ctx.services;
-        // Read from the repository rather than counted in SQL. A count that can
-        // disagree with the files is worse than no count.
         const collections = await Promise.all(Object.values(ctx.site.model.collections).map(async (def) => ({
             name: def.name,
             label: def.label,
@@ -66,16 +54,8 @@ export function adminSystemRoutes() {
         });
     });
     /**
-     * What this deployment is and what it is serving.
-     *
-     * Answers the questions that otherwise need shell access: which version is
-     * running, which content model it was handed, how large the database has
-     * grown, how this deployment decides who may edit it.
-     *
-     * All of it goes to everybody who is admitted. There is no administrator
-     * role to withhold it from: admission is configuration, so the people who
-     * reach this endpoint are exactly the people the operator named. No secret
-     * value is returned anywhere, only whether one is set.
+     * What this deployment is and serves. Every admitted editor sees it, because
+     * there is no administrator role. It never returns a secret value.
      */
     app.get("/system", async (c) => {
         const ctx = c.get("ctx");
@@ -85,9 +65,8 @@ export function adminSystemRoutes() {
         const files = await ctx.services.media.list();
         const mediaBytes = files.reduce((sum, file) => sum + file.size, 0);
         const uptimeSeconds = Math.floor(process.uptime());
-        // The composition's own facts — database, authentication, admission —
-        // come from the app. The runtime cannot know them, which is the point.
         const operational = ctx.operational();
+        const repository = await ctx.services.staging.repository();
         return c.json({
             cms: {
                 version: VERSION,
@@ -101,48 +80,34 @@ export function adminSystemRoutes() {
                 totals: stats.totals,
                 kinds: stats.kinds,
                 relations: stats.relations,
-                // Entry counts alongside the shape, because "8 fields, 0 entries" is
-                // the pair that tells an editor a collection was never filled in.
                 collections: stats.collections.map((item) => ({
                     ...item,
                     entries: counts[item.name] ?? 0,
                 })),
                 singletons: stats.singletons,
             },
-            /**
-             * Deliberately two separate things. `repository` is where the website's
-             * content lives and what must be backed up — by Git, which is doing it
-             * already. `database` is the composition's operational state, and null
-             * where the composition has none: the local editor keeps no database at
-             * all.
-             */
             repository: {
                 origin: ctx.site.contentRepository.origin,
                 entries: Object.values(counts).reduce((sum, count) => sum + count, 0),
                 media: { files: files.length, bytes: mediaBytes, readable: formatBytes(mediaBytes) },
+                ...repository,
             },
-            database: operational.database,
             deployment: {
                 site: ctx.site.id,
                 baseUrl: config.MICA_PUBLIC_URL,
                 schemaOrigin: schemaOrigin(ctx.site.contentRepository),
-                repositoryMode: config.REPOSITORY,
-                // Only meaningful for the local connector; a remote one names itself
-                // in `repository.origin` above.
-                contentRoot: config.REPOSITORY === "local" ? config.contentRoot : null,
+                // A clone that Mica keeps names its remote in `repository.url` instead.
+                contentRoot: repository.owner === "developer" ? config.contentRoot : null,
                 dataDir: operational.dataDir ?? null,
                 logLevel: config.LOG_LEVEL,
                 maxUploadBytes: config.MAX_UPLOAD_BYTES,
                 maxUploadReadable: formatBytes(config.MAX_UPLOAD_BYTES),
                 sessionTtlHours: operational.sessionTtlHours ?? null,
                 sessionIdleHours: operational.sessionIdleHours ?? null,
-                /** How this deployment authenticates, in words. */
                 auth: operational.auth,
-                /** What decides who may edit here, in the operator's own words. */
                 admission: operational.admission ?? null,
                 trustProxy: config.TRUST_PROXY,
                 adminOrigins: config.adminOrigins,
-                /** Names of the secrets this process generated for itself. */
                 generatedSecrets: operational.generatedSecrets ?? [],
                 memoryBytes: process.memoryUsage().rss,
             },

package/dist/routes/admin-system.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-system.js","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"admin-system.js","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Schema, dashboard and system information. The SPA knows no collection; it\n * renders what `/schema` returns.\n */\n\nimport { Hono } from \"hono\";\n\nimport { listedFields, resolveSlugField, resolveTitleField } from \"@micacms/core\";\n\nimport type { Env } from \"../http.js\";\nimport { schemaStats } from \"../lib/schema-stats.js\";\nimport { schemaOrigin } from \"../schema.js\";\nimport { VERSION } from \"../lib/version.js\";\nimport { formatBytes } from \"../services/media.js\";\n\nexport function adminSystemRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  /** The content model, plus the derived values that the UI would otherwise recompute. */\n  app.get(\"/schema\", (c) => {\n    const { site } = c.get(\"ctx\");\n\n    return c.json({\n      collections: Object.values(site.model.collections).map((def) => ({\n        name: def.name,\n        label: def.label,\n        labelSingular: def.labelSingular ?? def.label,\n        description: def.description ?? null,\n        sortable: def.sortable ?? false,\n        defaultSort: def.defaultSort ?? null,\n        titleField: resolveTitleField(def),\n        slugField: resolveSlugField(def),\n        listedFields: listedFields(def),\n        fields: def.fields,\n      })),\n      singletons: Object.values(site.model.singletons).map((def) => ({\n        name: def.name,\n        label: def.label,\n        description: def.description ?? null,\n        fields: def.fields,\n      })),\n    });\n  });\n\n  app.get(\"/overview\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const { content, media } = ctx.services;\n\n    const collections = await Promise.all(\n      Object.values(ctx.site.model.collections).map(async (def) => ({\n        name: def.name,\n        label: def.label,\n        total: (await content.list(def.name)).length,\n      })),\n    );\n\n    const files = await media.list();\n\n    return c.json({\n      collections,\n      media: {\n        files: files.length,\n        bytes: files.reduce((sum, file) => sum + file.size, 0),\n        readable: formatBytes(files.reduce((sum, file) => sum + file.size, 0)),\n      },\n      repository: ctx.site.contentRepository.origin,\n    });\n  });\n\n  /**\n   * What this deployment is and serves. Every admitted editor sees it, because\n   * there is no administrator role. It never returns a secret value.\n   */\n  app.get(\"/system\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const { config } = ctx;\n\n    const stats = schemaStats(ctx.site.model);\n\n    const counts = Object.fromEntries(\n      await Promise.all(\n        Object.values(ctx.site.model.collections).map(\n          async (def) => [def.name, (await ctx.services.content.list(def.name)).length] as const,\n        ),\n      ),\n    );\n\n    const files = await ctx.services.media.list();\n    const mediaBytes = files.reduce((sum, file) => sum + file.size, 0);\n\n    const uptimeSeconds = Math.floor(process.uptime());\n\n    const operational = ctx.operational();\n    const repository = await ctx.services.staging.repository();\n\n    return c.json({\n      cms: {\n        version: VERSION,\n        environment: config.NODE_ENV,\n        node: process.version,\n        platform: `${process.platform}/${process.arch}`,\n        startedAt: new Date(Date.now() - uptimeSeconds * 1000).toISOString(),\n        uptimeSeconds,\n      },\n      schema: {\n        totals: stats.totals,\n        kinds: stats.kinds,\n        relations: stats.relations,\n        collections: stats.collections.map((item) => ({\n          ...item,\n          entries: counts[item.name] ?? 0,\n        })),\n        singletons: stats.singletons,\n      },\n      repository: {\n        origin: ctx.site.contentRepository.origin,\n        entries: Object.values(counts).reduce((sum, count) => sum + count, 0),\n        media: { files: files.length, bytes: mediaBytes, readable: formatBytes(mediaBytes) },\n        ...repository,\n      },\n      deployment: {\n        site: ctx.site.id,\n        baseUrl: config.MICA_PUBLIC_URL,\n        schemaOrigin: schemaOrigin(ctx.site.contentRepository),\n        // A clone that Mica keeps names its remote in `repository.url` instead.\n        contentRoot: repository.owner === \"developer\" ? config.contentRoot : null,\n        dataDir: operational.dataDir ?? null,\n        logLevel: config.LOG_LEVEL,\n        maxUploadBytes: config.MAX_UPLOAD_BYTES,\n        maxUploadReadable: formatBytes(config.MAX_UPLOAD_BYTES),\n        sessionTtlHours: operational.sessionTtlHours ?? null,\n        sessionIdleHours: operational.sessionIdleHours ?? null,\n        auth: operational.auth,\n        admission: operational.admission ?? null,\n        trustProxy: config.TRUST_PROXY,\n        adminOrigins: config.adminOrigins,\n        generatedSecrets: operational.generatedSecrets ?? [],\n        memoryBytes: process.memoryUsage().rss,\n      },\n    });\n  });\n\n  return app;\n}\n"]}

package/dist/routes/health.d.ts

@@ -1,14 +1,7 @@
 /**
- * Health endpoints for container orchestration and uptime monitoring.
- *
- *   /health  the process answers. No I/O: a provider outage must not restart
- *            a container that would not be any better for it.
- *   /ready   the database, where the composition has one, and the content
- *            repository. Cached, because each probe spends one call of the
- *            repository token's quota and anybody can ask.
- *
- * Neither answer names the repository or the uptime: the endpoints are public,
- * and the System view shows both to editors (#79).
+ * `/health` does no I/O, so a repository outage does not restart the container.
+ * `/ready` checks the content repository and is cached because it is public.
+ * Neither names the repository or the uptime.
  */
 import { Hono } from "hono";
 import type { Env } from "../http.js";

package/dist/routes/health.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAUtC,MAAM,WAAW,aAAa;IAC5B,6CAA6C;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,wBAAgB,YAAY,CAAC,OAAO,GAAE,aAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAmBnE"}
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,WAAW,aAAa;IAC5B,6CAA6C;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,wBAAgB,YAAY,CAAC,OAAO,GAAE,aAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAmBnE"}

package/dist/routes/health.js

@@ -1,14 +1,7 @@
 /**
- * Health endpoints for container orchestration and uptime monitoring.
- *
- *   /health  the process answers. No I/O: a provider outage must not restart
- *            a container that would not be any better for it.
- *   /ready   the database, where the composition has one, and the content
- *            repository. Cached, because each probe spends one call of the
- *            repository token's quota and anybody can ask.
- *
- * Neither answer names the repository or the uptime: the endpoints are public,
- * and the System view shows both to editors (#79).
+ * `/health` does no I/O, so a repository outage does not restart the container.
+ * `/ready` checks the content repository and is cached because it is public.
+ * Neither names the repository or the uptime.
  */
 import { Hono } from "hono";
 export function healthRoutes(options = {}) {
@@ -30,21 +23,12 @@ export function healthRoutes(options = {}) {
 async function probe(c) {
     const ctx = c.get("ctx");
     const logger = c.get("logger");
-    let database;
-    // A probe only where the composition has a database. The local editor does
-    // not, and a health check must not invent one to report on.
-    if (ctx.health.database) {
-        try {
-            ctx.health.database();
-            database = "ok";
-        }
-        catch (error) {
-            logger.error("Health check failed", { error: String(error) });
-            database = "unavailable";
-        }
+    // A managed clone knows whether it can be edited without asking the remote.
+    if (ctx.health.ready) {
+        const { ok, reasons } = ctx.health.ready();
+        return { status: ok ? "ok" : "error", repository: ok ? "ok" : "unavailable", reasons };
     }
-    // `list` on a missing root returns an empty array rather than throwing, so
-    // this proves reachability, not that anyone has written content yet.
+    // `list` on a missing root returns an empty array, so this proves reachability only.
     let repository = "ok";
     try {
         await ctx.site.contentRepository.list("");
@@ -53,7 +37,6 @@ async function probe(c) {
         logger.error("Content repository is unreachable", { error: String(error) });
         repository = "unavailable";
     }
-    const ok = repository === "ok" && database !== "unavailable";
-    return { status: ok ? "ok" : "error", ...(database ? { database } : {}), repository };
+    return { status: repository === "ok" ? "ok" : "error", repository };
 }
 //# sourceMappingURL=health.js.map

package/dist/routes/health.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAkB1C,MAAM,UAAU,YAAY,CAAC,UAAyB,EAAE;IACtD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC;IAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,6EAA6E;IAC7E,IAAI,MAAM,GAAsD,IAAI,CAAC;IAErE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAO,CAAC;IAE5B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEpD,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC;YAC5C,MAAM,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACnC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,CAAe;IAClC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,QAA2B,CAAC;IAEhC,2EAA2E;IAC3E,4DAA4D;IAC5D,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtB,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9D,QAAQ,GAAG,aAAa,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,2EAA2E;IAC3E,qEAAqE;IACrE,IAAI,UAAU,GAAU,IAAI,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5E,UAAU,GAAG,aAAa,CAAC;IAC7B,CAAC;IAED,MAAM,EAAE,GAAG,UAAU,KAAK,IAAI,IAAI,QAAQ,KAAK,aAAa,CAAC;IAC7D,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC;AACxF,CAAC"}
+{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAmB1C,MAAM,UAAU,YAAY,CAAC,UAAyB,EAAE;IACtD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC;IAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,6EAA6E;IAC7E,IAAI,MAAM,GAAsD,IAAI,CAAC;IAErE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAO,CAAC;IAE5B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEpD,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,OAAO,EAAE,CAAC;YAC5C,MAAM,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACnC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,CAAe;IAClC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE/B,4EAA4E;IAC5E,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC3C,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC;IACzF,CAAC;IAED,qFAAqF;IACrF,IAAI,UAAU,GAAU,IAAI,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5E,UAAU,GAAG,aAAa,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;AACtE,CAAC","sourcesContent":["/**\n * `/health` does no I/O, so a repository outage does not restart the container.\n * `/ready` checks the content repository and is cached because it is public.\n * Neither names the repository or the uptime.\n */\n\nimport { Hono, type Context } from \"hono\";\n\nimport type { Env } from \"../http.js\";\n\ntype Check = \"ok\" | \"unavailable\";\n\ninterface Readiness {\n  status: \"ok\" | \"error\";\n  repository: Check;\n  /** Short codes from the composition, such as `sync_failing`. */\n  reasons?: string[];\n}\n\nexport interface HealthOptions {\n  /** How long a readiness result is reused. */\n  cacheMs?: number;\n  now?: () => number;\n}\n\nexport function healthRoutes(options: HealthOptions = {}): Hono<Env> {\n  const cacheMs = options.cacheMs ?? 30_000;\n  const now = options.now ?? Date.now;\n  // The promise, not the result: requests that arrive during a probe share it.\n  let cached: { at: number; result: Promise<Readiness> } | null = null;\n\n  const app = new Hono<Env>();\n\n  app.get(\"/health\", (c) => c.json({ status: \"ok\" }));\n\n  app.get(\"/ready\", async (c) => {\n    if (!cached || now() - cached.at >= cacheMs) {\n      cached = { at: now(), result: probe(c) };\n    }\n    const result = await cached.result;\n    return c.json(result, result.status === \"ok\" ? 200 : 503);\n  });\n\n  return app;\n}\n\nasync function probe(c: Context<Env>): Promise<Readiness> {\n  const ctx = c.get(\"ctx\");\n  const logger = c.get(\"logger\");\n\n  // A managed clone knows whether it can be edited without asking the remote.\n  if (ctx.health.ready) {\n    const { ok, reasons } = ctx.health.ready();\n    return { status: ok ? \"ok\" : \"error\", repository: ok ? \"ok\" : \"unavailable\", reasons };\n  }\n\n  // `list` on a missing root returns an empty array, so this proves reachability only.\n  let repository: Check = \"ok\";\n  try {\n    await ctx.site.contentRepository.list(\"\");\n  } catch (error) {\n    logger.error(\"Content repository is unreachable\", { error: String(error) });\n    repository = \"unavailable\";\n  }\n\n  return { status: repository === \"ok\" ? \"ok\" : \"error\", repository };\n}\n"]}

package/dist/schema.d.ts

@@ -1,21 +1,7 @@
 /**
- * Acquiring the content model at runtime.
- *
- * The server ships with no model of its own. It reads one out of the content
- * repository, at `.mica/schema.json`, through the same connector it reads
- * entries with. The Astro project writes that file and the developer commits
- * it, so the model reaches the server the way content does — no artifact to
- * mount, no second channel to keep in step, and a model change that is
- * reviewable in a diff.
- *
- * That is what lets one published image serve any project: the model is plain
- * data (field descriptors hold no functions, so `JSON.stringify(site)`
- * round-trips), and every consumer downstream — form generation, payload
- * validation, the admin — already reads it out of the request context.
- *
- * Whatever arrives is re-validated as if it had just been written by hand. A
- * manifest from a repository is untrusted input: it may have been produced by a
- * different version of `@micacms/core`, hand-edited, or truncated.
+ * Reads the content model from `.mica/schema.json` in the content repository.
+ * The Astro project writes it. The manifest is untrusted input (another core
+ * version, hand-edited or truncated), so it is validated again here.
  */
 import { type ContentSource, type Site } from "@micacms/core";
 export declare class SchemaError extends Error {
@@ -24,33 +10,19 @@ export declare class SchemaError extends Error {
 /** Where a model came from, for logs and the system screen. */
 export declare function schemaOrigin(source: ContentSource): string;
 /**
- * Reads the model the content repository publishes.
- *
- * A missing file is the interesting failure and gets the long message: it is
- * what a first deployment hits, and the fix — build the Astro project, commit
- * the result — is not guessable from "not found".
+ * Reads the model from the content repository. A missing file gets a long
+ * message because a first deployment hits it.
  */
 export declare function loadSchema(source: ContentSource): Promise<Site>;
 /**
- * Re-runs the checks `defineSite` performs on a hand-written model, plus the
- * one it does not: that every `kind` is a kind this build knows about.
- *
- * `defineSite` assumes its input came from the typed builders, so it never
- * questions a `kind`. Field kinds reach a `switch` with no default when a form
- * is rendered and when a payload is validated, so an unknown one surfaces as an
- * incoherent failure much later, on an editor's screen. Catching it here turns
- * a version mismatch between the project's `@micacms/core` and the image's
- * into a startup error that names the field.
+ * Runs the `defineSite` checks, and also refuses an unknown field `kind`, which
+ * `defineSite` does not check. This turns a core version mismatch into a
+ * startup error, not a later failure on an editor's screen.
  */
 export declare function checkSchema(raw: unknown, origin?: string): Site;
 /**
- * A stable short digest of a model, for spotting drift.
- *
- * Logged at startup and returned by the schema endpoint so that a website built
- * against one model and a CMS serving another is a visible mismatch rather than
- * a puzzling absence of fields. Key order follows the model's own declaration
- * order, which is meaningful here — reordering fields reorders the admin form,
- * so it is a real change and should produce a different digest.
+ * A short digest of a model, to show drift. Field order counts, because it is
+ * the order of the admin form.
  */
 export declare function schemaFingerprint(site: Site): Promise<string>;
 //# sourceMappingURL=schema.d.ts.map

package/dist/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAQL,KAAK,aAAa,EAGlB,KAAK,IAAI,EACV,MAAM,eAAe,CAAC;AAEvB,qBAAa,WAAY,SAAQ,KAAK;IAC3B,IAAI,SAAiB;CAC/B;AAED,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAE1D;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BrE;AAWD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,SAAe,GAAG,IAAI,CAuErE;AA0BD;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAQL,KAAK,aAAa,EAGlB,KAAK,IAAI,EACV,MAAM,eAAe,CAAC;AAEvB,qBAAa,WAAY,SAAQ,KAAK;IAC3B,IAAI,SAAiB;CAC/B;AAED,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAE1D;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BrE;AAWD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,SAAe,GAAG,IAAI,CAiDrE;AA0BD;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE"}

package/dist/schema.js

@@ -1,21 +1,7 @@
 /**
- * Acquiring the content model at runtime.
- *
- * The server ships with no model of its own. It reads one out of the content
- * repository, at `.mica/schema.json`, through the same connector it reads
- * entries with. The Astro project writes that file and the developer commits
- * it, so the model reaches the server the way content does — no artifact to
- * mount, no second channel to keep in step, and a model change that is
- * reviewable in a diff.
- *
- * That is what lets one published image serve any project: the model is plain
- * data (field descriptors hold no functions, so `JSON.stringify(site)`
- * round-trips), and every consumer downstream — form generation, payload
- * validation, the admin — already reads it out of the request context.
- *
- * Whatever arrives is re-validated as if it had just been written by hand. A
- * manifest from a repository is untrusted input: it may have been produced by a
- * different version of `@micacms/core`, hand-edited, or truncated.
+ * Reads the content model from `.mica/schema.json` in the content repository.
+ * The Astro project writes it. The manifest is untrusted input (another core
+ * version, hand-edited or truncated), so it is validated again here.
  */
 import { checkCompatibility, defineSite, isFieldKind, isProtocolManifest, MANIFEST_PATH, PROTOCOL_VERSION, } from "@micacms/core";
 export class SchemaError extends Error {
@@ -26,11 +12,8 @@ export function schemaOrigin(source) {
     return `${source.origin}/${MANIFEST_PATH}`;
 }
 /**
- * Reads the model the content repository publishes.
- *
- * A missing file is the interesting failure and gets the long message: it is
- * what a first deployment hits, and the fix — build the Astro project, commit
- * the result — is not guessable from "not found".
+ * Reads the model from the content repository. A missing file gets a long
+ * message because a first deployment hits it.
  */
 export async function loadSchema(source) {
     const origin = schemaOrigin(source);
@@ -39,8 +22,7 @@ export async function loadSchema(source) {
         text = await source.read(MANIFEST_PATH);
     }
     catch (error) {
-        // A repository that cannot be reached is not a bad model. Say which it is,
-        // because the two have completely different fixes.
+        // An unreachable repository is not a bad model; the fixes are different.
         throw new SchemaError(`Could not read the content model from ${source.origin}.\n` +
             `  ${error.message}\n` +
             `  The repository has to be reachable before Mica can start: the model\n` +
@@ -64,23 +46,15 @@ function describeMissing(origin) {
         `  then commit ${MANIFEST_PATH} and push it to the branch Mica is reading.`);
 }
 /**
- * Re-runs the checks `defineSite` performs on a hand-written model, plus the
- * one it does not: that every `kind` is a kind this build knows about.
- *
- * `defineSite` assumes its input came from the typed builders, so it never
- * questions a `kind`. Field kinds reach a `switch` with no default when a form
- * is rendered and when a payload is validated, so an unknown one surfaces as an
- * incoherent failure much later, on an editor's screen. Catching it here turns
- * a version mismatch between the project's `@micacms/core` and the image's
- * into a startup error that names the field.
+ * Runs the `defineSite` checks, and also refuses an unknown field `kind`, which
+ * `defineSite` does not check. This turns a core version mismatch into a
+ * startup error, not a later failure on an editor's screen.
  */
 export function checkSchema(raw, origin = "the schema") {
     if (raw === null || typeof raw !== "object") {
         throw new SchemaError(`${origin} is ${raw === null ? "null" : typeof raw}, expected an object.`);
     }
-    // Only when the envelope says so. A bare `{ collections }` is still accepted:
-    // the protocol version is a backstop for changes that cannot be detected by
-    // looking, not an admission ticket.
+    // A bare `{ collections }` without the protocol envelope is also accepted.
     if (isProtocolManifest(raw)) {
         const compatibility = checkCompatibility(raw);
         if (!compatibility.ok && compatibility.reason === "newer") {
@@ -93,10 +67,7 @@ export function checkSchema(raw, origin = "the schema") {
     if (candidate.collections === null || typeof candidate.collections !== "object") {
         throw new SchemaError(`${origin} has no \`collections\`. Expected defineSite({ collections: { ... } }).`);
     }
-    // `globals` was the term before the model settled on `singletons`. A manifest
-    // outlives the release that produced it, so both spellings are read here;
-    // only the new one is written anywhere.
-    const rawSingletons = candidate.singletons ?? candidate.globals;
+    const rawSingletons = candidate.singletons;
     if (rawSingletons !== undefined && (rawSingletons === null || typeof rawSingletons !== "object")) {
         throw new SchemaError(`${origin} has a \`singletons\` that is not an object.`);
     }
@@ -108,29 +79,12 @@ export function checkSchema(raw, origin = "the schema") {
     for (const [name, def] of Object.entries(singletons)) {
         assertFieldMap(def?.fields, `singletons.${name}`, origin);
     }
-    /**
-     * A default sort naming a field the collection does not declare is dropped
-     * here rather than refused.
-     *
-     * `defineSite` rejects it, which is right when somebody is writing the model
-     * and can fix the line they are looking at. By the time it reaches Mica the
-     * model is committed and a site is starting against it: the entries are
-     * intact, the fields are intact, and the only casualty is the order of a
-     * list. Refusing to serve the site over that would be out of proportion —
-     * and models written before the check existed contain exactly this, because
-     * the old fixed list of sort fields offered names no collection had.
-     *
-     * So the option is dropped, the list falls back to the order editors
-     * arranged by hand, and the project's next build reports it properly.
-     */
+    // Drop, do not refuse, a default sort on an undeclared field: only the list order is affected.
     for (const def of Object.values(collections)) {
         const field = def?.defaultSort?.field;
         if (field && field !== "position" && !def.fields?.[field])
             delete def.defaultSort;
     }
-    // Name injection and every cross-reference check — unknown relation targets,
-    // slugs derived from absent siblings, reserved collection names — come from
-    // the same function a hand-written model goes through.
     try {
         return defineSite({ collections, singletons });
     }
@@ -158,13 +112,8 @@ function assertFieldMap(fields, at, origin) {
     }
 }
 /**
- * A stable short digest of a model, for spotting drift.
- *
- * Logged at startup and returned by the schema endpoint so that a website built
- * against one model and a CMS serving another is a visible mismatch rather than
- * a puzzling absence of fields. Key order follows the model's own declaration
- * order, which is meaningful here — reordering fields reorders the admin form,
- * so it is a real change and should produce a different digest.
+ * A short digest of a model, to show drift. Field order counts, because it is
+ * the order of the admin form.
  */
 export async function schemaFingerprint(site) {
     const { createHash } = await import("node:crypto");