@lmzhen/dsh-evolution-merge 0.30.8 → 0.30.10

package/lib/index.js

@@ -1531,7 +1531,7 @@ function mergeUsage() {
 }
 //#endregion
 //#region lib/types/read-commands.js
-async function handleReadOnlyMergeCommand(command, io, home) {
+async function handleReadOnlyMergeCommand(command, io, home, cards) {
 	const withNote = (text, note) => note === void 0 ? text : "note: " + note + "\n" + text;
 	if (command.verb === "status") {
 		const loaded = await loadMergeState(io, home);
@@ -1544,7 +1544,8 @@ async function handleReadOnlyMergeCommand(command, io, home) {
 	if (command.verb === "pending") {
 		const loaded = await loadMergeState(io, home);
 		const rows = command.expired === true ? loaded.state.rows.filter((row) => row.expired !== void 0) : loaded.state.rows;
-		return withNote(command.expired === true ? formatStatus(rows) : formatQueue(rows, "pending"), loaded.note);
+		const live = cards === void 0 ? rows : rows.filter((row) => cards.some((card) => card.name === row.a) && cards.some((card) => card.name === row.b));
+		return withNote(command.expired === true ? formatStatus(live) : formatQueue(live, "pending"), loaded.note);
 	}
 	if (command.verb === "candidates") {
 		const loaded = await loadMergeState(io, home);
@@ -2874,12 +2875,16 @@ async function runRound1OverChannel(options, candidate, signal) {
 			dispose
 		};
 	}
-	if (!parsed.decision.shouldMerge || parsed.decision.mode === "keep") {
+	const decision = round1.turn.cacheRead === void 0 ? parsed.decision : {
+		...parsed.decision,
+		cacheRead: round1.turn.cacheRead
+	};
+	if (!decision.shouldMerge || decision.mode === "keep") {
 		await dispose();
 		return {
 			outcome: {
 				kind: "keep",
-				decision: parsed.decision
+				decision
 			},
 			dispose
 		};
@@ -2888,7 +2893,7 @@ async function runRound1OverChannel(options, candidate, signal) {
 	return {
 		outcome: {
 			kind: "merge",
-			decision: parsed.decision
+			decision
 		},
 		childId: child,
 		dispose,
@@ -3220,6 +3225,9 @@ async function commitStagedRun(io, home, runId, port, options) {
 	};
 	try {
 		await writeCommitReceipt(io, home, receipt);
+		try {
+			await io.remove(snapshotPath(home, runId));
+		} catch {}
 		return {
 			ok: true,
 			plan: assembled.plan,
@@ -4110,7 +4118,8 @@ function createMergeRuntime(deps) {
 				text: "merge approve 完成：merged " + String(result.report.totals.merged)
 			};
 		}
-		const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home);
+		const cards = command.verb === "pending" ? await deps.cards(new AbortController().signal) : void 0;
+		const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home, cards);
 		if (text !== null) return {
 			ok: true,
 			text

package/lib/types/channel-port.d.ts

@@ -9,6 +9,7 @@ import type { ScanRound1Outcome } from './scan-run.ts';
 export interface ChannelTurnLike {
     readonly text: string;
     readonly stopReason: string;
+    readonly cacheRead?: number;
 }
 export type ChannelTurnOutcome = {
     readonly kind: 'ok';

package/lib/types/channel-port.js

@@ -52,13 +52,14 @@ export async function runRound1OverChannel(options, candidate, signal) {
         await dispose();
         return { outcome: { kind: 'failed', failure: { stage: 'decide', code: parsed.code, message: parsed.message, retryable: true, retryFrom: 'agent1' } }, dispose };
     }
-    if (!parsed.decision.shouldMerge || parsed.decision.mode === 'keep') {
+    const decision = round1.turn.cacheRead === undefined ? parsed.decision : { ...parsed.decision, cacheRead: round1.turn.cacheRead };
+    if (!decision.shouldMerge || decision.mode === 'keep') {
         await dispose();
-        return { outcome: { kind: 'keep', decision: parsed.decision }, dispose };
+        return { outcome: { kind: 'keep', decision }, dispose };
     }
     const child = opened.childId;
     return {
-        outcome: { kind: 'merge', decision: parsed.decision },
+        outcome: { kind: 'merge', decision },
         childId: child,
         dispose,
         async author(row, decision, turnSignal) {

package/lib/types/commit-execute.js

@@ -2,7 +2,7 @@ import { assembleStagedCommit } from "./commit-assembly.js";
 import { writeCommitReceipt } from "./commit-receipt.js";
 import { pairKey } from "./contracts.js";
 import { writeJournal } from "./domain/commit-journal-store.js";
-import { writeCommitSnapshot } from "./commit-snapshot.js";
+import { snapshotPath, writeCommitSnapshot } from "./commit-snapshot.js";
 export async function commitStagedRun(io, home, runId, port, options) {
     const assembled = await assembleStagedCommit(io, home, runId, port, { origin: options.origin, summary: options.summary });
     if (!assembled.ok)
@@ -46,6 +46,10 @@ export async function commitStagedRun(io, home, runId, port, options) {
     };
     try {
         await writeCommitReceipt(io, home, receipt);
+        try {
+            await io.remove(snapshotPath(home, runId));
+        }
+        catch { /* committed journal is the record */ }
         return { ok: true, plan: assembled.plan, result, receipt };
     }
     catch (error) {

package/lib/types/contracts.d.ts

@@ -52,6 +52,7 @@ export interface MergeDecision {
     readonly confidence?: number;
     readonly aSummary?: string;
     readonly bSummary?: string;
+    readonly cacheRead?: number;
 }
 export interface MergeUsage {
     readonly inputTokens?: number;

package/lib/types/read-commands.d.ts

@@ -4,6 +4,8 @@
  */
 import type { EvolutionIoLike } from '@lmzhen/dsh-evolution-core';
 import type { MergeCliCommand } from './commands.ts';
-export declare function handleReadOnlyMergeCommand(command: MergeCliCommand, io: EvolutionIoLike, home: string): Promise<string | null>;
+export declare function handleReadOnlyMergeCommand(command: MergeCliCommand, io: EvolutionIoLike, home: string, cards?: readonly {
+    readonly name: string;
+}[]): Promise<string | null>;
 export declare function mergeCommandHelp(): string;
 //# sourceMappingURL=read-commands.d.ts.map

package/lib/types/read-commands.js

@@ -1,7 +1,7 @@
 import { loadMergeState } from "./state.js";
 import { formatQueue, formatStatus } from "./status.js";
 import { mergeUsage } from "./commands.js";
-export async function handleReadOnlyMergeCommand(command, io, home) {
+export async function handleReadOnlyMergeCommand(command, io, home, cards) {
     const withNote = (text, note) => note === undefined ? text : 'note: ' + note + '\n' + text;
     if (command.verb === 'status') {
         const loaded = await loadMergeState(io, home);
@@ -14,7 +14,8 @@ export async function handleReadOnlyMergeCommand(command, io, home) {
     if (command.verb === 'pending') {
         const loaded = await loadMergeState(io, home);
         const rows = command.expired === true ? loaded.state.rows.filter(row => row.expired !== undefined) : loaded.state.rows;
-        return withNote(command.expired === true ? formatStatus(rows) : formatQueue(rows, 'pending'), loaded.note);
+        const live = cards === undefined ? rows : rows.filter(row => cards.some(card => card.name === row.a) && cards.some(card => card.name === row.b));
+        return withNote(command.expired === true ? formatStatus(live) : formatQueue(live, 'pending'), loaded.note);
     }
     if (command.verb === 'candidates') {
         const loaded = await loadMergeState(io, home);

package/lib/types/runtime.js

@@ -314,7 +314,8 @@ export function createMergeRuntime(deps) {
                     return { ok: false, text: 'merge approve started without a report' };
                 return { ok: true, text: 'merge approve 完成：merged ' + String(result.report.totals.merged) };
             }
-            const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home);
+            const cards = command.verb === 'pending' ? await deps.cards(new AbortController().signal) : undefined;
+            const text = await handleReadOnlyMergeCommand(command, deps.io, deps.home, cards);
             if (text !== null)
                 return { ok: true, text };
             return readOnly.execute(command);

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.8",
+  "version": "0.30.10",
   "publishConfig": {
     "access": "public"
   },
@@ -27,8 +27,8 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.8",
-    "@lmzhen/dsh-evolution-merge-engine": "^0.30.8"
+    "@lmzhen/dsh-evolution-core": "^0.30.10",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.10"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"