@elie-laloum/outpost 3.0.0 → 4.0.0

package/dist/application/recovery-restore.js

@@ -0,0 +1,161 @@
+import { createHash } from "node:crypto";
+import { cp, lstat, mkdir } from "node:fs/promises";
+import { basename, dirname, join, resolve } from "node:path";
+import { invariant, OutpostError } from "../domain/errors.js";
+import { directory, inside, safeDestination } from "../infrastructure/files.js";
+import { verificationGit as git } from "../infrastructure/git/verification-command.js";
+import { verifyRecoveryRestorability } from "./recovery-restorability.js";
+import { snapshotRecoveryTransfer } from "./recovery-restore-snapshot.js";
+function planFingerprint(plan) {
+    return createHash("sha256")
+        .update(JSON.stringify([
+        plan.directory,
+        plan.repository,
+        plan.destination,
+        plan.side,
+        plan.maxBytes ?? null,
+        plan.manifestSha256,
+        plan.commit,
+        plan.payloads,
+        plan.staging,
+    ]))
+        .digest("hex");
+}
+async function absent(path) {
+    const present = await lstat(path).then(() => true, (error) => {
+        if (error &&
+            typeof error === "object" &&
+            "code" in error &&
+            error.code === "ENOENT")
+            return false;
+        throw error;
+    });
+    invariant(!present, "Recovery destination already exists");
+}
+async function locations(options) {
+    invariant(options.side === "previous" || options.side === "incoming", "Recovery side must be previous or incoming");
+    const repository = await directory(options.repository);
+    const transfer = await directory(options.directory);
+    const destination = join(await directory(dirname(resolve(options.destination))), basename(resolve(options.destination)));
+    const common = await directory((await git(repository, [
+        "rev-parse",
+        "--path-format=absolute",
+        "--git-common-dir",
+    ])).trim());
+    invariant(!inside(repository, destination) &&
+        !inside(transfer, destination) &&
+        !inside(common, destination), "Recovery destination must be outside the source repository, Git metadata and transfer");
+    await absent(destination);
+    return { repository, directory: transfer, destination };
+}
+export async function planRecoveryRestore(options) {
+    const paths = await locations(options);
+    const snapshot = await snapshotRecoveryTransfer(paths.directory, options.maxBytes);
+    try {
+        const checks = await verifyRecoveryRestorability(snapshot.directory, snapshot.state, paths.repository);
+        invariant(checks.every((check) => check.status === "pass"), "Recovery Git restorability verification failed");
+        const plan = {
+            ...options,
+            ...paths,
+            manifestSha256: snapshot.manifestSha256,
+            commit: options.side === "previous"
+                ? snapshot.state.previous
+                : snapshot.state.next,
+            payloads: options.side === "previous"
+                ? snapshot.state.previousExtras
+                : snapshot.state.incoming,
+            staging: options.side === "previous"
+                ? "preserved"
+                : "unavailable",
+        };
+        return { ...plan, fingerprint: planFingerprint(plan) };
+    }
+    finally {
+        await snapshot.dispose();
+    }
+}
+async function applyPatch(checkout, patch, cached = false) {
+    if (!(await lstat(patch)).size)
+        return;
+    await git(checkout, [
+        "apply",
+        "--binary",
+        ...(cached ? ["--cached"] : []),
+        patch,
+    ]);
+}
+export async function restoreRecoveryTransfer(plan) {
+    invariant(plan.fingerprint === planFingerprint(plan), "Recovery plan changed after planning");
+    const paths = await locations(plan);
+    invariant(paths.repository === plan.repository &&
+        paths.directory === plan.directory &&
+        paths.destination === plan.destination, "Recovery plan paths changed after planning");
+    const snapshot = await snapshotRecoveryTransfer(paths.directory, plan.maxBytes);
+    let owned = false;
+    try {
+        invariant(snapshot.manifestSha256 === plan.manifestSha256, "Recovery transfer changed since planning");
+        const commit = plan.side === "previous" ? snapshot.state.previous : snapshot.state.next;
+        invariant(commit === plan.commit, "Recovery plan commit changed");
+        const checks = await verifyRecoveryRestorability(snapshot.directory, snapshot.state, paths.repository);
+        invariant(checks.every((check) => check.status === "pass"), "Recovery Git restorability verification failed");
+        await mkdir(paths.destination, { mode: 0o700 });
+        owned = true;
+        await git(dirname(paths.destination), [
+            "clone",
+            "--local",
+            "--no-hardlinks",
+            "--no-checkout",
+            "--",
+            paths.repository,
+            paths.destination,
+        ]);
+        await git(paths.destination, ["remote", "remove", "origin"]);
+        if (snapshot.state.previous !== snapshot.state.next) {
+            await git(paths.destination, [
+                "bundle",
+                "verify",
+                join(snapshot.directory, "commits.bundle"),
+            ]);
+            await git(paths.destination, [
+                "bundle",
+                "unbundle",
+                join(snapshot.directory, "commits.bundle"),
+            ]);
+        }
+        await git(paths.destination, ["checkout", "--detach", commit]);
+        await applyPatch(paths.destination, join(snapshot.directory, plan.side === "previous" ? "previous.patch" : "remote.patch"));
+        if (plan.side === "previous")
+            await applyPatch(paths.destination, join(snapshot.directory, "previous-index.patch"), true);
+        const entries = plan.side === "previous"
+            ? snapshot.state.previousExtras
+            : snapshot.state.incoming;
+        const prefix = plan.side === "previous" ? "previous-files" : "incoming";
+        for (const entry of entries) {
+            const to = await safeDestination(paths.destination, entry);
+            await absent(to);
+            await mkdir(dirname(to), { recursive: true, mode: 0o700 });
+            await cp(await safeDestination(snapshot.directory, `${prefix}/${entry}`), to, {
+                dereference: false,
+                verbatimSymlinks: true,
+                force: false,
+                errorOnExist: true,
+            });
+        }
+        return {
+            directory: paths.destination,
+            commit,
+            side: plan.side,
+            staging: plan.side === "previous" ? "preserved" : "unavailable",
+            sourceRetained: true,
+        };
+    }
+    catch (cause) {
+        if (!owned)
+            throw cause;
+        throw new OutpostError("workspace", "Recovery restoration failed; source and partial destination retained", { destination: paths.destination, transfer: paths.directory }, cause);
+    }
+    finally {
+        await snapshot.dispose();
+    }
+}
+//# sourceMappingURL=recovery-restore.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-restore.js","sourceRoot":"","sources":["../../src/application/recovery-restore.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport { cp, lstat, mkdir } from \"node:fs/promises\";\nimport { basename, dirname, join, resolve } from \"node:path\";\nimport { invariant, OutpostError } from \"../domain/errors.ts\";\nimport { directory, inside, safeDestination } from \"../infrastructure/files.ts\";\nimport { verificationGit as git } from \"../infrastructure/git/verification-command.ts\";\nimport { verifyRecoveryRestorability } from \"./recovery-restorability.ts\";\nimport { snapshotRecoveryTransfer } from \"./recovery-restore-snapshot.ts\";\nimport type {\n  RecoveryRestoreOptions,\n  RecoveryRestorePlan,\n  RecoveryRestoreResult,\n} from \"./recovery-restore.types.ts\";\n\nfunction planFingerprint(\n  plan: Omit<RecoveryRestorePlan, \"fingerprint\">,\n): string {\n  return createHash(\"sha256\")\n    .update(\n      JSON.stringify([\n        plan.directory,\n        plan.repository,\n        plan.destination,\n        plan.side,\n        plan.maxBytes ?? null,\n        plan.manifestSha256,\n        plan.commit,\n        plan.payloads,\n        plan.staging,\n      ]),\n    )\n    .digest(\"hex\");\n}\n\nasync function absent(path: string): Promise<void> {\n  const present = await lstat(path).then(\n    () => true,\n    (error: unknown) => {\n      if (\n        error &&\n        typeof error === \"object\" &&\n        \"code\" in error &&\n        error.code === \"ENOENT\"\n      )\n        return false;\n      throw error;\n    },\n  );\n  invariant(!present, \"Recovery destination already exists\");\n}\n\nasync function locations(options: RecoveryRestoreOptions) {\n  invariant(\n    options.side === \"previous\" || options.side === \"incoming\",\n    \"Recovery side must be previous or incoming\",\n  );\n  const repository = await directory(options.repository);\n  const transfer = await directory(options.directory);\n  const destination = join(\n    await directory(dirname(resolve(options.destination))),\n    basename(resolve(options.destination)),\n  );\n  const common = await directory(\n    (\n      await git(repository, [\n        \"rev-parse\",\n        \"--path-format=absolute\",\n        \"--git-common-dir\",\n      ])\n    ).trim(),\n  );\n  invariant(\n    !inside(repository, destination) &&\n      !inside(transfer, destination) &&\n      !inside(common, destination),\n    \"Recovery destination must be outside the source repository, Git metadata and transfer\",\n  );\n  await absent(destination);\n  return { repository, directory: transfer, destination };\n}\n\nexport async function planRecoveryRestore(\n  options: RecoveryRestoreOptions,\n): Promise<RecoveryRestorePlan> {\n  const paths = await locations(options);\n  const snapshot = await snapshotRecoveryTransfer(\n    paths.directory,\n    options.maxBytes,\n  );\n  try {\n    const checks = await verifyRecoveryRestorability(\n      snapshot.directory,\n      snapshot.state,\n      paths.repository,\n    );\n    invariant(\n      checks.every((check) => check.status === \"pass\"),\n      \"Recovery Git restorability verification failed\",\n    );\n    const plan = {\n      ...options,\n      ...paths,\n      manifestSha256: snapshot.manifestSha256,\n      commit:\n        options.side === \"previous\"\n          ? snapshot.state.previous\n          : snapshot.state.next,\n      payloads:\n        options.side === \"previous\"\n          ? snapshot.state.previousExtras\n          : snapshot.state.incoming,\n      staging:\n        options.side === \"previous\"\n          ? (\"preserved\" as const)\n          : (\"unavailable\" as const),\n    };\n    return { ...plan, fingerprint: planFingerprint(plan) };\n  } finally {\n    await snapshot.dispose();\n  }\n}\n\nasync function applyPatch(\n  checkout: string,\n  patch: string,\n  cached = false,\n): Promise<void> {\n  if (!(await lstat(patch)).size) return;\n  await git(checkout, [\n    \"apply\",\n    \"--binary\",\n    ...(cached ? [\"--cached\"] : []),\n    patch,\n  ]);\n}\n\nexport async function restoreRecoveryTransfer(\n  plan: RecoveryRestorePlan,\n): Promise<RecoveryRestoreResult> {\n  invariant(\n    plan.fingerprint === planFingerprint(plan),\n    \"Recovery plan changed after planning\",\n  );\n  const paths = await locations(plan);\n  invariant(\n    paths.repository === plan.repository &&\n      paths.directory === plan.directory &&\n      paths.destination === plan.destination,\n    \"Recovery plan paths changed after planning\",\n  );\n  const snapshot = await snapshotRecoveryTransfer(\n    paths.directory,\n    plan.maxBytes,\n  );\n  let owned = false;\n  try {\n    invariant(\n      snapshot.manifestSha256 === plan.manifestSha256,\n      \"Recovery transfer changed since planning\",\n    );\n    const commit =\n      plan.side === \"previous\" ? snapshot.state.previous : snapshot.state.next;\n    invariant(commit === plan.commit, \"Recovery plan commit changed\");\n    const checks = await verifyRecoveryRestorability(\n      snapshot.directory,\n      snapshot.state,\n      paths.repository,\n    );\n    invariant(\n      checks.every((check) => check.status === \"pass\"),\n      \"Recovery Git restorability verification failed\",\n    );\n    await mkdir(paths.destination, { mode: 0o700 });\n    owned = true;\n    await git(dirname(paths.destination), [\n      \"clone\",\n      \"--local\",\n      \"--no-hardlinks\",\n      \"--no-checkout\",\n      \"--\",\n      paths.repository,\n      paths.destination,\n    ]);\n    await git(paths.destination, [\"remote\", \"remove\", \"origin\"]);\n    if (snapshot.state.previous !== snapshot.state.next) {\n      await git(paths.destination, [\n        \"bundle\",\n        \"verify\",\n        join(snapshot.directory, \"commits.bundle\"),\n      ]);\n      await git(paths.destination, [\n        \"bundle\",\n        \"unbundle\",\n        join(snapshot.directory, \"commits.bundle\"),\n      ]);\n    }\n    await git(paths.destination, [\"checkout\", \"--detach\", commit]);\n    await applyPatch(\n      paths.destination,\n      join(\n        snapshot.directory,\n        plan.side === \"previous\" ? \"previous.patch\" : \"remote.patch\",\n      ),\n    );\n    if (plan.side === \"previous\")\n      await applyPatch(\n        paths.destination,\n        join(snapshot.directory, \"previous-index.patch\"),\n        true,\n      );\n    const entries =\n      plan.side === \"previous\"\n        ? snapshot.state.previousExtras\n        : snapshot.state.incoming;\n    const prefix = plan.side === \"previous\" ? \"previous-files\" : \"incoming\";\n    for (const entry of entries) {\n      const to = await safeDestination(paths.destination, entry);\n      await absent(to);\n      await mkdir(dirname(to), { recursive: true, mode: 0o700 });\n      await cp(\n        await safeDestination(snapshot.directory, `${prefix}/${entry}`),\n        to,\n        {\n          dereference: false,\n          verbatimSymlinks: true,\n          force: false,\n          errorOnExist: true,\n        },\n      );\n    }\n    return {\n      directory: paths.destination,\n      commit,\n      side: plan.side,\n      staging: plan.side === \"previous\" ? \"preserved\" : \"unavailable\",\n      sourceRetained: true,\n    };\n  } catch (cause) {\n    if (!owned) throw cause;\n    throw new OutpostError(\n      \"workspace\",\n      \"Recovery restoration failed; source and partial destination retained\",\n      { destination: paths.destination, transfer: paths.directory },\n      cause,\n    );\n  } finally {\n    await snapshot.dispose();\n  }\n}\n"]}

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

