@forgecart/cli 2.202610130131.0 → 2.202610130431.0

package/dist/src/sync/sync-env-channel.d.ts

@@ -0,0 +1,47 @@
+import { type CliCredentials } from '../authorization/type/cli-authorization.types.js';
+import type { SyncEnvDigests, SyncEnvFileLines, SyncOutgoingEnv, SyncTakenEnv } from './type/sync.types.js';
+/**
+ * The laptop's side of `forgecart sync`'s env channel (#2781): EVERY env file a
+ * storefront reads — `.env`, `.env.local`, `.env.development`,
+ * `.env.development.local`, `.env.production`, `.env.production.local` — carried
+ * file for file, each one's merchant lines into the other side's file of the
+ * same name, so every key resolves in the workspace as it does on the laptop.
+ * The files are never flattened into one, and the platform's `FORGECART_*`
+ * keys never cross in any of them. What travelled is recorded per file and per
+ * key. A pull also writes the run's four credentials into `.env` — the `.env` a
+ * fresh pull writes.
+ */
+export declare class SyncEnvChannel {
+    private readonly files;
+    /** @param storefront the storefront directory. */
+    constructor(storefront: string);
+    /**
+     * The merchant lines a push carries — one entry per env file the laptop
+     * holds, its lines changed since `recorded` — and the digests to record once
+     * they land.
+     */
+    outgoing(recorded: SyncEnvDigests | null): Promise<SyncOutgoingEnv>;
+    /**
+     * The workspace's merchant lines a pull would take — one entry per env file
+     * the workspace holds, its lines for every key the laptop has not changed
+     * since `recorded`.
+     */
+    incoming(workspaceFiles: readonly SyncEnvFileLines[], recorded: SyncEnvDigests | null): Promise<SyncEnvFileLines[]>;
+    /**
+     * Take each workspace env file's merchant lines into the laptop file of the
+     * same name — created when the laptop lacks it — and the four credentials
+     * into `.env`. A file the workspace does not hold is left as it is, with the
+     * digests it last travelled with.
+     */
+    take(workspaceFiles: readonly SyncEnvFileLines[], credentials: CliCredentials, recorded: SyncEnvDigests | null): Promise<SyncTakenEnv>;
+    /** Take into one file — null for a file with neither workspace lines nor credentials to take. */
+    private takeInto;
+    /**
+     * The platform keys a pull writes into `file`: the four credentials in
+     * `.env`, in the order init writes them; none elsewhere.
+     */
+    private platformEntries;
+    /** The digests `file` last travelled with: null before a first sync, none for a file that never travelled. */
+    private recordOf;
+    private linesByFile;
+}

package/dist/src/sync/sync-env-channel.js

