@ngocsangairvds/vsaf 3.2.13 → 3.2.15

package/bin/vsaf.js

@@ -11,6 +11,7 @@ USAGE
   vsaf global     Install global infra only  (skills, binaries)
   vsaf project    Scaffold project files only (assumes global done)
   vsaf status     Show installation status
+  vsaf config env Edit ~/.vds/.env (add/edit/delete keys interactively)
   vsaf index               Re-index codebase (discovers git root)
   vsaf index --skip-git    Re-index from CWD (skip git root discovery)
   vsaf serve      Start GitNexus web UI server
@@ -65,6 +66,18 @@ async function main() {
       await showStatus();
       break;
     }
+    case 'config': {
+      const sub = process.argv[3];
+      if (sub === 'env') {
+        const { runConfigEnv } = require('../src/config');
+        runAndExit(await runConfigEnv(), 'Config env');
+      } else {
+        console.error(`Unknown config subcommand: ${sub || '(missing)'}`);
+        console.error('Available: vsaf config env');
+        process.exit(1);
+      }
+      break;
+    }
     case 'index': {
       const { runIndex } = require('../src/workflow');
       const skipGit = process.argv.includes('--skip-git');

package/package.json

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

package/src/config.js

@@ -0,0 +1,167 @@
+'use strict';
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+const { ok, info, warn, step, promptInput, promptSecret } = require('./utils');
+
+const ENV_FILE = path.join(os.homedir(), '.vds', '.env');
+const SECRET_KEY_RE = /password|token|secret|api[_-]?key/i;
+const VALID_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+
+function isSecret(key) {
+  return SECRET_KEY_RE.test(key);
+}
+
+function maskValue(value) {
+  if (!value) return '(empty)';
+  return '*'.repeat(8);
+}
+
+function parseEnvFile(content) {
+  const entries = [];
+  const lines = content.split('\n');
+  if (lines.length && lines[lines.length - 1] === '') lines.pop();
+  for (const rawLine of lines) {
+    const line = rawLine.replace(/\r$/, '');
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) {
+      entries.push({ type: 'other', raw: line });
+      continue;
+    }
+    const eq = line.indexOf('=');
+    if (eq < 0) {
+      entries.push({ type: 'other', raw: line });
+      continue;
+    }
+    const key = line.slice(0, eq).trim();
+    if (!key) {
+      entries.push({ type: 'other', raw: line });
+      continue;
+    }
+    entries.push({ type: 'kv', key, value: line.slice(eq + 1) });
+  }
+  return entries;
+}
+
+function serializeEntries(entries) {
+  return entries.map(e => e.type === 'kv' ? `${e.key}=${e.value}` : e.raw).join('\n') + '\n';
+}
+
+function kvIndexes(entries) {
+  const out = [];
+  entries.forEach((e, i) => { if (e.type === 'kv') out.push(i); });
+  return out;
+}
+
+function printState(entries) {
+  const kvList = kvIndexes(entries);
+  console.log(`\n\x1b[1mCurrent keys (${kvList.length}):\x1b[0m`);
+  if (!kvList.length) {
+    console.log('  (no keys)');
+  } else {
+    const maxLen = kvList.reduce((m, idx) => Math.max(m, entries[idx].key.length), 0);
+    kvList.forEach((entryIdx, i) => {
+      const e = entries[entryIdx];
+      const display = isSecret(e.key) ? maskValue(e.value) : (e.value || '(empty)');
+      const num = String(i + 1).padStart(2, ' ');
+      console.log(`  ${num}. ${e.key.padEnd(maxLen)} = ${display}`);
+    });
+  }
+  console.log('\n\x1b[1mCommands:\x1b[0m');
+  console.log('  [number]    Sửa key theo số thứ tự');
+  console.log('  a           Thêm key mới');
+  console.log('  d <number>  Xóa key theo số thứ tự');
+  console.log('  s           Lưu và thoát');
+  console.log('  q           Thoát không lưu');
+}
+
+async function confirm(question) {
+  const ans = (await promptInput(question)).toLowerCase();
+  return ans === 'y' || ans === 'yes';
+}
+
+async function runConfigEnv() {
+  step(`VSAF Config — ${ENV_FILE}`);
+
+  if (!fs.existsSync(ENV_FILE)) {
+    warn(`File chưa tồn tại: ${ENV_FILE}`);
+    info('Chạy `vsaf init` (hoặc `vsaf global`) để khởi tạo trước.');
+    return false;
+  }
+
+  const original = fs.readFileSync(ENV_FILE, 'utf8');
+  const entries = parseEnvFile(original);
+  let dirty = false;
+
+  while (true) {
+    printState(entries);
+    const choice = await promptInput('\n> ');
+    if (!choice) continue;
+
+    if (choice === 'q' || choice === 'quit') {
+      if (dirty && !(await confirm('Có thay đổi chưa lưu — thoát luôn? (y/N): '))) continue;
+      info('Thoát mà không lưu.');
+      return true;
+    }
+
+    if (choice === 's' || choice === 'save') {
+      fs.writeFileSync(ENV_FILE, serializeEntries(entries));
+      ok(`Đã lưu ${ENV_FILE}`);
+      return true;
+    }
+
+    if (choice === 'a' || choice === 'add') {
+      const key = await promptInput('  Tên key mới: ');
+      if (!key) { warn('Bỏ qua — key rỗng.'); continue; }
+      if (!VALID_KEY_RE.test(key)) { warn('Key không hợp lệ (chỉ chữ/số/_, không bắt đầu bằng số).'); continue; }
+      if (entries.some(e => e.type === 'kv' && e.key === key)) {
+        warn(`Key "${key}" đã tồn tại — chọn số tương ứng để sửa.`);
+        continue;
+      }
+      const value = isSecret(key)
+        ? await promptSecret(`  Giá trị ${key}: `)
+        : await promptInput(`  Giá trị ${key}: `);
+      entries.push({ type: 'kv', key, value });
+      dirty = true;
+      ok(`Đã thêm ${key}`);
+      continue;
+    }
+
+    const deleteMatch = choice.match(/^d\s+(\d+)$/);
+    if (deleteMatch) {
+      const kvList = kvIndexes(entries);
+      const entryIdx = kvList[parseInt(deleteMatch[1], 10) - 1];
+      if (entryIdx === undefined) { warn('Số không hợp lệ.'); continue; }
+      const key = entries[entryIdx].key;
+      if (await confirm(`  Xóa "${key}"? (y/N): `)) {
+        entries.splice(entryIdx, 1);
+        dirty = true;
+        ok(`Đã xóa ${key}`);
+      }
+      continue;
+    }
+
+    if (/^\d+$/.test(choice)) {
+      const kvList = kvIndexes(entries);
+      const entryIdx = kvList[parseInt(choice, 10) - 1];
+      if (entryIdx === undefined) { warn('Số không hợp lệ.'); continue; }
+      const e = entries[entryIdx];
+      const display = isSecret(e.key) ? maskValue(e.value) : (e.value || '(empty)');
+      const value = isSecret(e.key)
+        ? await promptSecret(`  ${e.key} (current: ${display}, Enter để giữ): `)
+        : await promptInput(`  ${e.key} (current: ${display}, Enter để giữ): `);
+      if (value !== '') {
+        e.value = value;
+        dirty = true;
+        ok(`Đã cập nhật ${e.key}`);
+      } else {
+        info(`Giữ nguyên ${e.key}.`);
+      }
+      continue;
+    }
+
+    warn(`Lệnh không hiểu: "${choice}"`);
+  }
+}
+
+module.exports = { runConfigEnv };