@@ -0,0 +1,28 @@
+import type { RecoveryTransferState } from "./recovery-verification.types.ts";
+export interface RecoveryRestoreOptions {
+    readonly directory: string;
+    readonly repository: string;
+    readonly destination: string;
+    readonly side: "previous" | "incoming";
+    readonly maxBytes?: number;
+}
+export interface RecoveryRestorePlan extends RecoveryRestoreOptions {
+    readonly fingerprint: string;
+    readonly manifestSha256: string;
+    readonly commit: string;
+    readonly payloads: readonly string[];
+    readonly staging: "preserved" | "unavailable";
+}
+export interface RecoveryRestoreResult {
+    readonly directory: string;
+    readonly commit: string;
+    readonly side: "previous" | "incoming";
+    readonly staging: "preserved" | "unavailable";
+    readonly sourceRetained: true;
+}
+export interface RecoveryRestoreSnapshot {
+    readonly directory: string;
+    readonly state: RecoveryTransferState;
+    readonly manifestSha256: string;
+    dispose(): Promise<void>;
+}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"recovery-restore.types.js","sourceRoot":"","sources":["../../src/application/recovery-restore.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { RecoveryTransferState } from \"./recovery-verification.types.ts\";\n\nexport interface RecoveryRestoreOptions {\n  readonly directory: string;\n  readonly repository: string;\n  readonly destination: string;\n  readonly side: \"previous\" | \"incoming\";\n  readonly maxBytes?: number;\n}\n\nexport interface RecoveryRestorePlan extends RecoveryRestoreOptions {\n  readonly fingerprint: string;\n  readonly manifestSha256: string;\n  readonly commit: string;\n  readonly payloads: readonly string[];\n  readonly staging: \"preserved\" | \"unavailable\";\n}\n\nexport interface RecoveryRestoreResult {\n  readonly directory: string;\n  readonly commit: string;\n  readonly side: \"previous\" | \"incoming\";\n  readonly staging: \"preserved\" | \"unavailable\";\n  readonly sourceRetained: true;\n}\n\nexport interface RecoveryRestoreSnapshot {\n  readonly directory: string;\n  readonly state: RecoveryTransferState;\n  readonly manifestSha256: string;\n  dispose(): Promise<void>;\n}\n"]}

