@elie-laloum/outpost 3.0.0 → 4.0.0

package/dist/application/remote-history.js

@@ -0,0 +1,114 @@
+import { mkdir, rename, rm } from "node:fs/promises";
+import { join } from "node:path";
+import { OutpostError } from "../domain/errors.js";
+import { verificationGit } from "../infrastructure/git/verification-command.js";
+async function probe(operation) {
+    try {
+        return await operation();
+    }
+    catch (error) {
+        if (error instanceof OutpostError &&
+            (error.details.status === 1 || error.details.status === 128))
+            return undefined;
+        if (error &&
+            typeof error === "object" &&
+            "code" in error &&
+            (error.code === 1 || error.code === 128))
+            return undefined;
+        throw error;
+    }
+}
+export async function seedHistory(workspace, lease, options, recovery, remoteBundle, run) {
+    const local = (args) => verificationGit(workspace.directory, args, options.limits?.gitMs, options.signal);
+    const bundle = join(recovery, "initial.bundle");
+    await local(["bundle", "create", bundle, "--all", "HEAD"]);
+    const head = (await local(["rev-parse", "HEAD"])).trim();
+    const candidate = (await probe(() => run(["rev-parse", "--verify", "HEAD"])))?.trim();
+    let base;
+    if (candidate &&
+        /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(candidate) &&
+        (await probe(() => local(["merge-base", "--is-ancestor", candidate, head]))) !== undefined &&
+        (await probe(() => run(["rev-list", "--objects", "--missing=error", "--quiet", candidate]))) !== undefined)
+        base = candidate;
+    if (base === head) {
+        await run(["checkout", "-B", workspace.branch, head]);
+        return;
+    }
+    let payload = bundle;
+    if (base) {
+        payload = join(recovery, "initial-delta.bundle");
+        await local(["bundle", "create", payload, "--all", "HEAD", `^${base}`]);
+    }
+    await lease.upload(payload, remoteBundle, {
+        ...(options.signal ? { signal: options.signal } : {}),
+        ...(options.limits?.copyMs ? { deadlineMs: options.limits.copyMs } : {}),
+    });
+    if (base &&
+        (await probe(() => run(["bundle", "verify", remoteBundle]))) === undefined)
+        await lease.upload(bundle, remoteBundle, {
+            ...(options.signal ? { signal: options.signal } : {}),
+            ...(options.limits?.copyMs ? { deadlineMs: options.limits.copyMs } : {}),
+        });
+    await run(["bundle", "verify", remoteBundle]);
+    await run(["fetch", remoteBundle, "HEAD"]);
+    await run(["checkout", "-B", workspace.branch, "FETCH_HEAD"]);
+}
+export async function prepareHistoryValidation(context, transfer) {
+    const validation = join(transfer, "validation");
+    await mkdir(validation, { recursive: true });
+    const snapshot = join(transfer, "host.bundle");
+    const run = (directory, args) => verificationGit(directory, args, context.options.limits?.gitMs);
+    await run(context.workspace.directory, [
+        "bundle",
+        "create",
+        snapshot,
+        "HEAD",
+    ]);
+    const format = (await run(context.workspace.directory, [
+        "rev-parse",
+        "--show-object-format",
+    ])).trim();
+    await run(validation, ["init", `--object-format=${format}`]);
+    await run(validation, ["config", "core.autocrlf", "false"]);
+    await run(validation, ["fetch", snapshot, "HEAD"]);
+    await run(validation, ["update-ref", "HEAD", "FETCH_HEAD"]);
+    await rm(snapshot);
+    return validation;
+}
+export async function downloadHistory(context, synchronized, head, transfer) {
+    const { run, lease, remoteBundle, options } = context;
+    const validation = await prepareHistoryValidation(context, transfer);
+    const local = (args) => verificationGit(validation, args, options.limits?.gitMs);
+    const usable = (await probe(() => local([
+        "rev-list",
+        "--objects",
+        "--missing=error",
+        "--quiet",
+        synchronized,
+    ]))) !== undefined &&
+        (await probe(() => run(["merge-base", "--is-ancestor", synchronized, head]))) !== undefined;
+    await run([
+        "bundle",
+        "create",
+        remoteBundle,
+        "HEAD",
+        ...(usable ? [`^${synchronized}`] : []),
+    ]);
+    const bundle = join(transfer, "commits.bundle");
+    const received = usable ? join(transfer, "commits-delta.bundle") : bundle;
+    await lease.download(remoteBundle, received, {
+        ...(options.limits?.copyMs ? { deadlineMs: options.limits.copyMs } : {}),
+    });
+    await local(["bundle", "verify", received]);
+    await local(["fetch", received, "HEAD"]);
+    if ((await local(["rev-parse", "FETCH_HEAD"])).trim() !== head)
+        throw new OutpostError("workspace", "Remote bundle HEAD changed during synchronization");
+    await local(["rev-list", "--objects", "--missing=error", "--quiet", head]);
+    await local(["update-ref", "HEAD", head]);
+    const complete = join(transfer, "complete.bundle");
+    await local(["bundle", "create", complete, "HEAD"]);
+    await rename(complete, bundle);
+    if (usable)
+        await rm(received);
+}
+//# sourceMappingURL=remote-history.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"remote-history.js","sourceRoot":"","sources":["../../src/application/remote-history.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdir, rename, rm } from \"node:fs/promises\";\nimport { join } 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 { verificationGit } from \"../infrastructure/git/verification-command.ts\";\nimport type {\n  RemoteSyncOptions,\n  RemoteWorkspaceContext,\n} from \"./remote-workspace.types.ts\";\n\nasync function probe(\n  operation: () => Promise<string>,\n): Promise<string | undefined> {\n  try {\n    return await operation();\n  } catch (error) {\n    if (\n      error instanceof OutpostError &&\n      (error.details.status === 1 || error.details.status === 128)\n    )\n      return undefined;\n    if (\n      error &&\n      typeof error === \"object\" &&\n      \"code\" in error &&\n      (error.code === 1 || error.code === 128)\n    )\n      return undefined;\n    throw error;\n  }\n}\n\nexport async function seedHistory(\n  workspace: WorkspaceRecord,\n  lease: SandboxLease,\n  options: RemoteSyncOptions,\n  recovery: string,\n  remoteBundle: string,\n  run: RemoteWorkspaceContext[\"run\"],\n): Promise<void> {\n  const local = (args: readonly string[]) =>\n    verificationGit(\n      workspace.directory,\n      args,\n      options.limits?.gitMs,\n      options.signal,\n    );\n  const bundle = join(recovery, \"initial.bundle\");\n  await local([\"bundle\", \"create\", bundle, \"--all\", \"HEAD\"]);\n  const head = (await local([\"rev-parse\", \"HEAD\"])).trim();\n  const candidate = (\n    await probe(() => run([\"rev-parse\", \"--verify\", \"HEAD\"]))\n  )?.trim();\n  let base: string | undefined;\n  if (\n    candidate &&\n    /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/.test(candidate) &&\n    (await probe(() =>\n      local([\"merge-base\", \"--is-ancestor\", candidate, head]),\n    )) !== undefined &&\n    (await probe(() =>\n      run([\"rev-list\", \"--objects\", \"--missing=error\", \"--quiet\", candidate]),\n    )) !== undefined\n  )\n    base = candidate;\n  if (base === head) {\n    await run([\"checkout\", \"-B\", workspace.branch, head]);\n    return;\n  }\n  let payload = bundle;\n  if (base) {\n    payload = join(recovery, \"initial-delta.bundle\");\n    await local([\"bundle\", \"create\", payload, \"--all\", \"HEAD\", `^${base}`]);\n  }\n  await lease.upload(payload, remoteBundle, {\n    ...(options.signal ? { signal: options.signal } : {}),\n    ...(options.limits?.copyMs ? { deadlineMs: options.limits.copyMs } : {}),\n  });\n  if (\n    base &&\n    (await probe(() => run([\"bundle\", \"verify\", remoteBundle]))) === undefined\n  )\n    await lease.upload(bundle, remoteBundle, {\n      ...(options.signal ? { signal: options.signal } : {}),\n      ...(options.limits?.copyMs ? { deadlineMs: options.limits.copyMs } : {}),\n    });\n  await run([\"bundle\", \"verify\", remoteBundle]);\n  await run([\"fetch\", remoteBundle, \"HEAD\"]);\n  await run([\"checkout\", \"-B\", workspace.branch, \"FETCH_HEAD\"]);\n}\n\nexport async function prepareHistoryValidation(\n  context: RemoteWorkspaceContext,\n  transfer: string,\n): Promise<string> {\n  const validation = join(transfer, \"validation\");\n  await mkdir(validation, { recursive: true });\n  const snapshot = join(transfer, \"host.bundle\");\n  const run = (directory: string, args: readonly string[]) =>\n    verificationGit(directory, args, context.options.limits?.gitMs);\n  await run(context.workspace.directory, [\n    \"bundle\",\n    \"create\",\n    snapshot,\n    \"HEAD\",\n  ]);\n  const format = (\n    await run(context.workspace.directory, [\n      \"rev-parse\",\n      \"--show-object-format\",\n    ])\n  ).trim();\n  await run(validation, [\"init\", `--object-format=${format}`]);\n  await run(validation, [\"config\", \"core.autocrlf\", \"false\"]);\n  await run(validation, [\"fetch\", snapshot, \"HEAD\"]);\n  await run(validation, [\"update-ref\", \"HEAD\", \"FETCH_HEAD\"]);\n  await rm(snapshot);\n  return validation;\n}\n\nexport async function downloadHistory(\n  context: RemoteWorkspaceContext,\n  synchronized: string,\n  head: string,\n  transfer: string,\n): Promise<void> {\n  const { run, lease, remoteBundle, options } = context;\n  const validation = await prepareHistoryValidation(context, transfer);\n  const local = (args: readonly string[]) =>\n    verificationGit(validation, args, options.limits?.gitMs);\n  const usable =\n    (await probe(() =>\n      local([\n        \"rev-list\",\n        \"--objects\",\n        \"--missing=error\",\n        \"--quiet\",\n        synchronized,\n      ]),\n    )) !== undefined &&\n    (await probe(() =>\n      run([\"merge-base\", \"--is-ancestor\", synchronized, head]),\n    )) !== undefined;\n  await run([\n    \"bundle\",\n    \"create\",\n    remoteBundle,\n    \"HEAD\",\n    ...(usable ? [`^${synchronized}`] : []),\n  ]);\n  const bundle = join(transfer, \"commits.bundle\");\n  const received = usable ? join(transfer, \"commits-delta.bundle\") : bundle;\n  await lease.download(remoteBundle, received, {\n    ...(options.limits?.copyMs ? { deadlineMs: options.limits.copyMs } : {}),\n  });\n  await local([\"bundle\", \"verify\", received]);\n  await local([\"fetch\", received, \"HEAD\"]);\n  if ((await local([\"rev-parse\", \"FETCH_HEAD\"])).trim() !== head)\n    throw new OutpostError(\n      \"workspace\",\n      \"Remote bundle HEAD changed during synchronization\",\n    );\n  await local([\"rev-list\", \"--objects\", \"--missing=error\", \"--quiet\", head]);\n  await local([\"update-ref\", \"HEAD\", head]);\n  const complete = join(transfer, \"complete.bundle\");\n  await local([\"bundle\", \"create\", complete, \"HEAD\"]);\n  await rename(complete, bundle);\n  if (usable) await rm(received);\n}\n"]}

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

