@gadmin2n/cli 0.0.94 → 0.0.96

package/actions/update.action.js

@@ -30,6 +30,16 @@ const DEFAULT_EXCLUDES = [
     '.DS_Store',
     '.env.local',
     'readme.md',
+    // package manager lock files & PnP artifacts —
+    // regenerated by the auto-install stage based on the merged package.json.
+    // Letting template versions overwrite instance lock files is semantically
+    // wrong (lock should reflect actually-installed deps) and clutters diff output.
+    'yarn.lock',
+    'package-lock.json',
+    'pnpm-lock.yaml',
+    '.yarn',
+    '.pnp.cjs',
+    '.pnp.loader.mjs',
 ];
 const CLAUDE_CONTEXT_REPO = 'https://git.tencent.com/OIT-OMC/erp-ai-coding-context.git';
 const CLAUDE_CONTEXT_BRANCH = 'master';
@@ -337,12 +347,14 @@ function fetchClaudeContextRepo() {
 }
 /**
  * Recursively copy every file under `srcDir` into `destDir`, preserving
- * relative structure. Existing destination files are NOT overwritten.
- * Returns counts.
+ * relative structure. The remote source is authoritative: existing files in
+ * `destDir` are OVERWRITTEN. Files that exist only in `destDir` (instance-only)
+ * are left untouched — this is an additive/overwriting sync, never a delete.
+ * Returns counts split between newly-added files and overwritten files.
  */
-function copyTreeNoOverwrite(srcDir, destDir) {
+function copyTreeOverwrite(srcDir, destDir) {
     let added = 0;
-    let skipped = 0;
+    let updated = 0;
     function walk(rel) {
         const absSrc = path.join(srcDir, rel);
         const entries = fs.readdirSync(absSrc, { withFileTypes: true });
@@ -354,20 +366,22 @@ function copyTreeNoOverwrite(srcDir, destDir) {
                 walk(childRel);
             }
             else if (entry.isFile()) {
-                if (fs.existsSync(absChildDest)) {
-                    skipped++;
-                    continue;
-                }
+                const existed = fs.existsSync(absChildDest);
                 fs.mkdirSync(path.dirname(absChildDest), { recursive: true });
                 fs.copyFileSync(absChildSrc, absChildDest);
-                added++;
+                if (existed) {
+                    updated++;
+                }
+                else {
+                    added++;
+                }
             }
         }
     }
     if (!fs.existsSync(srcDir))
-        return { added, skipped };
+        return { added, updated };
     walk('');
-    return { added, skipped };
+    return { added, updated };
 }
 function syncClaudeContext(instanceDir, dryRun) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -377,7 +391,7 @@ function syncClaudeContext(instanceDir, dryRun) {
         console.info(`${chalk.gray('Source: ')} ${CLAUDE_CONTEXT_REPO} (${CLAUDE_CONTEXT_BRANCH}) :: ${CLAUDE_SOURCE_SUBDIR}/`);
         console.info(`${chalk.gray('Targets:')} ${CLAUDE_TARGET_DIRS.map((d) => `${d}/`).join(', ')}\n`);
         if (dryRun) {
-            console.info(chalk.gray('(dry-run mode — would clone the repo and copy missing files into target dirs)\n'));
+            console.info(chalk.gray('(dry-run mode — would clone the repo and copy remote files into target dirs, overwriting existing files; instance-only files are kept)\n'));
             return;
         }
         const claudeSrc = fetchClaudeContextRepo();
@@ -387,12 +401,12 @@ function syncClaudeContext(instanceDir, dryRun) {
         for (const targetName of CLAUDE_TARGET_DIRS) {
             const destDir = path.join(instanceDir, targetName);
             fs.mkdirSync(destDir, { recursive: true });
-            const { added, skipped } = copyTreeNoOverwrite(claudeSrc, destDir);
+            const { added, updated } = copyTreeOverwrite(claudeSrc, destDir);
             const summary = [];
             if (added > 0)
                 summary.push(`${added} added`);
-            if (skipped > 0)
-                summary.push(`${skipped} kept (already exists)`);
+            if (updated > 0)
+                summary.push(`${updated} overwritten`);
             if (summary.length === 0)
                 summary.push('no files');
             console.info(`   ${chalk.cyan(targetName + '/')}  ${summary.join(' | ')}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "@angular-devkit/core": "13.3.2",
     "@angular-devkit/schematics": "13.3.2",
     "@angular-devkit/schematics-cli": "13.3.2",
-    "@gadmin2n/schematics": "^0.0.76",
+    "@gadmin2n/schematics": "^0.0.78",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",