package/src/global.js

@@ -1,8 +1,7 @@
 'use strict';
 const path = require('path');
 const fs = require('fs');
-const readline = require('readline');
-const { ok, info, warn, step, hasCommand, exec, copyDir, copyFile, CLAUDE_HOME, CODEX_HOME } = require('./utils');
+const { ok, info, warn, step, hasCommand, exec, copyDir, copyFile, CLAUDE_HOME, CODEX_HOME, promptInput, promptSecret } = require('./utils');
 
 const PKG_ROOT = path.join(__dirname, '..');
 const SKILLS_SRC = path.join(PKG_ROOT, 'tools', 'skills');
@@ -87,16 +86,19 @@ function installVdsCliwrapper(vdsRoot) {
     fs.mkdirSync(wrapperDir, { recursive: true });
     fs.writeFileSync(wrapperPath, [
       '@echo off',
+      'setlocal',
       `set "ROOT=${vdsRoot}"`,
       `set "VENV=%ROOT%\\.venv"`,
       `if exist "%USERPROFILE%\\.vds\\.env" (`,
-      `  for /f "usebackq tokens=*" %%a in ("%USERPROFILE%\\.vds\\.env") do set "%%a"`,
+      `  for /f "usebackq eol=# tokens=1,* delims==" %%a in ("%USERPROFILE%\\.vds\\.env") do (`,
+      `    if not "%%a"=="" if not "%%b"=="" set "%%a=%%b"`,
+      `  )`,
       `)`,
       `"%VENV%\\Scripts\\vds-cli.exe" %*`,
+      'endlocal',
     ].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}`);
+    ensureWindowsPath(wrapperDir);
   } else {
     const wrapperDir = path.join(os.homedir(), '.local', 'bin');
     const wrapperPath = path.join(wrapperDir, 'vds-cli');
@@ -118,6 +120,33 @@ function installVdsCliwrapper(vdsRoot) {
   }
 }
 
+function ensureWindowsPath(wrapperDir) {
+  const { execSync } = require('child_process');
+  try {
+    const currentUserPath = (execSync(
+      `powershell -NoProfile -Command "[Environment]::GetEnvironmentVariable('Path','User')"`,
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] }
+    ) || '').trim();
+
+    const segments = currentUserPath.split(';').filter(Boolean);
+    const target = wrapperDir.replace(/\\+$/, '').toLowerCase();
+    if (segments.some(p => p.replace(/\\+$/, '').toLowerCase() === target)) {
+      ok(`PATH đã có ${wrapperDir}`);
+      return;
+    }
+
+    const newPath = currentUserPath ? `${currentUserPath};${wrapperDir}` : wrapperDir;
+    execSync(
+      `powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', $env:VSAF_NEW_PATH, 'User')"`,
+      { stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env, VSAF_NEW_PATH: newPath } }
+    );
+    ok(`Đã thêm ${wrapperDir} vào user PATH`);
+    warn('Mở terminal mới để PATH có hiệu lực.');
+  } catch {
+    warn(`Không thể tự thêm PATH. Vui lòng thêm thủ công: ${wrapperDir}`);
+  }
+}
+
 async function setupVdsScriptsMcp() {
   step('VDS Scripts MCP');
 
@@ -229,50 +258,4 @@ async function ensureVidpEnv(envFile) {
   ok('Đã thêm cấu hình VIDP vào ~/.vds/.env');
 }
 
-function promptInput(question) {
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(question, (answer) => { rl.close(); resolve(answer.trim()); });
-  });
-}
-
-function promptSecret(question) {
-  return new Promise((resolve) => {
-    // Non-TTY (CI, pipe): fall back to plain readline without hiding
-    if (!process.stdin.isTTY) {
-      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-      rl.question(question, (answer) => { rl.close(); resolve(answer.trim()); });
-      return;
-    }
-
-    process.stdout.write(question);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-
-    let input = '';
-    const onData = (buf) => {
-      const ch = buf.toString('utf8');
-      if (ch === '\r' || ch === '\n' || ch === '\x00') {
-        // Enter — done
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
-        process.stdout.write('\n');
-        process.stdin.removeListener('data', onData);
-        resolve(input.trim());
-      } else if (ch === '\x03') {
-        // Ctrl+C
-        process.stdout.write('\n');
-        process.exit(0);
-      } else if (ch === '\x7f' || ch === '\b') {
-        // Backspace
-        input = input.slice(0, -1);
-      } else {
-        input += ch;
-      }
-    };
-
-    process.stdin.on('data', onData);
-  });
-}
-
 module.exports = { installGlobal, setupVdsScriptsMcp };