@@ -0,0 +1,106 @@
+import { CliCredentialKey, } from '../authorization/type/cli-authorization.types.js';
+import { STOREFRONT_ENV_FILES, StorefrontEnvFile } from '../util/dotenv.util.js';
+import { SyncDotenvFile } from './sync-dotenv.file.js';
+/**
+ * The laptop's side of `forgecart sync`'s env channel (#2781): EVERY env file a
+ * storefront reads — `.env`, `.env.local`, `.env.development`,
+ * `.env.development.local`, `.env.production`, `.env.production.local` — carried
+ * file for file, each one's merchant lines into the other side's file of the
+ * same name, so every key resolves in the workspace as it does on the laptop.
+ * The files are never flattened into one, and the platform's `FORGECART_*`
+ * keys never cross in any of them. What travelled is recorded per file and per
+ * key. A pull also writes the run's four credentials into `.env` — the `.env` a
+ * fresh pull writes.
+ */
+export class SyncEnvChannel {
+    files;
+    /** @param storefront the storefront directory. */
+    constructor(storefront) {
+        this.files = STOREFRONT_ENV_FILES.map((file) => new SyncDotenvFile(storefront, file));
+    }
+    /**
+     * The merchant lines a push carries — one entry per env file the laptop
+     * holds, its lines changed since `recorded` — and the digests to record once
+     * they land.
+     */
+    async outgoing(recorded) {
+        const files = [];
+        const digests = {};
+        for (const envFile of this.files) {
+            const outgoing = await envFile.outgoing(this.recordOf(recorded, envFile.file));
+            if (outgoing === null)
+                continue;
+            files.push({ file: envFile.file, lines: outgoing.lines });
+            digests[envFile.file] = outgoing.digests;
+        }
+        return { files, digests };
+    }
+    /**
+     * The workspace's merchant lines a pull would take — one entry per env file
+     * the workspace holds, its lines for every key the laptop has not changed
+     * since `recorded`.
+     */
+    async incoming(workspaceFiles, recorded) {
+        const workspace = this.linesByFile(workspaceFiles);
+        const files = [];
+        for (const envFile of this.files) {
+            const workspaceLines = workspace.get(envFile.file);
+            if (workspaceLines === undefined)
+                continue;
+            const lines = await envFile.incoming(workspaceLines, this.recordOf(recorded, envFile.file));
+            files.push({ file: envFile.file, lines });
+        }
+        return files;
+    }
+    /**
+     * Take each workspace env file's merchant lines into the laptop file of the
+     * same name — created when the laptop lacks it — and the four credentials
+     * into `.env`. A file the workspace does not hold is left as it is, with the
+     * digests it last travelled with.
+     */
+    async take(workspaceFiles, credentials, recorded) {
+        const workspace = this.linesByFile(workspaceFiles);
+        const digests = {};
+        let taken = 0;
+        for (const envFile of this.files) {
+            const workspaceLines = workspace.get(envFile.file);
+            const result = await this.takeInto(envFile, workspaceLines, credentials, recorded);
+            const fileDigests = result?.digests ?? recorded?.[envFile.file];
+            if (fileDigests !== undefined)
+                digests[envFile.file] = fileDigests;
+            taken += result?.taken ?? 0;
+        }
+        return { taken, digests };
+    }
+    /** Take into one file — null for a file with neither workspace lines nor credentials to take. */
+    async takeInto(envFile, workspaceLines, credentials, recorded) {
+        const platform = this.platformEntries(envFile.file, credentials);
+        if (workspaceLines === undefined && platform.size === 0)
+            return null;
+        return envFile.take(workspaceLines ?? [], platform, this.recordOf(recorded, envFile.file));
+    }
+    /**
+     * The platform keys a pull writes into `file`: the four credentials in
+     * `.env`, in the order init writes them; none elsewhere.
+     */
+    platformEntries(file, credentials) {
+        if (file !== StorefrontEnvFile.BASE)
+            return new Map();
+        return new Map([
+            [CliCredentialKey.CHANNEL_TOKEN, credentials.channelToken],
+            [CliCredentialKey.SHOP_API_URL, credentials.shopApiUrl],
+            [CliCredentialKey.ADMIN_SECRET, credentials.adminSecret],
+            [CliCredentialKey.ADMIN_API_URL, credentials.adminApiUrl],
+        ]);
+    }
+    /** The digests `file` last travelled with: null before a first sync, none for a file that never travelled. */
+    recordOf(recorded, file) {
+        if (recorded === null)
+            return null;
+        return recorded[file] ?? {};
+    }
+    linesByFile(files) {
+        return new Map(files.map(({ file, lines }) => [file, lines]));
+    }
+}
+//# sourceMappingURL=sync-env-channel.js.map

package/dist/src/sync/sync-env-channel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-env-channel.js","sourceRoot":"","sources":["../../../src/sync/sync-env-channel.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/sync-env.runner.d.ts

