@ybotok/loam 0.2.0-alpha.1 → 0.2.0-alpha.13

package/dist/commands/unarchive/manifest.js

@@ -11,17 +11,15 @@
 import { existsSync, lstatSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import {} from "../../core/envelope/json.js";
+import { repoPath } from "../../core/envelope/json.js";
 import { resolveInside, resolvePortableFileInside } from "../../core/kernel/path-safety.js";
 import { isRecord } from "../../core/kernel/records.js";
-import { SNAPSHOT_COMPAT_VERSION, SNAPSHOT_DIR, SNAPSHOT_MANIFEST, SNAPSHOT_VERSION, } from "../../core/staging/snapshot.js";
-export class RestoreFailure extends Error {
-    code;
-    constructor(code, msg) {
-        super(msg);
-        this.code = code;
-    }
-}
+import { isReadableSnapshotVersion, keysServiceRows, preImageRel, SNAPSHOT_DIR, SNAPSHOT_MANIFEST, } from "../../core/staging/snapshot/manifest.js";
+/**
+ * The snapshot manifest, or null when there is nothing this command can honour —
+ * absent, unreadable, or a layout version it would have to guess at. All three are
+ * the same answer to the caller: this feature cannot be unarchived automatically.
+ */
 export async function readManifest(request) {
     const { featureDir, docsDir, featureId, dirName } = request;
     try {
@@ -31,13 +29,13 @@ export async function readManifest(request) {
         const parsed = JSON.parse(await readFile(path, "utf8"));
         if (!isRecord(parsed))
             return null;
-        // Version 3 is what archive writes; version 2 is read forever under its own
-        // literal-path rules, because version-2 snapshots already sit in archived
-        // features and travel with them across loam upgrades. Version 1 stays
-        // refused: it records nothing about its restore source.
-        if (typeof parsed.version !== "number")
-            return null;
-        if (parsed.version !== SNAPSHOT_VERSION && parsed.version !== SNAPSHOT_COMPAT_VERSION)
+        // Version 4 is what archive writes; versions 3 and 2 are read forever under
+        // their own rules — 3 keyed but storing pre-images under their living
+        // names, 2 by literal path — because snapshots an older loam wrote already
+        // sit in archived features and travel with them across loam upgrades.
+        // Version 1 stays refused: it records nothing about its restore source.
+        const version = parsed.version;
+        if (!isReadableSnapshotVersion(version))
             return null;
         if (parsed.feature !== featureId || parsed.dirName !== dirName)
             return null;
@@ -46,6 +44,8 @@ export async function readManifest(request) {
         if (!Array.isArray(parsed.files))
             return null;
         const seen = new Set();
+        // Where the archived feature sits, as the rows spell paths (`repoPath`).
+        const featureRel = repoPath(docsDir, featureDir);
         const files = [];
         for (const raw of parsed.files) {
             if (!isRecord(raw))
@@ -65,12 +65,13 @@ export async function readManifest(request) {
             if (seen.has(raw.path))
                 return null;
             seen.add(raw.path);
-            // The version-3 shape rule, exact in both directions: a `services/` row
-            // carries its (service, artifact) key — that key is what version 3 IS,
-            // and a row without one is not a manifest this loam wrote — while a row
-            // anywhere else carries none, because nothing outside `services/` moves.
-            // Version-2 rows never carry the fields and are not asked to.
-            const key = readServiceKey(parsed.version, raw);
+            // The keyed shape rule (versions 3 and 4), exact in both directions: a
+            // `services/` row carries its (service, artifact) key — that key is what
+            // version 3 introduced, and a row without one is not a manifest this
+            // loam wrote — while a row anywhere else carries none, because nothing
+            // outside `services/` moves. Version-2 rows never carry the fields and
+            // are not asked to.
+            const key = readServiceKey(version, raw);
             if (key === undefined)
                 return null;
             // Where the file lives NOW. A re-keyed row resolves through the current
@@ -93,9 +94,24 @@ export async function readManifest(request) {
             // second. Restoring is the write; `staging.ts` only reads and compares a
             // digest, which is why its resolution of this same field can be lexical
             // and this one cannot.
-            const target = resolvePortableFileInside(docsDir, targetRel, `snapshot path '${raw.path}'`);
+            //
+            // A row of the feature's OWN documents — the ones archive relinked for
+            // its move, recorded inside `features/archive/<FEAT>/` — is held to the
+            // same test with the feature directory as the root, which is where its
+            // pre-image below is anchored too: that directory is the thing this
+            // command restores and moves back. Anchored at the docs root instead, a
+            // feature mounted by symlink from outside the repo — a layout every walk
+            // follows — resolved outside it and was refused as `snapshot-missing`,
+            // over rows inside the very directory being restored. A row that leaves
+            // the feature is still refused.
+            const inFeature = raw.path.startsWith(`${featureRel}/`) ? raw.path.slice(featureRel.length + 1) : null;
+            const target = inFeature === null
+                ? resolvePortableFileInside(docsDir, targetRel, `snapshot path '${raw.path}'`)
+                : resolvePortableFileInside(featureDir, inFeature, `snapshot path '${raw.path}'`);
             let snapshot = null;
-            const snapshotRel = `${SNAPSHOT_DIR}/files/${raw.path}`;
+            // Where THIS manifest's layout stores the pre-image — suffixed from
+            // version 4 on, under the living name before it (`preImageRel`).
+            const snapshotRel = `${SNAPSHOT_DIR}/files/${preImageRel(version, raw.path)}`;
             if (raw.existed) {
                 // Resolve from the feature directory, which always exists. The `files/`
                 // directory legitimately does not exist when every archive write was a
@@ -118,7 +134,7 @@ export async function readManifest(request) {
         return {
             // The version as WRITTEN, not as preferred: a caller looking at a
             // validated manifest deserves to know which rules it was read under.
-            version: parsed.version,
+            version,
             feature: featureId,
             dirName,
             archivedAt: parsed.archivedAt,
@@ -138,7 +154,7 @@ export async function readManifest(request) {
  * wrote and nothing can say what else in the file to distrust.
  */
 function readServiceKey(version, raw) {
-    if (version !== SNAPSHOT_VERSION)
+    if (!keysServiceRows(version))
         return null;
     const under = typeof raw.path === "string" && raw.path.startsWith("services/");
     if (!under)

package/dist/commands/unarchive/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/commands/unarchive/manifest.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The snapshot manifest, validated before a single byte is written back.\n *\n * `unarchive` says \"I put your docs back\", and that sentence must never be\n * sayable over a pre-image edited in the archived feature directory since. Each\n * entry carries the digest of what archive WROTE and the digest of what will be\n * RESTORED, and this is where both are checked — version, timestamp, feature\n * name, duplicate paths and all — so the restore below it can assume the file\n * describes the archive it claims to.\n */\nimport { existsSync, lstatSync } from \"node:fs\";\nimport { readFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { type ErrorCode } from \"../../core/envelope/json.js\";\nimport { resolveInside, resolvePortableFileInside } from \"../../core/kernel/path-safety.js\";\nimport { isRecord } from \"../../core/kernel/records.js\";\nimport {\n  SNAPSHOT_COMPAT_VERSION,\n  SNAPSHOT_DIR,\n  SNAPSHOT_MANIFEST,\n  SNAPSHOT_VERSION,\n  type SnapshotManifest,\n} from \"../../core/staging/snapshot.js\";\n\nexport class RestoreFailure extends Error {\n  constructor(\n    readonly code: ErrorCode,\n    msg: string,\n  ) {\n    super(msg);\n  }\n}\n\nexport interface ValidatedSnapshotEntry {\n  path: string;\n  existed: boolean;\n  after: string;\n  /** sha256 the pre-image beside the manifest must still have; null when archive created the destination. */\n  before: string | null;\n  /** Contained destination under the docs repo. */\n  target: string;\n  /** Contained pre-image, or null when archive created the destination. */\n  snapshot: string | null;\n}\n\nexport interface ValidatedSnapshotManifest extends Omit<SnapshotManifest, \"files\"> {\n  files: ValidatedSnapshotEntry[];\n}\n\n/**\n * `readManifest`'s inputs, as one object. `serviceDirOf` is the restore-time\n * half of the version-3 re-keying: a service id → its CURRENT docs-relative\n * directory per the enumeration, or null when no such service is enumerated.\n * Injected by the caller (which holds the enumeration) rather than resolved\n * here, so this module keeps validating one file against one repo state.\n */\nexport interface ManifestRequest {\n  featureDir: string;\n  docsDir: string;\n  featureId: string;\n  dirName: string;\n  serviceDirOf: (service: string) => string | null;\n}\n\nexport async function readManifest(request: ManifestRequest): Promise<ValidatedSnapshotManifest | null> {\n  const { featureDir, docsDir, featureId, dirName } = request;\n  try {\n    const path = resolveInside(\n      featureDir,\n      join(SNAPSHOT_DIR, SNAPSHOT_MANIFEST),\n      \"snapshot manifest path\",\n    );\n    if (!existsSync(path)) return null;\n    const parsed = JSON.parse(await readFile(path, \"utf8\")) as unknown;\n    if (!isRecord(parsed)) return null;\n    // Version 3 is what archive writes; version 2 is read forever under its own\n    // literal-path rules, because version-2 snapshots already sit in archived\n    // features and travel with them across loam upgrades. Version 1 stays\n    // refused: it records nothing about its restore source.\n    if (typeof parsed.version !== \"number\") return null;\n    if (parsed.version !== SNAPSHOT_VERSION && parsed.version !== SNAPSHOT_COMPAT_VERSION) return null;\n    if (parsed.feature !== featureId || parsed.dirName !== dirName) return null;\n    if (typeof parsed.archivedAt !== \"string\" || !isCanonicalIsoDate(parsed.archivedAt)) return null;\n    if (!Array.isArray(parsed.files)) return null;\n\n    const seen = new Set<string>();\n    const files: ValidatedSnapshotEntry[] = [];\n    for (const raw of parsed.files) {\n      if (!isRecord(raw)) return null;\n      if (typeof raw.path !== \"string\" || typeof raw.existed !== \"boolean\") return null;\n      if (typeof raw.after !== \"string\" || !/^[0-9a-f]{64}$/.test(raw.after)) return null;\n      // A manifest that claims a pre-image must say what it should hash to, and\n      // one that claims none must not. Either way it is a shape question, so it\n      // is answered here with the rest of them; whether the bytes MATCH is a\n      // different answer with its own code (`snapshot-corrupt`).\n      if (raw.existed ? typeof raw.before !== \"string\" || !/^[0-9a-f]{64}$/.test(raw.before) : raw.before !== null) {\n        return null;\n      }\n      const before = raw.existed ? (raw.before as string) : null;\n      if (seen.has(raw.path)) return null;\n      seen.add(raw.path);\n\n      // The version-3 shape rule, exact in both directions: a `services/` row\n      // carries its (service, artifact) key — that key is what version 3 IS,\n      // and a row without one is not a manifest this loam wrote — while a row\n      // anywhere else carries none, because nothing outside `services/` moves.\n      // Version-2 rows never carry the fields and are not asked to.\n      const key = readServiceKey(parsed.version, raw);\n      if (key === undefined) return null;\n\n      // Where the file lives NOW. A re-keyed row resolves through the current\n      // enumeration — the whole point of the bump: the bytes land wherever the\n      // service lives today, not where it lived on the day of the archive. An\n      // id the enumeration does not answer falls back to the literal path\n      // (an absent service restores as a create, exactly as before).\n      let targetRel = raw.path;\n      if (key !== null) {\n        const current = request.serviceDirOf(key.service);\n        if (current !== null) targetRel = `${current}/${key.artifact}`;\n      }\n      // The realpath test stays on this side, and it is not negotiable: this\n      // path is WRITTEN through. A symlink that leaves the repo is\n      // indistinguishable, lexically, from a service directory the operator\n      // mounted on purpose — `escape/owned.txt` and `services/<svc>/spec.md`\n      // are both \"inside docsDir\" until something resolves them — so the only\n      // check that can refuse the first is the one that also refuses the\n      // second. Restoring is the write; `staging.ts` only reads and compares a\n      // digest, which is why its resolution of this same field can be lexical\n      // and this one cannot.\n      const target = resolvePortableFileInside(docsDir, targetRel, `snapshot path '${raw.path}'`);\n      let snapshot: string | null = null;\n      const snapshotRel = `${SNAPSHOT_DIR}/files/${raw.path}`;\n      if (raw.existed) {\n        // Resolve from the feature directory, which always exists. The `files/`\n        // directory legitimately does not exist when every archive write was a\n        // creation; anchoring here permits that case while still inspecting an\n        // existing `files` component for symlink escape.\n        snapshot = resolvePortableFileInside(featureDir, snapshotRel, `snapshot pre-image '${raw.path}'`);\n        // Archive writes plain files. A missing pre-image or a symlink (even an\n        // internally-contained one) is not the byte snapshot this manifest\n        // claims, so refuse before any destination is staged.\n        if (!existsSync(snapshot) || !lstatSync(snapshot).isFile()) return null;\n      } else {\n        const unexpected = resolvePortableFileInside(featureDir, snapshotRel, `snapshot pre-image '${raw.path}'`);\n        if (existsSync(unexpected)) return null;\n      }\n      files.push({ path: raw.path, existed: raw.existed, after: raw.after, before, target, snapshot });\n    }\n\n    return {\n      // The version as WRITTEN, not as preferred: a caller looking at a\n      // validated manifest deserves to know which rules it was read under.\n      version: parsed.version,\n      feature: featureId,\n      dirName,\n      archivedAt: parsed.archivedAt,\n      files,\n    };\n  } catch {\n    return null;\n  }\n}\n\n/**\n * The (service, artifact) key of one manifest row, under its version's shape\n * rule. Three answers: the key; null when the row legitimately carries none (a\n * non-`services/` row, or any version-2 row — the key postdates version 2);\n * undefined when the row breaks the rule and the manifest must be refused\n * whole, because a half-keyed or wrongly-keyed row is not a record this loam\n * wrote and nothing can say what else in the file to distrust.\n */\nfunction readServiceKey(\n  version: number,\n  raw: Record<string, unknown>,\n): { service: string; artifact: string } | null | undefined {\n  if (version !== SNAPSHOT_VERSION) return null;\n  const under = typeof raw.path === \"string\" && raw.path.startsWith(\"services/\");\n  if (!under) return raw.service === undefined && raw.artifact === undefined ? null : undefined;\n  // The id is a lookup key into the enumeration and the artifact is joined\n  // under the resolved directory, so the id must be a single path segment; the\n  // artifact's own containment is `resolvePortableFileInside`'s question.\n  if (typeof raw.service !== \"string\" || raw.service.length === 0 || raw.service.includes(\"/\")) return undefined;\n  if (typeof raw.artifact !== \"string\" || raw.artifact.length === 0) return undefined;\n  return { service: raw.service, artifact: raw.artifact };\n}\n\nexport function isCanonicalIsoDate(value: string): boolean {\n  const millis = Date.parse(value);\n  return Number.isFinite(millis) && new Date(millis).toISOString() === value;\n}\n\n/** Remove `dir` and each empty ancestor, stopping short of `stopAt`. Best effort. */\n"]}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/commands/unarchive/manifest.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The snapshot manifest, validated before a single byte is written back.\n *\n * `unarchive` says \"I put your docs back\", and that sentence must never be\n * sayable over a pre-image edited in the archived feature directory since. Each\n * entry carries the digest of what archive WROTE and the digest of what will be\n * RESTORED, and this is where both are checked — version, timestamp, feature\n * name, duplicate paths and all — so the restore below it can assume the file\n * describes the archive it claims to.\n */\nimport { existsSync, lstatSync } from \"node:fs\";\nimport { readFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { repoPath } from \"../../core/envelope/json.js\";\nimport { resolveInside, resolvePortableFileInside } from \"../../core/kernel/path-safety.js\";\nimport { isRecord } from \"../../core/kernel/records.js\";\nimport {\n  isReadableSnapshotVersion,\n  keysServiceRows,\n  preImageRel,\n  SNAPSHOT_DIR,\n  SNAPSHOT_MANIFEST,\n  type ReadableSnapshotVersion,\n  type SnapshotManifest,\n} from \"../../core/staging/snapshot/manifest.js\";\n\nexport interface ValidatedSnapshotEntry {\n  path: string;\n  existed: boolean;\n  after: string;\n  /** sha256 the pre-image beside the manifest must still have; null when archive created the destination. */\n  before: string | null;\n  /** Contained destination under the docs repo. */\n  target: string;\n  /** Contained pre-image, or null when archive created the destination. */\n  snapshot: string | null;\n}\n\nexport interface ValidatedSnapshotManifest extends Omit<SnapshotManifest, \"files\"> {\n  files: ValidatedSnapshotEntry[];\n}\n\n/**\n * `readManifest`'s inputs, as one object. `serviceDirOf` is the restore-time\n * half of the (service, artifact) re-keying: a service id → its CURRENT docs-relative\n * directory per the enumeration, or null when no such service is enumerated.\n * Injected by the caller (which holds the enumeration) rather than resolved\n * here, so this module keeps validating one file against one repo state.\n */\nexport interface ManifestRequest {\n  featureDir: string;\n  docsDir: string;\n  featureId: string;\n  dirName: string;\n  serviceDirOf: (service: string) => string | null;\n}\n\n/**\n * The snapshot manifest, or null when there is nothing this command can honour —\n * absent, unreadable, or a layout version it would have to guess at. All three are\n * the same answer to the caller: this feature cannot be unarchived automatically.\n */\nexport async function readManifest(request: ManifestRequest): Promise<ValidatedSnapshotManifest | null> {\n  const { featureDir, docsDir, featureId, dirName } = request;\n  try {\n    const path = resolveInside(\n      featureDir,\n      join(SNAPSHOT_DIR, SNAPSHOT_MANIFEST),\n      \"snapshot manifest path\",\n    );\n    if (!existsSync(path)) return null;\n    const parsed = JSON.parse(await readFile(path, \"utf8\")) as unknown;\n    if (!isRecord(parsed)) return null;\n    // Version 4 is what archive writes; versions 3 and 2 are read forever under\n    // their own rules — 3 keyed but storing pre-images under their living\n    // names, 2 by literal path — because snapshots an older loam wrote already\n    // sit in archived features and travel with them across loam upgrades.\n    // Version 1 stays refused: it records nothing about its restore source.\n    const version = parsed.version;\n    if (!isReadableSnapshotVersion(version)) return null;\n    if (parsed.feature !== featureId || parsed.dirName !== dirName) return null;\n    if (typeof parsed.archivedAt !== \"string\" || !isCanonicalIsoDate(parsed.archivedAt)) return null;\n    if (!Array.isArray(parsed.files)) return null;\n\n    const seen = new Set<string>();\n    // Where the archived feature sits, as the rows spell paths (`repoPath`).\n    const featureRel = repoPath(docsDir, featureDir);\n    const files: ValidatedSnapshotEntry[] = [];\n    for (const raw of parsed.files) {\n      if (!isRecord(raw)) return null;\n      if (typeof raw.path !== \"string\" || typeof raw.existed !== \"boolean\") return null;\n      if (typeof raw.after !== \"string\" || !/^[0-9a-f]{64}$/.test(raw.after)) return null;\n      // A manifest that claims a pre-image must say what it should hash to, and\n      // one that claims none must not. Either way it is a shape question, so it\n      // is answered here with the rest of them; whether the bytes MATCH is a\n      // different answer with its own code (`snapshot-corrupt`).\n      if (raw.existed ? typeof raw.before !== \"string\" || !/^[0-9a-f]{64}$/.test(raw.before) : raw.before !== null) {\n        return null;\n      }\n      const before = raw.existed ? (raw.before as string) : null;\n      if (seen.has(raw.path)) return null;\n      seen.add(raw.path);\n\n      // The keyed shape rule (versions 3 and 4), exact in both directions: a\n      // `services/` row carries its (service, artifact) key — that key is what\n      // version 3 introduced, and a row without one is not a manifest this\n      // loam wrote — while a row anywhere else carries none, because nothing\n      // outside `services/` moves. Version-2 rows never carry the fields and\n      // are not asked to.\n      const key = readServiceKey(version, raw);\n      if (key === undefined) return null;\n\n      // Where the file lives NOW. A re-keyed row resolves through the current\n      // enumeration — the whole point of the bump: the bytes land wherever the\n      // service lives today, not where it lived on the day of the archive. An\n      // id the enumeration does not answer falls back to the literal path\n      // (an absent service restores as a create, exactly as before).\n      let targetRel = raw.path;\n      if (key !== null) {\n        const current = request.serviceDirOf(key.service);\n        if (current !== null) targetRel = `${current}/${key.artifact}`;\n      }\n      // The realpath test stays on this side, and it is not negotiable: this\n      // path is WRITTEN through. A symlink that leaves the repo is\n      // indistinguishable, lexically, from a service directory the operator\n      // mounted on purpose — `escape/owned.txt` and `services/<svc>/spec.md`\n      // are both \"inside docsDir\" until something resolves them — so the only\n      // check that can refuse the first is the one that also refuses the\n      // second. Restoring is the write; `staging.ts` only reads and compares a\n      // digest, which is why its resolution of this same field can be lexical\n      // and this one cannot.\n      //\n      // A row of the feature's OWN documents — the ones archive relinked for\n      // its move, recorded inside `features/archive/<FEAT>/` — is held to the\n      // same test with the feature directory as the root, which is where its\n      // pre-image below is anchored too: that directory is the thing this\n      // command restores and moves back. Anchored at the docs root instead, a\n      // feature mounted by symlink from outside the repo — a layout every walk\n      // follows — resolved outside it and was refused as `snapshot-missing`,\n      // over rows inside the very directory being restored. A row that leaves\n      // the feature is still refused.\n      const inFeature = raw.path.startsWith(`${featureRel}/`) ? raw.path.slice(featureRel.length + 1) : null;\n      const target =\n        inFeature === null\n          ? resolvePortableFileInside(docsDir, targetRel, `snapshot path '${raw.path}'`)\n          : resolvePortableFileInside(featureDir, inFeature, `snapshot path '${raw.path}'`);\n      let snapshot: string | null = null;\n      // Where THIS manifest's layout stores the pre-image — suffixed from\n      // version 4 on, under the living name before it (`preImageRel`).\n      const snapshotRel = `${SNAPSHOT_DIR}/files/${preImageRel(version, raw.path)}`;\n      if (raw.existed) {\n        // Resolve from the feature directory, which always exists. The `files/`\n        // directory legitimately does not exist when every archive write was a\n        // creation; anchoring here permits that case while still inspecting an\n        // existing `files` component for symlink escape.\n        snapshot = resolvePortableFileInside(featureDir, snapshotRel, `snapshot pre-image '${raw.path}'`);\n        // Archive writes plain files. A missing pre-image or a symlink (even an\n        // internally-contained one) is not the byte snapshot this manifest\n        // claims, so refuse before any destination is staged.\n        if (!existsSync(snapshot) || !lstatSync(snapshot).isFile()) return null;\n      } else {\n        const unexpected = resolvePortableFileInside(featureDir, snapshotRel, `snapshot pre-image '${raw.path}'`);\n        if (existsSync(unexpected)) return null;\n      }\n      files.push({ path: raw.path, existed: raw.existed, after: raw.after, before, target, snapshot });\n    }\n\n    return {\n      // The version as WRITTEN, not as preferred: a caller looking at a\n      // validated manifest deserves to know which rules it was read under.\n      version,\n      feature: featureId,\n      dirName,\n      archivedAt: parsed.archivedAt,\n      files,\n    };\n  } catch {\n    return null;\n  }\n}\n\n/**\n * The (service, artifact) key of one manifest row, under its version's shape\n * rule. Three answers: the key; null when the row legitimately carries none (a\n * non-`services/` row, or any version-2 row — the key postdates version 2);\n * undefined when the row breaks the rule and the manifest must be refused\n * whole, because a half-keyed or wrongly-keyed row is not a record this loam\n * wrote and nothing can say what else in the file to distrust.\n */\nfunction readServiceKey(\n  version: ReadableSnapshotVersion,\n  raw: Record<string, unknown>,\n): { service: string; artifact: string } | null | undefined {\n  if (!keysServiceRows(version)) return null;\n  const under = typeof raw.path === \"string\" && raw.path.startsWith(\"services/\");\n  if (!under) return raw.service === undefined && raw.artifact === undefined ? null : undefined;\n  // The id is a lookup key into the enumeration and the artifact is joined\n  // under the resolved directory, so the id must be a single path segment; the\n  // artifact's own containment is `resolvePortableFileInside`'s question.\n  if (typeof raw.service !== \"string\" || raw.service.length === 0 || raw.service.includes(\"/\")) return undefined;\n  if (typeof raw.artifact !== \"string\" || raw.artifact.length === 0) return undefined;\n  return { service: raw.service, artifact: raw.artifact };\n}\n\nexport function isCanonicalIsoDate(value: string): boolean {\n  const millis = Date.parse(value);\n  return Number.isFinite(millis) && new Date(millis).toISOString() === value;\n}\n\n/** Remove `dir` and each empty ancestor, stopping short of `stopAt`. Best effort. */\n"]}

package/dist/commands/unarchive/restore.js

@@ -8,19 +8,21 @@
  * the digest of what it will RESTORE, and a mismatch on either refuses.
  */
 import { existsSync } from "node:fs";
-import { readdir, readFile, rename, rmdir } from "node:fs/promises";
-import { dirname, join, relative } from "node:path";
-import { emitJson, fail, repoPath } from "../../core/envelope/json.js";
+import { readFile, rename } from "node:fs/promises";
+import { dirname, join, relative, sep } from "node:path";
+import { CodedFailure, emitJson, fail, repoPath } from "../../core/envelope/json.js";
+import { acrossRename, isPathInside } from "../../core/kernel/path-safety.js";
 import { archiveDir as archiveRoot, featuresDir as featuresRoot } from "../../core/repo/paths.js";
 import { listServices, resolveFeature } from "../../core/repo/repo.js";
 import { docsRepoState } from "../../core/repo/state.js";
 import { sayRecovery } from "../archive/plan/refusal.js";
-import { quietRm, rollbackError, rollbackStaged, stageWrites, swapStaged, } from "../../core/staging/commit.js";
+import { quietPruneEmptyParents, quietRm, rollbackError, rollbackStaged, stageWrites, swapStaged, } from "../../core/staging/commit.js";
 import { clearCommitIntent, writeCommitIntent } from "../../core/staging/recovery/intent.js";
 import { recoverInterruptedCommit } from "../../core/staging/recovery/recover.js";
-import { SNAPSHOT_DIR } from "../../core/staging/snapshot.js";
+import { SNAPSHOT_DIR } from "../../core/staging/snapshot/manifest.js";
 import { planWrite, sha256 } from "../../core/staging/writes.js";
-import { readManifest, RestoreFailure } from "./manifest.js";
+import { readManifest } from "./manifest.js";
+import { staleGeneratedViews } from "../../core/c4/project/architecture.js";
 export async function unarchiveLocked(docsDir, featureId, json, force) {
     // Same first move as archive, under the same lock: a commit killed between two
     // renames is exactly the state an undo must not be computed on top of.
@@ -46,7 +48,7 @@ export async function unarchiveLocked(docsDir, featureId, json, force) {
         return;
     }
     // The restore-time half of the snapshot's (service, artifact) re-keying: a
-    // version-3 entry restores into wherever its service lives TODAY, and the
+    // keyed entry restores into wherever its service lives TODAY, and the
     // enumeration is the only thing that may say where that is. Built once here,
     // as a map, so the manifest validation stays a pure question of one file
     // against one repo state. "no-services" is tolerated the way `listFeatures`
@@ -78,7 +80,21 @@ export async function unarchiveLocked(docsDir, featureId, json, force) {
     // whole, then refused together: "which files" is what makes the message
     // actionable, and no destination is staged until every one is accounted for.
     const corrupt = [];
+    // Rows written into ANOTHER change in flight — a document whose links into
+    // this feature the archive rewrote — whose feature directory is gone. That
+    // feature has a lifecycle of its own: archived since, it is history with its
+    // own snapshot; removed, it was abandoned. Putting the pre-image back would
+    // recreate a one-file `features/<other>/` that every reader then lists as a
+    // change in flight, beside the archived one or in place of the one somebody
+    // deleted — and calling the row drift would send the reader to `--force`,
+    // which does exactly that. Nothing edited it: it is left as it is, and said.
+    const left = [];
     for (const entry of manifest.files) {
+        const owner = inFlightFeatureDir(featuresDir, archiveDir, entry.target);
+        if (owner !== null && owner !== dest && !existsSync(owner)) {
+            left.push(entry.path);
+            continue;
+        }
         const current = existsSync(entry.target) ? await readFile(entry.target) : null;
         const now = current === null ? null : sha256(current);
         // Drift is "restoring this would destroy something", so a file already
@@ -148,17 +164,29 @@ export async function unarchiveLocked(docsDir, featureId, json, force) {
         const failures = await rollbackStaged(staged);
         await clearCommitIntent(docsDir);
         const wrapped = rollbackError(err, failures);
-        throw new RestoreFailure(failures.length > 0 ? "rollback-incomplete" : "restore-failed", wrapped.message);
+        throw new CodedFailure(failures.length > 0 ? "rollback-incomplete" : "restore-failed", wrapped.message);
     }
     // The snapshot describes an archive that no longer exists; the empty directories
     // are what the merge left behind. Both are tidying — neither can fail the undo.
     await quietRm(join(dest, SNAPSHOT_DIR));
     for (const w of writes)
         if (w.content === null)
-            await pruneEmptyDirs(dirname(w.path), docsDir);
-    await pruneEmptyDirs(archiveDir, docsDir);
-    const restored = writes.filter((w) => w.content !== null).map((w) => repoPath(docsDir, w.path));
-    const removed = writes.filter((w) => w.content === null).map((w) => repoPath(docsDir, w.path));
+            await pruneBelowRoot(docsDir, dirname(w.path));
+    await pruneBelowRoot(docsDir, archiveDir);
+    // Named where each file IS now: the feature's own documents were restored
+    // inside the archived directory and the rename just carried them out of it,
+    // so their write paths name a directory that no longer exists.
+    const landed = (path) => repoPath(docsDir, acrossRename(path, feature.dir, dest));
+    const restored = writes.filter((w) => w.content !== null).map((w) => landed(w.path));
+    const removed = writes.filter((w) => w.content === null).map((w) => landed(w.path));
+    // The undo puts back what the archive WROTE, and the two generated views
+    // files were never among it: `loam subsystem sync` owns them, and a sync run
+    // between the archive and this undo rewrote them against the merged map. So
+    // the map just went back and they did not — the services overview naming
+    // a service the map no longer draws — and "the living docs are back" would
+    // be said over a repo whose next `validate --all` is red. Graded after the
+    // commit through validate's own function, as archive grades its own result.
+    const staleViews = await staleGeneratedViews(docsDir);
     if (json) {
         emitJson({
             command: "unarchive",
@@ -167,7 +195,13 @@ export async function unarchiveLocked(docsDir, featureId, json, force) {
             path: repoPath(docsDir, dest),
             restored,
             removed,
-            discarded: drifted,
+            // Docs-relative as the manifest spells them, then named where they landed —
+            // the same file must not answer to two names across `discarded` and
+            // `restored`. The refusal and the `--force` warning above print the
+            // pre-move name, because they are said before the move.
+            discarded: drifted.map((rel) => landed(join(docsDir, ...rel.split("/")))),
+            // Additive, and omitted when nothing is stale — `archive --json`'s key, same meaning.
+            ...(staleViews.length === 0 ? {} : { staleViews }),
             ...(recovered === null ? {} : { recovered }),
         });
         return;
@@ -176,29 +210,45 @@ export async function unarchiveLocked(docsDir, featureId, json, force) {
         console.log(`  restored: ${p}`);
     for (const p of removed)
         console.log(`  removed:  ${p}`);
+    for (const p of left)
+        console.log(`  left:     ${p} — its feature is no longer in flight, so its pre-archive text is not put back`);
     console.log(`\n  reopened: features/archive/${feature.dirName} → features/${feature.dirName}`);
-    console.log("  the living docs are back to what they said before the archive.");
+    if (staleViews.length === 0) {
+        console.log("  the living docs are back to what they said before the archive.");
+        return;
+    }
+    // The narrower claim, true whether the views went stale after the archive or
+    // were stale before it — the closing line is a claim about the whole docs
+    // repo, and `archive` withholds its own for the same files.
+    console.log("  the documents the archive wrote are back to what they said before it.");
+    for (const path of staleViews) {
+        console.log(`  ⚠ ${path} no longer matches the tree and this map — run \`loam subsystem sync\`.`);
+    }
 }
 /**
- * The snapshot manifest, or null when there is nothing this command can honour —
- * absent, unreadable, or a layout version it would have to guess at. All three are
- * the same answer to the caller: this feature cannot be unarchived automatically.
+ * The in-flight feature directory a row's target sits in — `features/<dir>/`
+ * for a file below it, never under `features/archive/` — or null for a row
+ * anywhere else. The caller tells this feature's own destination apart.
+ *
+ * `--json` has no key for the rows the caller leaves: the payload's lists name
+ * files the undo wrote, and these it deliberately did not touch. The text
+ * output says each one.
  */
-async function pruneEmptyDirs(dir, stopAt) {
-    let cur = dir;
-    for (;;) {
-        const rel = relative(stopAt, cur);
-        if (rel === "" || rel.startsWith(".."))
-            return;
-        try {
-            if ((await readdir(cur)).length > 0)
-                return;
-            await rmdir(cur);
-        }
-        catch {
-            return;
-        }
-        cur = dirname(cur);
-    }
+function inFlightFeatureDir(featuresDir, archiveDir, target) {
+    if (!isPathInside(featuresDir, target) || isPathInside(archiveDir, target))
+        return null;
+    const [dir, ...below] = relative(featuresDir, target).split(sep);
+    return dir === undefined || below.length === 0 ? null : join(featuresDir, dir);
+}
+/**
+ * Remove the empty directories from `dir` upward, stopping BELOW the docs root:
+ * never the root itself, nor anything outside it. The walk is staging's own,
+ * bounded at the top-level directory `dir` sits in.
+ */
+async function pruneBelowRoot(docsDir, dir) {
+    const top = relative(docsDir, dir).split(sep)[0] ?? "";
+    if (top === "" || top.startsWith(".."))
+        return;
+    await quietPruneEmptyParents(dir, join(docsDir, top));
 }
 //# sourceMappingURL=restore.js.map

package/dist/commands/unarchive/restore.js.map

@@ -1 +1 @@
-{"version":3,"file":"restore.js","sourceRoot":"","sources":["../../../src/commands/unarchive/restore.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Putting the docs back: read the snapshot, verify every pre-image, then write.\n *\n * The whole restore runs under the docs lock, and the verification is the point\n * of the split — `unarchive` says \"I put your docs back\", and that sentence must\n * never be sayable over a pre-image that was edited in the archived feature\n * directory since. Each entry carries both the digest of what archive WROTE and\n * the digest of what it will RESTORE, and a mismatch on either refuses.\n */\nimport { existsSync } from \"node:fs\";\nimport { readdir, readFile, rename, rmdir } from \"node:fs/promises\";\nimport { dirname, join, relative } from \"node:path\";\nimport { emitJson, fail, repoPath } from \"../../core/envelope/json.js\";\nimport { archiveDir as archiveRoot, featuresDir as featuresRoot } from \"../../core/repo/paths.js\";\nimport { listServices, resolveFeature } from \"../../core/repo/repo.js\";\nimport { docsRepoState } from \"../../core/repo/state.js\";\nimport { sayRecovery } from \"../archive/plan/refusal.js\";\nimport {\n  quietRm,\n  rollbackError,\n  rollbackStaged,\n  stageWrites,\n  swapStaged,\n} from \"../../core/staging/commit.js\";\nimport { clearCommitIntent, writeCommitIntent } from \"../../core/staging/recovery/intent.js\";\nimport { recoverInterruptedCommit } from \"../../core/staging/recovery/recover.js\";\nimport { SNAPSHOT_DIR } from \"../../core/staging/snapshot.js\";\nimport { planWrite, sha256, type PlannedWrite } from \"../../core/staging/writes.js\";\nimport { readManifest, RestoreFailure } from \"./manifest.js\";\nimport type { DocsDir } from \"../../core/kernel/ids/dirs.js\";\n\nexport async function unarchiveLocked(\n  docsDir: DocsDir,\n  featureId: string,\n  json: boolean,\n  force: boolean,\n): Promise<void> {\n  // Same first move as archive, under the same lock: a commit killed between two\n  // renames is exactly the state an undo must not be computed on top of.\n  const recovered = await recoverInterruptedCommit(docsDir);\n  if (recovered !== null && !json) sayRecovery(recovered);\n\n  const featuresDir = featuresRoot(docsDir);\n  const archiveDir = archiveRoot(docsDir);\n\n  const feature = await resolveFeature(docsDir, featureId, \"only\");\n  if (!feature) {\n    fail(json, \"unknown-target\", `No archived feature '${featureId}' under ${archiveDir}.`);\n    return;\n  }\n  const dest = join(featuresDir, feature.dirName);\n\n  // Refuse to clobber. A feature that is active again carries its own delta, and\n  // dropping the archived copy on top of it would bury work in flight. Resolved\n  // by the feature's OWN id, not the raw argument — the collision is with\n  // whatever answers to this feature's name, however the caller spelled it.\n  const active = await resolveFeature(docsDir, feature.id, \"exclude\");\n  if (active !== null || existsSync(dest)) {\n    const name = active?.dirName ?? feature.dirName;\n    fail(\n      json,\n      \"feature-active\",\n      `unarchive ${feature.id} — BLOCKED: features/${name} already exists. Remove or rename it, then re-run.`,\n    );\n    return;\n  }\n\n  // The restore-time half of the snapshot's (service, artifact) re-keying: a\n  // version-3 entry restores into wherever its service lives TODAY, and the\n  // enumeration is the only thing that may say where that is. Built once here,\n  // as a map, so the manifest validation stays a pure question of one file\n  // against one repo state. \"no-services\" is tolerated the way `listFeatures`\n  // tolerates it: a docs repo whose `services/` is gone still restores by the\n  // literal paths (every id resolves to null), and it is `doctor`'s job to say\n  // the directory is missing — refusing the undo here would add a second,\n  // contradictory diagnosis.\n  const enumerated = docsRepoState(docsDir).kind === \"ok\" ? await listServices(docsDir) : [];\n  const serviceDirs = new Map<string, string>(enumerated.map((s) => [s.id, repoPath(docsDir, s.dir)]));\n  const manifest = await readManifest({\n    featureDir: feature.dir,\n    docsDir,\n    featureId: feature.id,\n    dirName: feature.dirName,\n    serviceDirOf: (service: string): string | null => serviceDirs.get(service) ?? null,\n  });\n  if (manifest === null) {\n    fail(\n      json,\n      \"snapshot-missing\",\n      `unarchive ${feature.id} — BLOCKED: features/archive/${feature.dirName}/${SNAPSHOT_DIR}/ is missing or was written by a different loam. ` +\n        `It was archived before loam recorded what it overwrote, and the previous text of a MODIFIED requirement exists nowhere else — ` +\n        `restore the living docs from version control instead.`,\n    );\n    return;\n  }\n\n  // What archive wrote is recorded, so a file edited since can be told from one\n  // this archive is still the top of. Restoring over a later change is silent data\n  // loss, so it takes --force to say it was meant.\n  const writes: PlannedWrite[] = [];\n  const drifted: string[] = [];\n  // Pre-images whose bytes are not the bytes archive wrote down. Collected\n  // whole, then refused together: \"which files\" is what makes the message\n  // actionable, and no destination is staged until every one is accounted for.\n  const corrupt: string[] = [];\n  for (const entry of manifest.files) {\n    const current = existsSync(entry.target) ? await readFile(entry.target) : null;\n    const now = current === null ? null : sha256(current);\n    // Drift is \"restoring this would destroy something\", so a file already\n    // holding its OWN pre-image is not drifted — putting it back writes the\n    // same bytes. It is also the state an interrupted restore leaves behind\n    // (the repair finishes the swaps it can, then this command re-runs): the\n    // narrower test used to call every repaired file a later change and demand\n    // `--force` to discard this command's own half-finished undo.\n    const restored = entry.existed ? now === entry.before : now === null;\n    if (now !== entry.after && !restored) drifted.push(entry.path);\n    let before: Buffer | null = null;\n    if (entry.snapshot !== null) {\n      before = await readFile(entry.snapshot);\n      // The one check that was missing entirely. `after` describes what archive\n      // WROTE and is checked above; nothing described the bytes it would\n      // RESTORE, so a pre-image edited inside the archived feature — a bad\n      // merge, a rebase, an editor — was written back verbatim and this command\n      // said \"the living docs are back to what they said before the archive\"\n      // over text nobody ever wrote.\n      if (sha256(before) !== entry.before) corrupt.push(entry.path);\n    }\n    // A restore whose destination is GONE is a create, and takes the same\n    // no-clobber swap an archive's creates take: between the manifest read and\n    // the swap, another writer may have put that path back, and a rename would\n    // bury it. The same helper both commands use, so neither can decide\n    // differently about the same file.\n    writes.push(planWrite(entry.target, before));\n  }\n  if (corrupt.length > 0) {\n    fail(\n      json,\n      \"snapshot-corrupt\",\n      `unarchive ${feature.id} — BLOCKED: ${corrupt.length} snapshot pre-image(s) no longer match the digest archive ` +\n        `recorded for them, so restoring them would write text nobody authored: ${corrupt.join(\", \")}. ` +\n        `--force does not override this — it discards LATER changes to the living docs, and the damage here is to the ` +\n        `undo itself. Restore the living docs from version control instead.`,\n    );\n    return;\n  }\n  if (drifted.length > 0 && !force) {\n    fail(\n      json,\n      \"snapshot-stale\",\n      `unarchive ${feature.id} — BLOCKED: ${drifted.length} file(s) changed since the archive, so this is no longer an undo: ` +\n        `${drifted.join(\", \")}. Re-run with --force to restore anyway, discarding those changes.`,\n    );\n    return;\n  }\n\n  if (!json) {\n    console.log(`unarchive ${feature.id}\\n`);\n    if (drifted.length > 0) {\n      console.log(`⚠ discarding later changes to ${drifted.length} file(s) (--force):`);\n      for (const p of drifted) console.log(`  ⚠ ${p}`);\n      console.log(\"\");\n    }\n  }\n\n  const staged = await stageWrites(writes);\n  try {\n    // The same journal archive writes, in the other direction: a restore killed\n    // between two renames leaves the docs half-back, and the merged text it was\n    // replacing is recorded nowhere — so a repair FINISHES this restore rather\n    // than undoing it, from the same digest-checked pre-images.\n    await writeCommitIntent(\n      docsDir,\n      { command: \"unarchive\", restore: \"after\", feature: feature.id, moveFrom: feature.dir, moveTo: dest },\n      staged,\n    );\n    await swapStaged(staged);\n    await rename(feature.dir, dest);\n    await clearCommitIntent(docsDir);\n  } catch (err) {\n    // The code is a caller's answer to \"can I trust the repo?\": restore-failed\n    // means yes (rolled back), rollback-incomplete means look at it by hand —\n    // rollbackError's message lists the files that need one.\n    const failures = await rollbackStaged(staged);\n    await clearCommitIntent(docsDir);\n    const wrapped = rollbackError(err, failures);\n    throw new RestoreFailure(failures.length > 0 ? \"rollback-incomplete\" : \"restore-failed\", wrapped.message);\n  }\n\n  // The snapshot describes an archive that no longer exists; the empty directories\n  // are what the merge left behind. Both are tidying — neither can fail the undo.\n  await quietRm(join(dest, SNAPSHOT_DIR));\n  for (const w of writes) if (w.content === null) await pruneEmptyDirs(dirname(w.path), docsDir);\n  await pruneEmptyDirs(archiveDir, docsDir);\n\n  const restored = writes.filter((w) => w.content !== null).map((w) => repoPath(docsDir, w.path));\n  const removed = writes.filter((w) => w.content === null).map((w) => repoPath(docsDir, w.path));\n\n  if (json) {\n    emitJson({\n      command: \"unarchive\",\n      feature: feature.id,\n      dirName: feature.dirName,\n      path: repoPath(docsDir, dest),\n      restored,\n      removed,\n      discarded: drifted,\n      ...(recovered === null ? {} : { recovered }),\n    });\n    return;\n  }\n  for (const p of restored) console.log(`  restored: ${p}`);\n  for (const p of removed) console.log(`  removed:  ${p}`);\n  console.log(`\\n  reopened: features/archive/${feature.dirName} → features/${feature.dirName}`);\n  console.log(\"  the living docs are back to what they said before the archive.\");\n}\n\n/**\n * The snapshot manifest, or null when there is nothing this command can honour —\n * absent, unreadable, or a layout version it would have to guess at. All three are\n * the same answer to the caller: this feature cannot be unarchived automatically.\n */\n\nasync function pruneEmptyDirs(dir: string, stopAt: string): Promise<void> {\n  let cur = dir;\n  for (;;) {\n    const rel = relative(stopAt, cur);\n    if (rel === \"\" || rel.startsWith(\"..\")) return;\n    try {\n      if ((await readdir(cur)).length > 0) return;\n      await rmdir(cur);\n    } catch {\n      return;\n    }\n    cur = dirname(cur);\n  }\n}\n"]}
+{"version":3,"file":"restore.js","sourceRoot":"","sources":["../../../src/commands/unarchive/restore.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Putting the docs back: read the snapshot, verify every pre-image, then write.\n *\n * The whole restore runs under the docs lock, and the verification is the point\n * of the split — `unarchive` says \"I put your docs back\", and that sentence must\n * never be sayable over a pre-image that was edited in the archived feature\n * directory since. Each entry carries both the digest of what archive WROTE and\n * the digest of what it will RESTORE, and a mismatch on either refuses.\n */\nimport { existsSync } from \"node:fs\";\nimport { readFile, rename } from \"node:fs/promises\";\nimport { dirname, join, relative, sep } from \"node:path\";\nimport { CodedFailure, emitJson, fail, repoPath } from \"../../core/envelope/json.js\";\nimport { acrossRename, isPathInside } from \"../../core/kernel/path-safety.js\";\nimport { archiveDir as archiveRoot, featuresDir as featuresRoot } from \"../../core/repo/paths.js\";\nimport { listServices, resolveFeature } from \"../../core/repo/repo.js\";\nimport { docsRepoState } from \"../../core/repo/state.js\";\nimport { sayRecovery } from \"../archive/plan/refusal.js\";\nimport {\n  quietPruneEmptyParents,\n  quietRm,\n  rollbackError,\n  rollbackStaged,\n  stageWrites,\n  swapStaged,\n} from \"../../core/staging/commit.js\";\nimport { clearCommitIntent, writeCommitIntent } from \"../../core/staging/recovery/intent.js\";\nimport { recoverInterruptedCommit } from \"../../core/staging/recovery/recover.js\";\nimport { SNAPSHOT_DIR } from \"../../core/staging/snapshot/manifest.js\";\nimport { planWrite, sha256, type PlannedWrite } from \"../../core/staging/writes.js\";\nimport { readManifest } from \"./manifest.js\";\nimport { staleGeneratedViews } from \"../../core/c4/project/architecture.js\";\nimport type { DocsDir } from \"../../core/kernel/ids/dirs.js\";\n\nexport async function unarchiveLocked(\n  docsDir: DocsDir,\n  featureId: string,\n  json: boolean,\n  force: boolean,\n): Promise<void> {\n  // Same first move as archive, under the same lock: a commit killed between two\n  // renames is exactly the state an undo must not be computed on top of.\n  const recovered = await recoverInterruptedCommit(docsDir);\n  if (recovered !== null && !json) sayRecovery(recovered);\n\n  const featuresDir = featuresRoot(docsDir);\n  const archiveDir = archiveRoot(docsDir);\n\n  const feature = await resolveFeature(docsDir, featureId, \"only\");\n  if (!feature) {\n    fail(json, \"unknown-target\", `No archived feature '${featureId}' under ${archiveDir}.`);\n    return;\n  }\n  const dest = join(featuresDir, feature.dirName);\n\n  // Refuse to clobber. A feature that is active again carries its own delta, and\n  // dropping the archived copy on top of it would bury work in flight. Resolved\n  // by the feature's OWN id, not the raw argument — the collision is with\n  // whatever answers to this feature's name, however the caller spelled it.\n  const active = await resolveFeature(docsDir, feature.id, \"exclude\");\n  if (active !== null || existsSync(dest)) {\n    const name = active?.dirName ?? feature.dirName;\n    fail(\n      json,\n      \"feature-active\",\n      `unarchive ${feature.id} — BLOCKED: features/${name} already exists. Remove or rename it, then re-run.`,\n    );\n    return;\n  }\n\n  // The restore-time half of the snapshot's (service, artifact) re-keying: a\n  // keyed entry restores into wherever its service lives TODAY, and the\n  // enumeration is the only thing that may say where that is. Built once here,\n  // as a map, so the manifest validation stays a pure question of one file\n  // against one repo state. \"no-services\" is tolerated the way `listFeatures`\n  // tolerates it: a docs repo whose `services/` is gone still restores by the\n  // literal paths (every id resolves to null), and it is `doctor`'s job to say\n  // the directory is missing — refusing the undo here would add a second,\n  // contradictory diagnosis.\n  const enumerated = docsRepoState(docsDir).kind === \"ok\" ? await listServices(docsDir) : [];\n  const serviceDirs = new Map<string, string>(enumerated.map((s) => [s.id, repoPath(docsDir, s.dir)]));\n  const manifest = await readManifest({\n    featureDir: feature.dir,\n    docsDir,\n    featureId: feature.id,\n    dirName: feature.dirName,\n    serviceDirOf: (service: string): string | null => serviceDirs.get(service) ?? null,\n  });\n  if (manifest === null) {\n    fail(\n      json,\n      \"snapshot-missing\",\n      `unarchive ${feature.id} — BLOCKED: features/archive/${feature.dirName}/${SNAPSHOT_DIR}/ is missing or was written by a different loam. ` +\n        `It was archived before loam recorded what it overwrote, and the previous text of a MODIFIED requirement exists nowhere else — ` +\n        `restore the living docs from version control instead.`,\n    );\n    return;\n  }\n\n  // What archive wrote is recorded, so a file edited since can be told from one\n  // this archive is still the top of. Restoring over a later change is silent data\n  // loss, so it takes --force to say it was meant.\n  const writes: PlannedWrite[] = [];\n  const drifted: string[] = [];\n  // Pre-images whose bytes are not the bytes archive wrote down. Collected\n  // whole, then refused together: \"which files\" is what makes the message\n  // actionable, and no destination is staged until every one is accounted for.\n  const corrupt: string[] = [];\n  // Rows written into ANOTHER change in flight — a document whose links into\n  // this feature the archive rewrote — whose feature directory is gone. That\n  // feature has a lifecycle of its own: archived since, it is history with its\n  // own snapshot; removed, it was abandoned. Putting the pre-image back would\n  // recreate a one-file `features/<other>/` that every reader then lists as a\n  // change in flight, beside the archived one or in place of the one somebody\n  // deleted — and calling the row drift would send the reader to `--force`,\n  // which does exactly that. Nothing edited it: it is left as it is, and said.\n  const left: string[] = [];\n  for (const entry of manifest.files) {\n    const owner = inFlightFeatureDir(featuresDir, archiveDir, entry.target);\n    if (owner !== null && owner !== dest && !existsSync(owner)) {\n      left.push(entry.path);\n      continue;\n    }\n    const current = existsSync(entry.target) ? await readFile(entry.target) : null;\n    const now = current === null ? null : sha256(current);\n    // Drift is \"restoring this would destroy something\", so a file already\n    // holding its OWN pre-image is not drifted — putting it back writes the\n    // same bytes. It is also the state an interrupted restore leaves behind\n    // (the repair finishes the swaps it can, then this command re-runs): the\n    // narrower test used to call every repaired file a later change and demand\n    // `--force` to discard this command's own half-finished undo.\n    const restored = entry.existed ? now === entry.before : now === null;\n    if (now !== entry.after && !restored) drifted.push(entry.path);\n    let before: Buffer | null = null;\n    if (entry.snapshot !== null) {\n      before = await readFile(entry.snapshot);\n      // The one check that was missing entirely. `after` describes what archive\n      // WROTE and is checked above; nothing described the bytes it would\n      // RESTORE, so a pre-image edited inside the archived feature — a bad\n      // merge, a rebase, an editor — was written back verbatim and this command\n      // said \"the living docs are back to what they said before the archive\"\n      // over text nobody ever wrote.\n      if (sha256(before) !== entry.before) corrupt.push(entry.path);\n    }\n    // A restore whose destination is GONE is a create, and takes the same\n    // no-clobber swap an archive's creates take: between the manifest read and\n    // the swap, another writer may have put that path back, and a rename would\n    // bury it. The same helper both commands use, so neither can decide\n    // differently about the same file.\n    writes.push(planWrite(entry.target, before));\n  }\n  if (corrupt.length > 0) {\n    fail(\n      json,\n      \"snapshot-corrupt\",\n      `unarchive ${feature.id} — BLOCKED: ${corrupt.length} snapshot pre-image(s) no longer match the digest archive ` +\n        `recorded for them, so restoring them would write text nobody authored: ${corrupt.join(\", \")}. ` +\n        `--force does not override this — it discards LATER changes to the living docs, and the damage here is to the ` +\n        `undo itself. Restore the living docs from version control instead.`,\n    );\n    return;\n  }\n  if (drifted.length > 0 && !force) {\n    fail(\n      json,\n      \"snapshot-stale\",\n      `unarchive ${feature.id} — BLOCKED: ${drifted.length} file(s) changed since the archive, so this is no longer an undo: ` +\n        `${drifted.join(\", \")}. Re-run with --force to restore anyway, discarding those changes.`,\n    );\n    return;\n  }\n\n  if (!json) {\n    console.log(`unarchive ${feature.id}\\n`);\n    if (drifted.length > 0) {\n      console.log(`⚠ discarding later changes to ${drifted.length} file(s) (--force):`);\n      for (const p of drifted) console.log(`  ⚠ ${p}`);\n      console.log(\"\");\n    }\n  }\n\n  const staged = await stageWrites(writes);\n  try {\n    // The same journal archive writes, in the other direction: a restore killed\n    // between two renames leaves the docs half-back, and the merged text it was\n    // replacing is recorded nowhere — so a repair FINISHES this restore rather\n    // than undoing it, from the same digest-checked pre-images.\n    await writeCommitIntent(\n      docsDir,\n      { command: \"unarchive\", restore: \"after\", feature: feature.id, moveFrom: feature.dir, moveTo: dest },\n      staged,\n    );\n    await swapStaged(staged);\n    await rename(feature.dir, dest);\n    await clearCommitIntent(docsDir);\n  } catch (err) {\n    // The code is a caller's answer to \"can I trust the repo?\": restore-failed\n    // means yes (rolled back), rollback-incomplete means look at it by hand —\n    // rollbackError's message lists the files that need one.\n    const failures = await rollbackStaged(staged);\n    await clearCommitIntent(docsDir);\n    const wrapped = rollbackError(err, failures);\n    throw new CodedFailure(failures.length > 0 ? \"rollback-incomplete\" : \"restore-failed\", wrapped.message);\n  }\n\n  // The snapshot describes an archive that no longer exists; the empty directories\n  // are what the merge left behind. Both are tidying — neither can fail the undo.\n  await quietRm(join(dest, SNAPSHOT_DIR));\n  for (const w of writes) if (w.content === null) await pruneBelowRoot(docsDir, dirname(w.path));\n  await pruneBelowRoot(docsDir, archiveDir);\n\n  // Named where each file IS now: the feature's own documents were restored\n  // inside the archived directory and the rename just carried them out of it,\n  // so their write paths name a directory that no longer exists.\n  const landed = (path: string): string => repoPath(docsDir, acrossRename(path, feature.dir, dest));\n  const restored = writes.filter((w) => w.content !== null).map((w) => landed(w.path));\n  const removed = writes.filter((w) => w.content === null).map((w) => landed(w.path));\n  // The undo puts back what the archive WROTE, and the two generated views\n  // files were never among it: `loam subsystem sync` owns them, and a sync run\n  // between the archive and this undo rewrote them against the merged map. So\n  // the map just went back and they did not — the services overview naming\n  // a service the map no longer draws — and \"the living docs are back\" would\n  // be said over a repo whose next `validate --all` is red. Graded after the\n  // commit through validate's own function, as archive grades its own result.\n  const staleViews = await staleGeneratedViews(docsDir);\n\n  if (json) {\n    emitJson({\n      command: \"unarchive\",\n      feature: feature.id,\n      dirName: feature.dirName,\n      path: repoPath(docsDir, dest),\n      restored,\n      removed,\n      // Docs-relative as the manifest spells them, then named where they landed —\n      // the same file must not answer to two names across `discarded` and\n      // `restored`. The refusal and the `--force` warning above print the\n      // pre-move name, because they are said before the move.\n      discarded: drifted.map((rel) => landed(join(docsDir, ...rel.split(\"/\")))),\n      // Additive, and omitted when nothing is stale — `archive --json`'s key, same meaning.\n      ...(staleViews.length === 0 ? {} : { staleViews }),\n      ...(recovered === null ? {} : { recovered }),\n    });\n    return;\n  }\n  for (const p of restored) console.log(`  restored: ${p}`);\n  for (const p of removed) console.log(`  removed:  ${p}`);\n  for (const p of left) console.log(`  left:     ${p} — its feature is no longer in flight, so its pre-archive text is not put back`);\n  console.log(`\\n  reopened: features/archive/${feature.dirName} → features/${feature.dirName}`);\n  if (staleViews.length === 0) {\n    console.log(\"  the living docs are back to what they said before the archive.\");\n    return;\n  }\n  // The narrower claim, true whether the views went stale after the archive or\n  // were stale before it — the closing line is a claim about the whole docs\n  // repo, and `archive` withholds its own for the same files.\n  console.log(\"  the documents the archive wrote are back to what they said before it.\");\n  for (const path of staleViews) {\n    console.log(`  ⚠ ${path} no longer matches the tree and this map — run \\`loam subsystem sync\\`.`);\n  }\n}\n\n/**\n * The in-flight feature directory a row's target sits in — `features/<dir>/`\n * for a file below it, never under `features/archive/` — or null for a row\n * anywhere else. The caller tells this feature's own destination apart.\n *\n * `--json` has no key for the rows the caller leaves: the payload's lists name\n * files the undo wrote, and these it deliberately did not touch. The text\n * output says each one.\n */\nfunction inFlightFeatureDir(featuresDir: string, archiveDir: string, target: string): string | null {\n  if (!isPathInside(featuresDir, target) || isPathInside(archiveDir, target)) return null;\n  const [dir, ...below] = relative(featuresDir, target).split(sep);\n  return dir === undefined || below.length === 0 ? null : join(featuresDir, dir);\n}\n\n/**\n * Remove the empty directories from `dir` upward, stopping BELOW the docs root:\n * never the root itself, nor anything outside it. The walk is staging's own,\n * bounded at the top-level directory `dir` sits in.\n */\nasync function pruneBelowRoot(docsDir: string, dir: string): Promise<void> {\n  const top = relative(docsDir, dir).split(sep)[0] ?? \"\";\n  if (top === \"\" || top.startsWith(\"..\")) return;\n  await quietPruneEmptyParents(dir, join(docsDir, top));\n}\n"]}

package/dist/commands/unarchive/unarchive.js

@@ -1,19 +1,27 @@
-import { loadConfig } from "../../core/envelope/config.js";
-import { fail, reportNoConfig } from "../../core/envelope/json.js";
+import { CodedFailure, configOrRefuse, fail } from "../../core/envelope/json.js";
 import { message } from "../../core/staging/commit.js";
 import { acquireDocsLock, DocsBusyError } from "../../core/staging/lock.js";
 import { InterruptedCommitError } from "../../core/staging/interrupted.js";
 import { unarchiveLocked } from "./restore.js";
-import { RestoreFailure } from "./manifest.js";
 /**
- * A commit-phase failure with its stable `--json` code attached — the mirror of
- * archive's discipline. `restore-failed` answers "can I trust the repo?" with
- * yes: nothing was restored, or everything was rolled back, and re-running can
- * work. `rollback-incomplete` is the code that demands a human: the restore
- * failed AND some files could not be put back — the message lists them.
- * Anything ELSE that escapes runUnarchive never touched the commit phase, so
- * the action handler reports it as `restore-failed`.
+ * The code a failed unarchive answers with. A commit-phase failure is thrown as
+ * a `CodedFailure` — the mirror of archive's discipline. `restore-failed`
+ * answers "can I trust the repo?" with yes: nothing was restored, or everything
+ * was rolled back, and re-running can work. `rollback-incomplete` is the code
+ * that demands a human: the restore failed AND some files could not be put back
+ * — the message lists them. Anything ELSE that escapes runUnarchive never
+ * touched the commit phase, so it reports as `restore-failed`.
  */
+function unarchiveErrorCode(err) {
+    if (err instanceof CodedFailure)
+        return err.code;
+    // Another writer holds the docs repo — the lock is taken refuse-fast below.
+    if (err instanceof DocsBusyError)
+        return "docs-busy";
+    if (err instanceof InterruptedCommitError)
+        return "commit-interrupted";
+    return "restore-failed";
+}
 export function registerUnarchive(program) {
     program
         .command("unarchive")
@@ -27,36 +35,20 @@ export function registerUnarchive(program) {
             await runUnarchive(featureId, json, opts.force === true);
         }
         catch (err) {
-            const code = err instanceof RestoreFailure
-                ? err.code
-                : err instanceof InterruptedCommitError
-                    ? "commit-interrupted"
-                    : "restore-failed";
-            fail(json, code, `unarchive ${featureId} failed: ${message(err)}`);
+            fail(json, unarchiveErrorCode(err), `unarchive ${featureId} failed: ${message(err)}`);
         }
     });
 }
 async function runUnarchive(featureId, json, force) {
-    const loaded = await loadConfig();
-    if (loaded.kind !== "loaded") {
-        reportNoConfig(json, loaded);
+    const config = await configOrRefuse(json);
+    if (config === null)
         return;
-    }
-    const config = loaded.config;
     // The same lock archive takes, for the same reason: unarchive rewrites the
     // living spec, contract and landscape from a snapshot, and an archive landing
     // inside that window would have its merge silently reverted by our restore —
     // or ours by its merge. One writer per docs repo, whichever direction it
     // writes in.
-    let release;
-    try {
-        release = await acquireDocsLock(config.docsDir);
-    }
-    catch (err) {
-        if (err instanceof DocsBusyError)
-            throw new RestoreFailure("docs-busy", err.message);
-        throw err;
-    }
+    const release = await acquireDocsLock(config.docsDir);
     try {
         await unarchiveLocked(config.docsDir, featureId, json, force);
     }

package/dist/commands/unarchive/unarchive.js.map

@@ -1 +1 @@
-{"version":3,"file":"unarchive.js","sourceRoot":"","sources":["../../../src/commands/unarchive/unarchive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAuB/C;;;;;;;;GAQG;AAEH,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,QAAQ,CAAC,aAAa,EAAE,2BAA2B,CAAC;SACpD,WAAW,CAAC,6EAA6E,CAAC;SAC1F,MAAM,CAAC,QAAQ,EAAE,qDAAqD,CAAC;SACvE,MAAM,CAAC,SAAS,EAAE,oFAAoF,CAAC;SACvG,MAAM,CAAC,KAAK,EAAE,SAAiB,EAAE,IAAsB,EAAE,EAAE;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,GAAG,GAAG,YAAY,cAAc;gBACxC,CAAC,CAAC,GAAG,CAAC,IAAI;gBACV,CAAC,CAAC,GAAG,YAAY,sBAAsB;oBACrC,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,gBAAgB,CAAC;YACvB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,SAAiB,EAAE,IAAa,EAAE,KAAc;IAC1E,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7B,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,yEAAyE;IACzE,aAAa;IACb,IAAI,OAA4B,CAAC;IACjC,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,aAAa;YAAE,MAAM,IAAI,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACrF,MAAM,GAAG,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC","sourcesContent":["import type { Command } from \"commander\";\nimport { loadConfig } from \"../../core/envelope/config.js\";\nimport { fail, reportNoConfig } from \"../../core/envelope/json.js\";\nimport { message } from \"../../core/staging/commit.js\";\nimport { acquireDocsLock, DocsBusyError } from \"../../core/staging/lock.js\";\nimport { InterruptedCommitError } from \"../../core/staging/interrupted.js\";\nimport { unarchiveLocked } from \"./restore.js\";\nimport { RestoreFailure } from \"./manifest.js\";\n\n/**\n * `loam unarchive <FEAT>` — take back a `loam archive`.\n *\n * Not an inverse merge, and it cannot be one. Undoing the requirements axis would\n * mean restoring a MODIFIED requirement's PREVIOUS text, which appears nowhere:\n * the delta records what the requirement became, never what it was. The landscape\n * axis is no better — the merge drops the feature tags, so the added lines are\n * indistinguishable from lines that were always there. Anything reconstructed\n * from the archived feature would be a plausible guess at the old docs, which is\n * exactly the kind of quiet fiction the rest of loam exists to prevent.\n *\n * So archive writes the bytes down instead (`<feature>/.loam-before/`), and this\n * command puts them back. The snapshot is optional on restore: a feature archived\n * before it existed fails with a clear message rather than a crash.\n */\n\ninterface UnarchiveOptions {\n  json?: boolean;\n  force?: boolean;\n}\n\n/**\n * A commit-phase failure with its stable `--json` code attached — the mirror of\n * archive's discipline. `restore-failed` answers \"can I trust the repo?\" with\n * yes: nothing was restored, or everything was rolled back, and re-running can\n * work. `rollback-incomplete` is the code that demands a human: the restore\n * failed AND some files could not be put back — the message lists them.\n * Anything ELSE that escapes runUnarchive never touched the commit phase, so\n * the action handler reports it as `restore-failed`.\n */\n\nexport function registerUnarchive(program: Command): void {\n  program\n    .command(\"unarchive\")\n    .argument(\"<featureId>\", \"feature id, e.g. FEAT-101\")\n    .description(\"Take back a `loam archive`: restore the living docs and re-open the feature\")\n    .option(\"--json\", \"emit the machine contract instead of the human view\")\n    .option(\"--force\", \"restore even if the living docs changed after the archive (discards those changes)\")\n    .action(async (featureId: string, opts: UnarchiveOptions) => {\n      const json = opts.json === true;\n      try {\n        await runUnarchive(featureId, json, opts.force === true);\n      } catch (err) {\n        const code = err instanceof RestoreFailure\n          ? err.code\n          : err instanceof InterruptedCommitError\n            ? \"commit-interrupted\"\n            : \"restore-failed\";\n        fail(json, code, `unarchive ${featureId} failed: ${message(err)}`);\n      }\n    });\n}\n\nasync function runUnarchive(featureId: string, json: boolean, force: boolean): Promise<void> {\n  const loaded = await loadConfig();\n  if (loaded.kind !== \"loaded\") {\n    reportNoConfig(json, loaded);\n    return;\n  }\n  const config = loaded.config;\n  // The same lock archive takes, for the same reason: unarchive rewrites the\n  // living spec, contract and landscape from a snapshot, and an archive landing\n  // inside that window would have its merge silently reverted by our restore —\n  // or ours by its merge. One writer per docs repo, whichever direction it\n  // writes in.\n  let release: () => Promise<void>;\n  try {\n    release = await acquireDocsLock(config.docsDir);\n  } catch (err) {\n    if (err instanceof DocsBusyError) throw new RestoreFailure(\"docs-busy\", err.message);\n    throw err;\n  }\n  try {\n    await unarchiveLocked(config.docsDir, featureId, json, force);\n  } finally {\n    await release();\n  }\n}\n"]}
+{"version":3,"file":"unarchive.js","sourceRoot":"","sources":["../../../src/commands/unarchive/unarchive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,EAAkB,MAAM,6BAA6B,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAuB/C;;;;;;;;GAQG;AACH,SAAS,kBAAkB,CAAC,GAAY;IACtC,IAAI,GAAG,YAAY,YAAY;QAAE,OAAO,GAAG,CAAC,IAAI,CAAC;IACjD,4EAA4E;IAC5E,IAAI,GAAG,YAAY,aAAa;QAAE,OAAO,WAAW,CAAC;IACrD,IAAI,GAAG,YAAY,sBAAsB;QAAE,OAAO,oBAAoB,CAAC;IACvE,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO;SACJ,OAAO,CAAC,WAAW,CAAC;SACpB,QAAQ,CAAC,aAAa,EAAE,2BAA2B,CAAC;SACpD,WAAW,CAAC,6EAA6E,CAAC;SAC1F,MAAM,CAAC,QAAQ,EAAE,qDAAqD,CAAC;SACvE,MAAM,CAAC,SAAS,EAAE,oFAAoF,CAAC;SACvG,MAAM,CAAC,KAAK,EAAE,SAAiB,EAAE,IAAsB,EAAE,EAAE;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,aAAa,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,SAAiB,EAAE,IAAa,EAAE,KAAc;IAC1E,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO;IAC5B,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,yEAAyE;IACzE,aAAa;IACb,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC","sourcesContent":["import type { Command } from \"commander\";\nimport { CodedFailure, configOrRefuse, fail, type ErrorCode } from \"../../core/envelope/json.js\";\nimport { message } from \"../../core/staging/commit.js\";\nimport { acquireDocsLock, DocsBusyError } from \"../../core/staging/lock.js\";\nimport { InterruptedCommitError } from \"../../core/staging/interrupted.js\";\nimport { unarchiveLocked } from \"./restore.js\";\n\n/**\n * `loam unarchive <FEAT>` — take back a `loam archive`.\n *\n * Not an inverse merge, and it cannot be one. Undoing the requirements axis would\n * mean restoring a MODIFIED requirement's PREVIOUS text, which appears nowhere:\n * the delta records what the requirement became, never what it was. The landscape\n * axis is no better — the merge drops the feature tags, so the added lines are\n * indistinguishable from lines that were always there. Anything reconstructed\n * from the archived feature would be a plausible guess at the old docs, which is\n * exactly the kind of quiet fiction the rest of loam exists to prevent.\n *\n * So archive writes the bytes down instead (`<feature>/.loam-before/`), and this\n * command puts them back. The snapshot is optional on restore: a feature archived\n * before it existed fails with a clear message rather than a crash.\n */\n\ninterface UnarchiveOptions {\n  json?: boolean;\n  force?: boolean;\n}\n\n/**\n * The code a failed unarchive answers with. A commit-phase failure is thrown as\n * a `CodedFailure` — the mirror of archive's discipline. `restore-failed`\n * answers \"can I trust the repo?\" with yes: nothing was restored, or everything\n * was rolled back, and re-running can work. `rollback-incomplete` is the code\n * that demands a human: the restore failed AND some files could not be put back\n * — the message lists them. Anything ELSE that escapes runUnarchive never\n * touched the commit phase, so it reports as `restore-failed`.\n */\nfunction unarchiveErrorCode(err: unknown): ErrorCode {\n  if (err instanceof CodedFailure) return err.code;\n  // Another writer holds the docs repo — the lock is taken refuse-fast below.\n  if (err instanceof DocsBusyError) return \"docs-busy\";\n  if (err instanceof InterruptedCommitError) return \"commit-interrupted\";\n  return \"restore-failed\";\n}\n\nexport function registerUnarchive(program: Command): void {\n  program\n    .command(\"unarchive\")\n    .argument(\"<featureId>\", \"feature id, e.g. FEAT-101\")\n    .description(\"Take back a `loam archive`: restore the living docs and re-open the feature\")\n    .option(\"--json\", \"emit the machine contract instead of the human view\")\n    .option(\"--force\", \"restore even if the living docs changed after the archive (discards those changes)\")\n    .action(async (featureId: string, opts: UnarchiveOptions) => {\n      const json = opts.json === true;\n      try {\n        await runUnarchive(featureId, json, opts.force === true);\n      } catch (err) {\n        fail(json, unarchiveErrorCode(err), `unarchive ${featureId} failed: ${message(err)}`);\n      }\n    });\n}\n\nasync function runUnarchive(featureId: string, json: boolean, force: boolean): Promise<void> {\n  const config = await configOrRefuse(json);\n  if (config === null) return;\n  // The same lock archive takes, for the same reason: unarchive rewrites the\n  // living spec, contract and landscape from a snapshot, and an archive landing\n  // inside that window would have its merge silently reverted by our restore —\n  // or ours by its merge. One writer per docs repo, whichever direction it\n  // writes in.\n  const release = await acquireDocsLock(config.docsDir);\n  try {\n    await unarchiveLocked(config.docsDir, featureId, json, force);\n  } finally {\n    await release();\n  }\n}\n"]}