package/src/utils.js

@@ -3,6 +3,7 @@ const { execSync, spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const readline = require('readline');
 
 const CLAUDE_HOME = path.join(os.homedir(), '.claude');
 const CODEX_HOME  = path.join(os.homedir(), '.codex');
@@ -80,4 +81,46 @@ function getPlatform() {
   return 'linux';
 }
 
-module.exports = { ok, info, warn, step, hasCommand, exec, copyDir, copyFile, CLAUDE_HOME, CODEX_HOME, getPlatform, hasGitCommits, cleanStaleWal };
+function promptInput(question) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(question, (answer) => { rl.close(); resolve(answer.trim()); });
+  });
+}
+
+function promptSecret(question) {
+  return new Promise((resolve) => {
+    if (!process.stdin.isTTY) {
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      rl.question(question, (answer) => { rl.close(); resolve(answer.trim()); });
+      return;
+    }
+
+    process.stdout.write(question);
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+
+    let input = '';
+    const onData = (buf) => {
+      const ch = buf.toString('utf8');
+      if (ch === '\r' || ch === '\n' || ch === '\x00') {
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+        process.stdout.write('\n');
+        process.stdin.removeListener('data', onData);
+        resolve(input.trim());
+      } else if (ch === '\x03') {
+        process.stdout.write('\n');
+        process.exit(0);
+      } else if (ch === '\x7f' || ch === '\b') {
+        input = input.slice(0, -1);
+      } else {
+        input += ch;
+      }
+    };
+
+    process.stdin.on('data', onData);
+  });
+}
+
+module.exports = { ok, info, warn, step, hasCommand, exec, copyDir, copyFile, CLAUDE_HOME, CODEX_HOME, getPlatform, hasGitCommits, cleanStaleWal, promptInput, promptSecret };

