@ngocsangairvds/vsaf 4.1.10 → 4.1.12

package/package.json

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

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

@@ -17,7 +17,7 @@
  */
 
 import { execSync } from 'child_process';
-import { existsSync, cpSync, mkdirSync, writeFileSync, rmSync } from 'fs';
+import { existsSync, cpSync, mkdirSync, writeFileSync, rmSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 
@@ -182,11 +182,26 @@ const ENV_TEMPLATE = `# VDS Environment Configuration
 VDS_USERNAME=
 VDS_PASSWORD=
 
+# ── Jira ──
+JIRA_BASE_URL=
+# JIRA_TOKEN=
+
+# ── Jira ViettelMoney ──
+JIRA_VIETTELMONEY_BASE_URL=
+# JIRA_VIETTELMONEY_USERNAME=
+# JIRA_VIETTELMONEY_PASSWORD=
+# JIRA_VIETTELMONEY_PROXY=
+
 # ── Bitbucket ──
-BITBUCKET_ACCESS_TOKEN=
 VDS_BITBUCKET_URL=
+BITBUCKET_ACCESS_TOKEN=
+# BITBUCKET_TOKEN=
+# BITBUCKET_MODE=server
+# BITBUCKET_CLOUD_WORKSPACE=
 
 # ── Confluence ──
+CONFLUENCE_INTERNAL_URL=
+CONFLUENCE_EXTERNAL_URL=
 INTERNAL_CONFLUENCE_TOKEN=
 EXTERNAL_CONFLUENCE_TOKEN=
 
@@ -202,18 +217,54 @@ VDS_GIT_CONCURRENCY_DEFAULT=8
 # VDS_GIT_HTTP_LOW_SPEED_LIMIT=1000
 # VDS_GIT_HTTP_LOW_SPEED_TIME=300
 # VDS_GIT_AUTO_REGENERATE_MANIFEST=
-# BITBUCKET_TOKEN=
 `;
 
 function provisionEnv() {
-  if (existsSync(ENV_FILE)) {
-    log('⊘', `.env already exists at ${ENV_FILE}`);
+  mkdirSync(ENV_DIR, { recursive: true });
+
+  if (!existsSync(ENV_FILE)) {
+    writeFileSync(ENV_FILE, ENV_TEMPLATE, 'utf-8');
+    log('✓', `.env template created at ${ENV_FILE}`);
+    log('⚠', `Fill in your credentials: ${ENV_FILE}`);
     return;
   }
-  mkdirSync(ENV_DIR, { recursive: true });
-  writeFileSync(ENV_FILE, ENV_TEMPLATE, 'utf-8');
-  log('✓', `.env template created at ${ENV_FILE}`);
-  log('⚠', `Fill in your credentials: ${ENV_FILE}`);
+
+  if (force) {
+    writeFileSync(ENV_FILE, ENV_TEMPLATE, 'utf-8');
+    log('✓', `.env overwritten at ${ENV_FILE}`);
+    log('⚠', `Fill in your credentials: ${ENV_FILE}`);
+    return;
+  }
+
+  // Merge: add missing variables from template into existing .env
+  const existing = readFileSync(ENV_FILE, 'utf-8');
+  const existingKeys = new Set(
+    existing.split('\n')
+      .map(line => line.trim())
+      .filter(line => line && !line.startsWith('#'))
+      .map(line => line.split('=')[0].trim()),
+  );
+
+  const newLines = [];
+  for (const line of ENV_TEMPLATE.split('\n')) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) continue;
+    const key = trimmed.split('=')[0].trim();
+    if (!existingKeys.has(key)) {
+      newLines.push(line);
+    }
+  }
+
+  if (newLines.length > 0) {
+    const append = '\n# ── Added by vds-skill installer ──\n' + newLines.join('\n') + '\n';
+    writeFileSync(ENV_FILE, existing.trimEnd() + '\n' + append, 'utf-8');
+    log('✓', `${newLines.length} new variable(s) added to ${ENV_FILE}`);
+    for (const line of newLines) {
+      log('  +', line.split('=')[0]);
+    }
+  } else {
+    log('⊘', `.env already up-to-date at ${ENV_FILE}`);
+  }
 }
 
 // ── Main ──

package/skills/vds-skill/runtime/bitbucket_orchestrator/src/vds_bitbucket_orchestrator/config.py

