@lmzhen/dsh-evolution-commands 0.30.36 → 0.30.38

package/lib/index.js

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { DEFAULT_SKILL_LIMITS, DIAGNOSTICS_FACT_KEYS, DIAGNOSTICS_RUNTIME_KEYS, DIAGNOSTICS_VIEW_SCHEMA_VERSION, EVOLUTION_PRESET_IDS, MAINTAINER_PRESET_ID, MAX_TIMER_DELAY_MS, PARAM_EXPOSURE, PARAM_GROUP_LABELS, PLATFORM_LINE, REVIEWER_PRESET_ID, absentHostServices, appendEvolutionEvent, applyNamespaceMigration, asRecord, assertSkillsRootAliasRetired, atomicWriteFiles, authorityFrom, buildLearnPrompt, canonicalWriteId, clampedNumber, classifyNamespaceMigration, classifySessionEvent, contentHash, createSubagentChannel, elapsedSince, errorText, eventsFile, evolutionHome, evolutionRoot, findOwnerCandidate, hostSurface, isDeprecatedParamId, isPresent, isRecord, isUnknown, liveBool, newRunRegistry, newSkillLibrary, ownerCandidatesFromSummaries, paramSettingsId, parseFrontmatter, partitionVersions, planExtract, planNamespaceMigration, policyStageLimits, probeMtime, probeText, proposalFromPlan, readExternalSupport, reportsSweepLockTarget, resolveParamId, resolveRootConfig, scopedPackageName, scopedProbeReport, sweepReports, transactIo, writeProposalReport } from "@lmzhen/dsh-evolution-core";
+import { DEFAULT_SKILL_LIMITS, DIAGNOSTICS_FACT_KEYS, DIAGNOSTICS_RUNTIME_KEYS, DIAGNOSTICS_VIEW_SCHEMA_VERSION, EVOLUTION_PRESET_IDS, MAINTAINER_PRESET_ID, MAX_TIMER_DELAY_MS, PARAM_EXPOSURE, PARAM_GROUP_LABELS, PLATFORM_LINE, REVIEWER_PRESET_ID, absentHostServices, appendEvolutionEvent, applyNamespaceMigration, asRecord, assertSkillsRootAliasRetired, atomicWriteFiles, authorityFrom, buildExtractPlanFromLibrary, buildLearnPrompt, canonicalWriteId, clampedNumber, classifyNamespaceMigration, classifySessionEvent, createSubagentChannel, elapsedSince, errorText, eventsFile, evolutionHome, evolutionRoot, hostSurface, isDeprecatedParamId, isPresent, isRecord, isUnknown, liveBool, newRunRegistry, newSkillLibrary, paramSettingsId, partitionVersions, planNamespaceMigration, policyStageLimits, probeMtime, probeText, proposalFromPlan, reportsSweepLockTarget, resolveParamId, resolveRootConfig, scopedPackageName, scopedProbeReport, sweepReports, transactIo, writeProposalReport } from "@lmzhen/dsh-evolution-core";
 import { HOST_ROUTES, json, methodNotAllowed, registerHostRoutes } from "@lmzhen/dsh-evolution-core/http-routes";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { dirname, join } from "node:path";
@@ -1996,6 +1996,11 @@ const COMMAND_ENTRIES = [
 		usage: "skill unpin <name>",
 		summary: "解钉一个技能：撤销上面的冻结（立即生效、不走审批）"
 	},
