@micacms/runtime 0.6.0 → 0.7.0

package/dist/workspace/developer.js

@@ -2,9 +2,11 @@
  * The policy for the developer's own checkout. Mica never fetches, merges or
  * resets here. Publish pushes with the developer's `git`, credentials and
  * upstream; a new branch without one is pushed to `origin` and tracks it. A
- * failed push keeps the commit.
+ * failed push keeps the commit. A push sends only Mica's own commits: other
+ * commits that no remote has make Publish refuse.
  */
-import { GitError } from "./git.js";
+import { ApiError } from "../lib/errors.js";
+import { unpushedCommits } from "./tree.js";
 export function developerPolicy(options) {
     return {
         owner: "developer",
@@ -13,11 +15,15 @@ export function developerPolicy(options) {
                 ? { enabled: true }
                 : { enabled: false, reason: "Publishing from local mode is disabled (MICA_LOCAL_PUBLISH=false)." };
         },
-        async prepare() { },
+        async prepare(tree) {
+            await refuseOtherCommits(tree);
+        },
         // The commit keeps the developer's own Git identity.
         commitAuthor: () => undefined,
         async push(tree, revision) {
             try {
+                // Checked again: a commit made in a terminal since `prepare` would go along.
+                await refuseOtherCommits(tree);
                 // Publishing is the request to push, so a new branch gets its upstream here.
                 const upstream = await tree.git.tryRun(["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"]);
                 const remotes = (await tree.git.tryRun(["remote"]))?.split("\n").filter(Boolean) ?? [];
@@ -30,13 +36,22 @@ export function developerPolicy(options) {
                 return { state: "published", revision };
             }
             catch (error) {
-                const pushError = error instanceof GitError || error instanceof Error ? error.message : String(error);
+                const pushError = error instanceof Error ? error.message : String(error);
                 options.logger.warn("Publish committed but the push failed", { revision, pushError });
                 return { state: "committed-pending-push", revision, pushError };
             }
         },
     };
 }
+/** A push sends every commit that no remote has; the developer's own commits are theirs to send. */
+async function refuseOtherCommits(tree) {
+    const other = (await unpushedCommits(tree))?.other ?? 0;
+    if (other === 0)
+        return;
+    throw new ApiError("conflict", `Publishing would also send ${other} change${other === 1 ? "" : "s"} that ${other === 1 ? "was" : "were"} not made in Mica ` +
+        "and that the website does not have yet. Send them with Git first (`git push`), or move them to another branch. " +
+        "Then publish again.");
+}
 function noUpstream(remotes) {
     return remotes.length === 0
         ? "This repository has no remote. Add one with `git remote add origin <url>`, then publish again."

package/dist/workspace/developer.js.map

@@ -1 +1 @@
-{"version":3,"file":"developer.js","sourceRoot":"","sources":["../../src/workspace/developer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAUpC,MAAM,UAAU,eAAe,CAAC,OAA+B;IAC7D,OAAO;QACL,KAAK,EAAE,WAAW;QAElB,mBAAmB;YACjB,OAAO,OAAO,CAAC,cAAc;gBAC3B,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;gBACnB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,oEAAoE,EAAE,CAAC;QACvG,CAAC;QAED,KAAK,CAAC,OAAO,KAAI,CAAC;QAElB,qDAAqD;QACrD,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS;QAE7B,KAAK,CAAC,IAAI,CAAC,IAAa,EAAE,QAAgB;YACxC,IAAI,CAAC;gBACH,6EAA6E;gBAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,sBAAsB,EAAE,aAAa,CAAC,CAAC,CAAC;gBAC7G,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACvF,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAAE,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;qBACrG,IAAI,QAAQ,KAAK,IAAI;oBAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;;oBAC5D,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;gBAClC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;YAC1C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,SAAS,GAAG,KAAK,YAAY,QAAQ,IAAI,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;gBACtF,OAAO,EAAE,KAAK,EAAE,wBAAwB,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;YAClE,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,OAAiB;IACnC,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC;QACzB,CAAC,CAAC,gGAAgG;QAClG,CAAC,CAAC,gEAAgE,OAAO,CAAC,CAAC,CAAC,8BAA8B,CAAC;AAC/G,CAAC","sourcesContent":["/**\n * The policy for the developer's own checkout. Mica never fetches, merges or\n * resets here. Publish pushes with the developer's `git`, credentials and\n * upstream; a new branch without one is pushed to `origin` and tracks it. A\n * failed push keeps the commit.\n */\n\nimport type { PublishResult } from \"@micacms/core\";\n\nimport type { Logger } from \"../lib/logger.js\";\nimport { GitError } from \"./git.js\";\nimport type { OwnerPolicy, PublishAvailability } from \"./policy.js\";\nimport type { GitTree } from \"./tree.js\";\n\nexport interface DeveloperPolicyOptions {\n  /** `MICA_LOCAL_PUBLISH`. */\n  publishEnabled: boolean;\n  logger: Logger;\n}\n\nexport function developerPolicy(options: DeveloperPolicyOptions): OwnerPolicy {\n  return {\n    owner: \"developer\",\n\n    publishAvailability(): PublishAvailability {\n      return options.publishEnabled\n        ? { enabled: true }\n        : { enabled: false, reason: \"Publishing from local mode is disabled (MICA_LOCAL_PUBLISH=false).\" };\n    },\n\n    async prepare() {},\n\n    // The commit keeps the developer's own Git identity.\n    commitAuthor: () => undefined,\n\n    async push(tree: GitTree, revision: string): Promise<PublishResult> {\n      try {\n        // Publishing is the request to push, so a new branch gets its upstream here.\n        const upstream = await tree.git.tryRun([\"rev-parse\", \"--abbrev-ref\", \"--symbolic-full-name\", \"@{upstream}\"]);\n        const remotes = (await tree.git.tryRun([\"remote\"]))?.split(\"\\n\").filter(Boolean) ?? [];\n        if (upstream === null && remotes.includes(\"origin\")) await tree.git.run([\"push\", \"-u\", \"origin\", \"HEAD\"]);\n        else if (upstream === null) throw new Error(noUpstream(remotes));\n        else await tree.git.run([\"push\"]);\n        return { state: \"published\", revision };\n      } catch (error) {\n        const pushError = error instanceof GitError || error instanceof Error ? error.message : String(error);\n        options.logger.warn(\"Publish committed but the push failed\", { revision, pushError });\n        return { state: \"committed-pending-push\", revision, pushError };\n      }\n    },\n  };\n}\n\nfunction noUpstream(remotes: string[]): string {\n  return remotes.length === 0\n    ? \"This repository has no remote. Add one with `git remote add origin <url>`, then publish again.\"\n    : `This branch has no upstream. Push it once with \\`git push -u ${remotes[0]} HEAD\\`, then publish again.`;\n}\n"]}
+{"version":3,"file":"developer.js","sourceRoot":"","sources":["../../src/workspace/developer.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The policy for the developer's own checkout. Mica never fetches, merges or\n * resets here. Publish pushes with the developer's `git`, credentials and\n * upstream; a new branch without one is pushed to `origin` and tracks it. A\n * failed push keeps the commit. A push sends only Mica's own commits: other\n * commits that no remote has make Publish refuse.\n */\n\nimport type { PublishResult } from \"@micacms/core\";\n\nimport { ApiError } from \"../lib/errors.js\";\nimport type { Logger } from \"../lib/logger.js\";\nimport type { OwnerPolicy, PublishAvailability } from \"./policy.js\";\nimport { unpushedCommits, type GitTree } from \"./tree.js\";\n\nexport interface DeveloperPolicyOptions {\n  /** `MICA_LOCAL_PUBLISH`. */\n  publishEnabled: boolean;\n  logger: Logger;\n}\n\nexport function developerPolicy(options: DeveloperPolicyOptions): OwnerPolicy {\n  return {\n    owner: \"developer\",\n\n    publishAvailability(): PublishAvailability {\n      return options.publishEnabled\n        ? { enabled: true }\n        : { enabled: false, reason: \"Publishing from local mode is disabled (MICA_LOCAL_PUBLISH=false).\" };\n    },\n\n    async prepare(tree: GitTree) {\n      await refuseOtherCommits(tree);\n    },\n\n    // The commit keeps the developer's own Git identity.\n    commitAuthor: () => undefined,\n\n    async push(tree: GitTree, revision: string): Promise<PublishResult> {\n      try {\n        // Checked again: a commit made in a terminal since `prepare` would go along.\n        await refuseOtherCommits(tree);\n        // Publishing is the request to push, so a new branch gets its upstream here.\n        const upstream = await tree.git.tryRun([\"rev-parse\", \"--abbrev-ref\", \"--symbolic-full-name\", \"@{upstream}\"]);\n        const remotes = (await tree.git.tryRun([\"remote\"]))?.split(\"\\n\").filter(Boolean) ?? [];\n        if (upstream === null && remotes.includes(\"origin\")) await tree.git.run([\"push\", \"-u\", \"origin\", \"HEAD\"]);\n        else if (upstream === null) throw new Error(noUpstream(remotes));\n        else await tree.git.run([\"push\"]);\n        return { state: \"published\", revision };\n      } catch (error) {\n        const pushError = error instanceof Error ? error.message : String(error);\n        options.logger.warn(\"Publish committed but the push failed\", { revision, pushError });\n        return { state: \"committed-pending-push\", revision, pushError };\n      }\n    },\n  };\n}\n\n/** A push sends every commit that no remote has; the developer's own commits are theirs to send. */\nasync function refuseOtherCommits(tree: GitTree): Promise<void> {\n  const other = (await unpushedCommits(tree))?.other ?? 0;\n  if (other === 0) return;\n  throw new ApiError(\n    \"conflict\",\n    `Publishing would also send ${other} change${other === 1 ? \"\" : \"s\"} that ${other === 1 ? \"was\" : \"were\"} not made in Mica ` +\n      \"and that the website does not have yet. Send them with Git first (`git push`), or move them to another branch. \" +\n      \"Then publish again.\",\n  );\n}\n\nfunction noUpstream(remotes: string[]): string {\n  return remotes.length === 0\n    ? \"This repository has no remote. Add one with `git remote add origin <url>`, then publish again.\"\n    : `This branch has no upstream. Push it once with \\`git push -u ${remotes[0]} HEAD\\`, then publish again.`;\n}\n"]}

package/dist/workspace/policy.d.ts

@@ -43,7 +43,7 @@ export interface SyncStatus {
         message: string;
         since: string;
     } | null;
-    /** The content model changed upstream; a restart applies it. */
+    /** A `.gitattributes` changed upstream; a restart applies it. A new content model needs none. */
     restartRequired: boolean;
     /** A publication committed and not yet pushed. Mica retries it. */
     pendingPush: {

package/dist/workspace/policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/workspace/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzF,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAC1C,iEAAiE;IACjE,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5I;AAED,oFAAoF;AACpF,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/D,gEAAgE;IAChE,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzD,kEAAkE;IAClE,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,qFAAqF;AACrF,MAAM,WAAW,qBAAqB;IACpC,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,mBAAmB,IAAI,mBAAmB,CAAC;IAC3C;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,gGAAgG;IAChG,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IAC7D;;;OAGG;IACH,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAI9D,UAAU,CAAC,IAAI,UAAU,CAAC;IAC1B,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,iFAAiF;IACjF,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC7C"}
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/workspace/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzF,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAC1C,iEAAiE;IACjE,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5I;AAED,oFAAoF;AACpF,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/D,iGAAiG;IACjG,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzD,kEAAkE;IAClE,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,qFAAqF;AACrF,MAAM,WAAW,qBAAqB;IACpC,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,mBAAmB,IAAI,mBAAmB,CAAC;IAC3C;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,gGAAgG;IAChG,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IAC7D;;;OAGG;IACH,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAI9D,UAAU,CAAC,IAAI,UAAU,CAAC;IAC1B,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,iFAAiF;IACjF,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC7C"}

package/dist/workspace/policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/workspace/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG","sourcesContent":["/**\n * What changes with the owner of a working tree: whether Publish may run and\n * how a commit reaches the remote. The app that keeps a managed clone supplies\n * its policy; `developer.ts` is the developer's.\n */\n\nimport type { PublishResult } from \"@micacms/core\";\n\nimport type { Author } from \"./files.js\";\n\nimport type { GitTree } from \"./tree.js\";\n\nexport type PublishAvailability = { enabled: true } | { enabled: false; reason: string };\n\n/** One piece of content that an editor changed and the website changed too. */\nexport interface SyncConflict {\n  /** Identifies the group in `resolve`. */\n  group: string;\n  label: string;\n  /** Content-relative paths of the group, on either side. */\n  paths: string[];\n  upstream: \"changed\" | \"deleted\" | \"added\";\n  /** What the comparison shows, when the group is one document. */\n  target?: { kind: \"entry\"; collection: string; slug: string } | { kind: \"singleton\"; name: string } | { kind: \"order\"; collection: string };\n}\n\n/** Where a clone that Mica keeps stands against its remote. Managed owners only. */\nexport interface SyncStatus {\n  lastSyncAt: string | null;\n  /** Upstream commits not yet in the clone. */\n  behind: number;\n  error: { code: string; message: string; since: string } | null;\n  /** The content model changed upstream; a restart applies it. */\n  restartRequired: boolean;\n  /** A publication committed and not yet pushed. Mica retries it. */\n  pendingPush: { revision: string; reason: string } | null;\n  /** The last publication the host refused; it is a draft again. */\n  refused: { reason: string; at: string } | null;\n  conflicts: SyncConflict[];\n}\n\n/** What the System page says about the repository, beyond what the runtime knows. */\nexport interface RepositoryDescription {\n  /** The remote URL, without credentials. */\n  url: string;\n  branch: string;\n  /** Bytes the clone takes on the data volume. */\n  cloneBytes: number | null;\n}\n\nexport interface OwnerPolicy {\n  readonly owner: \"developer\" | \"managed\";\n  publishAvailability(): PublishAvailability;\n  /**\n   * Runs with the remote lock held, before the tree lock. A managed clone syncs\n   * here and must not take the remote lock again. Throws an `ApiError` when\n   * Publish must wait.\n   */\n  prepare(tree: GitTree): Promise<void>;\n  /** Who a commit names as its author, given the signed-in editor. Undefined leaves it to Git. */\n  commitAuthor(editor: Author | undefined): Author | undefined;\n  /**\n   * Sends HEAD to the remote. A failure returns `committed-pending-push`, not\n   * an exception: the commit is real.\n   */\n  push(tree: GitTree, revision: string): Promise<PublishResult>;\n\n  /* A clone that Mica keeps answers these; the developer's checkout does not. */\n\n  syncStatus?(): SyncStatus;\n  sync?(): Promise<void>;\n  /** Keeps the editor's version of a conflicting group, or takes the website's. */\n  resolve?(group: string, choice: \"mine\" | \"website\"): Promise<void>;\n  /** The ref that holds the website's version, for a conflict's comparison. */\n  upstreamRef?: string;\n  describe?(): Promise<RepositoryDescription>;\n}\n"]}
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/workspace/policy.ts"],"names":[],"mappings":"AAAA;;;;GAIG","sourcesContent":["/**\n * What changes with the owner of a working tree: whether Publish may run and\n * how a commit reaches the remote. The app that keeps a managed clone supplies\n * its policy; `developer.ts` is the developer's.\n */\n\nimport type { PublishResult } from \"@micacms/core\";\n\nimport type { Author } from \"./files.js\";\n\nimport type { GitTree } from \"./tree.js\";\n\nexport type PublishAvailability = { enabled: true } | { enabled: false; reason: string };\n\n/** One piece of content that an editor changed and the website changed too. */\nexport interface SyncConflict {\n  /** Identifies the group in `resolve`. */\n  group: string;\n  label: string;\n  /** Content-relative paths of the group, on either side. */\n  paths: string[];\n  upstream: \"changed\" | \"deleted\" | \"added\";\n  /** What the comparison shows, when the group is one document. */\n  target?: { kind: \"entry\"; collection: string; slug: string } | { kind: \"singleton\"; name: string } | { kind: \"order\"; collection: string };\n}\n\n/** Where a clone that Mica keeps stands against its remote. Managed owners only. */\nexport interface SyncStatus {\n  lastSyncAt: string | null;\n  /** Upstream commits not yet in the clone. */\n  behind: number;\n  error: { code: string; message: string; since: string } | null;\n  /** A `.gitattributes` changed upstream; a restart applies it. A new content model needs none. */\n  restartRequired: boolean;\n  /** A publication committed and not yet pushed. Mica retries it. */\n  pendingPush: { revision: string; reason: string } | null;\n  /** The last publication the host refused; it is a draft again. */\n  refused: { reason: string; at: string } | null;\n  conflicts: SyncConflict[];\n}\n\n/** What the System page says about the repository, beyond what the runtime knows. */\nexport interface RepositoryDescription {\n  /** The remote URL, without credentials. */\n  url: string;\n  branch: string;\n  /** Bytes the clone takes on the data volume. */\n  cloneBytes: number | null;\n}\n\nexport interface OwnerPolicy {\n  readonly owner: \"developer\" | \"managed\";\n  publishAvailability(): PublishAvailability;\n  /**\n   * Runs with the remote lock held, before the tree lock. A managed clone syncs\n   * here and must not take the remote lock again. Throws an `ApiError` when\n   * Publish must wait.\n   */\n  prepare(tree: GitTree): Promise<void>;\n  /** Who a commit names as its author, given the signed-in editor. Undefined leaves it to Git. */\n  commitAuthor(editor: Author | undefined): Author | undefined;\n  /**\n   * Sends HEAD to the remote. A failure returns `committed-pending-push`, not\n   * an exception: the commit is real.\n   */\n  push(tree: GitTree, revision: string): Promise<PublishResult>;\n\n  /* A clone that Mica keeps answers these; the developer's checkout does not. */\n\n  syncStatus?(): SyncStatus;\n  sync?(): Promise<void>;\n  /** Keeps the editor's version of a conflicting group, or takes the website's. */\n  resolve?(group: string, choice: \"mine\" | \"website\"): Promise<void>;\n  /** The ref that holds the website's version, for a conflict's comparison. */\n  upstreamRef?: string;\n  describe?(): Promise<RepositoryDescription>;\n}\n"]}

