@gadmin2n/cli 0.0.96 → 0.0.99

package/actions/update.action.js

@@ -41,7 +41,8 @@ const DEFAULT_EXCLUDES = [
     '.pnp.cjs',
     '.pnp.loader.mjs',
 ];
-const CLAUDE_CONTEXT_REPO = 'https://git.tencent.com/OIT-OMC/erp-ai-coding-context.git';
+const CLAUDE_CONTEXT_REPO_HTTPS = 'https://git.tencent.com/OIT-OMC/erp-ai-coding-context.git';
+const CLAUDE_CONTEXT_REPO_SSH = 'git@git.tencent.com:OIT-OMC/erp-ai-coding-context.git';
 const CLAUDE_CONTEXT_BRANCH = 'master';
 const CLAUDE_SOURCE_SUBDIR = '.claude';
 const CLAUDE_TARGET_DIRS = ['.claude-internal', '.agent'];
@@ -310,11 +311,11 @@ function tryAutoMerge(instanceContent, templateContent) {
  * the absolute path to the `.claude` subfolder. Returns null on failure
  * (e.g. no network, repo private, credentials missing, etc.).
  */
-function fetchClaudeContextRepo() {
+function fetchClaudeContextRepo(repoUrl, branch) {
     var _a, _b;
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gadmin-claude-ctx-'));
     try {
-        (0, child_process_1.execSync)(`git clone --depth 1 --branch ${CLAUDE_CONTEXT_BRANCH} ${CLAUDE_CONTEXT_REPO} "${tmpDir}"`, { stdio: 'pipe' });
+        (0, child_process_1.execSync)(`git clone --depth 1 --branch ${branch} ${repoUrl} "${tmpDir}"`, { stdio: 'pipe' });
         const claudeSrc = path.join(tmpDir, CLAUDE_SOURCE_SUBDIR);
         if (!fs.existsSync(claudeSrc)) {
             // Repo cloned, but the .claude dir is missing — treat as no-op
@@ -338,7 +339,7 @@ function fetchClaudeContextRepo() {
     catch (err) {
         fs.rmSync(tmpDir, { recursive: true, force: true });
         const msg = ((_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)) || (err === null || err === void 0 ? void 0 : err.message) || String(err);
-        console.warn(chalk.yellow(`⚠️  Skipping .claude context sync: failed to clone ${CLAUDE_CONTEXT_REPO}\n   ${msg
+        console.warn(chalk.yellow(`⚠️  Skipping .claude context sync: failed to clone ${repoUrl}\n   ${msg
             .trim()
             .split('\n')
             .join('\n   ')}`));
@@ -383,18 +384,82 @@ function copyTreeOverwrite(srcDir, destDir) {
     walk('');
     return { added, updated };
 }
-function syncClaudeContext(instanceDir, dryRun) {
+/**
+ * Resolve which git URL + branch to use for the .claude context sync.
+ *
+ * Priority (highest first):
+ *   1. CLI --claude-context-repo (full URL override)
+ *   2. CLI --claude-context-protocol (https | ssh | skip)
+ *   3. Env var GADMIN2_CLAUDE_CONTEXT_REPO  (full URL)
+ *   4. Env var GADMIN2_CLAUDE_CONTEXT_PROTOCOL (https | ssh | skip)
+ *   5. --yes (auto mode): default to built-in HTTPS, no prompt
+ *   6. Interactive prompt: pick https / ssh / skip
+ *
+ * Returns null when the user / CI explicitly chose to skip the stage.
+ */
+function resolveClaudeContextSource(cliRepo, cliProtocol, autoYes) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const branch = process.env.GADMIN2_CLAUDE_CONTEXT_BRANCH || CLAUDE_CONTEXT_BRANCH;
+        // 1. CLI full-URL override
+        if (cliRepo) {
+            return { repo: cliRepo, branch };
+        }
+        // 2. CLI protocol override
+        const cliProto = (cliProtocol || '').toLowerCase();
+        if (cliProto === 'skip')
+            return null;
+        if (cliProto === 'ssh')
+            return { repo: CLAUDE_CONTEXT_REPO_SSH, branch };
+        if (cliProto === 'https')
+            return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+        // 3. Env var full-URL
+        const envRepo = process.env.GADMIN2_CLAUDE_CONTEXT_REPO;
+        if (envRepo)
+            return { repo: envRepo, branch };
+        // 4. Env var protocol
+        const envProto = (process.env.GADMIN2_CLAUDE_CONTEXT_PROTOCOL || '').toLowerCase();
+        if (envProto === 'skip')
+            return null;
+        if (envProto === 'ssh')
+            return { repo: CLAUDE_CONTEXT_REPO_SSH, branch };
+        if (envProto === 'https')
+            return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+        // 5. CI / auto-yes mode → silent default
+        if (autoYes)
+            return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+        // 6. Interactive prompt
+        const { proto } = yield inquirer.prompt([
+            {
+                type: 'list',
+                name: 'proto',
+                message: 'Choose git access method for .claude context sync:',
+                choices: [
+                    { name: `HTTPS  (${CLAUDE_CONTEXT_REPO_HTTPS})`, value: 'https' },
+                    { name: `SSH    (${CLAUDE_CONTEXT_REPO_SSH})`, value: 'ssh' },
+                    { name: 'Skip this stage', value: 'skip' },
+                ],
+                default: 'https',
+            },
+        ]);
+        if (proto === 'skip')
+            return null;
+        if (proto === 'ssh')
+            return { repo: CLAUDE_CONTEXT_REPO_SSH, branch };
+        return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+    });
+}
+function syncClaudeContext(instanceDir, dryRun, source) {
     return __awaiter(this, void 0, void 0, function* () {
         console.info(chalk.bold('\n═══════════════════════════════════════════════════'));
         console.info(chalk.bold('  Sync .claude context'));
         console.info(chalk.bold('═══════════════════════════════════════════════════'));
-        console.info(`${chalk.gray('Source: ')} ${CLAUDE_CONTEXT_REPO} (${CLAUDE_CONTEXT_BRANCH}) :: ${CLAUDE_SOURCE_SUBDIR}/`);
+        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'));
             return;
         }
-        const claudeSrc = fetchClaudeContextRepo();
+        const claudeSrc = fetchClaudeContextRepo(source.repo, source.branch);
         if (!claudeSrc) {
             return;
         }
@@ -682,7 +747,7 @@ class UpdateAction extends abstract_action_1.AbstractAction {
         });
     }
     handleUpdate(options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const dryRun = (_a = options.find((o) => o.name === 'dry-run')) === null || _a === void 0 ? void 0 : _a.value;
             const autoYes = (_b = options.find((o) => o.name === 'yes')) === null || _b === void 0 ? void 0 : _b.value;
@@ -970,7 +1035,23 @@ class UpdateAction extends abstract_action_1.AbstractAction {
                 }
             }
             // 2. Sync .claude context (regardless of whether template had changes)
-            yield syncClaudeContext(instanceDir, dryRun);
+            const claudeEnabled = ((_e = options.find((o) => o.name === 'claude-context')) === null || _e === void 0 ? void 0 : _e.value) !==
+                false;
+            if (claudeEnabled) {
+                const cliRepo = ((_f = options.find((o) => o.name === 'claude-context-repo')) === null || _f === void 0 ? void 0 : _f.value) ||
+                    '';
+                const cliProtocol = ((_g = options.find((o) => o.name === 'claude-context-protocol')) === null || _g === void 0 ? void 0 : _g.value) || '';
+                const claudeSource = yield resolveClaudeContextSource(cliRepo, cliProtocol, autoYes);
+                if (claudeSource) {
+                    yield syncClaudeContext(instanceDir, dryRun, claudeSource);
+                }
+                else {
+                    console.info(chalk.gray('\nSkipping .claude context sync (per user choice / --no-claude-context).\n'));
+                }
+            }
+            else {
+                console.info(chalk.gray('\nSkipping .claude context sync (--no-claude-context).\n'));
+            }
             // 3. If web/server package.json changed during template update, install deps
             yield maybeInstallChangedDeps(pkgSnapshots, dryRun);
         });

package/commands/update.command.js

@@ -31,6 +31,9 @@ class UpdateCommand extends abstract_command_1.AbstractCommand {
             .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('--no-version-check', '[update | diff] Skip the npm registry version check at startup.')
+            .option('--claude-context-repo <url>', '[update] Fully override the .claude context repo URL (highest priority).')
+            .option('--claude-context-protocol <proto>', '[update] Force protocol for the built-in context repo. One of: https | ssh | skip.')
+            .option('--no-claude-context', '[update] Skip the .claude context sync stage entirely.')
             .action((subcommand, command) => __awaiter(this, void 0, void 0, function* () {
             const inputs = [];
             inputs.push({ name: 'subcommand', value: subcommand || '' });
@@ -40,6 +43,18 @@ class UpdateCommand extends abstract_command_1.AbstractCommand {
             options.push({ name: 'yes', value: !!command.yes });
             options.push({ name: 'smart-merge', value: command.smartMerge !== false });
             options.push({ name: 'version-check', value: command.versionCheck !== false });
+            options.push({
+                name: 'claude-context-repo',
+                value: command.claudeContextRepo || '',
+            });
+            options.push({
+                name: 'claude-context-protocol',
+                value: command.claudeContextProtocol || '',
+            });
+            options.push({
+                name: 'claude-context',
+                value: command.claudeContext !== false,
+            });
             yield this.action.handle(inputs, options);
         }));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.96",
+  "version": "0.0.99",
   "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.78",
+    "@gadmin2n/schematics": "^0.0.81",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",