@elie-laloum/outpost 2.0.0 → 3.0.0

package/dist/application/recovery-retention.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-retention.constants.js","sourceRoot":"","sources":["../../src/application/recovery-retention.constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,cAAc,EAAE,MAAM,EAAW,CAAC","sourcesContent":["export const recoveryRetentionLimits = { maxPolicyBytes: 65_536 } as const;\n"]}

package/dist/application/recovery-retention.d.ts

@@ -0,0 +1,4 @@
+import type { RecoveryPruneResult, RecoveryQuotaOptions, RecoveryRetentionOptions, RecoveryRetentionPlan } from "./recovery-retention.types.ts";
+export declare function planRecoveryRetention(options: RecoveryRetentionOptions): Promise<RecoveryRetentionPlan>;
+export declare function pruneRecoveryRetention(plan: RecoveryRetentionPlan): Promise<RecoveryPruneResult>;
+export declare function assertRecoveryQuota(options: RecoveryQuotaOptions): Promise<void>;

package/dist/application/recovery-retention.js

@@ -0,0 +1,202 @@
+import { lstat, rm } from "node:fs/promises";
+import { OutpostError, invariant } from "../domain/errors.js";
+import { git } from "../infrastructure/git/command.js";
+import { lock, lockPath } from "../infrastructure/git/lock.js";
+import { closedJournal } from "../infrastructure/journal-retention.js";
+import { inspectRecovery } from "./recovery-inspection.js";
+import { retentionPolicy } from "./recovery-retention-policy.js";
+async function workspaceReason(entry, inspection) {
+    const workspace = inspection.git?.workspaces.find((value) => value.path === entry.path);
+    if (!workspace || workspace.state !== "registered")
+        return "WORKSPACE_UNREGISTERED_OR_UNKNOWN";
+    if (workspace.branch === null)
+        return "DETACHED_WORKSPACE";
+    if (workspace.dirty)
+        return "DIRTY_WORKSPACE";
+    if (workspace.locked)
+        return "GIT_LOCKED_WORKSPACE";
+    try {
+        await lstat(lockPath(inspection.repository, workspace.branch));
+        return "OPERATION_LOCK_PRESENT";
+    }
+    catch (error) {
+        if (!(error &&
+            typeof error === "object" &&
+            "code" in error &&
+            error.code === "ENOENT"))
+            return "OWNERSHIP_UNKNOWN";
+    }
+    try {
+        const ignored = await git(entry.path, [
+            "ls-files",
+            "--others",
+            "--ignored",
+            "--exclude-standard",
+            "-z",
+        ]);
+        if (ignored.length)
+            return "IGNORED_FILES";
+    }
+    catch {
+        return "WORKSPACE_STATE_UNKNOWN";
+    }
+    return "ELIGIBLE";
+}
+export async function planRecoveryRetention(options) {
+    retentionPolicy(options.policy);
+    const policy = structuredClone(options.policy);
+    const inspection = await inspectRecovery({
+        ...options,
+        git: true,
+        locks: true,
+    });
+    const entries = [];
+    const inspectedAt = new Date().toISOString();
+    const complete = inspection.complete && inspection.git?.complete !== false;
+    for (const category of inspection.categories) {
+        for (const entry of category.entries) {
+            let reason = "RECOVERY_DATA_PROTECTED";
+            if (category.name === "locks")
+                reason = "OWNERSHIP_RECORD_PROTECTED";
+            if (category.name === "logs")
+                reason = "LOG_ACTIVITY_OR_CONTENT_UNKNOWN";
+            if (category.name === "workspaces")
+                reason = "SCOPE_NOT_SELECTED";
+            if (category.name === "workspaces" &&
+                policy.scopes.includes("clean-workspaces"))
+                reason = await workspaceReason(entry, inspection);
+            if (category.name === "logs" &&
+                policy.scopes.includes("closed-logs") &&
+                entry.kind === "file" &&
+                entry.name.endsWith(".jsonl") &&
+                (await closedJournal(entry.path)))
+                reason = "ELIGIBLE";
+            if (category.name === "logs" && entry.name.endsWith(".closed.json"))
+                reason = "CLOSURE_RECORD_PROTECTED";
+            if (reason === "ELIGIBLE" &&
+                (!entry.modifiedAt ||
+                    Date.parse(inspectedAt) - Date.parse(entry.modifiedAt) <
+                        policy.minAgeMs))
+                reason = "RETENTION_AGE";
+            if (reason === "ELIGIBLE" && (!complete || !entry.complete))
+                reason = "INCOMPLETE_INVENTORY";
+            const workspace = inspection.git?.workspaces.find((value) => value.path === entry.path);
+            entries.push({
+                path: entry.path,
+                category: category.name,
+                bytes: entry.bytes,
+                eligible: reason === "ELIGIBLE",
+                reason,
+                ...(entry.modifiedAt ? { modifiedAt: entry.modifiedAt } : {}),
+                ...(workspace?.state === "registered" && workspace.branch
+                    ? { branch: workspace.branch, head: workspace.head }
+                    : {}),
+            });
+        }
+    }
+    const projectedBytes = inspection.usage.bytes -
+        entries
+            .filter((entry) => entry.eligible)
+            .reduce((sum, entry) => sum +
+            entry.bytes +
+            (entry.category === "logs"
+                ? (entries.find((other) => other.path === `${entry.path}.closed.json`)?.bytes ?? 0)
+                : 0), 0);
+    const workspaces = entries.filter((entry) => entry.category === "workspaces" && !entry.eligible).length;
+    const exceeded = (policy.maxBytes !== undefined && projectedBytes > policy.maxBytes) ||
+        (policy.maxWorkspaces !== undefined && workspaces > policy.maxWorkspaces);
+    return {
+        repository: inspection.repository,
+        policy,
+        inspectedAt,
+        inspection,
+        entries,
+        complete,
+        usageBytes: inspection.usage.bytes,
+        projectedBytes,
+        quota: !complete ? "unknown" : exceeded ? "exceeded" : "within",
+    };
+}
+export async function pruneRecoveryRetention(plan) {
+    retentionPolicy(plan.policy);
+    invariant(plan.complete, "Cannot prune an incomplete retention plan");
+    const removed = [];
+    const retained = [];
+    for (const candidate of plan.entries.filter((entry) => entry.eligible)) {
+        const fresh = await planRecoveryRetention({
+            repository: plan.repository,
+            policy: plan.policy,
+        });
+        const entry = fresh.entries.find((value) => value.path === candidate.path);
+        if (!entry?.eligible ||
+            entry.head !== candidate.head ||
+            entry.branch !== candidate.branch ||
+            entry.bytes !== candidate.bytes ||
+            entry.modifiedAt !== candidate.modifiedAt) {
+            retained.push({ path: candidate.path, reason: "PLAN_CHANGED" });
+            continue;
+        }
+        try {
+            if (entry.category === "workspaces" && entry.branch) {
+                const release = await lock(plan.repository, entry.branch);
+                try {
+                    const status = await git(entry.path, [
+                        "status",
+                        "--porcelain=v1",
+                        "--ignored",
+                        "--untracked-files=all",
+                    ]);
+                    invariant(!status.length, "Workspace changed before pruning");
+                    invariant((await git(entry.path, ["rev-parse", "HEAD"])).trim() ===
+                        entry.head, "Workspace HEAD changed before pruning");
+                    invariant((await git(entry.path, ["symbolic-ref", "--short", "HEAD"])).trim() === entry.branch, "Workspace branch changed before pruning");
+                    await git(plan.repository, ["worktree", "remove", entry.path]);
+                }
+                finally {
+                    await release();
+                }
+            }
+            else {
+                const release = await lock(plan.repository, `journal:${entry.path}`);
+                try {
+                    invariant(entry.category === "logs" && (await closedJournal(entry.path)), "Journal changed before pruning");
+                    await rm(entry.path);
+                    await rm(`${entry.path}.closed.json`);
+                }
+                finally {
+                    await release();
+                }
+            }
+            removed.push(entry.path);
+        }
+        catch {
+            retained.push({
+                path: candidate.path,
+                reason: "REVALIDATION_OR_REMOVAL_FAILED",
+            });
+        }
+    }
+    return {
+        removed,
+        retained,
+        after: await planRecoveryRetention({
+            repository: plan.repository,
+            policy: plan.policy,
+        }),
+    };
+}
+export async function assertRecoveryQuota(options) {
+    invariant(Number.isSafeInteger(options.maxBytes) && options.maxBytes >= 0, "maxBytes must be a nonnegative integer");
+    const reserve = options.reserveBytes ?? 0;
+    invariant(Number.isSafeInteger(reserve) && reserve >= 0, "reserveBytes must be a nonnegative integer");
+    const inspection = await inspectRecovery(options);
+    if (!inspection.complete ||
+        inspection.usage.bytes + reserve > options.maxBytes)
+        throw new OutpostError("workspace", "Outpost storage quota admission refused", {
+            usageBytes: inspection.usage.bytes,
+            reserveBytes: reserve,
+            maxBytes: options.maxBytes,
+            complete: inspection.complete,
+        });
+}
+//# sourceMappingURL=recovery-retention.js.map

