@lmzhen/dsh-evolution-core 0.29.0 → 0.30.0

package/lib/{http-routes-w09FdvOp.js → http-routes-ifJKGnu6.js}

@@ -77,8 +77,8 @@ const HOST_ROUTES = {
 	merge: {
 		view: "/api/dsh-evolution/merge/view",
 		rows: "/api/dsh-evolution/merge/rows",
-		run: "/api/dsh-evolution/merge/run",
-		runs: "/api/dsh-evolution/merge/runs"
+		body: "/api/dsh-evolution/merge/body",
+		history: "/api/dsh-evolution/merge/history"
 	},
 	diagnostics: { view: "/api/dsh-evolution/diagnostics" }
 };

package/lib/http-routes.js

@@ -1,2 +1,2 @@
-import { a as methodNotAllowed, i as json, n as MAX_REQUEST_BODY_BYTES, o as readJsonObject, r as hostSurface, s as registerHostRoutes, t as HOST_ROUTES } from "./http-routes-w09FdvOp.js";
+import { a as methodNotAllowed, i as json, n as MAX_REQUEST_BODY_BYTES, o as readJsonObject, r as hostSurface, s as registerHostRoutes, t as HOST_ROUTES } from "./http-routes-ifJKGnu6.js";
 export { HOST_ROUTES, MAX_REQUEST_BODY_BYTES, hostSurface, json, methodNotAllowed, readJsonObject, registerHostRoutes };

package/lib/index.js

@@ -1,5 +1,5 @@
 import { _ as scopedPackageName, c as MAINTAINER_PRESET_ID, d as RESTRICTED_TOOLS_ROW_ID, f as RESTRICTOR_MODULE, g as scopeOfNearestManifest, p as REVIEWER_PRESET_ID, s as EVOLUTION_PRESET_IDS, u as RESTRICTED_PRESET_DISPLAY } from "./ensure-MEYMj9jn.js";
-import { a as methodNotAllowed, c as asRecord, i as json, l as isRecord, n as MAX_REQUEST_BODY_BYTES, o as readJsonObject, r as hostSurface, s as registerHostRoutes, t as HOST_ROUTES } from "./http-routes-w09FdvOp.js";
+import { a as methodNotAllowed, c as asRecord, i as json, l as isRecord, n as MAX_REQUEST_BODY_BYTES, o as readJsonObject, r as hostSurface, s as registerHostRoutes, t as HOST_ROUTES } from "./http-routes-ifJKGnu6.js";
 import { w as allowRowCollisions } from "./composition-D8Y3-ROd.js";
 import { n as errorText, t as EVOLUTION_ERRORS } from "./errors-Br2-uUSK.js";
 import { createSubagentChannel, probeChannelState, subagentChannelState } from "./subagent/index.js";
