@lmzhen/dsh-evolution-commands 0.26.15 → 0.26.26

package/lib/index.js

@@ -1,10 +1,9 @@
 import { createRequire } from "node:module";
+import { DEFAULT_SKILL_LIMITS, MAX_TIMER_DELAY_MS, PARAM_EXPOSURE, PARAM_GROUP_LABELS, absentHostServices, appendEvolutionEvent, applyNamespaceMigration, asRecord, assertSkillsRootAliasRetired, atomicWriteFiles, authorityFrom, buildLearnPrompt, canonicalWriteId, clampedNumber, classifyNamespaceMigration, composePresetEntry, elapsedSince, errorText, eventsFile, evolutionHome, evolutionRoot, isDeprecatedParamId, isPresent, isRecord, isUnknown, liveBool, mergePresetRow, newRunRegistry, newSkillLibrary, paramSettingsId, partitionVersions, planNamespaceMigration, policyStageLimits, presetPatchText, presetRowBlock, presetRowBody, presetRowId, probeText, reportsSweepLockTarget, resolveBasePresetPatch, resolveParamId, resolveRootConfig, scopedPackageName, scopedProbeReport, sweepReports, transactIo } from "@lmzhen/dsh-evolution-core";
 import z from "@deepseek-ai/schemastery";
 import { effectiveSessionPolicy } from "@lmzhen/dsh-evolution-approval";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { DEFAULT_SKILL_LIMITS, MAX_TIMER_DELAY_MS, PARAM_EXPOSURE, PARAM_GROUP_LABELS, absentHostServices, appendEvolutionEvent, applyNamespaceMigration, asRecord, assertSkillsRootAliasRetired, atomicWriteFiles, buildLearnPrompt, canonicalWriteId, clampedNumber, classifyNamespaceMigration, composePresetEntry, elapsedSince, errorText, eventsFile, evolutionHome, evolutionRoot, isDeprecatedParamId, isPresent, isRecord, isUnknown, liveBool, mergePresetRow, newRunRegistry, newSkillLibrary, paramSettingsId, partitionVersions, planNamespaceMigration, policyStageLimits, presetPatchText, presetRowBlock, presetRowBody, presetRowId, probeText, reportsSweepLockTarget, resolveBasePresetPatch, resolveParamId, resolveRootConfig, scopedProbeReport, sweepReports, transactIo } from "@lmzhen/dsh-evolution-core";
 import { buildEnrichment, buildMaintainFacts, enrichmentSnapshotOptions, runMaintain, snapshotFromLibrary } from "@lmzhen/dsh-evolution-maintenance";
-import { preferProvider } from "@lmzhen/dsh-evolution-io";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -53,15 +52,18 @@ async function runNamespaceMigration(run) {
 		await settings.update(rowId, patch);
 	};
 	if (settings.describe === void 0 || settings.update === void 0) return NOTHING;
+	let seen;
 	for (const source of legacySettingsPaths(run.home)) {
 		const text = await run.io.readText(source);
 		if (text === null) continue;
 		const plan = planNamespaceMigration(text);
-		if (plan.entries.length === 0) return {
-			source,
-			plan,
-			report: void 0
-		};
+		if (plan.entries.length === 0) {
+			seen ??= {
+				source,
+				plan
+			};
+			continue;
+		}
 		return {
 			source,
 			plan,
@@ -72,7 +74,11 @@ async function runNamespaceMigration(run) {
 			})
 		};
 	}
