@orchestrator-claude/cli 3.1.12 → 3.2.1

package/templates/base/claude/skills/release/release.sh

@@ -0,0 +1,460 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ============================================================================
+# Release Script - Orchestrator v1.5.x
+# ============================================================================
+# Automates version bump and tag creation. CI/CD handles npm/Docker publish.
+#
+# Usage:
+#   ./scripts/release.sh patch    # 1.5.0 -> 1.5.1
+#   ./scripts/release.sh minor    # 1.5.0 -> 1.6.0
+#   ./scripts/release.sh major    # 1.5.0 -> 2.0.0
+#   ./scripts/release.sh 1.5.1    # Explicit version
+#
+# Files updated:
+#   - package.json (root)
+#   - packages/cli/package.json
+#   - packages/mcp-server/package.json
+#   - packages/cli/src/index.ts (CLI_VERSION constant)
+#   - src/infrastructure/templates/base/package.json.hbs (template versions)
+#
+# ============================================================================
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Global variables
+FORCE=false
+DRY_RUN=false
+
+# Parse arguments
+VERSION_ARG=""
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -y|--yes|--force)
+      FORCE=true
+      shift
+      ;;
+    --dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+    -h|--help)
+      echo "Usage: $0 [options] <version>"
+      echo ""
+      echo "Version can be:"
+      echo "  patch         Increment patch version (1.4.1 -> 1.4.2)"
+      echo "  minor         Increment minor version (1.4.1 -> 1.5.0)"
+      echo "  major         Increment major version (1.4.1 -> 2.0.0)"
+      echo "  x.y.z         Explicit version number"
+      echo ""
+      echo "Options:"
+      echo "  -y, --yes, --force  Skip confirmation prompts"
+      echo "  --dry-run           Show what would be done without making changes"
+      echo "  -h, --help          Show this help message"
+      echo ""
+      echo "Examples:"
+      echo "  $0 patch            # Bump patch version"
+      echo "  $0 1.4.2            # Set explicit version"
+      echo "  $0 --dry-run patch  # Preview changes"
+      echo ""
+      echo "What this script does:"
+      echo "  1. Validates prerequisites and working tree"
+      echo "  2. Bumps version in all package files"
+      echo "  3. Updates CLI_VERSION constant"
+      echo "  4. Commits version bump"
+      echo "  5. Creates and pushes git tag"
+      echo "  6. Tag push triggers CI/CD pipeline (npm + Docker publish)"
+      exit 0
+      ;;
+    *)
+      if [ -z "$VERSION_ARG" ]; then
+        VERSION_ARG="$1"
+      else
+        echo "Unknown option: $1"
+        exit 1
+      fi
+      shift
+      ;;
+  esac
+done
+
+if [ -z "$VERSION_ARG" ]; then
+  echo -e "${RED}❌ Version argument required${NC}"
+  echo "Usage: $0 [patch|minor|major|x.y.z]"
+  echo "Run '$0 --help' for more information"
+  exit 1
+fi
+
+# ============================================================================
+# Utility Functions
+# ============================================================================
+
+log_info() {
+  echo -e "${BLUE}ℹ${NC} $1"
+}
+
+log_success() {
+  echo -e "${GREEN}✅${NC} $1"
+}
+
+log_warning() {
+  echo -e "${YELLOW}⚠️${NC} $1"
+}
+
+log_error() {
+  echo -e "${RED}❌${NC} $1"
+}
+
+# ============================================================================
+# Validation Functions
+# ============================================================================
+
+validate_prerequisites() {
+  echo "🔍 Validating prerequisites..."
+  local missing=()
+
+  # Check git
+  if ! command -v git &> /dev/null; then
+    missing+=("git")
+  fi
+
+  # Check node
+  if ! command -v node &> /dev/null; then
+    missing+=("node")
+  fi
+
+  # Check we're in the right directory
+  if [ ! -f "package.json" ] || [ ! -d "packages/cli" ]; then
+    log_error "Must be run from orchestrator root directory"
+    exit 1
+  fi
+
+  if [ ${#missing[@]} -ne 0 ]; then
+    log_error "Missing required tools: ${missing[*]}"
+    exit 1
+  fi
+
+  log_success "All prerequisites satisfied"
+}
+
+validate_working_tree() {
+  echo "🔍 Validating working tree..."
+
+  # Check if working tree is clean
+  if [ -n "$(git status --porcelain)" ]; then
+    log_error "Working tree is not clean"
+    echo "Please commit or stash your changes:"
+    git status --short
+    exit 1
+  fi
+
+  # Check if on main branch
+  local branch
+  branch=$(git rev-parse --abbrev-ref HEAD)
+
+  if [[ "$branch" != "main" ]]; then
+    log_warning "You are on branch '$branch', not main"
+    if [ "$FORCE" = true ]; then
+      echo "Continuing with --force flag..."
+    else
+      read -p "Continue anyway? (y/N): " -n 1 -r
+      echo
+      if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        echo "Aborted by user"
+        exit 1
+      fi
+    fi
+  fi
+
+  log_success "Working tree is clean"
+}
+
+validate_tag_not_exists() {
+  local tag=$1
+
+  if git rev-parse "$tag" &> /dev/null; then
+    log_error "Tag '$tag' already exists"
+    echo "Choose a different version or delete the existing tag"
+    exit 1
+  fi
+
+  log_success "Tag '$tag' is available"
+}
+
+# ============================================================================
+# Version Functions
+# ============================================================================
+
+get_current_version() {
+  node -p "require('./packages/cli/package.json').version"
+}
+
+calculate_new_version() {
+  local current=$1
+  local bump_type=$2
+
+  # Parse current version
+  local major minor patch
+  IFS='.' read -r major minor patch <<< "$current"
+
+  case $bump_type in
+    patch)
+      echo "${major}.${minor}.$((patch + 1))"
+      ;;
+    minor)
+      echo "${major}.$((minor + 1)).0"
+      ;;
+    major)
+      echo "$((major + 1)).0.0"
+      ;;
+    *)
+      # Assume it's an explicit version
+      if [[ "$bump_type" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        echo "$bump_type"
+      else
+        log_error "Invalid version format: $bump_type"
+        echo "Use: patch, minor, major, or x.y.z format"
+        exit 1
+      fi
+      ;;
+  esac
+}
+
+# ============================================================================
+# Update Functions
+# ============================================================================
+
+update_package_version() {
+  local file=$1
+  local version=$2
+
+  if [ ! -f "$file" ]; then
+    log_warning "File not found: $file"
+    return
+  fi
+
+  if [ "$DRY_RUN" = true ]; then
+    echo "  [dry-run] Would update: $file"
+    return
+  fi
+
+  # Use node to update version (handles JSON properly)
+  node -e "
+    const fs = require('fs');
+    const pkg = JSON.parse(fs.readFileSync('$file', 'utf8'));
+    pkg.version = '$version';
+    fs.writeFileSync('$file', JSON.stringify(pkg, null, 2) + '\n');
+  "
+
+  log_info "Updated: $file"
+}
+
+update_cli_version_constant() {
+  local version=$1
+  local file="packages/cli/src/index.ts"
+
+  if [ ! -f "$file" ]; then
+    log_warning "File not found: $file"
+    return
+  fi
+
+  if [ "$DRY_RUN" = true ]; then
+    echo "  [dry-run] Would update CLI_VERSION in: $file"
+    return
+  fi
+
+  # Update CLI_VERSION constant
+  sed -i "s/export const CLI_VERSION = '[^']*'/export const CLI_VERSION = '${version}'/" "$file"
+
+  log_info "Updated CLI_VERSION in: $file"
+}
+
+update_template_version() {
+  local version=$1
+  local file="src/infrastructure/templates/base/package.json.hbs"
+
+  if [ ! -f "$file" ]; then
+    log_warning "Template file not found: $file"
+    return
+  fi
+
+  if [ "$DRY_RUN" = true ]; then
+    echo "  [dry-run] Would update template: $file"
+    return
+  fi
+
+  # Update @orchestrator-claude/cli and @orchestrator-claude/mcp-server versions
+  sed -i "s|\"@orchestrator-claude/cli\": \"\\^[0-9]*\\.[0-9]*\\.[0-9]*\"|\"@orchestrator-claude/cli\": \"^${version}\"|g" "$file"
+  sed -i "s|\"@orchestrator-claude/mcp-server\": \"\\^[0-9]*\\.[0-9]*\\.[0-9]*\"|\"@orchestrator-claude/mcp-server\": \"^${version}\"|g" "$file"
+
+  log_info "Updated template: $file"
+}
+
+update_all_versions() {
+  local version=$1
+
+  echo "📝 Updating versions to $version..."
+
+  # Update root package.json
+  update_package_version "package.json" "$version"
+
+  # Update CLI package
+  update_package_version "packages/cli/package.json" "$version"
+
+  # Update MCP server package
+  update_package_version "packages/mcp-server/package.json" "$version"
+
+  # Update CLI_VERSION constant
+  update_cli_version_constant "$version"
+
+  # Update templates
+  update_template_version "$version"
+
+  log_success "All versions updated to $version"
+}
+
+# ============================================================================
+# Git Functions
+# ============================================================================
+
+commit_version_bump() {
+  local version=$1
+  local tag="v${version}"
+
+  if [ "$DRY_RUN" = true ]; then
+    echo "  [dry-run] Would commit: chore: bump version to ${tag}"
+    return
+  fi
+
+  git add package.json \
+    packages/cli/package.json \
+    packages/mcp-server/package.json \
+    packages/cli/src/index.ts \
+    src/infrastructure/templates/base/package.json.hbs
+
+  git commit -m "chore: bump version to ${tag}
+
+Updates:
+- package.json (root)
+- packages/cli/package.json
+- packages/mcp-server/package.json
+- packages/cli/src/index.ts (CLI_VERSION)
+- src/infrastructure/templates/base/package.json.hbs (templates)
+
+Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>"
+
+  log_success "Version bump committed"
+}
+
+create_and_push_tag() {
+  local version=$1
+  local tag="v${version}"
+
+  if [ "$DRY_RUN" = true ]; then
+    echo "  [dry-run] Would create tag: $tag"
+    echo "  [dry-run] Would push: main and $tag"
+    return
+  fi
+
+  # Create annotated tag
+  git tag -a "$tag" -m "Release $tag"
+  log_success "Tag created: $tag"
+
+  # Push commit and tag
+  echo "⬆️  Pushing to remote..."
+  git push origin main
+  git push origin "$tag"
+
+  log_success "Pushed main and tag $tag"
+}
+
+# ============================================================================
+# Main Flow
+# ============================================================================
+
+main() {
+  echo ""
+  echo -e "${BLUE}════════════════════════════════════════${NC}"
+  echo -e "${BLUE}  Orchestrator Release Script${NC}"
+  echo -e "${BLUE}════════════════════════════════════════${NC}"
+  echo ""
+
+  validate_prerequisites
+  validate_working_tree
+
+  # Get current and new versions
+  local current_version
+  current_version=$(get_current_version)
+
+  local new_version
+  new_version=$(calculate_new_version "$current_version" "$VERSION_ARG")
+
+  local tag="v${new_version}"
+
+  echo ""
+  echo -e "${BLUE}Release Plan:${NC}"
+  echo "  Current version: $current_version"
+  echo "  New version:     $new_version"
+  echo "  Git tag:         $tag"
+  echo ""
+
+  if [ "$DRY_RUN" = true ]; then
+    echo -e "${YELLOW}[DRY RUN MODE - No changes will be made]${NC}"
+    echo ""
+  fi
+
+  validate_tag_not_exists "$tag"
+
+  # Show what will be updated
+  echo ""
+  echo "Files to update:"
+  echo "  - package.json (root)"
+  echo "  - packages/cli/package.json"
+  echo "  - packages/mcp-server/package.json"
+  echo "  - packages/cli/src/index.ts (CLI_VERSION)"
+  echo "  - src/infrastructure/templates/base/package.json.hbs (templates)"
+  echo ""
+  echo "Actions:"
+  echo "  1. Update version in all files"
+  echo "  2. Commit version bump"
+  echo "  3. Create git tag $tag"
+  echo "  4. Push main + tag to origin"
+  echo "  5. CI/CD pipeline will publish npm + Docker"
+  echo ""
+
+  if [ "$FORCE" = false ] && [ "$DRY_RUN" = false ]; then
+    read -p "Continue with release? (y/N): " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+      echo "Aborted by user"
+      exit 1
+    fi
+  fi
+
+  # Execute release steps
+  update_all_versions "$new_version"
+  commit_version_bump "$new_version"
+  create_and_push_tag "$new_version"
+
+  echo ""
+  echo -e "${GREEN}════════════════════════════════════════${NC}"
+  echo -e "${GREEN}  Release $tag initiated!${NC}"
+  echo -e "${GREEN}════════════════════════════════════════${NC}"
+  echo ""
+  echo "🚀 CI/CD pipeline will now:"
+  echo "   - Build and publish Docker image"
+  echo "   - Publish npm packages"
+  echo ""
+  echo "📍 Monitor pipeline at:"
+  echo "   https://github.com/orchestratorAII/orchestrator/actions"
+  echo ""
+}
+
+# Entry point
+main

package/templates/base/docker-compose.yml.hbs

@@ -1,19 +1,200 @@
+# docker-compose.yml — Generated by orchestrator init
+# Stack: PostgreSQL (state) + MinIO (artifacts) + Neo4j (knowledge graph, optional) + API
+#
+# Ports:
+#   API:        http://localhost:3001   (orchestrator REST API + MCP server)
+#   PostgreSQL: localhost:5432          (workflow state - direct access)
+#   MinIO S3:   http://localhost:9000   (artifact storage - S3 API)
+#   MinIO UI:   http://localhost:9001   (MinIO console)
+#   Neo4j HTTP: http://localhost:7474   (knowledge graph browser - requires --profile knowledge-graph)
+#   Neo4j Bolt: bolt://localhost:7687   (knowledge graph driver - requires --profile knowledge-graph)
+#
+# Usage:
+#   docker compose up -d                           # Start core services (API + PostgreSQL)
+#   docker compose --profile object-storage up -d  # Add MinIO
+#   docker compose --profile knowledge-graph up -d # Add Neo4j
+#   docker compose --profile full up -d            # Start everything
+
 services:
+  postgres:
+    image: postgres:15-alpine
+    container_name: {{projectName}}-postgres
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB:-orchestrator}
+      POSTGRES_USER: ${POSTGRES_USER:-orchestrator}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    volumes:
+      - {{projectName}}-postgres-data:/var/lib/postgresql/data
+    ports:
+      - "${POSTGRES_PORT:-5432}:5432"  # PostgreSQL
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-orchestrator} -d ${POSTGRES_DB:-orchestrator}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    restart: unless-stopped
+    networks:
+      - {{projectName}}-network
+
+  neo4j:
+    image: neo4j:5-community
+    container_name: {{projectName}}-neo4j
+    environment:
+      NEO4J_AUTH: neo4j/${NEO4J_PASSWORD:-orchestrator_neo4j}
+      NEO4J_PLUGINS: '["apoc"]'
+      NEO4J_dbms_memory_pagecache_size: 512M
+      NEO4J_dbms_memory_heap_initial__size: 512M
+      NEO4J_dbms_memory_heap_max__size: 1G
+      NEO4J_dbms_security_procedures_unrestricted: apoc.*
+      NEO4J_dbms_security_procedures_allowlist: apoc.*
+    ports:
+      - "${NEO4J_HTTP_PORT:-7474}:7474"   # Neo4j browser
+      - "${NEO4J_BOLT_PORT:-7687}:7687"   # Neo4j bolt
+    volumes:
+      - {{projectName}}-neo4j-data:/data
+      - {{projectName}}-neo4j-logs:/logs
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://localhost:7474"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 20s
+    restart: unless-stopped
+    networks:
+      - {{projectName}}-network
+    profiles:
+      - knowledge-graph
+      - full
+
+  minio:
+    image: minio/minio:latest
+    container_name: {{projectName}}-minio
+    command: server /data --console-address ":9001"
+    environment:
+      MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin}
+      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
+    ports:
+      - "${MINIO_S3_PORT:-9000}:9000"     # MinIO S3 API
+      - "${MINIO_CONSOLE_PORT:-9001}:9001" # MinIO console
+    volumes:
+      - {{projectName}}-minio-data:/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    restart: unless-stopped
+    networks:
+      - {{projectName}}-network
+    profiles:
+      - object-storage
+      - full
+
+  minio-init:
+    image: minio/mc:latest
+    container_name: {{projectName}}-minio-init
+    depends_on:
+      minio:
+        condition: service_healthy
+    entrypoint: >
+      /bin/sh -c "
+      mc alias set myminio http://minio:9000 ${MINIO_ROOT_USER:-minioadmin} ${MINIO_ROOT_PASSWORD};
+      mc mb --ignore-existing myminio/orchestrator-static;
+      mc mb --ignore-existing myminio/orchestrator-artifacts;
+      mc anonymous set download myminio/orchestrator-static;
+      echo 'MinIO buckets initialized successfully';
+      exit 0;
+      "
+    networks:
+      - {{projectName}}-network
+    profiles:
+      - object-storage
+      - full
+    restart: "no"
+
+  db-migrate:
+    image: cmac01/orchestrator-api:{{orchestratorVersion}}
+    container_name: {{projectName}}-db-migrate
+    depends_on:
+      postgres:
+        condition: service_healthy
+    environment:
+      NODE_ENV: production
+      RUN_MIGRATIONS: "true"
+      PERSISTENCE_MODE: postgres
+      DATABASE_URL: postgresql://${POSTGRES_USER:-orchestrator}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB:-orchestrator}
+      POSTGRES_HOST: postgres
+      POSTGRES_PORT: "5432"
+      POSTGRES_DB: ${POSTGRES_DB:-orchestrator}
+      POSTGRES_USER: ${POSTGRES_USER:-orchestrator}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    networks:
+      - {{projectName}}-network
+    restart: "no"
+
   orchestrator-api:
     image: cmac01/orchestrator-api:{{orchestratorVersion}}
     container_name: {{projectName}}-orchestrator-api