package/dist/application/recovery-retention.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-retention.js","sourceRoot":"","sources":["../../src/application/recovery-retention.ts"],"names":[],"mappings":"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","sourcesContent":["import { lstat, rm } from \"node:fs/promises\";\nimport { OutpostError, invariant } from \"../domain/errors.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { lock, lockPath } from \"../infrastructure/git/lock.ts\";\nimport { closedJournal } from \"../infrastructure/journal-retention.ts\";\nimport type { StorageEntry } from \"../infrastructure/storage-inventory.types.ts\";\nimport type { RecoveryInspection } from \"./recovery-inspection.types.ts\";\nimport { inspectRecovery } from \"./recovery-inspection.ts\";\nimport { retentionPolicy } from \"./recovery-retention-policy.ts\";\nimport type {\n  RecoveryPruneResult,\n  RecoveryRetainedEntry,\n  RecoveryQuotaOptions,\n  RecoveryRetentionEntry,\n  RecoveryRetentionOptions,\n  RecoveryRetentionPlan,\n} from \"./recovery-retention.types.ts\";\n\nasync function workspaceReason(\n  entry: StorageEntry,\n  inspection: RecoveryInspection,\n): Promise<string> {\n  const workspace = inspection.git?.workspaces.find(\n    (value) => value.path === entry.path,\n  );\n  if (!workspace || workspace.state !== \"registered\")\n    return \"WORKSPACE_UNREGISTERED_OR_UNKNOWN\";\n  if (workspace.branch === null) return \"DETACHED_WORKSPACE\";\n  if (workspace.dirty) return \"DIRTY_WORKSPACE\";\n  if (workspace.locked) return \"GIT_LOCKED_WORKSPACE\";\n  try {\n    await lstat(lockPath(inspection.repository, workspace.branch));\n    return \"OPERATION_LOCK_PRESENT\";\n  } catch (error) {\n    if (!(\n      error &&\n      typeof error === \"object\" &&\n      \"code\" in error &&\n      error.code === \"ENOENT\"\n    ))\n      return \"OWNERSHIP_UNKNOWN\";\n  }\n  try {\n    const ignored = await git(entry.path, [\n      \"ls-files\",\n      \"--others\",\n      \"--ignored\",\n      \"--exclude-standard\",\n      \"-z\",\n    ]);\n    if (ignored.length) return \"IGNORED_FILES\";\n  } catch {\n    return \"WORKSPACE_STATE_UNKNOWN\";\n  }\n  return \"ELIGIBLE\";\n}\n\nexport async function planRecoveryRetention(\n  options: RecoveryRetentionOptions,\n): Promise<RecoveryRetentionPlan> {\n  retentionPolicy(options.policy);\n  const policy = structuredClone(options.policy);\n  const inspection = await inspectRecovery({\n    ...options,\n    git: true,\n    locks: true,\n  });\n  const entries: RecoveryRetentionEntry[] = [];\n  const inspectedAt = new Date().toISOString();\n  const complete = inspection.complete && inspection.git?.complete !== false;\n  for (const category of inspection.categories) {\n    for (const entry of category.entries) {\n      let reason = \"RECOVERY_DATA_PROTECTED\";\n      if (category.name === \"locks\") reason = \"OWNERSHIP_RECORD_PROTECTED\";\n      if (category.name === \"logs\") reason = \"LOG_ACTIVITY_OR_CONTENT_UNKNOWN\";\n      if (category.name === \"workspaces\") reason = \"SCOPE_NOT_SELECTED\";\n      if (\n        category.name === \"workspaces\" &&\n        policy.scopes.includes(\"clean-workspaces\")\n      )\n        reason = await workspaceReason(entry, inspection);\n      if (\n        category.name === \"logs\" &&\n        policy.scopes.includes(\"closed-logs\") &&\n        entry.kind === \"file\" &&\n        entry.name.endsWith(\".jsonl\") &&\n        (await closedJournal(entry.path))\n      )\n        reason = \"ELIGIBLE\";\n      if (category.name === \"logs\" && entry.name.endsWith(\".closed.json\"))\n        reason = \"CLOSURE_RECORD_PROTECTED\";\n      if (\n        reason === \"ELIGIBLE\" &&\n        (!entry.modifiedAt ||\n          Date.parse(inspectedAt) - Date.parse(entry.modifiedAt) <\n            policy.minAgeMs)\n      )\n        reason = \"RETENTION_AGE\";\n      if (reason === \"ELIGIBLE\" && (!complete || !entry.complete))\n        reason = \"INCOMPLETE_INVENTORY\";\n      const workspace = inspection.git?.workspaces.find(\n        (value) => value.path === entry.path,\n      );\n      entries.push({\n        path: entry.path,\n        category: category.name,\n        bytes: entry.bytes,\n        eligible: reason === \"ELIGIBLE\",\n        reason,\n        ...(entry.modifiedAt ? { modifiedAt: entry.modifiedAt } : {}),\n        ...(workspace?.state === \"registered\" && workspace.branch\n          ? { branch: workspace.branch, head: workspace.head }\n          : {}),\n      });\n    }\n  }\n  const projectedBytes =\n    inspection.usage.bytes -\n    entries\n      .filter((entry) => entry.eligible)\n      .reduce(\n        (sum, entry) =>\n          sum +\n          entry.bytes +\n          (entry.category === \"logs\"\n            ? (entries.find(\n                (other) => other.path === `${entry.path}.closed.json`,\n              )?.bytes ?? 0)\n            : 0),\n        0,\n      );\n  const workspaces = entries.filter(\n    (entry) => entry.category === \"workspaces\" && !entry.eligible,\n  ).length;\n  const exceeded =\n    (policy.maxBytes !== undefined && projectedBytes > policy.maxBytes) ||\n    (policy.maxWorkspaces !== undefined && workspaces > policy.maxWorkspaces);\n  return {\n    repository: inspection.repository,\n    policy,\n    inspectedAt,\n    inspection,\n    entries,\n    complete,\n    usageBytes: inspection.usage.bytes,\n    projectedBytes,\n    quota: !complete ? \"unknown\" : exceeded ? \"exceeded\" : \"within\",\n  };\n}\n\nexport async function pruneRecoveryRetention(\n  plan: RecoveryRetentionPlan,\n): Promise<RecoveryPruneResult> {\n  retentionPolicy(plan.policy);\n  invariant(plan.complete, \"Cannot prune an incomplete retention plan\");\n  const removed: string[] = [];\n  const retained: RecoveryRetainedEntry[] = [];\n  for (const candidate of plan.entries.filter((entry) => entry.eligible)) {\n    const fresh = await planRecoveryRetention({\n      repository: plan.repository,\n      policy: plan.policy,\n    });\n    const entry = fresh.entries.find((value) => value.path === candidate.path);\n    if (\n      !entry?.eligible ||\n      entry.head !== candidate.head ||\n      entry.branch !== candidate.branch ||\n      entry.bytes !== candidate.bytes ||\n      entry.modifiedAt !== candidate.modifiedAt\n    ) {\n      retained.push({ path: candidate.path, reason: \"PLAN_CHANGED\" });\n      continue;\n    }\n    try {\n      if (entry.category === \"workspaces\" && entry.branch) {\n        const release = await lock(plan.repository, entry.branch);\n        try {\n          const status = await git(entry.path, [\n            \"status\",\n            \"--porcelain=v1\",\n            \"--ignored\",\n            \"--untracked-files=all\",\n          ]);\n          invariant(!status.length, \"Workspace changed before pruning\");\n          invariant(\n            (await git(entry.path, [\"rev-parse\", \"HEAD\"])).trim() ===\n              entry.head,\n            \"Workspace HEAD changed before pruning\",\n          );\n          invariant(\n            (\n              await git(entry.path, [\"symbolic-ref\", \"--short\", \"HEAD\"])\n            ).trim() === entry.branch,\n            \"Workspace branch changed before pruning\",\n          );\n          await git(plan.repository, [\"worktree\", \"remove\", entry.path]);\n        } finally {\n          await release();\n        }\n      } else {\n        const release = await lock(plan.repository, `journal:${entry.path}`);\n        try {\n          invariant(\n            entry.category === \"logs\" && (await closedJournal(entry.path)),\n            \"Journal changed before pruning\",\n          );\n          await rm(entry.path);\n          await rm(`${entry.path}.closed.json`);\n        } finally {\n          await release();\n        }\n      }\n      removed.push(entry.path);\n    } catch {\n      retained.push({\n        path: candidate.path,\n        reason: \"REVALIDATION_OR_REMOVAL_FAILED\",\n      });\n    }\n  }\n  return {\n    removed,\n    retained,\n    after: await planRecoveryRetention({\n      repository: plan.repository,\n      policy: plan.policy,\n    }),\n  };\n}\n\nexport async function assertRecoveryQuota(\n  options: RecoveryQuotaOptions,\n): Promise<void> {\n  invariant(\n    Number.isSafeInteger(options.maxBytes) && options.maxBytes >= 0,\n    \"maxBytes must be a nonnegative integer\",\n  );\n  const reserve = options.reserveBytes ?? 0;\n  invariant(\n    Number.isSafeInteger(reserve) && reserve >= 0,\n    \"reserveBytes must be a nonnegative integer\",\n  );\n  const inspection = await inspectRecovery(options);\n  if (\n    !inspection.complete ||\n    inspection.usage.bytes + reserve > options.maxBytes\n  )\n    throw new OutpostError(\n      \"workspace\",\n      \"Outpost storage quota admission refused\",\n      {\n        usageBytes: inspection.usage.bytes,\n        reserveBytes: reserve,\n        maxBytes: options.maxBytes,\n        complete: inspection.complete,\n      },\n    );\n}\n"]}