package/dist/workspace/tree.d.ts

@@ -54,8 +54,21 @@ export declare function discardChange(tree: GitTree, change: TreeChange): Promis
 export declare function headRevision(tree: GitTree): Promise<string | null>;
 /** The checked-out branch, or null when there is none to name. */
 export declare function currentBranch(tree: GitTree): Promise<string | null>;
-/** Commits waiting to be pushed, or null when there is no upstream to say. */
-export declare function aheadOfUpstream(tree: GitTree): Promise<number | null>;
+/** The trailer that marks a commit that Mica made for a publication. */
+export declare const PUBLISHED_WITH_MICA = "Published-with: Mica";
+/** A publication's commit message: the editor's summary, and Mica's trailer. */
+export declare function publicationMessage(summary: string): string;
+/** Commits on HEAD that no remote has, split into Mica's publications and other commits. */
+export interface UnpushedCommits {
+    mica: number;
+    other: number;
+}
+/**
+ * What a push of HEAD would send: the commits after the upstream branch, or,
+ * for a branch without one, the commits that no remote has. Null without a
+ * remote, because then nothing can be pushed and everything would count.
+ */
+export declare function unpushedCommits(tree: GitTree): Promise<UnpushedCommits | null>;
 /**
  * The content root as `ref` has it, read from Git's object store, because the
  * working tree holds the drafts.

package/dist/workspace/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../src/workspace/tree.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,eAAe,CAAC;AAGlF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAuB,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEtF;;;GAGG;AACH,eAAO,MAAM,OAAO,wBAAwB,CAAC;AAE7C,8CAA8C;AAC9C,MAAM,WAAW,OAAO;IACtB,mCAAmC;IACnC,GAAG,EAAE,SAAS,CAAC;IACf,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,+DAA+D;AAC/D,MAAM,WAAW,UAAW,SAAQ,aAAa;IAC/C,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,+EAA+E;IAC/E,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAoBvC;AAED,6DAA6D;AAC7D,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAQ1E;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIrG;AAsBD,sFAAsF;AACtF,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBpF;AAED,yDAAyD;AACzD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAElE;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEnE;AAED,8EAA8E;AAC9E,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAK3E;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,GAAG,aAAa,CAyBrE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,aAAa,CAqB7G;AAQD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAsDrE;AAQD,6EAA6E;AAC7E,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../src/workspace/tree.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAkB,MAAM,eAAe,CAAC;AAGlF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAuB,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEtF;;;GAGG;AACH,eAAO,MAAM,OAAO,wBAAwB,CAAC;AAE7C,8CAA8C;AAC9C,MAAM,WAAW,OAAO;IACtB,mCAAmC;IACnC,GAAG,EAAE,SAAS,CAAC;IACf,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,+DAA+D;AAC/D,MAAM,WAAW,UAAW,SAAQ,aAAa;IAC/C,uEAAuE;IACvE,SAAS,EAAE,OAAO,CAAC;IACnB,+EAA+E;IAC/E,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAoBvC;AAED,6DAA6D;AAC7D,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAQ1E;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIrG;AAsBD,sFAAsF;AACtF,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBpF;AAED,yDAAyD;AACzD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAElE;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEnE;AAED,wEAAwE;AACxE,eAAO,MAAM,mBAAmB,yBAAyB,CAAC;AAE1D,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,4FAA4F;AAC5F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAgBpF;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,GAAG,aAAa,CAyBrE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,aAAa,CAqB7G;AAQD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAsDrE;AAQD,6EAA6E;AAC7E,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3D"}

package/dist/workspace/tree.js

@@ -113,13 +113,36 @@ export function headRevision(tree) {
 export function currentBranch(tree) {
     return tree.git.tryRun(["rev-parse", "--abbrev-ref", "HEAD"]);
 }
-/** Commits waiting to be pushed, or null when there is no upstream to say. */
-export async function aheadOfUpstream(tree) {
-    const counted = await tree.git.tryRun(["rev-list", "--count", "@{upstream}..HEAD"]);
-    if (counted === null)
+/** The trailer that marks a commit that Mica made for a publication. */
+export const PUBLISHED_WITH_MICA = "Published-with: Mica";
+/** A publication's commit message: the editor's summary, and Mica's trailer. */
+export function publicationMessage(summary) {
+    return `${summary}\n\n${PUBLISHED_WITH_MICA}`;
+}
+/**
+ * What a push of HEAD would send: the commits after the upstream branch, or,
+ * for a branch without one, the commits that no remote has. Null without a
+ * remote, because then nothing can be pushed and everything would count.
+ */
+export async function unpushedCommits(tree) {
+    const remotes = await tree.git.tryRun(["remote"]);
+    if (!remotes)
         return null;
-    const ahead = Number(counted);
-    return Number.isFinite(ahead) ? ahead : null;
+    // A commit can be on another remote branch and still be new to the upstream.
+    const upstream = await tree.git.tryRun(["rev-parse", "--verify", "--quiet", "@{upstream}"]);
+    const range = upstream ? [`${upstream}..HEAD`] : ["HEAD", "--not", "--remotes"];
+    // %x1e ends a commit, so a multi-line message stays one record.
+    const log = await tree.git.tryRun(["log", "--max-count=1000", "--format=%B%x1e", ...range]);
+    if (log === null)
+        return { mica: 0, other: 0 };
+    const counted = { mica: 0, other: 0 };
+    for (const message of log.split("\x1e")) {
+        if (message.trim() === "")
+            continue;
+        const lines = message.trim().split("\n");
+        counted[lines.includes(PUBLISHED_WITH_MICA) ? "mica" : "other"] += 1;
+    }
+    return counted;
 }
 /**
  * The content root as `ref` has it, read from Git's object store, because the

package/dist/workspace/tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/workspace/tree.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Git operations on a working tree whose content root is the draft workspace.\n * The owner policy does the push. Every operation is limited to paths under the\n * content root, never `git add -A` over the repository, so other work in the\n * same checkout is never swept into a commit.\n */\n\nimport { existsSync } from \"node:fs\";\nimport { realpath, rm } from \"node:fs/promises\";\nimport { join, relative, sep } from \"node:path\";\n\nimport type { ContentChange, ContentSource, DirectoryEntry } from \"@micacms/core\";\nimport { within } from \"@micacms/core/node\";\n\nimport type { Author } from \"./files.js\";\nimport { GitError, gitRunner, type GitRunner, type GitRunnerOptions } from \"./git.js\";\n\n/**\n * Makes every path argument literal: `tour[1].json` is not a pattern that also\n * matches `tour1.json`.\n */\nexport const LITERAL = \"--literal-pathspecs\";\n\n/** A content root inside a Git repository. */\nexport interface GitTree {\n  /** Runs in the repository root. */\n  git: GitRunner;\n  /** Content root relative to the repository root; \"\" when they coincide. */\n  prefix: string;\n  /** Absolute path of the content root. */\n  contentRoot: string;\n}\n\n/** A changed file plus what only Git status knows about it. */\nexport interface TreeChange extends ContentChange {\n  /** Not yet known to Git — discarding means deleting, not restoring. */\n  untracked: boolean;\n  /** Mid-merge conflict markers. Unpublishable until resolved with Git tools. */\n  conflicted: boolean;\n}\n\n/**\n * Finds the repository the content root sits in, freshly each time: a\n * `git init` after startup should start working, not require a restart.\n */\nexport async function locateTree(\n  contentRoot: string,\n  options: GitRunnerOptions = {},\n): Promise<GitTree | { reason: string }> {\n  const probe = gitRunner(contentRoot, options);\n  try {\n    const repoRoot = await probe.run([\"rev-parse\", \"--show-toplevel\"]);\n    // Git resolves symlinks in the toplevel (`/private/var` for `/var` on\n    // macOS); do the same, or the prefix is wrong.\n    const resolved = await realpath(contentRoot);\n    return {\n      git: gitRunner(repoRoot, options),\n      prefix: toPosix(relative(repoRoot, resolved)),\n      contentRoot,\n    };\n  } catch (error) {\n    return {\n      reason:\n        error instanceof GitError && error.exitCode === null\n          ? error.message\n          : \"The content directory is not inside a Git repository.\",\n    };\n  }\n}\n\n/** The content root's changes, as `git status` sees them. */\nexport async function listTreeChanges(tree: GitTree): Promise<TreeChange[]> {\n  // `-uall`: Git otherwise collapses a new, untracked entry directory to one line.\n  // `GIT_OPTIONAL_LOCKS=0`: no `index.lock`, so a parallel commit cannot fail on it.\n  const raw = await tree.git.run(\n    [LITERAL, \"status\", \"--porcelain=v1\", \"-z\", \"-uall\", \"--\", tree.prefix === \"\" ? \".\" : tree.prefix],\n    { env: { GIT_OPTIONAL_LOCKS: \"0\" } },\n  );\n  return parseStatus(raw, tree.prefix);\n}\n\n/**\n * Stages and commits only `paths` (content-root relative) and returns the new\n * HEAD. The pathspec limits both steps, so all other staged or unstaged work\n * stays. Without `author`, Git's configured identity applies.\n */\nexport async function commitPaths(\n  tree: GitTree,\n  paths: string[],\n  message: string,\n  author?: Author,\n): Promise<string> {\n  const inRepository = await stagePaths(tree, paths);\n  const as = author ? [`--author=${author.name} <${author.email}>`] : [];\n  await tree.git.run([LITERAL, \"commit\", \"-m\", message, ...as, \"--\", ...inRepository]);\n  return tree.git.run([\"rev-parse\", \"HEAD\"]);\n}\n\n/**\n * Commits `paths` again with the message, author and date of `original`, after\n * a rejected push. Returns the new HEAD.\n */\nexport async function recommitPaths(tree: GitTree, paths: string[], original: string): Promise<string> {\n  const inRepository = await stagePaths(tree, paths);\n  await tree.git.run([LITERAL, \"commit\", \"-C\", original, \"--\", ...inRepository]);\n  return tree.git.run([\"rev-parse\", \"HEAD\"]);\n}\n\n/**\n * Stages `paths`, because `git commit -- <paths>` refuses a file Git has never\n * seen. A path gone from the disk uses `rm --cached`, because `git add` refuses\n * a deletion that is already staged (as `reset --soft` leaves it).\n */\nasync function stagePaths(tree: GitTree, paths: string[]): Promise<string[]> {\n  const present: string[] = [];\n  const gone: string[] = [];\n  for (const path of paths) {\n    (existsSync(within(tree.contentRoot, path)) ? present : gone).push(inRepo(tree.prefix, path));\n  }\n  for (const batch of chunked(present, 500)) {\n    await tree.git.run([LITERAL, \"add\", \"-A\", \"--\", ...batch]);\n  }\n  for (const batch of chunked(gone, 500)) {\n    await tree.git.run([LITERAL, \"rm\", \"--cached\", \"--ignore-unmatch\", \"--quiet\", \"--\", ...batch]);\n  }\n  return paths.map((path) => inRepo(tree.prefix, path));\n}\n\n/** Puts one changed file back to its HEAD version, or removes it if HEAD has none. */\nexport async function discardChange(tree: GitTree, change: TreeChange): Promise<void> {\n  if (change.kind === \"create\") {\n    // Unstage a staged creation first, so the index does not point at a deleted file.\n    if (!change.untracked) {\n      await tree.git.tryRun([LITERAL, \"rm\", \"--cached\", \"--force\", \"--\", inRepo(tree.prefix, change.path)]);\n    }\n    await rm(within(tree.contentRoot, change.path), { force: true });\n    return;\n  }\n  await tree.git.run([\n    LITERAL,\n    \"restore\",\n    \"--source=HEAD\",\n    \"--staged\",\n    \"--worktree\",\n    \"--\",\n    inRepo(tree.prefix, change.path),\n  ]);\n}\n\n/** HEAD's commit id, or null before the first commit. */\nexport function headRevision(tree: GitTree): Promise<string | null> {\n  return tree.git.tryRun([\"rev-parse\", \"HEAD\"]);\n}\n\n/** The checked-out branch, or null when there is none to name. */\nexport function currentBranch(tree: GitTree): Promise<string | null> {\n  return tree.git.tryRun([\"rev-parse\", \"--abbrev-ref\", \"HEAD\"]);\n}\n\n/** Commits waiting to be pushed, or null when there is no upstream to say. */\nexport async function aheadOfUpstream(tree: GitTree): Promise<number | null> {\n  const counted = await tree.git.tryRun([\"rev-list\", \"--count\", \"@{upstream}..HEAD\"]);\n  if (counted === null) return null;\n  const ahead = Number(counted);\n  return Number.isFinite(ahead) ? ahead : null;\n}\n\n/**\n * The content root as `ref` has it, read from Git's object store, because the\n * working tree holds the drafts.\n */\nexport function headSource(tree: GitTree, ref = \"HEAD\"): ContentSource {\n  const at = (path: string) => `${ref}:${path === \"\" ? tree.prefix : inRepo(tree.prefix, path)}`;\n\n  return {\n    origin: ref,\n\n    async read(path) {\n      // \"Not in HEAD\" and \"no commits yet\" both mean that there is no published version.\n      return tree.git.tryRun([\"show\", at(path)]);\n    },\n\n    async list(path) {\n      const raw = await tree.git.tryRun([\"ls-tree\", \"-z\", at(path)]);\n      if (raw === null) return [];\n\n      const entries: DirectoryEntry[] = [];\n      for (const field of raw.split(\"\\0\")) {\n        const tab = field.indexOf(\"\\t\");\n        if (tab === -1) continue;\n        const type = field.slice(0, tab).split(\" \")[1];\n        entries.push({ name: field.slice(tab + 1), type: type === \"tree\" ? \"directory\" : \"file\" });\n      }\n      return entries;\n    },\n  };\n}\n\n/**\n * `base` with `paths` taken from `top`: what a commit of exactly those paths\n * would hold. Publish checks a selection against it, not against drafts that\n * stay behind.\n */\nexport function overlaySource(base: ContentSource, top: ContentSource, paths: Iterable<string>): ContentSource {\n  const selected = new Set(paths);\n\n  return {\n    origin: `${base.origin} with the selected changes`,\n\n    read: (path) => (selected.has(path) ? top.read(path) : base.read(path)),\n\n    async list(directory) {\n      const prefix = directory === \"\" ? \"\" : `${directory}/`;\n      const items = new Map((await base.list(directory)).map((item) => [item.name, item]));\n      for (const path of selected) {\n        if (!path.startsWith(prefix)) continue;\n        const [name, ...deeper] = path.slice(prefix.length).split(\"/\");\n        if (deeper.length > 0) items.set(name!, { name: name!, type: \"directory\" });\n        else if ((await top.read(path)) === null) items.delete(name!);\n        else items.set(name!, { name: name!, type: \"file\" });\n      }\n      return [...items.values()];\n    },\n  };\n}\n\n/**\n * A save's temporary file (`*.mica-<pid>-<n>`), seen during a save or after a\n * crash. Never content.\n */\nconst TEMPORARY_FILE = /\\.mica-\\d+-\\d+$/;\n\n/**\n * Parses `git status --porcelain=v1 -z` into content-root-relative changes.\n * `-z` never changes a path; a rename is two fields and becomes a create and a\n * delete. `.mica/` is excluded: the developer commits the manifest, and the\n * drift check guards model changes.\n */\nexport function parseStatus(raw: string, prefix: string): TreeChange[] {\n  const fields = raw.split(\"\\0\").filter((field) => field !== \"\");\n  const changes: TreeChange[] = [];\n\n  const push = (\n    repoPath: string,\n    kind: TreeChange[\"kind\"],\n    flags: { untracked?: boolean; conflicted?: boolean } = {},\n  ) => {\n    const path = relativeToContent(repoPath, prefix);\n    if (path === null || path === \".mica\" || path.startsWith(\".mica/\")) return;\n    if (TEMPORARY_FILE.test(path)) return;\n    changes.push({\n      path,\n      kind,\n      untracked: flags.untracked ?? false,\n      conflicted: flags.conflicted ?? false,\n    });\n  };\n\n  for (let at = 0; at < fields.length; at += 1) {\n    const field = fields[at]!;\n    const x = field[0] ?? \" \";\n    const y = field[1] ?? \" \";\n    const repoPath = field.slice(3);\n\n    if (x === \"?\" && y === \"?\") {\n      push(repoPath, \"create\", { untracked: true });\n      continue;\n    }\n\n    // A merge conflict state, whatever the tree holds.\n    if (x === \"U\" || y === \"U\" || (x === \"A\" && y === \"A\") || (x === \"D\" && y === \"D\")) {\n      push(repoPath, \"update\", { conflicted: true });\n      continue;\n    }\n\n    if (x === \"R\" || x === \"C\") {\n      // The next field is the source path; only a rename deletes it.\n      const from = fields[++at]!;\n      push(repoPath, \"create\");\n      if (x === \"R\") push(from, \"delete\");\n      continue;\n    }\n\n    if (x === \"D\" || y === \"D\") {\n      push(repoPath, \"delete\");\n      continue;\n    }\n\n    push(repoPath, x === \"A\" ? \"create\" : \"update\");\n  }\n\n  return changes;\n}\n\nfunction relativeToContent(repoPath: string, prefix: string): string | null {\n  if (prefix === \"\") return repoPath;\n  if (repoPath === prefix) return null;\n  return repoPath.startsWith(`${prefix}/`) ? repoPath.slice(prefix.length + 1) : null;\n}\n\n/** A content-root-relative path as Git sees it, from the repository root. */\nexport function inRepo(prefix: string, path: string): string {\n  return prefix === \"\" ? path : join(prefix, path).split(sep).join(\"/\");\n}\n\nfunction toPosix(path: string): string {\n  return sep === \"/\" ? path : path.split(sep).join(\"/\");\n}\n\nfunction chunked<T>(items: T[], size: number): T[][] {\n  const batches: T[][] = [];\n  for (let at = 0; at < items.length; at += size) batches.push(items.slice(at, at + size));\n  return batches;\n}\n"]}
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/workspace/tree.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Git operations on a working tree whose content root is the draft workspace.\n * The owner policy does the push. Every operation is limited to paths under the\n * content root, never `git add -A` over the repository, so other work in the\n * same checkout is never swept into a commit.\n */\n\nimport { existsSync } from \"node:fs\";\nimport { realpath, rm } from \"node:fs/promises\";\nimport { join, relative, sep } from \"node:path\";\n\nimport type { ContentChange, ContentSource, DirectoryEntry } from \"@micacms/core\";\nimport { within } from \"@micacms/core/node\";\n\nimport type { Author } from \"./files.js\";\nimport { GitError, gitRunner, type GitRunner, type GitRunnerOptions } from \"./git.js\";\n\n/**\n * Makes every path argument literal: `tour[1].json` is not a pattern that also\n * matches `tour1.json`.\n */\nexport const LITERAL = \"--literal-pathspecs\";\n\n/** A content root inside a Git repository. */\nexport interface GitTree {\n  /** Runs in the repository root. */\n  git: GitRunner;\n  /** Content root relative to the repository root; \"\" when they coincide. */\n  prefix: string;\n  /** Absolute path of the content root. */\n  contentRoot: string;\n}\n\n/** A changed file plus what only Git status knows about it. */\nexport interface TreeChange extends ContentChange {\n  /** Not yet known to Git — discarding means deleting, not restoring. */\n  untracked: boolean;\n  /** Mid-merge conflict markers. Unpublishable until resolved with Git tools. */\n  conflicted: boolean;\n}\n\n/**\n * Finds the repository the content root sits in, freshly each time: a\n * `git init` after startup should start working, not require a restart.\n */\nexport async function locateTree(\n  contentRoot: string,\n  options: GitRunnerOptions = {},\n): Promise<GitTree | { reason: string }> {\n  const probe = gitRunner(contentRoot, options);\n  try {\n    const repoRoot = await probe.run([\"rev-parse\", \"--show-toplevel\"]);\n    // Git resolves symlinks in the toplevel (`/private/var` for `/var` on\n    // macOS); do the same, or the prefix is wrong.\n    const resolved = await realpath(contentRoot);\n    return {\n      git: gitRunner(repoRoot, options),\n      prefix: toPosix(relative(repoRoot, resolved)),\n      contentRoot,\n    };\n  } catch (error) {\n    return {\n      reason:\n        error instanceof GitError && error.exitCode === null\n          ? error.message\n          : \"The content directory is not inside a Git repository.\",\n    };\n  }\n}\n\n/** The content root's changes, as `git status` sees them. */\nexport async function listTreeChanges(tree: GitTree): Promise<TreeChange[]> {\n  // `-uall`: Git otherwise collapses a new, untracked entry directory to one line.\n  // `GIT_OPTIONAL_LOCKS=0`: no `index.lock`, so a parallel commit cannot fail on it.\n  const raw = await tree.git.run(\n    [LITERAL, \"status\", \"--porcelain=v1\", \"-z\", \"-uall\", \"--\", tree.prefix === \"\" ? \".\" : tree.prefix],\n    { env: { GIT_OPTIONAL_LOCKS: \"0\" } },\n  );\n  return parseStatus(raw, tree.prefix);\n}\n\n/**\n * Stages and commits only `paths` (content-root relative) and returns the new\n * HEAD. The pathspec limits both steps, so all other staged or unstaged work\n * stays. Without `author`, Git's configured identity applies.\n */\nexport async function commitPaths(\n  tree: GitTree,\n  paths: string[],\n  message: string,\n  author?: Author,\n): Promise<string> {\n  const inRepository = await stagePaths(tree, paths);\n  const as = author ? [`--author=${author.name} <${author.email}>`] : [];\n  await tree.git.run([LITERAL, \"commit\", \"-m\", message, ...as, \"--\", ...inRepository]);\n  return tree.git.run([\"rev-parse\", \"HEAD\"]);\n}\n\n/**\n * Commits `paths` again with the message, author and date of `original`, after\n * a rejected push. Returns the new HEAD.\n */\nexport async function recommitPaths(tree: GitTree, paths: string[], original: string): Promise<string> {\n  const inRepository = await stagePaths(tree, paths);\n  await tree.git.run([LITERAL, \"commit\", \"-C\", original, \"--\", ...inRepository]);\n  return tree.git.run([\"rev-parse\", \"HEAD\"]);\n}\n\n/**\n * Stages `paths`, because `git commit -- <paths>` refuses a file Git has never\n * seen. A path gone from the disk uses `rm --cached`, because `git add` refuses\n * a deletion that is already staged (as `reset --soft` leaves it).\n */\nasync function stagePaths(tree: GitTree, paths: string[]): Promise<string[]> {\n  const present: string[] = [];\n  const gone: string[] = [];\n  for (const path of paths) {\n    (existsSync(within(tree.contentRoot, path)) ? present : gone).push(inRepo(tree.prefix, path));\n  }\n  for (const batch of chunked(present, 500)) {\n    await tree.git.run([LITERAL, \"add\", \"-A\", \"--\", ...batch]);\n  }\n  for (const batch of chunked(gone, 500)) {\n    await tree.git.run([LITERAL, \"rm\", \"--cached\", \"--ignore-unmatch\", \"--quiet\", \"--\", ...batch]);\n  }\n  return paths.map((path) => inRepo(tree.prefix, path));\n}\n\n/** Puts one changed file back to its HEAD version, or removes it if HEAD has none. */\nexport async function discardChange(tree: GitTree, change: TreeChange): Promise<void> {\n  if (change.kind === \"create\") {\n    // Unstage a staged creation first, so the index does not point at a deleted file.\n    if (!change.untracked) {\n      await tree.git.tryRun([LITERAL, \"rm\", \"--cached\", \"--force\", \"--\", inRepo(tree.prefix, change.path)]);\n    }\n    await rm(within(tree.contentRoot, change.path), { force: true });\n    return;\n  }\n  await tree.git.run([\n    LITERAL,\n    \"restore\",\n    \"--source=HEAD\",\n    \"--staged\",\n    \"--worktree\",\n    \"--\",\n    inRepo(tree.prefix, change.path),\n  ]);\n}\n\n/** HEAD's commit id, or null before the first commit. */\nexport function headRevision(tree: GitTree): Promise<string | null> {\n  return tree.git.tryRun([\"rev-parse\", \"HEAD\"]);\n}\n\n/** The checked-out branch, or null when there is none to name. */\nexport function currentBranch(tree: GitTree): Promise<string | null> {\n  return tree.git.tryRun([\"rev-parse\", \"--abbrev-ref\", \"HEAD\"]);\n}\n\n/** The trailer that marks a commit that Mica made for a publication. */\nexport const PUBLISHED_WITH_MICA = \"Published-with: Mica\";\n\n/** A publication's commit message: the editor's summary, and Mica's trailer. */\nexport function publicationMessage(summary: string): string {\n  return `${summary}\\n\\n${PUBLISHED_WITH_MICA}`;\n}\n\n/** Commits on HEAD that no remote has, split into Mica's publications and other commits. */\nexport interface UnpushedCommits {\n  mica: number;\n  other: number;\n}\n\n/**\n * What a push of HEAD would send: the commits after the upstream branch, or,\n * for a branch without one, the commits that no remote has. Null without a\n * remote, because then nothing can be pushed and everything would count.\n */\nexport async function unpushedCommits(tree: GitTree): Promise<UnpushedCommits | null> {\n  const remotes = await tree.git.tryRun([\"remote\"]);\n  if (!remotes) return null;\n  // A commit can be on another remote branch and still be new to the upstream.\n  const upstream = await tree.git.tryRun([\"rev-parse\", \"--verify\", \"--quiet\", \"@{upstream}\"]);\n  const range = upstream ? [`${upstream}..HEAD`] : [\"HEAD\", \"--not\", \"--remotes\"];\n  // %x1e ends a commit, so a multi-line message stays one record.\n  const log = await tree.git.tryRun([\"log\", \"--max-count=1000\", \"--format=%B%x1e\", ...range]);\n  if (log === null) return { mica: 0, other: 0 };\n  const counted = { mica: 0, other: 0 };\n  for (const message of log.split(\"\\x1e\")) {\n    if (message.trim() === \"\") continue;\n    const lines = message.trim().split(\"\\n\");\n    counted[lines.includes(PUBLISHED_WITH_MICA) ? \"mica\" : \"other\"] += 1;\n  }\n  return counted;\n}\n\n/**\n * The content root as `ref` has it, read from Git's object store, because the\n * working tree holds the drafts.\n */\nexport function headSource(tree: GitTree, ref = \"HEAD\"): ContentSource {\n  const at = (path: string) => `${ref}:${path === \"\" ? tree.prefix : inRepo(tree.prefix, path)}`;\n\n  return {\n    origin: ref,\n\n    async read(path) {\n      // \"Not in HEAD\" and \"no commits yet\" both mean that there is no published version.\n      return tree.git.tryRun([\"show\", at(path)]);\n    },\n\n    async list(path) {\n      const raw = await tree.git.tryRun([\"ls-tree\", \"-z\", at(path)]);\n      if (raw === null) return [];\n\n      const entries: DirectoryEntry[] = [];\n      for (const field of raw.split(\"\\0\")) {\n        const tab = field.indexOf(\"\\t\");\n        if (tab === -1) continue;\n        const type = field.slice(0, tab).split(\" \")[1];\n        entries.push({ name: field.slice(tab + 1), type: type === \"tree\" ? \"directory\" : \"file\" });\n      }\n      return entries;\n    },\n  };\n}\n\n/**\n * `base` with `paths` taken from `top`: what a commit of exactly those paths\n * would hold. Publish checks a selection against it, not against drafts that\n * stay behind.\n */\nexport function overlaySource(base: ContentSource, top: ContentSource, paths: Iterable<string>): ContentSource {\n  const selected = new Set(paths);\n\n  return {\n    origin: `${base.origin} with the selected changes`,\n\n    read: (path) => (selected.has(path) ? top.read(path) : base.read(path)),\n\n    async list(directory) {\n      const prefix = directory === \"\" ? \"\" : `${directory}/`;\n      const items = new Map((await base.list(directory)).map((item) => [item.name, item]));\n      for (const path of selected) {\n        if (!path.startsWith(prefix)) continue;\n        const [name, ...deeper] = path.slice(prefix.length).split(\"/\");\n        if (deeper.length > 0) items.set(name!, { name: name!, type: \"directory\" });\n        else if ((await top.read(path)) === null) items.delete(name!);\n        else items.set(name!, { name: name!, type: \"file\" });\n      }\n      return [...items.values()];\n    },\n  };\n}\n\n/**\n * A save's temporary file (`*.mica-<pid>-<n>`), seen during a save or after a\n * crash. Never content.\n */\nconst TEMPORARY_FILE = /\\.mica-\\d+-\\d+$/;\n\n/**\n * Parses `git status --porcelain=v1 -z` into content-root-relative changes.\n * `-z` never changes a path; a rename is two fields and becomes a create and a\n * delete. `.mica/` is excluded: the developer commits the manifest, and the\n * drift check guards model changes.\n */\nexport function parseStatus(raw: string, prefix: string): TreeChange[] {\n  const fields = raw.split(\"\\0\").filter((field) => field !== \"\");\n  const changes: TreeChange[] = [];\n\n  const push = (\n    repoPath: string,\n    kind: TreeChange[\"kind\"],\n    flags: { untracked?: boolean; conflicted?: boolean } = {},\n  ) => {\n    const path = relativeToContent(repoPath, prefix);\n    if (path === null || path === \".mica\" || path.startsWith(\".mica/\")) return;\n    if (TEMPORARY_FILE.test(path)) return;\n    changes.push({\n      path,\n      kind,\n      untracked: flags.untracked ?? false,\n      conflicted: flags.conflicted ?? false,\n    });\n  };\n\n  for (let at = 0; at < fields.length; at += 1) {\n    const field = fields[at]!;\n    const x = field[0] ?? \" \";\n    const y = field[1] ?? \" \";\n    const repoPath = field.slice(3);\n\n    if (x === \"?\" && y === \"?\") {\n      push(repoPath, \"create\", { untracked: true });\n      continue;\n    }\n\n    // A merge conflict state, whatever the tree holds.\n    if (x === \"U\" || y === \"U\" || (x === \"A\" && y === \"A\") || (x === \"D\" && y === \"D\")) {\n      push(repoPath, \"update\", { conflicted: true });\n      continue;\n    }\n\n    if (x === \"R\" || x === \"C\") {\n      // The next field is the source path; only a rename deletes it.\n      const from = fields[++at]!;\n      push(repoPath, \"create\");\n      if (x === \"R\") push(from, \"delete\");\n      continue;\n    }\n\n    if (x === \"D\" || y === \"D\") {\n      push(repoPath, \"delete\");\n      continue;\n    }\n\n    push(repoPath, x === \"A\" ? \"create\" : \"update\");\n  }\n\n  return changes;\n}\n\nfunction relativeToContent(repoPath: string, prefix: string): string | null {\n  if (prefix === \"\") return repoPath;\n  if (repoPath === prefix) return null;\n  return repoPath.startsWith(`${prefix}/`) ? repoPath.slice(prefix.length + 1) : null;\n}\n\n/** A content-root-relative path as Git sees it, from the repository root. */\nexport function inRepo(prefix: string, path: string): string {\n  return prefix === \"\" ? path : join(prefix, path).split(sep).join(\"/\");\n}\n\nfunction toPosix(path: string): string {\n  return sep === \"/\" ? path : path.split(sep).join(\"/\");\n}\n\nfunction chunked<T>(items: T[], size: number): T[][] {\n  const batches: T[][] = [];\n  for (let at = 0; at < items.length; at += size) batches.push(items.slice(at, at + size));\n  return batches;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micacms/runtime",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "description": "The Mica single-site runtime: the Hono API, application services and staging orchestration, authentication-neutral. Composed by @micacms/editor locally and @micacms/self-hosted behind OIDC.",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "hono": "^4.13.7",
     "image-size": "^2.0.3",
     "zod": "^4.3.6",