@@ -5608,7 +5608,11 @@ function parseIndex(raw) {
 			...typeof record.resultRef === "string" ? { resultRef: record.resultRef } : {},
 			...typeof record.failure === "string" ? { failure: record.failure } : {},
 			...typeof record.supersededAt === "number" ? { supersededAt: record.supersededAt } : {},
-			...typeof record.parentRunId === "string" ? { parentRunId: record.parentRunId } : {}
+			...typeof record.parentRunId === "string" ? { parentRunId: record.parentRunId } : {},
+			...record.mergeStatus === "running" || record.mergeStatus === "succeeded" || record.mergeStatus === "failed" || record.mergeStatus === "cancelled" || record.mergeStatus === "awaiting-approval" || record.mergeStatus === "undone" || record.mergeStatus === "superseded" || record.mergeStatus === "interrupted" || record.mergeStatus === "orphan" ? { mergeStatus: record.mergeStatus } : {},
+			...typeof record.stagingRef === "string" ? { stagingRef: record.stagingRef } : {},
+			...typeof record.pairKey === "string" ? { pairKey: record.pairKey } : {},
+			...Array.isArray(record.pairs) ? { pairs: record.pairs } : {}
 		});
 	}
 	return {
@@ -5642,6 +5646,7 @@ function newRunRegistry(options) {
 	const orphanOf = (row) => ({
 		...row,
 		state: "failed",
+		mergeStatus: "orphan",
 		endedAt: now(),
 		failure: ORPHAN_FAILURE
 	});
@@ -5780,6 +5785,10 @@ function newRunRegistry(options) {
 				pid: process.pid,
 				...seed?.command !== void 0 ? { command: seed.command } : {},
 				...seed?.parentRunId !== void 0 ? { parentRunId: seed.parentRunId } : {},
+				...seed?.mergeStatus !== void 0 ? { mergeStatus: seed.mergeStatus } : {},
+				...seed?.stagingRef !== void 0 ? { stagingRef: seed.stagingRef } : {},
+				...seed?.pairKey !== void 0 ? { pairKey: seed.pairKey } : {},
+				...seed?.pairs !== void 0 ? { pairs: seed.pairs } : {},
 				...seed?.total !== void 0 ? { progress: {
 					done: 0,
 					total: seed.total
@@ -5811,6 +5820,7 @@ function newRunRegistry(options) {
 				const row = owned.get(id);
 				if (row === void 0 || row.supersededAt !== void 0) continue;
 				row.supersededAt = now();
+				if (row.kind === "merge") row.mergeStatus = "superseded";
 				changed = true;
 			}
 			if (changed) await persist();
@@ -5825,6 +5835,7 @@ function newRunRegistry(options) {
 				for (const row of merged.values()) {
 					if (row.kind !== kind || row.supersededAt !== void 0) continue;
 					row.supersededAt = now();
+					if (row.kind === "merge") row.mergeStatus = "superseded";
 					marked += 1;
 				}
 				const kept = capped([...merged.values()]);
@@ -5848,6 +5859,7 @@ function newRunRegistry(options) {
 			row.endedAt = now();
 			if (outcome.resultRef !== void 0) row.resultRef = outcome.resultRef;
 			if (outcome.failure !== void 0) row.failure = outcome.failure;
+			if (outcome.mergeStatus !== void 0) row.mergeStatus = outcome.mergeStatus;
 			controllers.delete(id);
 			await persist();
 		},
@@ -10965,24 +10977,41 @@ var SkillLibrary = class {
 				ok: false,
 				message: stuck.length === 0 ? `合并失败，已回滚：${reason}` : `合并失败（${reason}）；已回滚，但以下未回滚：${stuck.join(", ")}：它们仍在 .archive 里，请用 /evolution skill restore 恢复。`
 			});
-			if (plan.targetExists) {
-				for (const source of sources) {
-					if (await this.io.readText(join(this.dirOf(source), "SKILL.md")) !== sourceBodies.get(source)) {
-						const stuck = await rollbackSources();
-						return rollbackMessage(`来源技能「${source}」在归档前被改过`, stuck);
-					}
-					const result = await this.archive(source, {
-						absorbedInto: target,
+			const rollbackTarget = async () => {
+				const stuck = [];
+				const support = plan.supportFiles.map((file) => ({
+					target: join(dir, ...file.path.replace(/\\/g, "/").split("/").filter(Boolean)),
+					content: supportPrevious.get(file.path) ?? null,
+					previous: file.content
+				}));
+				const writes = [{
+					target: targetPath,
+					content: plan.expectedTargetBody ?? "",
+					expected: plan.body.trimEnd() + "\n"
+				}, ...support.map((file) => ({
+					target: file.target,
+					content: file.content ?? "",
+					expected: file.previous
+				}))];
+				try {
+					if (!(await this.applyTreeChange({
+						name: target,
+						origin: plan.origin,
+						protection: "write",
+						writes,
+						auditAction: "merge-rollback",
+						auditSummary: "merge rollback: restore target snapshot",
+						eventAction: "merge-rollback",
 						unitId,
-						unitHead: { skill: target },
-						reason: `Merged into ${target}`
-					}, plan.origin);
-					if (!result.ok) {
-						const stuck = await rollbackSources();
-						return rollbackMessage(result.message, stuck);
-					}
-					archived.push(source);
+						unitHead
+					})).ok) stuck.push(target);
+				} catch {
+					stuck.push(target);
 				}
+				return stuck;
+			};
+			if (plan.targetExists) {
+				for (const source of sources) if (await this.io.readText(join(this.dirOf(source), "SKILL.md")) !== sourceBodies.get(source)) return rollbackMessage(`来源技能「${source}」在归档前被改过`, []);
 				const writes = [{
 					target: targetPath,
 					content: plan.body.trimEnd() + "\n",
@@ -11003,9 +11032,25 @@ var SkillLibrary = class {
 					unitId,
 					unitHead
 				});
-				if (!result.ok) {
-					const stuck = await rollbackSources();
-					return rollbackMessage(result.message, stuck);
+				if (!result.ok) return rollbackMessage(result.message, []);
+				for (const source of sources) {
+					if (await this.io.readText(join(this.dirOf(source), "SKILL.md")) !== sourceBodies.get(source)) {
+						const stuck = await rollbackSources();
+						stuck.push(...await rollbackTarget());
+						return rollbackMessage(`来源技能「${source}」在归档前被改过`, stuck);
+					}
+					const archivedResult = await this.archive(source, {
+						absorbedInto: target,
+						unitId,
+						unitHead: { skill: target },
+						reason: `Merged into ${target}`
+					}, plan.origin);
+					if (!archivedResult.ok) {
+						const stuck = await rollbackSources();
+						stuck.push(...await rollbackTarget());
+						return rollbackMessage(archivedResult.message, stuck);
+					}
+					archived.push(source);
 				}
 				return {
 					ok: true,

package/lib/types/http-routes.d.ts

@@ -56,8 +56,8 @@ export declare const HOST_ROUTES: {
     readonly merge: {
         readonly view: "/api/dsh-evolution/merge/view";
         readonly rows: "/api/dsh-evolution/merge/rows";
-        readonly run: "/api/dsh-evolution/merge/run";
-        readonly runs: "/api/dsh-evolution/merge/runs";
+        readonly body: "/api/dsh-evolution/merge/body";
+        readonly history: "/api/dsh-evolution/merge/history";
     };
     readonly diagnostics: {
         readonly view: "/api/dsh-evolution/diagnostics";

package/lib/types/http-routes.js

@@ -53,8 +53,8 @@ export const HOST_ROUTES = {
     merge: {
         view: '/api/dsh-evolution/merge/view',
         rows: '/api/dsh-evolution/merge/rows',
-        run: '/api/dsh-evolution/merge/run',
-        runs: '/api/dsh-evolution/merge/runs',
+        body: '/api/dsh-evolution/merge/body',
+        history: '/api/dsh-evolution/merge/history',
     },
     diagnostics: {
         view: '/api/dsh-evolution/diagnostics',

package/lib/types/run-registry.d.ts

@@ -75,6 +75,11 @@ export interface RunRecord {
     supersededAt?: number | undefined;
     /** The run this run was spawned from (approve/resume after an earlier command). */
     parentRunId?: string | undefined;
+    /** Merge-side projection; core lifecycle stays four-state. */
+    mergeStatus?: 'running' | 'succeeded' | 'failed' | 'cancelled' | 'awaiting-approval' | 'undone' | 'superseded' | 'interrupted' | 'orphan' | undefined;
+    stagingRef?: string | undefined;
+    pairKey?: string | undefined;
+    pairs?: readonly unknown[] | undefined;
 }
 /** What a started run gets: its id and the signal its work must honour. */
 export interface RunHandle {
@@ -85,12 +90,18 @@ export interface RunHandle {
     readonly startedAt: number;
     readonly command?: RunCommand | undefined;
     readonly parentRunId?: string | undefined;
+    /** Merge-side projection; core lifecycle stays four-state. */
+    readonly mergeStatus?: 'running' | 'succeeded' | 'failed' | 'cancelled' | 'awaiting-approval' | 'undone' | 'superseded' | 'interrupted' | 'orphan' | undefined;
+    readonly stagingRef?: string | undefined;
+    readonly pairKey?: string | undefined;
+    readonly pairs?: readonly unknown[] | undefined;
 }
 /** How a run ended, as reported by its owner. */
 export interface RunOutcome {
     state: 'succeeded' | 'failed' | 'cancelled';
     resultRef?: string | undefined;
     failure?: string | undefined;
+    mergeStatus?: 'running' | 'succeeded' | 'failed' | 'cancelled' | 'awaiting-approval' | 'undone' | 'superseded' | 'interrupted' | 'orphan' | undefined;
 }
 /** The registry surface the commands row drives. */
 export interface RunRegistry {
@@ -114,6 +125,10 @@ export interface RunRegistry {
         command?: RunCommand;
         total?: number;
         parentRunId?: string;
+        mergeStatus?: 'running' | 'succeeded' | 'failed' | 'cancelled' | 'awaiting-approval' | 'undone' | 'superseded' | 'interrupted' | 'orphan';
+        stagingRef?: string;
+        pairKey?: string;
+        pairs?: readonly unknown[];
     }): Promise<RunHandle>;
     /** Record a run's terminal state (first writer wins). */
     settle(id: string, outcome: RunOutcome): Promise<void>;

package/lib/types/run-registry.js

@@ -110,6 +110,10 @@ function parseIndex(raw) {
             ...(typeof record.failure === 'string' ? { failure: record.failure } : {}),
             ...(typeof record.supersededAt === 'number' ? { supersededAt: record.supersededAt } : {}),
             ...(typeof record.parentRunId === 'string' ? { parentRunId: record.parentRunId } : {}),
+            ...(record.mergeStatus === 'running' || record.mergeStatus === 'succeeded' || record.mergeStatus === 'failed' || record.mergeStatus === 'cancelled' || record.mergeStatus === 'awaiting-approval' || record.mergeStatus === 'undone' || record.mergeStatus === 'superseded' || record.mergeStatus === 'interrupted' || record.mergeStatus === 'orphan' ? { mergeStatus: record.mergeStatus } : {}),
+            ...(typeof record.stagingRef === 'string' ? { stagingRef: record.stagingRef } : {}),
+            ...(typeof record.pairKey === 'string' ? { pairKey: record.pairKey } : {}),
+            ...(Array.isArray(record.pairs) ? { pairs: record.pairs } : {}),
         });
     }
     return { ok: true, records, foreign, ...(notes.length > 0 ? { note: notes.join('; ') } : {}) };
@@ -135,7 +139,7 @@ export function newRunRegistry(options) {
     /** A row whose owner cannot be reached: `pid` absent (an older build) or not alive. */
     const ownerIsGone = (row) => row.pid === undefined || !isProcessAlive(row.pid);
     /** The verdict is materialized ONCE, so its `endedAt` (and the duration a reader sees) is stable. */
-    const orphanOf = (row) => ({ ...row, state: 'failed', endedAt: now(), failure: ORPHAN_FAILURE });
+    const orphanOf = (row) => ({ ...row, state: 'failed', mergeStatus: 'orphan', endedAt: now(), failure: ORPHAN_FAILURE });
     /** Every row this process knows, newest first. ALL reads go through here. */
     const view = () => [...owned.values(), ...foreign.values()].sort((a, b) => b.startedAt - a.startedAt);
     /** Retained history: every running row plus the newest terminal rows per kind. */
@@ -301,6 +305,10 @@ export function newRunRegistry(options) {
                 pid: process.pid,
                 ...(seed?.command !== undefined ? { command: seed.command } : {}),
                 ...(seed?.parentRunId !== undefined ? { parentRunId: seed.parentRunId } : {}),
+                ...(seed?.mergeStatus !== undefined ? { mergeStatus: seed.mergeStatus } : {}),
+                ...(seed?.stagingRef !== undefined ? { stagingRef: seed.stagingRef } : {}),
+                ...(seed?.pairKey !== undefined ? { pairKey: seed.pairKey } : {}),
+                ...(seed?.pairs !== undefined ? { pairs: seed.pairs } : {}),
                 ...(seed?.total !== undefined ? { progress: { done: 0, total: seed.total } } : {}),
             });
             // Write-through (0.19.1, review P2): answering "started" promises a run another
@@ -332,6 +340,8 @@ export function newRunRegistry(options) {
                 if (row === undefined || row.supersededAt !== undefined)
                     continue;
                 row.supersededAt = now();
+                if (row.kind === 'merge')
+                    row.mergeStatus = 'superseded';
                 changed = true;
             }
             if (changed)
@@ -350,6 +360,8 @@ export function newRunRegistry(options) {
                     if (row.kind !== kind || row.supersededAt !== undefined)
                         continue;
                     row.supersededAt = now();
+                    if (row.kind === 'merge')
+                        row.mergeStatus = 'superseded';
                     marked += 1;
                 }
                 const kept = capped([...merged.values()]);
@@ -371,6 +383,8 @@ export function newRunRegistry(options) {
                 row.resultRef = outcome.resultRef;
             if (outcome.failure !== undefined)
                 row.failure = outcome.failure;
+            if (outcome.mergeStatus !== undefined)
+                row.mergeStatus = outcome.mergeStatus;
             controllers.delete(id);
             await persist();
         },

package/lib/types/skill-store.js

@@ -2036,24 +2036,42 @@ export class SkillLibrary {
                     ? `合并失败，已回滚：${reason}`
                     : `合并失败（${reason}）；已回滚，但以下未回滚：${stuck.join(', ')}：它们仍在 .archive 里，请用 /evolution skill restore 恢复。`,
             });
+            const rollbackTarget = async () => {
+                const stuck = [];
+                const support = plan.supportFiles.map(file => ({
+                    target: join(dir, ...file.path.replace(/\\/g, '/').split('/').filter(Boolean)),
+                    content: supportPrevious.get(file.path) ?? null,
+                    previous: file.content,
+                }));
+                const writes = [
+                    { target: targetPath, content: plan.expectedTargetBody ?? '', expected: plan.body.trimEnd() + '\n' },
+                    ...support.map(file => ({ target: file.target, content: file.content ?? '', expected: file.previous })),
+                ];
+                try {
+                    const restored = await this.applyTreeChange({
+                        name: target,
+                        origin: plan.origin,
+                        protection: 'write',
+                        writes,
+                        auditAction: 'merge-rollback',
+                        auditSummary: 'merge rollback: restore target snapshot',
+                        eventAction: 'merge-rollback',
+                        unitId,
+                        unitHead,
+                    });
+                    if (!restored.ok)
+                        stuck.push(target);
+                }
+                catch {
+                    stuck.push(target);
+                }
+                return stuck;
+            };
             if (plan.targetExists) {
                 for (const source of sources) {
                     const fresh = await this.io.readText(join(this.dirOf(source), 'SKILL.md'));
-                    if (fresh !== sourceBodies.get(source)) {
-                        const stuck = await rollbackSources();
-                        return rollbackMessage(`来源技能「${source}」在归档前被改过`, stuck);
-                    }
-                    const result = await this.archive(source, {
-                        absorbedInto: target,
-                        unitId,
-                        unitHead: { skill: target },
-                        reason: `Merged into ${target}`,
-                    }, plan.origin);
-                    if (!result.ok) {
-                        const stuck = await rollbackSources();
-                        return rollbackMessage(result.message, stuck);
-                    }
-                    archived.push(source);
+                    if (fresh !== sourceBodies.get(source))
+                        return rollbackMessage(`来源技能「${source}」在归档前被改过`, []);
                 }
                 const writes = [
                     { target: targetPath, content: plan.body.trimEnd() + '\n', expected: plan.expectedTargetBody },
@@ -2074,9 +2092,27 @@ export class SkillLibrary {
                     unitId,
                     unitHead,
                 });
-                if (!result.ok) {
-                    const stuck = await rollbackSources();
-                    return rollbackMessage(result.message, stuck);
+                if (!result.ok)
+                    return rollbackMessage(result.message, []);
+                for (const source of sources) {
+                    const fresh = await this.io.readText(join(this.dirOf(source), 'SKILL.md'));
+                    if (fresh !== sourceBodies.get(source)) {
+                        const stuck = await rollbackSources();
+                        stuck.push(...await rollbackTarget());
+                        return rollbackMessage(`来源技能「${source}」在归档前被改过`, stuck);
+                    }
+                    const archivedResult = await this.archive(source, {
+                        absorbedInto: target,
+                        unitId,
+                        unitHead: { skill: target },
+                        reason: `Merged into ${target}`,
+                    }, plan.origin);
+                    if (!archivedResult.ok) {
+                        const stuck = await rollbackSources();
+                        stuck.push(...await rollbackTarget());
+                        return rollbackMessage(archivedResult.message, stuck);
+                    }
+                    archived.push(source);
                 }
                 return { ok: true, message: `已把 ${sources.join(', ')} 合并进「${target}」。`, unitId, targetPath: dir, archived, mutations: 1 + sources.length };
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-core",
   "description": "Shared stores, prompts, signals and lifecycle logic for the dsh-evolution plugin family (community build)",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "publishConfig": {
     "access": "public"
   },

package/persisted-write-inventory.json

@@ -207,6 +207,15 @@
       "marker": "transactIo(options.io, path",
       "state": [],
       "note": "The release half of the same lock: delete only when the recorded token still matches."
+    },
+    {
+      "id": "merge-pair-index",
+      "path": "<evolutionHome>/merge/pair-index.json",
+      "writer": "evolution-merge/src/domain/pair-index-store.ts",
+      "serializedBy": "transact",
+      "marker": "transactIo(io, pairIndexPath(home)",
+      "state": [],
+      "note": "pairKey → result/runId/target index; RMW under the same IO lock so two merge runs cannot lose each other's entries."
     }
   ]
 }