@lmzhen/dsh-evolution-commands 0.32.2 → 0.32.4

package/lib/index.js

@@ -73,7 +73,7 @@ const RUNTIME_LABELS = {
 */
 const FORM_WORDS = Object.freeze({
 	M1: "完整功能包",
-	M2: "后台自动化包",
+	M2: "人工审批包",
 	M3: "会话预设包",
 	M4: "分层安装"
 });
@@ -238,7 +238,7 @@ function runtimeOf(inputs) {
 			label: RUNTIME_LABELS.runs ?? "运行登记",
 			status: "warn",
 			detail: "running=" + String(inputs.runs.running) + "，orphaned=" + String(inputs.runs.orphaned),
-			remedy: "运行 /evolution runs 收敛遗留运行。"
+			remedy: "运行 /evolution maintain status 查看并收敛遗留运行。"
 		} : {
 			key: "runs",
 			label: RUNTIME_LABELS.runs ?? "运行登记",
@@ -392,9 +392,10 @@ async function assembleDoctorInputs(ctx, extras = {}) {
 	const hasPreset = bundles.some((name) => name.endsWith("dsh-evolution-preset"));
 	const hasHost = bundles.some((name) => name.endsWith("dsh-evolution-host"));
 	const hasFamilyPreset = listed.some((entry) => typeof entry.id === "string" && EVOLUTION_PRESET_IDS.includes(entry.id));
+	const humanGated = get("evolutionApproval")?.isEnabled === true;
 	const detectedForm = hasAll || hasPreset ? {
-		id: "M1",
-		evidence: [hasAll ? "bundle dsh-evolution-all installed" : "bundle dsh-evolution-preset installed"],
+		id: humanGated ? "M2" : "M1",
+		evidence: [hasAll ? "bundle dsh-evolution-all installed" : "bundle dsh-evolution-preset installed", ...humanGated ? ["approval.enabled: true"] : []],
 		confidence: "declared"
 	} : hasHost ? hasFamilyPreset ? {
 		id: "M4",
@@ -1446,8 +1447,9 @@ async function diagnose(ctx, options = {}) {
 		pendingCount = null;
 		executingCount = null;
 	}
-	const installForm = full ? "full" : preset ? "preset" : layered ? "layered" : host ? "host" : presetDirInstalled ? "preset-only" : "none";
-	const deploymentForm = installForm === "layered" ? "variant" : installForm === "full" || installForm === "preset" ? "attach" : installForm === "host" ? "host-only" : installForm === "preset-only" ? "preset-only" : "none";
+	const humanGated = ctx.get("evolutionApproval")?.isEnabled === true;
+	const installForm = full || preset ? humanGated ? "human-gated" : full ? "full" : "preset" : layered ? "layered" : host ? "host" : presetDirInstalled ? "preset-only" : "none";
+	const deploymentForm = installForm === "layered" ? "variant" : installForm === "full" || installForm === "preset" || installForm === "human-gated" ? "attach" : installForm === "host" ? "host-only" : installForm === "preset-only" ? "preset-only" : "none";
 	const mountConflicts = conflicts.filter((row) => !row.includes("DEGRADED"));
 	const undecidable = mountConflicts.length !== conflicts.length;
 	const scopedProbe = {
@@ -1483,7 +1485,7 @@ async function diagnose(ctx, options = {}) {
 		if (row.status !== "differs") continue;
 		actions.push(`Preset row for base "${row.base}" in ${row.destination} DIFFERS from a fresh generation — it is an install-time snapshot; re-run the installer (/evolution preset install) to regenerate`);
 	}
-	const view = buildDoctorView(await assembleDoctorInputs(ctx));
+	const view = buildDoctorView(await assembleDoctorInputs(ctx, options.runs === void 0 ? {} : { runs: options.runs }));
 	const merge = await mergeDoctorLine(ctx);
 	if (merge.status !== "ok" && merge.remedy !== void 0) actions.push("合并行：" + merge.remedy);
 	return {
@@ -2270,7 +2272,10 @@ function parseCommand(defs, argv) {
 		help: true
 	};
 	const candidates = defs.filter((item) => item.words.includes(verb));
-	const def = candidates.find((item) => rest.filter((token) => token.startsWith("--")).every((token) => item.flags.some((flag) => flag.name === token.slice(2)))) ?? candidates[0];
+	const def = candidates.find((item) => rest.filter((token) => token.startsWith("--")).every((token) => {
+		const name = token.slice(2).split("=")[0] ?? "";
+		return item.flags.some((flag) => flag.name === name);
+	})) ?? candidates[0];
 	if (def === void 0) return {
 		ok: false,
 		code: "usage",
@@ -2284,15 +2289,27 @@ function parseCommand(defs, argv) {
 			positional.push(token);
 			continue;
 		}
-		const name = token.slice(2);
+		const eq = token.indexOf("=");
+		const name = (eq < 0 ? token : token.slice(0, eq)).slice(2);
+		const inline = eq < 0 ? void 0 : token.slice(eq + 1);
 		const flag = def.flags.find((item) => item.name === name);
 		if (flag === void 0) return {
 			ok: false,
 			code: "usage",
 			message: "unknown flag: --" + name
 		};
-		if (flag.kind === "boolean") values[name] = true;
-		else {
+		if (flag.kind === "boolean") {
+			if (inline !== void 0) return {
+				ok: false,
+				code: "usage",
+				message: "flag does not take a value: --" + name
+			};
+			values[name] = true;
+		} else {
+			if (inline !== void 0) {
+				values[name] = inline;
+				continue;
+			}
 			const value = rest[index + 1];
 			if (value === void 0 || value.startsWith("--")) return {
 				ok: false,
@@ -2573,7 +2590,7 @@ function apply(ctx, rawConfig = {}) {
 			};
 			const approval = ctx.get("evolutionApproval");
 			const pendingParsed = parseSubcommand(input);
-			if (!isParseFailure(pendingParsed) && pendingParsed.name === "pending") {
+			if (!isParseFailure(pendingParsed) && pendingParsed.name === "pending" && pendingParsed.positionals.length === 0 && [...pendingParsed.flags.keys()].every((flag) => flag === "detail")) {
 				if (!approval) return err(errorText("e-301-approval-service-not-mounted"));
 				const listed = [...await approval.list("pending"), ...await approval.list("executing")];
 				const pending = [...new Map(listed.map((row) => [row.id, row])).values()];
@@ -3331,7 +3348,7 @@ function apply(ctx, rawConfig = {}) {
 				return ok(replay.compare().report);
 			}
 			const paramsParsed = parseSubcommand(input);
-			if (!isParseFailure(paramsParsed) && paramsParsed.name === "params") {
+			if (!isParseFailure(paramsParsed) && paramsParsed.name === "params" && paramsParsed.positionals.length === 0 && [...paramsParsed.flags.keys()].every((flag) => flag === "group" || flag === "json")) {
 				const provider = ctx.get("settings");
 				const sections = /* @__PURE__ */ new Map();
 				if (provider?.describe !== void 0) try {
@@ -3446,7 +3463,8 @@ function apply(ctx, rawConfig = {}) {
 				} };
 				const report = await diagnose(ctx, {
 					home: evolutionRoot(),
-					...mounted
+					...mounted,
+					runs: doctorRuns()
 				});
 				if (input === "doctor --json") return ok(JSON.stringify(report.view, null, 2));
 				return ok(renderDoctorText(report));

package/lib/types/doctor.d.ts

@@ -73,7 +73,7 @@ export interface DoctorReport {
      * per-session install reported `none` and the action ladder advised
      * installing `all` — which double-mounts the preset's model rows (the
      * exact conflict this report flags). */
-    installForm: 'full' | 'host' | 'preset' | 'layered' | 'preset-only' | 'none';
+    installForm: 'full' | 'human-gated' | 'host' | 'preset' | 'layered' | 'preset-only' | 'none';
     /** The PRODUCT form the install form implies (0.3.77, C axis). `variant` =
      * session-level opt-in: the model tools live in the Evolution preset, so a
      * session on any platform original preset carries none of the family and the
@@ -166,6 +166,10 @@ export declare function diagnose(ctx: {
 }, options?: {
     home?: string;
     mounted?: MountedProfile;
+    runs?: {
+        readonly running: number;
+        readonly orphaned: number;
+    };
 }): Promise<DoctorReport>;
 /**
  * W8-S7: the doctor's text face, VIEW-FIRST.

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