-    "@micacms/core": "0.6.0"
+    "@micacms/core": "0.7.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.1",

package/src/app.ts

@@ -95,6 +95,11 @@ export function createApp(ctx: RuntimeContext, options: CreateAppOptions = {}):
 
   // One gate and no roles: whoever the surface admits is an editor of this site.
   for (const middleware of auth.gate) app.use("/api/admin/*", middleware);
+  // A model pushed or written since is used at once; editors cannot restart the server.
+  app.use("/api/admin/*", async (c, next) => {
+    await c.get("ctx").refreshModel();
+    await next();
+  });
 
   app.route("/api/admin", adminSystemRoutes());
   app.route("/api/admin", adminContentRoutes());

package/src/context.ts

@@ -4,12 +4,12 @@
  * runtime stays authentication-neutral.
  */
 
-import type { Site } from "@micacms/core";
+import { MANIFEST_PATH, type Site } from "@micacms/core";
 
 import type { RuntimeConfig } from "./config.js";
 import { createLogger, type Logger } from "./lib/logger.js";
 import { createRateLimiter, type RateLimiter } from "./lib/rate-limit.js";
-import { readOnlyParts } from "./schema.js";
+import { loadSchema, readOnlyParts, SchemaError } from "./schema.js";
 import { createMediaService, type MediaService } from "./services/media.js";
 import type { ContentStagingService } from "./services/changes.js";
 import { createContentStore, type ContentStore } from "./services/content-store.js";