package/dist/application/recovery-retention.types.d.ts

@@ -0,0 +1,52 @@
+import type { RecoveryInspection } from "./recovery-inspection.types.ts";
+export interface RecoveryRetentionPolicy {
+    readonly version: 1;
+    readonly scopes: readonly ("clean-workspaces" | "closed-logs")[];
+    readonly minAgeMs: number;
+    readonly maxBytes?: number;
+    readonly maxWorkspaces?: number;
+}
+export interface RecoveryRetentionOptions {
+    readonly repository?: string;
+    readonly policy: RecoveryRetentionPolicy;
+    readonly maxEntries?: number;
+}
+export interface RecoveryRetentionEntry {
+    readonly path: string;
+    readonly category: string;
+    readonly bytes: number;
+    readonly eligible: boolean;
+    readonly reason: string;
+    readonly branch?: string;
+    readonly head?: string;
+    readonly modifiedAt?: string;
+}
+export interface RecoveryRetentionPlan {
+    readonly repository: string;
+    readonly policy: RecoveryRetentionPolicy;
+    readonly inspectedAt: string;
+    readonly inspection: RecoveryInspection;
+    readonly entries: readonly RecoveryRetentionEntry[];
+    readonly complete: boolean;
+    readonly usageBytes: number;
+    readonly projectedBytes: number;
+    readonly quota: "within" | "exceeded" | "unknown";
+}
+export interface RecoveryRetainedEntry {
+    readonly path: string;
+    readonly reason: string;
+}
+export interface RecoveryPruneResult {
+    readonly removed: readonly string[];
+    readonly retained: readonly {
+        readonly path: string;
+        readonly reason: string;
+    }[];
+    readonly after: RecoveryRetentionPlan;
+}
+export interface RecoveryQuotaOptions {
+    readonly repository?: string;
+    readonly maxBytes: number;
+    readonly reserveBytes?: number;
+    readonly maxEntries?: number;
+}

