@lmzhen/dsh-evolution-merge 0.30.25 → 0.30.27

package/lib/index.js

@@ -8377,7 +8377,8 @@ async function runAuthoring(options) {
 		message: "target must be a bare skill name: " + options.target
 	};
 	const targetCard = options.cards.find((card) => card.name === options.target);
-	const mode = options.mode ?? (targetCard === void 0 ? "create-umbrella" : "merge-into-existing");
+	const requestedMode = options.mode ?? (targetCard === void 0 ? "create-umbrella" : "merge-into-existing");
+	const mode = requestedMode === "merge-into-existing" && targetCard === void 0 ? "create-umbrella" : requestedMode;
 	const createMode = mode === "create-umbrella";
 	if (!createMode && targetCard !== void 0) {
 		if (targetCard.managed !== true) return {
@@ -9080,6 +9081,11 @@ function failRun(stage, hint, next, result) {
 		text: formatMergeError(result.error)
 	};
 }
+async function hostOnlyFailure(verb, capabilities) {
+	if (capabilities === void 0) return void 0;
+	const state = await capabilities.hostOnly();
+	return state === void 0 ? void 0 : fail(verb, "e-323", "host data plane unavailable: " + state.code + (state.detail === void 0 ? "" : " (" + state.detail + ")"), "run /evolution merge doctor");
+}
 /**
 * The approved/fuse row that already holds a target. Pair/approve move a row to
 * approved/fuse BEFORE their run starts, so this row IS the in-flight claim a second
@@ -9162,6 +9168,8 @@ function createMergeRuntime(deps) {
 				text: "merge: 技能名不能包含 provider/name 或 provider:name 语法：" + command.a + " / " + command.b + " (provider-conflict)\nusage: /evolution merge pair <a> <b>"
 			};
 			if (agentless) return fail("pair", "e-305", errorText("e-305-this-invocation-carries-no", { a1: "pair" }), "在 GUI 或 CLI 的会话里运行 /evolution merge pair " + command.a + " " + command.b);
+			const pairHost = await hostOnlyFailure("pair", deps.hostCapabilities);
+			if (pairHost !== void 0) return pairHost;
 			const pairKeyValue = pairKey(command.a, command.b);
 			const inFlight = inFlightPairRun(await readRunMetas(deps.io, deps.home), pairKeyValue);
 			let ownerActive = false;
@@ -9239,6 +9247,8 @@ function createMergeRuntime(deps) {
 		}
 		if (command.verb === "scan") {
 			if (agentless) return fail("scan", "e-305", errorText("e-305-this-invocation-carries-no", { a1: "scan" }), "在 GUI 或 CLI 的会话里运行 /evolution merge scan");
+			const scanHost = await hostOnlyFailure("scan", deps.hostCapabilities);
+			if (scanHost !== void 0) return scanHost;
 			const signal = new AbortController().signal;
 			const cards = await deps.cards(signal);
 			const blocked = /* @__PURE__ */ new Set();
@@ -9756,6 +9766,31 @@ function createMergeRuntime(deps) {
 	} };
 }
 //#endregion
