@lmzhen/dsh-evolution-merge 0.37.1 → 0.38.0

package/lib/index.js

@@ -1,12 +1,14 @@
 import { dirname, join } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { pairKeyOf, screen, selectCandidates } from "@lmzhen/dsh-evolution-merge-engine";
+import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { DEFAULT_SKILL_LIMITS, SkillLibrary, UnitTransactions, authorityFrom, contentHash, createSubagentChannel, errorText, evolutionHome, evolutionIoAdapter, executeUnitUndo, isPresent, isProcessAlive, newRunRegistry, newSkillLibrary, parseFrontmatter, planUnitUndoAcross, policyStageLimits, probeAbsent, probeList, probePresent, probeText, probeUnknown, readTreeLock, readUnitEvidence, readUnitJournal, registerOwnerSettings, reportsSweepLockTarget, revisionAnchorOf, revisionFingerprint, revisionSupportDigest, runsFile, scanContentThreats, skillLibraryUnitBackend, supportRefs, sweepReports, transactIo, validateFrontmatter, validateSupportPath } from "@lmzhen/dsh-evolution-core";
 import { HOST_ROUTES, json, methodNotAllowed, registerHostRoutes } from "@lmzhen/dsh-evolution-core/http-routes";
 import { createHash, randomUUID } from "node:crypto";
 import { chmod, mkdir, open, readFile, stat, unlink } from "node:fs/promises";
 import { aliasRegistration, buildSurface, parseCommand } from "@lmzhen/dsh-evolution-commands";
 import { readFileSync } from "node:fs";
+import { defineTool } from "@lmzhen/dsh-evolution-core/platform";
 //#region lib/types/adapters/select.js
 /** Host selector correction: engine selector does not route judge errors to candidates. */
 function selectWithErrors(report) {
@@ -101,56 +103,32 @@ function normalizeProviderKey(value) {
 //#endregion
 //#region lib/types/adapters/model-runner.js
 /**
-* DeepSeek judge runner over the platform llm service. The engine calls
-* runner(prompt, cfg) and expects raw model text; the platform owns provider
-* selection, usage accounting and transport.
+* DeepSeek judge runner over the family LLM runtime. The engine calls
+* runner(prompt, cfg) and expects raw model text; the runtime owns provider
+* selection, purpose, transport and timeout.
 */
-function append(chunk, text) {
-	if (chunk.type === "text-delta" || chunk.type === "text") return text + (chunk.text ?? "");
-	if (chunk.type === "finish" && chunk.reason?.kind === "error") throw new Error("model call failed: " + (chunk.reason.failure?.message ?? "unknown"));
-	return text;
-}
 function createEngineRunner(llm, route) {
 	return async (prompt, cfg, runSignal) => {
+		if (!llm.available()) throw new Error("llm service unavailable: evolutionLlm is degraded");
 		const selection = route();
 		const timeout = Number(cfg?.timeoutMs);
-		const timeoutSignal = Number.isFinite(timeout) && timeout > 0 ? AbortSignal.timeout(timeout) : void 0;
-		const signal = runSignal === void 0 ? timeoutSignal : timeoutSignal === void 0 ? runSignal : typeof AbortSignal.any === "function" ? AbortSignal.any([runSignal, timeoutSignal]) : runSignal;
-		let text = "";
-		if (llm.stream !== void 0) {
-			for await (const chunk of llm.stream({
+		return await llm.text({
+			purpose: "evolution-merge-engine",
+			route: {
 				provider: normalizeProviderKey(selection.provider),
-				model: selection.model,
-				messages: [{
-					role: "user",
-					content: [{
-						type: "text",
-						text: prompt
-					}]
-				}],
-				temperature: 0,
-				...signal === void 0 ? {} : { signal }
-			})) text = append(chunk, text);
-			return text;
-		}
-		if (llm.prepareCall === void 0) throw new Error("llm service has neither stream nor prepareCall");
-		const call = await llm.prepareCall({
-			provider: normalizeProviderKey(selection.provider),
-			model: selection.model,
-			temperature: 0
-		}, signal);
-		for await (const chunk of call.stream({
-			...call.config,
-			messages: [{
-				role: "user",
+				model: selection.model
+			},
+			messages: [createUserMessage({
 				content: [{
 					type: "text",
 					text: prompt
-				}]
-			}],
-			...signal === void 0 ? {} : { signal }
-		})) text = append(chunk, text);
-		return text;
+				}],
+				source: { kind: "user" }
+			})],
+			temperature: 0,
+			...runSignal === void 0 ? {} : { signal: runSignal },
+			...Number.isFinite(timeout) && timeout > 0 ? { timeoutMs: timeout } : {}
+		});
 	};
 }
 //#endregion
