@ngocsangairvds/vsaf 4.1.6 → 4.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngocsangairvds/vsaf",
-  "version": "4.1.6",
+  "version": "4.1.7",
   "description": "logging step",
   "main": "packages/core/dist/index.js",
   "types": "packages/core/dist/index.d.ts",

package/skills/vds-skill/_shared/config-check.js

@@ -5,11 +5,11 @@
  * config-check.js — reusable pre-flight checker for vds-skill-* SKILL.md files.
  *
  * Usage:
- *   node config-check.js --cmd vds-cli --env VDS_CONFLUENCE_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT
+ *   node config-check.js --cmd vds-cli --env INTERNAL_CONFLUENCE_TOKEN
  *
  * Output (matches legacy bash format):
  *   OK                                          — all checks pass
- *   BLOCKED — missing: vds-cli VDS_JIRA_TOKEN   — something missing
+ *   BLOCKED — missing: vds-cli JIRA_TOKEN       — something missing
  *   NOTE: /path/to/cmd exists but fails to run  — broken shim detected
  */
 
@@ -72,5 +72,5 @@ if (missing.length === 0) {
   console.log('OK');
 } else {
   console.log(`BLOCKED — missing: ${missing.join(' ')}`);
-  console.log('Fix: edit ~/.vds/sdlc-config.env (or run: vsaf install vds-skill)');
+  console.log('Fix: edit ~/.vds/.env (or run: vsaf install vds-skill)');
 }

package/skills/vds-skill/_shared/credentials.js