package/dist/application/recovery-retention.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=recovery-retention.types.js.map

package/dist/application/recovery-retention.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-retention.types.js","sourceRoot":"","sources":["../../src/application/recovery-retention.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { RecoveryInspection } from \"./recovery-inspection.types.ts\";\nexport interface RecoveryRetentionPolicy {\n  readonly version: 1;\n  readonly scopes: readonly (\"clean-workspaces\" | \"closed-logs\")[];\n  readonly minAgeMs: number;\n  readonly maxBytes?: number;\n  readonly maxWorkspaces?: number;\n}\nexport interface RecoveryRetentionOptions {\n  readonly repository?: string;\n  readonly policy: RecoveryRetentionPolicy;\n  readonly maxEntries?: number;\n}\nexport interface RecoveryRetentionEntry {\n  readonly path: string;\n  readonly category: string;\n  readonly bytes: number;\n  readonly eligible: boolean;\n  readonly reason: string;\n  readonly branch?: string;\n  readonly head?: string;\n  readonly modifiedAt?: string;\n}\nexport interface RecoveryRetentionPlan {\n  readonly repository: string;\n  readonly policy: RecoveryRetentionPolicy;\n  readonly inspectedAt: string;\n  readonly inspection: RecoveryInspection;\n  readonly entries: readonly RecoveryRetentionEntry[];\n  readonly complete: boolean;\n  readonly usageBytes: number;\n  readonly projectedBytes: number;\n  readonly quota: \"within\" | \"exceeded\" | \"unknown\";\n}\nexport interface RecoveryRetainedEntry {\n  readonly path: string;\n  readonly reason: string;\n}\nexport interface RecoveryPruneResult {\n  readonly removed: readonly string[];\n  readonly retained: readonly {\n    readonly path: string;\n    readonly reason: string;\n  }[];\n  readonly after: RecoveryRetentionPlan;\n}\nexport interface RecoveryQuotaOptions {\n  readonly repository?: string;\n  readonly maxBytes: number;\n  readonly reserveBytes?: number;\n  readonly maxEntries?: number;\n}\n"]}

package/dist/application/recovery-verification.constants.d.ts

@@ -0,0 +1,5 @@
+export declare const recoveryVerificationDefaults: {
+    readonly maxStateBytes: 65536;
+    readonly maxPaths: 1000;
+};
+export declare const recoveryTransferPatches: readonly ["remote.patch", "previous.patch", "previous-index.patch"];

package/dist/application/recovery-verification.constants.js

@@ -0,0 +1,10 @@
+export const recoveryVerificationDefaults = {
+    maxStateBytes: 65_536,
+    maxPaths: 1000,
+};
+export const recoveryTransferPatches = [
+    "remote.patch",
+    "previous.patch",
+    "previous-index.patch",
+];
+//# sourceMappingURL=recovery-verification.constants.js.map

package/dist/application/recovery-verification.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-verification.constants.js","sourceRoot":"","sources":["../../src/application/recovery-verification.constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,aAAa,EAAE,MAAM;IACrB,QAAQ,EAAE,IAAI;CACN,CAAC;AAEX,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,cAAc;IACd,gBAAgB;IAChB,sBAAsB;CACd,CAAC","sourcesContent":["export const recoveryVerificationDefaults = {\n  maxStateBytes: 65_536,\n  maxPaths: 1000,\n} as const;\n\nexport const recoveryTransferPatches = [\n  \"remote.patch\",\n  \"previous.patch\",\n  \"previous-index.patch\",\n] as const;\n"]}

package/dist/application/recovery-verification.d.ts

@@ -0,0 +1,2 @@
+import type { RecoveryVerification, RecoveryVerificationOptions } from "./recovery-verification.types.ts";
+export declare function verifyRecoveryTransfer(path: string, options?: RecoveryVerificationOptions): Promise<RecoveryVerification>;

package/dist/application/recovery-verification.js