package/tools/vds-scripts/Makefile

@@ -6,16 +6,16 @@
 #
 # Tiers (per ADR-INF-10):
 #   - Tier 1 docker-compose.infra.yml     : postgres, redis, qdrant
-#   - Tier 2 docker-compose.services.yml  : memory-api/worker, scheduler, multi-agent (long-running)
-#   - Tier 3 docker-compose.cli.yml       : audit, pdf, progress, db-query, vds-cli, mcp-server (CLI)
+#   - Tier 2 docker-compose.services.yml  : memory-api/worker, scheduler (long-running)
+#   - Tier 3 docker-compose.cli.yml       : db-query, vds-cli, mcp-server (CLI)
 #
 # Long-running services use `up -d` (`make up-memory`, etc.).
-# CLI containers use `run --rm` (`make run-audit ARGS="workflow run --project X"`).
+# CLI containers use `run --rm` (`make run-db-query ARGS="query ..."`).
 
 .PHONY: help \
         env-link \
-        up-infra up-memory up-scheduler up-multi-agent up-services \
-        run-audit run-audit-migrate run-pdf run-progress run-progress-migrate run-db-query run-vds-cli \
+        up-infra up-memory up-scheduler up-services \
+        run-db-query run-vds-cli \
         down restart status verify build-cli clean-volumes
 
 # Hybrid project-identity anchor: -p flag + `name: vds-platform` in compose YAML
@@ -59,10 +59,7 @@ up-scheduler: env-link ## Start infra + scheduler-orchestrator (rebuilds image;
 	# Phase 217 HTTP refactor: scheduler depends_on memory-api; activate both --profile scheduler and --profile memory.
 	$(DC) $(SERVICES) --profile scheduler --profile memory up -d $(BUILD_FLAG)
 
-up-multi-agent: env-link ## Start infra + multi-agent-orchestrator (rebuilds image; set NO_BUILD=1 to skip)
-	$(DC) $(SERVICES) --profile multi-agent up -d $(BUILD_FLAG)
-
-up-services: env-link ## Start infra + all 4 long-running services (rebuilds images; set NO_BUILD=1 to skip)
+up-services: env-link ## Start infra + long-running services (rebuilds images; set NO_BUILD=1 to skip)
 	# Tier 3B retired in v2.15.10 (ADR-INF-10): long-running services only need services.yml.
 	$(DC) $(SERVICES) --profile full up -d $(BUILD_FLAG)
 
@@ -70,25 +67,6 @@ up-services: env-link ## Start infra + all 4 long-running services (rebuilds ima
 # Override ARGS to pass subcommands. ARGS defaults to --help.
 ARGS ?= --help
 