@@ -9,7 +9,7 @@ const { execFileSync } = require('child_process');
 const IS_WIN = process.platform === 'win32';
 
 function getConfigPath() {
-  return process.env.VSAF_CONFIG_FILE || join(homedir(), '.vds', 'sdlc-config.env');
+  return process.env.VSAF_CONFIG_FILE || join(homedir(), '.vds', '.env');
 }
 
 function parseEnvFile(filePath) {

package/skills/vds-skill/create-bitbucket-pr/SKILL.md

@@ -12,7 +12,7 @@ Create a Bitbucket PR on Viettel internal Bitbucket via `vds-cli`.
 Before doing anything, run this check via Bash tool:
 
 ```bash
-node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_BITBUCKET_TOKEN
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env BITBUCKET_TOKEN
 ```
 
 If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do NOT fabricate output. `--dry-run` mode skips credential + vds-cli checks.
@@ -22,7 +22,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 - `vds-cli` installed (for non-dry-run)
 - Inside a git repo with remote pointing to `bitbucket.digital.vn`
 - On a named branch (not detached HEAD)
-- `VDS_BITBUCKET_TOKEN` in `~/.vds/sdlc-config.env`
+- `BITBUCKET_TOKEN` in `~/.vds/.env`
 
 ## Usage
 
@@ -40,7 +40,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 2. Extract PROJECT/REPO from remote URL
 3. Determine source branch (current) + target (default `master`)
 4. Auto-detect description from `.vsaf/docs/features/*/09-ship.md` or `.vsaf/docs/hotfixes/*/03-ship.md`
-5. Lazy-prompt `VDS_BITBUCKET_TOKEN` if not set
+5. Lazy-prompt `BITBUCKET_TOKEN` if not set
 6. Confirm with user before executing
 7. Run `vds-cli bitbucket pr create $PROJECT/$REPO --source ... --target ... --title ... --description-file ... --yes --json-only`
 

package/skills/vds-skill/create-bitbucket-pr/scripts/create-pr.js

@@ -106,7 +106,7 @@ if (!cmdCheck.found) {
 }
 
 (async () => {
-  if (!await ensureEnv('VDS_BITBUCKET_TOKEN', 'Enter VDS Bitbucket personal access token')) process.exit(1);
+  if (!await ensureEnv('BITBUCKET_TOKEN', 'Enter Bitbucket personal access token')) process.exit(1);
 
   console.log('About to create PR:');
   console.log(`  Project/Repo: ${project}/${repo}`);

package/skills/vds-skill/create-jira-epic/SKILL.md

@@ -12,7 +12,7 @@ Create a Jira Epic on Viettel Jira based on a PRD markdown file.
 Before doing anything, run this check via Bash tool:
 
 ```bash
-node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_JIRA_TOKEN,VDS_JIRA_PROJECT_DEFAULT
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env JIRA_TOKEN,VDS_JIRA_PROJECT_DEFAULT
 ```
 
 If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do NOT fabricate output. `--dry-run` mode skips credential + vds-cli checks.
@@ -21,7 +21,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 
 - `vds-cli` installed (for non-dry-run)
 - A PRD file exists at `.vsaf/docs/features/{feature}/02-prd.md`
-- `VDS_JIRA_TOKEN` + `VDS_JIRA_PROJECT_DEFAULT` in `~/.vds/sdlc-config.env`
+- `JIRA_TOKEN` + `VDS_JIRA_PROJECT_DEFAULT` in `~/.vds/.env`
 
 ## Usage
 
@@ -37,7 +37,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 
 1. Locate PRD file (or use `--description-file`)
 2. Extract summary from PRD's first H1 heading
-3. Lazy-prompt `VDS_JIRA_TOKEN` + `VDS_JIRA_PROJECT_DEFAULT` if missing
+3. Lazy-prompt `JIRA_TOKEN` + `VDS_JIRA_PROJECT_DEFAULT` if missing
 4. Confirm with user
 5. Run `vds-cli jira create --project KEY --issuetype Epic --summary ... --description-file ... --yes --json-only`
 6. Save returned epic key to `<feature-dir>/jira-epic-key.txt`

package/skills/vds-skill/create-jira-epic/scripts/create-epic.js

@@ -76,7 +76,7 @@ if (!cmdCheck.found) {
 }
 
 (async () => {
-  if (!await ensureEnv('VDS_JIRA_TOKEN', 'Enter VDS Jira personal access token')) process.exit(1);
+  if (!await ensureEnv('JIRA_TOKEN', 'Enter Jira personal access token')) process.exit(1);
   if (!await ensureEnv('VDS_JIRA_PROJECT_DEFAULT', 'Enter default Jira project key (e.g. NTTC)', false)) process.exit(1);
 
   projectKey = projectKey || process.env.VDS_JIRA_PROJECT_DEFAULT;

package/skills/vds-skill/install-deps.mjs

@@ -3,8 +3,8 @@
 /**
  * VDS Skill Pack — credential & config setup
  *
- * Creates ~/.vds/sdlc-config.env template with all required
- * environment variables for vds-skill-* skills.
+ * Merges credential stubs into ~/.vds/.env (the shared VDS env file
+ * that all orchestrators read via pydantic-settings).
  *
  * Usage:
  *   node install-deps.mjs [projectPath]
@@ -20,14 +20,19 @@ const packDir = process.argv[3] || dirname(new URL(import.meta.url).pathname);
 // ── Config ──
 
 const VDS_DIR = join(homedir(), '.vds');
-const CONFIG_FILE = join(VDS_DIR, 'sdlc-config.env');
+const CONFIG_FILE = join(VDS_DIR, '.env');
 
 const REQUIRED_VARS = [
-  { name: 'VDS_CONFLUENCE_TOKEN', desc: 'Confluence personal access token', skills: 'push-prd, push-srs, search-confluence' },
-  { name: 'VDS_JIRA_TOKEN', desc: 'Jira personal access token', skills: 'create-jira-epic, search-confluence' },
-  { name: 'VDS_BITBUCKET_TOKEN', desc: 'Bitbucket personal access token', skills: 'create-bitbucket-pr' },
-  { name: 'VDS_CONFLUENCE_SPACE_DEFAULT', desc: 'Default Confluence space key (e.g. CEP)', skills: 'push-prd, push-srs, search-confluence' },
-  { name: 'VDS_JIRA_PROJECT_DEFAULT', desc: 'Default Jira project key (e.g. NTTC)', skills: 'create-jira-epic, search-confluence' },
+  // Personal Access Tokens — primary auth (one token per service)
+  { name: 'INTERNAL_CONFLUENCE_TOKEN', desc: 'Confluence internal server PAT', skills: 'push-prd, push-srs, search-confluence' },
+  { name: 'JIRA_TOKEN', desc: 'Jira personal access token', skills: 'create-jira-epic, search-confluence' },
+  { name: 'BITBUCKET_TOKEN', desc: 'Bitbucket personal access token', skills: 'create-bitbucket-pr' },
+];
+
+// Optional — basic auth fallback (only needed if PATs not available)
+const OPTIONAL_VARS = [
+  { name: 'VDS_USERNAME', desc: 'VDS username (basic auth fallback)', skills: 'confluence, jira, bitbucket' },
+  { name: 'VDS_PASSWORD', desc: 'VDS password (basic auth fallback)', skills: 'confluence, jira, bitbucket' },
 ];
 
 // ── Helpers ──
@@ -75,12 +80,14 @@ for (const v of REQUIRED_VARS) {
 if (!existsSync(CONFIG_FILE)) {
   // Create fresh template
   const lines = [
-    '# VDS Skill Pack — credential config',
-    '# File: ~/.vds/sdlc-config.env',
-    '# Permissions: 600 (auto-set by credentials.js)',
+    '# VDS shared environment — credential config',
+    '# File: ~/.vds/.env',
+    '# Permissions: 600 (auto-set by installer)',
     '#',
-    '# Fill in the values below. Skills will use these automatically.',
-    '# To rotate a token: update the value here, skills pick it up next run.',
+    '# Set per-service Personal Access Tokens (recommended):',
+    '#   INTERNAL_CONFLUENCE_TOKEN, JIRA_TOKEN, BITBUCKET_TOKEN',
+    '# Or basic auth fallback: VDS_USERNAME + VDS_PASSWORD (works for all services)',
+    '# To rotate a credential: update the value here, orchestrators pick it up next run.',
     '',
   ];
 
@@ -91,6 +98,14 @@ if (!existsSync(CONFIG_FILE)) {
     lines.push('');
   }
 
+  lines.push('# --- Basic auth fallback (optional, only if PATs not available) ---');
+  lines.push('');
+  for (const v of OPTIONAL_VARS) {
+    lines.push(`# ${v.desc}`);
+    lines.push(`# ${v.name}=`);
+  }
+  lines.push('');
+
   writeFileSync(CONFIG_FILE, lines.join('\n'));
   if (process.platform !== 'win32') {
     chmodSync(CONFIG_FILE, 0o600);

package/skills/vds-skill/push-prd/SKILL.md

@@ -17,7 +17,7 @@ Publish the current PRD to Viettel Confluence via `vds-cli` — create a new pag
 Before doing anything, run this check via Bash tool:
 
 ```bash
-node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_CONFLUENCE_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env INTERNAL_CONFLUENCE_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT
 ```
 
 If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do NOT fabricate output.
@@ -26,7 +26,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 
 - `vds-cli` installed
 - A PRD markdown file must exist
-- `VDS_CONFLUENCE_TOKEN` + `VDS_CONFLUENCE_SPACE_DEFAULT` in `~/.vds/sdlc-config.env`
+- `INTERNAL_CONFLUENCE_TOKEN` + `VDS_CONFLUENCE_SPACE_DEFAULT` in `~/.vds/.env`
 - Confluence parent page configured in `.vsaf/config.yaml` (or lazy-prompted)
 
 ## Steps

package/skills/vds-skill/push-srs/SKILL.md

@@ -17,7 +17,7 @@ Publish the current SRS to Viettel Confluence via `vds-cli` — create or update
 Before doing anything, run this check via Bash tool:
 
 ```bash
-node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_CONFLUENCE_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env INTERNAL_CONFLUENCE_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT
 ```
 
 If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do NOT fabricate output.
@@ -26,7 +26,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 
 - `vds-cli` installed
 - An SRS markdown file must exist
-- `VDS_CONFLUENCE_TOKEN` + `VDS_CONFLUENCE_SPACE_DEFAULT` in `~/.vds/sdlc-config.env`
+- `INTERNAL_CONFLUENCE_TOKEN` + `VDS_CONFLUENCE_SPACE_DEFAULT` in `~/.vds/.env`
 - Confluence parent page in config or lazy-prompted
 
 ## Steps

package/skills/vds-skill/search-confluence/SKILL.md

@@ -12,7 +12,7 @@ Search Viettel Confluence + Jira for pages/tickets related to a feature, then wr
 Before doing anything, run this check via Bash tool:
 
 ```bash
-node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_CONFLUENCE_TOKEN,VDS_JIRA_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT,VDS_JIRA_PROJECT_DEFAULT
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env INTERNAL_CONFLUENCE_TOKEN,JIRA_TOKEN,VDS_CONFLUENCE_SPACE_DEFAULT,VDS_JIRA_PROJECT_DEFAULT
 ```
 
 If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do NOT fabricate output. `--dry-run` mode skips vds-cli check.
@@ -21,7 +21,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 
 - `vds-cli` installed
 - Inside a project root with `.vsaf/docs/features/`
-- `VDS_CONFLUENCE_TOKEN`, `VDS_JIRA_TOKEN`, `VDS_CONFLUENCE_SPACE_DEFAULT`, `VDS_JIRA_PROJECT_DEFAULT` in `~/.vds/sdlc-config.env`
+- `INTERNAL_CONFLUENCE_TOKEN`, `JIRA_TOKEN`, `VDS_CONFLUENCE_SPACE_DEFAULT`, `VDS_JIRA_PROJECT_DEFAULT` in `~/.vds/.env`
 
 ## Usage
 

package/skills/vds-skill/search-confluence/scripts/search.js

@@ -57,8 +57,8 @@ if (!cmdCheck.found) {
 }
 
 (async () => {
-  if (!await ensureEnv('VDS_CONFLUENCE_TOKEN', 'Enter VDS Confluence personal access token')) process.exit(1);
-  if (!await ensureEnv('VDS_JIRA_TOKEN', 'Enter VDS Jira personal access token')) process.exit(1);
+  if (!await ensureEnv('INTERNAL_CONFLUENCE_TOKEN', 'Enter Confluence internal server PAT')) process.exit(1);
+  if (!await ensureEnv('JIRA_TOKEN', 'Enter Jira personal access token')) process.exit(1);
   if (!await ensureEnv('VDS_CONFLUENCE_SPACE_DEFAULT', 'Enter default Confluence space key (e.g. ENG)', false)) process.exit(1);
   if (!await ensureEnv('VDS_JIRA_PROJECT_DEFAULT', 'Enter default Jira project key (e.g. NTTC)', false)) process.exit(1);