@lmzhen/dsh-evolution-merge 0.30.6 → 0.30.8

package/lib/index.js

@@ -814,10 +814,15 @@ async function recoverCommitJournals(io, home, now, skillRoot, restoreSource, is
 				}
 				if (!restoredArchived) for (const source of snapshot.sourceBodies) await io.writeText(skillBodyPath(skillRoot, source.name), source.body);
 			}
-			if (snapshot.create && snapshot.targetBody === null) try {
-				await io.remove(skillBodyPath(skillRoot, snapshot.target));
-			} catch {}
-			else if (snapshot.targetBody !== null) await io.writeText(skillBodyPath(skillRoot, snapshot.target), snapshot.targetBody);
+			if (snapshot.create && snapshot.targetBody === null) {
+				try {
+					await io.remove(skillBodyPath(skillRoot, snapshot.target));
+				} catch {}
+				try {
+					const dir = join(skillRoot, snapshot.target);
+					if ((await io.list(dir)).length === 0) await io.remove(dir);
+				} catch {}
+			} else if (snapshot.targetBody !== null) await io.writeText(skillBodyPath(skillRoot, snapshot.target), snapshot.targetBody);
 			const oldPaths = new Set((snapshot.targetSupport ?? []).map((file) => file.path));
 			for (const file of snapshot.targetSupport ?? []) await io.writeText(skillFilePath(skillRoot, snapshot.target, file.path), file.content);
 			for (const file of snapshot.targetSupportAfter ?? []) if (!oldPaths.has(file.path)) try {
@@ -1556,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

package/lib/types/commit-recovery.js

@@ -72,6 +72,12 @@ export async function recoverCommitJournals(io, home, now, skillRoot, restoreSou
                         await io.remove(skillBodyPath(skillRoot, snapshot.target));
                     }
                     catch { /* already gone */ }
+                    try {
+                        const dir = join(skillRoot, snapshot.target);
+                        if ((await io.list(dir)).length === 0)
+                            await io.remove(dir);
+                    }
+                    catch { /* absent or non-empty */ }
                 }
                 else if (snapshot.targetBody !== null) {
                     await io.writeText(skillBodyPath(skillRoot, snapshot.target), snapshot.targetBody);

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