-	return NOTHING;
+	return seen === void 0 ? NOTHING : {
+		source: seen.source,
+		plan: seen.plan,
+		report: void 0
+	};
 }
 /**
 * Read the legacy document and report what is still unmigrated.
@@ -86,11 +92,24 @@ async function runNamespaceMigration(run) {
 async function readLegacyDocumentState(run) {
 	const settings = run.settings;
 	if (settings?.describe === void 0) return void 0;
+	let seen;
 	for (const source of legacySettingsPaths(run.home)) {
 		const text = await run.io.readText(source);
 		if (text === null) continue;
 		const plan = planNamespaceMigration(text);
-		const read = (rowId) => settings.describe?.({ redactSecrets: false }).find((entry) => entry.ns === rowId);
+		if (plan.entries.length === 0) {
+			seen ??= {
+				source,
+				plan
+			};
+			continue;
+		}
+		return stateOf(source, plan);
+	}
+	return seen === void 0 ? void 0 : stateOf(seen.source, seen.plan);
+	/** The doctor-facing state of ONE document, judged against the seat. */
+	function stateOf(source, plan) {
+		const read = (rowId) => settings?.describe?.({ redactSecrets: false }).find((entry) => entry.ns === rowId);
 		const decided = classifyNamespaceMigration(plan, read);
 		return {
 			source,
@@ -657,7 +676,7 @@ function memoryInterpolationIssues(home) {
 * "unknown" — the doctor never throws.
 * Platform anchor: `packages/boot/app-boot/src/profile.ts` — a family preset is a ROW in the
 * profile's own patch layer there (`PROFILE_PATCH_FILENAME`), never a preset directory. */
-const AGENT_PRESET_PACKAGE = "@lmzhen/dsh-evolution-agent-preset";
+const AGENT_PRESET_PACKAGE = scopedPackageName("dsh-evolution-agent-preset", import.meta.url);
 /** Resolve one asset the package declares in its exports map.
 * @param asset - bases.json or agent.cordis.yml.
 * @returns the file path, or null when the package is not installed. */
@@ -1368,10 +1387,20 @@ function flagsOf(name) {
 	const entry = COMMAND_ENTRIES.find((candidate) => entryName(candidate) === name);
 	return entry === void 0 ? [] : entryFlags(entry);
 }
-/** C7 shape, DERIVED: the subcommand name is the first token of `usage` (variants use `|`). */
+/**
+* C7 shape, DERIVED: the entry IDENTITY key, and it is HIERARCHICAL (E-08).
+*
+* The key used to be the first token alone, and `flagsOf` finds an entry with `.find(...)` - the FIRST
+* match - so `maintain handoff` / `maintain cancel` and `skill restore` / `skill history` / `skill undo` /
+* `skill pin` all derived the SAME key as their parent and every flag lookup silently saw the parent entry
+* only (nine collisions). A bare parent (`maintain [--timeout]`) keeps its one-token key, so parent lookups
+* still resolve: the one call site that named an entry by a name the key no longer produced was the preset
+* dispatch branch, and it now asks for the entry own key (`preset install`).
+*/
 function entryName(entry) {
-	const [head = ""] = entry.usage.split(" ");
-	return head.split("|")[0] ?? "";
+	const [head = "", second = ""] = entry.usage.split(" ");
+	const name = head.split("|")[0] ?? "";
+	return /^[a-z][a-z-]*$/.test(second) && !second.startsWith("--") ? name + " " + second : name;
 }
 /** C7 shape, DERIVED: the flags a `usage` declares, in the form `--flag` (value flags keep their name). */
 function entryFlags(entry) {
@@ -1841,7 +1870,7 @@ function apply(ctx, rawConfig = {}) {
 		const ioRegistry = ioCtx.get("evolutionIo");
 		if (!ioRegistry) return;
 		const registry = newRunRegistry({
-			io: preferProvider(ioRegistry, ["fs"]),
+			io: ioRegistry.provider(),
 			home: evolutionHome(),
 			warn: (message) => {
 				ctx.logger.warn(message);
@@ -2072,8 +2101,9 @@ function apply(ctx, rawConfig = {}) {
 				const ioRegistry = ctx.get("evolutionIo");
 				if (!ioRegistry) return err("未挂载 evolution-io 注册表：无法固定或取消固定技能。");
 				const result = await newSkillLibrary({
+					authority: authorityFrom({ origin: "foreground" }),
 					config: { root: skillsRootValue },
-					io: preferProvider(ioRegistry, ["fs"]),
+					io: ioRegistry.provider(),
 					ctx,
 					limits: {
 						...DEFAULT_SKILL_LIMITS,
@@ -2149,8 +2179,9 @@ function apply(ctx, rawConfig = {}) {
 				const ioRegistry = ctx.get("evolutionIo");
 				if (!ioRegistry) return err("未挂载 evolution-io 注册表：维护事实不可用。");
 				const library = newSkillLibrary({
+					authority: authorityFrom({ origin: "foreground" }),
 					config: { root: skillsRootValue },
-					io: preferProvider(ioRegistry, ["fs"])
+					io: ioRegistry.provider()
 				});
 				const enrichment = await buildEnrichment(ctx, library);
 				const readFailures = [];
@@ -2162,7 +2193,7 @@ function apply(ctx, rawConfig = {}) {
 					}
 				});
 				if (snapshots.length === 0 && readFailures.length > 0) return err(`维护扫描读不出 ${readFailures.length} 个已登记技能（${readFailures.slice(0, 10).join(", ")}${readFailures.length > 10 ? ", …" : ""}），且一个技能都没读到：技能库未被审计。请修好读不出的技能（或它们的目录名）后重新扫描`);
-				if (snapshots.length === 0 && skillsRootValue !== "" && !await preferProvider(ioRegistry, ["fs"]).exists(skillsRootValue)) return err(`维护扫描发现技能库为空，但配置的技能根目录不存在（${skillsRootValue}）：请把 skillsRoot 指向真实目录（字面量 \`~\` 不会被展开），然后重新扫描`);
+				if (snapshots.length === 0 && skillsRootValue !== "" && !await ioRegistry.provider().exists(skillsRootValue)) return err(`维护扫描发现技能库为空，但配置的技能根目录不存在（${skillsRootValue}）：请把 skillsRoot 指向真实目录（字面量 \`~\` 不会被展开），然后重新扫描`);
 				if (snapshots.length === 0) return ok("维护扫描：技能库为空，无需处理。");
 				const { facts } = buildMaintainFacts(snapshots, enrichment.usageObservedValue, void 0);
 				return ok(`维护事实（零 token 预览）：\n${facts}`);
@@ -2202,8 +2233,9 @@ function apply(ctx, rawConfig = {}) {
 				(async () => {
 					try {
 						const library = newSkillLibrary({
+							authority: authorityFrom({ origin: "foreground" }),
 							config: { root: skillsRootValue },
-							io: preferProvider(ioRegistry, ["fs"])
+							io: ioRegistry.provider()
 						});
 						const enrichment = await buildEnrichment(ctx, library);
 						const outcome = await runMaintain({
@@ -2215,7 +2247,7 @@ function apply(ctx, rawConfig = {}) {
 							logger: { warn: (message) => {
 								ctx.logger.warn(message);
 							} },
-							rootExists: skillsRootValue === "" ? void 0 : () => preferProvider(ioRegistry, ["fs"]).exists(skillsRootValue),
+							rootExists: skillsRootValue === "" ? void 0 : () => ioRegistry.provider().exists(skillsRootValue),
 							skillRoot: skillsRootValue
 						}, {
 							timeoutMs: runTimeoutMs,
@@ -2224,7 +2256,7 @@ function apply(ctx, rawConfig = {}) {
 							enrichment: () => enrichment
 						});
 						const endedAt = Date.now();
-						const resultRef = await writeMaintainReport(preferProvider(ioRegistry, ["fs"]), {
+						const resultRef = await writeMaintainReport(ioRegistry.provider(), {
 							runId: handle.id,
 							...outcome.ok ? {
 								verdict: outcome.verdict,
@@ -2248,7 +2280,7 @@ function apply(ctx, rawConfig = {}) {
 							...outcome.ok ? {} : { failure: handle.signal.aborted ? "cancelled: the scan was stopped before it settled" : outcome.error ?? "Maintenance scan failed." }
 						});
 						if (outcome.ok) {
-							appendEvolutionEvent(preferProvider(ioRegistry, ["fs"]), eventsFile(runRoot), {
+							appendEvolutionEvent(ioRegistry.provider(), eventsFile(runRoot), {
 								type: "maintain",
 								source: "manual",
 								runId: handle.id,
@@ -2341,7 +2373,7 @@ function apply(ctx, rawConfig = {}) {
 				if (wanted === void 0 && record.state === "running") return err(`最新一次运行 ${record.id} 仍在进行：它结束后才会出报告；用 /evolution maintain status ${record.id} 查看进度。`);
 				const ioRegistry = ctx.get("evolutionIo");
 				if (!ioRegistry) return err("未挂载 evolution-io 注册表：无法查看运行结果。");
-				const probed = await readRunReport(preferProvider(ioRegistry, ["fs"]), record);
+				const probed = await readRunReport(ioRegistry.provider(), record);
 				if (probed.kind === "missing") return err(`运行 ${record.id}（${record.state}）没有结果：没有写出报告${record.failure === void 0 ? "" : `（${record.failure}）`}。`);
 				if (probed.kind === "unknown") return err(`运行 ${record.id} 有报告但读不出来（${probed.reason}）：这「不是」没有结果。`);
 				return ok(probed.text);
@@ -2386,7 +2418,7 @@ function apply(ctx, rawConfig = {}) {
 				if (wanted === void 0 && record.state === "running") return err(`最新一次运行 ${record.id} 仍在进行：它结束后才会出报告；用 /evolution maintain status ${record.id} 查看进度。`);
 				const ioRegistry = ctx.get("evolutionIo");
 				if (!ioRegistry) return err("未挂载 evolution-io 注册表：无法交付报告。");
-				const probed = await readRunReport(preferProvider(ioRegistry, ["fs"]), record);
+				const probed = await readRunReport(ioRegistry.provider(), record);
 				if (probed.kind === "missing") return err(`运行 ${record.id}（${record.state}）没有结果：没有写出报告${record.failure === void 0 ? "" : `（${record.failure}）`}。`);
 				if (probed.kind === "unknown") return err(`运行 ${record.id} 有报告但读不出来（${probed.reason}）：这「不是」没有结果。`);
 				const missingAgent = agentMissing("handoff");
@@ -2413,7 +2445,7 @@ function apply(ctx, rawConfig = {}) {
 			}
 			if (/^maintain\b/.test(input)) return err("未知的 maintain 参数：应为 `maintain`、`maintain --timeout <ms>` / `maintain --timeout=<ms>`、`maintain status [<id>]`、`maintain report [<id>]`、`maintain handoff [<id>]` 或 `maintain cancel [<id>]`。实际收到：" + input);
 			const presetParsed = parseSubcommand(input);
-			const presetInstall = isParseFailure(presetParsed) || presetParsed.name !== "preset" ? null : presetParsed.positionals[0] === "install" && presetParsed.positionals.length === 1 && [...presetParsed.flags.keys()].every((flag) => flagsOf("preset").includes("--" + flag)) ? presetParsed : false;
+			const presetInstall = isParseFailure(presetParsed) || presetParsed.name !== "preset" ? null : presetParsed.positionals[0] === "install" && presetParsed.positionals.length === 1 && [...presetParsed.flags.keys()].every((flag) => flagsOf("preset install").includes("--" + flag)) ? presetParsed : false;
 			if (presetInstall !== null && presetInstall !== false) {
 				{
 					const mounted = presetProfileTarget(ctx);
@@ -2525,8 +2557,9 @@ function apply(ctx, rawConfig = {}) {
 					if (decision.action === "staged") return ok(`${decision.message}${planRunId ? `\n[audit] plan=${planRunId}` : ""}`);
 				}
 				const result = await newSkillLibrary({
+					authority: authorityFrom({ origin: "foreground" }),
 					config: { root: skillsRootValue },
-					io: preferProvider(ioRegistry, ["fs"]),
+					io: ioRegistry.provider(),
 					ctx,
 					threatExemptLabels: config.threatExemptLabels,
 					limits: {
@@ -2783,7 +2816,8 @@ function resolveAgentPresetDir(importMetaUrl) {
 	const overlayCandidate = join(dirname(fileURLToPath(importMetaUrl)), "..", "..", "evolution-agent");
 	if (existsSync(join(overlayCandidate, "agent.cordis.yml")) && existsSync(join(overlayCandidate, "bases.json"))) return overlayCandidate;
 	try {
-		return dirname(createRequire(importMetaUrl).resolve("@lmzhen/dsh-evolution-agent-preset/package.json"));
+		const agentPresetPackage = scopedPackageName("dsh-evolution-agent-preset", importMetaUrl);
+		return dirname(createRequire(importMetaUrl).resolve(agentPresetPackage + "/package.json"));
 	} catch {
 		return overlayCandidate;
 	}

package/lib/types/registry.d.ts

@@ -19,7 +19,16 @@ export interface CommandEntry {
 }
 /** The flags the TABLE declares for one subcommand (name → `--flag`), DERIVED from its usage. */
 export declare function flagsOf(name: string): string[];
-/** C7 shape, DERIVED: the subcommand name is the first token of `usage` (variants use `|`). */
+/**
+ * C7 shape, DERIVED: the entry IDENTITY key, and it is HIERARCHICAL (E-08).
+ *
+ * The key used to be the first token alone, and `flagsOf` finds an entry with `.find(...)` - the FIRST
+ * match - so `maintain handoff` / `maintain cancel` and `skill restore` / `skill history` / `skill undo` /
+ * `skill pin` all derived the SAME key as their parent and every flag lookup silently saw the parent entry
+ * only (nine collisions). A bare parent (`maintain [--timeout]`) keeps its one-token key, so parent lookups
+ * still resolve: the one call site that named an entry by a name the key no longer produced was the preset
+ * dispatch branch, and it now asks for the entry own key (`preset install`).
+ */
 export declare function entryName(entry: CommandEntry): string;
 /** C7 shape, DERIVED: the flags a `usage` declares, in the form `--flag` (value flags keep their name). */
 export declare function entryFlags(entry: CommandEntry): string[];

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.26.15",
+  "version": "0.26.26",
   "publishConfig": {
     "access": "public"
   },
@@ -27,18 +27,17 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.4",
-    "@lmzhen/dsh-evolution-approval": "^0.26.15",
-    "@lmzhen/dsh-evolution-core": "^0.26.15",
-    "@lmzhen/dsh-evolution-maintenance": "^0.26.15"
+    "@lmzhen/dsh-evolution-approval": "^0.26.26",
+    "@lmzhen/dsh-evolution-core": "^0.26.26",
+    "@lmzhen/dsh-evolution-maintenance": "^0.26.26"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.26.15"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.26.26"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-commands": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
-    "@lmzhen/dsh-evolution-io": "^0.26.15"
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-commands": "^0.2.0-rc.1"