@@ -23,7 +23,7 @@ import type { GitTree } from "./workspace/tree.js";
 export interface SiteContext {
   /** Identifies this site in logs. */
   id: string;
-  /** The content model, read from the repository at startup. */
+  /** The content model in use: read at startup, and again when `.mica/schema.json` changes. */
   model: Site;
   /** The working tree's files behind the workspace locks. Only Publish makes a commit. */
   contentRepository: ContentFiles;
@@ -34,6 +34,8 @@ export interface SiteContext {
   schemaRevision: string | null;
   /** Collections and singletons this build cannot write, from `readOnlyParts`, with the reason. */
   readOnly: ReadonlyMap<string, string>;
+  /** Why the newer model in the working tree is not in use. The model above stays in use. */
+  modelWarning: { message: string; revision: string | null } | null;
 }
 
 export const DEFAULT_SITE_ID = "default";
@@ -74,6 +76,12 @@ export interface RuntimeContext {
   };
   operational(): OperationalInfo;
   health: RuntimeHealth;
+  /**
+   * Uses a new content model when `.mica/schema.json` changed, and keeps the one
+   * in use when the new one cannot be read. Checks at most every two seconds,
+   * unless `force`.
+   */
+  refreshModel(options?: { force?: boolean }): Promise<void>;
   shutdown(): Promise<void>;
 }
 