@@ -0,0 +1,2 @@
+import type { SandboxLease, TransferOptions } from "../domain/sandbox.types.ts";
+export declare function uploadFiles(lease: SandboxLease, source: string, paths: readonly string[], options?: TransferOptions): Promise<void>;

package/dist/application/remote-upload.js

@@ -0,0 +1,17 @@
+import { posix } from "node:path";
+import { fileManifest } from "../infrastructure/file-manifest.js";
+import { safeDestination } from "../infrastructure/files.js";
+export async function uploadFiles(lease, source, paths, options = {}) {
+    if (lease.fileTransfers?.uploadBatch) {
+        const entries = [];
+        for (const path of paths) {
+            options.signal?.throwIfAborted();
+            entries.push(await fileManifest(source, path, options.signal));
+        }
+        await lease.fileTransfers.uploadBatch(source, entries, lease.root, options);
+        return;
+    }
+    for (const path of paths)
+        await lease.upload(await safeDestination(source, path), posix.join(lease.root, path), options);
+}
+//# sourceMappingURL=remote-upload.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"remote-upload.js","sourceRoot":"","sources":["../../src/application/remote-upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,KAAmB,EACnB,MAAc,EACd,KAAwB,EACxB,UAA2B,EAAE;IAE7B,IAAI,KAAK,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5E,OAAO;IACT,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK;QACtB,MAAM,KAAK,CAAC,MAAM,CAChB,MAAM,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,EACnC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAC5B,OAAO,CACR,CAAC;AACN,CAAC","sourcesContent":["import { posix } from \"node:path\";\nimport type { SandboxLease, TransferOptions } from \"../domain/sandbox.types.ts\";\nimport { fileManifest } from \"../infrastructure/file-manifest.ts\";\nimport { safeDestination } from \"../infrastructure/files.ts\";\n\nexport async function uploadFiles(\n  lease: SandboxLease,\n  source: string,\n  paths: readonly string[],\n  options: TransferOptions = {},\n): Promise<void> {\n  if (lease.fileTransfers?.uploadBatch) {\n    const entries = [];\n    for (const path of paths) {\n      options.signal?.throwIfAborted();\n      entries.push(await fileManifest(source, path, options.signal));\n    }\n    await lease.fileTransfers.uploadBatch(source, entries, lease.root, options);\n    return;\n  }\n  for (const path of paths)\n    await lease.upload(\n      await safeDestination(source, path),\n      posix.join(lease.root, path),\n      options,\n    );\n}\n"]}

