@ngocsangairvds/vsaf 4.1.4 → 4.1.6

package/package.json

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

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

@@ -193,7 +193,10 @@ if (!vdsCliFound && vdsScriptsDir) {
   // Check vds-scripts has valid structure (pyproject.toml = uv project)
   if (existsSync(join(vdsScriptsDir, 'pyproject.toml'))) {
     mkdirSync(wrapperDir, { recursive: true });
-    const wrapperContent = `#!/usr/bin/env node
+
+    if (process.platform === 'win32') {
+      // Windows: Node.js wrapper + .cmd shim
+      const wrapperContent = `#!/usr/bin/env node
 // Project-local vds-cli wrapper — created by vsaf install vds-skill
 const { execFileSync } = require('child_process');
 try {
@@ -202,20 +205,53 @@ try {
   process.exit(e.status || 1);
 }
 `;
-    writeFileSync(wrapperPath, wrapperContent);
-    if (process.platform !== 'win32') {
-      chmodSync(wrapperPath, 0o755);
-    } else {
+      writeFileSync(wrapperPath, wrapperContent);
       writeFileSync(wrapperPath + '.cmd', `@node "%~dp0\\vds-cli" %*\r\n`);
+    } else {
+      // Unix: pure bash wrapper — no node/nvm dependency
+      const wrapperContent = `#!/usr/bin/env bash
+# Project-local vds-cli wrapper — created by vsaf install vds-skill
+# Uses bash instead of node to avoid nvm/node PATH issues
+exec uv run --directory ${JSON.stringify(vdsScriptsDir)} --package vds-cli vds-cli "$@"
+`;
+      writeFileSync(wrapperPath, wrapperContent);
+      chmodSync(wrapperPath, 0o755);
     }
     log('✅', `vds-cli wrapper created: ${wrapperPath}`);
     log('  ', `Points to: ${vdsScriptsDir}`);
-    if (process.platform === 'win32') {
-      log('💡', 'Add to PATH:  set "PATH=.claude\\bin;%PATH%"');
-      log('  ', 'PowerShell:   $env:PATH = ".claude\\bin;$env:PATH"');
-    } else {
-      log('💡', 'Add to PATH:  export PATH=".claude/bin:$PATH"');
+
+    // Auto-register .claude/bin in CLAUDE.md so Claude Code always finds vds-cli
+    const claudeMdPath = join(projectPath, 'CLAUDE.md');
+    try {
+      const content = existsSync(claudeMdPath) ? readFileSync(claudeMdPath, 'utf-8') : '';
+      const pathExport = 'export PATH=".claude/bin:$PATH"';
+      if (!content.includes('.claude/bin')) {
+        const block = `\n\n## vds-cli PATH\n\nBefore running any \`vds-cli\` command, prepend the local bin directory:\n\`\`\`bash\n${pathExport}\n\`\`\`\nOr use the full path: \`.claude/bin/vds-cli\`\n`;
+        writeFileSync(claudeMdPath, content + block);
+        log('✅', 'PATH hint added to CLAUDE.md');
+      }
+    } catch {
+      // CLAUDE.md update is best-effort
+    }
+
+    // Also add Bash permission for .claude/bin/vds-cli in settings.local.json
+    const settingsPath = join(projectPath, '.claude', 'settings.local.json');
+    try {
+      const settings = existsSync(settingsPath)
+        ? JSON.parse(readFileSync(settingsPath, 'utf-8'))
+        : {};
+      if (!settings.permissions) settings.permissions = {};
+      if (!settings.permissions.allow) settings.permissions.allow = [];
+      const vdsRule = 'Bash(.claude/bin/vds-cli *)';
+      if (!settings.permissions.allow.some(r => r.includes('.claude/bin/vds-cli'))) {
+        settings.permissions.allow.push(vdsRule);
+        writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+        log('✅', 'vds-cli permission added to settings.local.json');
+      }
+    } catch {
+      // settings update is best-effort
     }
+
     vdsCliFound = true;
   }
 }
@@ -255,8 +291,9 @@ if (vdsScriptsDir) {
         execSync('uv sync --all-packages', {
           stdio: 'pipe',
           encoding: 'utf-8',
-          timeout: 120000,
+          timeout: 600000,
           cwd: vdsScriptsDir,
+          env: { ...process.env, UV_HTTP_TIMEOUT: '300' },
         });
         log('✅', 'All vds-scripts packages synced');
       } catch (e) {
@@ -279,7 +316,7 @@ let verified = false;
 
 // First pass: try vds-cli on PATH
 try {
-  const ver = execSync('vds-cli version', { stdio: 'pipe', encoding: 'utf-8', timeout: 15000 }).trim();
+  const ver = execSync('vds-cli version', { stdio: 'pipe', encoding: 'utf-8', timeout: 60000 }).trim();
   log('✅', `vds-cli ${ver} — working`);
   verified = true;
 } catch {
@@ -312,7 +349,7 @@ if (!verified) {
   try {
     const wrapperPath = join(projectPath, '.claude', 'bin');
     const ver = execSync('vds-cli version', {
-      stdio: 'pipe', encoding: 'utf-8', timeout: 15000,
+      stdio: 'pipe', encoding: 'utf-8', timeout: 60000,
       env: { ...process.env, PATH: `${wrapperPath}${delimiter}${process.env.PATH}` },
     }).trim();
     log('✅', `vds-cli ${ver} — working (via .claude/bin/vds-cli)`);
@@ -326,7 +363,7 @@ if (!verified) {
     if (vdsScriptsDir) {
       try {
         const uvVer = execSync(`uv run --directory ${JSON.stringify(vdsScriptsDir)} --package vds-cli vds-cli version`, {
-          stdio: 'pipe', encoding: 'utf-8', timeout: 15000,
+          stdio: 'pipe', encoding: 'utf-8', timeout: 60000,
         }).trim();
         log('  ', `Direct uv run works: ${uvVer}`);
         log('  ', 'Issue is with the wrapper script, not uv/vds-cli');

package/skills/vds-skill/vds-scripts-skill/SKILL.md

@@ -48,19 +48,22 @@ Do **not** use this skill as the authoritative deep runbook for:
 
 ## Primary Command Entry Points
 
+**Resolution order** — try each in sequence, use the first that works:
+
 ```bash
-# Via vds-cli on PATH (recommended — MCP-registered)
+# 1. Project-local wrapper (recommended — works with nvm, no PATH setup needed)
+.claude/bin/vds-cli --help
+.claude/bin/vds-cli confluence --help
+.claude/bin/vds-cli jira --help
+.claude/bin/vds-cli bitbucket --help
+
+# 2. On PATH (if user added .claude/bin to PATH or installed globally)
 vds-cli --help
-vds-cli confluence --help
-vds-cli jira --help
-vds-cli bitbucket --help
-vds-cli git --help
 
-# Direct uv invocation — project-local
+# 3. Direct uv invocation — project-local fallback
 uv run --directory .claude/vds-scripts --package vds-cli vds-cli --help
-uv run --directory .claude/vds-scripts --package audit_orchestrator vds-audit --help
 
-# Direct uv invocation — global fallback
+# 4. Direct uv invocation — global fallback
 uv run --directory ~/.claude/vds-scripts --package vds-cli vds-cli --help
 ```