@ngocsangairvds/vsaf 4.0.9 → 4.0.11

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

@@ -10,7 +10,7 @@
  *   node install-deps.mjs [projectPath]
  */
 
-import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, chmodSync } from 'fs';
 import { join, dirname } from 'path';
 import { homedir } from 'os';
 
@@ -77,7 +77,7 @@ if (!existsSync(CONFIG_FILE)) {
   const lines = [
     '# VDS Skill Pack — credential config',
     '# File: ~/.vds/sdlc-config.env',
-    '# Permissions: 600 (auto-set by credentials.sh)',
+    '# Permissions: 600 (auto-set by credentials.js)',
     '#',
     '# Fill in the values below. Skills will use these automatically.',
     '# To rotate a token: update the value here, skills pick it up next run.',
@@ -91,7 +91,10 @@ if (!existsSync(CONFIG_FILE)) {
     lines.push('');
   }
 
-  writeFileSync(CONFIG_FILE, lines.join('\n'), { mode: 0o600 });
+  writeFileSync(CONFIG_FILE, lines.join('\n'));
+  if (process.platform !== 'win32') {
+    chmodSync(CONFIG_FILE, 0o600);
+  }
   log('✅', `Config created: ${CONFIG_FILE}`);
 } else if (missing.length > 0) {
   // Append missing vars to existing config
@@ -105,7 +108,10 @@ if (!existsSync(CONFIG_FILE)) {
     }
   }
   if (appendLines.length > 1) {
-    writeFileSync(CONFIG_FILE, readFileSync(CONFIG_FILE, 'utf-8') + appendLines.join('\n'), { mode: 0o600 });
+    writeFileSync(CONFIG_FILE, readFileSync(CONFIG_FILE, 'utf-8') + appendLines.join('\n'));
+    if (process.platform !== 'win32') {
+      chmodSync(CONFIG_FILE, 0o600);
+    }
     log('✅', `Config updated: ${CONFIG_FILE}`);
   }
 } else {
@@ -184,17 +190,24 @@ try {
 if (!vdsCliFound && vdsScriptsDir) {
   const wrapperDir = join(projectPath, '.claude', 'bin');
   const wrapperPath = join(wrapperDir, 'vds-cli');
-  const uvRunner = join(vdsScriptsDir, 'scripts', 'worktree_uv.sh');
-
-  if (existsSync(uvRunner)) {
+  // 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 bash
-# Project-local vds-cli wrapper — created by vsaf install vds-skill
-# Delegates to worktree_uv.sh in the detected vds-scripts directory.
-set -euo pipefail
-exec "${uvRunner}" run --directory "${vdsScriptsDir}" --package vds-cli vds-cli "$@"
+    const wrapperContent = `#!/usr/bin/env node
+// Project-local vds-cli wrapper — created by vsaf install vds-skill
+const { execFileSync } = require('child_process');
+try {
+  execFileSync('uv', ['run', '--directory', ${JSON.stringify(vdsScriptsDir)}, '--package', 'vds-cli', 'vds-cli', ...process.argv.slice(2)], { stdio: 'inherit' });
+} catch (e) {
+  process.exit(e.status || 1);
+}
 `;
-    writeFileSync(wrapperPath, wrapperContent, { mode: 0o755 });
+    writeFileSync(wrapperPath, wrapperContent);
+    if (process.platform !== 'win32') {
+      chmodSync(wrapperPath, 0o755);
+    } else {
+      writeFileSync(wrapperPath + '.cmd', `@node "%~dp0\\vds-cli" %*\r\n`);
+    }
     log('✅', `vds-cli wrapper created: ${wrapperPath}`);
     log('  ', `Points to: ${vdsScriptsDir}`);
     log('💡', 'Add to PATH:  export PATH=".claude/bin:$PATH"');
@@ -206,39 +219,27 @@ if (!vdsCliFound) {
   log('⚠️', 'vds-cli not found — required for non-dry-run execution');
   log('  ', 'Option 1: Clone vds-scripts into .claude/vds-scripts/ then re-run install');
   log('  ', 'Option 2: Install vds-cli globally (pip install / Viettel internal)');
-  log('  ', 'Verify:   command -v vds-cli && vds-cli --version');
+  log('  ', 'Verify:   vds-cli --version');
 }
 
 // ── Step 5: Sync all vds-scripts packages (ensures subcommand binaries exist) ──
 
 if (vdsScriptsDir) {
   log('📂', `vds-scripts: ${vdsScriptsDir}`);
-  const uvRunner = join(vdsScriptsDir, 'scripts', 'worktree_uv.sh');
-  if (existsSync(uvRunner)) {
+  if (existsSync(join(vdsScriptsDir, 'pyproject.toml'))) {
     console.log('');
     log('🔄', 'Syncing vds-scripts packages (uv sync --all-packages)...');
     try {
-      execSync(`"${uvRunner}" sync --directory "${vdsScriptsDir}" --all-packages`, {
+      execSync('uv sync --all-packages', {
         stdio: 'pipe',
         encoding: 'utf-8',
         timeout: 120000,
         cwd: vdsScriptsDir,
       });
       log('✅', 'All vds-scripts packages synced');
-    } catch (e) {
-      // Fallback: try direct uv sync
-      try {
-        execSync('uv sync --all-packages', {
-          stdio: 'pipe',
-          encoding: 'utf-8',
-          timeout: 120000,
-          cwd: vdsScriptsDir,
-        });
-        log('✅', 'All vds-scripts packages synced (direct uv)');
-      } catch {
-        log('⚠️', 'Failed to sync vds-scripts packages — subcommands like confluence/jira may not work');
-        log('  ', `Fix: cd ${vdsScriptsDir} && uv sync --all-packages`);
-      }
+    } catch {
+      log('⚠️', 'Failed to sync vds-scripts packages — subcommands like confluence/jira may not work');
+      log('  ', `Fix: cd ${vdsScriptsDir} && uv sync --all-packages`);
     }
   }
 } else {
@@ -268,7 +269,8 @@ try {
   } catch {
     // Check if a shim exists but is broken
     try {
-      const shimPath = execSync('command -v vds-cli', { stdio: 'pipe', encoding: 'utf-8' }).trim();
+      const whichCmd = process.platform === 'win32' ? 'where' : 'which';
+      const shimPath = execSync(`${whichCmd} vds-cli`, { stdio: 'pipe', encoding: 'utf-8' }).trim().split('\n')[0];
       log('❌', `vds-cli BROKEN — ${shimPath} exists but fails to run`);
       log('  ', 'The shim likely points to a deleted venv or missing vds-scripts directory.');
       log('  ', `Fix: rm ${shimPath}  then re-run: vsaf install vds-skill`);

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

@@ -27,7 +27,7 @@ Wrapper for `git pull` that detects stale local knowledge index after pull and s
 Invoke the bundled script:
 
 ```bash
-bash .claude/skills/vds-skill-pull/scripts/pull.sh "$@"
+node .claude/skills/vds-skill-pull/scripts/pull.js "$@"
 ```
 
 ## Notes

package/skills/vds-skill/pull/scripts/pull.js

@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+'use strict';
+
+/**
+ * vds-skill-pull: git pull + detect stale local knowledge index.
+ * Usage: node pull.js [...git pull args]
+ * Exit: forwards git pull exit code. Advisory stale warnings never block.
+ */
+
+const { execSync } = require('child_process');
+const { existsSync, statSync } = require('fs');
+
+const args = process.argv.slice(2);
+
+// Forward git pull with all args, inherit I/O
+let exitCode = 0;
+try {
+  execSync(`git pull ${args.map(a => JSON.stringify(a)).join(' ')}`, { stdio: 'inherit' });
+} catch (err) {
+  exitCode = err.status || 1;
+  process.exit(exitCode);
+}
+
+// Skip stale check if FETCH_HEAD doesn't exist
+if (!existsSync('.git/FETCH_HEAD')) {
+  process.exit(0);
+}
+
+const fetchMtime = statSync('.git/FETCH_HEAD').mtimeMs;
+const staleReasons = [];
+
+// Check .gitnexus/
+if (existsSync('.gitnexus')) {
+  const gnMtime = statSync('.gitnexus').mtimeMs;
+  if (gnMtime < fetchMtime) {
+    staleReasons.push('.gitnexus/ index older than fetched commits');
+  }
+}
+
+// Check graphify-out/graph.json
+if (existsSync('graphify-out/graph.json')) {
+  const gMtime = statSync('graphify-out/graph.json').mtimeMs;
+  if (gMtime < fetchMtime) {
+    staleReasons.push('graphify-out/graph.json older than fetched commits');
+  }
+}
+
+if (staleReasons.length > 0) {
+  console.log('');
+  console.log('  Knowledge index may be stale after pull:');
+  for (const reason of staleReasons) {
+    console.log(`   - ${reason}`);
+  }
+  console.log('');
+  console.log('   Recommend: run /sdlc-onboard-code to rebuild GitNexus + Graphify locally.');
+  console.log('');
+}
+
+process.exit(0);

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

@@ -17,32 +17,14 @@ Publish the current PRD to Viettel Confluence via `vds-cli` — create a new pag
 Before doing anything, run this check via Bash tool:
 
 ```bash
-source .claude/skills/_shared/vds-skill/credentials.sh 2>/dev/null
-MISSING=""
-[[ -x .claude/bin/vds-cli ]] && export PATH=".claude/bin:$PATH"
-if ! vds-cli --version >/dev/null 2>&1; then
-  MISSING="$MISSING vds-cli"
-  # Show why: broken shim vs truly missing
-  VDS_PATH=$(command -v vds-cli 2>/dev/null)
-  if [[ -n "$VDS_PATH" ]]; then
-    echo "NOTE: $VDS_PATH exists but fails to run (broken shim or missing venv)"
-  fi
-fi
-[[ -z "${VDS_CONFLUENCE_TOKEN:-}" ]] && MISSING="$MISSING VDS_CONFLUENCE_TOKEN"
-[[ -z "${VDS_CONFLUENCE_SPACE_DEFAULT:-}" ]] && MISSING="$MISSING VDS_CONFLUENCE_SPACE_DEFAULT"
-if [[ -n "$MISSING" ]]; then
-  echo "BLOCKED — missing:$MISSING"
-  echo "Fix: edit ~/.vds/sdlc-config.env (or run: vsaf install vds-skill)"
-else
-  echo "OK"
-fi
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_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.
 
 ## Prerequisites
 
-- `vds-cli` installed (`command -v vds-cli`)
+- `vds-cli` installed
 - A PRD markdown file must exist
 - `VDS_CONFLUENCE_TOKEN` + `VDS_CONFLUENCE_SPACE_DEFAULT` in `~/.vds/sdlc-config.env`
 - Confluence parent page configured in `.vsaf/config.yaml` (or lazy-prompted)
@@ -63,7 +45,7 @@ Read `.vsaf/config.yaml` (or `.vsaf/_bmad/bmm/config.yaml`) and extract:
 - `confluence_space_key`
 - `confluence_parent_page`
 
-If missing: lazy-prompt + persist via `_shared/credentials.sh ensure_env`.
+If missing: lazy-prompt + persist via `_shared/credentials.js ensureEnv`.
 
 ### Step 3 — Determine page title
 
@@ -150,9 +132,6 @@ Save converted XHTML to a temp file: `BODY_FILE=$(mktemp --suffix=.html)`.
 Use Bash tool to run:
 
 ```bash
-source .claude/skills/_shared/vds-skill/credentials.sh
-ensure_env VDS_CONFLUENCE_TOKEN "Enter VDS Confluence personal access token"
-
 SPACE_KEY="<from config>"
 PAGE_TITLE="<title from Step 3>"
 
@@ -160,8 +139,9 @@ SEARCH_RESULT=$(vds-cli confluence search \
     --cql "space=$SPACE_KEY AND title = \"$PAGE_TITLE\"" \
     --limit 1 --json-only)
 
-EXISTING_PAGE_ID=$(echo "$SEARCH_RESULT" | python3 -c \
-    'import json,sys; d=json.load(sys.stdin); print(d["results"][0]["id"] if d.get("results") else "")')
+EXISTING_PAGE_ID=$(node -e \
+    "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')); process.stdout.write(d.results?.[0]?.id ?? '');" \
+    <<< "$SEARCH_RESULT")
 ```
 
 If `$EXISTING_PAGE_ID` non-empty → Step 6 (update). Otherwise → Step 7 (create).
@@ -169,8 +149,9 @@ If `$EXISTING_PAGE_ID` non-empty → Step 6 (update). Otherwise → Step 7 (crea
 ### Step 6 — Update existing page (via vds-cli)
 
 ```bash
-EXISTING_VERSION=$(echo "$SEARCH_RESULT" | python3 -c \
-    'import json,sys; d=json.load(sys.stdin); print(d["results"][0].get("version",{}).get("number",1))')
+EXISTING_VERSION=$(node -e \
+    "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')); process.stdout.write(String(d.results?.[0]?.version?.number ?? 1));" \
+    <<< "$SEARCH_RESULT")
 
 VERSION_COMMENT="${COMMENT:-Updated via vds-skill-push-prd}"
 
@@ -188,7 +169,7 @@ rm -f "$BODY_FILE"
 
 ```bash
 LATEST_VERSION=$(vds-cli confluence content page "$EXISTING_PAGE_ID" --json-only \
-    | python3 -c 'import json,sys; print(json.load(sys.stdin)["version"]["number"])')
+    | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')); process.stdout.write(String(d.version.number));")
 
 vds-cli confluence content update \
     --page-id "$EXISTING_PAGE_ID" \
@@ -207,7 +188,7 @@ if [[ -n "$CONFLUENCE_PARENT_PAGE" ]]; then
     PARENT_ID=$(vds-cli confluence search \
         --cql "space=$SPACE_KEY AND title = \"$CONFLUENCE_PARENT_PAGE\"" \
         --limit 1 --json-only \
-        | python3 -c 'import json,sys; d=json.load(sys.stdin); print(d["results"][0]["id"] if d.get("results") else "")')
+        | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')); process.stdout.write(d.results?.[0]?.id ?? '');")
 fi
 
 CREATE_ARGS=(vds-cli confluence content create-page

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

@@ -17,24 +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
-source .claude/skills/_shared/vds-skill/credentials.sh 2>/dev/null
-MISSING=""
-[[ -x .claude/bin/vds-cli ]] && export PATH=".claude/bin:$PATH"
-if ! vds-cli --version >/dev/null 2>&1; then
-  MISSING="$MISSING vds-cli"
-  VDS_PATH=$(command -v vds-cli 2>/dev/null)
-  if [[ -n "$VDS_PATH" ]]; then
-    echo "NOTE: $VDS_PATH exists but fails to run (broken shim or missing venv)"
-  fi
-fi
-[[ -z "${VDS_CONFLUENCE_TOKEN:-}" ]] && MISSING="$MISSING VDS_CONFLUENCE_TOKEN"
-[[ -z "${VDS_CONFLUENCE_SPACE_DEFAULT:-}" ]] && MISSING="$MISSING VDS_CONFLUENCE_SPACE_DEFAULT"
-if [[ -n "$MISSING" ]]; then
-  echo "BLOCKED — missing:$MISSING"
-  echo "Fix: edit ~/.vds/sdlc-config.env (or run: vsaf install vds-skill)"
-else
-  echo "OK"
-fi
+node .claude/skills/_shared/vds-skill/config-check.js --cmd vds-cli --env VDS_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.
@@ -84,9 +67,6 @@ Same as `/vds-skill-push-prd` Step 7. Use `Initial SRS push via vds-skill-push-s
 ### Step 8 — Link SRS page to PRD page (if PRD exists)
 
 ```bash
-source .claude/skills/_shared/vds-skill/credentials.sh
-ensure_env VDS_CONFLUENCE_TOKEN "Enter VDS Confluence personal access token"
-
 # Derive PRD page title from feature name
 FEATURE_NAME="<from folder>"
 PRD_TITLE="[PRD] $FEATURE_NAME"
@@ -95,8 +75,9 @@ PRD_PAGE=$(vds-cli confluence search \
     --cql "space=$SPACE_KEY AND title = \"$PRD_TITLE\"" \
     --limit 1 --json-only)
 
-PRD_URL=$(echo "$PRD_PAGE" | python3 -c \
-    'import json,sys; d=json.load(sys.stdin); r=d.get("results"); print(r[0].get("url","") if r else "")')
+PRD_URL=$(node -e \
+    "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')); process.stdout.write(d.results?.[0]?.url ?? '');" \
+    <<< "$PRD_PAGE")
 
 if [[ -n "$PRD_URL" ]]; then
     # Prepend "Related Documents" macro to SRS body BEFORE push (modify $BODY_FILE)

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

@@ -12,26 +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
-source .claude/skills/_shared/vds-skill/credentials.sh 2>/dev/null
-MISSING=""
-[[ -x .claude/bin/vds-cli ]] && export PATH=".claude/bin:$PATH"
-if ! vds-cli --version >/dev/null 2>&1; then
-  MISSING="$MISSING vds-cli"
-  VDS_PATH=$(command -v vds-cli 2>/dev/null)
-  if [[ -n "$VDS_PATH" ]]; then
-    echo "NOTE: $VDS_PATH exists but fails to run (broken shim or missing venv)"
-  fi
-fi
-[[ -z "${VDS_CONFLUENCE_TOKEN:-}" ]] && MISSING="$MISSING VDS_CONFLUENCE_TOKEN"
-[[ -z "${VDS_JIRA_TOKEN:-}" ]] && MISSING="$MISSING VDS_JIRA_TOKEN"
-[[ -z "${VDS_CONFLUENCE_SPACE_DEFAULT:-}" ]] && MISSING="$MISSING VDS_CONFLUENCE_SPACE_DEFAULT"
-[[ -z "${VDS_JIRA_PROJECT_DEFAULT:-}" ]] && MISSING="$MISSING VDS_JIRA_PROJECT_DEFAULT"
-if [[ -n "$MISSING" ]]; then
-  echo "BLOCKED — missing:$MISSING"
-  echo "Fix: edit ~/.vds/sdlc-config.env (or run: vsaf install vds-skill)"
-else
-  echo "OK"
-fi
+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
 ```
 
 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.
@@ -39,7 +20,6 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 ## Prerequisites
 
 - `vds-cli` installed
-- `python3` 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`
 
@@ -62,7 +42,7 @@ If BLOCKED: tell the user exactly what's missing and how to fix, then STOP. Do N
 ## Implementation
 
 ```bash
-bash .claude/skills/vds-skill-search-confluence/scripts/search.sh "$@"
+node .claude/skills/vds-skill-search-confluence/scripts/search.js "$@"
 ```
 
 ## Notes

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

@@ -0,0 +1,114 @@
+#!/usr/bin/env node
+'use strict';
+
+const { execFileSync } = require('child_process');
+const { existsSync, mkdirSync, writeFileSync } = require('fs');
+const { join } = require('path');
+// NOTE: path matches DEPLOYED location (.claude/skills/_shared/vds-skill/), not source repo
+const { loadCredentials, ensureEnv, requireCommand } = require('../../_shared/vds-skill/credentials.js');
+
+let feature = '';
+let query = '';
+let days = 180;
+let limit = 30;
+let dryRun = false;
+
+const args = process.argv.slice(2);
+for (let i = 0; i < args.length; i++) {
+  switch (args[i]) {
+    case '--feature': feature = args[++i]; break;
+    case '--query': query = args[++i]; break;
+    case '--days': days = parseInt(args[++i], 10); break;
+    case '--limit': limit = parseInt(args[++i], 10); break;
+    case '--dry-run': dryRun = true; break;
+    default:
+      process.stderr.write(`Unknown arg: ${args[i]}\n`);
+      process.exit(2);
+  }
+}
+
+if (!feature) { process.stderr.write('ERROR: --feature is required\n'); process.exit(2); }
+if (!query) { process.stderr.write('ERROR: --query (search keywords) is required\n'); process.exit(2); }
+
+const outDir = join('.vsaf', 'docs', 'features', feature);
+const outJson = join(outDir, '01-discovery-historical.json');
+const outMd = join(outDir, '01-discovery-historical.md');
+
+if (dryRun) {
+  loadCredentials();
+  const space = process.env.VDS_CONFLUENCE_SPACE_DEFAULT || '<VDS_CONFLUENCE_SPACE_DEFAULT>';
+  const project = process.env.VDS_JIRA_PROJECT_DEFAULT || '<VDS_JIRA_PROJECT_DEFAULT>';
+  const cql = `space=${space} AND text ~ "${query}" AND lastmodified > now("-${days}d")`;
+  const jql = `project = ${project} AND text ~ "${query}" AND created > -${days}d ORDER BY created DESC`;
+  console.log('DRY-RUN — would execute:');
+  console.log(`  vds-cli confluence search --cql "${cql}" --limit ${limit} --json-only`);
+  console.log(`  vds-cli jira search "${jql}" --limit ${limit} --json-only`);
+  console.log(`  Write to: ${outJson} + ${outMd}`);
+  process.exit(0);
+}
+
+loadCredentials();
+
+const cmdCheck = requireCommand('vds-cli');
+if (!cmdCheck.found) {
+  process.stderr.write('ERROR: vds-cli not found in PATH\n');
+  if (cmdCheck.broken) process.stderr.write(`NOTE: ${cmdCheck.path} exists but fails to run (broken shim or missing venv)\n`);
+  process.exit(127);
+}
+
+(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('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);
+
+  const space = process.env.VDS_CONFLUENCE_SPACE_DEFAULT;
+  const project = process.env.VDS_JIRA_PROJECT_DEFAULT;
+  const cql = `space=${space} AND text ~ "${query}" AND lastmodified > now("-${days}d")`;
+  const jql = `project = ${project} AND text ~ "${query}" AND created > -${days}d ORDER BY created DESC`;
+
+  mkdirSync(outDir, { recursive: true });
+
+  console.log(`Searching Confluence (limit ${limit}, last ${days}d)...`);
+  let confResults;
+  try {
+    const stdout = execFileSync('vds-cli', ['confluence', 'search', '--cql', cql, '--limit', String(limit), '--json-only'], {
+      encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    confResults = JSON.parse(stdout);
+  } catch { confResults = { results: [] }; }
+
+  console.log(`Searching Jira (limit ${limit}, last ${days}d)...`);
+  let jiraResults;
+  try {
+    const stdout = execFileSync('vds-cli', ['jira', 'search', jql, '--limit', String(limit), '--json-only'], {
+      encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    jiraResults = JSON.parse(stdout);
+  } catch { jiraResults = { issues: [] }; }
+
+  const combined = { query, days_back: days, confluence: confResults.results || [], jira: jiraResults.issues || [] };
+  writeFileSync(outJson, JSON.stringify(combined, null, 2) + '\n');
+
+  const lines = [
+    `# Discovery Historical Context — ${query}`, '',
+    `> Generated by /vds-skill-search-confluence — searched last ${days} days`, '',
+    `## Confluence pages (${combined.confluence.length} results)`, '',
+  ];
+  for (const page of combined.confluence.slice(0, 10)) {
+    const title = page.title || '<no title>';
+    const url = page.url || (page._links && page._links.webui) || '';
+    const modified = page.lastModified || (page.version && page.version.when) || '?';
+    lines.push(`- [${title}](${url}) — modified ${modified}`);
+  }
+  lines.push('', `## Jira tickets (${combined.jira.length} results)`, '');
+  for (const issue of combined.jira.slice(0, 15)) {
+    const key = issue.key || '?';
+    const summary = (issue.fields && issue.fields.summary) || '<no summary>';
+    const status = (issue.fields && issue.fields.status && issue.fields.status.name) || '?';
+    lines.push(`- **${key}** — ${summary} (${status})`);
+  }
+  writeFileSync(outMd, lines.join('\n') + '\n');
+  console.log(`Wrote: ${outJson}`);
+  console.log(`Wrote: ${outMd}`);
+})();

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

@@ -57,11 +57,11 @@ vds-cli bitbucket --help
 vds-cli git --help
 
 # Direct uv invocation — project-local
-.claude/vds-scripts/scripts/worktree_uv.sh run --directory .claude/vds-scripts --package vds-cli vds-cli --help
-.claude/vds-scripts/scripts/worktree_uv.sh run --directory .claude/vds-scripts --package audit_orchestrator vds-audit --help
+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
-~/.claude/vds-scripts/scripts/worktree_uv.sh run --directory ~/.claude/vds-scripts --package vds-cli vds-cli --help
+uv run --directory ~/.claude/vds-scripts --package vds-cli vds-cli --help
 ```
 
 ## Platform Command Families

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

@@ -1,79 +0,0 @@
-#!/bin/bash
-# Shared credential helper for vds-skill-* skills.
-# Sourced by skill scripts to lazy-prompt + persist credentials.
-# Config file: ~/.vds/sdlc-config.env (chmod 600)
-#
-# Portable across bash and zsh (uses eval for indirect expansion).
-
-VSAF_CONFIG_FILE="${VSAF_CONFIG_FILE:-$HOME/.vds/sdlc-config.env}"
-readonly VSAF_CONFIG_FILE
-
-# Load existing config if present
-if [[ -f "$VSAF_CONFIG_FILE" ]]; then
-    # shellcheck source=/dev/null
-    source "$VSAF_CONFIG_FILE"
-fi
-
-# Also load vds-cli's own env if present (for token reuse)
-if [[ -f "$HOME/.vds/.env" ]]; then
-    set -a
-    # shellcheck source=/dev/null
-    source "$HOME/.vds/.env"
-    set +a
-fi
-
-# ensure_env VAR_NAME "Prompt message" [is_secret]
-# Prompts user if VAR is empty, persists to config file.
-# Re-persists if VAR is pre-set (supports token rotation).
-ensure_env() {
-    local var="$1"
-    local prompt="${2:-Enter $var}"
-    local is_secret="${3:-true}"
-
-    # Portable indirect expansion (works in both bash and zsh)
-    local value
-    eval "value=\${$var:-}"
-
-    if [[ -z "$value" ]]; then
-        # Prompt user
-        if [[ "$is_secret" == "true" ]]; then
-            read -rsp "$prompt: " value
-            echo "" >&2
-        else
-            read -rp "$prompt: " value
-        fi
-
-        if [[ -z "$value" ]]; then
-            echo "ERROR: $var is required" >&2
-            return 1
-        fi
-
-        export "$var=$value"
-    fi
-
-    # Persist to config file (idempotent — replace existing entry or append)
-    mkdir -p "$(dirname "$VSAF_CONFIG_FILE")" || { echo "ERROR: Cannot create config dir $(dirname "$VSAF_CONFIG_FILE")" >&2; return 1; }
-
-    if grep -q "^${var}=" "$VSAF_CONFIG_FILE" 2>/dev/null; then
-        # Update in place (BSD/GNU sed compatible via tmp file)
-        local tmp
-        tmp=$(mktemp) || { echo "ERROR: mktemp failed" >&2; return 1; }
-        trap 'rm -f "$tmp"' EXIT INT TERM
-        grep -v "^${var}=" "$VSAF_CONFIG_FILE" > "$tmp"
-        printf '%s=%q\n' "$var" "$value" >> "$tmp"
-        mv "$tmp" "$VSAF_CONFIG_FILE"
-        trap - EXIT INT TERM
-    else
-        printf '%s=%q\n' "$var" "$value" >> "$VSAF_CONFIG_FILE"
-    fi
-    chmod 600 "$VSAF_CONFIG_FILE" || echo "WARN: Could not set chmod 600 on $VSAF_CONFIG_FILE" >&2
-}
-
-# require_command COMMAND_NAME — exits 127 if missing
-require_command() {
-    if ! command -v "$1" >/dev/null 2>&1; then
-        echo "ERROR: Required command '$1' not found in PATH" >&2
-        echo "       Install it before running this skill." >&2
-        return 127
-    fi
-}