@gadmin2n/cli 0.0.112 → 0.0.114

package/actions/update.action.js

@@ -19,7 +19,6 @@ const child_process_1 = require("child_process");
 const abstract_action_1 = require("./abstract.action");
 const self_update_action_1 = require("./self-update.action");
 const version_check_1 = require("../lib/version-check");
-const schematics_root_1 = require("../lib/schematics-root");
 const executable_paths_1 = require("../lib/executable-paths");
 const merge3way_1 = require("../lib/template-merge/merge3way");
 const binary_detect_1 = require("../lib/template-merge/binary-detect");
@@ -48,28 +47,6 @@ function formatMaterializeError(schematicsVersion, err) {
     const m = (_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : String(err);
     return `\n❌ Failed to materialize base @ schematics ${schematicsVersion}: ${m}\n`;
 }
-/* ------------------------------------------------------------------ *
- * Template config / path resolution
- * ------------------------------------------------------------------ */
-function resolveTemplatePath(templateName) {
-    const schematicsRoot = (0, schematics_root_1.findSchematicsRoot)();
-    const nameVariants = [templateName];
-    if (templateName.startsWith('gadmin2n-')) {
-        nameVariants.push(templateName.replace('gadmin2n-', 'gadmin2-'));
-    }
-    else if (templateName.startsWith('gadmin2-')) {
-        nameVariants.push(templateName.replace('gadmin2-', 'gadmin2n-'));
-    }
-    for (const name of nameVariants) {
-        const distPath = path.join(schematicsRoot, 'dist/lib/application/files', name);
-        const srcPath = path.join(schematicsRoot, 'src/lib/application/files', name);
-        if (fs.existsSync(distPath))
-            return distPath;
-        if (fs.existsSync(srcPath))
-            return srcPath;
-    }
-    throw new Error(`Template directory not found for "${templateName}" in ${schematicsRoot}`);
-}
 /* ------------------------------------------------------------------ *
  * .claude context sync (from remote git repo)
  * ------------------------------------------------------------------ */
@@ -223,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;
@@ -466,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) {
@@ -789,7 +775,17 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                 ...((_b = cfg.templateExcludes) !== null && _b !== void 0 ? _b : []),
                 ...((_d = (_c = cfg.templateUpdate) === null || _c === void 0 ? void 0 : _c.excludes) !== null && _d !== void 0 ? _d : []),
             ];
-            const theirsRoot = resolveTemplatePath(cfg.template);
+            let theirsHandle;
+            try {
+                theirsHandle = (0, materialize_1.materializeLatest)(cfg.template);
+            }
+            catch (err) {
+                console.error(chalk.red(`\n❌ ${err.message}\n`));
+                process.exit(1);
+                return; // unreachable; satisfies TS
+            }
+            const theirsRoot = theirsHandle.dir;
+            const theirsVersion = theirsHandle.version;
             const metaExists = fs.existsSync((0, base_store_1.metaPath)(instanceDir));
             let baseHandle = null;
             let baseRoot;
@@ -801,6 +797,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                     baseRoot = baseHandle.dir;
                 }
                 catch (err) {
+                    theirsHandle.cleanup();
                     console.error(chalk.red(formatMaterializeError((_e = meta === null || meta === void 0 ? void 0 : meta.schematicsVersion) !== null && _e !== void 0 ? _e : '?', err)));
                     process.exit(1);
                 }
@@ -811,8 +808,8 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                 baseRoot = path.join(instanceDir, '.gadmin/__nonexistent__');
             }
             try {
-                console.info(`\n${chalk.gray('Template:')} ${theirsRoot}`);
-                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)'}`);
@@ -857,6 +854,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
             finally {
                 if (baseHandle)
                     baseHandle.cleanup();
+                theirsHandle.cleanup();
             }
         });
     }
@@ -886,17 +884,18 @@ 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);
-            let theirsRoot;
+            let theirsHandle;
             try {
-                theirsRoot = resolveTemplatePath(cfg.template);
+                theirsHandle = (0, materialize_1.materializeLatest)(cfg.template);
             }
             catch (err) {
                 console.error(chalk.red(err.message + '\n'));
                 process.exit(2);
+                return; // unreachable
             }
             let baseHandle = null;
             try {
@@ -907,7 +906,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                     console.error(chalk.red(formatMaterializeError(meta.schematicsVersion, err)));
                     process.exit(2);
                 }
