@lmzhen/dsh-evolution-merge 0.30.7 → 0.30.9

package/lib/index.js

@@ -1561,10 +1561,13 @@ function mergeCommandHelp() {
 }
 //#endregion
 //#region lib/types/domain/errors.js
+function redact(text) {
+	return text.replace(/sk-[A-Za-z0-9_-]{16,}/g, "[redacted]").replace(/Bearer\s+\S+/gi, "Bearer [redacted]").replace(/(api[_-]?key\s*[:=]\s*)\S+/gi, "$1[redacted]");
+}
 function formatMergeError(error) {
 	if (error.kind === "parameter") return "merge: " + error.message + " (" + error.code + ")";
 	const where = error.stage === void 0 && error.runId === void 0 ? error.detail ?? "no additional detail" : [error.stage === void 0 ? void 0 : "stage=" + error.stage, error.runId === void 0 ? void 0 : "run=" + error.runId].filter(Boolean).join(" ");
-	return "merge failed: " + error.message + " (" + error.code + ")\n" + where + "\nnext: fix the target or rerun after the cause is gone";
+	return redact("merge failed: " + error.message + " (" + error.code + ")\n" + where + "\nnext: fix the target or rerun after the cause is gone");
 }
 //#endregion
 //#region lib/types/merge-command.js
@@ -2871,12 +2874,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
 		};
@@ -2885,7 +2892,7 @@ async function runRound1OverChannel(options, candidate, signal) {
 	return {
 		outcome: {
 			kind: "merge",
-			decision: parsed.decision
+			decision
 		},
 		childId: child,
 		dispose,

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/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/domain/errors.js

@@ -1,9 +1,15 @@
+function redact(text) {
+    return text
+        .replace(/sk-[A-Za-z0-9_-]{16,}/g, '[redacted]')
+        .replace(/Bearer\s+\S+/gi, 'Bearer [redacted]')
+        .replace(/(api[_-]?key\s*[:=]\s*)\S+/gi, '$1[redacted]');
+}
 export function formatMergeError(error) {
     if (error.kind === 'parameter')
         return 'merge: ' + error.message + ' (' + error.code + ')';
     const where = error.stage === undefined && error.runId === undefined
         ? (error.detail ?? 'no additional detail')
         : [error.stage === undefined ? undefined : 'stage=' + error.stage, error.runId === undefined ? undefined : 'run=' + error.runId].filter(Boolean).join(' ');
-    return 'merge failed: ' + error.message + ' (' + error.code + ')\n' + where + '\nnext: fix the target or rerun after the cause is gone';
+    return redact('merge failed: ' + error.message + ' (' + error.code + ')\n' + where + '\nnext: fix the target or rerun after the cause is gone');
 }
 //# sourceMappingURL=errors.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.30.7",
+  "version": "0.30.9",
   "publishConfig": {
     "access": "public"
   },
@@ -27,8 +27,8 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.30.7",
-    "@lmzhen/dsh-evolution-merge-engine": "^0.30.7"
+    "@lmzhen/dsh-evolution-core": "^0.30.9",
+    "@lmzhen/dsh-evolution-merge-engine": "^0.30.9"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"