+	{
+		readonly: false,
+		usage: "propose",
+		summary: "为 body-oversize 技能写 keep 提议（不自动拆分；同一 reports store）"
+	},
 	{
 		readonly: true,
 		usage: "skills health",
@@ -2063,8 +2068,8 @@ const COMMAND_ENTRIES = [
 	},
 	{
 		readonly: false,
-		usage: "extract <source> <target> \"<heading>\" [--start <line>] [--end <line>] [--plan <runId>]",
-		summary: "把源技能的可复用部分提取到已有类级 owner（多根一次事务）"
+		usage: "extract <source> <target> \"<heading>\" [--start <line>] [--end <line>] [--outcome extract|mixed] [--apply]",
+		summary: "预览把源技能的可复用部分提取到已有类级 owner；默认 plan，--apply 才写（多根一次事务）"
 	},
 	{
 		readonly: true,
@@ -2114,7 +2119,8 @@ const VALUE_FLAGS = [
 	"timeout",
 	"plan",
 	"start",
-	"end"
+	"end",
+	"outcome"
 ];
 /**
 * Narrow a parse result: true when it is the syntax failure rather than a command.
@@ -2711,21 +2717,25 @@ function apply(ctx, rawConfig = {}) {
 				const versions = await curator.history(name);
 				if (versions.length === 0) return ok(`技能 "${name}" 还没有内容版本：下一次经 skill_manage 写入后才会出现。`);
 				const groups = partitionVersions(versions);
-				const row = (entry) => `v${entry.v}\t${entry.at}\t${entry.action}\t${entry.chars} chars\t${entry.hash.slice(0, 12)}`;
+				const row = (entry) => `v${entry.v}\t${entry.at}\t${entry.action}\t${entry.chars} chars\t${entry.hash.slice(0, 12)}${entry.unitId === void 0 ? "" : `\tunit:${entry.unitId}`}`;
 				const lines = [`技能 "${name}" 的内容版本（由旧到新，${groups.content.length} 条，最多保留这么多）：`, ...groups.content.map(row)];
 				if (groups.support.length > 0) lines.push("支撑文件版本（仅在历史里 —— 撤销恢复的是 SKILL.md，不是这些字节）：", ...groups.support.map(row));
 				return ok(lines.join("\n"));
 			}
 			if (input.startsWith("skill undo ")) {
 				const rest = input.slice(11).trim();
-				const toMatch = /--to\s+v?(\d+)\s*$/.exec(rest);
-				const name = (toMatch?.index === void 0 ? rest : rest.slice(0, toMatch.index)).trim();
-				if (!name) return err("用法：/evolution skill undo <name> [--to v<N>]");
+				const toMatch = /--to\s+v?(\d+)/.exec(rest);
+				const unitMatch = /--unit\s+(\S+)/.exec(rest);
+				const marker = [toMatch?.index, unitMatch?.index].filter((index) => index !== void 0).sort((a, b) => a - b)[0];
+				const name = (marker === void 0 ? rest : rest.slice(0, marker)).trim();
+				if (!name) return err("用法：/evolution skill undo <name> [--to v<N> | --unit <id>]");
+				if (toMatch !== null && unitMatch !== null) return err("--to 与 --unit 不能同时使用");
 				const skillUndoRefusal = unreplayableWriteRefusal("skill undo");
 				if (skillUndoRefusal) return skillUndoRefusal;
 				const curator = ctx.get("evolutionCurator");
 				const target = toMatch?.[1] === void 0 ? void 0 : Number(toMatch[1]);
-				const result = curator ? await (target === void 0 ? curator.undo(name) : curator.undo(name, target)) : {
+				const unitId = unitMatch?.[1];
+				const result = curator ? unitId !== void 0 ? await curator.undoUnit(name, unitId) : target === void 0 ? await curator.undo(name) : await curator.undo(name, target) : {
 					ok: false,
 					message: errorText("e-302-curator-service-not-mounted")
 				};
@@ -2749,6 +2759,12 @@ function apply(ctx, rawConfig = {}) {
 				}).setPinned(name, pinned);
 				return result.ok ? ok(result.message) : err(result.message);
 			}
+			if (input === "propose") {
+				const curator = ctx.get("evolutionCurator");
+				if (!curator) return err(errorText("e-302-curator-service-not-mounted"));
+				const result = await curator.proposeKeeps();
+				return result.ok ? ok(result.message) : err(result.message);
+			}
 			if (input === "skills health") {
 				const curator = ctx.get("evolutionCurator");
 				if (!curator) return err(errorText("e-302-curator-service-not-mounted"));
@@ -3161,13 +3177,15 @@ function apply(ctx, rawConfig = {}) {
 			}
 			if (input.startsWith("extract ")) {
 				const extractParsed = parseSubcommand(rawInputTrimmed);
-				if (isParseFailure(extractParsed) || extractParsed.name !== "extract") return err("用法：/evolution extract <source> <target> \"<## heading>\" [--start <line>] [--end <line>]");
+				if (isParseFailure(extractParsed) || extractParsed.name !== "extract") return err("用法：/evolution extract <source> <target> \"<heading>\" [--start <line>] [--end <line>]");
 				const source = extractParsed.positionals[0] ?? "";
 				const target = extractParsed.positionals[1] ?? "";
 				const heading = extractParsed.positionals[2] ?? "";
-				if (source === "" || target === "" || heading === "") return err("用法：/evolution extract <source> <target> \"<## heading>\" [--start <line>] [--end <line>]");
+				if (source === "" || target === "" || heading === "") return err("用法：/evolution extract <source> <target> \"<heading>\" [--start <line>] [--end <line>]");
 				const startFlag = extractParsed.flags.get("start");
 				const endFlag = extractParsed.flags.get("end");
+				const outcomeFlag = extractParsed.flags.get("outcome");
+				if (outcomeFlag !== void 0 && outcomeFlag !== "extract" && outcomeFlag !== "mixed") return err("--outcome 只能是 extract 或 mixed。");
 				const start = typeof startFlag === "string" ? startFlag : void 0;
 				const end = typeof endFlag === "string" ? endFlag : void 0;
 				const ioRegistry = ctx.get("evolutionIo");
@@ -3183,56 +3201,24 @@ function apply(ctx, rawConfig = {}) {
 						...policyStageLimits(ctx.get("evolutionPolicy")?.get?.())
 					}
 				});
-				const sourceMd = await library.read(source);
-				const targetMd = await library.read(target);
-				if (sourceMd === null) return err("技能「" + source + "」不存在。");
-				if (targetMd === null) return err("目标技能「" + target + "」不存在；owner-gap 不自动 create。");
-				if (source === target) return err("source 与 target 不能相同。");
-				const candidate = findOwnerCandidate(ownerCandidatesFromSummaries(source, await library.list({
-					withContent: true,
-					withFrontmatter: true
-				})), target);
-				if (candidate === void 0) return err("目标「" + target + "」不是可用的 owner candidate（描述为空或已排除）；owner-gap，不自动 create。");
-				if (candidate.protectionUnknown || candidate.protectedBy !== null) return err("目标「" + target + "」受保护（" + (candidate.protectedBy ?? "未知") + "），拒绝提取。");
-				const sourceParsed = parseFrontmatter(sourceMd);
-				if (sourceParsed === null) return err("技能「" + source + "」没有可读取的正文。");
-				const sourceFiles = await library.listSupportFiles(source);
-				const targetFiles = await library.listSupportFiles(target);
-				if (!isPresent(sourceFiles) || !isPresent(targetFiles)) return err("支撑文件列表不可读；拒绝在不确定的闭包上提取。");
-				const external = await readExternalSupport(sourceParsed.body, join(library.root, source), dirname(library.root), targetFiles.value);
-				if (!external.ok) return err(external.message);
-				const plan = planExtract({
-					body: sourceParsed.body,
-					sourceName: source,
-					targetName: target,
-					targetExists: true,
-					outcome: start !== void 0 || end !== void 0 ? "mixed" : "extract",
-					owner: {
-						mode: "covered",
-						name: target,
-						triggerCovers: true,
-						outcomeCovers: true,
-						reason: "explicit target"
-					},
-					requests: [{
+				const built = await buildExtractPlanFromLibrary(library, {
+					source,
+					items: [{
 						heading,
 						...start === void 0 ? {} : { start },
-						...end === void 0 ? {} : { end }
+						...end === void 0 ? {} : { end },
+						to_skill: target
 					}],
-					sourceFiles: sourceFiles.value,
-					targetFiles: targetFiles.value,
-					external: external.files,
-					anchors: {
-						sourceMdSha256: contentHash(sourceMd),
-						targetMdSha256: contentHash(targetMd)
-					}
+					...outcomeFlag === void 0 ? {} : { outcome: outcomeFlag }
 				});
-				if (!plan.ok) return err(plan.message);
-				if (extractParsed.flags.has("plan")) {
-					const proposal = proposalFromPlan(plan.plan, { runId: "cli-" + Date.now().toString(36) });
+				if (!built.ok) return err(built.message);
+				const plan = built.plan;
+				const warnings = built.warnings === void 0 || built.warnings.length === 0 ? "" : "\n" + built.warnings.join("\n");
+				if (!extractParsed.flags.has("apply")) {
+					const proposal = proposalFromPlan(plan, { runId: "cli-" + Date.now().toString(36) });
 					const io = ctx.get("evolutionIo")?.provider();
 					if (io !== void 0) await writeProposalReport(io, proposal).catch(() => {});
-					return ok("提取计划（未写入）：" + plan.plan.parts.map((part) => "## " + part.heading).join(", ") + " -> " + target);
+					return ok("提取计划（未写入；默认 plan，--apply 才写）：" + plan.parts.map((part) => "## " + part.heading).join(", ") + " -> " + target + "\n提取判定：outcome=" + plan.outcome + "；target=" + target + "；owner=covered by " + target + warnings);
 				}
 				if (approval) {
 					const session = invocationAgent?.session;
@@ -3266,17 +3252,17 @@ function apply(ctx, rawConfig = {}) {
 					});
 					if (decision.action === "staged") return ok(decision.message);
 				}
-				const result = await library.extract(plan.plan, "foreground");
+				const result = await library.extract(plan, "foreground");
 				if (!result.ok) return err(result.message);
-				return ok(result.message);
+				return ok(result.message + "\n提取判定：outcome=" + plan.outcome + "；target=" + target + warnings);
 			}
 			if (input.startsWith("restructure ")) {
 				const restParsed = parseSubcommand(rawInputTrimmed);
-				if (isParseFailure(restParsed) || restParsed.name !== "restructure") return err("用法：/evolution restructure <name> \"<## heading>\" <to_file>");
+				if (isParseFailure(restParsed) || restParsed.name !== "restructure") return err("用法：/evolution restructure <name> \"<heading>\" <to_file>");
 				const name = restParsed.positionals[0] ?? "";
 				const heading = restParsed.positionals[1] ?? "";
 				const toFile = restParsed.positionals[2] ?? "";
-				if (name === "" || heading === "" || toFile === "") return err("用法：/evolution restructure <name> \"<## heading>\" <to_file>");
+				if (name === "" || heading === "" || toFile === "") return err("用法：/evolution restructure <name> \"<heading>\" <to_file>");
 				const planFlag = restParsed.flags.get("plan");
 				const planRunId = typeof planFlag === "string" ? planFlag : void 0;
 				if (!toFile.startsWith("references/")) return err("to_file 必须位于 references/ 之下（日志或明细的落地位置）。");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-commands",
   "description": "Human commands for the evolution family (/evolution pending|curator|maintain|doctor) (community build)",
-  "version": "0.30.36",
+  "version": "0.30.38",
   "publishConfig": {
     "access": "public"
   },
@@ -27,12 +27,12 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-approval": "^0.30.36",
-    "@lmzhen/dsh-evolution-core": "^0.30.36",
-    "@lmzhen/dsh-evolution-maintenance": "^0.30.36"
+    "@lmzhen/dsh-evolution-approval": "^0.30.38",
+    "@lmzhen/dsh-evolution-core": "^0.30.38",
+    "@lmzhen/dsh-evolution-maintenance": "^0.30.38"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.30.36"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.30.38"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5",