-                const plan = (0, classify_1.classifyAll)(baseHandle.dir, instanceDir, theirsRoot, userExcludes);
+                const plan = (0, classify_1.classifyAll)(baseHandle.dir, instanceDir, theirsHandle.dir, userExcludes);
                 const structural = [
                     ...plan.addAddConflict.map((p) => ({ kind: 'add/add', path: p })),
                     ...plan.modifyDeleteConflict.map((p) => ({ kind: 'modify/delete', path: p })),
@@ -943,6 +942,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
             finally {
                 if (baseHandle)
                     baseHandle.cleanup();
+                theirsHandle.cleanup();
             }
         });
     }
@@ -956,13 +956,15 @@ class UpdateAction extends abstract_action_1.AbstractAction {
             const templateEnabled = ((_e = options.find((o) => o.name === 'template')) === null || _e === void 0 ? void 0 : _e.value) !== false;
             const claudeEnabled = ((_f = options.find((o) => o.name === 'coding-context')) === null || _f === void 0 ? void 0 : _f.value) !== false;
             if (!templateEnabled && !claudeEnabled) {
-                console.error(chalk.red('\nNothing to do: both --no-template and --no-coding-context were specified.\n'));
+                // Should never happen under the opt-in selector — kept as a safety net.
+                console.error(chalk.red('\nNothing to do: neither stage was selected.\n'));
                 process.exit(1);
             }
             const mergeOpts = { ours, theirs };
             let pkgSnapshots = null;
             let preflight = null;
             let baseHandle = null;
+            let theirsHandle = null;
             try {
                 if (templateEnabled) {
                     try {
@@ -973,20 +975,31 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                         process.exit(1);
                     }
                     const { instanceDir, templateName, userExcludes } = preflight;
-                    const theirsRoot = resolveTemplatePath(templateName);
-                    console.info(`\n${chalk.gray('Template:')} ${theirsRoot}`);
-                    console.info(`${chalk.gray('Instance:')} ${instanceDir}\n`);
+                    // Pull the latest schematics tarball from npm to use as `theirs`.
+                    // Fail-hard: if the registry is unreachable, abort the update — we
+                    // don't want to silently fall back to a stale local copy.
+                    try {
+                        theirsHandle = (0, materialize_1.materializeLatest)(templateName);
+                    }
+                    catch (err) {
+                        console.error(chalk.red(`\n❌ ${err.message}\n`));
+                        process.exit(1);
+                        return; // unreachable
+                    }
+                    const theirsRoot = theirsHandle.dir;
+                    const schematicsVersion = theirsHandle.version;
+                    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)'),
                         snapshotPackageJson(path.join(instanceDir, 'web'), 'web'),
                         snapshotPackageJson(path.join(instanceDir, 'server'), 'server'),
                     ];
-                    const schematicsVersion = (0, schematics_root_1.getSchematicsVersion)(instanceDir);
                     // First-time bootstrap: meta absent → write meta + README, exit.
                     if (!fs.existsSync((0, base_store_1.metaPath)(instanceDir))) {
                         if (dryRun) {
-                            console.info(chalk.gray('(dry-run: would write .gadmin/.meta.json pinned to current schematics version, then exit)\n'));
+                            console.info(chalk.gray('(dry-run: would write .gadmin/.meta.json pinned to latest schematics version, then exit)\n'));
                         }
                         else {
                             (0, base_store_1.writeMeta)(instanceDir, {
@@ -995,7 +1008,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                             });
                             (0, base_store_1.writeReadme)(instanceDir);
                             console.info(chalk.green('✅ Baseline established at .gadmin/.meta.json'));
-                            console.info(chalk.gray(`   Pinned to schematics ${schematicsVersion}.`));
+                            console.info(chalk.gray(`   Pinned to schematics ${schematicsVersion} (latest from npm).`));
                             console.info(chalk.gray('   The next `gadmin2 update` will perform a real 3-way merge.'));
                         }
                         // Skip the rest of stage 1 — nothing to merge yet.
@@ -1085,7 +1098,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                     }
                 }
                 else {
-                    console.info(chalk.gray('\nSkipping template update (--no-template).\n'));
+                    console.info(chalk.gray('\nSkipping template update (not selected).\n'));
                 }
                 // Stage 2: .claude context sync — UNCHANGED.
                 if (claudeEnabled) {
@@ -1096,11 +1109,11 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                         yield syncClaudeContext(process.cwd(), dryRun, claudeSource);
                     }
                     else {
-                        console.info(chalk.gray('\nSkipping .claude context sync (per user choice / --no-coding-context).\n'));
+                        console.info(chalk.gray('\nSkipping .claude context sync (per user choice).\n'));
                     }
                 }
                 else {
-                    console.info(chalk.gray('\nSkipping .claude context sync (--no-coding-context).\n'));
+                    console.info(chalk.gray('\nSkipping .claude context sync (not selected).\n'));
                 }
                 // Stage 3: Install changed deps — UNCHANGED.
                 if (pkgSnapshots) {
@@ -1110,6 +1123,8 @@ class UpdateAction extends abstract_action_1.AbstractAction {
             finally {
                 if (baseHandle)
                     baseHandle.cleanup();
+                if (theirsHandle)
+                    theirsHandle.cleanup();
                 if (preflight)
                     preflight.releaseLock();
             }

package/commands/update.command.js

@@ -25,23 +25,32 @@ class UpdateCommand extends abstract_command_1.AbstractCommand {
             '  Conflict resolution:\n' +
             '    Conflicts are written into source files as <<<<<<< INSTANCE / >>>>>>> TEMPLATE markers.\n' +
             '    Resolve them in your editor, verify with `gadmin2 update status`, then commit.\n\n' +
-            '  Stage toggles:\n' +
-            '    --no-template          Skip template merge + auto-install.\n' +
-            '    --no-coding-context    Skip .claude context sync.\n')
+            '  Stage selection (opt-in selector — when omitted, both stages run):\n' +
+            '    --template             Run only the template merge + deps install stage.\n' +
+            '    --coding-context       Run only the .claude context sync stage.\n' +
+            '    (pass both / neither)  Run both stages.\n')
             .option('--no-content', '[diff] Only show file list, skip inline diff content.')
             .option('-d, --dry-run', '[update] Show what would be updated without making changes.')
-            .option('-y, --yes', '[update] Skip interactive prompts (currently used only for .claude protocol).')
+            .option('-y, --yes', '[update] Skip interactive prompts (template confirm, .claude protocol).')
             .option('--ours', '[update] Resolve all conflicts by keeping the instance side (mutually exclusive with --theirs).')
             .option('--theirs', '[update] Resolve all conflicts by taking the template side (mutually exclusive with --ours).')
             .option('--no-version-check', '[update | diff] Skip the npm registry version check at startup.')
             .option('--coding-context-repo <url>', '[update] Fully override the .claude context repo URL.')
             .option('--coding-context-protocol <proto>', '[update] One of: https | ssh | skip.')
-            .option('--no-coding-context', '[update] Skip the .claude context sync stage.')
-            .option('--no-template', '[update] Skip the template merge + auto-install stages.')
+            .option('--template', '[update] Run only the template merge + deps install stage.')
+            .option('--coding-context', '[update] Run only the .claude context sync stage.')
             .action((subcommand, arg, command) => __awaiter(this, void 0, void 0, function* () {
             const inputs = [];
             inputs.push({ name: 'subcommand', value: subcommand || '' });
             inputs.push({ name: 'subcommand-arg', value: arg || '' });
+            // Opt-in stage selector: when neither --template nor --coding-context
+            // is passed, run both stages (default). When at least one is passed,
+            // run only the stage(s) explicitly requested.
+            const tplFlag = !!command.template;
+            const ctxFlag = !!command.codingContext;
+            const anySelector = tplFlag || ctxFlag;
+            const templateEnabled = anySelector ? tplFlag : true;
+            const codingContextEnabled = anySelector ? ctxFlag : true;
             const options = [];
             options.push({ name: 'no-content', value: !command.content });
             options.push({ name: 'dry-run', value: !!command.dryRun });
@@ -51,8 +60,8 @@ class UpdateCommand extends abstract_command_1.AbstractCommand {
             options.push({ name: 'version-check', value: command.versionCheck !== false });
             options.push({ name: 'coding-context-repo', value: command.codingContextRepo || '' });
             options.push({ name: 'coding-context-protocol', value: command.codingContextProtocol || '' });
-            options.push({ name: 'coding-context', value: command.codingContext !== false });
-            options.push({ name: 'template', value: command.template !== false });
+            options.push({ name: 'coding-context', value: codingContextEnabled });
+            options.push({ name: 'template', value: templateEnabled });
             yield this.action.handle(inputs, options);
         }));
     }

package/lib/template-merge/materialize.d.ts

@@ -4,6 +4,10 @@ export interface MaterializedBase {
     /** Idempotent cleanup of any temp dirs created. */
     cleanup: () => void;
 }
+export interface MaterializedLatest extends MaterializedBase {
+    /** Resolved version string (whatever the registry / env override returned). */
+    version: string;
+}
 /**
  * Materialize a base reference for 3-way merge.
  *
@@ -16,3 +20,26 @@ export interface MaterializedBase {
  * Returned `cleanup()` removes any tmp dir we created.
  */
 export declare function materializeBase(schematicsVersion: string, templateName: string): MaterializedBase;
+/**
+ * Resolve the latest published version of `@gadmin2n/schematics`.
+ *
+ * Sources, in priority order:
+ *   1. `GADMIN2_LATEST_VERSION` env var — used by tests and `--use-version=X`
+ *      style overrides.
+ *   2. `npm view @gadmin2n/schematics version --json` — production. Hard
+ *      timeout via npm's own behaviour; we do not catch ENOENT here because a
+ *      missing `npm` is a fatal config error.
+ *
+ * Throws on any failure (fail-hard per design decision: theirs must always be
+ * truly latest, callers should not silently fall back to a stale local copy).
+ */
+export declare function resolveLatestVersion(): string;
+/**
+ * Materialize the LATEST published template as the `theirs` side of a
+ * 3-way merge. Equivalent to `materializeBase(resolveLatestVersion(), ...)`
+ * with the resolved version returned alongside the handle.
+ *
+ * Per design (fail-hard on network failure): if either step throws, the
+ * caller is expected to surface the error and abort the update.
+ */
+export declare function materializeLatest(templateName: string): MaterializedLatest;

package/lib/template-merge/materialize.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.materializeBase = void 0;
+exports.materializeLatest = exports.resolveLatestVersion = exports.materializeBase = void 0;
 // cli/lib/template-merge/materialize.ts
 const fs = require("fs");
 const os = require("os");
@@ -127,3 +127,60 @@ function copyTreeRecursive(src, dst) {
         // symlinks / sockets: skip
     }
 }
