@lmzhen/dsh-evolution-commands 0.3.30 → 0.3.31

package/lib/index.js

@@ -382,34 +382,42 @@ function atomicWriteFiles(targetDir, writes, fs = defaultFs) {
 			const bakPath = join(targetDir, `${name}.bak`);
 			if (fs.existsSync(finalPath) && !fs.existsSync(bakPath)) fs.copyFileSync(finalPath, bakPath);
 		}
+		const committed = [];
 		for (const { name } of writes) {
 			const finalPath = join(targetDir, name);
 			const bakPath = join(targetDir, `${name}.bak`);
 			const tmp = stage(name);
 			try {
 				fs.renameSync(tmp, finalPath);
+				committed.push(name);
 			} catch {
 				fs.rmSync(finalPath, { force: true });
 				try {
 					fs.renameSync(tmp, finalPath);
+					committed.push(name);
 				} catch (renameError) {
+					const already = committed.length > 0 ? `; already committed: ${committed.join(", ")}` : "";
 					if (fs.existsSync(bakPath)) {
 						try {
 							fs.copyFileSync(bakPath, finalPath);
 						} catch {
-							throw new Error(`atomicWriteFiles: "${name}" was removed but recovery from ${bakPath} failed (${renameError instanceof Error ? renameError.message : String(renameError)}); verify the file manually`);
+							throw new Error(`atomicWriteFiles: "${name}" was removed but recovery from ${bakPath} failed (${renameError instanceof Error ? renameError.message : String(renameError)}); verify the file manually${already}`);
 						}
 						const bakMtime = fs.mtime?.(bakPath);
 						const when = bakMtime !== null && bakMtime !== void 0 && Number.isFinite(bakMtime) ? ` (bak mtime ${new Date(bakMtime).toISOString()})` : "";
-						throw new Error(`atomicWriteFiles: "${name}" was removed during commit and restored from the last good generation ${bakPath}${when}; original error: ${renameError instanceof Error ? renameError.message : String(renameError)}`);
+						throw new Error(`atomicWriteFiles: "${name}" was removed during commit and restored from the last good generation ${bakPath}${when}; original error: ${renameError instanceof Error ? renameError.message : String(renameError)}${already}`);
 					}
-					throw renameError;
+					throw new Error(`${renameError instanceof Error ? renameError.message : String(renameError)}${already}`);
 				}
 			}
 		}
 		for (const { name } of writes) {
 			const finalPath = join(targetDir, name);
-			if (fs.existsSync(finalPath)) fs.copyFileSync(finalPath, join(targetDir, `${name}.bak`));
+			try {
+				if (fs.existsSync(finalPath)) fs.copyFileSync(finalPath, join(targetDir, `${name}.bak`));
+			} catch (refreshError) {
+				console.warn(`atomicWriteFiles: committed "${name}" but failed to refresh its .bak (${refreshError instanceof Error ? refreshError.message : String(refreshError)}); a later failed commit will recover to an OLDER generation`);
+			}
 		}
 	} catch (error) {
 		for (const { name } of writes) fs.rmSync(stage(name), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-commands",
   "description": "Human commands for the evolution family (community build)",
-  "version": "0.3.30",
+  "version": "0.3.31",
   "publishConfig": {
     "access": "public"
   },
@@ -30,9 +30,9 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@lmzhen/dsh-evolution-approval": "^0.3.30",
-    "@lmzhen/dsh-evolution-core": "^0.3.30",
-    "@lmzhen/dsh-evolution-maintenance": "^0.3.30"
+    "@lmzhen/dsh-evolution-approval": "^0.3.31",
+    "@lmzhen/dsh-evolution-core": "^0.3.31",
+    "@lmzhen/dsh-evolution-maintenance": "^0.3.31"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",