package/dist/application/recovery-retention.js

@@ -6,6 +6,10 @@ 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) {
+    if (inspection.resources?.complete === false)
+        return "RESOURCE_ACTIVITY_UNKNOWN";
+    if (inspection.resources?.entries.some((resource) => resource.record?.workspace === entry.path))
+        return "RESOURCE_ACTIVITY_RECORDED";
     const workspace = inspection.git?.workspaces.find((value) => value.path === entry.path);
     if (!workspace || workspace.state !== "registered")
         return "WORKSPACE_UNREGISTERED_OR_UNKNOWN";
@@ -49,6 +53,7 @@ export async function planRecoveryRetention(options) {
         ...options,
         git: true,
         locks: true,
+        resources: true,
     });
     const entries = [];
     const inspectedAt = new Date().toISOString();

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

@@ -1 +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"]}
+{"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  if (inspection.resources?.complete === false)\n    return \"RESOURCE_ACTIVITY_UNKNOWN\";\n  if (\n    inspection.resources?.entries.some(\n      (resource) => resource.record?.workspace === entry.path,\n    )\n  )\n    return \"RESOURCE_ACTIVITY_RECORDED\";\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    resources: 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-verification.d.ts

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

package/dist/application/recovery-verification.js

@@ -22,7 +22,7 @@ function paths(value) {
             part === ".." ||
             part.toLowerCase() === ".git")) && new Set(value).size === value.length);
 }
