@gadmin2n/cli 0.0.106 → 0.0.108

package/commands/command.loader.js

@@ -5,7 +5,6 @@ const chalk = require("chalk");
 const actions_1 = require("../actions");
 const ui_1 = require("../lib/ui");
 const add_command_1 = require("./add.command");
-const build_command_1 = require("./build.command");
 const generate_command_1 = require("./generate.command");
 const info_command_1 = require("./info.command");
 const new_command_1 = require("./new.command");
@@ -15,7 +14,6 @@ const update_command_1 = require("./update.command");
 class CommandLoader {
     static load(program) {
         new new_command_1.NewCommand(new actions_1.NewAction()).load(program);
-        new build_command_1.BuildCommand(new actions_1.BuildAction()).load(program);
         new start_command_1.StartCommand(new actions_1.StartAction()).load(program);
         new info_command_1.InfoCommand(new actions_1.InfoAction()).load(program);
         new update_command_1.UpdateCommand(new actions_1.UpdateAction()).load(program);

package/commands/update.command.js

@@ -14,55 +14,45 @@ const abstract_command_1 = require("./abstract.command");
 class UpdateCommand extends abstract_command_1.AbstractCommand {
     load(program) {
         program
-            .command('update [subcommand]')
+            .command('update [subcommand] [arg]')
             .alias('u')
-            .description('Update project from template, sync .claude context, and install changed deps.\n\n' +
+            .description('Update project from template via git-merge-style 3-way merge,\n' +
+            'sync .claude context, and install changed deps.\n\n' +
             '  Subcommands:\n' +
-            '    (none)    Pull updates from template into instance, sync .claude → .claude-internal/.agent,\n' +
-            '              and run install in web/ or server/ if their package.json changed.\n' +
-            '    diff      Show differences between instance and template (read-only).\n\n' +
-            '  Stage toggles (combine to run only what you want):\n' +
-            '    --no-template          Skip stage 1 (template merge) and stage 3 (auto-install).\n' +
-            '    --no-coding-context    Skip stage 2 (.claude context sync).\n\n' +
-            '  Update strategies (per-file interactive prompt):\n' +
-            '    skip        Keep instance file as-is\n' +
-            '    overwrite   Replace with template version\n' +
-            '    merge       Attempt auto merge via git merge-file\n' +
-            '    conflict    Write conflict markers for manual resolve\n')
+            '    (none)         Run the full pipeline: 3-way template merge → .claude sync → deps install.\n' +
+            '    diff [file]    Show 3-way differences (read-only). Optional file path filters output.\n' +
+            '    status         Report unresolved conflicts. Exit code: 0 clean / 1 conflicts / 2 meta error.\n\n' +
+            '  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')
             .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 per-file prompt, use conflict markers for all.')
-            .option('--no-smart-merge', '[update] Disable smart structural mergers; use line-level prompt for every file.')
+            .option('-y, --yes', '[update] Skip interactive prompts (currently used only for .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 (highest priority).')
-            .option('--coding-context-protocol <proto>', '[update] Force protocol for the built-in context repo. One of: https | ssh | skip.')
-            .option('--no-coding-context', '[update] Skip the .claude context sync stage entirely.')
-            .option('--no-template', '[update] Skip the template merge stage and the auto-install stage; only run .claude context sync.')
-            .action((subcommand, command) => __awaiter(this, void 0, void 0, function* () {
+            .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.')
+            .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 || '' });
             const options = [];
             options.push({ name: 'no-content', value: !command.content });
             options.push({ name: 'dry-run', value: !!command.dryRun });
             options.push({ name: 'yes', value: !!command.yes });
-            options.push({ name: 'smart-merge', value: command.smartMerge !== false });
+            options.push({ name: 'ours', value: !!command.ours });
+            options.push({ name: 'theirs', value: !!command.theirs });
             options.push({ name: 'version-check', value: command.versionCheck !== false });
-            options.push({
-                name: 'coding-context-repo',
-                value: command.claudeContextRepo || '',
-            });
-            options.push({
-                name: 'coding-context-protocol',
-                value: command.claudeContextProtocol || '',
-            });
-            options.push({
-                name: 'coding-context',
-                value: command.claudeContext !== false,
-            });
-            options.push({
-                name: 'template',
-                value: command.template !== 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 });
             yield this.action.handle(inputs, options);
         }));
     }

package/lib/template-merge/base-store.d.ts

@@ -0,0 +1,16 @@
+import { BaseMeta, CURRENT_META_SCHEMA_VERSION } from './types';
+export { CURRENT_META_SCHEMA_VERSION };
+export declare const GADMIN_DIRNAME = ".gadmin";
+export declare const META_FILENAME = ".meta.json";
+export declare const LOCK_FILENAME = ".lock";
+export declare const README_FILENAME = "README.md";
+export declare const WARNING_MESSAGE = "managed by gadmin2 \u2014 do not edit";
+export declare function gadminDir(instanceDir: string): string;
+export declare function metaPath(instanceDir: string): string;
+export declare function lockPath(instanceDir: string): string;
+export declare function readmePath(instanceDir: string): string;
+export declare function readMeta(instanceDir: string): BaseMeta;
+export declare function writeMeta(instanceDir: string, meta: BaseMeta): void;
+export declare function validateMetaConsistency(instanceDir: string): BaseMeta;
+export declare function acquireLock(instanceDir: string): () => void;
+export declare function writeReadme(instanceDir: string): void;

package/lib/template-merge/base-store.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeReadme = exports.acquireLock = exports.validateMetaConsistency = exports.writeMeta = exports.readMeta = exports.readmePath = exports.lockPath = exports.metaPath = exports.gadminDir = exports.WARNING_MESSAGE = exports.README_FILENAME = exports.LOCK_FILENAME = exports.META_FILENAME = exports.GADMIN_DIRNAME = exports.CURRENT_META_SCHEMA_VERSION = void 0;
+// cli/lib/template-merge/base-store.ts
+const fs = require("fs");
+const path = require("path");
+const types_1 = require("./types");
+Object.defineProperty(exports, "CURRENT_META_SCHEMA_VERSION", { enumerable: true, get: function () { return types_1.CURRENT_META_SCHEMA_VERSION; } });
+exports.GADMIN_DIRNAME = '.gadmin';
+exports.META_FILENAME = '.meta.json';
+exports.LOCK_FILENAME = '.lock';
+exports.README_FILENAME = 'README.md';
+exports.WARNING_MESSAGE = 'managed by gadmin2 — do not edit';
+function gadminDir(instanceDir) {
+    return path.join(instanceDir, exports.GADMIN_DIRNAME);
+}
+exports.gadminDir = gadminDir;
+function metaPath(instanceDir) {
+    return path.join(gadminDir(instanceDir), exports.META_FILENAME);
+}
+exports.metaPath = metaPath;
+function lockPath(instanceDir) {
+    return path.join(gadminDir(instanceDir), exports.LOCK_FILENAME);
+}
+exports.lockPath = lockPath;
+function readmePath(instanceDir) {
+    return path.join(gadminDir(instanceDir), exports.README_FILENAME);
+}
+exports.readmePath = readmePath;
+const REQUIRED_META_FIELDS = ['schematicsVersion', 'schemaVersion'];
+function readMeta(instanceDir) {
+    const p = metaPath(instanceDir);
+    if (!fs.existsSync(p)) {
+        throw new Error(`base meta missing at ${p} — run \`gadmin2 update\` to bootstrap`);
+    }
+    const raw = fs.readFileSync(p, 'utf-8');
+    let json;
+    try {
+        json = JSON.parse(raw);
+    }
+    catch (err) {
+        throw new Error(`base meta corrupt at ${p}: ${err.message}`);
+    }
+    for (const k of REQUIRED_META_FIELDS) {
+        if (!(k in json))
+            throw new Error(`base meta missing field: ${k}`);
+    }
+    return {
+        schematicsVersion: json.schematicsVersion,
+        schemaVersion: json.schemaVersion,
+    };
+}
+exports.readMeta = readMeta;
+function writeMeta(instanceDir, meta) {
+    fs.mkdirSync(gadminDir(instanceDir), { recursive: true });
+    // V8 preserves insertion order; @warning must be first so it renders at the top of meta.json.
+    const ordered = {
+        '@warning': exports.WARNING_MESSAGE,
+        schematicsVersion: meta.schematicsVersion,
+        schemaVersion: meta.schemaVersion,
+    };
+    fs.writeFileSync(metaPath(instanceDir), JSON.stringify(ordered, null, 2) + '\n', 'utf-8');
+}
+exports.writeMeta = writeMeta;
+function validateMetaConsistency(instanceDir) {
+    const meta = readMeta(instanceDir);
+    if (meta.schemaVersion > types_1.CURRENT_META_SCHEMA_VERSION) {
+        throw new Error(`base was written by a newer gadmin2 (schema v${meta.schemaVersion}, ` +
+            `this CLI supports v${types_1.CURRENT_META_SCHEMA_VERSION}). Upgrade gadmin2.`);
+    }
+    return meta;
+}
+exports.validateMetaConsistency = validateMetaConsistency;
+function acquireLock(instanceDir) {
+    fs.mkdirSync(gadminDir(instanceDir), { recursive: true });
+    const p = lockPath(instanceDir);
+    let fd;
+    try {
+        fd = fs.openSync(p, 'wx'); // O_EXCL — fails if file exists
+    }
+    catch (err) {
+        if (err.code === 'EEXIST') {
+            throw new Error(`another update is running (or crashed). If sure no update is running, remove ${p} and retry.`);
+        }
+        throw err;
+    }
+    try {
+        fs.writeSync(fd, String(process.pid));
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+    let released = false;
+    const release = () => {
+        if (released)
+            return;
+        released = true;
+        try {
+            fs.unlinkSync(p);
+        }
+        catch ( /* already gone */_a) { /* already gone */ }
+    };
+    process.on('exit', release);
+    return release;
+}
+exports.acquireLock = acquireLock;
+const README_TEXT = [
+    '# .gadmin/ — managed by `gadmin2 update`',
+    '',
+    'This directory holds metadata only. The template baseline is **not** stored',
+    'here as files; it is referenced by version in `.meta.json` and materialized',
+    'on demand from the npm registry into a temp dir during `gadmin2 update`.',
+    '',
+    'Do **not** edit `.meta.json` by hand — it is the authoritative pointer to',
+    'the schematics version your 3-way merge is anchored to.',
+    '',
+    'To re-anchor the baseline, delete `.gadmin/.meta.json` and re-run',
+    '`gadmin2 update`; it will pin to the currently installed schematics version.',
+    '',
+].join('\n');
+function writeReadme(instanceDir) {
+    fs.mkdirSync(gadminDir(instanceDir), { recursive: true });
+    const p = readmePath(instanceDir);
+    if (!fs.existsSync(p))
+        fs.writeFileSync(p, README_TEXT, 'utf-8');
+}
+exports.writeReadme = writeReadme;

package/lib/template-merge/binary-detect.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" />
+/** 字节缓冲：包含 \0 视为二进制。仅检查前 8KB。 */
+export declare function isBinaryBuffer(buf: Buffer): boolean;
+/** 读文件前 8KB，应用 isBinaryBuffer。不存在的路径返回 false。 */
+export declare function isFileBinary(filePath: string): boolean;
+/** 任一路径为二进制即返回 true。 */
+export declare function isAnyBinary(...filePaths: string[]): boolean;

package/lib/template-merge/binary-detect.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAnyBinary = exports.isFileBinary = exports.isBinaryBuffer = void 0;
+// cli/lib/template-merge/binary-detect.ts
+const fs = require("fs");
+const PROBE_BYTES = 8192;
+/** 字节缓冲：包含 \0 视为二进制。仅检查前 8KB。 */
+function isBinaryBuffer(buf) {
+    const slice = buf.subarray(0, PROBE_BYTES);
+    for (let i = 0; i < slice.length; i++) {
+        if (slice[i] === 0)
+            return true;
+    }
+    return false;
+}
+exports.isBinaryBuffer = isBinaryBuffer;
+/** 读文件前 8KB，应用 isBinaryBuffer。不存在的路径返回 false。 */
+function isFileBinary(filePath) {
+    if (!fs.existsSync(filePath))
+        return false;
+    const fd = fs.openSync(filePath, 'r');
+    try {
+        const buf = Buffer.alloc(PROBE_BYTES);
+        const n = fs.readSync(fd, buf, 0, PROBE_BYTES, 0);
+        return isBinaryBuffer(buf.subarray(0, n));
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+}
+exports.isFileBinary = isFileBinary;
+/** 任一路径为二进制即返回 true。 */
+function isAnyBinary(...filePaths) {
+    return filePaths.some(isFileBinary);
+}
+exports.isAnyBinary = isAnyBinary;

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

@@ -0,0 +1,10 @@
+import { ClassifyResult, ClassifiedPlan } from './types';
+export interface ClassifyInput {
+    baseExists: boolean;
+    oursExists: boolean;
+    theirsExists: boolean;
+    oursEqBase?: () => boolean;
+    oursEqTheirs?: () => boolean;
+}
+export declare function classifyFile(input: ClassifyInput): ClassifyResult;
+export declare function classifyAll(baseDir: string, oursDir: string, theirsDir: string, userExcludes: string[]): ClassifiedPlan;

package/lib/template-merge/classify.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.classifyAll = exports.classifyFile = void 0;
+// cli/lib/template-merge/classify.ts
+const fs = require("fs");
+const path = require("path");
+const excludes_1 = require("./excludes");
+function classifyFile(input) {
+    var _a, _b, _c;
+    const { baseExists, oursExists, theirsExists } = input;
+    if (!baseExists && !oursExists && !theirsExists) {
+        throw new Error('classifyFile: impossible state — file in none of the three sides');
+    }
+    if (!baseExists && !oursExists && theirsExists)
+        return 'add';
+    if (!baseExists && oursExists && !theirsExists)
+        return 'keep';
+    if (!baseExists && oursExists && theirsExists) {
+        return ((_a = input.oursEqTheirs) === null || _a === void 0 ? void 0 : _a.call(input)) ? 'keep' : 'addAddConflict';
+    }
+    if (baseExists && !oursExists && !theirsExists)
+        return 'noop';
+    if (baseExists && !oursExists && theirsExists)
+        return 'deleteModifyConflict';
+    if (baseExists && oursExists && !theirsExists) {
+        return ((_b = input.oursEqBase) === null || _b === void 0 ? void 0 : _b.call(input)) ? 'delete' : 'modifyDeleteConflict';
+    }
+    // ✓✓✓ — all three sides exist. If ours already equals theirs, no merge needed.
+    return ((_c = input.oursEqTheirs) === null || _c === void 0 ? void 0 : _c.call(input)) ? 'keep' : 'update';
+}
+exports.classifyFile = classifyFile;
+function fileBytesEqual(p, q) {
+    return fs.readFileSync(p).equals(fs.readFileSync(q));
+}
+function classifyAll(baseDir, oursDir, theirsDir, userExcludes) {
+    const excludes = [...excludes_1.HARDCODED_EXCLUDES, ...userExcludes];
+    const baseFiles = new Set((0, excludes_1.collectFiles)(baseDir, excludes));
+    const oursFiles = new Set((0, excludes_1.collectFiles)(oursDir, excludes));
+    const theirsFiles = new Set((0, excludes_1.collectFiles)(theirsDir, excludes));
+    const all = new Set([...baseFiles, ...oursFiles, ...theirsFiles]);
+    const plan = {
+        add: [], keep: [], noop: [],
+        delete: [], update: [],
+        addAddConflict: [], modifyDeleteConflict: [], deleteModifyConflict: [],
+    };
+    for (const rel of [...all].sort()) {
+        const baseExists = baseFiles.has(rel);
+        const oursExists = oursFiles.has(rel);
+        const theirsExists = theirsFiles.has(rel);
+        const result = classifyFile({
+            baseExists,
+            oursExists,
+            theirsExists,
+            oursEqBase: () => baseExists && oursExists && fileBytesEqual(path.join(baseDir, rel), path.join(oursDir, rel)),
+            oursEqTheirs: () => oursExists && theirsExists && fileBytesEqual(path.join(oursDir, rel), path.join(theirsDir, rel)),
+        });
+        plan[result].push(rel);
+    }
+    return plan;
+}
+exports.classifyAll = classifyAll;

package/lib/template-merge/config-validate.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 抛错如果 gadmin-cli.json 含有已下线字段。
+ * `<deprecated-since-version>` 占位符在 P6 实施时由 update.command.ts 注入实际 CLI 版本。
+ */
+export declare function assertNoDeprecatedFields(gadminCliJson: any, cliVersion?: string): void;

package/lib/template-merge/config-validate.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertNoDeprecatedFields = void 0;
+const DEPRECATED_VERSION_PLACEHOLDER = '<deprecated-since-version>';
+/**
+ * 抛错如果 gadmin-cli.json 含有已下线字段。
+ * `<deprecated-since-version>` 占位符在 P6 实施时由 update.command.ts 注入实际 CLI 版本。
+ */
+function assertNoDeprecatedFields(gadminCliJson, cliVersion = DEPRECATED_VERSION_PLACEHOLDER) {
+    const tu = gadminCliJson === null || gadminCliJson === void 0 ? void 0 : gadminCliJson.templateUpdate;
+    if (!tu || typeof tu !== 'object')
+        return;
+    const found = [];
+    if ('policies' in tu)
+        found.push('templateUpdate.policies');
+    if ('mergers' in tu)
+        found.push('templateUpdate.mergers');
+    if (found.length === 0)
+        return;
+    const lines = [
+        'gadmin-cli.json contains deprecated fields that have been removed:',
+        '',
+        ...found.map((f) => `     ${f}`),
+        '',
+        `   These were used by the old Smart Merger system, which has been replaced`,
+        `   by git-merge-style 3-way merge as of CLI ${cliVersion}.`,
+        `   Remove the fields and re-run.`,
+        '',
+        `   See: usage/UPDATE.md`,
+    ];
+    throw new Error(lines.join('\n'));
+}
+exports.assertNoDeprecatedFields = assertNoDeprecatedFields;

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

@@ -0,0 +1,7 @@
+/** 用户无法关闭的硬排除——这些目录三方扫描时永远跳过。 */
+export declare const HARDCODED_EXCLUDES: string[];
+/** 默认排除——可通过 gadmin-cli.json templateExcludes 追加。 */
+export declare const DEFAULT_EXCLUDES: string[];
+export declare function shouldExclude(filePath: string, excludes: string[]): boolean;
+/** 递归列出 dir 下所有文件相对路径（已排序），应用 excludes。 */
+export declare function collectFiles(dir: string, excludes: string[], base?: string): string[];

package/lib/template-merge/excludes.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectFiles = exports.shouldExclude = exports.DEFAULT_EXCLUDES = exports.HARDCODED_EXCLUDES = void 0;
+// cli/lib/template-merge/excludes.ts
+const fs = require("fs");
+const path = require("path");
+/** 用户无法关闭的硬排除——这些目录三方扫描时永远跳过。 */
+exports.HARDCODED_EXCLUDES = [
+    '.gadmin',
+    '.git',
+    'node_modules',
+    'dist',
+    'generated',
+];
+/** 默认排除——可通过 gadmin-cli.json templateExcludes 追加。 */
+exports.DEFAULT_EXCLUDES = [
+    '.DS_Store',
+    '.env.local',
+    'readme.md',
+    // 包管理器锁文件由 install 阶段重建，不参与 update
+    'yarn.lock',
+    'package-lock.json',
+    'pnpm-lock.yaml',
+    '.yarn',
+    '.pnp.cjs',
+    '.pnp.loader.mjs',
+];
+function globToRegex(pattern) {
+    let s = '^';
+    let i = 0;
+    while (i < pattern.length) {
+        const c = pattern[i];
+        if (c === '*') {
+            if (pattern[i + 1] === '*') {
+                if (pattern[i + 2] === '/') {
+                    s += '(?:.+/)?';
+                    i += 3;
+                }
+                else {
+                    s += '.*';
+                    i += 2;
+                }
+            }
+            else {
+                s += '[^/]*';
+                i++;
+            }
+        }
+        else if (c === '?') {
+            s += '[^/]';
+            i++;
+        }
+        else if ('.()[]{}+^$|\\'.includes(c)) {
+            s += '\\' + c;
+            i++;
+        }
+        else {
+            s += c;
+            i++;
+        }
+    }
+    return new RegExp(s + '$');
+}
+function matchesPattern(filePath, pattern) {
+    if (filePath === pattern)
+        return true;
+    if (filePath.startsWith(pattern + '/'))
+        return true;
+    const parts = filePath.split('/');
+    if (!pattern.includes('/') && !pattern.includes('*') && !pattern.includes('?')) {
+        if (parts.includes(pattern))
+            return true;
+    }
+    if (pattern.includes('*') || pattern.includes('?')) {
+        const regex = globToRegex(pattern);
+        if (regex.test(filePath))
+            return true;
+        // Patterns without '/' also match individual path segments (gitignore-style).
+        if (!pattern.includes('/')) {
+            for (const part of parts) {
+                if (regex.test(part))
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+function shouldExclude(filePath, excludes) {
+    return excludes.some((p) => matchesPattern(filePath, p));
+}
+exports.shouldExclude = shouldExclude;
+/** 递归列出 dir 下所有文件相对路径（已排序），应用 excludes。 */
+function collectFiles(dir, excludes, base = '') {
+    if (!fs.existsSync(path.join(dir, base)))
+        return [];
+    const out = [];
+    const entries = fs.readdirSync(path.join(dir, base), { withFileTypes: true });
+    for (const e of entries) {
+        const rel = base ? `${base}/${e.name}` : e.name;
+        if (shouldExclude(rel, excludes))
+            continue;
+        if (e.isDirectory())
+            out.push(...collectFiles(dir, excludes, rel));
+        else if (e.isFile())
+            out.push(rel);
+    }
+    return out.sort();
+}
+exports.collectFiles = collectFiles;

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

@@ -1,8 +1,9 @@
-export * from './merger';
-export * from './registry';
-export * from './config-loader';
-export * from './glob';
-export * from './json-merger';
-export * from './env-merger';
-export * from './prisma-merger';
-export * from './ts-module-merger';
+export * from './types';
+export * from './binary-detect';
+export * from './excludes';
+export * from './residual-scan';
+export * from './classify';
+export * from './merge3way';
+export * from './base-store';
+export * from './config-validate';
+export * from './materialize';

package/lib/template-merge/index.js

@@ -14,11 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./merger"), exports);
-__exportStar(require("./registry"), exports);
-__exportStar(require("./config-loader"), exports);
-__exportStar(require("./glob"), exports);
-__exportStar(require("./json-merger"), exports);
-__exportStar(require("./env-merger"), exports);
-__exportStar(require("./prisma-merger"), exports);
-__exportStar(require("./ts-module-merger"), exports);
+// cli/lib/template-merge/index.ts
+__exportStar(require("./types"), exports);
+__exportStar(require("./binary-detect"), exports);
+__exportStar(require("./excludes"), exports);
+__exportStar(require("./residual-scan"), exports);
+__exportStar(require("./classify"), exports);
+__exportStar(require("./merge3way"), exports);
+__exportStar(require("./base-store"), exports);
+__exportStar(require("./config-validate"), exports);
+__exportStar(require("./materialize"), exports);

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

@@ -0,0 +1,18 @@
+export interface MaterializedBase {
+    /** Absolute path to the directory containing the template's files. */
+    dir: string;
+    /** Idempotent cleanup of any temp dirs created. */
+    cleanup: () => void;
+}
+/**
+ * Materialize a base reference for 3-way merge.
+ *
+ * Sources, in priority order:
+ *   1. `GADMIN2_LOCAL_REGISTRY_DIR/<version>/<templateName>/` — used by tests
+ *      and local development. Files are copied into a fresh tmp dir.
+ *   2. `npm pack @gadmin2n/schematics@<version>` — production. Tarball is
+ *      extracted into a fresh tmp dir; the inner template subdir is returned.
+ *
+ * Returned `cleanup()` removes any tmp dir we created.
+ */
+export declare function materializeBase(schematicsVersion: string, templateName: string): MaterializedBase;