@gadmin2n/cli 0.0.113 → 0.0.114

package/actions/update.action.js

@@ -200,9 +200,18 @@ function syncClaudeContext(instanceDir, dryRun, source) {
         console.info(`${chalk.gray('Source: ')} ${source.repo} (${source.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 remote files into target dirs, overwriting existing files; instance-only files are kept)\n'));
+            console.info(chalk.gray('(dry-run — no files written. The real run would:'));
+            console.info(chalk.gray(`   1. git clone ${source.repo} --branch ${source.branch} --depth 1  (into tmp dir)`));
+            console.info(chalk.gray(`   2. Copy <tmp>/${CLAUDE_SOURCE_SUBDIR}/** → each target dir, OVERWRITING same-named files`));
+            console.info(chalk.gray('   3. Files only present in target dirs (instance-only) are kept untouched)\n'));
             return;
         }
+        // Real run: warn the user that same-named files will be overwritten before
+        // we actually do it. They've already accepted the protocol prompt at this
+        // point, so we don't ask for further confirmation — just make the behaviour
+        // visible so changes to the local copy aren't silently clobbered.
+        console.info(chalk.yellow('⚠️  Same-named files in target dirs will be overwritten by the remote version.'));
+        console.info(chalk.gray('   Instance-only files (only present locally) are kept untouched.\n'));
         const claudeSrc = fetchClaudeContextRepo(source.repo, source.branch);
         if (!claudeSrc) {
             return;
@@ -443,7 +452,7 @@ function handleBinary(rel, baseRoot, oursRoot, theirsRoot, opts, conflicts) {
         detail: `binary differs three-ways. To accept template:  cp "${theirsPath}" "${oursPath}"`,
     });
     console.warn(chalk.yellow(`   ⚠️  binary conflict (cannot 3-way merge): ${rel}`));
-    console.warn(chalk.gray(`      template: ${theirsPath}`));
+    console.warn(chalk.gray(`      template(theirs): ${theirsPath}`));
     console.warn(chalk.gray(`      base:     ${basePath}`));
 }
 function applyPlan(plan, baseRoot, oursRoot, theirsRoot, opts) {
@@ -799,8 +808,8 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                 baseRoot = path.join(instanceDir, '.gadmin/__nonexistent__');
             }
             try {
-                console.info(`\n${chalk.gray('Template:')} @gadmin2n/schematics@${theirsVersion} (latest)`);
-                console.info(`${chalk.gray('Instance:')} ${instanceDir}`);
+                console.info(`\n${chalk.gray('Template(Theirs):')} @gadmin2n/schematics@${theirsVersion} (latest)`);
+                console.info(`${chalk.gray('Instance(Ours):')} ${instanceDir}`);
                 console.info(`${chalk.gray('Base:    ')} ${metaExists
                     ? `(materialized from schematics ${meta.schematicsVersion})`
                     : '(not yet established — run `gadmin2 update` once to bootstrap)'}`);
@@ -875,7 +884,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                 console.error(chalk.red(err.message + '\n'));
                 process.exit(2);
             }
-            console.info(`Template:        ${cfg.template} @ schematics ${meta.schematicsVersion}`);
+            console.info(`Template(Theirs):        ${cfg.template} @ schematics ${meta.schematicsVersion}`);
             const allExcludes = [...excludes_1.HARDCODED_EXCLUDES, ...excludes_1.DEFAULT_EXCLUDES, ...userExcludes];
             const instanceFiles = (0, excludes_1.collectFiles)(instanceDir, allExcludes);
             const residual = (0, residual_scan_1.scanResidualMarkers)(instanceDir, instanceFiles);
@@ -979,8 +988,8 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                     }
                     const theirsRoot = theirsHandle.dir;
                     const schematicsVersion = theirsHandle.version;
-                    console.info(`\n${chalk.gray('Template:')} @gadmin2n/schematics@${schematicsVersion} (latest)`);
-                    console.info(`${chalk.gray('Instance:')} ${instanceDir}\n`);
+                    console.info(`\n${chalk.gray('Template(Theirs):')} @gadmin2n/schematics@${schematicsVersion} (latest)`);
+                    console.info(`${chalk.gray('Instance(Ours):')} ${instanceDir}\n`);
                     // Snapshot package.json before any writes (for stage 3 install)
                     pkgSnapshots = [
                         snapshotPackageJson(instanceDir, '(root)'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.113",
+  "version": "0.0.114",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"