@@ -0,0 +1,107 @@
+import { verifyRecoveryRestorability } from "./recovery-restorability.js";
+import { verifyRecoveryChecksums } from "./recovery-checksums.js";
+import { invariant, positive } from "../domain/errors.js";
+import { lstat } from "node:fs/promises";
+import { isAbsolute, join, win32 } from "node:path";
+import { directory, safeDestination } from "../infrastructure/files.js";
+import { readInspectionFile } from "../infrastructure/inspection-file.js";
+import { recoveryTransferPatches, recoveryVerificationDefaults, } from "./recovery-verification.constants.js";
+function paths(value) {
+    if (!Array.isArray(value) ||
+        value.length > recoveryVerificationDefaults.maxPaths)
+        return false;
+    return (value.every((path) => typeof path === "string" &&
+        path.length > 0 &&
+        !path.includes("\0") &&
+        !isAbsolute(path) &&
+        !win32.parse(path).root &&
+        !path
+            .split(/[\\/]/)
+            .some((part) => !part ||
+            part === "." ||
+            part === ".." ||
+            part.toLowerCase() === ".git")) && new Set(value).size === value.length);
+}
+function transferState(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    if (!("previous" in value) ||
+        !("next" in value) ||
+        !("previousExtras" in value) ||
+        !("incoming" in value))
+        return false;
+    return (typeof value.previous === "string" &&
+        /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(value.previous) &&
+        typeof value.next === "string" &&
+        /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(value.next) &&
+        value.next.length === value.previous.length &&
+        paths(value.previousExtras) &&
+        paths(value.incoming));
+}
+async function checkFile(root, name, allowSymlink = false) {
+    try {
+        const path = await safeDestination(root, name);
+        const info = await lstat(path);
+        if (allowSymlink && info.isSymbolicLink())
+            return { path, status: "pass", code: "SYMLINK_PRESENT" };
+        if (info.isFile())
+            return { path, status: "pass", code: "FILE_PRESENT" };
+        return { path, status: "fail", code: "UNEXPECTED_TYPE" };
+    }
+    catch {
+        return { path: join(root, name), status: "fail", code: "FILE_UNAVAILABLE" };
+    }
+}
+export async function verifyRecoveryTransfer(path, options = {}) {
+    invariant(!options.restorability || !!options.repository, "Restorability verification requires a repository");
+    if (options.maxBytes !== undefined)
+        positive(options.maxBytes, "maxBytes");
+    const root = await directory(path);
+    const checks = [];
+    const report = () => ({
+        directory: root,
+        scope: options.restorability
+            ? "transfer-restorability"
+            : "transfer-structure",
+        complete: checks.every((check) => check.status === "pass"),
+        integrity: "unverified",
+        checks,
+    });
+    const statePath = join(root, "state.json");
+    let state;
+    try {
+        state = JSON.parse((await readInspectionFile(statePath, recoveryVerificationDefaults.maxStateBytes)).toString("utf8"));
+    }
+    catch {
+        checks.push({ path: statePath, status: "fail", code: "STATE_UNAVAILABLE" });
+        return report();
+    }
+    if (!transferState(state)) {
+        checks.push({ path: statePath, status: "fail", code: "INVALID_STATE" });
+        return report();
+    }
+    checks.push({
+        path: statePath,
+        status: "pass",
+        code: "STATE_STRUCTURE_VALID",
+    });
+    for (const name of recoveryTransferPatches)
+        checks.push(await checkFile(root, name));
+    if (state.previous !== state.next)
+        checks.push(await checkFile(root, "commits.bundle"));
+    for (const name of state.previousExtras)
+        checks.push(await checkFile(root, `previous-files/${name}`, true));
+    for (const name of state.incoming)
+        checks.push(await checkFile(root, `incoming/${name}`, true));
+    if (options.restorability &&
+        options.repository &&
+        checks.every((check) => check.status === "pass"))
+        checks.push(...(await verifyRecoveryRestorability(root, state, options.repository)));
+    if (options.checksums && checks.every((check) => check.status === "pass")) {
+        const checksums = await verifyRecoveryChecksums(root, state, options.maxBytes);
+        checks.push(...checksums.checks);
+        return { ...report(), integrity: checksums.integrity, checksums };
+    }
+    return report();
+}
+//# sourceMappingURL=recovery-verification.js.map

