@micacms/runtime 0.5.0 → 0.6.0-rc.1

package/dist/services/staging.js

@@ -14,14 +14,15 @@ import { ApiError, badRequest, notFound } from "../lib/errors.js";
 import { developerPolicy } from "../workspace/developer.js";
 import { GitError } from "../workspace/git.js";
 import { createWorkspaceLocks } from "../workspace/locks.js";
-import { aheadOfUpstream, commitPaths, currentBranch, discardChange, headRevision, headSource, listTreeChanges, locateTree, } from "../workspace/tree.js";
+import { aheadOfUpstream, commitPaths, currentBranch, discardChange, headRevision, headSource, overlaySource, listTreeChanges, locateTree, } from "../workspace/tree.js";
 import { analyseChanges, compareSources, describeProblems, flattenProblems, } from "./changes.js";
 export function createWorkingTreeStagingService(deps) {
     const { model, files, contentRoot, logger } = deps;
     const policy = deps.policy ?? developerPolicy({ publishEnabled: deps.publishEnabled, logger });
     const locks = deps.locks ?? createWorkspaceLocks();
-    const analyse = async (tree, treeChanges) => {
-        const { changes, validation } = await analyseChanges(model, files, treeChanges, headSource(tree));
+    /** `source` is what the result holds: the whole working tree, or HEAD with a selection. */
+    const analyse = async (tree, treeChanges, source = files) => {
+        const { changes, validation } = await analyseChanges(model, source, treeChanges, headSource(tree));
         // The field validator cannot see a merge conflict: the file holds Git's conflict format.
         for (const change of treeChanges) {
             if (!change.conflicted)
@@ -149,7 +150,9 @@ export function createWorkingTreeStagingService(deps) {
                             "the new model, then review the pending changes and publish again.");
                     }
                     const selected = (await listTreeChanges(tree)).filter((change) => change.path in input.paths);
-                    const { validation } = await analyse(tree, selected);
+                    // Checked against what the commit will hold: drafts left behind are not on the site.
+                    const result = overlaySource(headSource(tree), files, selected.map((change) => change.path));
+                    const { validation } = await analyse(tree, selected, result);
                     if (!validation.ok) {
                         throw new ApiError("validation_failed", describeProblems(validation.problems), {
                             issues: flattenProblems(validation.problems),

package/dist/services/staging.js.map

@@ -1 +1 @@
-{"version":3,"file":"staging.js","sourceRoot":"","sources":["../../src/services/staging.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The staging service on a Git working tree. Autosave has already written the\n * files; Publish commits the reviewed paths.\n *\n *   - Every Git operation is limited to an explicit path set, so other work in\n *     the same checkout is never swept in.\n *   - Only the reviewed files are published, as the editor saw them. Drafts of\n *     other entries stay drafts.\n *   - When the push fails, the commit stays as `committed-pending-push`; a\n *     retry pushes and never commits again.\n */\n\nimport { MANIFEST_PATH, memorySource, type PublishResult, type Site } from \"@micacms/core\";\n\nimport { ApiError, badRequest, notFound } from \"../lib/errors.js\";\nimport type { Logger } from \"../lib/logger.js\";\nimport { developerPolicy } from \"../workspace/developer.js\";\nimport type { ContentFiles } from \"../workspace/files.js\";\nimport { GitError } from \"../workspace/git.js\";\nimport { createWorkspaceLocks, type WorkspaceLocks } from \"../workspace/locks.js\";\nimport type { OwnerPolicy } from \"../workspace/policy.js\";\nimport {\n  aheadOfUpstream,\n  commitPaths,\n  currentBranch,\n  discardChange,\n  headRevision,\n  headSource,\n  listTreeChanges,\n  locateTree,\n  type GitTree,\n  type TreeChange,\n} from \"../workspace/tree.js\";\nimport {\n  analyseChanges,\n  compareSources,\n  describeProblems,\n  flattenProblems,\n  type AnnotatedChange,\n  type CompareTarget,\n  type Comparison,\n  type ContentStagingService,\n  type PublishInput,\n  type RepositoryInfo,\n  type StagingStatus,\n  type StagingValidation,\n} from \"./changes.js\";\n\nexport interface WorkingTreeStagingDeps {\n  model: Site;\n  /**\n   * The working tree's files without the lock wrapper: this service holds the\n   * locks around whole operations.\n   */\n  files: ContentFiles;\n  contentRoot: string;\n  schemaRevision: string | null;\n  /** From `readOnlyParts`: a change to one of these is never published by this build. */\n  readOnly?: ReadonlyMap<string, string>;\n  /** `MICA_LOCAL_PUBLISH`, for the default developer policy. */\n  publishEnabled: boolean;\n  logger: Logger;\n  /** Defaults to the developer. */\n  policy?: OwnerPolicy;\n  /** Shared with the services that write content. */\n  locks?: WorkspaceLocks;\n  /**\n   * Set by a managed clone, whose Git runs in an isolated environment. Without\n   * it, the developer's Git finds the tree.\n   */\n  tree?: GitTree;\n}\n\nexport function createWorkingTreeStagingService(\n  deps: WorkingTreeStagingDeps,\n): ContentStagingService {\n  const { model, files, contentRoot, logger } = deps;\n  const policy = deps.policy ?? developerPolicy({ publishEnabled: deps.publishEnabled, logger });\n  const locks = deps.locks ?? createWorkspaceLocks();\n\n  const analyse = async (tree: GitTree, treeChanges: TreeChange[]) => {\n    const { changes, validation } = await analyseChanges(\n      model,\n      files,\n      treeChanges,\n      headSource(tree),\n    );\n\n    // The field validator cannot see a merge conflict: the file holds Git's conflict format.\n    for (const change of treeChanges) {\n      if (!change.conflicted) continue;\n      validation.problems.push({\n        path: change.path,\n        label: change.path,\n        issues: [\n          { path: \"\", message: \"This file has a Git merge conflict. Resolve it with your Git tools.\" },\n        ],\n      });\n    }\n    // By the first path segment, so that a stray file in a read-only collection is caught too.\n    for (const change of changes) {\n      const head = change.path.split(\"/\")[0] ?? \"\";\n      const reason = deps.readOnly?.get(`collections.${head}`) ?? deps.readOnly?.get(`singletons.${head.replace(/\\.json$/, \"\")}`);\n      if (reason) {\n        validation.problems.push({ path: change.path, label: change.owner.label, issues: [{ path: \"\", message: reason }] });\n      }\n    }\n    validation.ok = validation.problems.length === 0;\n\n    return { changes, validation };\n  };\n\n  const locate = async (): Promise<GitTree | { reason: string }> => deps.tree ?? locateTree(contentRoot);\n\n  const located = async (): Promise<GitTree> => {\n    const tree = await locate();\n    if (\"reason\" in tree) throw badRequest(tree.reason);\n    return tree;\n  };\n\n  const publishable = async (): Promise<GitTree> => {\n    const availability = policy.publishAvailability();\n    if (!availability.enabled) throw badRequest(availability.reason);\n    return located();\n  };\n\n  /** The key that keeps an entry's files together: a publication never splits one. */\n  const groupOf = (change: AnnotatedChange): string => {\n    const owner = change.owner;\n    if (owner.kind === \"entry\") return `entry:${owner.collection}/${owner.slug}`;\n    if (owner.kind === \"singleton\") return `singleton:${owner.name}`;\n    if (owner.kind === \"order\") return `order:${owner.collection}`;\n    return `file:${change.path}`;\n  };\n\n  const withRevisions = async (changes: AnnotatedChange[]): Promise<AnnotatedChange[]> =>\n    Promise.all(\n      changes.map(async (change) => ({\n        ...change,\n        revision: change.kind === \"delete\" ? null : await files.revision(change.path),\n      })),\n    );\n\n  /** Refused for the developer's checkout: Mica never fetches or merges there. */\n  const managedOnly = <T>(action: T | undefined): T => {\n    if (action === undefined) throw notFound(\"This is the developer's checkout; Git there is theirs.\");\n    return action;\n  };\n\n  return {\n    async status(): Promise<StagingStatus> {\n      const tree = await locate();\n      const sync = policy.syncStatus?.() ?? null;\n\n      if (\"reason\" in tree) {\n        return {\n          owner: policy.owner,\n          publish: { enabled: false, reason: tree.reason },\n          head: null,\n          branch: null,\n          ahead: null,\n          changes: [],\n          validation: emptyValidation(),\n          sync,\n        };\n      }\n\n      const { changes, validation, head, branch } = await locks.tree.read(async () => {\n        const analysed = await analyse(tree, await listTreeChanges(tree));\n        return {\n          ...analysed,\n          changes: await withRevisions(analysed.changes),\n          head: await headRevision(tree),\n          branch: await currentBranch(tree),\n        };\n      });\n\n      return {\n        owner: policy.owner,\n        publish: policy.publishAvailability(),\n        head,\n        branch,\n        ahead: await aheadOfUpstream(tree),\n        changes,\n        validation,\n        sync,\n      };\n    },\n\n    async publish(input: PublishInput): Promise<PublishResult> {\n      const message = input.message.trim();\n      if (!message) throw badRequest(\"A publication needs a commit message.\");\n      const reviewed = Object.keys(input.paths);\n      if (reviewed.length === 0) throw badRequest(\"Choose at least one change to publish.\");\n\n      const tree = await publishable();\n\n      // One publication at a time from sync to push: no sync can run in\n      // between, and no second commit can stack up.\n      return locks.remote.run(async () => {\n        await policy.prepare(tree);\n\n        const revision = await locks.tree.write(async () => {\n          const pending = await withRevisions((await analyse(tree, await listTreeChanges(tree))).changes);\n          const byPath = new Map(pending.map((change) => [change.path, change]));\n\n          // The review gate refuses a file saved again since the review, a\n          // reviewed file that is no longer pending, or another file of a\n          // reviewed entry. Drafts of other entries never block a publication.\n          const reviewedGroups = new Set(\n            reviewed.map((path) => byPath.get(path)).flatMap((change) => (change ? [groupOf(change)] : [])),\n          );\n          const stale = [\n            ...reviewed.filter((path) => byPath.get(path)?.revision !== input.paths[path] || !byPath.has(path)),\n            ...pending\n              .filter((change) => reviewedGroups.has(groupOf(change)) && !(change.path in input.paths))\n              .map((change) => change.path),\n          ];\n          if (stale.length > 0) {\n            throw new ApiError(\n              \"conflict\",\n              \"Some of these changes were edited after you reviewed them. Review them again, then publish.\",\n            );\n          }\n\n          // The model drift gate: validation used the model that this process started with.\n          if ((await files.revision(MANIFEST_PATH)) !== deps.schemaRevision) {\n            throw new ApiError(\n              \"conflict\",\n              \"The content model changed after this server started. Restart Mica to load \" +\n                \"the new model, then review the pending changes and publish again.\",\n            );\n          }\n\n          const selected = (await listTreeChanges(tree)).filter((change) => change.path in input.paths);\n          const { validation } = await analyse(tree, selected);\n          if (!validation.ok) {\n            throw new ApiError(\"validation_failed\", describeProblems(validation.problems), {\n              issues: flattenProblems(validation.problems),\n            });\n          }\n\n          try {\n            const revision = await commitPaths(tree, reviewed, message, policy.commitAuthor(input.author));\n            logger.info(\"Published\", { revision, files: reviewed.length, owner: policy.owner });\n            return revision;\n          } catch (error) {\n            if (error instanceof GitError) {\n              // Git's message is the actionable part: no identity, a hook that\n              // refused, a rebase in progress.\n              throw new ApiError(\"conflict\", `Git refused the commit: ${error.message}`);\n            }\n            throw error;\n          }\n        });\n\n        return policy.push(tree, revision);\n      });\n    },\n\n    async push(): Promise<PublishResult> {\n      const tree = await publishable();\n\n      return locks.remote.run(async () => {\n        const revision = await headRevision(tree);\n        if (revision === null) throw badRequest(\"There is no commit to push yet.\");\n        return policy.push(tree, revision);\n      });\n    },\n\n    async discard(requested: string[]): Promise<{ discarded: string[] }> {\n      const tree = await located();\n\n      return locks.tree.write(async () => {\n        // Discard is destructive, so it reaches only paths that the change list names.\n        const current = new Map((await listTreeChanges(tree)).map((change) => [change.path, change]));\n\n        const discarded: string[] = [];\n        for (const path of requested) {\n          const change = current.get(path);\n          if (!change) continue;\n          await discardChange(tree, change);\n          discarded.push(path);\n        }\n\n        return { discarded };\n      });\n    },\n\n    async compare(target: CompareTarget, against: \"head\" | \"origin\" = \"head\"): Promise<Comparison> {\n      const tree = await locate();\n      if (against === \"origin\" && !policy.upstreamRef) throw badRequest(\"There is no website version to compare with here.\");\n      // Without a repository nothing is published, so \"before\" is an empty source.\n      const published =\n        \"reason\" in tree\n          ? memorySource({}, \"unpublished\")\n          : headSource(tree, against === \"origin\" ? policy.upstreamRef : \"HEAD\");\n      return locks.tree.read(() => compareSources(model, published, files, target));\n    },\n\n    async sync(): Promise<void> {\n      await managedOnly(policy.sync)();\n    },\n\n    async resolve(group: string, choice: \"mine\" | \"website\"): Promise<void> {\n      await managedOnly(policy.resolve)(group, choice);\n    },\n\n    async repository(): Promise<RepositoryInfo> {\n      const tree = await locate();\n      const described = (await policy.describe?.()) ?? null;\n      return {\n        owner: policy.owner,\n        branch: \"reason\" in tree ? null : await currentBranch(tree),\n        head: \"reason\" in tree ? null : await headRevision(tree),\n        url: described?.url ?? null,\n        cloneBytes: described?.cloneBytes ?? null,\n        sync: policy.syncStatus?.() ?? null,\n      };\n    },\n  };\n}\n\nfunction emptyValidation(): StagingValidation {\n  return { ok: true, problems: [] };\n}\n"]}
+{"version":3,"file":"staging.js","sourceRoot":"","sources":["../../src/services/staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,aAAa,EAAE,YAAY,EAAqD,MAAM,eAAe,CAAC;AAE/G,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAuB,MAAM,uBAAuB,CAAC;AAElF,OAAO,EACL,eAAe,EACf,WAAW,EACX,aAAa,EACb,aAAa,EACb,YAAY,EACZ,UAAU,EACV,aAAa,EACb,eAAe,EACf,UAAU,GAGX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,eAAe,GAShB,MAAM,cAAc,CAAC;AA2BtB,MAAM,UAAU,+BAA+B,CAC7C,IAA4B;IAE5B,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,eAAe,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,oBAAoB,EAAE,CAAC;IAEnD,2FAA2F;IAC3F,MAAM,OAAO,GAAG,KAAK,EAAE,IAAa,EAAE,WAAyB,EAAE,SAAwB,KAAK,EAAE,EAAE;QAChG,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,cAAc,CAClD,KAAK,EACL,MAAM,EACN,WAAW,EACX,UAAU,CAAC,IAAI,CAAC,CACjB,CAAC;QAEF,yFAAyF;QACzF,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,UAAU;gBAAE,SAAS;YACjC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACvB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,KAAK,EAAE,MAAM,CAAC,IAAI;gBAClB,MAAM,EAAE;oBACN,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,qEAAqE,EAAE;iBAC7F;aACF,CAAC,CAAC;QACL,CAAC;QACD,2FAA2F;QAC3F,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5H,IAAI,MAAM,EAAE,CAAC;gBACX,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACtH,CAAC;QACH,CAAC;QACD,UAAU,CAAC,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;QAEjD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IACjC,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,IAA2C,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;IAEvG,MAAM,OAAO,GAAG,KAAK,IAAsB,EAAE;QAC3C,MAAM,IAAI,GAAG,MAAM,MAAM,EAAE,CAAC;QAC5B,IAAI,QAAQ,IAAI,IAAI;YAAE,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,IAAsB,EAAE;QAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAClD,IAAI,CAAC,YAAY,CAAC,OAAO;YAAE,MAAM,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC,CAAC;IAEF,oFAAoF;IACpF,MAAM,OAAO,GAAG,CAAC,MAAuB,EAAU,EAAE;QAClD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,SAAS,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QAC7E,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,aAAa,KAAK,CAAC,IAAI,EAAE,CAAC;QACjE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,SAAS,KAAK,CAAC,UAAU,EAAE,CAAC;QAC/D,OAAO,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,EAAE,OAA0B,EAA8B,EAAE,CACrF,OAAO,CAAC,GAAG,CACT,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7B,GAAG,MAAM;QACT,QAAQ,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;KAC9E,CAAC,CAAC,CACJ,CAAC;IAEJ,gFAAgF;IAChF,MAAM,WAAW,GAAG,CAAI,MAAqB,EAAK,EAAE;QAClD,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,QAAQ,CAAC,wDAAwD,CAAC,CAAC;QACnG,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO;QACL,KAAK,CAAC,MAAM;YACV,MAAM,IAAI,GAAG,MAAM,MAAM,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,IAAI,CAAC;YAE3C,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,OAAO;oBACL,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;oBAChD,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,EAAE;oBACX,UAAU,EAAE,eAAe,EAAE;oBAC7B,IAAI;iBACL,CAAC;YACJ,CAAC;YAED,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;gBAC7E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;gBAClE,OAAO;oBACL,GAAG,QAAQ;oBACX,OAAO,EAAE,MAAM,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC9C,IAAI,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;oBAC9B,MAAM,EAAE,MAAM,aAAa,CAAC,IAAI,CAAC;iBAClC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,mBAAmB,EAAE;gBACrC,IAAI;gBACJ,MAAM;gBACN,KAAK,EAAE,MAAM,eAAe,CAAC,IAAI,CAAC;gBAClC,OAAO;gBACP,UAAU;gBACV,IAAI;aACL,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,KAAmB;YAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO;gBAAE,MAAM,UAAU,CAAC,uCAAuC,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,UAAU,CAAC,wCAAwC,CAAC,CAAC;YAEtF,MAAM,IAAI,GAAG,MAAM,WAAW,EAAE,CAAC;YAEjC,kEAAkE;YAClE,8CAA8C;YAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACjC,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE3B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;oBACjD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBAChG,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;oBAEvE,iEAAiE;oBACjE,gEAAgE;oBAChE,qEAAqE;oBACrE,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAChG,CAAC;oBACF,MAAM,KAAK,GAAG;wBACZ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACnG,GAAG,OAAO;6BACP,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;6BACxF,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;qBAChC,CAAC;oBACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACrB,MAAM,IAAI,QAAQ,CAChB,UAAU,EACV,6FAA6F,CAC9F,CAAC;oBACJ,CAAC;oBAED,kFAAkF;oBAClF,IAAI,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;wBAClE,MAAM,IAAI,QAAQ,CAChB,UAAU,EACV,4EAA4E;4BAC1E,mEAAmE,CACtE,CAAC;oBACJ,CAAC;oBAED,MAAM,QAAQ,GAAG,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC9F,qFAAqF;oBACrF,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC7F,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;oBAC7D,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;wBACnB,MAAM,IAAI,QAAQ,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;4BAC7E,MAAM,EAAE,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC;yBAC7C,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,CAAC;wBACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;wBAC/F,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;wBACpF,OAAO,QAAQ,CAAC;oBAClB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;4BAC9B,iEAAiE;4BACjE,iCAAiC;4BACjC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,2BAA2B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC7E,CAAC;wBACD,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI;YACR,MAAM,IAAI,GAAG,MAAM,WAAW,EAAE,CAAC;YAEjC,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACjC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,QAAQ,KAAK,IAAI;oBAAE,MAAM,UAAU,CAAC,iCAAiC,CAAC,CAAC;gBAC3E,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,SAAmB;YAC/B,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;YAE7B,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;gBACjC,+EAA+E;gBAC/E,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;gBAE9F,MAAM,SAAS,GAAa,EAAE,CAAC;gBAC/B,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;oBAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjC,IAAI,CAAC,MAAM;wBAAE,SAAS;oBACtB,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAClC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC;gBAED,OAAO,EAAE,SAAS,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,MAAqB,EAAE,UAA6B,MAAM;YACtE,MAAM,IAAI,GAAG,MAAM,MAAM,EAAE,CAAC;YAC5B,IAAI,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,WAAW;gBAAE,MAAM,UAAU,CAAC,mDAAmD,CAAC,CAAC;YACvH,6EAA6E;YAC7E,MAAM,SAAS,GACb,QAAQ,IAAI,IAAI;gBACd,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,aAAa,CAAC;gBACjC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3E,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,KAAK,CAAC,IAAI;YACR,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,KAAa,EAAE,MAA0B;YACrD,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;QAED,KAAK,CAAC,UAAU;YACd,MAAM,IAAI,GAAG,MAAM,MAAM,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;YACtD,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,IAAI,CAAC;gBAC3D,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC;gBACxD,GAAG,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI;gBAC3B,UAAU,EAAE,SAAS,EAAE,UAAU,IAAI,IAAI;gBACzC,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,IAAI;aACpC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AACpC,CAAC","sourcesContent":["/**\n * The staging service on a Git working tree. Autosave has already written the\n * files; Publish commits the reviewed paths.\n *\n *   - Every Git operation is limited to an explicit path set, so other work in\n *     the same checkout is never swept in.\n *   - Only the reviewed files are published, as the editor saw them. Drafts of\n *     other entries stay drafts.\n *   - When the push fails, the commit stays as `committed-pending-push`; a\n *     retry pushes and never commits again.\n */\n\nimport { MANIFEST_PATH, memorySource, type ContentSource, type PublishResult, type Site } from \"@micacms/core\";\n\nimport { ApiError, badRequest, notFound } from \"../lib/errors.js\";\nimport type { Logger } from \"../lib/logger.js\";\nimport { developerPolicy } from \"../workspace/developer.js\";\nimport type { ContentFiles } from \"../workspace/files.js\";\nimport { GitError } from \"../workspace/git.js\";\nimport { createWorkspaceLocks, type WorkspaceLocks } from \"../workspace/locks.js\";\nimport type { OwnerPolicy } from \"../workspace/policy.js\";\nimport {\n  aheadOfUpstream,\n  commitPaths,\n  currentBranch,\n  discardChange,\n  headRevision,\n  headSource,\n  overlaySource,\n  listTreeChanges,\n  locateTree,\n  type GitTree,\n  type TreeChange,\n} from \"../workspace/tree.js\";\nimport {\n  analyseChanges,\n  compareSources,\n  describeProblems,\n  flattenProblems,\n  type AnnotatedChange,\n  type CompareTarget,\n  type Comparison,\n  type ContentStagingService,\n  type PublishInput,\n  type RepositoryInfo,\n  type StagingStatus,\n  type StagingValidation,\n} from \"./changes.js\";\n\nexport interface WorkingTreeStagingDeps {\n  model: Site;\n  /**\n   * The working tree's files without the lock wrapper: this service holds the\n   * locks around whole operations.\n   */\n  files: ContentFiles;\n  contentRoot: string;\n  schemaRevision: string | null;\n  /** From `readOnlyParts`: a change to one of these is never published by this build. */\n  readOnly?: ReadonlyMap<string, string>;\n  /** `MICA_LOCAL_PUBLISH`, for the default developer policy. */\n  publishEnabled: boolean;\n  logger: Logger;\n  /** Defaults to the developer. */\n  policy?: OwnerPolicy;\n  /** Shared with the services that write content. */\n  locks?: WorkspaceLocks;\n  /**\n   * Set by a managed clone, whose Git runs in an isolated environment. Without\n   * it, the developer's Git finds the tree.\n   */\n  tree?: GitTree;\n}\n\nexport function createWorkingTreeStagingService(\n  deps: WorkingTreeStagingDeps,\n): ContentStagingService {\n  const { model, files, contentRoot, logger } = deps;\n  const policy = deps.policy ?? developerPolicy({ publishEnabled: deps.publishEnabled, logger });\n  const locks = deps.locks ?? createWorkspaceLocks();\n\n  /** `source` is what the result holds: the whole working tree, or HEAD with a selection. */\n  const analyse = async (tree: GitTree, treeChanges: TreeChange[], source: ContentSource = files) => {\n    const { changes, validation } = await analyseChanges(\n      model,\n      source,\n      treeChanges,\n      headSource(tree),\n    );\n\n    // The field validator cannot see a merge conflict: the file holds Git's conflict format.\n    for (const change of treeChanges) {\n      if (!change.conflicted) continue;\n      validation.problems.push({\n        path: change.path,\n        label: change.path,\n        issues: [\n          { path: \"\", message: \"This file has a Git merge conflict. Resolve it with your Git tools.\" },\n        ],\n      });\n    }\n    // By the first path segment, so that a stray file in a read-only collection is caught too.\n    for (const change of changes) {\n      const head = change.path.split(\"/\")[0] ?? \"\";\n      const reason = deps.readOnly?.get(`collections.${head}`) ?? deps.readOnly?.get(`singletons.${head.replace(/\\.json$/, \"\")}`);\n      if (reason) {\n        validation.problems.push({ path: change.path, label: change.owner.label, issues: [{ path: \"\", message: reason }] });\n      }\n    }\n    validation.ok = validation.problems.length === 0;\n\n    return { changes, validation };\n  };\n\n  const locate = async (): Promise<GitTree | { reason: string }> => deps.tree ?? locateTree(contentRoot);\n\n  const located = async (): Promise<GitTree> => {\n    const tree = await locate();\n    if (\"reason\" in tree) throw badRequest(tree.reason);\n    return tree;\n  };\n\n  const publishable = async (): Promise<GitTree> => {\n    const availability = policy.publishAvailability();\n    if (!availability.enabled) throw badRequest(availability.reason);\n    return located();\n  };\n\n  /** The key that keeps an entry's files together: a publication never splits one. */\n  const groupOf = (change: AnnotatedChange): string => {\n    const owner = change.owner;\n    if (owner.kind === \"entry\") return `entry:${owner.collection}/${owner.slug}`;\n    if (owner.kind === \"singleton\") return `singleton:${owner.name}`;\n    if (owner.kind === \"order\") return `order:${owner.collection}`;\n    return `file:${change.path}`;\n  };\n\n  const withRevisions = async (changes: AnnotatedChange[]): Promise<AnnotatedChange[]> =>\n    Promise.all(\n      changes.map(async (change) => ({\n        ...change,\n        revision: change.kind === \"delete\" ? null : await files.revision(change.path),\n      })),\n    );\n\n  /** Refused for the developer's checkout: Mica never fetches or merges there. */\n  const managedOnly = <T>(action: T | undefined): T => {\n    if (action === undefined) throw notFound(\"This is the developer's checkout; Git there is theirs.\");\n    return action;\n  };\n\n  return {\n    async status(): Promise<StagingStatus> {\n      const tree = await locate();\n      const sync = policy.syncStatus?.() ?? null;\n\n      if (\"reason\" in tree) {\n        return {\n          owner: policy.owner,\n          publish: { enabled: false, reason: tree.reason },\n          head: null,\n          branch: null,\n          ahead: null,\n          changes: [],\n          validation: emptyValidation(),\n          sync,\n        };\n      }\n\n      const { changes, validation, head, branch } = await locks.tree.read(async () => {\n        const analysed = await analyse(tree, await listTreeChanges(tree));\n        return {\n          ...analysed,\n          changes: await withRevisions(analysed.changes),\n          head: await headRevision(tree),\n          branch: await currentBranch(tree),\n        };\n      });\n\n      return {\n        owner: policy.owner,\n        publish: policy.publishAvailability(),\n        head,\n        branch,\n        ahead: await aheadOfUpstream(tree),\n        changes,\n        validation,\n        sync,\n      };\n    },\n\n    async publish(input: PublishInput): Promise<PublishResult> {\n      const message = input.message.trim();\n      if (!message) throw badRequest(\"A publication needs a commit message.\");\n      const reviewed = Object.keys(input.paths);\n      if (reviewed.length === 0) throw badRequest(\"Choose at least one change to publish.\");\n\n      const tree = await publishable();\n\n      // One publication at a time from sync to push: no sync can run in\n      // between, and no second commit can stack up.\n      return locks.remote.run(async () => {\n        await policy.prepare(tree);\n\n        const revision = await locks.tree.write(async () => {\n          const pending = await withRevisions((await analyse(tree, await listTreeChanges(tree))).changes);\n          const byPath = new Map(pending.map((change) => [change.path, change]));\n\n          // The review gate refuses a file saved again since the review, a\n          // reviewed file that is no longer pending, or another file of a\n          // reviewed entry. Drafts of other entries never block a publication.\n          const reviewedGroups = new Set(\n            reviewed.map((path) => byPath.get(path)).flatMap((change) => (change ? [groupOf(change)] : [])),\n          );\n          const stale = [\n            ...reviewed.filter((path) => byPath.get(path)?.revision !== input.paths[path] || !byPath.has(path)),\n            ...pending\n              .filter((change) => reviewedGroups.has(groupOf(change)) && !(change.path in input.paths))\n              .map((change) => change.path),\n          ];\n          if (stale.length > 0) {\n            throw new ApiError(\n              \"conflict\",\n              \"Some of these changes were edited after you reviewed them. Review them again, then publish.\",\n            );\n          }\n\n          // The model drift gate: validation used the model that this process started with.\n          if ((await files.revision(MANIFEST_PATH)) !== deps.schemaRevision) {\n            throw new ApiError(\n              \"conflict\",\n              \"The content model changed after this server started. Restart Mica to load \" +\n                \"the new model, then review the pending changes and publish again.\",\n            );\n          }\n\n          const selected = (await listTreeChanges(tree)).filter((change) => change.path in input.paths);\n          // Checked against what the commit will hold: drafts left behind are not on the site.\n          const result = overlaySource(headSource(tree), files, selected.map((change) => change.path));\n          const { validation } = await analyse(tree, selected, result);\n          if (!validation.ok) {\n            throw new ApiError(\"validation_failed\", describeProblems(validation.problems), {\n              issues: flattenProblems(validation.problems),\n            });\n          }\n\n          try {\n            const revision = await commitPaths(tree, reviewed, message, policy.commitAuthor(input.author));\n            logger.info(\"Published\", { revision, files: reviewed.length, owner: policy.owner });\n            return revision;\n          } catch (error) {\n            if (error instanceof GitError) {\n              // Git's message is the actionable part: no identity, a hook that\n              // refused, a rebase in progress.\n              throw new ApiError(\"conflict\", `Git refused the commit: ${error.message}`);\n            }\n            throw error;\n          }\n        });\n\n        return policy.push(tree, revision);\n      });\n    },\n\n    async push(): Promise<PublishResult> {\n      const tree = await publishable();\n\n      return locks.remote.run(async () => {\n        const revision = await headRevision(tree);\n        if (revision === null) throw badRequest(\"There is no commit to push yet.\");\n        return policy.push(tree, revision);\n      });\n    },\n\n    async discard(requested: string[]): Promise<{ discarded: string[] }> {\n      const tree = await located();\n\n      return locks.tree.write(async () => {\n        // Discard is destructive, so it reaches only paths that the change list names.\n        const current = new Map((await listTreeChanges(tree)).map((change) => [change.path, change]));\n\n        const discarded: string[] = [];\n        for (const path of requested) {\n          const change = current.get(path);\n          if (!change) continue;\n          await discardChange(tree, change);\n          discarded.push(path);\n        }\n\n        return { discarded };\n      });\n    },\n\n    async compare(target: CompareTarget, against: \"head\" | \"origin\" = \"head\"): Promise<Comparison> {\n      const tree = await locate();\n      if (against === \"origin\" && !policy.upstreamRef) throw badRequest(\"There is no website version to compare with here.\");\n      // Without a repository nothing is published, so \"before\" is an empty source.\n      const published =\n        \"reason\" in tree\n          ? memorySource({}, \"unpublished\")\n          : headSource(tree, against === \"origin\" ? policy.upstreamRef : \"HEAD\");\n      return locks.tree.read(() => compareSources(model, published, files, target));\n    },\n\n    async sync(): Promise<void> {\n      await managedOnly(policy.sync)();\n    },\n\n    async resolve(group: string, choice: \"mine\" | \"website\"): Promise<void> {\n      await managedOnly(policy.resolve)(group, choice);\n    },\n\n    async repository(): Promise<RepositoryInfo> {\n      const tree = await locate();\n      const described = (await policy.describe?.()) ?? null;\n      return {\n        owner: policy.owner,\n        branch: \"reason\" in tree ? null : await currentBranch(tree),\n        head: \"reason\" in tree ? null : await headRevision(tree),\n        url: described?.url ?? null,\n        cloneBytes: described?.cloneBytes ?? null,\n        sync: policy.syncStatus?.() ?? null,\n      };\n    },\n  };\n}\n\nfunction emptyValidation(): StagingValidation {\n  return { ok: true, problems: [] };\n}\n"]}

package/dist/workspace/tree.d.ts

@@ -61,6 +61,12 @@ export declare function aheadOfUpstream(tree: GitTree): Promise<number | null>;
  * working tree holds the drafts.
  */
 export declare function headSource(tree: GitTree, ref?: string): ContentSource;
+/**
+ * `base` with `paths` taken from `top`: what a commit of exactly those paths
+ * would hold. Publish checks a selection against it, not against drafts that
+ * stay behind.
+ */
+export declare function overlaySource(base: ContentSource, top: ContentSource, paths: Iterable<string>): ContentSource;
 /**
  * Parses `git status --porcelain=v1 -z` into content-root-relative changes.
  * `-z` never changes a path; a rename is two fields and becomes a create and a

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;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,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"}

package/dist/workspace/tree.js

@@ -149,6 +149,34 @@ export function headSource(tree, ref = "HEAD") {
         },
     };
 }
+/**
+ * `base` with `paths` taken from `top`: what a commit of exactly those paths
+ * would hold. Publish checks a selection against it, not against drafts that
+ * stay behind.
+ */
+export function overlaySource(base, top, paths) {
+    const selected = new Set(paths);
+    return {
+        origin: `${base.origin} with the selected changes`,
+        read: (path) => (selected.has(path) ? top.read(path) : base.read(path)),
+        async list(directory) {
+            const prefix = directory === "" ? "" : `${directory}/`;
+            const items = new Map((await base.list(directory)).map((item) => [item.name, item]));
+            for (const path of selected) {
+                if (!path.startsWith(prefix))
+                    continue;
+                const [name, ...deeper] = path.slice(prefix.length).split("/");
+                if (deeper.length > 0)
+                    items.set(name, { name: name, type: "directory" });
+                else if ((await top.read(path)) === null)
+                    items.delete(name);
+                else
+                    items.set(name, { name: name, type: "file" });
+            }
+            return [...items.values()];
+        },
+    };
+}
 /**
  * A save's temporary file (`*.mica-<pid>-<n>`), seen during a save or after a
  * crash. Never content.

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 * 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/** 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"]}

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@micacms/runtime",
-  "version": "0.5.0",
+  "version": "0.6.0-rc.1",
   "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",
+  "homepage": "https://micacms.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/micacms/mica.git",
+    "directory": "packages/runtime"
+  },
+  "bugs": "https://github.com/micacms/mica/issues",
   "author": "Alexander Müdespacher",
   "keywords": [
     "mica",
@@ -22,14 +29,15 @@
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "src"
   ],
   "dependencies": {
     "@hono/node-server": "^1.13.8",
     "hono": "^4.13.7",
     "image-size": "^2.0.3",
     "zod": "^4.3.6",
-    "@micacms/core": "0.5.0"
+    "@micacms/core": "0.6.0-rc.1"
   },
   "devDependencies": {
     "@types/node": "^22.20.1",
@@ -37,7 +45,7 @@
     "typescript": "^5.7.3"
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/src/app.ts

@@ -0,0 +1,127 @@
+/**
+ * Assembles the app: health, the admin API and the admin SPA. There is no
+ * public content API and no `/media/*`; a website builds from the repository,
+ * not from this server. Authentication comes from the composing app.
+ */
+
+import { Hono } from "hono";
+import { cors } from "hono/cors";
+import type { MiddlewareHandler } from "hono";
+
+import type { RuntimeContext } from "./context.js";
+import type { Env } from "./http.js";
+import {
+  allowedOrigins,
+  errorHandler,
+  originGuard,
+  requestSizeLimit,
+  rateLimit,
+  requestContext,
+  securityHeaders,
+} from "./middleware/index.js";
+import { adminContentRoutes } from "./routes/admin-content.js";
+import { adminMediaRoutes } from "./routes/admin-media.js";
+import { adminSpaRoutes, adminAssetsExist } from "./routes/admin-spa.js";
+import { adminStagingRoutes } from "./routes/admin-staging.js";
+import { adminSystemRoutes } from "./routes/admin-system.js";
+import { healthRoutes } from "./routes/health.js";
+
+/** What a composing app contributes around the auth-neutral runtime. */
+export interface AuthSurface {
+  /** Mounted at `/api/auth`: sign-in, callback, logout, whatever auth needs. */
+  routes: Hono<Env>;
+  /** Applied before every `/api/admin` route. Must set `access` or refuse the request. */
+  gate: MiddlewareHandler<Env>[];
+}
+
+/**
+ * Allows every request with no identity. Safe only because the local editor is
+ * loopback-bound and Host-guarded.
+ */
+export function allowAll(): MiddlewareHandler<Env> {
+  return async (c, next) => {
+    c.set("access", { identity: null });
+    await next();
+  };
+}
+
+/** `/api/auth/config` with nothing behind it: the SPA's cue to skip sign-in. */
+function unauthenticatedSurface(): AuthSurface {
+  const routes = new Hono<Env>();
+  routes.get("/config", (c) => c.json({ authRequired: false, provider: null }));
+  return { routes, gate: [allowAll()] };
+}
+
+export interface CreateAppOptions {
+  /** Absent means the unauthenticated local surface. */
+  auth?: AuthSurface;
+  /**
+   * Middleware in front of everything, so the local editor's Host allowlist
+   * also guards the health endpoints.
+   */
+  guards?: MiddlewareHandler<Env>[];
+  adminDir?: string;
+}
+
+export function createApp(ctx: RuntimeContext, options: CreateAppOptions = {}): Hono<Env> {
+  const app = new Hono<Env>();
+  const auth = options.auth ?? unauthenticatedSurface();
+
+  app.use("*", requestContext(ctx));
+  for (const guard of options.guards ?? []) app.use("*", guard);
+  app.use("*", securityHeaders());
+  app.onError(errorHandler());
+
+  app.route("/", healthRoutes());
+
+  // Only for the Vite dev server on another origin; in production the SPA is same-origin.
+  if (ctx.config.adminOrigins.length > 0) {
+    app.use(
+      "/api/*",
+      cors({
+        origin: allowedOrigins(ctx.config),
+        credentials: true,
+        allowHeaders: ["content-type", "x-csrf-token"],
+        allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
+      }),
+    );
+  }
+
+  app.use("/api/*", rateLimit());
+  app.use("/api/*", originGuard());
+  app.use("/api/*", requestSizeLimit());
+
+  app.route("/api/auth", auth.routes);
+
+  // 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);
+
+  app.route("/api/admin", adminSystemRoutes());
+  app.route("/api/admin", adminContentRoutes());
+  app.route("/api/admin", adminStagingRoutes());
+  app.route("/api/admin/media", adminMediaRoutes());
+
+  app.all("/api/*", (c) =>
+    c.json({ error: { code: "not_found" as const, message: "No such endpoint." } }, 404),
+  );
+
+  const adminDir = options.adminDir ?? ctx.config.MICA_ADMIN_DIR;
+
+  if (adminDir && adminAssetsExist(adminDir)) {
+    app.route("/admin", adminSpaRoutes(adminDir));
+  } else {
+    app.get("/admin/*", (c) =>
+      c.text(
+        "The admin interface has not been built.\n" +
+          "Run `rush build`, or use `rush dev` and open the Vite dev server.",
+        503,
+      ),
+    );
+  }
+
+  app.get("/", (c) => c.redirect("/admin/"));
+
+  app.notFound((c) => c.text("Not found", 404));
+
+  return app;
+}

package/src/config.ts

@@ -0,0 +1,113 @@
+/**
+ * The environment variables the runtime reads. There is no `loadConfig`: each
+ * app builds its own schema from `runtimeEnv`, because the variables and
+ * defaults are what make one app different from another.
+ */
+
+import path from "node:path";
+import { z } from "zod";
+
+import { DEFAULT_BASE_URL, DEFAULT_PORT } from "./lib/ports.js";
+
+/** In Zod 4, `.default` takes the output value and skips the transform. */
+export const bool = (fallback: boolean) =>
+  z
+    .enum(["true", "false", "1", "0"])
+    .transform((value) => value === "true" || value === "1")
+    .default(fallback);
+
+/** Splits a comma-separated list, trims entries and drops empty ones. */
+export const list = (value: string | undefined): string[] =>
+  (value ?? "")
+    .split(",")
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+
+export class ConfigError extends Error {
+  override name = "ConfigError";
+}
+
+/** Hostnames that are this machine, and nowhere else. */
+export const LOOPBACK = new Set(["localhost", "127.0.0.1", "[::1]", "::1", "0:0:0:0:0:0:0:1"]);
+
+/** The variables the runtime itself reads. Apps spread this into their schema. */
+export const runtimeEnv = {
+  NODE_ENV: z.enum(["development", "test", "production"]).default("development"),
+  MICA_LOG_LEVEL: z.enum(["debug", "info", "warn", "error", "silent"]).default("info"),
+
+  /** The listen address. The app sets the default. */
+  HOST: z.string().optional(),
+  PORT: z.coerce.number().int().min(1).max(65535).default(DEFAULT_PORT),
+
+  /** Public origin of the CMS itself. Used for cookies, CORS and media URLs. */
+  MICA_PUBLIC_URL: z.string().url().default(DEFAULT_BASE_URL),
+
+  /** The content root this Mica serves: a directory in a Git working tree. Each app sets it. */
+  MICA_CONTENT_ROOT: z.string(),
+
+  /** `false` disables commit and push: Publish shows the pending changes read-only. */
+  MICA_LOCAL_PUBLISH: bool(true),
+
+  MICA_MAX_UPLOAD_BYTES: z.coerce
+    .number()
+    .int()
+    .positive()
+    .default(25 * 1024 * 1024),
+
+  /** Read the client IP from X-Forwarded-For. Only enable behind a proxy. */
+  MICA_TRUST_PROXY: bool(false),
+  /** Extra browser origins allowed to call the admin API (dev Vite server). */
+  MICA_ADMIN_ORIGINS: z.string().optional(),
+  /** Overrides where the built admin SPA is served from. */
+  MICA_ADMIN_DIR: z.string().optional(),
+};
+
+const runtimeSchema = z.object(runtimeEnv);
+export type RuntimeEnv = z.infer<typeof runtimeSchema>;
+
+/**
+ * Adds the derived values to the parsed environment. Each app calls it from its
+ * own `transform`.
+ */
+export function deriveRuntime<T extends RuntimeEnv>(env: T) {
+  return {
+    ...env,
+    isProduction: env.NODE_ENV === "production",
+    contentRoot: path.resolve(env.MICA_CONTENT_ROOT),
+    adminOrigins: list(env.MICA_ADMIN_ORIGINS),
+  };
+}
+
+/** What the runtime requires of a finished configuration. */
+export type RuntimeConfig = ReturnType<typeof deriveRuntime<RuntimeEnv>> & {
+  /** Resolved by the app: the runtime never guesses an address. */
+  HOST: string;
+};
+
+/** Loads `./.env` into `process.env`. Variables that are already set win. */
+export function loadEnvFile(): void {
+  try {
+    process.loadEnvFile();
+  } catch (error) {
+    // A missing `.env` is normal; an unreadable or malformed one must not start
+    // the server with defaults.
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+      throw new ConfigError(`Could not read .env: ${(error as Error).message}`);
+    }
+  }
+}
+
+/** Treats a blank variable as unset, so a verbatim copy of `.env.example` with blanks is valid. */
+export function withoutBlanks(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
+  return Object.fromEntries(
+    Object.entries(env).filter(([, value]) => value !== undefined && value.trim() !== ""),
+  );
+}
+
+/** Formats a Zod refusal the way a person at a terminal reads it. */
+export function describeConfigIssues(error: z.ZodError): string {
+  const details = error.issues
+    .map((issue) => `  ${issue.path.join(".") || "(root)"}: ${issue.message}`)
+    .join("\n");
+  return `Invalid environment configuration:\n${details}`;
+}