@lmzhen/dsh-evolution-commands 0.30.18 → 0.30.19

package/lib/index.js

@@ -1477,6 +1477,8 @@ async function diagnose(ctx, options = {}) {
 		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 merge = await mergeDoctorLine(ctx);
+	if (merge.status !== "ok" && merge.remedy !== void 0) actions.push("合并行：" + merge.remedy);
 	return {
 		installForm,
 		deploymentForm,
@@ -1500,7 +1502,35 @@ async function diagnose(ctx, options = {}) {
 		dormantBundles,
 		serviceSource: reviewRow === void 0 ? "bundles" : "platform",
 		actions,
-		view
+		view,
+		merge
+	};
+}
+/**
+* Probe the merge plugin's global-doctor line. The plugin exposes `doctorFact()` (which composes
+* its wire DoctorView); this module never reads merge files itself, so core stays free of merge
+* rows and the two producers cannot drift.
+* @param ctx - the host service view.
+* @returns the one-line merge fact; unknown on absence or failure (doctor must answer).
+*/
+async function mergeDoctorLine(ctx) {
+	const service = ctx.get("evolutionMerge");
+	if (service?.doctorFact === void 0) return {
+		status: "unknown",
+		detail: "evolutionMerge 服务未挂载：本安装形态没有合并行",
+		remedy: "安装含 evolution-merge 的 bundle 后重新运行 /evolution doctor"
+	};
+	const probed = await probeBounded(() => service.doctorFact(), "merge doctor");
+	if (!probed.ok) return {
+		status: "unknown",
+		detail: "合并状态探测失败：" + probed.message,
+		remedy: "运行 /evolution merge doctor 查看详情"
+	};
+	const value = probed.value;
+	return {
+		status: value.status === "ok" || value.status === "warn" || value.status === "fail" || value.status === "unknown" ? value.status : "unknown",
+		detail: typeof value.detail === "string" && value.detail !== "" ? value.detail : "合并状态探测没有返回 detail",
+		...typeof value.remedy === "string" && value.remedy !== "" ? { remedy: value.remedy } : {}
 	};
 }
 /**
@@ -1642,6 +1672,9 @@ function renderDoctorText(report) {
 	if (report.dormantBundles.length > 0) extras.push(`installed but not selected: ${report.dormantBundles.join(", ")} — the Plugins page lists them; this runtime mounts neither`);
 	extras.push(`bundles (all profiles): ${report.bundles.length > 0 ? report.bundles.join(", ") : "(none)"}`);
 	extras.push(`services: review=${report.services.review} (${report.serviceSource === "platform" ? "the live row, this runtime" : "inferred from bundles, all profiles"}) curator=${report.services.curator} approval=${report.services.approval} skillUsage=${report.services.skillUsage} io=${report.services.io}`);
+	const mergeStatus = report.merge.status === "ok" ? "正常" : report.merge.status === "warn" ? "注意" : report.merge.status === "fail" ? "异常" : "未知";
+	extras.push("merge: [" + mergeStatus + "] " + report.merge.detail + (report.merge.remedy === void 0 ? "" : "；下一步：" + report.merge.remedy));
+	if (report.merge.status !== "ok" && report.merge.remedy !== void 0) extras.push("  → " + report.merge.remedy);
 	if (report.capabilityAbsence.length > 0) extras.push(`capability absence (${report.capabilityAbsence.length}): ${report.capabilityAbsence.map((entry) => `${entry.service} — ${entry.feature}`).join("; ")}`);
 	extras.push(scopedProbeLine(report.scopedProbe));
 	extras.push(legacyLine(report.legacy));
@@ -2178,6 +2211,108 @@ function parseSubcommand(input) {
 	};
 }
 //#endregion
+//#region lib/types/command-catalog.js
+function buildSurface(defs, prefix) {
+	const defaults = (def) => Object.fromEntries(def.flags.flatMap((flag) => {
+		if (flag.default !== void 0) return [[flag.name, flag.default]];
+		return flag.kind === "boolean" ? [[flag.name, "false"]] : [];
+	}));
+	return {
+		wireVersion: 1,
+		prefix,
+		commands: defs.filter((def) => def.surface !== false).map((def) => ({
+			id: def.id,
+			words: def.words,
+			flags: def.flags,
+			positional: def.positional,
+			readOnly: def.readOnly,
+			needsRun: def.needsRun,
+			defaults: defaults(def),
+			rowActions: (def.rowActions ?? []).map((action) => ({
+				id: action.id,
+				command: action.command,
+				confirm: action.confirm === true
+			})),
+			fallback: def.fallback
+		})),
+		fallback: defs.filter((def) => def.surface !== false && (def.rowActions === void 0 || def.rowActions.length === 0)).map((def) => ({
+			id: def.id,
+			command: def.fallback
+		}))
+	};
+}
+function parseCommand(defs, argv) {
+	const [verb, ...rest] = argv;
+	if (verb === void 0 || verb === "help" || verb === "--help" || verb === "-h") return {
+		ok: true,
+		id: "help",
+		values: {},
+		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];
+	if (def === void 0) return {
+		ok: false,
+		code: "usage",
+		message: "unknown command: " + verb
+	};
+	const values = {};
+	const positional = [];
+	for (let index = 0; index < rest.length; index += 1) {
+		const token = rest[index];
+		if (!token.startsWith("--")) {
+			positional.push(token);
+			continue;
+		}
+		const name = token.slice(2);
+		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 {
+			const value = rest[index + 1];
+			if (value === void 0 || value.startsWith("--")) return {
+				ok: false,
+				code: "usage",
+				message: "missing value for --" + name
+			};
+			values[name] = value;
+			index += 1;
+		}
+	}
+	for (const flag of def.flags) if (flag.required === true && values[flag.name] === void 0) return {
+		ok: false,
+		code: "usage",
+		message: "missing required flag: --" + flag.name
+	};
+	const required = def.positional.filter((item) => item.required).length;
+	if (positional.length < required || positional.length > def.positional.length) return {
+		ok: false,
+		code: "usage",
+		message: "usage: " + def.fallback
+	};
+	def.positional.forEach((item, index) => {
+		const value = positional[index];
+		if (value !== void 0) values[item.name] = value;
+	});
+	return {
+		ok: true,
+		id: def.id,
+		values
+	};
+}
+function aliasRegistration(version, def) {
+	if (def.deprecatedAt === void 0) return "registered";
+	const [major, minor] = version.split(".").map(Number);
+	const [depMajor = 0, depMinor = 0] = def.deprecatedAt.split(".").map(Number);
+	if ((major ?? 0) > depMajor || (major ?? 0) === depMajor && (minor ?? 0) >= depMinor + 1) return "removed";
+	if ((major ?? 0) === depMajor && (minor ?? 0) === depMinor) return "deprecated";
+	return "registered";
+}
+//#endregion
 //#region lib/types/index.js
 /**
 * Human commands for the evolution family: /evolution learn|pending|curator|restore|consolidate|skills refresh.
@@ -3342,4 +3477,4 @@ function safeStagedArgs(args) {
 	}
 }
 //#endregion
-export { Config, apply, atomicWriteFiles, name };
+export { Config, aliasRegistration, apply, atomicWriteFiles, buildSurface, name, parseCommand };

package/lib/types/command-catalog.d.ts

@@ -0,0 +1,87 @@
+/** Family command catalog: one source for parser/help/surface/fallback. */
+export interface CommandFlagDef {
+    readonly name: string;
+    readonly kind: 'boolean' | 'value';
+    readonly valueName?: string;
+    readonly repeatable?: boolean;
+    readonly values?: readonly string[];
+    readonly default?: string;
+    readonly required?: boolean;
+}
+export interface CommandPositionalDef {
+    readonly name: string;
+    readonly kind: 'skill' | 'target' | 'runId' | 'id' | 'json' | 'text';
+    readonly required: boolean;
+    readonly variadic?: boolean;
+}
+export interface RowActionDef {
+    readonly id: string;
+    readonly command: string;
+    readonly confirm?: boolean;
+    readonly enabledWhen?: string;
+}
+export interface CommandDef {
+    readonly id: string;
+    readonly words: readonly string[];
+    readonly summaryKey: string;
+    readonly helpKey: string;
+    readonly flags: readonly CommandFlagDef[];
+    readonly positional: readonly CommandPositionalDef[];
+    readonly readOnly: boolean;
+    readonly needsRun: boolean;
+    readonly aliases?: readonly string[];
+    readonly rowActions?: readonly RowActionDef[];
+    readonly fallback: string;
+    readonly deprecatedAt?: '0.31' | '0.32';
+    readonly surface?: boolean;
+    readonly usage?: boolean;
+}
+export interface CommandSurfaceCommand {
+    readonly id: string;
+    readonly words: readonly string[];
+    readonly flags: readonly {
+        readonly name: string;
+        readonly kind: 'boolean' | 'value';
+        readonly valueName?: string;
+        readonly repeatable?: boolean;
+        readonly values?: readonly string[];
+    }[];
+    readonly positional: readonly {
+        readonly name: string;
+        readonly kind: 'skill' | 'target' | 'runId' | 'id' | 'json' | 'text';
+        readonly required: boolean;
+        readonly variadic?: boolean;
+    }[];
+    readonly readOnly: boolean;
+    readonly needsRun: boolean;
+    readonly defaults: Readonly<Record<string, string>>;
+    readonly rowActions: readonly {
+        readonly id: string;
+        readonly command: string;
+        readonly confirm: boolean;
+    }[];
+    readonly fallback: string;
+}
+export interface CommandSurfaceView {
+    readonly wireVersion: 1;
+    readonly prefix: string;
+    readonly commands: readonly CommandSurfaceCommand[];
+    readonly fallback: readonly {
+        readonly id: string;
+        readonly command: string;
+    }[];
+}
+export type ParsedCommand = {
+    readonly ok: true;
+    readonly id: string;
+    readonly values: Readonly<Record<string, string | true>>;
+    readonly help?: true;
+} | {
+    readonly ok: false;
+    readonly code: 'usage';
+    readonly message: string;
+};
+export declare function buildSurface(defs: readonly CommandDef[], prefix: string): CommandSurfaceView;
+export declare function parseCommand(defs: readonly CommandDef[], argv: readonly string[]): ParsedCommand;
+export declare function aliasRegistration(version: string, def: CommandDef): 'registered' | 'deprecated' | 'removed';
+//# sourceMappingURL=command-catalog.d.ts.map

package/lib/types/doctor.d.ts

@@ -60,6 +60,12 @@ export interface LegacyMigrationRow {
     /** Keys still waiting for their row, as `rowId.key`. */
     readonly pending: readonly string[];
 }
+/** The merge plugin's one-line contribution to the global doctor (cross-plugin read). */
+export interface MergeDoctorLine {
+    readonly status: 'ok' | 'warn' | 'fail' | 'unknown';
+    readonly detail: string;
+    readonly remedy?: string;
+}
 export interface DoctorReport {
     /** OPT-23 (2026-09): `preset-only` — the delivered Evolution preset
      * artifact exists but NO profile carries an evolution bundle (e.g. the
@@ -144,6 +150,8 @@ export interface DoctorReport {
     /** G6/W8 tail: the frozen DiagnosticsView (7 facts + 8 runtime rows) — the SAME object the
      * diagnostics route and the client card render; `--json` emits it and the text renderer prints it. */
     readonly view: DiagnosticsView;
+    /** The merge row: produced by the merge plugin's buildDoctorView consumer; absent service = unknown. */
+    readonly merge: MergeDoctorLine;
 }
 /** Profile bundle rows for evolution-family packages across all profiles.
  *

package/lib/types/index.d.ts

@@ -73,4 +73,5 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     threatExemptLabels: z<string[], string[], "defined">;
 }>>, "plain">;
 export declare function apply(ctx: Context, rawConfig?: Config): void;
+export * from './command-catalog.ts';
 //# sourceMappingURL=index.d.ts.map

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