@ngocsangairvds/vsaf 3.2.1 → 3.2.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ngocsangairvds/vsaf",
-  "version": "3.2.1",
-  "description": "add vds script",
+  "version": "3.2.3",
+  "description": "add vds script env",
   "keywords": ["claude", "claude-code", "ai", "sdlc", "framework", "bmad", "gitnexus", "superpowers"],
   "bin": {
     "vsaf": "./bin/vsaf.js"

package/src/global.js

@@ -11,13 +11,13 @@ const CODEX_SKILLS_DST = path.join(CODEX_HOME, 'skills');
 
 async function installGlobal() {
   console.log('\n\x1b[1m╔══════════════════════════════════════════╗\x1b[0m');
-  console.log('\x1b[1m║   VSAF — Global Infra                    ║\x1b[0m');
-  console.log('\x1b[1m╚══════════════════════════════════════════╝\x1b[0m');
+  console.log('\x1b  [1m║   VSAF — Global Infra                    ║\x1b[0m');
+  console.log('\x1b[  1m╚══════════════════════════════════════════╝\x1b[0m');
 
   installSkills();
   installBinary('gitnexus', () => exec('npm install -g gitnexus@1.6.4-rc.79'));
   setupGitnexusMcp();
-  await setupConfluenceMcp();
+  installBinary('uv', () => exec('curl -LsSf https://astral.sh/uv/install.sh | sh'));
   await setupVdsScriptsMcp();
 
   console.log('\n\x1b[32m\x1b[1m✓ Global infra ready.\x1b[0m\n');
@@ -72,50 +72,7 @@ function setupGitnexusMcp() {
     : warn('MCP setup failed — run manually: claude mcp add gitnexus -- npx -y gitnexus@1.6.4-rc.79 mcp');
 }
 
-async function setupConfluenceMcp() {
-  step('Confluence MCP');
 
-  if (!hasCommand('claude')) {
-    info('Claude Code CLI not found — skip Confluence MCP setup');
-    return;
-  }
-
-  const url = await promptInput(
-    '  Confluence URL (blank to skip, e.g. http://confluence.company.com): '
-  );
-
-  if (!url) {
-    warn('Confluence MCP skipped — run manually later:\n' +
-      '    claude mcp add confluence -e CONF_MODE=server \\\n' +
-      '      -e CONF_BASE_URL=<your-url> \\\n' +
-      '      -e CONF_AUTH_MODE=bearer \\\n' +
-      '      -e CONF_TOKEN=<your-token> \\\n' +
-      '      -- npx -y confluence-mcp-server');
-    return;
-  }
-
-  const token = await promptSecret(
-    '  Confluence Personal Access Token: '
-  );
-
-  if (!token) {
-    warn('Confluence MCP skipped — token is required');
-    return;
-  }
-
-  const cmd = [
-    'claude mcp add confluence',
-    '-e CONF_MODE=server',
-    `-e CONF_BASE_URL=${url}`,
-    '-e CONF_AUTH_MODE=bearer',
-    `-e CONF_TOKEN=${token}`,
-    '-- npx -y confluence-mcp-server',
-  ].join(' ');
-
-  exec(cmd)
-    ? ok('Confluence MCP configured')
-    : warn('Confluence MCP setup failed — run manually (see above)');
-}
 
 async function setupVdsScriptsMcp() {
   step('VDS Scripts MCP');
@@ -126,37 +83,46 @@ async function setupVdsScriptsMcp() {
   }
 
   const srcDir = path.join(PKG_ROOT, 'tools', 'vds-scripts');
+  const destDir = path.join(CLAUDE_HOME, 'vds-scripts');
+  const mcpDir = path.join(destDir, 'mcp_server');
+
+  info(`Source: ${srcDir}`);
   if (!fs.existsSync(srcDir)) {
     warn('Không tìm thấy source vds-scripts trong package — bỏ qua cài đặt.');
     return;
   }
 
-  const destDir = path.join(CLAUDE_HOME, 'vds-scripts');
-  const mcpDir = path.join(destDir, 'mcp_server');
-
-  info(`Đang copy mã nguồn vds-scripts vào ${destDir}...`);
   fs.mkdirSync(path.dirname(destDir), { recursive: true });
   copyDir(srcDir, destDir);
-  ok('Copy mã nguồn thành công.');
+  ok('Cài đặt thành công.');
 
   step('Cấu hình VDS CLI và Credentials');
   const envDir = path.join(require('os').homedir(), '.vds');
   const envFile = path.join(envDir, '.env');
   if (!fs.existsSync(envFile)) {
-    info('Đang khởi tạo file cấu hình ~/.vds/.env...');
     fs.mkdirSync(envDir, { recursive: true });
 
-    info('Vui lòng cung cấp các thông tin xác thực sau (để trống nếu muốn nhập sau):');
+    info('Vui lòng cung cấp các thông tin xác thực sau (Enter để bỏ qua nếu đã có sẵn):');
     const vdsUsername = await promptInput('  Nhập VDS_USERNAME: ');
     const vdsPassword = await promptSecret('  Nhập VDS_PASSWORD: ');
-    const bitbucketToken = await promptSecret('  Nhập BITBUCKET_ACCESS_TOKEN: ');
+    const bitbucketToken = await promptSecret('  Nhập BITBUCKET_TOKEN: ');
+    const jiraToken = await promptSecret('  Nhập JIRA_TOKEN: ');
+    const confluenceToken = await promptSecret('  Nhập INTERNAL_CONFLUENCE_TOKEN: ');
+    const extConfluenceToken = await promptSecret('  Nhập EXTERNAL_CONFLUENCE_TOKEN: ');
+
+    const confluenceInternalUrl = (await promptInput('  Nhập CONFLUENCE_INTERNAL_URL (ex: http://10.254.136.35:8090): ')) || 'http://10.254.136.35:8090';
+    const confluenceExternalUrl = (await promptInput('  Nhập CONFLUENCE_EXTERNAL_URL (ex: https://atlassian.digital.vn): ')) || 'https://atlassian.digital.vn';
 
     const envContent = [
       `VDS_USERNAME=${vdsUsername}`,
       `VDS_PASSWORD=${vdsPassword}`,
-      `BITBUCKET_ACCESS_TOKEN=${bitbucketToken}`,
-      'JIRA_BASE_URL=https://jira.digital.vn',
-      'CONFLUENCE_BASE_URL=https://confluence.digital.vn',
+      `BITBUCKET_TOKEN=${bitbucketToken}`,
+      `JIRA_TOKEN=${jiraToken}`,
+      `INTERNAL_CONFLUENCE_TOKEN=${confluenceToken}`,
+      `EXTERNAL_CONFLUENCE_TOKEN=${extConfluenceToken}`,
+      'JIRA_BASE_URL=https://jira.viettelmoney.vn/',
+      `CONFLUENCE_INTERNAL_URL=${confluenceInternalUrl}`,
+      `CONFLUENCE_EXTERNAL_URL=${confluenceExternalUrl}`,
       'BITBUCKET_BASE_URL=http://bitbucket.digital.vn'
     ].join('\n') + '\n';
 
@@ -166,7 +132,6 @@ async function setupVdsScriptsMcp() {
     ok('Đã tìm thấy file cấu hình ~/.vds/.env');
   }
 
-  info('Đang cấu hình VDS Scripts MCP vào Claude...');
   const cmd = `claude mcp add vds-orchestrator -- uv run --project "${mcpDir}" vds-mcp-server`;
 
   if (exec(cmd)) {
@@ -222,4 +187,4 @@ function promptSecret(question) {
   });
 }
 
-module.exports = { installGlobal };
+module.exports = { installGlobal, setupVdsScriptsMcp };

package/src/project.js

@@ -2,6 +2,7 @@
 const path = require('path');
 const fs   = require('fs');
 const { ok, info, warn, step, hasCommand, exec, copyDir, copyFile, cleanStaleWal } = require('./utils');
+const { setupVdsScriptsMcp } = require('./global');
 
 const PKG_ROOT  = path.join(__dirname, '..');
 const TEMPLATES = path.join(PKG_ROOT, 'assets', 'templates');
@@ -16,8 +17,9 @@ async function installProject() {
 
   scaffoldFiles();
   scaffoldBmadWorkspace();
-  syncLocalBmadSkills();
+  syncLocalSkills();
   initGitNexus();
+  await setupVdsScriptsMcp();
 
   console.log('\n\x1b[32m\x1b[1m✓ Project ready.\x1b[0m');
   console.log('\n  Next steps:');
@@ -128,7 +130,7 @@ function syncLocalBmadSkills() {
 
   const entries = fs
     .readdirSync(SKILLS_SRC, { withFileTypes: true })
-    .filter((entry) => entry.name.startsWith('bmad-'));
+    .filter((entry) => entry.name.startsWith('bmad-') || entry.name.startsWith('vsaf-') || entry.name.startsWith('vds-'));
 
   if (entries.length === 0) {
     warn('No BMAD skills found in package — skipping');

package/src/status.js

@@ -11,7 +11,9 @@ async function showStatus() {
   checkSkills();
   checkCodexSkills();
   checkCmd('gitnexus', 'GitNexus');
-
+  checkCmd('uv', 'UV Package Manager');
+  checkVdsScripts();
+  checkVdsEnv();
   // ── Project ────────────────────────────────────────────────────────────────
   console.log('\n\x1b[1mProject  (current repo)\x1b[0m');
   checkPath('.claude/settings.json',    'Claude settings');
@@ -71,4 +73,16 @@ function checkProjectSkillDir(rel, label) {
   }
 }
 
+function checkVdsScripts() {
+  const dir = path.join(CLAUDE_HOME, 'vds-scripts');
+  const exists = fs.existsSync(dir);
+  console.log(`  ${exists ? '\x1b[32m✓\x1b[0m' : '\x1b[31m✗\x1b[0m'} VDS Scripts (~/.claude/vds-scripts)`);
+}
+
+function checkVdsEnv() {
+  const file = path.join(require('os').homedir(), '.vds', '.env');
+  const exists = fs.existsSync(file);
+  console.log(`  ${exists ? '\x1b[32m✓\x1b[0m' : '\x1b[31m✗\x1b[0m'} VDS Config (~/.vds/.env)`);
+}
+
 module.exports = { showStatus };