-function transferState(value) {
+export function transferState(value) {
     if (!value || typeof value !== "object")
         return false;
     if (!("previous" in value) ||

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

@@ -1 +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"]}
+{"version":3,"file":"recovery-verification.js","sourceRoot":"","sources":["../../src/application/recovery-verification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EACL,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,sCAAsC,CAAC;AAQ9C,SAAS,KAAK,CAAC,KAAc;IAC3B,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,KAAK,CAAC,MAAM,GAAG,4BAA4B,CAAC,QAAQ;QAEpD,OAAO,KAAK,CAAC;IACf,OAAO,CACL,KAAK,CAAC,KAAK,CACT,CAAC,IAAa,EAAE,EAAE,CAChB,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,CAAC,MAAM,GAAG,CAAC;QACf,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QACpB,CAAC,UAAU,CAAC,IAAI,CAAC;QACjB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI;QACvB,CAAC,IAAI;aACF,KAAK,CAAC,OAAO,CAAC;aACd,IAAI,CACH,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,IAAI;YACL,IAAI,KAAK,GAAG;YACZ,IAAI,KAAK,IAAI;YACb,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAChC,CACN,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,IACE,CAAC,CAAC,UAAU,IAAI,KAAK,CAAC;QACtB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAClB,CAAC,CAAC,gBAAgB,IAAI,KAAK,CAAC;QAC5B,CAAC,CAAC,UAAU,IAAI,KAAK,CAAC;QAEtB,OAAO,KAAK,CAAC;IACf,OAAO,CACL,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAClC,iCAAiC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACtD,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,iCAAiC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,QAAQ,CAAC,MAAM;QAC3C,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC;QAC3B,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CACtB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,IAAY,EACZ,IAAY,EACZ,YAAY,GAAG,KAAK;IAEpB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,YAAY,IAAI,IAAI,CAAC,cAAc,EAAE;YACvC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;QAC3D,IAAI,IAAI,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;QACzE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IAC9E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAY,EACZ,UAAuC,EAAE;IAEzC,SAAS,CACP,CAAC,OAAO,CAAC,aAAa,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAC9C,kDAAkD,CACnD,CAAC;IACF,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;QAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,GAAyB,EAAE,CAAC,CAAC;QAC1C,SAAS,EAAE,IAAI;QACf,KAAK,EAAE,OAAO,CAAC,aAAa;YAC1B,CAAC,CAAC,wBAAwB;YAC1B,CAAC,CAAC,oBAAoB;QACxB,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC;QAC1D,SAAS,EAAE,YAAY;QACvB,MAAM;KACP,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC3C,IAAI,KAAc,CAAC;IACnB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAChB,CACE,MAAM,kBAAkB,CACtB,SAAS,EACT,4BAA4B,CAAC,aAAa,CAC3C,CACF,CAAC,QAAQ,CAAC,MAAM,CAAC,CACnB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC5E,OAAO,MAAM,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QACxE,OAAO,MAAM,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,IAAI,CAAC;QACV,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,uBAAuB;KAC9B,CAAC,CAAC;IACH,KAAK,MAAM,IAAI,IAAI,uBAAuB;QACxC,MAAM,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,IAAI;QAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,cAAc;QACrC,MAAM,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,kBAAkB,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IACrE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,QAAQ;QAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,YAAY,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/D,IACE,OAAO,CAAC,aAAa;QACrB,OAAO,CAAC,UAAU;QAClB,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC;QAEhD,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,MAAM,2BAA2B,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CACxE,CAAC;IACJ,IAAI,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,CAAC;QAC1E,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAC7C,IAAI,EACJ,KAAK,EACL,OAAO,CAAC,QAAQ,CACjB,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QACjC,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC;IACpE,CAAC;IACD,OAAO,MAAM,EAAE,CAAC;AAClB,CAAC","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\nexport function 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/remote-apply.js

@@ -10,6 +10,12 @@ export async function applyChanges(context, changes, backup, synchronized, expec
     const { previousPatch, previousExtras } = backup;
     if ((await digest(workspace.directory, recovery)) !== expected)
         throw new OutpostError("conflict", "Host workspace changed during synchronization", { recovery });
+    if (head !== synchronized)
+        await git(workspace.directory, [
+            "fetch",
+            join(transfer, "commits.bundle"),
+            "HEAD",
+        ]);
     if ((await readFile(previousPatch)).length)
         await git(workspace.directory, [
             "apply",

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, 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"]}
+{"version":3,"file":"remote-apply.js","sourceRoot":"","sources":["../../src/application/remote-apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,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,YAAY,CAChC,OAA+B,EAC/B,OAAsB,EACtB,MAAkB,EAClB,YAAoB,EACpB,QAAgB,EAChB,QAAgB;IAEhB,MAAM,EACJ,SAAS,EACT,OAAO,EACP,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IACjD,IAAI,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,KAAK,QAAQ;QAC5D,MAAM,IAAI,YAAY,CACpB,UAAU,EACV,+CAA+C,EAC/C,EAAE,QAAQ,EAAE,CACb,CAAC;IACJ,IAAI,IAAI,KAAK,YAAY;QACvB,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;YAC7B,OAAO;YACP,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC;YAChC,MAAM;SACP,CAAC,CAAC;IACL,IAAI,CAAC,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM;QACxC,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;YAC7B,OAAO;YACP,WAAW;YACX,UAAU;YACV,aAAa;SACd,CAAC,CAAC;IACL,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7D,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,MAAM,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CACzC,EAAE,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CACtC,GAAG,EAAE,CAAC,IAAI,EACV,CAAC,KAA4B,EAAE,EAAE;gBAC/B,IACE,KAAK,CAAC,IAAI,KAAK,WAAW;oBAC1B,KAAK,CAAC,IAAI,KAAK,QAAQ;oBACvB,KAAK,CAAC,IAAI,KAAK,QAAQ;oBAEvB,OAAO,KAAK,CAAC;gBACf,MAAM,KAAK,CAAC;YACd,CAAC,CACF,CAAC;YACF,IAAI,CAAC,OAAO;gBAAE,MAAM;YACpB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,IAAI,IAAI,KAAK,YAAY;QACvB,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;QAChC,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM;QACtE,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM;QACtE,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE;YAC7B,OAAO;YACP,UAAU;YACV,UAAU;YACV,YAAY;SACb,CAAC,CAAC;IACL,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,EAAE;YAC7D,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;QACtB,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE;YACjD,WAAW,EAAE,KAAK;YAClB,gBAAgB,EAAE,IAAI;YACtB,KAAK,EAAE,KAAK;YACZ,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;IACL,CAAC;AACH,CAAC","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 (head !== synchronized)\n    await git(workspace.directory, [\n      \"fetch\",\n      join(transfer, \"commits.bundle\"),\n      \"HEAD\",\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-download.js

@@ -1,5 +1,6 @@
 import { cp, mkdir, writeFile } from "node:fs/promises";
 import { dirname, join, posix } from "node:path";
+import { downloadHistory } from "./remote-history.js";
 import { OutpostError } from "../domain/errors.js";
 import { fileManifest, parseManifest, sameFile, sameLocalFile, } from "../infrastructure/file-manifest.js";
 import { safeDestination } from "../infrastructure/files.js";
@@ -48,8 +49,7 @@ export async function downloadChanges(context, synchronized, transfer) {
             await lease.download(posix.join(lease.root, file), await safeDestination(join(transfer, "incoming"), file));
         }
     if (head !== synchronized) {
-        await run(["bundle", "create", remoteBundle, "HEAD"]);
-        await lease.download(remoteBundle, join(transfer, "commits.bundle"));
+        await downloadHistory(context, synchronized, head, transfer);
     }
     return { head, patch, incoming, ...(manifest ? { manifest } : {}) };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"remote-download.js","sourceRoot":"","sources":["../../src/application/remote-download.ts"],"names":[],"mappings":"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","sourcesContent":["import { cp, mkdir, writeFile } from \"node:fs/promises\";\nimport { dirname, join, posix } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport {\n  fileManifest,\n  parseManifest,\n  sameFile,\n  sameLocalFile,\n} from \"../infrastructure/file-manifest.ts\";\nimport type { FileManifestEntry } from \"../domain/sandbox.types.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport type {\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\n\nexport async function downloadChanges(\n  context: RemoteWorkspaceContext,\n  synchronized: string,\n  transfer: string,\n): Promise<RemoteChanges> {\n  const { workspace, lease, remoteBundle, run } = context;\n  const head = (await run([\"rev-parse\", \"HEAD\"])).trim(),\n    patch = join(transfer, \"remote.patch\");\n  await run([\"diff\", \"--binary\", \"HEAD\", `--output=${remoteBundle}.patch`]);\n  await lease.download(`${remoteBundle}.patch`, patch);\n  const incoming = (\n    await run([\"ls-files\", \"--others\", \"--exclude-standard\", \"-z\"])\n  )\n    .split(\"\\0\")\n    .filter(Boolean);\n  for (const file of incoming) {\n    if (/^\\.outpost\\/(locks|recovery|workspaces|logs)(\\/|$)/i.test(file))\n      throw new OutpostError(\n        \"workspace\",\n        \"Remote file overlaps Outpost runtime state\",\n        { file },\n      );\n    await safeDestination(join(transfer, \"incoming\"), file);\n  }\n  let manifest: readonly FileManifestEntry[] | undefined;\n  if (lease.fileTransfers) {\n    manifest = parseManifest(\n      await lease.fileTransfers.manifest(lease.root, incoming),\n      incoming,\n    );\n    await writeFile(join(transfer, \"manifest.json\"), JSON.stringify(manifest), {\n      mode: 0o600,\n    });\n    const changed: FileManifestEntry[] = [];\n    for (const entry of manifest) {\n      const previous = context.transferred?.get(entry.path);\n      if (\n        previous &&\n        sameFile(previous, entry) &&\n        sameLocalFile(\n          entry,\n          await fileManifest(workspace.directory, entry.path),\n        )\n      ) {\n        const target = await safeDestination(\n          join(transfer, \"incoming\"),\n          entry.path,\n        );\n        await mkdir(dirname(target), { recursive: true });\n        await cp(\n          await safeDestination(workspace.directory, entry.path),\n          target,\n          { dereference: false, verbatimSymlinks: true },\n        );\n        continue;\n      }\n      changed.push(entry);\n    }\n    await lease.fileTransfers.downloadBatch(\n      lease.root,\n      changed,\n      join(transfer, \"incoming\"),\n    );\n    for (const entry of manifest) {\n      if (\n        !sameLocalFile(\n          entry,\n          await fileManifest(join(transfer, \"incoming\"), entry.path),\n        )\n      )\n        throw new OutpostError(\"workspace\", \"Incoming file checksum mismatch\", {\n          file: entry.path,\n        });\n    }\n  } else\n    for (const file of incoming) {\n      await lease.download(\n        posix.join(lease.root, file),\n        await safeDestination(join(transfer, \"incoming\"), file),\n      );\n    }\n  if (head !== synchronized) {\n    await run([\"bundle\", \"create\", remoteBundle, \"HEAD\"]);\n    await lease.download(remoteBundle, join(transfer, \"commits.bundle\"));\n  }\n\n  return { head, patch, incoming, ...(manifest ? { manifest } : {}) };\n}\n"]}
+{"version":3,"file":"remote-download.js","sourceRoot":"","sources":["../../src/application/remote-download.ts"],"names":[],"mappings":"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","sourcesContent":["import { cp, mkdir, writeFile } from \"node:fs/promises\";\nimport { dirname, join, posix } from \"node:path\";\nimport { downloadHistory } from \"./remote-history.ts\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport {\n  fileManifest,\n  parseManifest,\n  sameFile,\n  sameLocalFile,\n} from \"../infrastructure/file-manifest.ts\";\nimport type { FileManifestEntry } from \"../domain/sandbox.types.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport type {\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\n\nexport async function downloadChanges(\n  context: RemoteWorkspaceContext,\n  synchronized: string,\n  transfer: string,\n): Promise<RemoteChanges> {\n  const { workspace, lease, remoteBundle, run } = context;\n  const head = (await run([\"rev-parse\", \"HEAD\"])).trim(),\n    patch = join(transfer, \"remote.patch\");\n  await run([\"diff\", \"--binary\", \"HEAD\", `--output=${remoteBundle}.patch`]);\n  await lease.download(`${remoteBundle}.patch`, patch);\n  const incoming = (\n    await run([\"ls-files\", \"--others\", \"--exclude-standard\", \"-z\"])\n  )\n    .split(\"\\0\")\n    .filter(Boolean);\n  for (const file of incoming) {\n    if (/^\\.outpost\\/(locks|recovery|workspaces|logs)(\\/|$)/i.test(file))\n      throw new OutpostError(\n        \"workspace\",\n        \"Remote file overlaps Outpost runtime state\",\n        { file },\n      );\n    await safeDestination(join(transfer, \"incoming\"), file);\n  }\n  let manifest: readonly FileManifestEntry[] | undefined;\n  if (lease.fileTransfers) {\n    manifest = parseManifest(\n      await lease.fileTransfers.manifest(lease.root, incoming),\n      incoming,\n    );\n    await writeFile(join(transfer, \"manifest.json\"), JSON.stringify(manifest), {\n      mode: 0o600,\n    });\n    const changed: FileManifestEntry[] = [];\n    for (const entry of manifest) {\n      const previous = context.transferred?.get(entry.path);\n      if (\n        previous &&\n        sameFile(previous, entry) &&\n        sameLocalFile(\n          entry,\n          await fileManifest(workspace.directory, entry.path),\n        )\n      ) {\n        const target = await safeDestination(\n          join(transfer, \"incoming\"),\n          entry.path,\n        );\n        await mkdir(dirname(target), { recursive: true });\n        await cp(\n          await safeDestination(workspace.directory, entry.path),\n          target,\n          { dereference: false, verbatimSymlinks: true },\n        );\n        continue;\n      }\n      changed.push(entry);\n    }\n    await lease.fileTransfers.downloadBatch(\n      lease.root,\n      changed,\n      join(transfer, \"incoming\"),\n    );\n    for (const entry of manifest) {\n      if (\n        !sameLocalFile(\n          entry,\n          await fileManifest(join(transfer, \"incoming\"), entry.path),\n        )\n      )\n        throw new OutpostError(\"workspace\", \"Incoming file checksum mismatch\", {\n          file: entry.path,\n        });\n    }\n  } else\n    for (const file of incoming) {\n      await lease.download(\n        posix.join(lease.root, file),\n        await safeDestination(join(transfer, \"incoming\"), file),\n      );\n    }\n  if (head !== synchronized) {\n    await downloadHistory(context, synchronized, head, transfer);\n  }\n\n  return { head, patch, incoming, ...(manifest ? { manifest } : {}) };\n}\n"]}

package/dist/application/remote-history.d.ts

@@ -0,0 +1,6 @@
+import type { SandboxLease } from "../domain/sandbox.types.ts";
+import type { WorkspaceRecord } from "../domain/workspace.types.ts";
+import type { RemoteSyncOptions, RemoteWorkspaceContext } from "./remote-workspace.types.ts";
+export declare function seedHistory(workspace: WorkspaceRecord, lease: SandboxLease, options: RemoteSyncOptions, recovery: string, remoteBundle: string, run: RemoteWorkspaceContext["run"]): Promise<void>;
+export declare function prepareHistoryValidation(context: RemoteWorkspaceContext, transfer: string): Promise<string>;
+export declare function downloadHistory(context: RemoteWorkspaceContext, synchronized: string, head: string, transfer: string): Promise<void>;