@lmzhen/dsh-evolution-commands 0.30.31 → 0.30.36

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, createSubagentChannel, elapsedSince, errorText, eventsFile, evolutionHome, evolutionRoot, hostSurface, isDeprecatedParamId, isPresent, isRecord, isUnknown, liveBool, newRunRegistry, newSkillLibrary, paramSettingsId, partitionVersions, planNamespaceMigration, policyStageLimits, probeMtime, probeText, reportsSweepLockTarget, resolveParamId, resolveRootConfig, scopedPackageName, scopedProbeReport, sweepReports, transactIo } 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, 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 { 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";
@@ -2061,6 +2061,11 @@ const COMMAND_ENTRIES = [
 		usage: "restructure <name> \"<heading>\" <to_file> [--plan <runId>]",
 		summary: "把技能正文的一节移到 references 文件"
 	},
+	{
+		readonly: false,
+		usage: "extract <source> <target> \"<heading>\" [--start <line>] [--end <line>] [--plan <runId>]",
+		summary: "把源技能的可复用部分提取到已有类级 owner（多根一次事务）"
+	},
 	{
 		readonly: true,
 		usage: "replay",
@@ -2107,7 +2112,9 @@ const VALUE_FLAGS = [
 	"base",
 	"to",
 	"timeout",
-	"plan"
+	"plan",
+	"start",
+	"end"
 ];
 /**
 * Narrow a parse result: true when it is the syntax failure rather than a command.
@@ -3152,6 +3159,117 @@ function apply(ctx, rawConfig = {}) {
 					return err(`预设安装失败：${error instanceof Error ? error.message : String(error)}`);
 				}
 			}
+			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>]");
+				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>]");
+				const startFlag = extractParsed.flags.get("start");
+				const endFlag = extractParsed.flags.get("end");
+				const start = typeof startFlag === "string" ? startFlag : void 0;
+				const end = typeof endFlag === "string" ? endFlag : void 0;
+				const ioRegistry = ctx.get("evolutionIo");
+				if (!ioRegistry) return err("未挂载 evolution-io 注册表：无法执行 extract。");
+				const library = newSkillLibrary({
+					authority: authorityFrom({ origin: "foreground" }),
+					config: { root: skillsRootValue },
+					io: ioRegistry.provider(),
+					ctx,
+					threatExemptLabels: config.threatExemptLabels,
+					limits: {
+						...DEFAULT_SKILL_LIMITS,
+						...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: [{
+						heading,
+						...start === void 0 ? {} : { start },
+						...end === void 0 ? {} : { end }
+					}],
+					sourceFiles: sourceFiles.value,
+					targetFiles: targetFiles.value,
+					external: external.files,
+					anchors: {
+						sourceMdSha256: contentHash(sourceMd),
+						targetMdSha256: contentHash(targetMd)
+					}
+				});
+				if (!plan.ok) return err(plan.message);
+				if (extractParsed.flags.has("plan")) {
+					const proposal = proposalFromPlan(plan.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);
+				}
+				if (approval) {
+					const session = invocationAgent?.session;
+					const sessionPolicy = effectiveSessionPolicy(ctx, session);
+					const stagesForeground = approval.isEnabled !== false && sessionPolicy !== "never" && approval.stageForeground !== false;
+					if (stagesForeground && session === void 0) return err(errorText("e-306-this-deployment-stages-foreground-2"));
+					if (stagesForeground && !approval.hasRunner("skill")) return err("无法暂存提取：没有注册技能回放运行器：请挂载 tool-skill-manage 行，或禁用 evolution-approval。");
+					const decision = await approval.request({
+						kind: "skill",
+						summary: "/evolution extract " + source + " -> " + target + " " + heading,
+						args: {
+							operation: {
+								action: "extract",
+								name: source,
+								extract: [{
+									heading,
+									...start === void 0 ? {} : { start },
+									...end === void 0 ? {} : { end },
+									to_skill: target
+								}]
+							},
+							origin: "foreground",
+							libraryOrigin: "foreground"
+						},
+						origin: "foreground",
+						...session !== void 0 ? {
+							sessionId: session.id,
+							session
+						} : {},
+						...sessionPolicy !== void 0 ? { sessionPolicy } : {}
+					});
+					if (decision.action === "staged") return ok(decision.message);
+				}
+				const result = await library.extract(plan.plan, "foreground");
+				if (!result.ok) return err(result.message);
+				return ok(result.message);
+			}
 			if (input.startsWith("restructure ")) {
 				const restParsed = parseSubcommand(rawInputTrimmed);
 				if (isParseFailure(restParsed) || restParsed.name !== "restructure") return err("用法：/evolution restructure <name> \"<## heading>\" <to_file>");

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.31",
+  "version": "0.30.36",
   "publishConfig": {
     "access": "public"
   },
@@ -27,12 +27,12 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-approval": "^0.30.31",
-    "@lmzhen/dsh-evolution-core": "^0.30.31",
-    "@lmzhen/dsh-evolution-maintenance": "^0.30.31"
+    "@lmzhen/dsh-evolution-approval": "^0.30.36",
+    "@lmzhen/dsh-evolution-core": "^0.30.36",
+    "@lmzhen/dsh-evolution-maintenance": "^0.30.36"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.30.31"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.30.36"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5",