package/dist/application/recovery-verification.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-verification.js","sourceRoot":"","sources":["../../src/application/recovery-verification.ts"],"names":[],"mappings":"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","sourcesContent":["import { verifyRecoveryRestorability } from \"./recovery-restorability.ts\";\nimport { verifyRecoveryChecksums } from \"./recovery-checksums.ts\";\nimport { invariant, positive } from \"../domain/errors.ts\";\nimport { lstat } from \"node:fs/promises\";\nimport { isAbsolute, join, win32 } from \"node:path\";\nimport { directory, safeDestination } from \"../infrastructure/files.ts\";\nimport { readInspectionFile } from \"../infrastructure/inspection-file.ts\";\nimport {\n  recoveryTransferPatches,\n  recoveryVerificationDefaults,\n} from \"./recovery-verification.constants.ts\";\nimport type {\n  RecoveryStructureCheck,\n  RecoveryTransferState,\n  RecoveryVerification,\n  RecoveryVerificationOptions,\n} from \"./recovery-verification.types.ts\";\n\nfunction paths(value: unknown): value is readonly string[] {\n  if (\n    !Array.isArray(value) ||\n    value.length > recoveryVerificationDefaults.maxPaths\n  )\n    return false;\n  return (\n    value.every(\n      (path: unknown) =>\n        typeof path === \"string\" &&\n        path.length > 0 &&\n        !path.includes(\"\\0\") &&\n        !isAbsolute(path) &&\n        !win32.parse(path).root &&\n        !path\n          .split(/[\\\\/]/)\n          .some(\n            (part) =>\n              !part ||\n              part === \".\" ||\n              part === \"..\" ||\n              part.toLowerCase() === \".git\",\n          ),\n    ) && new Set(value).size === value.length\n  );\n}\n\nfunction transferState(value: unknown): value is RecoveryTransferState {\n  if (!value || typeof value !== \"object\") return false;\n  if (\n    !(\"previous\" in value) ||\n    !(\"next\" in value) ||\n    !(\"previousExtras\" in value) ||\n    !(\"incoming\" in value)\n  )\n    return false;\n  return (\n    typeof value.previous === \"string\" &&\n    /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(value.previous) &&\n    typeof value.next === \"string\" &&\n    /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(value.next) &&\n    value.next.length === value.previous.length &&\n    paths(value.previousExtras) &&\n    paths(value.incoming)\n  );\n}\n\nasync function checkFile(\n  root: string,\n  name: string,\n  allowSymlink = false,\n): Promise<RecoveryStructureCheck> {\n  try {\n    const path = await safeDestination(root, name);\n    const info = await lstat(path);\n    if (allowSymlink && info.isSymbolicLink())\n      return { path, status: \"pass\", code: \"SYMLINK_PRESENT\" };\n    if (info.isFile()) return { path, status: \"pass\", code: \"FILE_PRESENT\" };\n    return { path, status: \"fail\", code: \"UNEXPECTED_TYPE\" };\n  } catch {\n    return { path: join(root, name), status: \"fail\", code: \"FILE_UNAVAILABLE\" };\n  }\n}\n\nexport async function verifyRecoveryTransfer(\n  path: string,\n  options: RecoveryVerificationOptions = {},\n): Promise<RecoveryVerification> {\n  invariant(\n    !options.restorability || !!options.repository,\n    \"Restorability verification requires a repository\",\n  );\n  if (options.maxBytes !== undefined) positive(options.maxBytes, \"maxBytes\");\n  const root = await directory(path);\n  const checks: RecoveryStructureCheck[] = [];\n  const report = (): RecoveryVerification => ({\n    directory: root,\n    scope: options.restorability\n      ? \"transfer-restorability\"\n      : \"transfer-structure\",\n    complete: checks.every((check) => check.status === \"pass\"),\n    integrity: \"unverified\",\n    checks,\n  });\n  const statePath = join(root, \"state.json\");\n  let state: unknown;\n  try {\n    state = JSON.parse(\n      (\n        await readInspectionFile(\n          statePath,\n          recoveryVerificationDefaults.maxStateBytes,\n        )\n      ).toString(\"utf8\"),\n    );\n  } catch {\n    checks.push({ path: statePath, status: \"fail\", code: \"STATE_UNAVAILABLE\" });\n    return report();\n  }\n  if (!transferState(state)) {\n    checks.push({ path: statePath, status: \"fail\", code: \"INVALID_STATE\" });\n    return report();\n  }\n  checks.push({\n    path: statePath,\n    status: \"pass\",\n    code: \"STATE_STRUCTURE_VALID\",\n  });\n  for (const name of recoveryTransferPatches)\n    checks.push(await checkFile(root, name));\n  if (state.previous !== state.next)\n    checks.push(await checkFile(root, \"commits.bundle\"));\n  for (const name of state.previousExtras)\n    checks.push(await checkFile(root, `previous-files/${name}`, true));\n  for (const name of state.incoming)\n    checks.push(await checkFile(root, `incoming/${name}`, true));\n  if (\n    options.restorability &&\n    options.repository &&\n    checks.every((check) => check.status === \"pass\")\n  )\n    checks.push(\n      ...(await verifyRecoveryRestorability(root, state, options.repository)),\n    );\n  if (options.checksums && checks.every((check) => check.status === \"pass\")) {\n    const checksums = await verifyRecoveryChecksums(\n      root,\n      state,\n      options.maxBytes,\n    );\n    checks.push(...checksums.checks);\n    return { ...report(), integrity: checksums.integrity, checksums };\n  }\n  return report();\n}\n"]}

package/dist/application/recovery-verification.types.d.ts

@@ -0,0 +1,26 @@
+import type { RecoveryChecksumResult, RecoveryIntegrity } from "./recovery-checksums.types.ts";
+export interface RecoveryTransferState {
+    readonly previous: string;
+    readonly next: string;
+    readonly previousExtras: readonly string[];
+    readonly incoming: readonly string[];
+}
+export interface RecoveryStructureCheck {
+    readonly path: string;
+    readonly status: "pass" | "fail";
+    readonly code: string;
+}
+export interface RecoveryVerification {
+    readonly directory: string;
+    readonly scope: "transfer-structure" | "transfer-restorability";
+    readonly complete: boolean;
+    readonly integrity: RecoveryIntegrity;
+    readonly checksums?: RecoveryChecksumResult;
+    readonly checks: readonly RecoveryStructureCheck[];
+}
+export interface RecoveryVerificationOptions {
+    readonly restorability?: boolean;
+    readonly repository?: string;
+    readonly checksums?: boolean;
+    readonly maxBytes?: number;
+}

package/dist/application/recovery-verification.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=recovery-verification.types.js.map

package/dist/application/recovery-verification.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-verification.types.js","sourceRoot":"","sources":["../../src/application/recovery-verification.types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  RecoveryChecksumResult,\n  RecoveryIntegrity,\n} from \"./recovery-checksums.types.ts\";\nexport interface RecoveryTransferState {\n  readonly previous: string;\n  readonly next: string;\n  readonly previousExtras: readonly string[];\n  readonly incoming: readonly string[];\n}\n\nexport interface RecoveryStructureCheck {\n  readonly path: string;\n  readonly status: \"pass\" | \"fail\";\n  readonly code: string;\n}\n\nexport interface RecoveryVerification {\n  readonly directory: string;\n  readonly scope: \"transfer-structure\" | \"transfer-restorability\";\n  readonly complete: boolean;\n  readonly integrity: RecoveryIntegrity;\n  readonly checksums?: RecoveryChecksumResult;\n  readonly checks: readonly RecoveryStructureCheck[];\n}\n\nexport interface RecoveryVerificationOptions {\n  readonly restorability?: boolean;\n  readonly repository?: string;\n  readonly checksums?: boolean;\n  readonly maxBytes?: number;\n}\n"]}

package/dist/application/remote-apply.js

@@ -1,5 +1,5 @@
-import { cp, mkdir, readFile, rm } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { cp, lstat, mkdir, readFile, rm, rmdir } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
 import { OutpostError } from "../domain/errors.js";
 import { safeDestination } from "../infrastructure/files.js";
 import { git } from "../infrastructure/git/command.js";
@@ -18,10 +18,23 @@ export async function applyChanges(context, changes, backup, synchronized, expec
             previousPatch,
         ]);
     await git(workspace.directory, ["reset", "--mixed", "HEAD"]);
