@icebreakers/monorepo 3.2.11 → 3.2.13

package/dist/cli.cjs

@@ -1,4 +1,4 @@
-const require_upgrade = require('./upgrade-BDVNfq80.cjs');
+const require_upgrade = require('./upgrade-DjOZstRC.cjs');
 let node_process = require("node:process");
 node_process = require_upgrade.__toESM(node_process);
 let _icebreakers_monorepo_templates = require("@icebreakers/monorepo-templates");

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { C as syncSkills, F as generateAgenticTemplate, I as generateAgenticTemplates, L as loadAgenticTasks, M as resolveCommandConfig, N as createTimestampFolderName, O as name, P as defaultAgenticBaseDir, R as logger, S as skillTargets, _ as getCreateChoices, b as cleanProjects, g as defaultTemplate, h as createNewProject, i as init, k as version, n as syncNpmMirror, r as setVscodeBinaryMirror, t as upgradeMonorepo } from "./upgrade-zJC3jLQe.mjs";
+import { C as syncSkills, F as generateAgenticTemplate, I as generateAgenticTemplates, L as loadAgenticTasks, M as resolveCommandConfig, N as createTimestampFolderName, O as name, P as defaultAgenticBaseDir, R as logger, S as skillTargets, _ as getCreateChoices, b as cleanProjects, g as defaultTemplate, h as createNewProject, i as init, k as version, n as syncNpmMirror, r as setVscodeBinaryMirror, t as upgradeMonorepo } from "./upgrade-DiPTZW6J.mjs";
 import process from "node:process";
 import { input, program, select } from "@icebreakers/monorepo-templates";
 

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_upgrade = require('./upgrade-BDVNfq80.cjs');
+const require_upgrade = require('./upgrade-DjOZstRC.cjs');
 let _icebreakers_monorepo_templates = require("@icebreakers/monorepo-templates");
 
 exports.GitClient = require_upgrade.GitClient;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { A as defineMonorepoConfig, B as getWorkspacePackages, C as syncSkills, D as templatesDir, E as rootDir, F as generateAgenticTemplate, I as generateAgenticTemplates, L as loadAgenticTasks, M as resolveCommandConfig, N as createTimestampFolderName, O as name, P as defaultAgenticBaseDir, R as logger, S as skillTargets, T as packageDir, V as GitClient, _ as getCreateChoices, a as escapeStringRegexp, b as cleanProjects, c as isFileChanged, d as toWorkspaceGitignorePath, f as updateIssueTemplateConfig, h as createNewProject, i as init, j as loadMonorepoConfig, k as version, l as isGitignoreFile, m as createContext, n as syncNpmMirror, o as isMatch, p as isIgnorableFsError, r as setVscodeBinaryMirror, s as getFileHash, t as upgradeMonorepo, u as toPublishGitignorePath, v as getTemplateMap, w as assetsDir, x as getSkillTargetPaths, y as templateMap, z as getWorkspaceData } from "./upgrade-zJC3jLQe.mjs";
+import { A as defineMonorepoConfig, B as getWorkspacePackages, C as syncSkills, D as templatesDir, E as rootDir, F as generateAgenticTemplate, I as generateAgenticTemplates, L as loadAgenticTasks, M as resolveCommandConfig, N as createTimestampFolderName, O as name, P as defaultAgenticBaseDir, R as logger, S as skillTargets, T as packageDir, V as GitClient, _ as getCreateChoices, a as escapeStringRegexp, b as cleanProjects, c as isFileChanged, d as toWorkspaceGitignorePath, f as updateIssueTemplateConfig, h as createNewProject, i as init, j as loadMonorepoConfig, k as version, l as isGitignoreFile, m as createContext, n as syncNpmMirror, o as isMatch, p as isIgnorableFsError, r as setVscodeBinaryMirror, s as getFileHash, t as upgradeMonorepo, u as toPublishGitignorePath, v as getTemplateMap, w as assetsDir, x as getSkillTargetPaths, y as templateMap, z as getWorkspaceData } from "./upgrade-DiPTZW6J.mjs";
 
 export { GitClient, assetsDir, cleanProjects, createContext, createNewProject, createTimestampFolderName, defaultAgenticBaseDir, defineMonorepoConfig, escapeStringRegexp, generateAgenticTemplate, generateAgenticTemplates, getCreateChoices, getFileHash, getSkillTargetPaths, getTemplateMap, getWorkspaceData, getWorkspacePackages, init, isFileChanged, isGitignoreFile, isIgnorableFsError, isMatch, loadAgenticTasks, loadMonorepoConfig, logger, name, packageDir, resolveCommandConfig, rootDir, setVscodeBinaryMirror, skillTargets, syncNpmMirror, syncSkills, templateMap, templatesDir, toPublishGitignorePath, toWorkspaceGitignorePath, updateIssueTemplateConfig, upgradeMonorepo, version };