-run-audit: env-link ## Run audit CLI (set ARGS="workflow run --project X")
-	$(DC) $(CLI) --profile audit run --rm audit-orchestrator $(ARGS)
-
-# v2.15.10 (ADR-INF-10): Tier 3B migrate containers retired.
-# Migrations run via --entrypoint override against the orchestrator service container.
-run-audit-migrate: env-link ## Run audit Alembic migrations to head (one-shot)
-	$(DC) $(CLI) --profile audit run --rm --no-deps --entrypoint /opt/venv/bin/alembic audit-orchestrator -c /app/audit_orchestrator/alembic.ini upgrade head
-
-run-pdf: env-link ## Run pdf CLI (set ARGS="merge a.pdf b.pdf -o c.pdf")
-	$(DC) $(CLI) --profile pdf run --rm pdf-orchestrator $(ARGS)
-
-run-progress: env-link ## Run progress CLI (set ARGS="generate --project X")
-	$(DC) $(CLI) --profile progress run --rm progress-report-orchestrator $(ARGS)
-
-# v2.15.10 (ADR-INF-10): Tier 3B migrate containers retired.
-# Migrations run via --entrypoint override against the orchestrator service container.
-run-progress-migrate: env-link ## Run progress Alembic migrations to head (one-shot)
-	$(DC) $(CLI) --profile progress run --rm --no-deps --entrypoint /opt/venv/bin/alembic progress-report-orchestrator -c /app/progress_report_orchestrator/alembic.ini upgrade head
-
 run-db-query: env-link ## Run db-query CLI (set ARGS="query --connection prod -q 'SELECT 1'")
 	$(DC) $(CLI) --profile db-query run --rm db-query-orchestrator $(ARGS)
 
@@ -97,7 +75,7 @@ run-vds-cli: env-link ## Run unified vds-cli router (set ARGS="<service> <comman
 
 # === Build / build CLI images ahead of time ================================
 
-build-cli: ## Pre-build all 6 CLI images (audit, pdf, progress, db-query, vds-cli, mcp-server)
+build-cli: ## Pre-build CLI images (db-query, vds-cli, mcp-server)
 	$(DC) $(CLI) --profile cli build
 
 # === Lifecycle =============================================================
@@ -114,6 +92,6 @@ verify: ## Run topology verification (stdlib python3, no uv)
 	python3 scripts/verify-infra-topology.py --profile infra
 
 clean-volumes: ## Remove all VDS-managed volumes (DESTRUCTIVE — prompts first)
-	@echo "About to remove: vds_postgres_data vds_redis_data vds_qdrant_data vds-audit-cache vds-memory-logs vds-pdf-cache vds-progress-cache"
+	@echo "About to remove: vds_postgres_data vds_redis_data vds_qdrant_data vds-memory-logs"
 	@read -p "Type YES to confirm: " confirm && [ "$$confirm" = "YES" ] || (echo "Aborted." && exit 1)
-	docker volume rm -f vds_postgres_data vds_redis_data vds_qdrant_data vds-audit-cache vds-memory-logs vds-pdf-cache vds-progress-cache 2>/dev/null || true
+	docker volume rm -f vds_postgres_data vds_redis_data vds_qdrant_data vds-memory-logs 2>/dev/null || true

package/tools/vds-scripts/docker/docker-compose.cli.yml

@@ -6,7 +6,7 @@
 # (CLI-only). All share `restart: "no"` + exit-0 contract.
 #
 # Migration commands: see docs/agents/reference/migration-playbook.md
-# Profiles: audit | pdf | progress | db-query | vds-cli | mcp-server | cli
+# Profiles: db-query | vds-cli | mcp-server | cli
 # =============================================================================
 
 # Must match docker-compose.infra.yml + docker-compose.services.yml so all
@@ -26,112 +26,6 @@ x-logging-default: &logging-default
     max-file: "3"
 
 services:
