@lmzhen/dsh-evolution-merge 0.32.4 → 0.32.6

package/README.md

@@ -1,53 +1,21 @@
 # @lmzhen/dsh-evolution-merge
 
-Skill auto-merge host surface: candidate screening through the vendored pipeline,
-two-round child authoring, per-pair staging, pending approval, commit receipts and
-unit undo.
+Skill merge service with candidate screening, two-round authoring, pending/skipped queues, staged model work, commit orchestration, recovery, and undo.
 
-> **Screening pipeline freeze:** the merge-engine screening pipeline ①–⑤ is specially
-> tuned. Its substantive flow (stage order, inputs/outputs, models, weights, thresholds,
-> filters, scoring, decisions, and any selection policy affecting candidate set/order)
-> must not change. Only packaging, loading, adapters, error boundaries, diagnostics and
-> tests may change, with parity evidence proving identical screening output.
+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.
 
-## Surface
+## Control axes
 
-- `/evolution merge <subcommand>` — canonical command.
-- `/merge <subcommand>` — compatibility alias; registered through 0.30, deprecated in 0.31, removed in 0.32.
-- Four read-only routes under `/api/dsh-evolution/merge/*`.
+| 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. |
 
-```text
-/evolution merge scan | pair [--force] <a> <b> | candidates [--retry <id>] |
-  status [id] | pending [--expired] | report [id] |
-  approve <id> | reject <id> | resume [id] [--clear <id>] [--retry] |
-  skipped [--restore <id>] | doctor | runs | cancel [id] | undo <target> --run <id> |
-  reconcile
-```
+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.
 
-`/evolution merge` help lists 19 read/write surface commands plus the `reconcile`
-maintenance command; `doctor` and `reconcile` stay off the frozen CommandSurface v1.
+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.
 
-## Models
-
-The engine needs local `potion-multilingual-128M-int8` and
-`potion-multilingual-128M-pca64-int8` directories under `mergeModelsRoot`.
-No auto provisioning; missing models fail loud and `/evolution doctor` warns.
-`SKILL_MERGE_MODELS_ROOT` is an engine-internal test/CLI knob, not a host
-configuration surface.
-
-## Read-only panel
-
-The browser panel is `@lmzhen/dsh-evolution-merge-ui`, mounted by the
-`all` bundle only. The host row is mounted by `all`, `host` and `preset`.
-## Reconcile
-
-`/evolution merge reconcile` is the one writer of row-state convergence: skipped-TTL
-expiry, approved→fuse continuation when the stage tree is usable, stage-lost demotion to a
-retryable fuse row, and source-gone clearing (only when the live library is non-empty).
-Every run writes `<home>/merge/reconcile.json`; `/evolution merge doctor` and the global
-`/evolution doctor` merge line consume that report. Snapshots and the four GET routes
-derive (for example an expired stage) but never persist.
-
-Runtime command failures use three lines — `code:` (with stage/run id), `hint:`, `next:`.
-A missing parent run answers `merge-parent-required` (with an E-305 hint); an invocation
-that carried no agent answers the typed `no-agent` code.
+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";
@@ -10543,6 +10543,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/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.4",
+  "version": "0.32.6",
   "publishConfig": {
     "access": "public"
   },
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.32.4",
-    "@lmzhen/dsh-evolution-commands": "^0.32.4",
-    "@lmzhen/dsh-evolution-merge-engine": "0.32.4"
+    "@lmzhen/dsh-evolution-core": "^0.32.6",
+    "@lmzhen/dsh-evolution-commands": "^0.32.6",
+    "@lmzhen/dsh-evolution-merge-engine": "0.32.6"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"