@lmzhen/dsh-evolution-commands 0.3.27 → 0.3.29

package/lib/index.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { SkillLibrary, appendEvolutionEvent, buildLearnPrompt, composePresetComposition, eventsFile, evolutionRoot, resolveSkillsRoot } from "@lmzhen/dsh-evolution-core";
 import { buildEnrichment, buildMaintainFacts, runMaintain, snapshotFromLibrary } from "@lmzhen/dsh-evolution-maintenance";
-import { copyFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 //#region lib/types/index.js
@@ -342,6 +342,13 @@ const defaultFs = {
 	},
 	rmSync: (path, options) => {
 		rmSync(path, options);
+	},
+	mtime: (path) => {
+		try {
+			return statSync(path).mtimeMs;
+		} catch {
+			return null;
+		}
 	}
 };
 /**
@@ -358,6 +365,13 @@ const defaultFs = {
 * single `.bak` created above still holds the previous content, so the target
 * is restored from it (best-effort) before the original rename error is
 * rethrown, so a failed commit never leaves the file missing.
+*
+* V4-17: the `.bak` is refreshed to the committed content after every
+* successful commit, so a later failed commit always recovers to the most
+* recent good generation (a once-at-first-install `.bak` could otherwise
+* restore content several installs old). The recovery error names the `.bak`
+* source (and mtime when available) so the caller knows the generation it
+* restored from.
 */
 function atomicWriteFiles(targetDir, writes, fs = defaultFs) {
 	const stage = (name) => join(targetDir, `${name}.tmp`);
@@ -379,15 +393,24 @@ function atomicWriteFiles(targetDir, writes, fs = defaultFs) {
 				try {
 					fs.renameSync(tmp, finalPath);
 				} catch (renameError) {
-					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`);
+					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`);
+						}
+						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 renameError;
 				}
 			}
 		}
+		for (const { name } of writes) {
+			const finalPath = join(targetDir, name);
+			if (fs.existsSync(finalPath)) fs.copyFileSync(finalPath, join(targetDir, `${name}.bak`));
+		}
 	} catch (error) {
 		for (const { name } of writes) fs.rmSync(stage(name), {
 			force: true,
@@ -410,13 +433,28 @@ function atomicWriteFiles(targetDir, writes, fs = defaultFs) {
 */
 function countMaintainRecommendations(text) {
 	if (!text) return 0;
-	return (text.split("\nNotes:")[0] ?? "").match(/^- \[/gm)?.length ?? 0;
+	return beforeNotesHeader(text).match(/^- \[/gm)?.length ?? 0;
+}
+/** Locate the maintain-plan `Notes:` section header as a standalone line.
+* Returns everything before it (the plan section), or the whole text when the
+* header is absent. formatPlan emits the header via `lines.push('Notes:')`, so
+* it is always a line that is exactly `Notes:` (never an indented/embedded
+* continuation), letting us ignore a `Notes:` that appears inside a field. */
+function beforeNotesHeader(text) {
+	const header = /(^|\n)Notes:(?=\n)/.exec(text);
+	if (!header) return text;
+	return text.slice(0, header.index);
 }
 /** F-328: render staged args for `pending --detail`, truncated to 500 chars.
-* args may be non-JSON (a tool produced garbage), so the render is fail-safe. */
+* args may be non-JSON (a tool produced garbage), so the render is fail-safe.
+* V4-19: a truncation is marked with `…(truncated N chars)` so the operator is
+* never silently shown a partial JSON payload that could even split an escape
+* sequence — the marker makes the cut explicit rather than looking complete. */
 function safeStagedArgs(args) {
 	try {
-		return JSON.stringify(args).slice(0, 500);
+		const json = JSON.stringify(args);
+		if (json.length > 500) return `${json.slice(0, 500)}…(truncated ${json.length - 500} chars)`;
+		return json;
 	} catch {
 		return "(unserializable)";
 	}

package/lib/types/index.d.ts

@@ -25,7 +25,9 @@ export interface Config {
 }
 export declare function apply(ctx: Context, rawConfig?: Config): void;
 /** F-211: the fs surface atomicWriteFiles uses — injectable so the commit-phase
- * rename-failure path is deterministically testable. Defaults to node:fs. */
+ * rename-failure path is deterministically testable. Defaults to node:fs.
+ * `mtime` (optional) probes a path's last-write time so the failed-commit
+ * recovery message can name the generation it restored from. */
 interface FsOps {
     writeFileSync(path: string, data: string | Uint8Array): void;
     existsSync(path: string): boolean;
@@ -35,6 +37,7 @@ interface FsOps {
         force?: boolean;
         recursive?: boolean;
     }): void;
+    mtime?(path: string): number | null;
 }
 /**
  * S6.3 (E-40): atomically replace a set of files within one directory.
@@ -50,6 +53,13 @@ interface FsOps {
  * single `.bak` created above still holds the previous content, so the target
  * is restored from it (best-effort) before the original rename error is
  * rethrown, so a failed commit never leaves the file missing.
+ *
+ * V4-17: the `.bak` is refreshed to the committed content after every
+ * successful commit, so a later failed commit always recovers to the most
+ * recent good generation (a once-at-first-install `.bak` could otherwise
+ * restore content several installs old). The recovery error names the `.bak`
+ * source (and mtime when available) so the caller knows the generation it
+ * restored from.
  */
 export declare function atomicWriteFiles(targetDir: string, writes: Array<{
     name: string;

package/package.json

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