@lmzhen/dsh-evolution-merge 0.32.5 → 0.33.0

package/README.md

@@ -1,19 +1,21 @@
 # @lmzhen/dsh-evolution-merge
 
-> 技能合并：把重叠技能合成一个，可审批、可撤销。
+Skill merge service with candidate screening, two-round authoring, pending/skipped queues, staged model work, commit orchestration, recovery, and undo.
 
-## 你会看到
+Use `/evolution merge …` for operations. `merge_stage` is the model-facing staging tool. The sidebar supplied by `evolution-merge-ui` is read-only and copies commands rather than executing a merge itself.
 
-`/evolution merge …` 命令与侧栏合并面板。
+## Control axes
 
-## 什么时候会用到
+| Setting | Default | Meaning |
+|---|---|---|
+| `mergeApproval` | `false` | Do not pause after round 1 for merge-specific approval. |
+| `mergeSkippedTtlDays` | `0` | Skipped pairs never expire automatically. |
+| `mergeRunTimeoutMinutes` | `0` | No overall run timeout. |
+| `mergePairTimeoutMinutes` | `15` | Bound one pair round. |
+| `mergeModelsRoot` | empty | Must be configured to the local model root for the shipped engine path. |
 
-你主动合并，或后台提出合并建议时。
+For scan, the model root contains `potion-multilingual-128M-int8` and `potion-multilingual-128M-pca64-int8`. Missing required models fail explicitly; this package does not silently provision them. Ordinary pair skips this local candidate-screening dependency, but its round 1 and authoring still require the child-session model channel rather than scan's stub fallback.
 
-## 默认 / 前提
+Merge approval is independent of the ordinary memory/skill approval queue. `platformWrite` is accepted as a fallback parameter, overridden by the host approval capability when available, and included in run reports and snapshots; it is not an admission check in this package. Actual write execution depends on host capability preparation and the merge state machine; neither that projected field nor `mergeApproval:false` proves that every environment permits writes.
 
-需要本地合并模型；没有模型会明确报错。
-
-## 边界
-
-面板只读；合并结果可撤销。
+Four read-only host routes expose view, rows, body, and history data. `merge/run` and `merge/runs` are declared but not implemented. Committed merges have durable receipts for undo; recovery and reconcile report blocked or interrupted state rather than hiding it.

package/lib/index.js

@@ -1,7 +1,7 @@
 import { dirname, join } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { pairKeyOf, screen, selectCandidates } from "@lmzhen/dsh-evolution-merge-engine";