-  # ---------------------------------------------------------------------------
-  # Audit Orchestrator (CLI; postgres-backed via audit_state schema)
-  # ---------------------------------------------------------------------------
-  # Migrations are run as an explicit operator step (NOT a depends_on dependency).
-  # Tier 3B sub-shape (auto-init migrate container) retired in v2.15.10 per
-  # ADR-INF-10 update. Run before first up or after model changes:
-  #
-  #   docker compose -f docker-compose.infra.yml \
-  #                  -f docker-compose.services.yml \
-  #                  -f docker-compose.cli.yml \
-  #                  --profile audit \
-  #                  run --rm --no-deps --entrypoint /opt/venv/bin/alembic audit-orchestrator \
-  #                  -c /app/audit_orchestrator/alembic.ini upgrade head
-  audit-orchestrator:
-    profiles: ["audit", "cli"]
-    build:
-      # audit Dockerfile hardcodes WHO-project/vds-scripts/... paths,
-      # so its context must be the monorepo root (vds/).
-      context: ../../../
-      dockerfile: WHO-project/vds-scripts/audit_orchestrator/Dockerfile
-    image: vds-audit:${VERSION:-1.0.0}
-    container_name: vds-audit-orchestrator
-    depends_on:
-      postgres:
-        condition: service_healthy
-      pgbouncer:
-        condition: service_healthy
-    env_file: *env_files
-    environment:
-      # Post-P8 (v2.15.7): route through PgBouncer stanza vds_audit. Audit's session-scoped advisory locks (state/store.py:5265,5279) require session mode — uniform topology preserves correctness.
-      VDS_AUDIT_STATE_DSN: postgresql://postgres:${VDS_POSTGRES_PASSWORD:-vds_postgres_secret}@vds-pgbouncer:6432/vds_audit
-      VDS_AUDIT_LANGGRAPH__POSTGRES_DSN: postgresql://postgres:${VDS_POSTGRES_PASSWORD:-vds_postgres_secret}@vds-pgbouncer:6432/vds_audit
-      VDS_AUDIT_LLM_PROTOCOL: ${VDS_AUDIT_LLM_PROTOCOL:-anthropic}
-      VDS_AUDIT_LLM__BASE_URL: ${VDS_AUDIT_LLM__BASE_URL:-}
-      VDS_AUDIT_LLM__API_KEY: ${VDS_AUDIT_LLM__API_KEY:-}
-      VDS_USERNAME: ${VDS_USERNAME:-}
-      VDS_PASSWORD: ${VDS_PASSWORD:-}
-      BITBUCKET_ACCESS_TOKEN: ${BITBUCKET_ACCESS_TOKEN:-}
-      LOG_LEVEL: ${LOG_LEVEL:-INFO}
-    volumes:
-      - ${AUDIT_DATA_DIR:-./data}:/data:ro
-      - ${AUDIT_OUTPUT_DIR:-./reports}:/app/reports
-      - audit_cache:/app/cache
-    networks:
-      - vds
-    restart: "no"
-    logging: *logging-default
-
-  # ---------------------------------------------------------------------------
-  # PDF Orchestrator (CLI; redis DB 7)
-  # ---------------------------------------------------------------------------
-  pdf-orchestrator:
-    profiles: ["pdf", "cli"]
-    env_file: *env_files
-    build:
-      context: ../
-      dockerfile: pdf_orchestrator/Dockerfile
-    image: vds-pdf:${VERSION:-1.0.0}
-    container_name: vds-pdf-orchestrator
-    depends_on:
-      redis:
-        condition: service_healthy
-    environment:
-      REDIS_URL: redis://redis:6379/7
-    volumes:
-      - pdf_cache:/app/cache
-    networks:
-      - vds
-    restart: "no"
-    logging: *logging-default
-
-  # ---------------------------------------------------------------------------
-  # Progress Report Orchestrator (CLI; postgres `progress` schema)
-  # ---------------------------------------------------------------------------
-  # Migrations are run as an explicit operator step (NOT a depends_on dependency).
-  # Tier 3B sub-shape (auto-init migrate container) retired in v2.15.10 per
-  # ADR-INF-10 update. Run before first up or after model changes:
-  #
-  #   docker compose ... --profile progress \
-  #     run --rm --no-deps --entrypoint /opt/venv/bin/alembic progress-report-orchestrator \
-  #     -c /app/progress_report_orchestrator/alembic.ini upgrade head
-  progress-report-orchestrator:
-    profiles: ["progress", "cli"]
-    env_file: *env_files
-    build:
-      context: ../
-      dockerfile: progress_report_orchestrator/Dockerfile
-    image: vds-progress:${VERSION:-1.0.0}
-    container_name: vds-progress-report-orchestrator
-    depends_on:
-      postgres:
-        condition: service_healthy
-      pgbouncer:
-        condition: service_healthy
-    environment:
-      # Post-P8 (v2.15.7): route through PgBouncer stanza vds_progress.
-      # Note: state/schema.py:_connect() helper SETs search_path post-connect (F21 close), so connect_query is paired with app-level pinning for unqualified-DML resilience.
-      DATABASE_URL: postgresql://postgres:${VDS_POSTGRES_PASSWORD:-vds_postgres_secret}@vds-pgbouncer:6432/vds_progress
-    volumes:
-      - ${PROGRESS_REPORTS_DIR:-./reports/progress}:/app/reports
-      - progress_cache:/app/cache
-    networks:
-      - vds
-    restart: "no"
-    logging: *logging-default
-
   # ---------------------------------------------------------------------------
   # DB Query Orchestrator (CLI; external-DB client)
   # ---------------------------------------------------------------------------