@@ -94,6 +102,8 @@ export interface CreateRuntimeContextOptions {
   locks?: WorkspaceLocks;
   /** See `WorkingTreeStagingDeps.tree`. */
   tree?: GitTree;
+  /** Called after a new model is in use, for what the app keeps beside the runtime. */
+  onModel?: (model: Site) => void;
   onShutdown?: () => void | Promise<void>;
 }
 
@@ -112,35 +122,73 @@ export function createRuntimeContext(options: CreateRuntimeContextOptions): Runt
   // Services write through the lock wrapper; staging takes the locks itself.
   const locks = options.locks ?? createWorkspaceLocks();
 
-  const readOnly = readOnlyParts(model);
-  for (const reason of readOnly.values()) logger.warn("Read-only in this version of Mica", { reason });
-
   const site: SiteContext = {
     id: options.siteId ?? DEFAULT_SITE_ID,
     model,
     contentRepository: lockedFiles(options.files, locks.tree),
     schemaRevision,
-    readOnly,
+    readOnly: new Map(),
+    modelWarning: null,
+  };
+
+  /** The services that read the model. Media does not. */
+  const forModel = (current: Site, revision: string | null) => {
+    const readOnly = readOnlyParts(current);
+    for (const reason of readOnly.values()) logger.warn("Read-only in this version of Mica", { reason });
+    site.model = current;
+    site.schemaRevision = revision;
+    site.readOnly = readOnly;
+    return {
+      content: createContentStore(current, site.contentRepository, readOnly),
+      staging: createWorkingTreeStagingService({
+        model: current,
+        files: options.files,
+        contentRoot: config.contentRoot,
+        schemaRevision: revision,
+        readOnly,
+        publishEnabled: config.MICA_LOCAL_PUBLISH,
+        logger,
+        locks,
+        ...(options.policy ? { policy: options.policy } : {}),
+        ...(options.tree ? { tree: options.tree } : {}),
+      }),
+    };
   };
 