@@ -43,7 +43,6 @@ class BitbucketSettings(HTTPClientSettings, BaseSettings):
     # Backward-compatible aliases: BITBUCKET_BASE_URL, VDS_BITBUCKET_HTTP_BASE
     # Priority: VDS_BITBUCKET_URL > BITBUCKET_BASE_URL > VDS_BITBUCKET_HTTP_BASE
     base_url: str = Field(
-        default="http://bitbucket.digital.vn",
         validation_alias=AliasChoices(
             "VDS_BITBUCKET_URL",  # Primary (highest priority)
             "BITBUCKET_BASE_URL",  # Legacy alias

package/skills/vds-skill/runtime/confluence_orchestrator/src/confluence_orchestrator/config.py

@@ -52,11 +52,9 @@ class ConfluenceSettings(HTTPClientSettings, BaseSettings):
 
     # Canonical URLs
     internal_url: AnyHttpUrl = Field(
-        default="http://confluence.digital.vn",
         alias="CONFLUENCE_INTERNAL_URL",
     )
     external_url: AnyHttpUrl = Field(
-        default="http://10.254.136.35:8090",
         alias="CONFLUENCE_EXTERNAL_URL",
     )
 

package/skills/vds-skill/runtime/docs/.confluence.yaml

@@ -1,5 +1,4 @@
 bitbucket:
-  base_url: http://bitbucket.digital.vn
   project: WHO
   server: internal
 pages:
@@ -154,4 +153,4 @@ repos:
   name: vds-ai-memory
   slug: vds-ai-memory
 space_key: TTCN24
-confluence_url: http://confluence.digital.vn/display/TTCN24/WHO-Project+Ecosystem+Documentation
+# confluence_url is resolved at runtime from CONFLUENCE_INTERNAL_URL env var

package/skills/vds-skill/runtime/jira_orchestrator/src/vds_jira_orchestrator/config.py

@@ -43,7 +43,7 @@ class JiraSettings(HTTPClientSettings, BaseSettings):
 
     # Non-sensitive fields
     username: str | None = Field(default=None, alias="VDS_USERNAME")
-    base_url: str = Field(default="http://jira.digital.vn", alias="JIRA_BASE_URL")
+    base_url: str = Field(alias="JIRA_BASE_URL")
 
     # Sensitive credentials - stored as SecretStr for security
     password_secret: SecretStr | None = Field(default=None, alias="VDS_PASSWORD")

package/skills/vds-skill/runtime/jira_viettelmoney_orchestrator/src/vds_jira_viettelmoney_orchestrator/config.py

@@ -34,11 +34,9 @@ class JiraViettelMoneySettings(HTTPClientSettings, BaseSettings):
     )
 
     username: str | None = Field(default=None, alias="JIRA_VIETTELMONEY_USERNAME")
-    base_url: str = Field(
-        default="https://jira.viettelmoney.vn", alias="JIRA_VIETTELMONEY_BASE_URL"
-    )
+    base_url: str = Field(alias="JIRA_VIETTELMONEY_BASE_URL")
     # Proxy is passed per-request via requests.Session — not set system-wide
-    proxy_url: str | None = Field(default="http://10.254.148.131:8800", alias="JIRA_VIETTELMONEY_PROXY")
+    proxy_url: str | None = Field(default=None, alias="JIRA_VIETTELMONEY_PROXY")
 
     password_secret: SecretStr | None = Field(default=None, alias="JIRA_VIETTELMONEY_PASSWORD")
     token_secret: SecretStr | None = Field(default=None, alias="JIRA_VIETTELMONEY_TOKEN")

package/skills/vds-skill/runtime/vds_cli/src/vds_cli/confluence_sync.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import os
 import re
 from dataclasses import dataclass, field
 from datetime import UTC, datetime
@@ -306,11 +307,19 @@ def load_confluence_config(repo_root: Path) -> ConfluenceHubConfig:
             )
         )
 
+    # Resolve bitbucket_base_url from env (VDS_BITBUCKET_URL) with YAML fallback
+    bitbucket_base_url = os.environ.get(
+        "VDS_BITBUCKET_URL",
+        raw.get("bitbucket", {}).get("base_url", ""),
+    )
+    if not bitbucket_base_url:
+        raise ValueError("VDS_BITBUCKET_URL env var is required (or set bitbucket.base_url in .confluence.yaml)")
+
     return ConfluenceHubConfig(
         parent_page_id=raw["parent_page_id"],
         space_key=raw["space_key"],
         bitbucket_project=raw["bitbucket"]["project"],
-        bitbucket_base_url=raw["bitbucket"]["base_url"],
+        bitbucket_base_url=bitbucket_base_url.rstrip("/"),
         bitbucket_server=raw["bitbucket"].get("server", "internal"),
         repos=repos,
         pages=pages,