+/**
+ * Resolve the latest published version of `@gadmin2n/schematics`.
+ *
+ * Sources, in priority order:
+ *   1. `GADMIN2_LATEST_VERSION` env var — used by tests and `--use-version=X`
+ *      style overrides.
+ *   2. `npm view @gadmin2n/schematics version --json` — production. Hard
+ *      timeout via npm's own behaviour; we do not catch ENOENT here because a
+ *      missing `npm` is a fatal config error.
+ *
+ * Throws on any failure (fail-hard per design decision: theirs must always be
+ * truly latest, callers should not silently fall back to a stale local copy).
+ */
+function resolveLatestVersion() {
+    var _a, _b, _c, _d;
+    const envOverride = process.env.GADMIN2_LATEST_VERSION;
+    if (envOverride)
+        return envOverride.trim();
+    try {
+        const out = (0, child_process_1.execFileSync)('npm', ['view', SCHEMATICS_PKG, 'version', '--json'], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
+        const trimmed = out.trim();
+        // `--json` wraps the value in quotes for plain strings.
+        const parsed = trimmed.startsWith('"') ? JSON.parse(trimmed) : trimmed;
+        if (typeof parsed !== 'string' || parsed.length === 0) {
+            throw new Error(`unexpected npm view output: ${out}`);
+        }
+        return parsed;
+    }
+    catch (err) {
+        if (err && err.code === 'ENOENT') {
+            throw new Error('npm not in PATH — required to resolve the latest @gadmin2n/schematics version. ' +
+                'Install Node.js / npm and retry.');
+        }
+        const stderr = (_c = (_b = (_a = err === null || err === void 0 ? void 0 : err.stderr) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : '';
+        const message = (_d = err === null || err === void 0 ? void 0 : err.message) !== null && _d !== void 0 ? _d : String(err);
+        throw new Error(`Failed to resolve latest @gadmin2n/schematics version from npm registry.\n` +
+            `   ${message.split('\n').join('\n   ')}` +
+            (stderr ? `\n   ${stderr.trim().split('\n').join('\n   ')}` : '') +
+            `\n   Check your network / npm registry config and retry, ` +
+            `or set GADMIN2_LATEST_VERSION=<version> to pin a specific version.`);
+    }
+}
+exports.resolveLatestVersion = resolveLatestVersion;
+/**
+ * Materialize the LATEST published template as the `theirs` side of a
+ * 3-way merge. Equivalent to `materializeBase(resolveLatestVersion(), ...)`
+ * with the resolved version returned alongside the handle.
+ *
+ * Per design (fail-hard on network failure): if either step throws, the
+ * caller is expected to surface the error and abort the update.
+ */
+function materializeLatest(templateName) {
+    const version = resolveLatestVersion();
+    const handle = materializeBase(version, templateName);
+    return Object.assign(Object.assign({}, handle), { version });
+}
+exports.materializeLatest = materializeLatest;

package/package.json

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