@bensandee/tooling 0.50.0 → 0.50.2

package/dist/bin.mjs

@@ -663,13 +663,22 @@ const MONOREPO_IGNORED_KEYS = new Set(["setupVitest", "projectType"]);
 function saveToolingConfig(ctx, config) {
 	const defaults = computeDefaults(config.targetDir);
 	const isMonorepo = config.structure === "monorepo";
+	const existing = ctx.exists(CONFIG_FILE) ? ctx.read(CONFIG_FILE) : void 0;
+	const overrideKeySet = new Set(OVERRIDE_KEYS);
+	const preserved = {};
+	if (existing) {
+		const result = ToolingConfigSchema.safeParse(JSON.parse(existing));
+		if (result.success) {
+			for (const [key, value] of Object.entries(result.data)) if (key !== "$schema" && !overrideKeySet.has(key)) preserved[key] = value;
+		}
+	}
 	const overrides = { $schema: "node_modules/@bensandee/tooling/tooling.schema.json" };
 	for (const key of OVERRIDE_KEYS) {
 		if (isMonorepo && MONOREPO_IGNORED_KEYS.has(key)) continue;
 		if (config[key] !== defaults[key]) overrides[key] = config[key];
 	}
+	Object.assign(overrides, preserved);
 	const content = JSON.stringify(overrides, null, 2) + "\n";
-	const existing = ctx.exists(CONFIG_FILE) ? ctx.read(CONFIG_FILE) : void 0;
 	if (existing !== void 0 && contentEqual(CONFIG_FILE, existing, content)) return {
 		filePath: CONFIG_FILE,
 		action: "skipped",
@@ -1585,7 +1594,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.10.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.50.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.50.2";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.12.0";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
@@ -3359,7 +3368,7 @@ async function runGenerators(ctx) {
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.50.0 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.50.2 repo:sync\` on ${timestamp}_\n`);
 	const changed = results.filter((r) => r.action === "created" || r.action === "updated" || r.action === "archived");
 	if (changed.length > 0) {
 		const items = changed.map((r) => {
@@ -4281,7 +4290,7 @@ async function runVersionMode(executor, config) {
 	};
 	const existingPr = await findOpenPr(executor, conn, BRANCH);
 	debug(config, `Existing open PR for ${BRANCH}: ${existingPr === null ? "(none)" : `#${String(existingPr)}`}`);
-	if (existingPr === null) {
+	if (existingPr === null) try {
 		await createPr(executor, conn, {
 			title,
 			head: BRANCH,
@@ -4293,6 +4302,19 @@ async function runVersionMode(executor, config) {
 			mode: "version",
 			pr: "created"
 		};
+	} catch (error) {
+		debug(config, `createPr failed, retrying as update: ${String(error)}`);
+		const racePr = await findOpenPr(executor, conn, BRANCH);
+		if (racePr === null) throw error;
+		await updatePr(executor, conn, racePr, {
+			title,
+			body
+		});
+		log.info(`Updated version PR #${String(racePr)} (recovered from race condition)`);
+		return {
+			mode: "version",
+			pr: "updated"
+		};
 	}
 	await updatePr(executor, conn, existingPr, {
 		title,
@@ -6437,7 +6459,7 @@ const webhookSendCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.50.0",
+		version: "0.50.2",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -6458,7 +6480,7 @@ const main = defineCommand({
 		"webhook:send": webhookSendCommand
 	}
 });
-console.log(`@bensandee/tooling v0.50.0`);
+console.log(`@bensandee/tooling v0.50.2`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.50.0",
+  "version": "0.50.2",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "license": "MIT",
   "repository": {
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "citty": "^0.2.1",
+    "citty": "^0.2.2",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.3.1",
     "picomatch": "^4.0.4",