package/dist/{upgrade-zJC3jLQe.mjs → upgrade-DiPTZW6J.mjs}

@@ -559,7 +559,7 @@ async function resolveCommandConfig(name, cwd) {
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.2.11";
+var version = "3.2.13";
 
 //#endregion
 //#region src/constants.ts
@@ -664,11 +664,13 @@ async function cleanProjects(cwd, overrides) {
 	});
 	const readmeZh = path.resolve(workspaceDir, "README.zh-CN.md");
 	const qoderDir = path.resolve(workspaceDir, ".qoder");
+	const docsPlansDir = path.resolve(workspaceDir, "docs/plans");
 	const skillTargets = Object.values(getSkillTargetPaths());
 	const candidates = Array.from(new Set([
 		...cleanDirs.filter(Boolean),
 		readmeZh,
 		qoderDir,
+		docsPlansDir,
 		...skillTargets
 	]));
 	await Promise.all(candidates.map(async (dir) => {
@@ -1162,9 +1164,12 @@ async function syncNpmMirror(cwd, options) {
 
 //#endregion
 //#region src/commands/upgrade/agents.ts
-function normalizeEol(input) {
+function normalizeEol$1(input) {
 	return input.replace(/\r\n/g, "\n");
 }
+function normalizeComparableContent(input) {
+	return normalizeEol$1(input).trimEnd();
+}
 function normalizeHeadingKey(line) {
 	return line.replace(/^##\s+/, "").trim().toLowerCase();
 }
@@ -1183,7 +1188,7 @@ function trimEdgeEmptyLines(lines) {
 	return next;
 }
 function parseMarkdownByH2(content) {
-	const lines = normalizeEol(content).split("\n");
+	const lines = normalizeEol$1(content).split("\n");
 	const preamble = [];
 	const sections = [];
 	let current;
@@ -1209,8 +1214,8 @@ function parseMarkdownByH2(content) {
 	};
 }
 function mergePlainText(source, target) {
-	const sourceLines = trimEdgeEmptyLines(normalizeEol(source).split("\n"));
-	const result = trimEdgeEmptyLines(normalizeEol(target).split("\n"));
+	const sourceLines = trimEdgeEmptyLines(normalizeEol$1(source).split("\n"));
+	const result = trimEdgeEmptyLines(normalizeEol$1(target).split("\n"));
 	const seen = new Set(result);
 	for (const line of sourceLines) {
 		if (!line.trim()) continue;
@@ -1220,6 +1225,9 @@ function mergePlainText(source, target) {
 	}
 	return `${result.join("\n")}\n`;
 }
+function getSectionSignature(section) {
+	return `${section.key}\n${trimEdgeEmptyLines(section.lines).join("\n")}`;
+}
 /**
 * Merge AGENTS instructions by keeping existing sections and filling missing sections
 * from source defaults. This avoids destructive overwrite while still syncing updates.
@@ -1232,13 +1240,25 @@ function mergeAgentsMarkdown(source, target) {
 	const targetSectionMap = new Map(targetParsed.sections.map((section) => [section.key, section]));
 	const mergedSections = [];
 	for (const section of sourceParsed.sections) mergedSections.push(targetSectionMap.get(section.key) ?? section);
-	for (const section of targetParsed.sections) if (!sourceSectionKeys.has(section.key)) mergedSections.push(section);
+	const seenTargetOnlySectionSignatures = /* @__PURE__ */ new Set();
+	for (const section of targetParsed.sections) if (!sourceSectionKeys.has(section.key)) {
+		const signature = getSectionSignature(section);
+		if (seenTargetOnlySectionSignatures.has(signature)) continue;
+		seenTargetOnlySectionSignatures.add(signature);
+		mergedSections.push(section);
+	}
 	const preamble = trimEdgeEmptyLines(targetParsed.preamble.length ? targetParsed.preamble : sourceParsed.preamble);
 	const blocks = [];
 	if (preamble.length) blocks.push(preamble.join("\n"));
 	for (const section of mergedSections) blocks.push(trimEdgeEmptyLines(section.lines).join("\n"));
 	return `${blocks.filter(Boolean).join("\n\n")}\n`;
 }
+/**
+* Compare AGENTS markdown with normalized EOL and trailing newline differences ignored.
+*/
+function isAgentsMarkdownEquivalent(left, right) {
+	return normalizeComparableContent(left) === normalizeComparableContent(right);
+}
 
 //#endregion
 //#region src/commands/upgrade/overwrite.ts
@@ -1441,6 +1461,35 @@ function mergeWorkspaceManifest(source, target) {
 
 //#endregion
 //#region src/commands/upgrade/index.ts
+function normalizeEol(input) {
+	return input.replace(/\r\n/g, "\n");
+}
+function normalizeGitignoreLine(line) {
+	const trimmed = line.trim();
+	if (!trimmed) return "";
+	if (trimmed.startsWith("#")) return `#${trimmed.slice(1).trim()}`;
+	return trimmed;
+}
+function isTextEquivalent(left, right) {
+	return normalizeEol(left).trimEnd() === normalizeEol(right).trimEnd();
+}
+function mergeGitignore(source, target) {
+	const sourceLines = normalizeEol(source).split("\n");
+	const result = normalizeEol(target).split("\n");
+	const seen = new Set(result.map((line) => normalizeGitignoreLine(line)).filter(Boolean));
+	for (const line of sourceLines) {
+		const normalized = normalizeGitignoreLine(line);
+		if (!normalized || seen.has(normalized)) continue;
+		seen.add(normalized);
+		result.push(line);
+	}
+	while (result.length) {
+		const last = result.at(-1);
+		if (last === void 0 || last.trim().length > 0) break;
+		result.pop();
+	}
+	return `${result.join("\n")}\n`;
+}
 /**
 * 将 assets 目录的模版文件同步到工程中，实现一键升级脚手架能力。
 */
@@ -1531,11 +1580,31 @@ async function upgradeMonorepo(opts) {
 				});
 				continue;
 			}
+			if (relPath === ".gitignore") {
+				const source = await fs.readFile(file.path, "utf8");
+				const exists = await fs.pathExists(targetPath);
+				const target = exists ? await fs.readFile(targetPath, "utf8") : "";
+				const data = exists ? mergeGitignore(source, target) : source;
+				if (exists && isTextEquivalent(target, data)) continue;
+				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
+				const action = async () => {
+					await fs.outputFile(targetPath, data, "utf8");
+					logger.success(targetPath);
+				};
+				await scheduleOverwrite(intent, {
+					relPath,
+					targetPath,
+					action,
+					pending: pendingOverwrites
+				});
+				continue;
+			}
 			if (relPath === "AGENTS.md") {
 				const source = await fs.readFile(file.path, "utf8");
 				const exists = await fs.pathExists(targetPath);
 				const target = exists ? await fs.readFile(targetPath, "utf8") : "";
 				const data = exists ? mergeAgentsMarkdown(source, target) : source;
+				if (exists && isAgentsMarkdownEquivalent(target, data)) continue;
 				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
 				const action = async () => {
 					await fs.outputFile(targetPath, data, "utf8");

package/dist/{upgrade-BDVNfq80.cjs → upgrade-DjOZstRC.cjs}

@@ -570,7 +570,7 @@ async function resolveCommandConfig(name, cwd) {
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.2.11";
+var version = "3.2.13";
 
 //#endregion
 //#region src/constants.ts
@@ -675,11 +675,13 @@ async function cleanProjects(cwd, overrides) {
 	});
 	const readmeZh = pathe.default.resolve(workspaceDir, "README.zh-CN.md");
 	const qoderDir = pathe.default.resolve(workspaceDir, ".qoder");
+	const docsPlansDir = pathe.default.resolve(workspaceDir, "docs/plans");
 	const skillTargets = Object.values(getSkillTargetPaths());
 	const candidates = Array.from(new Set([
 		...cleanDirs.filter(Boolean),
 		readmeZh,
 		qoderDir,
+		docsPlansDir,
 		...skillTargets
 	]));
 	await Promise.all(candidates.map(async (dir) => {
@@ -1173,9 +1175,12 @@ async function syncNpmMirror(cwd, options) {
 
 //#endregion
 //#region src/commands/upgrade/agents.ts
-function normalizeEol(input) {
+function normalizeEol$1(input) {
 	return input.replace(/\r\n/g, "\n");
 }
+function normalizeComparableContent(input) {
+	return normalizeEol$1(input).trimEnd();
+}
 function normalizeHeadingKey(line) {
 	return line.replace(/^##\s+/, "").trim().toLowerCase();
 }
@@ -1194,7 +1199,7 @@ function trimEdgeEmptyLines(lines) {
 	return next;
 }
 function parseMarkdownByH2(content) {
-	const lines = normalizeEol(content).split("\n");
+	const lines = normalizeEol$1(content).split("\n");
 	const preamble = [];
 	const sections = [];
 	let current;
@@ -1220,8 +1225,8 @@ function parseMarkdownByH2(content) {
 	};
 }
 function mergePlainText(source, target) {
-	const sourceLines = trimEdgeEmptyLines(normalizeEol(source).split("\n"));
-	const result = trimEdgeEmptyLines(normalizeEol(target).split("\n"));
+	const sourceLines = trimEdgeEmptyLines(normalizeEol$1(source).split("\n"));
+	const result = trimEdgeEmptyLines(normalizeEol$1(target).split("\n"));
 	const seen = new Set(result);
 	for (const line of sourceLines) {
 		if (!line.trim()) continue;
@@ -1231,6 +1236,9 @@ function mergePlainText(source, target) {
 	}
 	return `${result.join("\n")}\n`;
 }
+function getSectionSignature(section) {
+	return `${section.key}\n${trimEdgeEmptyLines(section.lines).join("\n")}`;
+}
 /**
 * Merge AGENTS instructions by keeping existing sections and filling missing sections
 * from source defaults. This avoids destructive overwrite while still syncing updates.
@@ -1243,13 +1251,25 @@ function mergeAgentsMarkdown(source, target) {
 	const targetSectionMap = new Map(targetParsed.sections.map((section) => [section.key, section]));
 	const mergedSections = [];
 	for (const section of sourceParsed.sections) mergedSections.push(targetSectionMap.get(section.key) ?? section);
-	for (const section of targetParsed.sections) if (!sourceSectionKeys.has(section.key)) mergedSections.push(section);
+	const seenTargetOnlySectionSignatures = /* @__PURE__ */ new Set();
+	for (const section of targetParsed.sections) if (!sourceSectionKeys.has(section.key)) {
+		const signature = getSectionSignature(section);
+		if (seenTargetOnlySectionSignatures.has(signature)) continue;
+		seenTargetOnlySectionSignatures.add(signature);
+		mergedSections.push(section);
+	}
 	const preamble = trimEdgeEmptyLines(targetParsed.preamble.length ? targetParsed.preamble : sourceParsed.preamble);
 	const blocks = [];
 	if (preamble.length) blocks.push(preamble.join("\n"));
 	for (const section of mergedSections) blocks.push(trimEdgeEmptyLines(section.lines).join("\n"));
 	return `${blocks.filter(Boolean).join("\n\n")}\n`;
 }
+/**
+* Compare AGENTS markdown with normalized EOL and trailing newline differences ignored.
+*/
+function isAgentsMarkdownEquivalent(left, right) {
+	return normalizeComparableContent(left) === normalizeComparableContent(right);
+}
 
 //#endregion
 //#region src/commands/upgrade/overwrite.ts
@@ -1452,6 +1472,35 @@ function mergeWorkspaceManifest(source, target) {
 
 //#endregion
 //#region src/commands/upgrade/index.ts
+function normalizeEol(input) {
+	return input.replace(/\r\n/g, "\n");
+}
+function normalizeGitignoreLine(line) {
+	const trimmed = line.trim();
+	if (!trimmed) return "";
+	if (trimmed.startsWith("#")) return `#${trimmed.slice(1).trim()}`;
+	return trimmed;
+}
+function isTextEquivalent(left, right) {
+	return normalizeEol(left).trimEnd() === normalizeEol(right).trimEnd();
+}
+function mergeGitignore(source, target) {
+	const sourceLines = normalizeEol(source).split("\n");
+	const result = normalizeEol(target).split("\n");
+	const seen = new Set(result.map((line) => normalizeGitignoreLine(line)).filter(Boolean));
+	for (const line of sourceLines) {
+		const normalized = normalizeGitignoreLine(line);
+		if (!normalized || seen.has(normalized)) continue;
+		seen.add(normalized);
+		result.push(line);
+	}
+	while (result.length) {
+		const last = result.at(-1);
+		if (last === void 0 || last.trim().length > 0) break;
+		result.pop();
+	}
+	return `${result.join("\n")}\n`;
+}
 /**
 * 将 assets 目录的模版文件同步到工程中，实现一键升级脚手架能力。
 */
@@ -1542,11 +1591,31 @@ async function upgradeMonorepo(opts) {
 				});
 				continue;
 			}
+			if (relPath === ".gitignore") {
+				const source = await fs_extra.default.readFile(file.path, "utf8");
+				const exists = await fs_extra.default.pathExists(targetPath);
+				const target = exists ? await fs_extra.default.readFile(targetPath, "utf8") : "";
+				const data = exists ? mergeGitignore(source, target) : source;
+				if (exists && isTextEquivalent(target, data)) continue;
+				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
+				const action = async () => {
+					await fs_extra.default.outputFile(targetPath, data, "utf8");
+					logger.success(targetPath);
+				};
+				await scheduleOverwrite(intent, {
+					relPath,
+					targetPath,
+					action,
+					pending: pendingOverwrites
+				});
+				continue;
+			}
 			if (relPath === "AGENTS.md") {
 				const source = await fs_extra.default.readFile(file.path, "utf8");
 				const exists = await fs_extra.default.pathExists(targetPath);
 				const target = exists ? await fs_extra.default.readFile(targetPath, "utf8") : "";
 				const data = exists ? mergeAgentsMarkdown(source, target) : source;
+				if (exists && isAgentsMarkdownEquivalent(target, data)) continue;
 				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
 				const action = async () => {
 					await fs_extra.default.outputFile(targetPath, data, "utf8");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/monorepo",
   "type": "module",
-  "version": "3.2.11",
+  "version": "3.2.13",
   "description": "The icebreaker's monorepo manager",
   "author": "ice breaker <hi@sonofmagic.top>",
   "license": "MIT",
@@ -64,7 +64,7 @@
     "@pnpm/workspace.find-packages": "^1000.0.62",
     "@pnpm/workspace.read-manifest": "^1000.2.10",
     "c12": "^3.3.3",
-    "comment-json": "^4.5.1",
+    "comment-json": "^4.6.1",
     "consola": "^3.4.2",
     "fs-extra": "^11.3.3",
     "git-url-parse": "^16.1.0",
@@ -73,7 +73,7 @@
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "semver": "^7.7.4",
-    "simple-git": "^3.32.2",
+    "simple-git": "^3.32.3",
     "yaml": "^2.8.2",
     "@icebreakers/monorepo-templates": "0.1.11"
   },