+//#region lib/types/host-capabilities.js
+/**
+* The host's data-plane capability as ONE value shared by snapshot, doctor, HTTP and run preflight.
+* The probe is injected so the Cordis wiring stays in index.ts; a rejected probe is the same E-323
+* answer as an unavailable one, never an unhandled promise.
+* @module @lmzhen/dsh-evolution-merge
+*/
+/**
+* Wrap one probe with the shared error normalization.
+* @param probe - the platform-specific availability check.
+* @returns the capability value consumed by snapshot and runtime.
+*/
+function createHostCapabilities(probe) {
+	return { hostOnly: async () => {
+		try {
+			return await probe();
+		} catch (error) {
+			return {
+				code: "E-323",
+				detail: error instanceof Error ? error.message : String(error)
+			};
+		}
+	} };
+}
+//#endregion
 //#region lib/types/params.js
 /**
 * Merge parameter resolution. E2/E3 values arrive as one JSON object; this is the only
@@ -10534,6 +10569,16 @@ function apply(ctx, rawConfig = {}) {
 		});
 		const platformChannel = createSubagentChannel(ctx);
 		const channel = subagentChannelAdapter(platformChannel);
+		const hostCapabilities = createHostCapabilities(async () => {
+			const state = await platformChannel.prepare({
+				kind: "reviewer",
+				allow: ["skill"]
+			});
+			return state.kind === "unavailable" ? {
+				code: "E-323",
+				detail: state.reason
+			} : void 0;
+		});
 		const stage = new StageToolRegistry();
 		const engineInput = resolveEngineInput({ modelsRoot: params.mergeModelsRoot });
 		const engineConfig = engineConfigFromRoot(engineInput.modelsRoot);
@@ -10597,23 +10642,7 @@ function apply(ctx, rawConfig = {}) {
 					runs: runs.runs("merge"),
 					approval: params.mergeApproval,
 					platformWrite,
-					hostOnly: async () => {
-						try {
-							const state = await platformChannel.prepare({
-								kind: "reviewer",
-								allow: ["skill"]
-							});
-							return state.kind === "unavailable" ? {
-								code: "E-323",
-								detail: state.reason
-							} : void 0;
-						} catch (error) {
-							return {
-								code: "E-323",
-								detail: error instanceof Error ? error.message : String(error)
-							};
-						}
-					},
+					hostOnly: hostCapabilities.hostOnly,
 					live: async () => liveRowFactsOf(await readSkillCards(skills)),
 					history: async () => {
 						const items = /* @__PURE__ */ new Map();
