@lmzhen/dsh-evolution-commands 0.3.68 → 0.3.70

package/lib/index.js

@@ -26,17 +26,32 @@ const EVOLUTION_BUNDLE_TAILS = new Set([
 	"dsh-evolution-host",
 	"dsh-evolution-preset"
 ]);
-/** Profile bundle rows for evolution-family packages across all profiles. */
-function collectEvolutionBundles(home) {
+/** Profile bundle rows for evolution-family packages across all profiles.
+*
+* `onReadError` reports a profile whose manifest could not be READ or PARSED.
+* Like the directory-enumeration failure, it is fail-closed at every caller:
+* a truncated manifest is indistinguishable from "no bundles" by the returned
+* list alone, and treating it as "no bundles" is exactly the fail-open state
+* the double-mount exclusion exists to prevent. */
+function collectEvolutionBundles(home, onReadError) {
 	const profilesDir = join(home, "profiles");
 	if (!existsSync(profilesDir)) return [];
 	const bundles = [];
-	for (const profile of readdirSync(profilesDir, { withFileTypes: true })) {
+	let profileEntries;
+	try {
+		profileEntries = readdirSync(profilesDir, { withFileTypes: true });
+	} catch (error) {
+		onReadError?.(error, "profiles-dir");
+		return bundles;
+	}
+	for (const profile of profileEntries) {
 		if (!profile.isDirectory()) continue;
 		try {
 			const manifest = JSON.parse(readFileSync(join(profilesDir, profile.name, "package.json"), "utf8"));
 			for (const name of manifest.dsh?.profile?.bundles ?? []) if (EVOLUTION_BUNDLE_TAILS.has(tailOf(name))) bundles.push(name);
-		} catch {}
+		} catch (error) {
+			onReadError?.(error, "profile-manifest");
+		}
 	}
 	return bundles;
 }
@@ -58,14 +73,17 @@ function envIssues() {
 */
 async function diagnose(ctx, options = {}) {
 	const home = options.home ?? evolutionRoot();
-	const bundles = collectEvolutionBundles(home);
+	const conflicts = [];
+	const bundles = collectEvolutionBundles(home, (error, scope) => {
+		const detail = error instanceof Error ? error.message : String(error);
+		conflicts.push(scope === "profiles-dir" ? `the home profiles directory could not be enumerated (${detail}) — bundle-based install-form and conflict checks are DEGRADED and may miss installed bundles` : `a profile manifest could not be read or parsed (${detail}) — this profile's bundle rows are UNKNOWN, so the install-form and conflict checks are DEGRADED and may miss installed bundles`);
+	});
 	const has = (name) => ctx.get(name) !== void 0;
 	const full = bundles.some((name) => tailOf(name) === "dsh-evolution-all");
 	const host = bundles.some((name) => tailOf(name) === "dsh-evolution-host");
 	const preset = bundles.some((name) => tailOf(name) === "dsh-evolution-preset");
 	const presetDirInstalled = existsSync(join(join(home, ".agent-presets", "evolution"), "agent.cordis.yml"));
 	const layered = host && presetDirInstalled;
-	const conflicts = [];
 	if (full && host) conflicts.push("evolution-all and evolution-host are installed together — the infra rows double-mount and startup fails loud. Keep ONE: remove the other bundle.");
 	if (full && preset) conflicts.push("evolution-all and evolution-preset are installed together — the infra rows double-mount. Keep ONE.");
 	if (host && preset) conflicts.push("evolution-host and evolution-preset are installed together — the infra rows double-mount. Keep ONE.");
@@ -99,7 +117,7 @@ async function diagnose(ctx, options = {}) {
 	if (env.length > 0) actions.push("Fix the DSH_EVOLUTION_* variable listed above.");
 	if (services.review && !services.curator) actions.push("Curator service is not mounted — automatic curation is off; verify the host/all bundle row set is complete.");
 	if (pendingCount === null && services.approval) actions.push("Approval service is mounted but pending listing failed — check the evolution state service.");
-	if ((executingCount ?? 0) > 0) actions.push(`${executingCount} staged write(s) are stuck EXECUTING (the approving run crashed) — inspect with /evolution pending and reject them after verifying the write effect.`);
+	if ((executingCount ?? 0) > 0) actions.push(`${executingCount} staged write(s) are EXECUTING (an approve crashed mid-run — or one is still in flight). Inspect with /evolution pending: if you started the approve, verify the landed write and do not reject it; only reject after verifying no write is intended.`);
 	return {
 		installForm,
 		bundles,
@@ -115,7 +133,7 @@ function renderDoctorText(report) {
 	const lines = [
 		`Evolution doctor — install form: ${report.installForm}`,
 		`bundles (all profiles): ${report.bundles.length > 0 ? report.bundles.join(", ") : "(none)"}`,
-		`services: review=${report.services.review} curator=${report.services.curator} approval=${report.services.approval} skillUsage=${report.services.skillUsage} io=${report.services.io}`,
+		`services: review=${report.services.review} (inferred from bundles, all profiles) curator=${report.services.curator} approval=${report.services.approval} skillUsage=${report.services.skillUsage} io=${report.services.io}`,
 		`pending: ${report.pendingCount === null ? "unknown" : report.pendingCount}`,
 		`executing: ${report.executingCount === null ? "unknown" : report.executingCount}`
 	];
@@ -224,12 +242,12 @@ function apply(ctx, rawConfig = {}) {
 	let maintainInFlightSince = 0;
 	ctx.inject(["commands"], (commandCtx) => {
 		const commands = commandCtx.commands;
-		commandCtx.effect(() => commands.register({
+		const evolutionCommand = {
 			name: "evolution",
 			description: "Self-evolution status and approval controls",
 			recordInput: false,
 			input: { hint: renderHint() },
-			async handler(invocation) {
+			run: async (invocation) => {
 				const rawInputTrimmed = invocation.rawInput.trim();
 				const input = rawInputTrimmed.replace(/\s+/g, " ");
 				const ok = (text) => ({
@@ -243,7 +261,8 @@ function apply(ctx, rawConfig = {}) {
 				const approval = ctx.get("evolutionApproval");
 				const pendingMatch = /^pending(?: --detail)?$/.exec(input);
 				if (pendingMatch) {
-					const pending = approval ? [...await approval.list("pending"), ...await approval.list("executing")] : [];
+					const listed = approval ? [...await approval.list("pending"), ...await approval.list("executing")] : [];
+					const pending = [...new Map(listed.map((row) => [row.id, row])).values()];
 					if (pending.length === 0) return ok("No pending evolution writes.");
 					const detailed = pendingMatch[0] === "pending --detail";
 					return ok(pending.map((p) => {
@@ -449,7 +468,7 @@ function apply(ctx, rawConfig = {}) {
 							logger: { warn: (message) => {
 								ctx.logger.warn(message);
 							} },
-							rootExists: () => ioRegistry.provider().exists(skillsRootValue),
+							rootExists: skillsRootValue === "" ? void 0 : () => ioRegistry.provider().exists(skillsRootValue),
 							skillRoot: skillsRootValue
 						}, {
 							timeoutMs: runTimeoutMs,
@@ -482,6 +501,19 @@ function apply(ctx, rawConfig = {}) {
 				}
 				if (/^maintain\b/.test(input)) return err("Unknown maintain arguments: expected bare `maintain`, `maintain --timeout <ms>` or `maintain --timeout=<ms>` (a positive integer). Got: " + input);
 				if (input === "preset install") {
+					{
+						let installedBundles;
+						try {
+							installedBundles = collectEvolutionBundles(evolutionRoot(), (error) => {
+								throw error;
+							});
+						} catch (enumerationError) {
+							return err(`Refusing to install the layered Evolution preset: the home profile directory or one of its profile manifests could not be read (${enumerationError instanceof Error ? enumerationError.message : String(enumerationError)}) — the all/preset double-mount check could not run. Resolve access to the profiles directory and retry, or install via the layered installer, which enforces the same exclusion up front.`);
+						}
+						const allBundle = installedBundles.find((name) => name === "dsh-evolution-all" || name.endsWith("/dsh-evolution-all"));
+						const presetBundle = installedBundles.find((name) => name === "dsh-evolution-preset" || name.endsWith("/dsh-evolution-preset"));
+						if (allBundle || presetBundle) return err(`Refusing to install the layered Evolution preset: "${allBundle ?? presetBundle}" is installed in this home — its model rows (tool-memory / tool-skill-manage / tool-session-query / skill-catalog) would double-mount with the preset's and the profile fails loud at startup. Keep ONE: remove the ${allBundle ? "evolution-all bundle" : "evolution-preset bundle"} before installing the layered preset (see /evolution doctor).`);
+					}
 					const target = join(evolutionRoot(), ".agent-presets", "evolution");
 					try {
 						const source = resolveAgentPresetDir(import.meta.url);
@@ -565,8 +597,13 @@ function apply(ctx, rawConfig = {}) {
 					return ok(renderDoctorText(report));
 				}
 				return ok(`Evolution: memory, skills, review, curator — self-evolution status, approval and maintenance.\n${renderHelpText()}`);
-			}
-		}));
+			},
+			handler: (invocation) => evolutionCommand.run(invocation).catch((error) => ({
+				kind: "error",
+				text: `evolution: command failed: ${error instanceof Error ? error.message : String(error)}\nRun /evolution doctor to inspect services and state files; a corrupted state file is quarantined as <file>.corrupt for inspection.`
+			}))
+		};
+		commandCtx.effect(() => commands.register(evolutionCommand));
 	});
 }
 /**

package/lib/types/doctor.d.ts

@@ -21,8 +21,14 @@ export interface DoctorReport {
     executingCount: number | null;
     actions: string[];
 }
-/** Profile bundle rows for evolution-family packages across all profiles. */
-export declare function collectEvolutionBundles(home: string): string[];
+/** Profile bundle rows for evolution-family packages across all profiles.
+ *
+ * `onReadError` reports a profile whose manifest could not be READ or PARSED.
+ * Like the directory-enumeration failure, it is fail-closed at every caller:
+ * a truncated manifest is indistinguishable from "no bundles" by the returned
+ * list alone, and treating it as "no bundles" is exactly the fail-open state
+ * the double-mount exclusion exists to prevent. */
+export declare function collectEvolutionBundles(home: string, onReadError?: (error: unknown, scope: 'profiles-dir' | 'profile-manifest') => void): string[];
 /**
  * Diagnose the deployment. `ctx` supplies service presence (a bare stub with
  * only `get` is enough); `home` defaults to the evolution root so tests can

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.3.68",
+  "version": "0.3.70",
   "publishConfig": {
     "access": "public"
   },
@@ -31,21 +31,21 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.68",
-    "@lmzhen/dsh-evolution-core": "^0.3.68",
-    "@lmzhen/dsh-evolution-maintenance": "^0.3.68"
+    "@lmzhen/dsh-evolution-approval": "^0.3.70",
+    "@lmzhen/dsh-evolution-core": "^0.3.70",
+    "@lmzhen/dsh-evolution-maintenance": "^0.3.70"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.3.68"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.3.70"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-commands": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2"
+    "@deepseek-ai/dsh-commands": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-commands": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2"
+    "@deepseek-ai/dsh-commands": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.2"
   }
 }