cc-devflow 2.4.1 → 2.4.2

package/CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
-## [2.4.1] - 2026-01-08
+## [2.4.2] - 2026-01-09
 
 ### 🩹 CLI 增强：增量更新 (Incremental Update)
 
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **增量更新机制**: 当目标目录已存在时，`init` 默认进入增量模式。
   - 仅复制目标目录中**缺失**的文件。
   - **保留**所有已存在的文件（即使用户修改过）。
+  - 若目标文件存在但内容与新版模板不同，生成 `filename.new` 并提示 `[UPDATE]`。
   - 输出 `[NEW] filename` 提示新增文件。
 - **强制模式重构**: `--force` 选项现在的行为更明确：彻底删除旧目录并重新安装。
 

package/bin/cc-devflow-cli.js

@@ -99,11 +99,25 @@ function copyIncremental(src, dest) {
     }
   } else {
     if (!fs.existsSync(dest)) {
+      // Case 1: File missing - Copy it
       fs.copyFileSync(src, dest);
       console.log(`[NEW] ${path.relative(process.cwd(), dest)}`);
     } else {
-      // File exists - skip to preserve user changes
-      // TODO: In the future, we could implement a 3-way merge or check for unmodified defaults
+      // Case 2: File exists - Compare content
+      try {
+        const srcContent = fs.readFileSync(src);
+        const destContent = fs.readFileSync(dest);
+
+        if (!srcContent.equals(destContent)) {
+          // Content differs - Create .new version
+          const newFile = `${dest}.new`;
+          fs.copyFileSync(src, newFile);
+          console.log(`[UPDATE] ${path.relative(process.cwd(), newFile)} (conflict detected)`);
+        }
+        // else: Content identical - Silent skip
+      } catch (err) {
+        console.warn(`[WARN] Could not compare ${path.relative(process.cwd(), dest)}: ${err.message}`);
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cc-devflow",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "description": "DevFlow CLI tool",
     "main": "bin/cc-devflow.js",
     "bin": {
@@ -47,4 +47,4 @@
     "engines": {
         "node": ">=18"
     }
-}
+}