@icebreakers/monorepo 3.2.10 → 3.2.12

package/dist/cli.cjs

@@ -1,4 +1,4 @@
-const require_upgrade = require('./upgrade-CUCnIgN-.cjs');
+const require_upgrade = require('./upgrade-DR2Sqzg5.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-DxiYiN3S.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-CPqyPuV5.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-CUCnIgN-.cjs');
+const require_upgrade = require('./upgrade-DR2Sqzg5.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-DxiYiN3S.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-CPqyPuV5.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-DxiYiN3S.mjs → upgrade-CPqyPuV5.mjs}

@@ -7,7 +7,7 @@ import path from "pathe";
 import process from "node:process";
 import fs from "fs-extra";
 import { createConsola } from "consola";
-import { assetsDir, checkbox, execaCommand, getAssetTargets, isGitignoreFile, scaffoldTemplate, templatesDir, toPublishGitignorePath, toWorkspaceGitignorePath } from "@icebreakers/monorepo-templates";
+import { assetsDir, checkbox, ensureTemplateAssetsPrepared, execaCommand, getAssetTargets, isGitignoreFile, scaffoldTemplate, templatesDir, toPublishGitignorePath, toWorkspaceGitignorePath } from "@icebreakers/monorepo-templates";
 import { loadConfig } from "c12";
 import os from "node:os";
 import * as path$1 from "node:path";
@@ -559,7 +559,7 @@ async function resolveCommandConfig(name, cwd) {
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.2.10";
+var version = "3.2.12";
 
 //#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) => {
@@ -1160,6 +1162,104 @@ async function syncNpmMirror(cwd, options) {
 	await Promise.all(tasks);
 }
 
+//#endregion
+//#region src/commands/upgrade/agents.ts
+function normalizeEol(input) {
+	return input.replace(/\r\n/g, "\n");
+}
+function normalizeComparableContent(input) {
+	return normalizeEol(input).trimEnd();
+}
+function normalizeHeadingKey(line) {
+	return line.replace(/^##\s+/, "").trim().toLowerCase();
+}
+function trimEdgeEmptyLines(lines) {
+	const next = [...lines];
+	while (next.length) {
+		const first = next[0];
+		if (first === void 0 || first.trim().length > 0) break;
+		next.shift();
+	}
+	while (next.length) {
+		const last = next.at(-1);
+		if (last === void 0 || last.trim().length > 0) break;
+		next.pop();
+	}
+	return next;
+}
+function parseMarkdownByH2(content) {
+	const lines = normalizeEol(content).split("\n");
+	const preamble = [];
+	const sections = [];
+	let current;
+	for (const line of lines) {
+		if (/^##\s+/.test(line)) {
+			if (current) sections.push(current);
+			current = {
+				key: normalizeHeadingKey(line),
+				lines: [line]
+			};
+			continue;
+		}
+		if (current) {
+			current.lines.push(line);
+			continue;
+		}
+		preamble.push(line);
+	}
+	if (current) sections.push(current);
+	return {
+		preamble,
+		sections
+	};
+}
+function mergePlainText(source, target) {
+	const sourceLines = trimEdgeEmptyLines(normalizeEol(source).split("\n"));
+	const result = trimEdgeEmptyLines(normalizeEol(target).split("\n"));
+	const seen = new Set(result);
+	for (const line of sourceLines) {
+		if (!line.trim()) continue;
+		if (seen.has(line)) continue;
+		seen.add(line);
+		result.push(line);
+	}
+	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.
+*/
+function mergeAgentsMarkdown(source, target) {
+	const sourceParsed = parseMarkdownByH2(source);
+	const targetParsed = parseMarkdownByH2(target);
+	if (!sourceParsed.sections.length || !targetParsed.sections.length) return mergePlainText(source, target);
+	const sourceSectionKeys = new Set(sourceParsed.sections.map((section) => section.key));
+	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);
+	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
 function asBuffer(data) {
@@ -1365,6 +1465,7 @@ function mergeWorkspaceManifest(source, target) {
 * 将 assets 目录的模版文件同步到工程中，实现一键升级脚手架能力。
 */
 async function upgradeMonorepo(opts) {
+	await ensureTemplateAssetsPrepared();
 	const cwd = opts.cwd ?? process.cwd();
 	const upgradeConfig = await resolveCommandConfig("upgrade", cwd);
 	const merged = {
@@ -1450,6 +1551,25 @@ async function upgradeMonorepo(opts) {
 				});
 				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");
+					logger.success(targetPath);
+				};
+				await scheduleOverwrite(intent, {
+					relPath,
+					targetPath,
+					action,
+					pending: pendingOverwrites
+				});
+				continue;
+			}
 			if (relPath === ".changeset/config.json" && repoName) {
 				const changesetJson = await fs.readJson(file.path);
 				(0, import_set_value.default)(changesetJson, "changelog.1.repo", repoName);

package/dist/{upgrade-CUCnIgN-.cjs → upgrade-DR2Sqzg5.cjs}

@@ -570,7 +570,7 @@ async function resolveCommandConfig(name, cwd) {
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.2.10";
+var version = "3.2.12";
 
 //#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) => {
@@ -1171,6 +1173,104 @@ async function syncNpmMirror(cwd, options) {
 	await Promise.all(tasks);
 }
 
+//#endregion
+//#region src/commands/upgrade/agents.ts
+function normalizeEol(input) {
+	return input.replace(/\r\n/g, "\n");
+}
+function normalizeComparableContent(input) {
+	return normalizeEol(input).trimEnd();
+}
+function normalizeHeadingKey(line) {
+	return line.replace(/^##\s+/, "").trim().toLowerCase();
+}
+function trimEdgeEmptyLines(lines) {
+	const next = [...lines];
+	while (next.length) {
+		const first = next[0];
+		if (first === void 0 || first.trim().length > 0) break;
+		next.shift();
+	}
+	while (next.length) {
+		const last = next.at(-1);
+		if (last === void 0 || last.trim().length > 0) break;
+		next.pop();
+	}
+	return next;
+}
+function parseMarkdownByH2(content) {
+	const lines = normalizeEol(content).split("\n");
+	const preamble = [];
+	const sections = [];
+	let current;
+	for (const line of lines) {
+		if (/^##\s+/.test(line)) {
+			if (current) sections.push(current);
+			current = {
+				key: normalizeHeadingKey(line),
+				lines: [line]
+			};
+			continue;
+		}
+		if (current) {
+			current.lines.push(line);
+			continue;
+		}
+		preamble.push(line);
+	}
+	if (current) sections.push(current);
+	return {
+		preamble,
+		sections
+	};
+}
+function mergePlainText(source, target) {
+	const sourceLines = trimEdgeEmptyLines(normalizeEol(source).split("\n"));
+	const result = trimEdgeEmptyLines(normalizeEol(target).split("\n"));
+	const seen = new Set(result);
+	for (const line of sourceLines) {
+		if (!line.trim()) continue;
+		if (seen.has(line)) continue;
+		seen.add(line);
+		result.push(line);
+	}
+	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.
+*/
+function mergeAgentsMarkdown(source, target) {
+	const sourceParsed = parseMarkdownByH2(source);
+	const targetParsed = parseMarkdownByH2(target);
+	if (!sourceParsed.sections.length || !targetParsed.sections.length) return mergePlainText(source, target);
+	const sourceSectionKeys = new Set(sourceParsed.sections.map((section) => section.key));
+	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);
+	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
 function asBuffer(data) {
@@ -1376,6 +1476,7 @@ function mergeWorkspaceManifest(source, target) {
 * 将 assets 目录的模版文件同步到工程中，实现一键升级脚手架能力。
 */
 async function upgradeMonorepo(opts) {
+	await (0, _icebreakers_monorepo_templates.ensureTemplateAssetsPrepared)();
 	const cwd = opts.cwd ?? node_process.default.cwd();
 	const upgradeConfig = await resolveCommandConfig("upgrade", cwd);
 	const merged = {
@@ -1461,6 +1562,25 @@ async function upgradeMonorepo(opts) {
 				});
 				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");
+					logger.success(targetPath);
+				};
+				await scheduleOverwrite(intent, {
+					relPath,
+					targetPath,
+					action,
+					pending: pendingOverwrites
+				});
+				continue;
+			}
 			if (relPath === ".changeset/config.json" && repoName) {
 				const changesetJson = await fs_extra.default.readJson(file.path);
 				(0, import_set_value.default)(changesetJson, "changelog.1.repo", repoName);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/monorepo",
   "type": "module",
-  "version": "3.2.10",
+  "version": "3.2.12",
   "description": "The icebreaker's monorepo manager",
   "author": "ice breaker <hi@sonofmagic.top>",
   "license": "MIT",
@@ -60,8 +60,8 @@
     "@pnpm/find-workspace-dir": "^1000.1.4",
     "@pnpm/logger": "^1001.0.1",
     "@pnpm/types": "^1001.3.0",
-    "@pnpm/worker": "^1000.6.4",
-    "@pnpm/workspace.find-packages": "^1000.0.59",
+    "@pnpm/worker": "^1000.6.5",
+    "@pnpm/workspace.find-packages": "^1000.0.62",
     "@pnpm/workspace.read-manifest": "^1000.2.10",
     "c12": "^3.3.3",
     "comment-json": "^4.5.1",
@@ -73,9 +73,9 @@
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "semver": "^7.7.4",
-    "simple-git": "^3.30.0",
+    "simple-git": "^3.32.3",
     "yaml": "^2.8.2",
-    "@icebreakers/monorepo-templates": "0.1.10"
+    "@icebreakers/monorepo-templates": "0.1.11"
   },
   "devDependencies": {
     "@types/klaw": "^3.0.7",