@@ -10307,33 +10285,29 @@ function operation(args) {
 	return shapeError("op must be list/read/write/copy");
 }
 function createMergeStageTool(io, home, context, diagnose) {
-	return {
+	return defineTool({
 		name: MERGE_STAGE_TOOL_NAME,
 		description: "Read source copies and write the merged skill into the staging tree. list/read use area=sources|merged plus source (for sources); write/copy paths are relative to merged/<target> (for example path=SKILL.md, from=SKILL.md, to=references/x.md). Write/copy are only allowed in the author phase.",
 		parameters: {
-			type: "object",
-			properties: {
-				op: {
-					type: "string",
-					enum: [
-						"list",
-						"read",
-						"write",
-						"copy"
-					]
-				},
-				area: {
-					type: "string",
-					enum: ["sources", "merged"]
-				},
-				path: { type: "string" },
-				source: { type: "string" },
-				content: { type: "string" },
-				from: { type: "string" },
-				to: { type: "string" }
+			op: {
+				type: "string",
+				required: true,
+				enum: [
+					"list",
+					"read",
+					"write",
+					"copy"
+				]
 			},
-			required: ["op"],
-			additionalProperties: false
+			area: {
+				type: "string",
+				enum: ["sources", "merged"]
+			},
+			path: { type: "string" },
+			source: { type: "string" },
+			content: { type: "string" },
+			from: { type: "string" },
+			to: { type: "string" }
 		},
 		output: {
 			schema: { type: "string" },
@@ -10354,7 +10328,7 @@ function createMergeStageTool(io, home, context, diagnose) {
 			});
 			return JSON.stringify(await applyStageTool(io, home, ctx, op));
 		}
-	};
+	});
 }
 //#endregion
 //#region lib/types/supersede.js