@@ -1,12 +1,16 @@
 import type { SyncEnvOptions } from './type/sync.types.js';
 /**
  * `forgecart sync-env [name]` (#2781) — the workspace's side of `forgecart
- * sync`, which the admin API runs in the pod: it reads the merchant lines of the
- * storefront's `.env`, or, with `--merge`, merges the lines
- * FORGECART_SYNC_ENV_LINES carries under init's merge rule, and prints ONE JSON
- * report — the merchant lines as they stand, and how many keys the merge
- * carried in. The platform's own `FORGECART_*` keys are never read out and
- * never written: a laptop's never land, the pod's never leave.
+ * sync`, which the admin API runs in the pod. It reads EVERY env file the
+ * storefront holds — `.env`, `.env.local`, `.env.development`,
+ * `.env.development.local`, `.env.production`, `.env.production.local` — or,
+ * with `--merge`, merges the lines FORGECART_SYNC_ENV_FILES carries for each
+ * file into the storefront file of that name under init's merge rule, creating
+ * one the storefront lacks. The files stay apart, so the dev-server resolves
+ * every key as the laptop does. It prints ONE JSON report: one entry per env
+ * file the storefront holds — its merchant lines as they stand, and how many
+ * keys the merge carried in. The platform's own `FORGECART_*` keys are never
+ * read out and never written: a laptop's never land, the pod's never leave.
  */
 export declare class SyncEnvRunner {
     private readonly name;
@@ -17,13 +21,25 @@ export declare class SyncEnvRunner {
      */
     constructor(name: string | undefined, options: SyncEnvOptions);
     run(): Promise<void>;
-    /** The merchant keys the variable carries, keyed to their values — platform keys and other lines dropped. */
+    /**
+     * One env file once the run is done: the merchant keys carried for it merged
+     * in — the file created when the storefront lacks it — and its merchant lines
+     * as they then stand; null for a file the storefront does not hold.
+     */
+    private settle;
+    /** A file nothing was merged into, as it stands — null when the storefront does not hold it. */
+    private held;
+    /**
+     * The merchant keys a merge carries for each env file, keyed to their values
+     * — platform keys and other lines dropped; none for a read.
+     */
     private incoming;
-    private parseLines;
+    private managedOf;
+    private parseEntries;
+    /** One entry: an env file the storefront reads — never a path outside them — and its lines. */
+    private parseEntry;
     private malformedMessage;
     private merchantLines;
     /** The report the admin API parses: ONE line of JSON on stdout. */
     private report;
-    /** The `.env` text — empty when the storefront has none; any other failure propagates. */
-    private read;
 }

package/dist/src/sync/sync-env.runner.js

@@ -1,20 +1,25 @@
-import { readFile, writeFile } from 'node:fs/promises';
+import { writeFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
+import { isJsonObject } from '../json.js';
 import { print } from '../output.js';
-import { dotenvValue, mergeDotenv, merchantAssignments } from '../util/dotenv.util.js';
+import { STOREFRONT_ENV_FILES, dotenvValue, isStorefrontEnvFile, mergeDotenv, merchantAssignments, readDotenvFile, } from '../util/dotenv.util.js';
 /**
  * The variable a merge's lines arrive in — the pod records a command's line,
  * never its environment, so the lines never land in a record.
  */
-const SYNC_ENV_LINES_VARIABLE = 'FORGECART_SYNC_ENV_LINES';
+const SYNC_ENV_FILES_VARIABLE = 'FORGECART_SYNC_ENV_FILES';
 /**
  * `forgecart sync-env [name]` (#2781) — the workspace's side of `forgecart
- * sync`, which the admin API runs in the pod: it reads the merchant lines of the
- * storefront's `.env`, or, with `--merge`, merges the lines
- * FORGECART_SYNC_ENV_LINES carries under init's merge rule, and prints ONE JSON
- * report — the merchant lines as they stand, and how many keys the merge
- * carried in. The platform's own `FORGECART_*` keys are never read out and
- * never written: a laptop's never land, the pod's never leave.
+ * sync`, which the admin API runs in the pod. It reads EVERY env file the
+ * storefront holds — `.env`, `.env.local`, `.env.development`,
+ * `.env.development.local`, `.env.production`, `.env.production.local` — or,
+ * with `--merge`, merges the lines FORGECART_SYNC_ENV_FILES carries for each
+ * file into the storefront file of that name under init's merge rule, creating
+ * one the storefront lacks. The files stay apart, so the dev-server resolves
+ * every key as the laptop does. It prints ONE JSON report: one entry per env
+ * file the storefront holds — its merchant lines as they stand, and how many
+ * keys the merge carried in. The platform's own `FORGECART_*` keys are never
+ * read out and never written: a laptop's never land, the pod's never leave.
  */
 export class SyncEnvRunner {
     name;
@@ -28,31 +33,60 @@ export class SyncEnvRunner {
         this.options = options;
     }
     async run() {
-        const envPath = join(this.name ? resolve(process.cwd(), this.name) : process.cwd(), '.env');
-        const existing = await this.read(envPath);
-        if (this.options.merge !== true) {
-            this.report({ lines: this.merchantLines(existing), merged: 0 });
-            return;
+        const storefront = this.name ? resolve(process.cwd(), this.name) : process.cwd();
+        const incoming = this.incoming();
+        const files = [];
+        for (const file of STOREFRONT_ENV_FILES) {
+            const settled = await this.settle(storefront, file, incoming.get(file));
+            if (settled !== null)
+                files.push(settled);
         }
-        const managed = this.incoming(process.env[SYNC_ENV_LINES_VARIABLE]);
-        if (managed.size === 0) {
-            this.report({ lines: this.merchantLines(existing), merged: 0 });
-            return;
-        }
-        const next = mergeDotenv(existing, managed);
+        this.report({ files });
+    }
+    /**
+     * One env file once the run is done: the merchant keys carried for it merged
+     * in — the file created when the storefront lacks it — and its merchant lines
+     * as they then stand; null for a file the storefront does not hold.
+     */
+    async settle(storefront, file, managed) {
+        const path = join(storefront, file);
+        const existing = await readDotenvFile(path);
+        if (managed === undefined || managed.size === 0)
+            return this.held(file, existing);
+        const next = mergeDotenv(existing ?? '', managed);
         if (next !== existing)
-            await writeFile(envPath, next, 'utf8');
-        this.report({ lines: this.merchantLines(next), merged: managed.size });
+            await writeFile(path, next, 'utf8');
+        return { file, lines: this.merchantLines(next), merged: managed.size };
+    }
+    /** A file nothing was merged into, as it stands — null when the storefront does not hold it. */
+    held(file, content) {
+        if (content === null)
+            return null;
+        return { file, lines: this.merchantLines(content), merged: 0 };
+    }
+    /**
+     * The merchant keys a merge carries for each env file, keyed to their values
+     * — platform keys and other lines dropped; none for a read.
+     */
+    incoming() {
+        const incoming = new Map();
+        if (this.options.merge !== true)
+            return incoming;
+        for (const entry of this.parseEntries(process.env[SYNC_ENV_FILES_VARIABLE])) {
+            const { file, lines } = this.parseEntry(entry);
+            if (incoming.has(file))
+                throw new Error(this.malformedMessage());
+            incoming.set(file, this.managedOf(lines));
+        }
+        return incoming;
     }
-    /** The merchant keys the variable carries, keyed to their values — platform keys and other lines dropped. */
-    incoming(raw) {
-        const lines = this.parseLines(raw);
+    managedOf(lines) {
         return new Map([...merchantAssignments(lines)].map(([key, line]) => [
             key,
             dotenvValue(line, key),
         ]));
     }
-    parseLines(raw) {
+    parseEntries(raw) {
         if (raw === undefined)
             throw new Error(this.malformedMessage());
         let parsed;
@@ -64,14 +98,24 @@ export class SyncEnvRunner {
         }
         if (!Array.isArray(parsed))
             throw new Error(this.malformedMessage());
-        const items = parsed;
+        return parsed;
+    }
+    /** One entry: an env file the storefront reads — never a path outside them — and its lines. */
+    parseEntry(entry) {
+        if (!isJsonObject(entry))
+            throw new Error(this.malformedMessage());
+        const { file, lines } = entry;
+        if (typeof file !== 'string' || !isStorefrontEnvFile(file) || !Array.isArray(lines)) {
+            throw new Error(this.malformedMessage());
+        }
+        const items = lines;
         if (!items.every((item) => typeof item === 'string')) {
             throw new Error(this.malformedMessage());
         }
-        return items;
+        return { file, lines: items };
     }
     malformedMessage() {
-        return `--merge reads ${SYNC_ENV_LINES_VARIABLE}, which must hold a JSON list of KEY=value lines.`;
+        return `--merge reads ${SYNC_ENV_FILES_VARIABLE}, which must hold a JSON list of { "file", "lines" } entries — each file one of ${STOREFRONT_ENV_FILES.join(', ')}, named once, and its lines KEY=value lines.`;
     }
     merchantLines(content) {
         return [...merchantAssignments(content.split('\n')).values()];
@@ -80,16 +124,5 @@ export class SyncEnvRunner {
     report(report) {
         print(JSON.stringify(report));
     }
-    /** The `.env` text — empty when the storefront has none; any other failure propagates. */
-    async read(path) {
-        try {
-            return await readFile(path, 'utf8');
-        }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return '';
-            throw error;
-        }
-    }
 }
 //# sourceMappingURL=sync-env.runner.js.map

package/dist/src/sync/sync-env.runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-env.runner.js","sourceRoot":"","sources":["../../../src/sync/sync-env.runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-env.runner.js","sourceRoot":"","sources":["../../../src/sync/sync-env.runner.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/sync-record.file.d.ts

@@ -1,27 +1,35 @@
-import type { SyncRecord } from './type/sync.types.js';
+import type { SyncEnvDigests, SyncRecord } from './type/sync.types.js';
 /**
  * The last sync of one storefront (#2781), kept in `.forgecart/sync/state.json`
  * beside the private repository: the channel it ran against — a digest of the
- * admin API and the channel token, never the token — the serving commit the
- * laptop's tree last matched, and a digest of every merchant `.env` line as it
- * last travelled. A record of another channel is no record: a storefront pointed
- * at another channel syncs as a first sync.
+ * channel token, never the token — the serving commit the laptop's tree last
+ * matched, and a digest of every merchant line of every env file as it last
+ * travelled, file by file. A record of another channel is no record: a
+ * storefront pointed at another channel syncs as a first sync.
+ *
+ * The admin API's URL is no part of the channel: it is the route a run reaches
+ * the shop by, and a hop in front of the shop — a proxy, an ingress, the edge —
+ * changes it while the channel and its board stay the same (factory task
+ * 2375). A laptop that pulled through one route pushes through another onto
+ * the base it pulled.
  */
 export declare class SyncRecordFile {
-    private readonly channel;
     private readonly path;
+    private readonly channel;
     /**
      * @param storefront the storefront directory.
-     * @param channel the digest naming the channel this run syncs against.
+     * @param channelToken the token of the channel this run syncs against, kept only as its digest.
      */
-    constructor(storefront: string, channel: string);
+    constructor(storefront: string, channelToken: string);
     /** This channel's last sync — null before the first, or after a sync against another channel. */
     read(): Promise<SyncRecord | null>;
-    /** Record a sync that left the laptop on `servingSha`, with the `.env` lines as `env` digests them. */
-    write(servingSha: string, env: Readonly<Record<string, string>>): Promise<void>;
+    /** Record a sync that left the laptop on `servingSha`, with the env files' lines as `env` digests them. */
+    write(servingSha: string, env: Readonly<SyncEnvDigests>): Promise<void>;
     /** The record's fields, checked one by one: a file sync cannot read is an error naming it. */
     private parse;
+    /** The env digests, file by file: every file one a storefront reads, every digest a string. */
     private parseEnv;
+    private parseFileDigests;
     private unreadableMessage;
     /** The record's text — null before the first sync; any other failure propagates. */
     private readIfPresent;

package/dist/src/sync/sync-record.file.js

@@ -1,6 +1,8 @@
+import { createHash } from 'node:crypto';
 import { readFile, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { isJsonObject } from '../json.js';
+import { isStorefrontEnvFile } from '../util/dotenv.util.js';
 import { SYNC_STATE_PATH } from './sync-repository.js';
 /** The record's file, in the private state directory. */
 const RECORD_FILE = 'state.json';
@@ -10,21 +12,27 @@ const COMMIT_ID_LENGTHS = new Set([40, 64]);
 /**
  * The last sync of one storefront (#2781), kept in `.forgecart/sync/state.json`
  * beside the private repository: the channel it ran against — a digest of the
- * admin API and the channel token, never the token — the serving commit the
- * laptop's tree last matched, and a digest of every merchant `.env` line as it
- * last travelled. A record of another channel is no record: a storefront pointed
- * at another channel syncs as a first sync.
+ * channel token, never the token — the serving commit the laptop's tree last
+ * matched, and a digest of every merchant line of every env file as it last
+ * travelled, file by file. A record of another channel is no record: a
+ * storefront pointed at another channel syncs as a first sync.
+ *
+ * The admin API's URL is no part of the channel: it is the route a run reaches
+ * the shop by, and a hop in front of the shop — a proxy, an ingress, the edge —
+ * changes it while the channel and its board stay the same (factory task
+ * 2375). A laptop that pulled through one route pushes through another onto
+ * the base it pulled.
  */
 export class SyncRecordFile {
-    channel;
     path;
+    channel;
     /**
      * @param storefront the storefront directory.
-     * @param channel the digest naming the channel this run syncs against.
+     * @param channelToken the token of the channel this run syncs against, kept only as its digest.
      */
-    constructor(storefront, channel) {
-        this.channel = channel;
+    constructor(storefront, channelToken) {
         this.path = join(storefront, ...SYNC_STATE_PATH, RECORD_FILE);
+        this.channel = createHash('sha256').update(channelToken).digest('hex');
     }
     /** This channel's last sync — null before the first, or after a sync against another channel. */
     async read() {
@@ -34,7 +42,7 @@ export class SyncRecordFile {
         const record = this.parse(raw);
         return record.channel === this.channel ? record : null;
     }
-    /** Record a sync that left the laptop on `servingSha`, with the `.env` lines as `env` digests them. */
+    /** Record a sync that left the laptop on `servingSha`, with the env files' lines as `env` digests them. */
     async write(servingSha, env) {
         const record = { channel: this.channel, servingSha, env: { ...env } };
         await writeFile(this.path, `${JSON.stringify(record, null, 2)}\n`, 'utf8');
@@ -59,10 +67,22 @@ export class SyncRecordFile {
         }
         return { channel, servingSha, env: this.parseEnv(env) };
     }
+    /** The env digests, file by file: every file one a storefront reads, every digest a string. */
     parseEnv(env) {
         if (!isJsonObject(env))
             throw new Error(this.unreadableMessage());
-        const entries = Object.entries(env);
+        const digests = {};
+        for (const [file, fileDigests] of Object.entries(env)) {
+            if (!isStorefrontEnvFile(file))
+                throw new Error(this.unreadableMessage());
+            digests[file] = this.parseFileDigests(fileDigests);
+        }
+        return digests;
+    }
+    parseFileDigests(fileDigests) {
+        if (!isJsonObject(fileDigests))
+            throw new Error(this.unreadableMessage());
+        const entries = Object.entries(fileDigests);
         if (!entries.every((entry) => typeof entry[1] === 'string')) {
             throw new Error(this.unreadableMessage());
         }

package/dist/src/sync/sync-record.file.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-record.file.js","sourceRoot":"","sources":["../../../src/sync/sync-record.file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-record.file.js","sourceRoot":"","sources":["../../../src/sync/sync-record.file.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/sync-repository.d.ts

@@ -60,12 +60,17 @@ export declare class SyncRepository {
     /**
      * The ONE commit a push sends: the laptop's tree on the serving tip `serving`,
      * keeping the platform's `.forgecart/` the serving tree carries — the laptop's
-     * own never travels.
+     * own never travels. It is dated as the serving tip it is cut on, so the same
+     * tree cut on the same tip is the same commit on every run: a run that
+     * re-sends a push an earlier run broke off sends the very bundle the
+     * workspace holds parts of. The pod mints the landed commit itself.
      */
     pushCommit(localTree: string, serving: string): Promise<string>;
     /**
      * `commit` as the git bundle a push sends: its one ref `refs/heads/serving`,
-     * its one prerequisite the serving tip `serving` it was cut on.
+     * its one prerequisite the serving tip `serving` it was cut on. The pack is
+     * written by one thread, so the same commit is the same bundle, byte for
+     * byte, on every run.
      */
     pushBundle(commit: string, serving: string): Promise<Buffer>;
     /** The top-level entries of `tree`, in `ls-tree -z` form — the form `mktree -z` reads back. */

package/dist/src/sync/sync-repository.js

@@ -188,23 +188,41 @@ export class SyncRepository {
     /**
      * The ONE commit a push sends: the laptop's tree on the serving tip `serving`,
      * keeping the platform's `.forgecart/` the serving tree carries — the laptop's
-     * own never travels.
+     * own never travels. It is dated as the serving tip it is cut on, so the same
+     * tree cut on the same tip is the same commit on every run: a run that
+     * re-sends a push an earlier run broke off sends the very bundle the
+     * workspace holds parts of. The pod mints the landed commit itself.
      */
     async pushCommit(localTree, serving) {
         const local = await this.topLevelEntries(localTree);
         const platform = (await this.topLevelEntries(`${serving}^{tree}`)).filter((entry) => this.entryName(entry) === PLATFORM_DIR);
         const tree = await this.makeTree([...local, ...platform]);
-        return this.line(await this.git(['commit-tree', tree, '-p', serving, '-m', PUSH_MESSAGE]));
+        const servingDate = await this.git(['log', '-1', '--format=%cd', '--date=raw', serving]);
+        const date = `@${this.line(servingDate)}`;
+        const run = await this.git(['commit-tree', tree, '-p', serving, '-m', PUSH_MESSAGE], {
+            env: { GIT_AUTHOR_DATE: date, GIT_COMMITTER_DATE: date },
+        });
+        return this.line(run);
     }
     /**
      * `commit` as the git bundle a push sends: its one ref `refs/heads/serving`,
-     * its one prerequisite the serving tip `serving` it was cut on.
+     * its one prerequisite the serving tip `serving` it was cut on. The pack is
+     * written by one thread, so the same commit is the same bundle, byte for
+     * byte, on every run.
      */
     async pushBundle(commit, serving) {
         await this.git(['update-ref', PUSH_REF, commit]);
         const bundlePath = this.spoolPath('push');
         try {
-            await this.git(['bundle', 'create', bundlePath, PUSH_REF, `^${serving}`]);
+            await this.git([
+                '-c',
+                'pack.threads=1',
+                'bundle',
+                'create',
+                bundlePath,
+                PUSH_REF,
+                `^${serving}`,
+            ]);
             return await readFile(bundlePath);
         }
         finally {
@@ -297,7 +315,10 @@ export class SyncRepository {
      * caller reads it as an answer.
      */
     async git(args, options = {}) {
-        const env = this.repositoryEnv(options.indexFile ?? join(this.gitDir, INDEX_FILE));
+        const env = {
+            ...this.repositoryEnv(options.indexFile ?? join(this.gitDir, INDEX_FILE)),
+            ...options.env,
+        };
         const run = await this.spawnGit([...this.gitFlags(), ...args], env, options);
         if (options.allowFailure !== true)
             this.assertSucceeded(args, run);