+  // Routes read `ctx.services` on each request, so a reload replaces these in place.
   const services = {
-    content: createContentStore(model, site.contentRepository, readOnly),
+    ...forModel(model, schemaRevision),
     media: createMediaService({
       files: site.contentRepository,
       maxBytes: config.MICA_MAX_UPLOAD_BYTES,
     }),
-    staging: createWorkingTreeStagingService({
-      model,
-      files: options.files,
-      contentRoot: config.contentRoot,
-      schemaRevision,
-      readOnly,
-      publishEnabled: config.MICA_LOCAL_PUBLISH,
-      logger,
-      locks,
-      ...(options.policy ? { policy: options.policy } : {}),
-      ...(options.tree ? { tree: options.tree } : {}),
-    }),
+  };
+
+  let checkedAt = 0;
+  let checking: Promise<void> | null = null;
+  const refreshModel = (refresh: { force?: boolean } = {}): Promise<void> => {
+    // A forced check must read the files as they are now, not join one that started earlier.
+    if (checking) return refresh.force ? checking.then(() => refreshModel(refresh)) : checking;
+    if (!refresh.force && Date.now() - checkedAt < 2_000) return Promise.resolve();
+    checking = (async () => {
+      checkedAt = Date.now();
+      const revision = await options.files.revision(MANIFEST_PATH);
+      if (revision === site.schemaRevision || revision === site.modelWarning?.revision) return;
+      try {
+        const next = await loadSchema(options.files);
+        Object.assign(services, forModel(next, revision));
+        site.modelWarning = null;
+        logger.info("Using the new content model", { revision });
+        options.onModel?.(next);
+      } catch (error) {
+        if (!(error instanceof SchemaError)) throw error;
+        site.modelWarning = { message: error.message, revision };
+        logger.warn("The new content model cannot be read; the one in use stays", { message: error.message });
+      }
+    })().finally(() => {
+      checking = null;
+    });
+    return checking;
   };
 
   const limiters = {
@@ -158,6 +206,7 @@ export function createRuntimeContext(options: CreateRuntimeContextOptions): Runt
       options.operational ??
       (() => ({ auth: "unspecified" })),
     health: options.health ?? {},
+    refreshModel,
 
     async shutdown() {
       limiters.api.stop();

package/src/http.ts

@@ -44,3 +44,9 @@ export function actorOf(c: Context<Env>): { id: string; email: string; name: str
   const identity = c.get("access")?.identity;
   return identity ? { id: identity.subject, email: identity.email, name: identity.name } : null;
 }
+
+/** Who did it, for the log: the signed-in editor's email, else their subject. None in the local editor. */
+export function editorOf(c: Context<Env>): string | undefined {
+  const actor = actorOf(c);
+  return actor ? actor.email || actor.id : undefined;
+}

package/src/lib/file-type.ts

@@ -92,9 +92,12 @@ export const isImageType = (mimeType: string): boolean => IMAGE_TYPES.has(mimeTy
 export function isAccepted(mimeType: string, accept: "image" | "document" | "any"): boolean {
   if (accept === "image") return IMAGE_TYPES.has(mimeType);
   if (accept === "document") return DOCUMENT_TYPES.has(mimeType);
-  return IMAGE_TYPES.has(mimeType) || DOCUMENT_TYPES.has(mimeType) || mimeType === "video/mp4";
+  return IMAGE_TYPES.has(mimeType) || DOCUMENT_TYPES.has(mimeType);
 }
 
+/** A video is large for a Git repository, and the media list cannot show one. */
+export const VIDEO_TYPE = "video/mp4";
+
 /**
  * SVG can carry scripts, so Mica neither stores nor shows it (#86). It is still
  * detected, so that the refusal can say why.

package/src/routes/admin-content.ts

@@ -11,7 +11,7 @@ import { Hono } from "hono";
 import { z } from "zod";
 
 import { ApiError, badRequest, notFound } from "../lib/errors.js";
-import type { Env } from "../http.js";
+import { editorOf, type Env } from "../http.js";
 
 const saveSchema = z.object({
   data: z.record(z.string(), z.unknown()),
@@ -21,6 +21,10 @@ const saveSchema = z.object({
    * exist, so two parallel creates cannot overwrite.
    */
   revision: z.string().nullable().optional(),
+  /** The editor saw that a colleague saved since, and chose to save over it. Logged. */
+  keepMine: z.boolean().optional(),
+  /** On a URL change: other entries and settings pages that link here follow the new URL. */
+  updateLinks: z.boolean().optional(),
 });
 
 const reorderSchema = z.object({ slugs: z.array(z.string().min(1)).max(2000) });
@@ -140,8 +144,15 @@ export function adminContentRoutes(): Hono<Env> {
         data: parsed.data.data,
         slug: c.req.param("slug"),
         expectedRevision: parsed.data.revision,
+        ...(parsed.data.updateLinks ? { updateLinks: true } : {}),
       }),
     );
+    if (parsed.data.keepMine) {
+      c.get("ctx").logger.info("Kept own version over a newer save", {
+        entry: `${c.req.param("collection")}/${c.req.param("slug")}`,
+        editor: editorOf(c),
+      });
+    }
 
     return c.json(saved);
   });
@@ -182,13 +193,16 @@ export function adminContentRoutes(): Hono<Env> {
 
   app.put("/singletons/:name", async (c) => {
     const { content } = c.get("ctx").services;
-    const body = (await jsonBody(c)) as { data?: unknown; revision?: string | null };
+    const body = (await jsonBody(c)) as { data?: unknown; revision?: string | null; keepMine?: boolean };
 
     const saved = await handled(() =>
       content.saveSingleton(c.req.param("name"), body?.data ?? {}, {
         expectedRevision: body?.revision,
       }),
     );
+    if (body?.keepMine === true) {
+      c.get("ctx").logger.info("Kept own version over a newer save", { singleton: c.req.param("name"), editor: editorOf(c) });
+    }
 
     return c.json(saved);
   });