@lmzhen/dsh-evolution-commands 0.3.79 → 0.3.80

package/lib/index.js

@@ -119,6 +119,9 @@ function resolveAgentPresetAsset(asset) {
 }
 /** The base rows of bases.json: the comparison iterates the same table the
 * installer reads, so doctor cannot check a different set of variants.
+* S1-F1: rows also carry the optional `unsupported` note — the layered-form
+* detection below must not treat a base that carries NO family model rows
+* (minimal) as a double-mount participant.
 * @param path - resolved bases.json.
 * @returns the rows, or null when the table is unreadable or malformed. */
 function readAgentPresetBases$1(path) {
@@ -131,7 +134,8 @@ function readAgentPresetBases$1(path) {
 			if (typeof entry.name !== "string" || typeof entry.id !== "string") return null;
 			rows.push({
 				name: entry.name,
-				id: entry.id
+				id: entry.id,
+				...typeof entry.unsupported === "string" ? { unsupported: entry.unsupported } : {}
 			});
 		}
 		return rows.length > 0 ? rows : null;
@@ -155,6 +159,38 @@ function installedPresetIds(root) {
 	return ids;
 }
 /**
+* S1-F1: ids of the family's DELIVERED layered presets — every
+* `.agent-presets/<id>/agent.cordis.yml` artifact that can actually carry the
+* family model rows. The detection used to probe ONLY the default base id
+* (`evolution`), so a `--base ptc|cordis` layered install was invisible:
+* installForm degraded to `none`/`host` and the action ladder recommended
+* installing `evolution-all` on top — the exact double-mount the doctor exists
+* to prevent (V27 G6.4 closed it for the default id only).
+*
+* A directory counts only when the base table names it as a SUPPORTED family
+* base (the `unsupported` minimal base carries no model rows and cannot
+* double-mount anything). When the table itself cannot be read, every
+* delivered artifact counts — the visible-by-directory posture of
+* {@link probePresetFreshness}: flag rather than stay silent.
+* @param root - the `.agent-presets` home directory.
+* @returns installed family base ids whose `agent.cordis.yml` is on disk.
+*/
+function installedLayeredPresetIds(root) {
+	const delivered = installedPresetIds(root).filter((id) => existsSync(join(root, id, "agent.cordis.yml")));
+	if (delivered.length === 0) return [];
+	const basesPath = resolveAgentPresetAsset("bases.json");
+	const bases = basesPath === null ? null : readAgentPresetBases$1(basesPath);
+	if (bases === null) return delivered.filter((id) => {
+		try {
+			return readFileSync(join(root, id, "agent.cordis.yml"), "utf8").includes("@deepseek-ai/dsh-");
+		} catch {
+			return false;
+		}
+	});
+	const supported = new Set(bases.filter((row) => row.unsupported === void 0).map((row) => row.id));
+	return delivered.filter((id) => supported.has(id));
+}
+/**
 * G3-② (B2): recompute what a fresh generation would write for every
 * installed variant and compare it byte-for-byte with the file on disk.
 *
@@ -278,13 +314,15 @@ async function diagnose(ctx, options = {}) {
 	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 layeredIds = installedLayeredPresetIds(join(home, ".agent-presets"));
+	const presetDirInstalled = layeredIds.length > 0;
+	const layeredArtifactLabel = presetDirInstalled ? layeredIds.join(", ") : "evolution";
 	const layered = host && presetDirInstalled;
 	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.");
-	if (full && presetDirInstalled) conflicts.push("evolution-all and the layered Evolution preset are both present — the model rows double-mount. Keep ONE (use layered without all, or drop the preset).");
-	if (preset && presetDirInstalled) conflicts.push("evolution-preset and the layered Evolution preset are both present — the model rows double-mount (the preset bundle carries the same model rows as all). Keep ONE (drop the preset bundle, or remove the layered preset).");
+	if (full && presetDirInstalled) conflicts.push(`evolution-all and the layered Evolution preset (${layeredArtifactLabel}) are both present — the model rows double-mount. Keep ONE (use layered without all, or drop the preset).`);
+	if (preset && presetDirInstalled) conflicts.push(`evolution-preset and the layered Evolution preset (${layeredArtifactLabel}) are both present — the model rows double-mount (the preset bundle carries the same model rows as all). Keep ONE (drop the preset bundle, or remove the layered preset).`);
 	const services = {
 		review: full || host || preset,
 		curator: has("evolutionCurator"),
@@ -312,7 +350,7 @@ async function diagnose(ctx, options = {}) {
 	if (mountConflicts.length > 0) actions.push("Resolve the conflict first: keep exactly one of evolution-all / evolution-host / evolution-preset / layered.");
 	else if (undecidable) actions.push("The install form is UNDECIDABLE (see the DEGRADED row above): an unreadable profiles directory or profile manifest hides whatever is installed, so this report must not add or remove a bundle. Fix the reported read failure, then re-run /evolution doctor.");
 	else if (installForm === "none") actions.push("Install the default full bundle: dsh plugin --profile web add @lmzhen/dsh-evolution-all");
-	else if (installForm === "preset-only") actions.push("The Evolution preset is delivered but no profile mounts an evolution bundle — re-add @lmzhen/dsh-evolution-host for the layered layout (do NOT add all on top of the preset: that double-mounts the model rows), or remove .agent-presets/evolution if the layered layout is no longer wanted.");
+	else if (installForm === "preset-only") actions.push(`The Evolution preset is delivered but no profile mounts an evolution bundle — re-add @lmzhen/dsh-evolution-host for the layered layout (do NOT add all on top of the preset: that double-mounts the model rows), or remove .agent-presets/${layeredArtifactLabel} if the layered layout is no longer wanted.`);
 	else if (installForm === "layered") actions.push("Variant form (session opt-in): model tools follow the Evolution preset, and a session on a platform original preset carries no family rows; add @lmzhen/dsh-evolution-all instead if every session should have them.");
 	const env = envIssues();
 	if (env.length > 0) actions.push("Fix the DSH_EVOLUTION_* variable listed above.");
@@ -320,7 +358,7 @@ async function diagnose(ctx, options = {}) {
 	if (pendingCount === null && services.approval) actions.push("Approval service is mounted but pending listing failed — check the evolution state service.");
 	const memoryIssues = memoryInterpolationIssues(home);
 	if (memoryIssues.length > 0) actions.push("Rewrite the memory entries listed above (or run a build with the render-time neutralization) — they broke prompt assembly on older builds.");
-	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.`);
+	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. For a verified orphan (this build: S2-P2-22), /evolution release <id> returns it to the pending window instead.`);
 	for (const row of presetFreshness) {
 		if (row.status !== "differs") continue;
 		actions.push(`Preset variant ${row.destination} DIFFERS from a fresh generation — it is an install-time snapshot; re-run the installer (/evolution preset install) to regenerate`);
@@ -373,6 +411,10 @@ const COMMAND_ENTRIES = [
 		usage: "reject <id>",
 		summary: "drop a staged write without running it"
 	},
+	{
+		usage: "release <id>",
+		summary: "return an orphaned EXECUTING write to the pending window (verify the effect first, then approve or reject)"
+	},
 	{
 		usage: "doctor [--json]",
 		summary: "read-only self-check: install form, conflicts, env, services (--json feeds scripts)"
@@ -477,7 +519,8 @@ function apply(ctx, rawConfig = {}) {
 				const approval = ctx.get("evolutionApproval");
 				const pendingMatch = /^pending(?: --detail)?$/.exec(input);
 				if (pendingMatch) {
-					const listed = approval ? [...await approval.list("pending"), ...await approval.list("executing")] : [];
+					if (!approval) return err("E-301: approval service not mounted — pending writes cannot be listed or replayed. Next: the evolution-approval row ships with evolution-host/evolution-all — run /evolution doctor to see which services are mounted.");
+					const listed = [...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";
@@ -504,6 +547,13 @@ function apply(ctx, rawConfig = {}) {
 					};
 					return result.ok ? ok(result.message) : err(result.message);
 				}
+				if (input.startsWith("release ")) {
+					const id = input.slice(8).trim();
+					if (!approval) return err("E-301: approval service not mounted. Next: the evolution-approval row ships with evolution-host/evolution-all — run /evolution doctor to see which services are mounted.");
+					if (!approval.release) return err("E-304: the mounted approval service predates the release capability — reject the record instead.");
+					const result = await approval.release(id);
+					return result.ok ? ok(result.message) : err(result.message);
+				}
 				if (input === "curator run") {
 					const curator = ctx.get("evolutionCurator");
 					if (!curator) return err("E-302: curator service not mounted. Next: mount the evolution-curator row (evolution-host/evolution-all) and run /evolution doctor.");

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