@@ -194,13 +88,3 @@ services:
     restart: "no"
     logging: *logging-default
 
-# =============================================================================
-# Volumes (CLI-only; shared with other tiers via fixed names)
-# =============================================================================
-volumes:
-  audit_cache:
-    name: vds-audit-cache
-  pdf_cache:
-    name: vds-pdf-cache
-  progress_cache:
-    name: vds-progress-cache

package/tools/vds-scripts/docker/docker-compose.services.yml

@@ -5,7 +5,7 @@
 # Phase: ecosystem-infrastructure-evolution v2.13.x (WP-5.3)
 #
 # This file declares ONLY the long-running services (per ADR-INF-10):
-# memory-api, memory-worker, scheduler-orchestrator, multi-agent-orchestrator.
+# memory-api, memory-worker, scheduler-orchestrator.
 # CLI orchestrators (audit, pdf, progress, db-query) live in
 # `docker-compose.cli.yml` (Tier 3). Earlier versions of this file mixed both
 # patterns under "services" which caused CLI containers to restart-loop after
@@ -34,7 +34,6 @@
 # Profiles (long-running only):
 #   - memory      : memory-api + memory-worker (FastAPI + Celery)
 #   - scheduler   : scheduler-orchestrator (DBOS-managed FastAPI; needs VDS_SCHEDULER_ENABLED=true)
-#   - multi-agent : multi-agent-orchestrator (FastAPI agent coordinator)
 #   - full        : all of the above
 #
 # For CLI profiles (audit/pdf/progress/db-query/vds-cli/mcp-server) and the
@@ -251,44 +250,6 @@ services:
       - --concurrency
       - "${CELERY_WORKER_CONCURRENCY:-4}"
 
-  # ---------------------------------------------------------------------------
-  # Multi-Agent Orchestrator Service (FastAPI; long-running)
-  # ---------------------------------------------------------------------------
-  multi-agent-orchestrator:
-    profiles: ["multi-agent", "full"]
-    env_file: *env_files
-    build:
-      context: ../
-      dockerfile: multi_agent_orchestrator/Dockerfile
-    image: vds-multi-agent:${VERSION:-1.0.0}
-    container_name: vds-multi-agent-orchestrator
-    depends_on:
-      redis:
-        condition: service_healthy
-    environment:
-      # Multi-agent uses Redis DB 6 (FR-3 allocation)
-      REDIS_URL: redis://redis:6379/6
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
-      REDIS_DB: 6
-
-      # Memory service backfill (allows multi-agent to discover memory-api)
-      VDS_AI_MEMORY_BASE_URL: ${VDS_AI_MEMORY_BASE_URL:-http://memory-api:8000}
-    ports:
-      - "${MULTI_AGENT_PORT:-8003}:8080"
-    deploy:
-      resources:
-        limits:
-          cpus: "${VDS_MULTI_AGENT_CPU_LIMIT:-1.0}"
-          memory: "${VDS_MULTI_AGENT_MEM_LIMIT:-512m}"
-        reservations:
-          cpus: "${VDS_MULTI_AGENT_CPU_RESERVE:-0.25}"
-          memory: "${VDS_MULTI_AGENT_MEM_RESERVE:-128m}"
-    networks:
-      - vds
-    restart: unless-stopped
-    logging: *logging-default
-
   # ---------------------------------------------------------------------------
   # Scheduler Orchestrator Service (DBOS-managed FastAPI; long-running)
   # ---------------------------------------------------------------------------