-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, reportsSweepLockTarget, revisionAnchorOf, revisionFingerprint, revisionSupportDigest, runsFile, scanContentThreats, skillLibraryUnitBackend, supportRefs, sweepReports, transactIo, validateFrontmatter, validateSupportPath } from "@lmzhen/dsh-evolution-core";
+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";
@@ -3700,6 +3700,10 @@ function runView(run, readAt, includeResultRef = false) {
 	const record = run.record;
 	const state = run.meta?.phase === "undone" ? "undone" : run.meta?.stopReason === "interrupted" ? "interrupted" : run.meta?.approval === "pending" ? "awaiting-approval" : record.state;
 	const stopReason = run.meta?.stopReason ?? (record.state === "cancelled" ? "cancelled" : record.state === "failed" ? "failed" : record.state === "succeeded" ? "completed" : void 0);
+	const progress = record.progress === void 0 ? null : {
+		done: state === "succeeded" || state === "undone" ? Math.max(record.progress.done, run.pairs.length) : record.progress.done,
+		total: record.progress.total
+	};
 	return {
 		wireVersion: 1,
 		readAt,
@@ -3707,10 +3711,7 @@ function runView(run, readAt, includeResultRef = false) {
 		state,
 		command: record.command ?? "scan",
 		...record.stage === void 0 ? {} : { stage: record.stage },
-		progress: record.progress === void 0 ? null : {
-			done: record.progress.done,
-			total: record.progress.total
-		},
+		progress,
 		startedAt: record.startedAt,
 		...record.endedAt === void 0 ? {} : { endedAt: record.endedAt },
 		...stopReason === void 0 ? {} : { stopReason },
@@ -10543,6 +10544,7 @@ function formatUnreadyError() {
 }
 const inject = [];
 function apply(ctx, rawConfig = {}) {
+	registerOwnerSettings(ctx, "evolution-merge", Config);
 	configureMergePresentation(ctx);
 	let params = resolveMergeParams(rawConfig);
 	let mergeRun;

package/lib/types/index.js

@@ -5,6 +5,7 @@ import { selectWithErrors } from "./adapters/select.js";
 import { createEngineScreening } from "./adapters/engine-screen.js";
 import { createEngineRunner } from "./adapters/model-runner.js";
 import { authorityFrom, createSubagentChannel, evolutionHome, evolutionIoAdapter, newRunRegistry, newSkillLibrary, reportsSweepLockTarget, sweepReports, transactIo } from '@lmzhen/dsh-evolution-core';
+import { registerOwnerSettings } from '@lmzhen/dsh-evolution-core';
 import { registerHostRoutes } from '@lmzhen/dsh-evolution-core/http-routes';
 import { loadMergeState } from "./state.js";
 import { pairLedger, normalizePairLedger } from "./domain/pair-ledger.js";
@@ -134,6 +135,7 @@ function formatUnreadyError() {
 }
 export const inject = [];
 export function apply(ctx, rawConfig = {}) {
+    registerOwnerSettings(ctx, 'evolution-merge', Config);
     configureMergePresentation(ctx);
     let params = resolveMergeParams(rawConfig);
     let mergeRun;

package/lib/types/surface/merge-view.js

@@ -86,7 +86,13 @@ function runView(run, readAt, includeResultRef = false) {
             : run.meta?.approval === 'pending' ? 'awaiting-approval'
                 : record.state;
     const stopReason = run.meta?.stopReason ?? (record.state === 'cancelled' ? 'cancelled' : record.state === 'failed' ? 'failed' : record.state === 'succeeded' ? 'completed' : undefined);
-    return { wireVersion: 1, readAt, id: record.id, state, command: record.command ?? 'scan', ...(record.stage === undefined ? {} : { stage: record.stage }), progress: record.progress === undefined ? null : { done: record.progress.done, total: record.progress.total }, startedAt: record.startedAt, ...(record.endedAt === undefined ? {} : { endedAt: record.endedAt }), ...(stopReason === undefined ? {} : { stopReason }), ...(record.failure === undefined ? {} : { failure: { stage: 'settle', code: 'run-failed', retryable: false, retryFrom: 'none', detail: record.failure } }), ...(record.parentRunId === undefined ? {} : { parentRunId: record.parentRunId }), ...(run.pairs[0]?.pairKey === undefined ? {} : { currentPairKey: run.pairs[0].pairKey }), ...(record.resultRef === undefined ? {} : { resultRef: record.resultRef }), actions: [{ id: 'status', command: base + 'status ' + record.id, confirm: false, enabled: true }, { id: 'report', command: base + 'report ' + record.id, confirm: false, enabled: record.resultRef !== undefined }, { id: 'cancel', command: base + 'cancel ' + record.id, confirm: false, enabled: record.state === 'running' }] };
+    // The maker records progress while running; a terminal run that actually produced pairs
+    // must not keep the last in-flight 0/N. The UI shows what happened, not the last tick.
+    const progress = record.progress === undefined ? null : {
+        done: state === 'succeeded' || state === 'undone' ? Math.max(record.progress.done, run.pairs.length) : record.progress.done,
+        total: record.progress.total,
+    };
+    return { wireVersion: 1, readAt, id: record.id, state, command: record.command ?? 'scan', ...(record.stage === undefined ? {} : { stage: record.stage }), progress, startedAt: record.startedAt, ...(record.endedAt === undefined ? {} : { endedAt: record.endedAt }), ...(stopReason === undefined ? {} : { stopReason }), ...(record.failure === undefined ? {} : { failure: { stage: 'settle', code: 'run-failed', retryable: false, retryFrom: 'none', detail: record.failure } }), ...(record.parentRunId === undefined ? {} : { parentRunId: record.parentRunId }), ...(run.pairs[0]?.pairKey === undefined ? {} : { currentPairKey: run.pairs[0].pairKey }), ...(record.resultRef === undefined ? {} : { resultRef: record.resultRef }), actions: [{ id: 'status', command: base + 'status ' + record.id, confirm: false, enabled: true }, { id: 'report', command: base + 'report ' + record.id, confirm: false, enabled: record.resultRef !== undefined }, { id: 'cancel', command: base + 'cancel ' + record.id, confirm: false, enabled: record.state === 'running' }] };
 }
 export function buildFacts(snapshot) {
     const ordered = [...snapshot.runs].sort((a, b) => b.record.startedAt - a.record.startedAt);

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.32.5",
+  "version": "0.33.0",
   "publishConfig": {
     "access": "public"
   },
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.32.5",
-    "@lmzhen/dsh-evolution-commands": "^0.32.5",
-    "@lmzhen/dsh-evolution-merge-engine": "0.32.5"
+    "@lmzhen/dsh-evolution-core": "^0.33.0",
+    "@lmzhen/dsh-evolution-commands": "^0.33.0",
+    "@lmzhen/dsh-evolution-merge-engine": "0.33.0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"