@multiplatform.one/cli 7.22.0 → 7.23.1

package/lib/bin/multiplatformOne.mjs

@@ -5,318 +5,18 @@ import { generateDoctypeTypes, typesDrift } from "../commands/doctypeTypes.mjs";
 import { discoverE2EApp, runE2ESession } from "../commands/e2e.mjs";
 import { SINGLETON_APPS, init } from "../commands/init.mjs";
 import { updateApp } from "../commands/updateApp.mjs";
-import { createRequire } from "node:module";
 import fsSync from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import fs from "node:fs/promises";
 import { formatServiceList, lookupProjectRoot, waitForFrappe, waitForKeycloak, waitForPostgres, waitServices } from "@multiplatform.one/utils/dev";
 import { Command } from "commander";
+import dotenv from "dotenv";
 import spawn from "nano-spawn";
 import YAML from "yaml";
 import yoctoSpinner from "yocto-spinner";
 
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-
-//#endregion
-//#region ../../node_modules/dotenv/lib/main.js
-var require_main = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const fs$1 = __require("fs");
-	const path$1 = __require("path");
-	const os = __require("os");
-	const crypto = __require("crypto");
-	const TIPS = [
-		"◈ encrypted .env [www.dotenvx.com]",
-		"◈ secrets for agents [www.dotenvx.com]",
-		"⌁ auth for agents [www.vestauth.com]",
-		"⌘ custom filepath { path: '/custom/path/.env' }",
-		"⌘ enable debugging { debug: true }",
-		"⌘ override existing { override: true }",
-		"⌘ suppress logs { quiet: true }",
-		"⌘ multiple files { path: ['.env.local', '.env'] }"
-	];
-	function _getRandomTip() {
-		return TIPS[Math.floor(Math.random() * TIPS.length)];
-	}
-	function parseBoolean(value) {
-		if (typeof value === "string") return ![
-			"false",
-			"0",
-			"no",
-			"off",
-			""
-		].includes(value.toLowerCase());
-		return Boolean(value);
-	}
-	function supportsAnsi() {
-		return process.stdout.isTTY;
-	}
-	function dim(text) {
-		return supportsAnsi() ? `\x1b[2m${text}\x1b[0m` : text;
-	}
-	const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
-	function parse(src) {
-		const obj = {};
-		let lines = src.toString();
-		lines = lines.replace(/\r\n?/gm, "\n");
-		let match;
-		while ((match = LINE.exec(lines)) != null) {
-			const key = match[1];
-			let value = match[2] || "";
-			value = value.trim();
-			const maybeQuote = value[0];
-			value = value.replace(/^(['"`])([\s\S]*)\1$/gm, "$2");
-			if (maybeQuote === "\"") {
-				value = value.replace(/\\n/g, "\n");
-				value = value.replace(/\\r/g, "\r");
-			}
-			obj[key] = value;
-		}
-		return obj;
-	}
-	function _parseVault(options) {
-		options = options || {};
-		const vaultPath = _vaultPath(options);
-		options.path = vaultPath;
-		const result = DotenvModule.configDotenv(options);
-		if (!result.parsed) {
-			const err = /* @__PURE__ */ new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
-			err.code = "MISSING_DATA";
-			throw err;
-		}
-		const keys = _dotenvKey(options).split(",");
-		const length = keys.length;
-		let decrypted;
-		for (let i = 0; i < length; i++) try {
-			const attrs = _instructions(result, keys[i].trim());
-			decrypted = DotenvModule.decrypt(attrs.ciphertext, attrs.key);
-			break;
-		} catch (error) {
-			if (i + 1 >= length) throw error;
-		}
-		return DotenvModule.parse(decrypted);
-	}
-	function _warn(message) {
-		console.error(`⚠ ${message}`);
-	}
-	function _debug(message) {
-		console.log(`┆ ${message}`);
-	}
-	function _log(message) {
-		console.log(`◇ ${message}`);
-	}
-	function _dotenvKey(options) {
-		if (options && options.DOTENV_KEY && options.DOTENV_KEY.length > 0) return options.DOTENV_KEY;
-		if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) return process.env.DOTENV_KEY;
-		return "";
-	}
-	function _instructions(result, dotenvKey) {
-		let uri;
-		try {
-			uri = new URL(dotenvKey);
-		} catch (error) {
-			if (error.code === "ERR_INVALID_URL") {
-				const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=development");
-				err.code = "INVALID_DOTENV_KEY";
-				throw err;
-			}
-			throw error;
-		}
-		const key = uri.password;
-		if (!key) {
-			const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: Missing key part");
-			err.code = "INVALID_DOTENV_KEY";
-			throw err;
-		}
-		const environment = uri.searchParams.get("environment");
-		if (!environment) {
-			const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: Missing environment part");
-			err.code = "INVALID_DOTENV_KEY";
-			throw err;
-		}
-		const environmentKey = `DOTENV_VAULT_${environment.toUpperCase()}`;
-		const ciphertext = result.parsed[environmentKey];
-		if (!ciphertext) {
-			const err = /* @__PURE__ */ new Error(`NOT_FOUND_DOTENV_ENVIRONMENT: Cannot locate environment ${environmentKey} in your .env.vault file.`);
-			err.code = "NOT_FOUND_DOTENV_ENVIRONMENT";
-			throw err;
-		}
-		return {
-			ciphertext,
-			key
-		};
-	}
-	function _vaultPath(options) {
-		let possibleVaultPath = null;
-		if (options && options.path && options.path.length > 0) if (Array.isArray(options.path)) {
-			for (const filepath of options.path) if (fs$1.existsSync(filepath)) possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`;
-		} else possibleVaultPath = options.path.endsWith(".vault") ? options.path : `${options.path}.vault`;
-		else possibleVaultPath = path$1.resolve(process.cwd(), ".env.vault");
-		if (fs$1.existsSync(possibleVaultPath)) return possibleVaultPath;
-		return null;
-	}
-	function _resolveHome(envPath) {
-		return envPath[0] === "~" ? path$1.join(os.homedir(), envPath.slice(1)) : envPath;
-	}
-	function _configVault(options) {
-		const debug = parseBoolean(process.env.DOTENV_CONFIG_DEBUG || options && options.debug);
-		const quiet = parseBoolean(process.env.DOTENV_CONFIG_QUIET || options && options.quiet);
-		if (debug || !quiet) _log("loading env from encrypted .env.vault");
-		const parsed = DotenvModule._parseVault(options);
-		let processEnv = process.env;
-		if (options && options.processEnv != null) processEnv = options.processEnv;
-		DotenvModule.populate(processEnv, parsed, options);
-		return { parsed };
-	}
-	function configDotenv(options) {
-		const dotenvPath = path$1.resolve(process.cwd(), ".env");
-		let encoding = "utf8";
-		let processEnv = process.env;
-		if (options && options.processEnv != null) processEnv = options.processEnv;
-		let debug = parseBoolean(processEnv.DOTENV_CONFIG_DEBUG || options && options.debug);
-		let quiet = parseBoolean(processEnv.DOTENV_CONFIG_QUIET || options && options.quiet);
-		if (options && options.encoding) encoding = options.encoding;
-		else if (debug) _debug("no encoding is specified (UTF-8 is used by default)");
-		let optionPaths = [dotenvPath];
-		if (options && options.path) if (!Array.isArray(options.path)) optionPaths = [_resolveHome(options.path)];
-		else {
-			optionPaths = [];
-			for (const filepath of options.path) optionPaths.push(_resolveHome(filepath));
-		}
-		let lastError;
-		const parsedAll = {};
-		for (const path of optionPaths) try {
-			const parsed = DotenvModule.parse(fs$1.readFileSync(path, { encoding }));
-			DotenvModule.populate(parsedAll, parsed, options);
-		} catch (e) {
-			if (debug) _debug(`failed to load ${path} ${e.message}`);
-			lastError = e;
-		}
-		const populated = DotenvModule.populate(processEnv, parsedAll, options);
-		debug = parseBoolean(processEnv.DOTENV_CONFIG_DEBUG || debug);
-		quiet = parseBoolean(processEnv.DOTENV_CONFIG_QUIET || quiet);
-		if (debug || !quiet) {
-			const keysCount = Object.keys(populated).length;
-			const shortPaths = [];
-			for (const filePath of optionPaths) try {
-				const relative = path$1.relative(process.cwd(), filePath);
-				shortPaths.push(relative);
-			} catch (e) {
-				if (debug) _debug(`failed to load ${filePath} ${e.message}`);
-				lastError = e;
-			}
-			_log(`injected env (${keysCount}) from ${shortPaths.join(",")} ${dim(`// tip: ${_getRandomTip()}`)}`);
-		}
-		if (lastError) return {
-			parsed: parsedAll,
-			error: lastError
-		};
-		else return { parsed: parsedAll };
-	}
-	function config(options) {
-		if (_dotenvKey(options).length === 0) return DotenvModule.configDotenv(options);
-		const vaultPath = _vaultPath(options);
-		if (!vaultPath) {
-			_warn(`you set DOTENV_KEY but you are missing a .env.vault file at ${vaultPath}`);
-			return DotenvModule.configDotenv(options);
-		}
-		return DotenvModule._configVault(options);
-	}
-	function decrypt(encrypted, keyStr) {
-		const key = Buffer.from(keyStr.slice(-64), "hex");
-		let ciphertext = Buffer.from(encrypted, "base64");
-		const nonce = ciphertext.subarray(0, 12);
-		const authTag = ciphertext.subarray(-16);
-		ciphertext = ciphertext.subarray(12, -16);
-		try {
-			const aesgcm = crypto.createDecipheriv("aes-256-gcm", key, nonce);
-			aesgcm.setAuthTag(authTag);
-			return `${aesgcm.update(ciphertext)}${aesgcm.final()}`;
-		} catch (error) {
-			const isRange = error instanceof RangeError;
-			const invalidKeyLength = error.message === "Invalid key length";
-			const decryptionFailed = error.message === "Unsupported state or unable to authenticate data";
-			if (isRange || invalidKeyLength) {
-				const err = /* @__PURE__ */ new Error("INVALID_DOTENV_KEY: It must be 64 characters long (or more)");
-				err.code = "INVALID_DOTENV_KEY";
-				throw err;
-			} else if (decryptionFailed) {
-				const err = /* @__PURE__ */ new Error("DECRYPTION_FAILED: Please check your DOTENV_KEY");
-				err.code = "DECRYPTION_FAILED";
-				throw err;
-			} else throw error;
-		}
-	}
-	function populate(processEnv, parsed, options = {}) {
-		const debug = Boolean(options && options.debug);
-		const override = Boolean(options && options.override);
-		const populated = {};
-		if (typeof parsed !== "object") {
-			const err = /* @__PURE__ */ new Error("OBJECT_REQUIRED: Please check the processEnv argument being passed to populate");
-			err.code = "OBJECT_REQUIRED";
-			throw err;
-		}
-		for (const key of Object.keys(parsed)) if (Object.prototype.hasOwnProperty.call(processEnv, key)) {
-			if (override === true) {
-				processEnv[key] = parsed[key];
-				populated[key] = parsed[key];
-			}
-			if (debug) if (override === true) _debug(`"${key}" is already defined and WAS overwritten`);
-			else _debug(`"${key}" is already defined and was NOT overwritten`);
-		} else {
-			processEnv[key] = parsed[key];
-			populated[key] = parsed[key];
-		}
-		return populated;
-	}
-	const DotenvModule = {
-		configDotenv,
-		_configVault,
-		_parseVault,
-		config,
-		decrypt,
-		parse,
-		populate
-	};
-	module.exports.configDotenv = DotenvModule.configDotenv;
-	module.exports._configVault = DotenvModule._configVault;
-	module.exports._parseVault = DotenvModule._parseVault;
-	module.exports.config = DotenvModule.config;
-	module.exports.decrypt = DotenvModule.decrypt;
-	module.exports.parse = DotenvModule.parse;
-	module.exports.populate = DotenvModule.populate;
-	module.exports = DotenvModule;
-}));
-
-//#endregion
 //#region src/bin/multiplatformOne.ts
-var import_main = /* @__PURE__ */ __toESM(require_main(), 1);
 const projectRoot = lookupProjectRoot();
 const availableServices = [
 	"api",
@@ -516,7 +216,7 @@ program.command("update").option("--source <path|url>", "monorepo to update from
 	});
 });
 program.command("wait").description("wait for a service to be ready").option("-i, --interval <interval>", "interval to wait for", "1000").option("-t, --timeout <timeout>", "timeout to wait for", "600000").option("-e, --dotenv <dotenv>", "dotenv file path", ".env").argument("<services>", `the services to wait for (${waitServices.join(", ")})`).action(async (servicesString, options) => {
-	import_main.default.config({ path: options.dotenv || defaultDotenvPath });
+	dotenv.config({ path: options.dotenv || defaultDotenvPath });
 	const interval = Number.parseInt(options.interval);
 	const timeout = Number.parseInt(options.timeout);
 	const services = servicesString.split(",");
@@ -532,7 +232,7 @@ program.command("wait").description("wait for a service to be ready").option("-i
 const frappe = program.command("frappe").description("manage frappe development environment").option("-e, --dotenv <dotenv>", "dotenv file path", ".env");
 frappe.command("bootstrap").description("bootstrap frappe development environment").option("-u, --update", "update dependencies").action(async (options) => {
 	const parentOptions = frappe.opts();
-	import_main.default.config({ path: parentOptions.dotenv || defaultDotenvPath });
+	dotenv.config({ path: parentOptions.dotenv || defaultDotenvPath });
 	await spawn("sh", [
 		path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/frappe.sh"),
 		"bootstrap",
@@ -556,7 +256,7 @@ frappe.command("clean").description("clean frappe bench artifacts").option("--ca
 });
 frappe.command("dev").description("start frappe development server").action(async () => {
 	const parentOptions = frappe.opts();
-	import_main.default.config({ path: parentOptions.dotenv || defaultDotenvPath });
+	dotenv.config({ path: parentOptions.dotenv || defaultDotenvPath });
 	await spawn("sh", [path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/frappe.sh"), "dev"], {
 		stdio: "inherit",
 		shell: true,
@@ -565,7 +265,7 @@ frappe.command("dev").description("start frappe development server").action(asyn
 });
 frappe.command("bench").description("run bench command").action(async () => {
 	const parentOptions = frappe.opts();
-	import_main.default.config({ path: parentOptions.dotenv || defaultDotenvPath });
+	dotenv.config({ path: parentOptions.dotenv || defaultDotenvPath });
 	await spawn("sh", [path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/frappe.sh"), "bench"], {
 		stdio: "inherit",
 		shell: true,
@@ -574,7 +274,7 @@ frappe.command("bench").description("run bench command").action(async () => {
 });
 frappe.command("types").description("generate TypeScript types for doctypes from getdoctype (auth: $FRAPPE_API_KEY, $FRAPPE_API_SECRET)").argument("<doctypes...>", "doctype names; child tables come along").option("-o, --out <file>", "write the module here instead of stdout").option("--check", "exit 1 and print the diff when --out differs from the server").option("--url <url>", "frappe base URL (default $FRAPPE_URL or http://localhost:8000)").action(async (doctypes, options) => {
 	const parentOptions = frappe.opts();
-	import_main.default.config({
+	dotenv.config({
 		path: parentOptions.dotenv || defaultDotenvPath,
 		quiet: true
 	});

package/lib/commands/merge.mjs

@@ -11,7 +11,7 @@ import { tmpdir } from "node:os";
 *   ours   = the project's HEAD (every commit the project made)
 *   theirs = the scaffold it is moving to
 *
-* `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+* `git merge-tree --write-tree` (git 2.38+) merges the scaffold's
 * evolution with the project's history; the result lands in the index and
 * worktree, never in a commit, so the project commits when it is happy.
 * `.updateignore` entries (exact files or directory prefixes, not globs) and
@@ -296,6 +296,14 @@ async function mergeScaffolds(request) {
 	const head = await gitOut(projectDir, ["rev-parse", "HEAD"]);
 	const baseCommit = request.baseDir ? await commitTreeFromDir(projectDir, request.baseDir, request.baseLabel) : await emptyCommit(projectDir, request.baseLabel);
 	const nextCommit = await commitTreeFromDir(projectDir, request.theirsDir, request.theirsLabel, baseCommit);
+	const oursCommit = await gitOut(projectDir, [
+		"commit-tree",
+		`${head}^{tree}`,
+		"-p",
+		baseCommit,
+		"-m",
+		"HEAD"
+	]);
 	let mergedTree;
 	let conflicts = [];
 	try {
@@ -303,8 +311,7 @@ async function mergeScaffolds(request) {
 			"merge-tree",
 			"--write-tree",
 			"--name-only",
-			`--merge-base=${baseCommit}`,
-			head,
+			oursCommit,
 			nextCommit
 		])).split("\n")[0].trim();
 	} catch (err) {

package/lib/source.json

@@ -1,5 +1,5 @@
 {
-  "cliVersion": "7.22.0",
+  "cliVersion": "7.23.1",
   "url": "https://git.corp.bitspur.com/multiplatform.one/mpo.git",
-  "sha": "96ad73f740428ca21d7a6ef0a82fbfd7b120df76"
+  "sha": "89886a8f78197534fdfb5aaa348d0e1e242d94f7"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "7.22.0",
+  "version": "7.23.1",
   "description": "multiplatform.one cli — mpo init clones and prunes the monorepo, mpo update merges it back",
   "keywords": [
     "create-multiplatform-app",
@@ -56,8 +56,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@multiplatform.one/utils": "7.22.0",
+    "@multiplatform.one/utils": "7.23.1",
     "commander": "^14.0.3",
+    "dotenv": "^17.4.2",
     "inquirer": "^13.4.2",
     "nano-spawn": "^2.1.0",
     "yaml": "^2.8.3",

package/src/commands/merge.spec.ts

@@ -1,5 +1,9 @@
-import { describe, expect, it } from "vitest";
-import { threeWayMergePackageJson } from "./merge";
+import { chmodSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import spawn from "nano-spawn";
+import { afterEach, describe, expect, it } from "vitest";
+import { gitOut, mergeScaffolds, threeWayMergePackageJson } from "./merge";
 
 const json = (value: unknown) => JSON.stringify(value, null, 2);
 
@@ -79,3 +83,54 @@ describe("threeWayMergePackageJson", () => {
     });
   });
 });
+
+describe("mergeScaffolds on git 2.38 and 2.39, whose merge-tree has no --merge-base", () => {
+  const scratch: string[] = [];
+  const path = process.env.PATH;
+
+  afterEach(() => {
+    process.env.PATH = path;
+    for (const dir of scratch.splice(0)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  function tempDir(files: Record<string, string> = {}): string {
+    const dir = mkdtempSync(join(tmpdir(), "mpo-merge-spec-"));
+    scratch.push(dir);
+    for (const [name, content] of Object.entries(files)) writeFileSync(join(dir, name), content);
+    return dir;
+  }
+
+  it("merges the scaffold's change into the project through history alone", async () => {
+    const shim = tempDir({
+      git: `#!/bin/sh\nfor arg in "$@"; do\n  case $arg in --merge-base*) exit 129 ;; esac\ndone\nPATH='${path}' exec git "$@"\n`,
+    });
+    chmodSync(join(shim, "git"), 0o755);
+
+    const project = tempDir({ "a.txt": "one\n", "b.txt": "b\n", "mine.txt": "mine\n" });
+    await spawn("git", ["init", "--quiet"], { cwd: project });
+    await spawn("git", ["config", "user.email", "spec@example.com"], { cwd: project });
+    await spawn("git", ["config", "user.name", "Spec"], { cwd: project });
+    await spawn("git", ["add", "-A"], { cwd: project });
+    await spawn("git", ["commit", "--quiet", "-m", "project"], { cwd: project });
+
+    process.env.PATH = `${shim}:${path}`;
+    await expect(
+      spawn("git", ["merge-tree", "--write-tree", "--merge-base=HEAD", "HEAD", "HEAD"], {
+        cwd: project,
+      }),
+    ).rejects.toMatchObject({ exitCode: 129 });
+
+    const outcome = await mergeScaffolds({
+      projectDir: project,
+      baseDir: tempDir({ "a.txt": "one\n", "b.txt": "b\n" }),
+      theirsDir: tempDir({ "a.txt": "two\n", "b.txt": "b\n" }),
+      baseLabel: "scaffold 1",
+      theirsLabel: "scaffold 2",
+    });
+
+    expect(outcome.conflicts).toEqual([]);
+    expect(outcome.changed).toBe(true);
+    expect(await gitOut(project, ["show", `${outcome.mergedTree}:a.txt`])).toBe("two");
+    expect(await gitOut(project, ["show", `${outcome.mergedTree}:mine.txt`])).toBe("mine");
+  });
+});

package/src/commands/merge.ts

@@ -5,7 +5,7 @@
  *   ours   = the project's HEAD (every commit the project made)
  *   theirs = the scaffold it is moving to
  *
- * `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+ * `git merge-tree --write-tree` (git 2.38+) merges the scaffold's
  * evolution with the project's history; the result lands in the index and
  * worktree, never in a commit, so the project commits when it is happy.
  * `.updateignore` entries (exact files or directory prefixes, not globs) and
@@ -324,6 +324,17 @@ export async function mergeScaffolds(request: MergeRequest): Promise<MergeOutcom
     request.theirsLabel,
     baseCommit,
   );
+  // merge-tree reads --merge-base only from git 2.40, and Debian bookworm
+  // ships 2.39. HEAD's tree on a commit parented by the base hands it the
+  // same base through history instead.
+  const oursCommit = await gitOut(projectDir, [
+    "commit-tree",
+    `${head}^{tree}`,
+    "-p",
+    baseCommit,
+    "-m",
+    "HEAD",
+  ]);
 
   let mergedTree: string;
   let conflicts: string[] = [];
@@ -332,8 +343,7 @@ export async function mergeScaffolds(request: MergeRequest): Promise<MergeOutcom
       "merge-tree",
       "--write-tree",
       "--name-only",
-      `--merge-base=${baseCommit}`,
-      head,
+      oursCommit,
       nextCommit,
     ]);
     mergedTree = out.split("\n")[0]!.trim();

package/types/commands/merge.d.ts

@@ -5,7 +5,7 @@
  *   ours   = the project's HEAD (every commit the project made)
  *   theirs = the scaffold it is moving to
  *
- * `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+ * `git merge-tree --write-tree` (git 2.38+) merges the scaffold's
  * evolution with the project's history; the result lands in the index and
  * worktree, never in a commit, so the project commits when it is happy.
  * `.updateignore` entries (exact files or directory prefixes, not globs) and

package/types/commands/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,wBAAsB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,wCAKzF;AAED,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAG5F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIpE;AAED,+EAA+E;AAC/E,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzF;AAuED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAkBrD;AA2ED;0EAC0E;AAC1E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAerC;AAwDD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,8FAA8F;AAC9F,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2DjF;AAED;2DAC2D;AAC3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E;AAED,gFAAgF;AAChF,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,wBAAsB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,wCAKzF;AAED,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAG5F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIpE;AAED,+EAA+E;AAC/E,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzF;AAuED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAkBrD;AA2ED;0EAC0E;AAC1E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAerC;AAwDD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,8FAA8F;AAC9F,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqEjF;AAED;2DAC2D;AAC3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E;AAED,gFAAgF;AAChF,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAuBf"}