@elie-laloum/outpost 1.1.4 → 3.0.0

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":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,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,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;QACC,MAAM,EAAE,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;YACzD,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;IACL,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,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;SACnB,CAAC,CAAC;IACL,CAAC;AACH,CAAC","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"]}

package/dist/application/remote-download.js

@@ -1,5 +1,7 @@
-import { join, posix } from "node:path";
+import { cp, mkdir, writeFile } from "node:fs/promises";
+import { dirname, join, posix } from "node:path";
 import { OutpostError } from "../domain/errors.js";
+import { fileManifest, parseManifest, sameFile, sameLocalFile, } from "../infrastructure/file-manifest.js";
 import { safeDestination } from "../infrastructure/files.js";
 export async function downloadChanges(context, synchronized, transfer) {
     const { workspace, lease, remoteBundle, run } = context;
@@ -12,13 +14,43 @@ export async function downloadChanges(context, synchronized, transfer) {
     for (const file of incoming) {
         if (/^\.outpost\/(locks|recovery|workspaces|logs)(\/|$)/i.test(file))
             throw new OutpostError("workspace", "Remote file overlaps Outpost runtime state", { file });
-        await safeDestination(workspace.directory, file);
-        await lease.download(posix.join(lease.root, file), await safeDestination(join(transfer, "incoming"), file));
+        await safeDestination(join(transfer, "incoming"), file);
     }
+    let manifest;
+    if (lease.fileTransfers) {
+        manifest = parseManifest(await lease.fileTransfers.manifest(lease.root, incoming), incoming);
+        await writeFile(join(transfer, "manifest.json"), JSON.stringify(manifest), {
+            mode: 0o600,
+        });
+        const changed = [];
+        for (const entry of manifest) {
+            const previous = context.transferred?.get(entry.path);
+            if (previous &&
+                sameFile(previous, entry) &&
+                sameLocalFile(entry, await fileManifest(workspace.directory, entry.path))) {
+                const target = await safeDestination(join(transfer, "incoming"), entry.path);
+                await mkdir(dirname(target), { recursive: true });
+                await cp(await safeDestination(workspace.directory, entry.path), target, { dereference: false, verbatimSymlinks: true });
+                continue;
+            }
+            changed.push(entry);
+        }
+        await lease.fileTransfers.downloadBatch(lease.root, changed, join(transfer, "incoming"));
+        for (const entry of manifest) {
+            if (!sameLocalFile(entry, await fileManifest(join(transfer, "incoming"), entry.path)))
+                throw new OutpostError("workspace", "Incoming file checksum mismatch", {
+                    file: entry.path,
+                });
+        }
+    }
+    else
+        for (const file of incoming) {
+            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"));
     }
-    return { head, patch, incoming };
+    return { head, patch, incoming, ...(manifest ? { manifest } : {}) };
 }
 //# sourceMappingURL=remote-download.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"remote-download.js","sourceRoot":"","sources":["../../src/application/remote-download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAA+B,EAC/B,YAAoB,EACpB,QAAgB;IAEhB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EACpD,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACzC,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,YAAY,QAAQ,CAAC,CAAC,CAAC;IAC1E,MAAM,KAAK,CAAC,QAAQ,CAAC,GAAG,YAAY,QAAQ,EAAE,KAAK,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,CACf,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAChE;SACE,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,qDAAqD,CAAC,IAAI,CAAC,IAAI,CAAC;YAClE,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,4CAA4C,EAC5C,EAAE,IAAI,EAAE,CACT,CAAC;QACJ,MAAM,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACjD,MAAM,KAAK,CAAC,QAAQ,CAClB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAC5B,MAAM,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CACxD,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;QACtD,MAAM,KAAK,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACnC,CAAC","sourcesContent":["import { join, posix } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.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(workspace.directory, file);\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 };\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 { 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"]}

package/dist/application/remote-validation.js

@@ -2,10 +2,29 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { OutpostError } from "../domain/errors.js";
 import { git } from "../infrastructure/git/command.js";
+import { remoteSyncLimits } from "./remote-workspace.constants.js";
 import { digest } from "./workspace-fingerprint.js";
 export async function validateChanges(context, changes, synchronized, expected, transfer) {
     const { workspace, options, recovery, run, protectedFiles, originalHead, initialPatch, initialIndex, } = context;
     const { head, patch, incoming } = changes;
+    const ignoredOverlaps = [];
+    for (let offset = 0; offset < incoming.length; offset += remoteSyncLimits.pathspecs) {
+        ignoredOverlaps.push(...(await git(workspace.directory, [
+            "ls-files",
+            "--others",
+            "--ignored",
+            "--exclude-standard",
+            "-z",
+            "--",
+            ...incoming
+                .slice(offset, offset + remoteSyncLimits.pathspecs)
+                .map((path) => `:(literal)${path}`),
+        ]))
+            .split("\0")
+            .filter(Boolean));
+    }
+    if (ignoredOverlaps.length)
+        throw new OutpostError("conflict", "Remote changes overlap ignored host files", { files: ignoredOverlaps, recovery: transfer });
     if (protectedFiles.length) {
         const changed = new Set([
             ...(await run(["diff", "--name-only", "-z", originalHead]))

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

@@ -1 +1 @@
-{"version":3,"file":"remote-validation.js","sourceRoot":"","sources":["../../src/application/remote-validation.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport type {\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { digest } from \"./workspace-fingerprint.ts\";\n\nexport async function validateChanges(\n  context: RemoteWorkspaceContext,\n  changes: RemoteChanges,\n  synchronized: string,\n  expected: string,\n  transfer: string,\n): Promise<void> {\n  const {\n    workspace,\n    options,\n    recovery,\n    run,\n    protectedFiles,\n    originalHead,\n    initialPatch,\n    initialIndex,\n  } = context;\n  const { head, patch, incoming } = changes;\n  if (protectedFiles.length) {\n    const changed = new Set([\n      ...(await run([\"diff\", \"--name-only\", \"-z\", originalHead]))\n        .split(\"\\0\")\n        .filter(Boolean),\n      ...incoming,\n    ]);\n    const overlaps = protectedFiles.filter((file) =>\n      [...changed].some(\n        (path) =>\n          path === file ||\n          path.startsWith(`${file}/`) ||\n          file.startsWith(`${path}/`),\n      ),\n    );\n    if (overlaps.length)\n      throw new OutpostError(\n        \"conflict\",\n        \"Remote changes overlap uncommitted host files\",\n        { files: overlaps, recovery: transfer },\n      );\n  }\n  if ((await digest(workspace.directory, recovery)) !== expected)\n    throw new OutpostError(\n      \"conflict\",\n      \"Host workspace changed while the remote sandbox was active\",\n      { recovery },\n    );\n  if (head !== synchronized) {\n    await git(workspace.directory, [\n      \"fetch\",\n      join(transfer, \"commits.bundle\"),\n      \"HEAD\",\n    ]);\n    await git(workspace.directory, [\n      \"merge-base\",\n      \"--is-ancestor\",\n      \"HEAD\",\n      \"FETCH_HEAD\",\n    ]);\n  }\n  const validation = join(transfer, \"validation\");\n  await git(workspace.directory, [\n    \"worktree\",\n    \"add\",\n    \"--detach\",\n    validation,\n    head,\n  ]);\n  try {\n    if ((await readFile(patch)).length)\n      await git(validation, [\"apply\", \"--binary\", patch]);\n    if (!options.includeUncommitted && (await readFile(initialPatch)).length)\n      await git(validation, [\"apply\", \"--binary\", initialPatch]);\n    if (!options.includeUncommitted && (await readFile(initialIndex)).length)\n      await git(validation, [\"apply\", \"--cached\", \"--binary\", initialIndex]);\n  } finally {\n    await git(workspace.directory, [\n      \"worktree\",\n      \"remove\",\n      \"--force\",\n      validation,\n    ]);\n  }\n}\n"]}
+{"version":3,"file":"remote-validation.js","sourceRoot":"","sources":["../../src/application/remote-validation.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport type {\n  RemoteChanges,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { remoteSyncLimits } from \"./remote-workspace.constants.ts\";\nimport { digest } from \"./workspace-fingerprint.ts\";\n\nexport async function validateChanges(\n  context: RemoteWorkspaceContext,\n  changes: RemoteChanges,\n  synchronized: string,\n  expected: string,\n  transfer: string,\n): Promise<void> {\n  const {\n    workspace,\n    options,\n    recovery,\n    run,\n    protectedFiles,\n    originalHead,\n    initialPatch,\n    initialIndex,\n  } = context;\n  const { head, patch, incoming } = changes;\n  const ignoredOverlaps: string[] = [];\n  for (\n    let offset = 0;\n    offset < incoming.length;\n    offset += remoteSyncLimits.pathspecs\n  ) {\n    ignoredOverlaps.push(\n      ...(\n        await git(workspace.directory, [\n          \"ls-files\",\n          \"--others\",\n          \"--ignored\",\n          \"--exclude-standard\",\n          \"-z\",\n          \"--\",\n          ...incoming\n            .slice(offset, offset + remoteSyncLimits.pathspecs)\n            .map((path) => `:(literal)${path}`),\n        ])\n      )\n        .split(\"\\0\")\n        .filter(Boolean),\n    );\n  }\n  if (ignoredOverlaps.length)\n    throw new OutpostError(\n      \"conflict\",\n      \"Remote changes overlap ignored host files\",\n      { files: ignoredOverlaps, recovery: transfer },\n    );\n  if (protectedFiles.length) {\n    const changed = new Set([\n      ...(await run([\"diff\", \"--name-only\", \"-z\", originalHead]))\n        .split(\"\\0\")\n        .filter(Boolean),\n      ...incoming,\n    ]);\n    const overlaps = protectedFiles.filter((file) =>\n      [...changed].some(\n        (path) =>\n          path === file ||\n          path.startsWith(`${file}/`) ||\n          file.startsWith(`${path}/`),\n      ),\n    );\n    if (overlaps.length)\n      throw new OutpostError(\n        \"conflict\",\n        \"Remote changes overlap uncommitted host files\",\n        { files: overlaps, recovery: transfer },\n      );\n  }\n  if ((await digest(workspace.directory, recovery)) !== expected)\n    throw new OutpostError(\n      \"conflict\",\n      \"Host workspace changed while the remote sandbox was active\",\n      { recovery },\n    );\n  if (head !== synchronized) {\n    await git(workspace.directory, [\n      \"fetch\",\n      join(transfer, \"commits.bundle\"),\n      \"HEAD\",\n    ]);\n    await git(workspace.directory, [\n      \"merge-base\",\n      \"--is-ancestor\",\n      \"HEAD\",\n      \"FETCH_HEAD\",\n    ]);\n  }\n  const validation = join(transfer, \"validation\");\n  await git(workspace.directory, [\n    \"worktree\",\n    \"add\",\n    \"--detach\",\n    validation,\n    head,\n  ]);\n  try {\n    if ((await readFile(patch)).length)\n      await git(validation, [\"apply\", \"--binary\", patch]);\n    if (!options.includeUncommitted && (await readFile(initialPatch)).length)\n      await git(validation, [\"apply\", \"--binary\", initialPatch]);\n    if (!options.includeUncommitted && (await readFile(initialIndex)).length)\n      await git(validation, [\"apply\", \"--cached\", \"--binary\", initialIndex]);\n  } finally {\n    await git(workspace.directory, [\n      \"worktree\",\n      \"remove\",\n      \"--force\",\n      validation,\n    ]);\n  }\n}\n"]}

package/dist/application/remote-workspace.constants.d.ts

@@ -0,0 +1,3 @@
+export declare const remoteSyncLimits: {
+    readonly pathspecs: 32;
+};

package/dist/application/remote-workspace.constants.js

@@ -0,0 +1,2 @@
+export const remoteSyncLimits = { pathspecs: 32 };
+//# sourceMappingURL=remote-workspace.constants.js.map

package/dist/application/remote-workspace.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-workspace.constants.js","sourceRoot":"","sources":["../../src/application/remote-workspace.constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,SAAS,EAAE,EAAE,EAAW,CAAC","sourcesContent":["export const remoteSyncLimits = { pathspecs: 32 } as const;\n"]}

package/dist/application/remote-workspace.js

@@ -40,6 +40,8 @@ export async function seedRemote(workspace, lease, options = {}) {
                 ...result,
                 recovery,
             });
+        if (result.stdout.length >= gitDefaults.retainBytes)
+            throw new OutpostError("workspace", "Remote Git output exceeds synchronization limit", { recovery });
         return result.stdout;
     };
     await run(["init"]);
@@ -86,6 +88,7 @@ export async function seedRemote(workspace, lease, options = {}) {
     initializing = false;
     let expected = await digest(workspace.directory, recovery);
     const context = {
+        transferred: new Map(),
         workspace,
         lease,
         options,
@@ -110,6 +113,9 @@ export async function seedRemote(workspace, lease, options = {}) {
                 await validateChanges(context, changes, synchronized, expected, transfer);
                 const backup = await backupHost(context, changes, synchronized, transfer);
                 await applyChanges(context, changes, backup, synchronized, expected, transfer);
+                context.transferred?.clear();
+                for (const entry of changes.manifest ?? [])
+                    context.transferred?.set(entry.path, entry);
                 const { head } = changes;
                 synchronized = head;
                 expected = await digest(workspace.directory, recovery);

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

@@ -1 +1 @@
-{"version":3,"file":"remote-workspace.js","sourceRoot":"","sources":["../../src/application/remote-workspace.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { mkdir, readFile, rm } from \"node:fs/promises\";\nimport { join, posix } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport type { SandboxLease } from \"../domain/sandbox.types.ts\";\nimport type { WorkspaceRecord } from \"../domain/workspace.types.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { gitDefaults } from \"../infrastructure/git/git.constants.ts\";\nimport { applyChanges } from \"./remote-apply.ts\";\nimport { backupHost } from \"./remote-backup.ts\";\nimport { downloadChanges } from \"./remote-download.ts\";\nimport { validateChanges } from \"./remote-validation.ts\";\nimport type {\n  RemoteSync,\n  RemoteSyncOptions,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { digest, extras } from \"./workspace-fingerprint.ts\";\n\nexport type {\n  RemoteSync,\n  RemoteSyncOptions,\n} from \"./remote-workspace.types.ts\";\n\nexport async function seedRemote(\n  workspace: WorkspaceRecord,\n  lease: SandboxLease,\n  options: RemoteSyncOptions = {},\n): Promise<RemoteSync> {\n  options.signal?.throwIfAborted();\n  const recovery = join(\n    workspace.repository,\n    \".outpost\",\n    \"recovery\",\n    randomUUID(),\n  );\n  await mkdir(recovery, { recursive: true });\n  const bundle = join(recovery, \"initial.bundle\");\n  await git(workspace.directory, [\"bundle\", \"create\", bundle, \"--all\", \"HEAD\"]);\n  const remoteBundle = posix.join(\n    lease.root.replaceAll(\"\\\\\", \"/\"),\n    \"..\",\n    `outpost-${randomUUID()}.bundle`,\n  );\n  await lease.upload(bundle, remoteBundle);\n  let initializing = true,\n    failed = false;\n  const run = async (args: readonly string[]) => {\n    let result;\n    for (let attempt = 0; attempt < 3; attempt++) {\n      result = await lease.invoke({\n        executable: \"git\",\n        arguments: args,\n        directory: lease.root,\n        retain: gitDefaults.retainBytes,\n        ...(initializing && options.signal ? { signal: options.signal } : {}),\n        ...(options.limits?.gitMs ? { deadlineMs: options.limits.gitMs } : {}),\n      });\n      if (!initializing || result.status !== 126) break;\n    }\n    if (!result)\n      throw new OutpostError(\"workspace\", \"Remote Git did not start\");\n    if (result.status !== 0)\n      throw new OutpostError(\"workspace\", \"Remote Git operation failed\", {\n        ...result,\n        recovery,\n      });\n    return result.stdout;\n  };\n  await run([\"init\"]);\n  await run([\"config\", \"core.autocrlf\", \"false\"]);\n  await run([\"fetch\", remoteBundle, \"HEAD\"]);\n  await run([\"checkout\", \"-B\", workspace.branch, \"FETCH_HEAD\"]);\n  for (const key of [\"user.name\", \"user.email\"] as const) {\n    const fallback = key === \"user.name\" ? \"Outpost\" : \"outpost@localhost\";\n    const value =\n      (\n        await git(workspace.repository, [\"config\", \"--get\", key]).catch(\n          () => fallback,\n        )\n      ).trim() || fallback;\n    await run([\"config\", key, value]);\n  }\n  const initialPatch = join(recovery, \"initial.patch\");\n  await git(workspace.directory, [\n    \"diff\",\n    \"--binary\",\n    \"HEAD\",\n    `--output=${initialPatch}`,\n  ]);\n  const initialIndex = join(recovery, \"initial-index.patch\");\n  await git(workspace.directory, [\n    \"diff\",\n    \"--cached\",\n    \"--binary\",\n    `--output=${initialIndex}`,\n  ]);\n  const protectedFiles = options.includeUncommitted\n    ? []\n    : [\n        ...(\n          await git(workspace.directory, [\"diff\", \"--name-only\", \"-z\", \"HEAD\"])\n        )\n          .split(\"\\0\")\n          .filter(Boolean),\n        ...(await extras(workspace.directory)),\n      ];\n  const originalHead = (\n    await git(workspace.directory, [\"rev-parse\", \"HEAD\"])\n  ).trim();\n  if (options.includeUncommitted && (await readFile(initialPatch)).length) {\n    await lease.upload(initialPatch, `${remoteBundle}.patch`);\n    await run([\"apply\", \"--binary\", `${remoteBundle}.patch`]);\n  }\n  for (const file of options.includeUncommitted\n    ? await extras(workspace.directory)\n    : [])\n    await lease.upload(\n      await safeDestination(workspace.directory, file),\n      posix.join(lease.root, file),\n    );\n  let synchronized = (await run([\"rev-parse\", \"HEAD\"])).trim();\n  initializing = false;\n  let expected = await digest(workspace.directory, recovery);\n  const context: RemoteWorkspaceContext = {\n    workspace,\n    lease,\n    options,\n    recovery,\n    remoteBundle,\n    run,\n    protectedFiles,\n    originalHead,\n    initialPatch,\n    initialIndex,\n  };\n  return {\n    async close() {\n      if (!failed) await rm(recovery, { recursive: true, force: true });\n    },\n    async pull() {\n      const transfer = join(recovery, randomUUID());\n      await mkdir(transfer, { recursive: true });\n      try {\n        const changes = await downloadChanges(context, synchronized, transfer);\n        await validateChanges(\n          context,\n          changes,\n          synchronized,\n          expected,\n          transfer,\n        );\n        const backup = await backupHost(\n          context,\n          changes,\n          synchronized,\n          transfer,\n        );\n        await applyChanges(\n          context,\n          changes,\n          backup,\n          synchronized,\n          expected,\n          transfer,\n        );\n        const { head } = changes;\n        synchronized = head;\n        expected = await digest(workspace.directory, recovery);\n        await rm(transfer, { recursive: true, force: true });\n      } catch (cause) {\n        failed = true;\n        throw new OutpostError(\n          \"workspace\",\n          \"Remote changes could not be fully synchronized; recovery files retained\",\n          { recovery: transfer, directory: workspace.directory },\n          cause,\n        );\n      }\n    },\n  };\n}\n"]}
+{"version":3,"file":"remote-workspace.js","sourceRoot":"","sources":["../../src/application/remote-workspace.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { mkdir, readFile, rm } from \"node:fs/promises\";\nimport { join, posix } from \"node:path\";\nimport { OutpostError } from \"../domain/errors.ts\";\nimport type { SandboxLease } from \"../domain/sandbox.types.ts\";\nimport type { WorkspaceRecord } from \"../domain/workspace.types.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\nimport { git } from \"../infrastructure/git/command.ts\";\nimport { gitDefaults } from \"../infrastructure/git/git.constants.ts\";\nimport { applyChanges } from \"./remote-apply.ts\";\nimport { backupHost } from \"./remote-backup.ts\";\nimport { downloadChanges } from \"./remote-download.ts\";\nimport { validateChanges } from \"./remote-validation.ts\";\nimport type {\n  RemoteSync,\n  RemoteSyncOptions,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\nimport { digest, extras } from \"./workspace-fingerprint.ts\";\n\nexport type {\n  RemoteSync,\n  RemoteSyncOptions,\n} from \"./remote-workspace.types.ts\";\n\nexport async function seedRemote(\n  workspace: WorkspaceRecord,\n  lease: SandboxLease,\n  options: RemoteSyncOptions = {},\n): Promise<RemoteSync> {\n  options.signal?.throwIfAborted();\n  const recovery = join(\n    workspace.repository,\n    \".outpost\",\n    \"recovery\",\n    randomUUID(),\n  );\n  await mkdir(recovery, { recursive: true });\n  const bundle = join(recovery, \"initial.bundle\");\n  await git(workspace.directory, [\"bundle\", \"create\", bundle, \"--all\", \"HEAD\"]);\n  const remoteBundle = posix.join(\n    lease.root.replaceAll(\"\\\\\", \"/\"),\n    \"..\",\n    `outpost-${randomUUID()}.bundle`,\n  );\n  await lease.upload(bundle, remoteBundle);\n  let initializing = true,\n    failed = false;\n  const run = async (args: readonly string[]) => {\n    let result;\n    for (let attempt = 0; attempt < 3; attempt++) {\n      result = await lease.invoke({\n        executable: \"git\",\n        arguments: args,\n        directory: lease.root,\n        retain: gitDefaults.retainBytes,\n        ...(initializing && options.signal ? { signal: options.signal } : {}),\n        ...(options.limits?.gitMs ? { deadlineMs: options.limits.gitMs } : {}),\n      });\n      if (!initializing || result.status !== 126) break;\n    }\n    if (!result)\n      throw new OutpostError(\"workspace\", \"Remote Git did not start\");\n    if (result.status !== 0)\n      throw new OutpostError(\"workspace\", \"Remote Git operation failed\", {\n        ...result,\n        recovery,\n      });\n    if (result.stdout.length >= gitDefaults.retainBytes)\n      throw new OutpostError(\n        \"workspace\",\n        \"Remote Git output exceeds synchronization limit\",\n        { recovery },\n      );\n    return result.stdout;\n  };\n  await run([\"init\"]);\n  await run([\"config\", \"core.autocrlf\", \"false\"]);\n  await run([\"fetch\", remoteBundle, \"HEAD\"]);\n  await run([\"checkout\", \"-B\", workspace.branch, \"FETCH_HEAD\"]);\n  for (const key of [\"user.name\", \"user.email\"] as const) {\n    const fallback = key === \"user.name\" ? \"Outpost\" : \"outpost@localhost\";\n    const value =\n      (\n        await git(workspace.repository, [\"config\", \"--get\", key]).catch(\n          () => fallback,\n        )\n      ).trim() || fallback;\n    await run([\"config\", key, value]);\n  }\n  const initialPatch = join(recovery, \"initial.patch\");\n  await git(workspace.directory, [\n    \"diff\",\n    \"--binary\",\n    \"HEAD\",\n    `--output=${initialPatch}`,\n  ]);\n  const initialIndex = join(recovery, \"initial-index.patch\");\n  await git(workspace.directory, [\n    \"diff\",\n    \"--cached\",\n    \"--binary\",\n    `--output=${initialIndex}`,\n  ]);\n  const protectedFiles = options.includeUncommitted\n    ? []\n    : [\n        ...(\n          await git(workspace.directory, [\"diff\", \"--name-only\", \"-z\", \"HEAD\"])\n        )\n          .split(\"\\0\")\n          .filter(Boolean),\n        ...(await extras(workspace.directory)),\n      ];\n  const originalHead = (\n    await git(workspace.directory, [\"rev-parse\", \"HEAD\"])\n  ).trim();\n  if (options.includeUncommitted && (await readFile(initialPatch)).length) {\n    await lease.upload(initialPatch, `${remoteBundle}.patch`);\n    await run([\"apply\", \"--binary\", `${remoteBundle}.patch`]);\n  }\n  for (const file of options.includeUncommitted\n    ? await extras(workspace.directory)\n    : [])\n    await lease.upload(\n      await safeDestination(workspace.directory, file),\n      posix.join(lease.root, file),\n    );\n  let synchronized = (await run([\"rev-parse\", \"HEAD\"])).trim();\n  initializing = false;\n  let expected = await digest(workspace.directory, recovery);\n  const context: RemoteWorkspaceContext = {\n    transferred: new Map(),\n    workspace,\n    lease,\n    options,\n    recovery,\n    remoteBundle,\n    run,\n    protectedFiles,\n    originalHead,\n    initialPatch,\n    initialIndex,\n  };\n  return {\n    async close() {\n      if (!failed) await rm(recovery, { recursive: true, force: true });\n    },\n    async pull() {\n      const transfer = join(recovery, randomUUID());\n      await mkdir(transfer, { recursive: true });\n      try {\n        const changes = await downloadChanges(context, synchronized, transfer);\n        await validateChanges(\n          context,\n          changes,\n          synchronized,\n          expected,\n          transfer,\n        );\n        const backup = await backupHost(\n          context,\n          changes,\n          synchronized,\n          transfer,\n        );\n        await applyChanges(\n          context,\n          changes,\n          backup,\n          synchronized,\n          expected,\n          transfer,\n        );\n        context.transferred?.clear();\n        for (const entry of changes.manifest ?? [])\n          context.transferred?.set(entry.path, entry);\n        const { head } = changes;\n        synchronized = head;\n        expected = await digest(workspace.directory, recovery);\n        await rm(transfer, { recursive: true, force: true });\n      } catch (cause) {\n        failed = true;\n        throw new OutpostError(\n          \"workspace\",\n          \"Remote changes could not be fully synchronized; recovery files retained\",\n          { recovery: transfer, directory: workspace.directory },\n          cause,\n        );\n      }\n    },\n  };\n}\n"]}

package/dist/application/remote-workspace.types.d.ts

@@ -1,4 +1,4 @@
-import type { SandboxLease } from "../domain/sandbox.types.ts";
+import type { FileManifestEntry, SandboxLease } from "../domain/sandbox.types.ts";
 import type { StageLimits, WorkspaceRecord } from "../domain/workspace.types.ts";
 export interface RemoteSync {
     pull(): Promise<void>;
@@ -10,6 +10,7 @@ export interface RemoteSyncOptions {
     readonly limits?: StageLimits;
 }
 export interface RemoteWorkspaceContext {
+    readonly transferred?: Map<string, FileManifestEntry>;
     readonly workspace: WorkspaceRecord;
     readonly lease: SandboxLease;
     readonly options: RemoteSyncOptions;
@@ -22,6 +23,7 @@ export interface RemoteWorkspaceContext {
     readonly initialIndex: string;
 }
 export interface RemoteChanges {
+    readonly manifest?: readonly FileManifestEntry[];
     readonly head: string;
     readonly patch: string;
     readonly incoming: readonly string[];

package/dist/application/remote-workspace.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-workspace.types.js","sourceRoot":"","sources":["../../src/application/remote-workspace.types.ts"],"names":[],"mappings":"","sourcesContent":["import type { SandboxLease } from \"../domain/sandbox.types.ts\";\nimport type {\n  StageLimits,\n  WorkspaceRecord,\n} from \"../domain/workspace.types.ts\";\n\nexport interface RemoteSync {\n  pull(): Promise<void>;\n  close(): Promise<void>;\n}\n\nexport interface RemoteSyncOptions {\n  readonly includeUncommitted?: boolean;\n  readonly signal?: AbortSignal;\n  readonly limits?: StageLimits;\n}\n\nexport interface RemoteWorkspaceContext {\n  readonly workspace: WorkspaceRecord;\n  readonly lease: SandboxLease;\n  readonly options: RemoteSyncOptions;\n  readonly recovery: string;\n  readonly remoteBundle: string;\n  readonly run: (args: readonly string[]) => Promise<string>;\n  readonly protectedFiles: readonly string[];\n  readonly originalHead: string;\n  readonly initialPatch: string;\n  readonly initialIndex: string;\n}\nexport interface RemoteChanges {\n  readonly head: string;\n  readonly patch: string;\n  readonly incoming: readonly string[];\n}\nexport interface HostBackup {\n  readonly previousPatch: string;\n  readonly previousExtras: readonly string[];\n}\n"]}
+{"version":3,"file":"remote-workspace.types.js","sourceRoot":"","sources":["../../src/application/remote-workspace.types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  FileManifestEntry,\n  SandboxLease,\n} from \"../domain/sandbox.types.ts\";\nimport type {\n  StageLimits,\n  WorkspaceRecord,\n} from \"../domain/workspace.types.ts\";\n\nexport interface RemoteSync {\n  pull(): Promise<void>;\n  close(): Promise<void>;\n}\n\nexport interface RemoteSyncOptions {\n  readonly includeUncommitted?: boolean;\n  readonly signal?: AbortSignal;\n  readonly limits?: StageLimits;\n}\n\nexport interface RemoteWorkspaceContext {\n  readonly transferred?: Map<string, FileManifestEntry>;\n  readonly workspace: WorkspaceRecord;\n  readonly lease: SandboxLease;\n  readonly options: RemoteSyncOptions;\n  readonly recovery: string;\n  readonly remoteBundle: string;\n  readonly run: (args: readonly string[]) => Promise<string>;\n  readonly protectedFiles: readonly string[];\n  readonly originalHead: string;\n  readonly initialPatch: string;\n  readonly initialIndex: string;\n}\nexport interface RemoteChanges {\n  readonly manifest?: readonly FileManifestEntry[];\n  readonly head: string;\n  readonly patch: string;\n  readonly incoming: readonly string[];\n}\nexport interface HostBackup {\n  readonly previousPatch: string;\n  readonly previousExtras: readonly string[];\n}\n"]}

package/dist/application/sandbox.js

@@ -2,6 +2,7 @@ import { OutpostError } from "../domain/errors.js";
 import { validateBrief } from "../domain/prompts.js";
 import { registerCleanup } from "../infrastructure/shutdown.js";
 import { validateDispatch } from "./dispatch-validation.js";
+import { diagnoseSandbox } from "./doctor-sandbox.js";
 import { operationGate } from "./operation-gate.js";
 import { sandboxAgents } from "./sandbox-agents.js";
 import { attachInSandbox } from "./sandbox-attach.js";
@@ -32,6 +33,16 @@ export async function createSandbox(options = {}) {
             validateBrief(settings.brief, true);
             return exclusive(() => attachInSandbox(context, agents, settings));
         },
+        diagnose(settings = {}) {
+            settings.signal?.throwIfAborted();
+            return exclusive(() => diagnoseSandbox(runtime, {
+                ...settings,
+                provider: context.provider,
+                signal: settings.signal
+                    ? AbortSignal.any([settings.signal, stop.signal])
+                    : stop.signal,
+            }));
+        },
         command(command) {
             command.signal?.throwIfAborted();
             return exclusive(async () => {