@gadmin2n/cli 0.0.179 → 0.0.181

package/actions/update.action.js

@@ -32,11 +32,22 @@ const types_1 = require("../lib/template-merge/types");
 /* ------------------------------------------------------------------ *
  * Config / constants
  * ------------------------------------------------------------------ */
-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 = ['.codebuddy', '.agent', '.claude'];
+const CODING_AGENT_CONTEXT_REPO_HTTPS = 'https://git.tencent.com/OIT-OMC/gadmin2-coding-agent-context.git';
+const CODING_AGENT_CONTEXT_REPO_SSH = 'git@git.tencent.com:OIT-OMC/gadmin2-coding-agent-context.git';
+const CODING_AGENT_CONTEXT_BRANCH = 'master';
+const CODING_AGENT_SOURCE_SUBDIR = '.';
+/**
+ * Top-level entries in the cloned repo that must NOT be mirrored into the
+ * target agent dirs:
+ * - `.git`      — clone metadata, never part of the context payload
+ * - `CLAUDE.md` — repo documentation, not part of the synced context
+ */
+const CODING_AGENT_SOURCE_ROOT_EXCLUDES = new Set(['.git', 'CLAUDE.md']);
+const CODING_AGENT_TARGET_DIRS = ['.codebuddy', '.agent', '.claude'];
+/** Human-readable label for the source location in log output. */
+const CODING_AGENT_SOURCE_DISPLAY = CODING_AGENT_SOURCE_SUBDIR === '.'
+    ? '(repo root)'
+    : `${CODING_AGENT_SOURCE_SUBDIR}/`;
 /**
  * Canonical formatting for "failed to materialize the base" errors.
  * All three handlers (handleDiff/handleStatus/handleUpdate) share this so the
@@ -51,9 +62,9 @@ function formatMaterializeError(schematicsVersion, err) {
  * .claude context sync (from remote git repo)
  * ------------------------------------------------------------------ */
 /**
- * Shallow-clone the remote .claude context repo into a temp dir and return
- * the absolute path to the `.claude` subfolder plus the repo-root `CLAUDE.md`
- * path (when present). Returns null on failure
+ * Shallow-clone the remote coding-agent context repo into a temp dir and
+ * return the absolute path to the source root (`CODING_AGENT_SOURCE_SUBDIR`
+ * under the clone). Returns null on failure
  * (e.g. no network, repo private, credentials missing, etc.).
  */
 function fetchClaudeContextRepo(repoUrl, branch) {
@@ -61,16 +72,7 @@ function fetchClaudeContextRepo(repoUrl, branch) {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gadmin-claude-ctx-'));
     try {
         (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
-            fs.rmSync(tmpDir, { recursive: true, force: true });
-            return null;
-        }
-        const rootClaudeMdSrc = path.join(tmpDir, 'CLAUDE.md');
-        const rootClaudeMd = fs.existsSync(rootClaudeMdSrc)
-            ? rootClaudeMdSrc
-            : null;
+        const claudeSrc = path.join(tmpDir, CODING_AGENT_SOURCE_SUBDIR);
         // Caller is responsible for cleaning up the parent tmpDir.
         // We return the inner path; we stash the parent on a property so caller
         // can clean it. To keep things simple, register a process exit cleanup
@@ -83,7 +85,7 @@ function fetchClaudeContextRepo(repoUrl, branch) {
                 // ignore
             }
         });
-        return { claudeDir: claudeSrc, rootClaudeMd };
+        return { claudeDir: claudeSrc };
     }
     catch (err) {
         fs.rmSync(tmpDir, { recursive: true, force: true });
@@ -100,15 +102,19 @@ function fetchClaudeContextRepo(repoUrl, branch) {
  * 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.
+ * `excludeTopLevel` names entries at the source root that are skipped
+ * entirely (e.g. `.git`, `CLAUDE.md`).
  * Returns counts split between newly-added files and overwritten files.
  */
-function copyTreeOverwrite(srcDir, destDir) {
+function copyTreeOverwrite(srcDir, destDir, excludeTopLevel) {
     let added = 0;
     let updated = 0;
     function walk(rel) {
         const absSrc = path.join(srcDir, rel);
         const entries = fs.readdirSync(absSrc, { withFileTypes: true });
         for (const entry of entries) {
+            if (rel === '' && (excludeTopLevel === null || excludeTopLevel === void 0 ? void 0 : excludeTopLevel.has(entry.name)))
+                continue;
             const childRel = rel ? path.join(rel, entry.name) : entry.name;
             const absChildSrc = path.join(srcDir, childRel);
             const absChildDest = path.join(destDir, childRel);
@@ -139,8 +145,8 @@ function copyTreeOverwrite(srcDir, destDir) {
  * Priority (highest first):
  *   1. CLI --coding-context-repo (full URL override)
  *   2. CLI --coding-context-protocol (https | ssh | skip)
- *   3. Env var GADMIN2_CLAUDE_CONTEXT_REPO  (full URL)
- *   4. Env var GADMIN2_CLAUDE_CONTEXT_PROTOCOL (https | ssh | skip)
+ *   3. Env var GADMIN2_CODING_AGENT_CONTEXT_REPO  (full URL)
+ *   4. Env var GADMIN2_CODING_AGENT_CONTEXT_PROTOCOL (https | ssh | skip)
  *   5. --yes (auto mode): default to built-in HTTPS, no prompt
  *   6. Interactive prompt: pick https / ssh / skip
  *
@@ -148,7 +154,7 @@ function copyTreeOverwrite(srcDir, destDir) {
  */
 function resolveClaudeContextSource(cliRepo, cliProtocol, autoYes) {
     return __awaiter(this, void 0, void 0, function* () {
-        const branch = process.env.GADMIN2_CLAUDE_CONTEXT_BRANCH || CLAUDE_CONTEXT_BRANCH;
+        const branch = process.env.GADMIN2_CODING_AGENT_CONTEXT_BRANCH || CODING_AGENT_CONTEXT_BRANCH;
         // 1. CLI full-URL override
         if (cliRepo) {
             return { repo: cliRepo, branch };
@@ -158,24 +164,24 @@ function resolveClaudeContextSource(cliRepo, cliProtocol, autoYes) {
         if (cliProto === 'skip')
             return null;
         if (cliProto === 'ssh')
-            return { repo: CLAUDE_CONTEXT_REPO_SSH, branch };
+            return { repo: CODING_AGENT_CONTEXT_REPO_SSH, branch };
         if (cliProto === 'https')
-            return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+            return { repo: CODING_AGENT_CONTEXT_REPO_HTTPS, branch };
         // 3. Env var full-URL
-        const envRepo = process.env.GADMIN2_CLAUDE_CONTEXT_REPO;
+        const envRepo = process.env.GADMIN2_CODING_AGENT_CONTEXT_REPO;
         if (envRepo)
             return { repo: envRepo, branch };
         // 4. Env var protocol
-        const envProto = (process.env.GADMIN2_CLAUDE_CONTEXT_PROTOCOL || '').toLowerCase();
+        const envProto = (process.env.GADMIN2_CODING_AGENT_CONTEXT_PROTOCOL || '').toLowerCase();
         if (envProto === 'skip')
             return null;
         if (envProto === 'ssh')
-            return { repo: CLAUDE_CONTEXT_REPO_SSH, branch };
+            return { repo: CODING_AGENT_CONTEXT_REPO_SSH, branch };
         if (envProto === 'https')
-            return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+            return { repo: CODING_AGENT_CONTEXT_REPO_HTTPS, branch };
         // 5. CI / auto-yes mode → silent default
         if (autoYes)
-            return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+            return { repo: CODING_AGENT_CONTEXT_REPO_HTTPS, branch };
         // 6. Interactive prompt
         const { proto } = yield inquirer.prompt([
             {
@@ -183,8 +189,8 @@ function resolveClaudeContextSource(cliRepo, cliProtocol, autoYes) {
                 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: `HTTPS  (${CODING_AGENT_CONTEXT_REPO_HTTPS})`, value: 'https' },
+                    { name: `SSH    (${CODING_AGENT_CONTEXT_REPO_SSH})`, value: 'ssh' },
                     { name: 'Skip this stage', value: 'skip' },
                 ],
                 default: 'https',
@@ -193,8 +199,8 @@ function resolveClaudeContextSource(cliRepo, cliProtocol, autoYes) {
         if (proto === 'skip')
             return null;
         if (proto === 'ssh')
-            return { repo: CLAUDE_CONTEXT_REPO_SSH, branch };
-        return { repo: CLAUDE_CONTEXT_REPO_HTTPS, branch };
+            return { repo: CODING_AGENT_CONTEXT_REPO_SSH, branch };
+        return { repo: CODING_AGENT_CONTEXT_REPO_HTTPS, branch };
     });
 }
 function syncClaudeContext(instanceDir, dryRun, source) {
@@ -202,14 +208,13 @@ function syncClaudeContext(instanceDir, dryRun, source) {
         console.info(chalk.bold('\n═══════════════════════════════════════════════════'));
         console.info(chalk.bold('  Sync .claude context'));
         console.info(chalk.bold('═══════════════════════════════════════════════════'));
-        console.info(`${chalk.gray('Source: ')} ${source.repo} (${source.branch}) :: ${CLAUDE_SOURCE_SUBDIR}/`);
-        console.info(`${chalk.gray('Targets:')} ${CLAUDE_TARGET_DIRS.map((d) => `${d}/`).join(', ')}, AGENTS.md\n`);
+        console.info(`${chalk.gray('Source: ')} ${source.repo} (${source.branch}) :: ${CODING_AGENT_SOURCE_DISPLAY}`);
+        console.info(`${chalk.gray('Targets:')} ${CODING_AGENT_TARGET_DIRS.map((d) => `${d}/`).join(', ')}\n`);
         if (dryRun) {
             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. Copy <tmp>/CLAUDE.md → project root AGENTS.md (overwriting if present)'));
-            console.info(chalk.gray('   4. Files only present in target dirs (instance-only) are kept untouched)\n'));
+            console.info(chalk.gray(`   2. Copy <tmp>/${CODING_AGENT_SOURCE_SUBDIR === '.' ? '' : `${CODING_AGENT_SOURCE_SUBDIR}/`}** (excluding .git, CLAUDE.md) → 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
@@ -222,10 +227,10 @@ function syncClaudeContext(instanceDir, dryRun, source) {
         if (!fetched) {
             return;
         }
-        for (const targetName of CLAUDE_TARGET_DIRS) {
+        for (const targetName of CODING_AGENT_TARGET_DIRS) {
             const destDir = path.join(instanceDir, targetName);
             fs.mkdirSync(destDir, { recursive: true });
-            const { added, updated } = copyTreeOverwrite(fetched.claudeDir, destDir);
+            const { added, updated } = copyTreeOverwrite(fetched.claudeDir, destDir, CODING_AGENT_SOURCE_ROOT_EXCLUDES);
             const summary = [];
             if (added > 0)
                 summary.push(`${added} added`);
@@ -235,13 +240,6 @@ function syncClaudeContext(instanceDir, dryRun, source) {
                 summary.push('no files');
             console.info(`   ${chalk.cyan(targetName + '/')}  ${summary.join(' | ')}`);
         }
-        // Sync repo-root CLAUDE.md into the project root as AGENTS.md.
-        if (fetched.rootClaudeMd) {
-            const agentsDest = path.join(instanceDir, 'AGENTS.md');
-            const agentsExisted = fs.existsSync(agentsDest);
-            fs.copyFileSync(fetched.rootClaudeMd, agentsDest);
-            console.info(`   ${chalk.cyan('AGENTS.md')}  ${agentsExisted ? 'overwritten' : 'added'} (from CLAUDE.md)`);
-        }
         console.info();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.179",
+  "version": "0.0.181",
   "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.145",
+    "@gadmin2n/schematics": "^0.0.146",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",