@@ -10762,7 +10736,7 @@ function apply(ctx, rawConfig = {}) {
 		const stage = new StageToolRegistry();
 		const engineInput = resolveEngineInput({ modelsRoot: startupParams.mergeModelsRoot });
 		const engineConfig = engineConfigFromRoot(engineInput.modelsRoot);
-		const llm = ctx.get("llm");
+		const llm = ctx.get("evolutionLlm");
 		const defaultModel = ctx.get("agentDefaultModel");
 		const runner = llm === void 0 || defaultModel === void 0 ? void 0 : createEngineRunner(llm, () => defaultModel.currentSelection());
 		const engineScreening = createEngineScreening({

package/lib/types/adapters/model-runner.d.ts

@@ -1,23 +1,24 @@
+/**
+ * DeepSeek judge runner over the family LLM runtime. The engine calls
+ * runner(prompt, cfg) and expects raw model text; the runtime owns provider
+ * selection, purpose, transport and timeout.
+ */
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
 export interface ModelRoute {
     readonly provider: string;
     readonly model: string;
 }
-export interface LlmChunkLike {
-    readonly type: string;
-    readonly text?: string;
-    readonly reason?: {
-        readonly kind?: string;
-        readonly failure?: {
-            readonly message?: string;
-        };
-    };
+/** The runtime service surface the merge engine consumes. */
+export interface EvolutionLlmLike {
+    available(): boolean;
+    text(input: {
+        readonly purpose: 'evolution-merge-engine';
+        readonly route: ModelRoute;
+        readonly messages: ReturnType<typeof createUserMessage>[];
+        readonly temperature: number;
+        readonly signal?: AbortSignal | undefined;
+        readonly timeoutMs?: number | undefined;
+    }): Promise<string>;
 }
-export interface LlmServiceLike {
-    stream?(options: Record<string, unknown>): AsyncIterable<LlmChunkLike>;
-    prepareCall?(config: Record<string, unknown>, signal?: AbortSignal): Promise<{
-        readonly config: Record<string, unknown>;
-        stream(input: Record<string, unknown>): AsyncIterable<LlmChunkLike>;
-    }>;
-}
-export declare function createEngineRunner(llm: LlmServiceLike, route: () => ModelRoute): (prompt: string, cfg?: Record<string, unknown>, signal?: AbortSignal | undefined) => Promise<string>;
+export declare function createEngineRunner(llm: EvolutionLlmLike, route: () => ModelRoute): (prompt: string, cfg?: Record<string, unknown>, signal?: AbortSignal | undefined) => Promise<string>;
 //# sourceMappingURL=model-runner.d.ts.map

package/lib/types/adapters/model-runner.js

@@ -1,45 +1,24 @@
 /**
- * DeepSeek judge runner over the platform llm service. The engine calls
- * runner(prompt, cfg) and expects raw model text; the platform owns provider
- * selection, usage accounting and transport.
+ * DeepSeek judge runner over the family LLM runtime. The engine calls
+ * runner(prompt, cfg) and expects raw model text; the runtime owns provider
+ * selection, purpose, transport and timeout.
  */
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { normalizeProviderKey } from "../domain/provider-key.js";
-function append(chunk, text) {
-    if (chunk.type === 'text-delta' || chunk.type === 'text')
-        return text + (chunk.text ?? '');
-    if (chunk.type === 'finish' && chunk.reason?.kind === 'error') {
-        throw new Error('model call failed: ' + (chunk.reason.failure?.message ?? 'unknown'));
-    }
-    return text;
-}
 export function createEngineRunner(llm, route) {
     return async (prompt, cfg, runSignal) => {
+        if (!llm.available())
+            throw new Error('llm service unavailable: evolutionLlm is degraded');
         const selection = route();
         const timeout = Number(cfg?.timeoutMs);
-        const timeoutSignal = Number.isFinite(timeout) && timeout > 0 ? AbortSignal.timeout(timeout) : undefined;
-        const signal = runSignal === undefined ? timeoutSignal : timeoutSignal === undefined ? runSignal : (typeof AbortSignal.any === 'function' ? AbortSignal.any([runSignal, timeoutSignal]) : runSignal);
-        let text = '';
-        if (llm.stream !== undefined) {
-            for await (const chunk of llm.stream({
-                provider: normalizeProviderKey(selection.provider),
-                model: selection.model,
-                messages: [{ role: 'user', content: [{ type: 'text', text: prompt }] }],
-                temperature: 0,
-                ...(signal === undefined ? {} : { signal }),
-            }))
-                text = append(chunk, text);
-            return text;
-        }
-        if (llm.prepareCall === undefined)
-            throw new Error('llm service has neither stream nor prepareCall');
-        const call = await llm.prepareCall({ provider: normalizeProviderKey(selection.provider), model: selection.model, temperature: 0 }, signal);
-        for await (const chunk of call.stream({
-            ...call.config,
-            messages: [{ role: 'user', content: [{ type: 'text', text: prompt }] }],
-            ...(signal === undefined ? {} : { signal }),
-        }))
-            text = append(chunk, text);
-        return text;
+        return await llm.text({
+            purpose: 'evolution-merge-engine',
+            route: { provider: normalizeProviderKey(selection.provider), model: selection.model },
+            messages: [createUserMessage({ content: [{ type: 'text', text: prompt }], source: { kind: 'user' } })],
+            temperature: 0,
+            ...(runSignal === undefined ? {} : { signal: runSignal }),
+            ...(Number.isFinite(timeout) && timeout > 0 ? { timeoutMs: timeout } : {}),
+        });
     };
 }
 //# sourceMappingURL=model-runner.js.map

package/lib/types/index.js

@@ -254,7 +254,7 @@ export function apply(ctx, rawConfig = {}) {
         const stage = new StageToolRegistry();
         const engineInput = resolveEngineInput({ modelsRoot: startupParams.mergeModelsRoot });
         const engineConfig = engineConfigFromRoot(engineInput.modelsRoot);
-        const llm = ctx.get('llm');
+        const llm = ctx.get('evolutionLlm');
         const defaultModel = ctx.get('agentDefaultModel');
         const runner = llm === undefined || defaultModel === undefined
             ? undefined

package/lib/types/merge-tool.d.ts

@@ -3,20 +3,8 @@
  * this module owns the argument schema and the JSON result. All policy remains in applyStageTool.
  */
 import type { EvolutionIoLike } from '@lmzhen/dsh-evolution-core';
+import { defineTool } from '@lmzhen/dsh-evolution-core/platform';
 import { type StageToolContext } from './stage-tool.ts';
 export declare const MERGE_STAGE_TOOL_NAME = "merge_stage";
-export interface ToolDefinitionLike {
-    readonly name: string;
-    readonly description: string;
-    readonly parameters: Record<string, unknown>;
-    readonly output: {
-        readonly schema: Record<string, unknown>;
-        readonly render: (args: unknown, value: string) => readonly {
-            readonly type: 'text';
-            readonly text: string;
-        }[];
-    };
-    readonly execute: (args: Record<string, unknown>, exec: unknown) => Promise<string>;
-}
-export declare function createMergeStageTool(io: EvolutionIoLike, home: string, context: (exec: unknown) => StageToolContext | undefined, diagnose?: (exec: unknown) => unknown): ToolDefinitionLike;
+export declare function createMergeStageTool(io: EvolutionIoLike, home: string, context: (exec: unknown) => StageToolContext | undefined, diagnose?: (exec: unknown) => unknown): ReturnType<typeof defineTool>;
 //# sourceMappingURL=merge-tool.d.ts.map

package/lib/types/merge-tool.js

@@ -1,3 +1,4 @@
+import { defineTool } from '@lmzhen/dsh-evolution-core/platform';
 import { applyStageTool } from "./stage-tool.js";
 export const MERGE_STAGE_TOOL_NAME = 'merge_stage';
 function shapeError(message) {
@@ -34,22 +35,17 @@ function operation(args) {
     return shapeError('op must be list/read/write/copy');
 }
 export function createMergeStageTool(io, home, context, diagnose) {
-    return {
+    return defineTool({
         name: MERGE_STAGE_TOOL_NAME,
         description: 'Read source copies and write the merged skill into the staging tree. list/read use area=sources|merged plus source (for sources); write/copy paths are relative to merged/<target> (for example path=SKILL.md, from=SKILL.md, to=references/x.md). Write/copy are only allowed in the author phase.',
         parameters: {
-            type: 'object',
-            properties: {
-                op: { type: 'string', enum: ['list', 'read', 'write', 'copy'] },
-                area: { type: 'string', enum: ['sources', 'merged'] },
-                path: { type: 'string' },
-                source: { type: 'string' },
-                content: { type: 'string' },
-                from: { type: 'string' },
-                to: { type: 'string' },
-            },
-            required: ['op'],
-            additionalProperties: false,
+            op: { type: 'string', required: true, enum: ['list', 'read', 'write', 'copy'] },
+            area: { type: 'string', enum: ['sources', 'merged'] },
+            path: { type: 'string' },
+            source: { type: 'string' },
+            content: { type: 'string' },
+            from: { type: 'string' },
+            to: { type: 'string' },
         },
         output: {
             schema: { type: 'string' },
@@ -64,6 +60,6 @@ export function createMergeStageTool(io, home, context, diagnose) {
                 return JSON.stringify({ ok: false, code: 'not-merge-child', message: 'merge_stage is only available to an active merge child', ...(diagnose === undefined ? {} : { diagnostic: diagnose(exec) }) });
             return JSON.stringify(await applyStageTool(io, home, ctx, op));
         },
-    };
+    });
 }
 //# sourceMappingURL=merge-tool.js.map

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.37.1",
+  "version": "0.38.0",
   "publishConfig": {
     "access": "public"
   },
@@ -32,14 +32,15 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.37.1",
-    "@lmzhen/dsh-evolution-commands": "^0.37.1",
-    "@lmzhen/dsh-evolution-merge-engine": "0.37.1"
+    "@lmzhen/dsh-evolution-core": "^0.38.0",
+    "@lmzhen/dsh-evolution-commands": "^0.38.0",
+    "@lmzhen/dsh-evolution-merge-engine": "0.38.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5"
+    "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-llm": "^0.2.2-rc.0"
   },
   "engines": {
-    "dsh": ">=0.2.1-rc.2 <0.2.2-0"
+    "dsh": ">=0.2.2-rc.0 <0.2.3-0"
   }
 }