-    for (const file of previousExtras.filter((file) => !protectedFiles.includes(file)))
-        await rm(await safeDestination(workspace.directory, file), {
-            force: true,
-        });
+    for (const file of previousExtras.filter((file) => !protectedFiles.includes(file))) {
+        const target = await safeDestination(workspace.directory, file);
+        await rm(target, { force: true });
+        let parent = dirname(target);
+        while (parent !== resolve(workspace.directory)) {
+            const removed = await rmdir(parent).then(() => true, (error) => {
+                if (error.code === "ENOTEMPTY" ||
+                    error.code === "ENOENT" ||
+                    error.code === "EEXIST")
+                    return false;
+                throw error;
+            });
+            if (!removed)
+                break;
+            parent = dirname(parent);
+        }
+    }
     if (head !== synchronized)
         await git(workspace.directory, ["merge", "--ff-only", "FETCH_HEAD"]);
     if ((await readFile(patch)).length)
@@ -37,9 +50,14 @@ export async function applyChanges(context, changes, backup, synchronized, expec
         ]);
     for (const file of incoming) {
         const target = await safeDestination(workspace.directory, file);
+        if ((await lstat(target).catch(() => undefined))?.isDirectory())
+            await rmdir(target);
         await mkdir(dirname(target), { recursive: true });
         await cp(join(transfer, "incoming", file), target, {
             dereference: false,
+            verbatimSymlinks: true,
+            force: false,
+            errorOnExist: true,
         });
     }
 }

package/dist/application/remote-apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-apply.js","sourceRoot":"","sources":["../../src/application/remote-apply.ts"],"names":[],"mappings":"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","sourcesContent":["import { cp, mkdir, readFile, rm } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport type {\n  HostBackup,\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { digest } from \"./workspace-fingerprint.ts\";\n\nexport async function applyChanges(\n  context: RemoteWorkspaceContext,\n  changes: RemoteChanges,\n  backup: HostBackup,\n  synchronized: string,\n  expected: string,\n  transfer: string,\n): Promise<void> {\n  const {\n    workspace,\n    options,\n    recovery,\n    protectedFiles,\n    initialPatch,\n    initialIndex,\n  } = context;\n  const { head, patch, incoming } = changes;\n  const { previousPatch, previousExtras } = backup;\n  if ((await digest(workspace.directory, recovery)) !== expected)\n    throw new OutpostError(\n      \"conflict\",\n      \"Host workspace changed during synchronization\",\n      { recovery },\n    );\n  if ((await readFile(previousPatch)).length)\n    await git(workspace.directory, [\n      \"apply\",\n      \"--reverse\",\n      \"--binary\",\n      previousPatch,\n    ]);\n  await git(workspace.directory, [\"reset\", \"--mixed\", \"HEAD\"]);\n  for (const file of previousExtras.filter(\n    (file) => !protectedFiles.includes(file),\n  ))\n    await rm(await safeDestination(workspace.directory, file), {\n      force: true,\n    });\n  if (head !== synchronized)\n    await git(workspace.directory, [\"merge\", \"--ff-only\", \"FETCH_HEAD\"]);\n  if ((await readFile(patch)).length)\n    await git(workspace.directory, [\"apply\", \"--binary\", patch]);\n  if (!options.includeUncommitted && (await readFile(initialPatch)).length)\n    await git(workspace.directory, [\"apply\", \"--binary\", initialPatch]);\n  if (!options.includeUncommitted && (await readFile(initialIndex)).length)\n    await git(workspace.directory, [\n      \"apply\",\n      \"--cached\",\n      \"--binary\",\n      initialIndex,\n    ]);\n  for (const file of incoming) {\n    const target = await safeDestination(workspace.directory, file);\n    await mkdir(dirname(target), { recursive: true });\n    await cp(join(transfer, \"incoming\", file), target, {\n      dereference: false,\n    });\n  }\n}\n"]}
+{"version":3,"file":"remote-apply.js","sourceRoot":"","sources":["../../src/application/remote-apply.ts"],"names":[],"mappings":"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","sourcesContent":["import { cp, lstat, mkdir, readFile, rm, rmdir } from \"node:fs/promises\";\nimport { dirname, join, resolve } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport type {\n  HostBackup,\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { digest } from \"./workspace-fingerprint.ts\";\n\nexport async function applyChanges(\n  context: RemoteWorkspaceContext,\n  changes: RemoteChanges,\n  backup: HostBackup,\n  synchronized: string,\n  expected: string,\n  transfer: string,\n): Promise<void> {\n  const {\n    workspace,\n    options,\n    recovery,\n    protectedFiles,\n    initialPatch,\n    initialIndex,\n  } = context;\n  const { head, patch, incoming } = changes;\n  const { previousPatch, previousExtras } = backup;\n  if ((await digest(workspace.directory, recovery)) !== expected)\n    throw new OutpostError(\n      \"conflict\",\n      \"Host workspace changed during synchronization\",\n      { recovery },\n    );\n  if ((await readFile(previousPatch)).length)\n    await git(workspace.directory, [\n      \"apply\",\n      \"--reverse\",\n      \"--binary\",\n      previousPatch,\n    ]);\n  await git(workspace.directory, [\"reset\", \"--mixed\", \"HEAD\"]);\n  for (const file of previousExtras.filter(\n    (file) => !protectedFiles.includes(file),\n  )) {\n    const target = await safeDestination(workspace.directory, file);\n    await rm(target, { force: true });\n    let parent = dirname(target);\n    while (parent !== resolve(workspace.directory)) {\n      const removed = await rmdir(parent).then(\n        () => true,\n        (error: NodeJS.ErrnoException) => {\n          if (\n            error.code === \"ENOTEMPTY\" ||\n            error.code === \"ENOENT\" ||\n            error.code === \"EEXIST\"\n          )\n            return false;\n          throw error;\n        },\n      );\n      if (!removed) break;\n      parent = dirname(parent);\n    }\n  }\n  if (head !== synchronized)\n    await git(workspace.directory, [\"merge\", \"--ff-only\", \"FETCH_HEAD\"]);\n  if ((await readFile(patch)).length)\n    await git(workspace.directory, [\"apply\", \"--binary\", patch]);\n  if (!options.includeUncommitted && (await readFile(initialPatch)).length)\n    await git(workspace.directory, [\"apply\", \"--binary\", initialPatch]);\n  if (!options.includeUncommitted && (await readFile(initialIndex)).length)\n    await git(workspace.directory, [\n      \"apply\",\n      \"--cached\",\n      \"--binary\",\n      initialIndex,\n    ]);\n  for (const file of incoming) {\n    const target = await safeDestination(workspace.directory, file);\n    if ((await lstat(target).catch(() => undefined))?.isDirectory())\n      await rmdir(target);\n    await mkdir(dirname(target), { recursive: true });\n    await cp(join(transfer, \"incoming\", file), target, {\n      dereference: false,\n      verbatimSymlinks: true,\n      force: false,\n      errorOnExist: true,\n    });\n  }\n}\n"]}