package/dist/application/remote-validation.js

@@ -1,5 +1,7 @@
-import { readFile } from "node:fs/promises";
+import { readFile, rm } from "node:fs/promises";
 import { join } from "node:path";
+import { prepareHistoryValidation } from "./remote-history.js";
+import { verificationGit } from "../infrastructure/git/verification-command.js";
 import { OutpostError } from "../domain/errors.js";
 import { git } from "../infrastructure/git/command.js";
 import { remoteSyncLimits } from "./remote-workspace.constants.js";
@@ -40,42 +42,32 @@ export async function validateChanges(context, changes, synchronized, expected,
     }
     if ((await digest(workspace.directory, recovery)) !== expected)
         throw new OutpostError("conflict", "Host workspace changed while the remote sandbox was active", { recovery });
-    if (head !== synchronized) {
-        await git(workspace.directory, [
-            "fetch",
-            join(transfer, "commits.bundle"),
-            "HEAD",
-        ]);
-        await git(workspace.directory, [
+    const validation = join(transfer, "validation");
+    if (head === synchronized)
+        await prepareHistoryValidation(context, transfer);
+    if (head !== synchronized)
+        await verificationGit(validation, [
             "merge-base",
             "--is-ancestor",
-            "HEAD",
-            "FETCH_HEAD",
+            synchronized,
+            head,
         ]);
-    }
-    const validation = join(transfer, "validation");
-    await git(workspace.directory, [
-        "worktree",
-        "add",
-        "--detach",
-        validation,
-        head,
-    ]);
+    await verificationGit(validation, ["checkout", "--detach", head]);
     try {
         if ((await readFile(patch)).length)
-            await git(validation, ["apply", "--binary", patch]);
+            await verificationGit(validation, ["apply", "--binary", patch]);
         if (!options.includeUncommitted && (await readFile(initialPatch)).length)
-            await git(validation, ["apply", "--binary", initialPatch]);
+            await verificationGit(validation, ["apply", "--binary", initialPatch]);
         if (!options.includeUncommitted && (await readFile(initialIndex)).length)
-            await git(validation, ["apply", "--cached", "--binary", initialIndex]);
+            await verificationGit(validation, [
+                "apply",
+                "--cached",
+                "--binary",
+                initialIndex,
+            ]);
     }
     finally {
-        await git(workspace.directory, [
-            "worktree",
-            "remove",
-            "--force",
-            validation,
-        ]);
+        await rm(validation, { recursive: true, force: true });
     }
 }
 //# sourceMappingURL=remote-validation.js.map

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 { 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"]}
+{"version":3,"file":"remote-validation.js","sourceRoot":"","sources":["../../src/application/remote-validation.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile, rm } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { prepareHistoryValidation } from \"./remote-history.ts\";\nimport { verificationGit } from \"../infrastructure/git/verification-command.ts\";\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  const validation = join(transfer, \"validation\");\n  if (head === synchronized) await prepareHistoryValidation(context, transfer);\n  if (head !== synchronized)\n    await verificationGit(validation, [\n      \"merge-base\",\n      \"--is-ancestor\",\n      synchronized,\n      head,\n    ]);\n  await verificationGit(validation, [\"checkout\", \"--detach\", head]);\n  try {\n    if ((await readFile(patch)).length)\n      await verificationGit(validation, [\"apply\", \"--binary\", patch]);\n    if (!options.includeUncommitted && (await readFile(initialPatch)).length)\n      await verificationGit(validation, [\"apply\", \"--binary\", initialPatch]);\n    if (!options.includeUncommitted && (await readFile(initialIndex)).length)\n      await verificationGit(validation, [\n        \"apply\",\n        \"--cached\",\n        \"--binary\",\n        initialIndex,\n      ]);\n  } finally {\n    await rm(validation, { recursive: true, force: true });\n  }\n}\n"]}

package/dist/application/remote-workspace.js

@@ -2,7 +2,8 @@ import { randomUUID } from "node:crypto";
 import { mkdir, readFile, rm } from "node:fs/promises";
 import { join, posix } from "node:path";
 import { OutpostError } from "../domain/errors.js";
-import { safeDestination } from "../infrastructure/files.js";
+import { seedHistory } from "./remote-history.js";
+import { uploadFiles } from "./remote-upload.js";
 import { git } from "../infrastructure/git/command.js";
 import { gitDefaults } from "../infrastructure/git/git.constants.js";
 import { applyChanges } from "./remote-apply.js";
@@ -14,10 +15,7 @@ export async function seedRemote(workspace, lease, options = {}) {
     options.signal?.throwIfAborted();
     const recovery = join(workspace.repository, ".outpost", "recovery", randomUUID());
     await mkdir(recovery, { recursive: true });
-    const bundle = join(recovery, "initial.bundle");
-    await git(workspace.directory, ["bundle", "create", bundle, "--all", "HEAD"]);
     const remoteBundle = posix.join(lease.root.replaceAll("\\", "/"), "..", `outpost-${randomUUID()}.bundle`);
-    await lease.upload(bundle, remoteBundle);
     let initializing = true, failed = false;
     const run = async (args) => {
         let result;
@@ -46,8 +44,7 @@ export async function seedRemote(workspace, lease, options = {}) {
     };
     await run(["init"]);
     await run(["config", "core.autocrlf", "false"]);
-    await run(["fetch", remoteBundle, "HEAD"]);
-    await run(["checkout", "-B", workspace.branch, "FETCH_HEAD"]);
+    await seedHistory(workspace, lease, options, recovery, remoteBundle, run);
     for (const key of ["user.name", "user.email"]) {
         const fallback = key === "user.name" ? "Outpost" : "outpost@localhost";
         const value = (await git(workspace.repository, ["config", "--get", key]).catch(() => fallback)).trim() || fallback;
@@ -80,10 +77,7 @@ export async function seedRemote(workspace, lease, options = {}) {
         await lease.upload(initialPatch, `${remoteBundle}.patch`);
         await run(["apply", "--binary", `${remoteBundle}.patch`]);
     }
-    for (const file of options.includeUncommitted
-        ? await extras(workspace.directory)
-        : [])
-        await lease.upload(await safeDestination(workspace.directory, file), posix.join(lease.root, file));
+    await uploadFiles(lease, workspace.directory, options.includeUncommitted ? await extras(workspace.directory) : [], { ...(options.signal ? { signal: options.signal } : {}) });
     let synchronized = (await run(["rev-parse", "HEAD"])).trim();
     initializing = false;
     let 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    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"]}
+{"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 { seedHistory } from \"./remote-history.ts\";\nimport { uploadFiles } from \"./remote-upload.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 remoteBundle = posix.join(\n    lease.root.replaceAll(\"\\\\\", \"/\"),\n    \"..\",\n    `outpost-${randomUUID()}.bundle`,\n  );\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 seedHistory(workspace, lease, options, recovery, remoteBundle, run);\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  await uploadFiles(\n    lease,\n    workspace.directory,\n    options.includeUncommitted ? await extras(workspace.directory) : [],\n    { ...(options.signal ? { signal: options.signal } : {}) },\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/sandbox-activity.d.ts

@@ -0,0 +1,3 @@
+import type { SandboxLease } from "../domain/sandbox.types.ts";
+import type { ResourceActivity } from "../infrastructure/resource-activity.types.ts";
+export declare function trackedSandboxLease(lease: SandboxLease, activity: ResourceActivity): SandboxLease;

package/dist/application/sandbox-activity.js

@@ -0,0 +1,25 @@
+export function trackedSandboxLease(lease, activity) {
+    const transfers = lease.fileTransfers;
+    const upload = transfers?.uploadBatch?.bind(transfers);
+    const uploadBatch = upload
+        ? (...args) => activity.run("upload-batch", () => upload(...args))
+        : undefined;
+    return {
+        ...lease,
+        invoke: (command) => activity.run("invoke", () => lease.invoke(command)),
+        upload: (source, destination, options) => activity.run("upload", () => lease.upload(source, destination, options)),
+        download: (source, destination, options) => activity.run("download", () => lease.download(source, destination, options)),
+        release: lease.release.bind(lease),
+        ...(transfers
+            ? {
+                fileTransfers: {
+                    ...transfers,
+                    ...(uploadBatch ? { uploadBatch } : {}),
+                    manifest: (source, paths, options) => activity.run("manifest", () => transfers.manifest(source, paths, options)),
+                    downloadBatch: (source, entries, destination, options) => activity.run("download-batch", () => transfers.downloadBatch(source, entries, destination, options)),
+                },
+            }
+            : {}),
+    };
+}
+//# sourceMappingURL=sandbox-activity.js.map

package/dist/application/sandbox-activity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sandbox-activity.js","sourceRoot":"","sources":["../../src/application/sandbox-activity.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,mBAAmB,CACjC,KAAmB,EACnB,QAA0B;IAE1B,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC;IACtC,MAAM,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,MAAM,WAAW,GAAiC,MAAM;QACtD,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QAClE,CAAC,CAAC,SAAS,CAAC;IACd,OAAO;QACL,GAAG,KAAK;QACR,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CACvC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1E,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CACzC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,CAC5B,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAC7C;QACH,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QAClC,GAAG,CAAC,SAAS;YACX,CAAC,CAAC;gBACE,aAAa,EAAE;oBACb,GAAG,SAAS;oBACZ,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvC,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CACnC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,CAC5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAC3C;oBACH,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CACvD,QAAQ,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAClC,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAC/D;iBACJ;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC","sourcesContent":["import type { FileTransfers, SandboxLease } from \"../domain/sandbox.types.ts\";\nimport type { ResourceActivity } from \"../infrastructure/resource-activity.types.ts\";\n\nexport function trackedSandboxLease(\n  lease: SandboxLease,\n  activity: ResourceActivity,\n): SandboxLease {\n  const transfers = lease.fileTransfers;\n  const upload = transfers?.uploadBatch?.bind(transfers);\n  const uploadBatch: FileTransfers[\"uploadBatch\"] = upload\n    ? (...args) => activity.run(\"upload-batch\", () => upload(...args))\n    : undefined;\n  return {\n    ...lease,\n    invoke: (command) => activity.run(\"invoke\", () => lease.invoke(command)),\n    upload: (source, destination, options) =>\n      activity.run(\"upload\", () => lease.upload(source, destination, options)),\n    download: (source, destination, options) =>\n      activity.run(\"download\", () =>\n        lease.download(source, destination, options),\n      ),\n    release: lease.release.bind(lease),\n    ...(transfers\n      ? {\n          fileTransfers: {\n            ...transfers,\n            ...(uploadBatch ? { uploadBatch } : {}),\n            manifest: (source, paths, options) =>\n              activity.run(\"manifest\", () =>\n                transfers.manifest(source, paths, options),\n              ),\n            downloadBatch: (source, entries, destination, options) =>\n              activity.run(\"download-batch\", () =>\n                transfers.downloadBatch(source, entries, destination, options),\n              ),\n          },\n        }\n      : {}),\n  };\n}\n"]}

package/dist/application/sandbox-provision.js

@@ -1,13 +1,16 @@
-import { stat } from "node:fs/promises";
+import { lstat } from "node:fs/promises";
 import { join, posix } from "node:path";
 import { invariant } from "../domain/errors.js";
 import { git } from "../infrastructure/git/command.js";
 import { executeProcess } from "../infrastructure/process.js";
 import { resolveVariables } from "../infrastructure/settings.js";
+import { registerResourceActivity } from "../infrastructure/resource-activity.js";
+import { trackedSandboxLease } from "./sandbox-activity.js";
 import { boundedTransfers } from "../infrastructure/transfer.js";
 import { docker } from "../providers/docker.js";
 import { prepareAdapter } from "./agent-bootstrap.js";
 import { hooks } from "./lifecycle-hooks.js";
+import { uploadFiles } from "./remote-upload.js";
 import { seedRemote } from "./remote-workspace.js";
 import { startupFailure } from "./startup-recovery.js";
 import { workspaces } from "./workspace-registry.js";
@@ -18,7 +21,10 @@ export async function provisionSandbox(options) {
     if (provider.placement === "remote" && !options.workspace && !options.branch)
         options = { ...options, branch: { mode: "integrate" } };
     invariant(!options.workspace ||
-        (!options.repository && !options.branch && !options.copies), "A supplied workspace owns its repository, branch and copied inputs");
+        (!options.repository &&
+            !options.branch &&
+            !options.copies &&
+            !options.storageQuota), "A supplied workspace owns its repository, branch, copied inputs and storage quota");
     const owned = !options.workspace;
     invariant(provider.placement !== "remote" ||
         ((options.workspace?.policy ?? options.branch)?.mode !== "current" &&
@@ -33,9 +39,17 @@ export async function provisionSandbox(options) {
         ? AbortSignal.any([options.signal, stop.signal])
         : stop.signal;
     let lease, sync;
+    let activity;
+    let acquisitionStarted = false;
     const prepared = new Map();
     const staging = join(workspace.repository, ".outpost", "recovery", "conversations");
     try {
+        activity = await registerResourceActivity({
+            repository: workspace.repository,
+            workspace: workspace.directory,
+            provider: provider.name,
+            placement: provider.placement,
+        });
         const configured = await resolveVariables(workspace.repository, {}, provider.variables);
         const name = (await git(workspace.repository, ["config", "--get", "user.name"]).catch(() => "Outpost")).trim();
         const email = (await git(workspace.repository, ["config", "--get", "user.email"]).catch(() => "outpost@localhost")).trim();
@@ -46,13 +60,14 @@ export async function provisionSandbox(options) {
             GIT_COMMITTER_EMAIL: email,
             ...configured,
         };
-        lease = boundedTransfers(await provider.acquire({
+        acquisitionStarted = true;
+        lease = boundedTransfers(trackedSandboxLease(await provider.acquire({
             repository: workspace.repository,
             directory: workspace.directory,
             gitDirectories: workspace.gitDirectories,
             variables,
             signal: setupSignal,
-        }), {
+        }), activity), {
             ...(options.limits?.copyMs
                 ? { deadlineMs: options.limits.copyMs }
                 : {}),
@@ -63,13 +78,24 @@ export async function provisionSandbox(options) {
                 ...(options.limits ? { limits: options.limits } : {}),
                 signal: setupSignal,
             });
-            for (const path of options.copies ?? [])
-                if (await stat(join(workspace.directory, path)).catch((error) => {
+            const copiedFiles = [];
+            for (const path of options.copies ?? []) {
+                const info = await lstat(join(workspace.directory, path)).catch((error) => {
                     if (error.code === "ENOENT")
                         return undefined;
                     throw error;
-                }))
-                    await lease.upload(join(workspace.directory, path), posix.join(lease.root, path.replaceAll("\\", "/")));
+                });
+                if (!info)
+                    continue;
+                if (info.isFile() || info.isSymbolicLink()) {
+                    copiedFiles.push(path.replaceAll("\\", "/"));
+                    continue;
+                }
+                await lease.upload(join(workspace.directory, path), posix.join(lease.root, path.replaceAll("\\", "/")), { signal: setupSignal });
+            }
+            await uploadFiles(lease, workspace.directory, [...new Set(copiedFiles)], {
+                signal: setupSignal,
+            });
             if (options.bootstrap !== false && options.agent)
                 prepared.set(options.agent, await prepareAdapter(options.agent, lease, setupSignal));
         }
@@ -83,13 +109,31 @@ export async function provisionSandbox(options) {
         const failure = initialized.find((item) => item.status === "rejected");
         if (failure?.status === "rejected")
             throw failure.reason;
+        await activity.phase("ready");
     }
     catch (cause) {
         await startupFailure(workspace, cause, options);
-        await lease?.release().catch(() => undefined);
+        const allocationUncertain = acquisitionStarted && !lease;
+        let cleanupFailed = allocationUncertain;
+        await activity?.phase("closing").catch(() => {
+            cleanupFailed = true;
+        });
+        await lease?.release().catch(() => {
+            cleanupFailed = true;
+        });
+        if (activity && !(await activity.idle()))
+            cleanupFailed = true;
         state.active = false;
         if (owned)
-            await workspace.close();
+            await workspace.close({ preserve: cleanupFailed }).catch(() => {
+                cleanupFailed = true;
+            });
+        if (cleanupFailed)
+            await activity
+                ?.phase(allocationUncertain ? "allocation-uncertain" : "cleanup-failed")
+                .catch(() => undefined);
+        if (!cleanupFailed)
+            await activity?.remove().catch(() => undefined);
         throw cause;
     }
     return {
@@ -100,6 +144,7 @@ export async function provisionSandbox(options) {
         owned,
         stop,
         runtime: lease,
+        activity,
         sync,
         prepared,
         staging,