-    user: "${UID:-1000}:${GID:-1000}"
+    depends_on:
+      postgres:
+        condition: service_healthy
+      db-migrate:
+        condition: service_completed_successfully
+    env_file: .env
+    environment:
+      NODE_ENV: production
+      API_HOST: "0.0.0.0"
+      API_PORT: "3001"
+      PERSISTENCE_MODE: postgres
+      RUN_MIGRATIONS: "false"
+      # PostgreSQL connection (service name resolves within Docker network)
+      POSTGRES_HOST: postgres
+      POSTGRES_PORT: "5432"
+      DATABASE_URL: postgresql://${POSTGRES_USER:-orchestrator}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB:-orchestrator}
+      # MinIO object storage (requires --profile object-storage or --profile full)
+      ENABLE_OBJECT_STORAGE: "${ENABLE_OBJECT_STORAGE:-true}"
+      OBJECT_STORAGE_PROVIDER: minio
+      OBJECT_STORAGE_ENDPOINT: "http://minio:9000"
+      OBJECT_STORAGE_REGION: us-east-1
+      OBJECT_STORAGE_ACCESS_KEY: ${MINIO_ROOT_USER:-minioadmin}
+      OBJECT_STORAGE_SECRET_KEY: ${MINIO_ROOT_PASSWORD}
+      BUCKET_STATIC: orchestrator-static
+      BUCKET_ARTIFACTS: orchestrator-artifacts
+      # Neo4j knowledge graph (requires --profile knowledge-graph or --profile full)
+      NEO4J_URI: "${NEO4J_URI:-bolt://neo4j:7687}"
+      NEO4J_USER: "${NEO4J_USER:-neo4j}"
+      NEO4J_PASSWORD: "${NEO4J_PASSWORD:-orchestrator_neo4j}"
+      ENABLE_KNOWLEDGE_GRAPH: "${ENABLE_KNOWLEDGE_GRAPH:-false}"
+      # JWT Authentication
+      JWT_SECRET: ${JWT_SECRET}
     ports:
-      - "3001:3001"
+      - "3001:3001"  # Orchestrator REST API + MCP server
     volumes:
-      - .:/app/project:rw
-    environment:
-      - ORCHESTRATOR_ROOT=/app/project
-      - NODE_ENV=development
+      # Staging area for Artifact Relay Pattern (TD-039)
+      # Sub-agents write artifacts here; main agent relays to MinIO via MCP
+      - /tmp/orchestrator:/tmp/orchestrator
     healthcheck:
       test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:3001/api/v1/health"]
       interval: 30s
-      timeout: 3s
-      start_period: 10s
+      timeout: 10s
       retries: 3
+      start_period: 15s
     restart: unless-stopped
+    networks:
+      - {{projectName}}-network
+
+volumes:
+  {{projectName}}-postgres-data:
+    driver: local
+  {{projectName}}-neo4j-data:
+    driver: local
+  {{projectName}}-neo4j-logs:
+    driver: local
+  {{projectName}}-minio-data:
+    driver: local
+
+networks:
+  {{projectName}}-network:
+    driver: bridge

package/templates/base/mcp.json.hbs

@@ -3,22 +3,29 @@
   "mcpServers": {
     "orchestrator-tools": {
       "command": "npx",
-      "args": [
-        "@orchestrator-claude/mcp-server"
-      ],
+      "args": ["@orchestrator-claude/mcp-server"],
       "env": {
         "ORCHESTRATOR_API_URL": "http://localhost:3001",
-        "ORCHESTRATOR_ROOT": ".orchestrator",
+        "ORCHESTRATOR_PROJECT_ID": "{{projectId}}",
+        "ORCHESTRATOR_AUTH_EMAIL": "{{authEmail}}",
+        "ORCHESTRATOR_AUTH_PASSWORD": "{{authPassword}}",
+        "NODE_ENV": "production"
+      }
+    },
+    "orchestrator-extended": {
+      "command": "npx",
+      "args": ["@orchestrator-claude/mcp-server", "--server", "extended"],
+      "env": {
+        "ORCHESTRATOR_API_URL": "http://localhost:3001",
+        "ORCHESTRATOR_PROJECT_ID": "{{projectId}}",
+        "ORCHESTRATOR_AUTH_EMAIL": "{{authEmail}}",
+        "ORCHESTRATOR_AUTH_PASSWORD": "{{authPassword}}",
         "NODE_ENV": "production"
       }
     },
     "perplexity": {
       "command": "npx",
-      "args": [
-        "@orchestrator-claude/mcp-server",
-        "--server",
-        "perplexity"
-      ],
+      "args": ["@orchestrator-claude/mcp-server", "--server", "perplexity"],
       "env": {
         "ORCHESTRATOR_API_URL": "http://localhost:3001",
         "PERPLEXITY_API_KEY": "{{perplexityApiKey}}"