package/dist/application/remote-backup.js

@@ -1,3 +1,4 @@
+import { captureRecoveryChecksums } from "./recovery-checksum-capture.js";
 import { cp, mkdir, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { safeDestination } from "../infrastructure/files.js";
@@ -25,14 +26,17 @@ export async function backupHost(context, changes, synchronized, transfer) {
         await mkdir(dirname(backup), { recursive: true });
         await cp(await safeDestination(workspace.directory, file), backup, {
             dereference: false,
+            verbatimSymlinks: true,
         });
     }
-    await writeFile(join(transfer, "state.json"), JSON.stringify({
+    const state = {
         previous: synchronized,
         next: head,
         previousExtras,
         incoming,
-    }));
+    };
+    await writeFile(join(transfer, "state.json"), JSON.stringify(state));
+    await captureRecoveryChecksums(transfer, state);
     return { previousPatch, previousExtras };
 }
 //# sourceMappingURL=remote-backup.js.map

package/dist/application/remote-backup.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-backup.js","sourceRoot":"","sources":["../../src/application/remote-backup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAMvD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAA+B,EAC/B,OAAsB,EACtB,YAAoB,EACpB,QAAgB;IAEhB,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACvD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;QAC7B,MAAM;QACN,UAAU;QACV,MAAM;QACN,YAAY,aAAa,EAAE;KAC5B,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;QAC7B,MAAM;QACN,UAAU;QACV,UAAU;QACV,YAAY,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,EAAE;KACrD,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,eAAe,CAClC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAChC,IAAI,CACL,CAAC;QACF,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,EAAE,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE;YACjE,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,SAAS,CACb,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,EAC5B,IAAI,CAAC,SAAS,CAAC;QACb,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,IAAI;QACV,cAAc;QACd,QAAQ;KACT,CAAC,CACH,CAAC;IAEF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AAC3C,CAAC","sourcesContent":["import { cp, mkdir, writeFile } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport type {\n  HostBackup,\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { extras } from \"./workspace-fingerprint.ts\";\n\nexport async function backupHost(\n  context: RemoteWorkspaceContext,\n  changes: RemoteChanges,\n  synchronized: string,\n  transfer: string,\n): Promise<HostBackup> {\n  const { workspace } = context;\n  const { head, incoming } = changes;\n  const previousPatch = join(transfer, \"previous.patch\");\n  await git(workspace.directory, [\n    \"diff\",\n    \"--binary\",\n    \"HEAD\",\n    `--output=${previousPatch}`,\n  ]);\n  await git(workspace.directory, [\n    \"diff\",\n    \"--cached\",\n    \"--binary\",\n    `--output=${join(transfer, \"previous-index.patch\")}`,\n  ]);\n  const previousExtras = await extras(workspace.directory);\n  for (const file of previousExtras) {\n    const backup = await safeDestination(\n      join(transfer, \"previous-files\"),\n      file,\n    );\n    await mkdir(dirname(backup), { recursive: true });\n    await cp(await safeDestination(workspace.directory, file), backup, {\n      dereference: false,\n    });\n  }\n  await writeFile(\n    join(transfer, \"state.json\"),\n    JSON.stringify({\n      previous: synchronized,\n      next: head,\n      previousExtras,\n      incoming,\n    }),\n  );\n\n  return { previousPatch, previousExtras };\n}\n"]}
+{"version":3,"file":"remote-backup.js","sourceRoot":"","sources":["../../src/application/remote-backup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAMvD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAA+B,EAC/B,OAAsB,EACtB,YAAoB,EACpB,QAAgB;IAEhB,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACvD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;QAC7B,MAAM;QACN,UAAU;QACV,MAAM;QACN,YAAY,aAAa,EAAE;KAC5B,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;QAC7B,MAAM;QACN,UAAU;QACV,UAAU;QACV,YAAY,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,EAAE;KACrD,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,eAAe,CAClC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAChC,IAAI,CACL,CAAC;QACF,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,EAAE,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE;YACjE,WAAW,EAAE,KAAK;YAClB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,IAAI;QACV,cAAc;QACd,QAAQ;KACT,CAAC;IACF,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,MAAM,wBAAwB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAEhD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AAC3C,CAAC","sourcesContent":["import { captureRecoveryChecksums } from \"./recovery-checksum-capture.ts\";\nimport { cp, mkdir, writeFile } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport type {\n  HostBackup,\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { extras } from \"./workspace-fingerprint.ts\";\n\nexport async function backupHost(\n  context: RemoteWorkspaceContext,\n  changes: RemoteChanges,\n  synchronized: string,\n  transfer: string,\n): Promise<HostBackup> {\n  const { workspace } = context;\n  const { head, incoming } = changes;\n  const previousPatch = join(transfer, \"previous.patch\");\n  await git(workspace.directory, [\n    \"diff\",\n    \"--binary\",\n    \"HEAD\",\n    `--output=${previousPatch}`,\n  ]);\n  await git(workspace.directory, [\n    \"diff\",\n    \"--cached\",\n    \"--binary\",\n    `--output=${join(transfer, \"previous-index.patch\")}`,\n  ]);\n  const previousExtras = await extras(workspace.directory);\n  for (const file of previousExtras) {\n    const backup = await safeDestination(\n      join(transfer, \"previous-files\"),\n      file,\n    );\n    await mkdir(dirname(backup), { recursive: true });\n    await cp(await safeDestination(workspace.directory, file), backup, {\n      dereference: false,\n      verbatimSymlinks: true,\n    });\n  }\n  const state = {\n    previous: synchronized,\n    next: head,\n    previousExtras,\n    incoming,\n  };\n  await writeFile(join(transfer, \"state.json\"), JSON.stringify(state));\n  await captureRecoveryChecksums(transfer, state);\n\n  return { previousPatch, previousExtras };\n}\n"]}