@@ -10707,6 +10736,7 @@ function apply(ctx, rawConfig = {}) {
 			parent: void 0,
 			allow: ["merge_stage"],
 			timeoutMinutes: params.mergeRunTimeoutMinutes,
+			hostCapabilities,
 			isBlocked: async (name) => {
 				return await ctx.get("evolutionCurator")?.isBlocked?.(name) === true;
 			},

package/lib/types/authoring-flow.js

@@ -10,7 +10,12 @@ export async function runAuthoring(options) {
     if (options.target.includes('/') || options.target.includes(':'))
         return { ok: false, code: 'target-invalid', message: 'target must be a bare skill name: ' + options.target };
     const targetCard = options.cards.find(card => card.name === options.target);
-    const mode = options.mode ?? (targetCard === undefined ? 'create-umbrella' : 'merge-into-existing');
+    // A decision can name a fresh target yet say merge-into-existing (the model's vocabulary is
+    // about intent, not existence). The target card is the authoritative existence fact: when it is
+    // absent, the only safe mode is create-umbrella; otherwise commit-assembly correctly refuses to
+    // re-create a target that disappeared later.
+    const requestedMode = options.mode ?? (targetCard === undefined ? 'create-umbrella' : 'merge-into-existing');
+    const mode = requestedMode === 'merge-into-existing' && targetCard === undefined ? 'create-umbrella' : requestedMode;
     const createMode = mode === 'create-umbrella';
     if (!createMode && targetCard !== undefined) {
         if (targetCard.managed !== true)

package/lib/types/host-capabilities.d.ts

@@ -0,0 +1,22 @@
+/**
+ * The host's data-plane capability as ONE value shared by snapshot, doctor, HTTP and run preflight.
+ * The probe is injected so the Cordis wiring stays in index.ts; a rejected probe is the same E-323
+ * answer as an unavailable one, never an unhandled promise.
+ * @module @lmzhen/dsh-evolution-merge
+ */
+/** The one unavailable answer the merge surface understands. */
+export interface HostOnlyUnavailable {
+    readonly code: 'E-323';
+    readonly detail?: string;
+}
+/** A host capability probe; undefined means the data plane is usable. */
+export interface HostCapabilities {
+    readonly hostOnly: () => Promise<HostOnlyUnavailable | undefined>;
+}
+/**
+ * Wrap one probe with the shared error normalization.
+ * @param probe - the platform-specific availability check.
+ * @returns the capability value consumed by snapshot and runtime.
+ */
+export declare function createHostCapabilities(probe: () => Promise<HostOnlyUnavailable | undefined>): HostCapabilities;
+//# sourceMappingURL=host-capabilities.d.ts.map

package/lib/types/host-capabilities.js

@@ -0,0 +1,24 @@
+/**
+ * The host's data-plane capability as ONE value shared by snapshot, doctor, HTTP and run preflight.
+ * The probe is injected so the Cordis wiring stays in index.ts; a rejected probe is the same E-323
+ * answer as an unavailable one, never an unhandled promise.
+ * @module @lmzhen/dsh-evolution-merge
+ */
+/**
+ * Wrap one probe with the shared error normalization.
+ * @param probe - the platform-specific availability check.
+ * @returns the capability value consumed by snapshot and runtime.
+ */
+export function createHostCapabilities(probe) {
+    return {
+        hostOnly: async () => {
+            try {
+                return await probe();
+            }
+            catch (error) {
+                return { code: 'E-323', detail: error instanceof Error ? error.message : String(error) };
+            }
+        },
+    };
+}
+//# sourceMappingURL=host-capabilities.js.map

package/lib/types/index.js

@@ -31,6 +31,7 @@ import { pairKey, rowIdOf } from "./contracts.js";
 import { makeMergeRoutes } from "./merge-routes.js";
 import { createMergeCommand, runMergeCommand } from "./merge-command.js";
 import { createMergeRuntime } from "./runtime.js";
+import { createHostCapabilities } from "./host-capabilities.js";
 import { resolveMergeParams } from "./params.js";
 import { subagentChannelAdapter } from "./adapters/channel.js";
 import { StageToolRegistry } from "./stage-tool-registry.js";
@@ -234,6 +235,10 @@ export function apply(ctx, rawConfig = {}) {
         }).catch((error) => { ctx.logger.warn('merge state readiness failed: ' + (error instanceof Error ? error.message : String(error))); });
         const platformChannel = createSubagentChannel(ctx);
         const channel = subagentChannelAdapter(platformChannel);
+        const hostCapabilities = createHostCapabilities(async () => {
+            const state = await platformChannel.prepare({ kind: 'reviewer', allow: ['skill'] });
+            return state.kind === 'unavailable' ? { code: 'E-323', detail: state.reason } : undefined;
+        });
         const stage = new StageToolRegistry();
         const engineInput = resolveEngineInput({ modelsRoot: params.mergeModelsRoot });
         const engineConfig = engineConfigFromRoot(engineInput.modelsRoot);
@@ -276,15 +281,7 @@ export function apply(ctx, rawConfig = {}) {
         });
         source = {
             async snapshot() {
-                return await readMergeSnapshot({ io, home, runs: runs.runs('merge'), approval: params.mergeApproval, platformWrite, hostOnly: async () => {
-                        try {
-                            const state = await platformChannel.prepare({ kind: 'reviewer', allow: ['skill'] });
-                            return state.kind === 'unavailable' ? { code: 'E-323', detail: state.reason } : undefined;
-                        }
-                        catch (error) {
-                            return { code: 'E-323', detail: error instanceof Error ? error.message : String(error) };
-                        }
-                    }, live: async () => liveRowFactsOf(await readSkillCards(skills)), history: async () => {
+                return await readMergeSnapshot({ io, home, runs: runs.runs('merge'), approval: params.mergeApproval, platformWrite, hostOnly: hostCapabilities.hostOnly, live: async () => liveRowFactsOf(await readSkillCards(skills)), history: async () => {
                         const items = new Map();
                         const receipts = [...await readCommitReceipts(io, home)].sort((a, b) => a.at - b.at);
                         const generationOf = new Map(receipts.map((receipt, index) => [receipt.runId, index + 1]));
@@ -331,6 +328,7 @@ export function apply(ctx, rawConfig = {}) {
             io, home, registry: runs, skills, now: () => Date.now(), params, platformWrite,
             ...(defaultModel === undefined ? {} : { model: defaultModel.currentSelection().model }),
             channel, parent: undefined, allow: ['merge_stage'], timeoutMinutes: params.mergeRunTimeoutMinutes,
+            hostCapabilities,
             isBlocked: async (name) => {
                 const curator = ctx.get('evolutionCurator');
                 return (await curator?.isBlocked?.(name)) === true;

package/lib/types/runtime.d.ts

@@ -6,6 +6,7 @@ import type { MergeRegistryPort } from './run-shell.ts';
 import type { MergeCommandService } from './merge-command.ts';
 import type { StageToolContext } from './stage-tool.ts';
 import type { ConversationChannelLike } from './channel-port.ts';
+import type { HostCapabilities } from './host-capabilities.ts';
 export declare function forcedDecisionFor(a: string, b: string): MergeDecision;
 export interface MergeStageBindingPort {
     bind(context: StageToolContext): void;
@@ -20,6 +21,7 @@ export interface MergeRuntimeDeps {
     readonly params: MergeParams;
     readonly platformWrite: boolean;
     readonly channel: ConversationChannelLike;
+    readonly hostCapabilities?: HostCapabilities;
     readonly parent: unknown;
     readonly allow: readonly string[];
     readonly cwd?: string;

package/lib/types/runtime.js

@@ -38,6 +38,12 @@ function fail(stage, code, hint, next, runId) {
 function failRun(stage, hint, next, result) {
     return result.error === undefined ? fail(stage, 'run-failed', hint, next, result.runId) : { ok: false, text: formatMergeError(result.error) };
 }
+async function hostOnlyFailure(verb, capabilities) {
+    if (capabilities === undefined)
+        return undefined;
+    const state = await capabilities.hostOnly();
+    return state === undefined ? undefined : fail(verb, 'e-323', 'host data plane unavailable: ' + state.code + (state.detail === undefined ? '' : ' (' + state.detail + ')'), 'run /evolution merge doctor');
+}
 /**
  * The approved/fuse row that already holds a target. Pair/approve move a row to
  * approved/fuse BEFORE their run starts, so this row IS the in-flight claim a second
@@ -100,6 +106,9 @@ export function createMergeRuntime(deps) {
                 // the three-line shape instead of opening a run that is guaranteed to fail.
                 if (agentless)
                     return fail('pair', 'e-305', errorText('e-305-this-invocation-carries-no', { a1: 'pair' }), '在 GUI 或 CLI 的会话里运行 /evolution merge pair ' + command.a + ' ' + command.b);
+                const pairHost = await hostOnlyFailure('pair', deps.hostCapabilities);
+                if (pairHost !== undefined)
+                    return pairHost;
                 // FR-EXEC-17/NFR-04: two pair runs for one pair must not race for the same row.
                 const pairKeyValue = pairKey(command.a, command.b);
                 const inFlight = inFlightPairRun(await readRunMetas(deps.io, deps.home), pairKeyValue);
@@ -179,6 +188,9 @@ export function createMergeRuntime(deps) {
             if (command.verb === 'scan') {
                 if (agentless)
                     return fail('scan', 'e-305', errorText('e-305-this-invocation-carries-no', { a1: 'scan' }), '在 GUI 或 CLI 的会话里运行 /evolution merge scan');
+                const scanHost = await hostOnlyFailure('scan', deps.hostCapabilities);
+                if (scanHost !== undefined)
+                    return scanHost;
                 const signal = new AbortController().signal;
                 const cards = await deps.cards(signal);
                 const blocked = new Set();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-merge",
   "description": "Skill auto-merge domain: screening, two-round authoring, queues and commit orchestration (community build)",
-  "version": "0.30.25",
+  "version": "0.30.27",
   "publishConfig": {
     "access": "public"
   },
@@ -32,14 +32,14 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.25",
-    "@lmzhen/dsh-evolution-commands": "^0.30.25",
-    "@lmzhen/dsh-evolution-merge-engine": "0.30.25"
+    "@lmzhen/dsh-evolution-core": "^0.30.27",
+    "@lmzhen/dsh-evolution-commands": "^0.30.27",
+    "@lmzhen/dsh-evolution-merge-engine": "0.30.27"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"
   },
   "engines": {
-    "dsh": ">=0.2.1-rc.1 <0.2.2-0"
+    "dsh": ">=0.2.1-rc.2 <0.2.2-0"
   }
 }