@ngocsangairvds/vsaf 3.2.10 → 3.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngocsangairvds/vsaf",
-  "version": "3.2.10",
+  "version": "3.2.12",
   "description": "improve confluence format",
   "keywords": ["claude", "claude-code", "ai", "sdlc", "framework", "bmad", "gitnexus", "superpowers"],
   "bin": {

package/src/global.js

@@ -17,7 +17,10 @@ async function installGlobal() {
   installSkills();
   installBinary('gitnexus', () => exec('npm install -g gitnexus@1.6.4-rc.79'));
   setupGitnexusMcp();
-  installBinary('uv', () => exec('curl -LsSf https://astral.sh/uv/install.sh | sh'));
+  const isWin = process.platform === 'win32';
+  installBinary('uv', () => isWin
+    ? exec('powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"')
+    : 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');
@@ -74,6 +77,47 @@ function setupGitnexusMcp() {
 
 
 
+function installVdsCliwrapper(vdsRoot) {
+  const os = require('os');
+  const isWin = process.platform === 'win32';
+
+  if (isWin) {
+    const wrapperDir = path.join(os.homedir(), '.local', 'bin');
+    const wrapperPath = path.join(wrapperDir, 'vds-cli.cmd');
+    fs.mkdirSync(wrapperDir, { recursive: true });
+    fs.writeFileSync(wrapperPath, [
+      '@echo off',
+      `set "ROOT=${vdsRoot}"`,
+      `set "VENV=%ROOT%\\.venv"`,
+      `if exist "%USERPROFILE%\\.vds\\.env" (`,
+      `  for /f "usebackq tokens=*" %%a in ("%USERPROFILE%\\.vds\\.env") do set "%%a"`,
+      `)`,
+      `"%VENV%\\Scripts\\vds-cli.exe" %*`,
+    ].join('\r\n'));
+    ok(`vds-cli wrapper → ${wrapperPath}`);
+    const inPath = (process.env.PATH || '').split(';').some(p => p.toLowerCase() === wrapperDir.toLowerCase());
+    if (!inPath) warn(`Thêm vào PATH: ${wrapperDir}`);
+  } else {
+    const wrapperDir = path.join(os.homedir(), '.local', 'bin');
+    const wrapperPath = path.join(wrapperDir, 'vds-cli');
+    fs.mkdirSync(wrapperDir, { recursive: true });
+    fs.writeFileSync(wrapperPath, [
+      '#!/usr/bin/env bash',
+      'set -euo pipefail',
+      `ROOT="${vdsRoot}"`,
+      'VENV="$ROOT/.venv"',
+      'if [[ -n "${VIRTUAL_ENV:-}" && "${VIRTUAL_ENV}" != "$VENV" ]]; then unset VIRTUAL_ENV; fi',
+      'unset UV_PROJECT_ENVIRONMENT CONDA_PREFIX 2>/dev/null || true',
+      'if [[ -f "$HOME/.vds/.env" ]]; then set -a; source "$HOME/.vds/.env"; set +a; fi',
+      'exec "$VENV/bin/vds-cli" "$@"',
+    ].join('\n') + '\n');
+    fs.chmodSync(wrapperPath, 0o755);
+    ok(`vds-cli wrapper → ${wrapperPath}`);
+    const inPath = (process.env.PATH || '').split(':').includes(wrapperDir);
+    if (!inPath) warn(`Thêm vào ~/.bashrc hoặc ~/.zshrc: export PATH="$HOME/.local/bin:$PATH"`);
+  }
+}
+
 async function setupVdsScriptsMcp() {
   step('VDS Scripts MCP');
 
@@ -93,7 +137,18 @@ async function setupVdsScriptsMcp() {
 
   fs.mkdirSync(path.dirname(destDir), { recursive: true });
   copyDir(srcDir, destDir);
-  ok('Cài đặt thành công.');
+  ok('Đã sao chép vds-scripts.');
+
+  info('Đang khởi tạo môi trường Python (uv sync)...');
+  const syncOk = exec(`uv sync --frozen --package vds-cli --project "${destDir}"`, { silent: true })
+    || exec(`uv sync --package vds-cli --project "${destDir}"`, { silent: true });
+  if (syncOk) {
+    ok('Môi trường Python đã sẵn sàng.');
+  } else {
+    warn('uv sync thất bại — vds-cli có thể chưa sẵn sàng');
+  }
+
+  installVdsCliwrapper(destDir);
 
   step('Cấu hình VDS CLI và Credentials');
   const envDir = path.join(require('os').homedir(), '.vds');
@@ -131,7 +186,8 @@ async function setupVdsScriptsMcp() {
     ok('Đã tìm thấy file cấu hình ~/.vds/.env');
   }
 
-  const cmd = `claude mcp add vds-orchestrator -e VDS_SCRIPTS_ROOT="${destDir}" -- uv run --project "${mcpDir}" vds-mcp-server`;
+  exec('claude mcp remove vds-orchestrator', { silent: true });
+  const cmd = `claude mcp add vds-orchestrator --scope user -e VDS_SCRIPTS_ROOT="${destDir}" -- uv run --project "${mcpDir}" vds-mcp-server`;
 
   if (exec(cmd)) {
     ok('VDS Scripts MCP đã được cấu hình thành công');

package/src/utils.js

@@ -18,7 +18,10 @@ function hasCommand(cmd) {
   if (versionCheck.status === 0) return true;
 
   // Fallback: check if command exists on PATH
-  const pathCheck = spawnSync('sh', ['-c', `command -v "${cmd}"`], { stdio: 'ignore', shell: false });
+  const isWin = process.platform === 'win32';
+  const pathCheck = isWin
+    ? spawnSync('where', [cmd], { stdio: 'ignore', shell: false })
+    : spawnSync('sh', ['-c', `command -v "${cmd}"`], { stdio: 'ignore', shell: false });
   return pathCheck.status === 0;
 }
 
@@ -73,6 +76,7 @@ function cleanStaleWal() {
 
 function getPlatform() {
   if (process.platform === 'darwin') return 'macos';
+  if (process.platform === 'win32') return 'windows';
   return 'linux';
 }
 

package/tools/vds-scripts/confluence_orchestrator/src/confluence_orchestrator/http.py

@@ -222,29 +222,31 @@ class ConfluenceClient:
         client_cls = AtlassianConfluenceCloud if self._is_cloud else AtlassianConfluenceServer
 
         # Configure authentication based on available credentials
+        # Token (Bearer/PAT) takes priority over username+password to avoid 401s
+        # when Basic auth is disabled on the server.
         auth_kwargs: dict[str, Any] = {"url": base_url, "timeout": self._timeout}
         if self._is_cloud:
-            if settings.username and settings.password:
+            if token:
+                auth_kwargs["token"] = token
+            elif settings.username and settings.password:
                 auth_kwargs["username"] = settings.username
                 auth_kwargs["password"] = resolve_secret(settings.password)
-            elif token:
-                auth_kwargs["token"] = token
             else:
                 raise AuthError(
                     f"No credentials available for cloud server '{self._server}'. "
-                    "Provide VDS_USERNAME+VDS_PASSWORD or an API token.",
+                    "Provide an API token or VDS_USERNAME+VDS_PASSWORD.",
                     context={"server": self._server},
                 )
+        elif token:
+            # PATs supported on Confluence Server/Data Center
+            auth_kwargs["token"] = token
         elif settings.username and settings.password:
             auth_kwargs["username"] = settings.username
             auth_kwargs["password"] = resolve_secret(settings.password)
-        elif token:
-            # Recent ConfluenceServer class also supports PATs
-            auth_kwargs["token"] = token
         else:
             raise AuthError(
                 f"No credentials available for server '{self._server}'. "
-                "Provide VDS_USERNAME+VDS_PASSWORD or a CONFLUENCE token.",
+                "Provide a CONFLUENCE token or VDS_USERNAME+VDS_PASSWORD.",
                 context={"server": self._server},
             )
         client_params = set(self._safe_signature_params(client_cls))