aidp 0.15.2 → 0.17.0

data/lib/aidp/cli.rb

@@ -9,6 +9,7 @@ require_relative "harness/ui/enhanced_workflow_selector"
 require_relative "harness/enhanced_runner"
 require_relative "cli/first_run_wizard"
 require_relative "rescue_logging"
+require_relative "concurrency"
 
 module Aidp
   # CLI interface for AIDP
@@ -240,7 +241,7 @@ module Aidp
 
         if File.exist?(config_path)
           require "yaml"
-          full_config = YAML.load_file(config_path)
+          full_config = YAML.safe_load_file(config_path, permitted_classes: [Date, Time, Symbol], aliases: true)
           logging_config = full_config["logging"] || full_config[:logging] || {}
         end
 
@@ -286,6 +287,27 @@ module Aidp
           opts.separator "  mcp                      MCP server dashboard and management"
           opts.separator "    dashboard                - Show all MCP servers across providers"
           opts.separator "    check <servers...>       - Check provider eligibility for servers"
+          opts.separator "  ws                       Manage parallel workstreams (git worktrees)"
+          opts.separator "    list                     - List all workstreams"
+          opts.separator "    new <slug> [task]        - Create new workstream"
+          opts.separator "    rm <slug>                - Remove workstream"
+          opts.separator "    status <slug>            - Show workstream status"
+          opts.separator "    pause <slug>             - Pause workstream"
+          opts.separator "    resume <slug>            - Resume workstream"
+          opts.separator "    complete <slug>          - Mark workstream as completed"
+          opts.separator "    dashboard                - Show multi-workstream overview"
+          opts.separator "    pause-all                - Pause all active workstreams"
+          opts.separator "    resume-all               - Resume all paused workstreams"
+          opts.separator "    stop-all                 - Stop all active workstreams"
+          opts.separator "  work                     Execute workflow in workstream context"
+          opts.separator "    --workstream <slug>      - Required: workstream to run in"
+          opts.separator "    --mode <mode>            - analyze or execute (default: execute)"
+          opts.separator "    --background             - Run in background job"
+          opts.separator "  skill                    Manage skills (agent personas)"
+          opts.separator "    list                     - List all available skills"
+          opts.separator "    show <id>                - Show detailed skill information"
+          opts.separator "    search <query>           - Search skills by keyword"
+          opts.separator "    validate [path]          - Validate skill file format"
           opts.separator "  harness                  Manage harness state"
           opts.separator "  config                   Manage configuration"
           opts.separator "    status                   - Show harness status"
@@ -338,7 +360,7 @@ module Aidp
       # Determine if the invocation is a subcommand style call
       def subcommand?(args)
         return false if args.nil? || args.empty?
-        %w[status jobs kb harness providers checkpoint mcp issue config init watch].include?(args.first)
+        %w[status jobs kb harness providers checkpoint mcp issue config init watch ws work skill].include?(args.first)
       end
 
       def run_subcommand(args)
@@ -355,6 +377,9 @@ module Aidp
         when "config" then run_config_command(args)
         when "init" then run_init_command(args)
         when "watch" then run_watch_command(args)
+        when "ws" then run_ws_command(args)
+        when "work" then run_work_command(args)
+        when "skill" then run_skill_command(args)
         else
           display_message("Unknown command: #{cmd}", type: :info)
           return 1
@@ -461,7 +486,15 @@ module Aidp
           if follow
             display_message("", type: :info)
             display_message("Following logs (Ctrl+C to stop following)...", type: :info)
-            sleep 1 # Give daemon time to start writing logs
+
+            # Wait for log file to be created before following
+            log_file = File.join(runner.instance_variable_get(:@jobs_dir), job_id, "output.log")
+            begin
+              Aidp::Concurrency::Wait.for_file(log_file, timeout: 10, interval: 0.2)
+            rescue Aidp::Concurrency::TimeoutError
+              display_message("Warning: Log file not found after 10s", type: :warning)
+            end
+
             runner.follow_job_logs(job_id)
           end
 
@@ -1060,7 +1093,7 @@ module Aidp
 
       def run_watch_command(args)
         if args.empty?
-          display_message("Usage: aidp watch <issues_url> [--interval SECONDS] [--provider NAME] [--once]", type: :info)
+          display_message("Usage: aidp watch <issues_url> [--interval SECONDS] [--provider NAME] [--once] [--no-workstreams]", type: :info)
           return
         end
 
@@ -1068,6 +1101,7 @@ module Aidp
         interval = Aidp::Watch::Runner::DEFAULT_INTERVAL
         provider_name = nil
         once = false
+        use_workstreams = true # Default to using workstreams
 
         until args.empty?
           token = args.shift
@@ -1079,6 +1113,8 @@ module Aidp
             provider_name = args.shift
           when "--once"
             once = true
+          when "--no-workstreams"
+            use_workstreams = false
           else
             display_message("⚠️  Unknown watch option: #{token}", type: :warn)
           end
@@ -1090,6 +1126,7 @@ module Aidp
           provider_name: provider_name,
           project_dir: Dir.pwd,
           once: once,
+          use_workstreams: use_workstreams,
           prompt: TTY::Prompt.new
         )
         runner.start
@@ -1098,9 +1135,1054 @@ module Aidp
         display_message("❌ #{e.message}", type: :error)
       end
 
+      def run_ws_command(args)
+        require_relative "worktree"
+        require_relative "workstream_state"
+        require "tty-table"
+
+        subcommand = args.shift
+
+        case subcommand
+        when "list", nil
+          # List all workstreams
+          workstreams = Aidp::Worktree.list(project_dir: Dir.pwd)
+
+          if workstreams.empty?
+            display_message("No workstreams found.", type: :info)
+            display_message("Create one with: aidp ws new <slug> [task]", type: :muted)
+            return
+          end
+
+          display_message("Workstreams", type: :highlight)
+          display_message("=" * 80, type: :muted)
+
+          table_rows = workstreams.map do |ws|
+            state = Aidp::WorkstreamState.read(slug: ws[:slug], project_dir: Dir.pwd) || {}
+            status_icon = ws[:active] ? "✓" : "✗"
+            created = Time.parse(ws[:created_at]).strftime("%Y-%m-%d %H:%M")
+            iterations = state[:iterations] || 0
+            task = state[:task] && state[:task].to_s[0, 40]
+            [
+              status_icon,
+              ws[:slug],
+              ws[:branch],
+              created,
+              ws[:active] ? "active" : "inactive",
+              iterations,
+              task
+            ]
+          end
+
+          header = ["", "Slug", "Branch", "Created", "Status", "Iter", "Task"]
+          table = TTY::Table.new(header, table_rows)
+          # Render with explicit width for non-TTY environments (e.g., tests)
+          renderer = if $stdout.tty?
+            table.render(:basic)
+          else
+            table.render(:basic, width: 120)
+          end
+          display_message(renderer, type: :info)
+
+        when "new"
+          # Create new workstream
+          slug = args.shift
+          unless slug
+            display_message("❌ Missing slug", type: :error)
+            display_message("Usage: aidp ws new <slug> [task]", type: :info)
+            return
+          end
+
+          # Validate slug format (lowercase, hyphens, no special chars)
+          unless slug.match?(/^[a-z0-9]+(-[a-z0-9]+)*$/)
+            display_message("❌ Invalid slug format", type: :error)
+            display_message("   Slug must be lowercase with hyphens (e.g., 'issue-123-fix-auth')", type: :info)
+            return
+          end
+
+          task_parts = []
+          base_branch = nil
+          until args.empty?
+            token = args.shift
+            if token == "--base-branch"
+              base_branch = args.shift
+            else
+              task_parts << token
+            end
+          end
+          task = task_parts.join(" ")
+
+          begin
+            result = Aidp::Worktree.create(
+              slug: slug,
+              project_dir: Dir.pwd,
+              base_branch: base_branch,
+              task: (task unless task.empty?)
+            )
+
+            display_message("✓ Created workstream: #{slug}", type: :success)
+            display_message("  Path: #{result[:path]}", type: :info)
+            display_message("  Branch: #{result[:branch]}", type: :info)
+            display_message("  Task: #{task}", type: :info) unless task.empty?
+            display_message("", type: :info)
+            display_message("Switch to this workstream:", type: :muted)
+            display_message("  cd #{result[:path]}", type: :info)
+          rescue Aidp::Worktree::Error => e
+            display_message("❌ #{e.message}", type: :error)
+          end
+
+        when "rm"
+          # Remove workstream
+          slug = args.shift
+          unless slug
+            display_message("❌ Missing slug", type: :error)
+            display_message("Usage: aidp ws rm <slug> [--delete-branch] [--force]", type: :info)
+            return
+          end
+
+          delete_branch = args.include?("--delete-branch")
+          force = args.include?("--force")
+
+          # Confirm removal unless --force
+          unless force
+            prompt = TTY::Prompt.new
+            confirm = prompt.yes?("Remove workstream '#{slug}'?#{" (will also delete branch)" if delete_branch}")
+            return unless confirm
+          end
+
+          begin
+            Aidp::Worktree.remove(
+              slug: slug,
+              project_dir: Dir.pwd,
+              delete_branch: delete_branch
+            )
+
+            display_message("✓ Removed workstream: #{slug}", type: :success)
+            display_message("  Branch deleted", type: :info) if delete_branch
+          rescue Aidp::Worktree::Error => e
+            display_message("❌ #{e.message}", type: :error)
+          end
+
+        when "status"
+          # Show workstream status
+          slug = args.shift
+          unless slug
+            display_message("❌ Missing slug", type: :error)
+            display_message("Usage: aidp ws status <slug>", type: :info)
+            return
+          end
+
+          begin
+            ws = Aidp::Worktree.info(slug: slug, project_dir: Dir.pwd)
+            unless ws
+              display_message("❌ Workstream not found: #{slug}", type: :error)
+              return
+            end
+
+            state = Aidp::WorkstreamState.read(slug: slug, project_dir: Dir.pwd) || {}
+            iterations = state[:iterations] || 0
+            elapsed = Aidp::WorkstreamState.elapsed_seconds(slug: slug, project_dir: Dir.pwd)
+            task = state[:task]
+            recent_events = Aidp::WorkstreamState.recent_events(slug: slug, project_dir: Dir.pwd, limit: 5)
+            display_message("Workstream: #{slug}", type: :highlight)
+            display_message("=" * 60, type: :muted)
+            display_message("Path: #{ws[:path]}", type: :info)
+            display_message("Branch: #{ws[:branch]}", type: :info)
+            display_message("Created: #{Time.parse(ws[:created_at]).strftime("%Y-%m-%d %H:%M:%S")}", type: :info)
+            display_message("Status: #{ws[:active] ? "Active" : "Inactive"}", type: ws[:active] ? :success : :error)
+            display_message("Iterations: #{iterations}", type: :info)
+            display_message("Elapsed: #{elapsed}s", type: :info)
+            display_message("Task: #{task}", type: :info) if task
+            if recent_events.any?
+              display_message("", type: :info)
+              display_message("Recent Events:", type: :highlight)
+              recent_events.each do |ev|
+                display_message("  #{ev[:timestamp]} #{ev[:type]} #{ev[:data].inspect if ev[:data]}", type: :muted)
+              end
+            end
+
+            # Show git status if active
+            if ws[:active] && Dir.exist?(ws[:path])
+              display_message("", type: :info)
+              display_message("Git Status:", type: :highlight)
+              Dir.chdir(ws[:path]) do
+                system("git", "status", "--short")
+              end
+            end
+          rescue Aidp::Worktree::Error => e
+            display_message("❌ #{e.message}", type: :error)
+          end
+
+        when "pause"
+          # Pause workstream
+          slug = args.shift
+          unless slug
+            display_message("❌ Missing slug", type: :error)
+            display_message("Usage: aidp ws pause <slug>", type: :info)
+            return
+          end
+
+          result = Aidp::WorkstreamState.pause(slug: slug, project_dir: Dir.pwd)
+          if result[:error]
+            display_message("❌ #{result[:error]}", type: :error)
+          else
+            display_message("⏸️  Paused workstream: #{slug}", type: :success)
+          end
+
+        when "resume"
+          # Resume workstream
+          slug = args.shift
+          unless slug
+            display_message("❌ Missing slug", type: :error)
+            display_message("Usage: aidp ws resume <slug>", type: :info)
+            return
+          end
+
+          result = Aidp::WorkstreamState.resume(slug: slug, project_dir: Dir.pwd)
+          if result[:error]
+            display_message("❌ #{result[:error]}", type: :error)
+          else
+            display_message("▶️  Resumed workstream: #{slug}", type: :success)
+          end
+
+        when "complete"
+          # Mark workstream as completed
+          slug = args.shift
+          unless slug
+            display_message("❌ Missing slug", type: :error)
+            display_message("Usage: aidp ws complete <slug>", type: :info)
+            return
+          end
+
+          result = Aidp::WorkstreamState.complete(slug: slug, project_dir: Dir.pwd)
+          if result[:error]
+            display_message("❌ #{result[:error]}", type: :error)
+          else
+            display_message("✅ Completed workstream: #{slug}", type: :success)
+          end
+
+        when "run"
+          # Run one or more workstreams in parallel
+          require_relative "workstream_executor"
+
+          slugs = []
+          max_concurrent = 3
+          mode = :execute
+          selected_steps = nil
+
+          until args.empty?
+            token = args.shift
+            case token
+            when "--max-concurrent"
+              max_concurrent = args.shift.to_i
+            when "--mode"
+              mode = args.shift&.to_sym || :execute
+            when "--steps"
+              selected_steps = args.shift.split(",")
+            else
+              slugs << token
+            end
+          end
+
+          if slugs.empty?
+            display_message("❌ Missing workstream slug(s)", type: :error)
+            display_message("Usage: aidp ws run <slug1> [slug2...] [--max-concurrent N] [--mode analyze|execute] [--steps STEP1,STEP2]", type: :info)
+            display_message("", type: :info)
+            display_message("Examples:", type: :info)
+            display_message("  aidp ws run issue-123                           # Run single workstream", type: :info)
+            display_message("  aidp ws run issue-123 issue-456 feature-x       # Run multiple in parallel", type: :info)
+            display_message("  aidp ws run issue-* --max-concurrent 5          # Run all matching (expand glob first)", type: :info)
+            return
+          end
+
+          begin
+            executor = Aidp::WorkstreamExecutor.new(project_dir: Dir.pwd, max_concurrent: max_concurrent)
+            options = {mode: mode}
+            options[:selected_steps] = selected_steps if selected_steps
+
+            results = executor.execute_parallel(slugs, options)
+
+            # Show results
+            display_message("", type: :info)
+            success_count = results.count { |r| r.status == "completed" }
+            if success_count == results.size
+              display_message("🎉 All workstreams completed successfully!", type: :success)
+            else
+              display_message("⚠️  Some workstreams failed", type: :warn)
+            end
+          rescue => e
+            display_message("❌ Parallel execution error: #{e.message}", type: :error)
+          end
+
+        when "run-all"
+          # Run all active workstreams in parallel
+          require_relative "workstream_executor"
+
+          max_concurrent = 3
+          mode = :execute
+          selected_steps = nil
+
+          until args.empty?
+            token = args.shift
+            case token
+            when "--max-concurrent"
+              max_concurrent = args.shift.to_i
+            when "--mode"
+              mode = args.shift&.to_sym || :execute
+            when "--steps"
+              selected_steps = args.shift.split(",")
+            end
+          end
+
+          begin
+            executor = Aidp::WorkstreamExecutor.new(project_dir: Dir.pwd, max_concurrent: max_concurrent)
+            options = {mode: mode}
+            options[:selected_steps] = selected_steps if selected_steps
+
+            results = executor.execute_all(options)
+
+            if results.empty?
+              display_message("⚠️  No active workstreams to run", type: :warn)
+              return
+            end
+
+            # Show results
+            display_message("", type: :info)
+            success_count = results.count { |r| r.status == "completed" }
+            if success_count == results.size
+              display_message("🎉 All workstreams completed successfully!", type: :success)
+            else
+              display_message("⚠️  Some workstreams failed", type: :warn)
+            end
+          rescue => e
+            display_message("❌ Parallel execution error: #{e.message}", type: :error)
+          end
+
+        when "dashboard"
+          # Show multi-workstream dashboard
+          workstreams = Aidp::Worktree.list(project_dir: Dir.pwd)
+
+          if workstreams.empty?
+            display_message("No workstreams found.", type: :info)
+            display_message("Create one with: aidp ws new <slug> [task]", type: :muted)
+            return
+          end
+
+          display_message("Workstreams Dashboard", type: :highlight)
+          display_message("=" * 120, type: :muted)
+
+          # Aggregate state from all workstreams
+          table_rows = workstreams.map do |ws|
+            state = Aidp::WorkstreamState.read(slug: ws[:slug], project_dir: Dir.pwd) || {}
+            status = state[:status] || "active"
+            iterations = state[:iterations] || 0
+            elapsed = Aidp::WorkstreamState.elapsed_seconds(slug: ws[:slug], project_dir: Dir.pwd)
+            task = state[:task] && state[:task].to_s[0, 30]
+            recent_events = Aidp::WorkstreamState.recent_events(slug: ws[:slug], project_dir: Dir.pwd, limit: 1)
+            recent_event = recent_events.first
+            event_summary = if recent_event
+              "#{recent_event[:type]} (#{Time.parse(recent_event[:timestamp]).strftime("%H:%M")})"
+            else
+              "—"
+            end
+
+            status_icon = case status
+            when "active" then "▶️"
+            when "paused" then "⏸️"
+            when "completed" then "✅"
+            when "removed" then "❌"
+            else "?"
+            end
+
+            [
+              status_icon,
+              ws[:slug],
+              status,
+              iterations,
+              "#{elapsed}s",
+              task || "—",
+              event_summary
+            ]
+          end
+
+          header = ["", "Slug", "Status", "Iter", "Elapsed", "Task", "Recent Event"]
+          table = TTY::Table.new(header, table_rows)
+          # Render with explicit width for non-TTY environments
+          renderer = if $stdout.tty?
+            table.render(:basic)
+          else
+            table.render(:basic, width: 120)
+          end
+          display_message(renderer, type: :info)
+
+          # Show summary counts
+          display_message("", type: :info)
+          status_counts = workstreams.group_by do |ws|
+            state = Aidp::WorkstreamState.read(slug: ws[:slug], project_dir: Dir.pwd) || {}
+            state[:status] || "active"
+          end
+          summary_parts = status_counts.map { |status, ws_list| "#{status}: #{ws_list.size}" }
+          display_message("Summary: #{summary_parts.join(", ")}", type: :muted)
+
+        when "pause-all"
+          # Pause all active workstreams
+          workstreams = Aidp::Worktree.list(project_dir: Dir.pwd)
+          paused_count = 0
+          workstreams.each do |ws|
+            state = Aidp::WorkstreamState.read(slug: ws[:slug], project_dir: Dir.pwd)
+            next unless state && state[:status] == "active"
+            result = Aidp::WorkstreamState.pause(slug: ws[:slug], project_dir: Dir.pwd)
+            paused_count += 1 unless result[:error]
+          end
+          display_message("⏸️  Paused #{paused_count} workstream(s)", type: :success)
+
+        when "resume-all"
+          # Resume all paused workstreams
+          workstreams = Aidp::Worktree.list(project_dir: Dir.pwd)
+          resumed_count = 0
+          workstreams.each do |ws|
+            state = Aidp::WorkstreamState.read(slug: ws[:slug], project_dir: Dir.pwd)
+            next unless state && state[:status] == "paused"
+            result = Aidp::WorkstreamState.resume(slug: ws[:slug], project_dir: Dir.pwd)
+            resumed_count += 1 unless result[:error]
+          end
+          display_message("▶️  Resumed #{resumed_count} workstream(s)", type: :success)
+
+        when "stop-all"
+          # Complete all active workstreams
+          workstreams = Aidp::Worktree.list(project_dir: Dir.pwd)
+          stopped_count = 0
+          workstreams.each do |ws|
+            state = Aidp::WorkstreamState.read(slug: ws[:slug], project_dir: Dir.pwd)
+            next unless state && state[:status] == "active"
+            result = Aidp::WorkstreamState.complete(slug: ws[:slug], project_dir: Dir.pwd)
+            stopped_count += 1 unless result[:error]
+          end
+          display_message("⏹️  Stopped #{stopped_count} workstream(s)", type: :success)
+
+        else
+          display_message("Usage: aidp ws <command>", type: :info)
+          display_message("", type: :info)
+          display_message("Commands:", type: :info)
+          display_message("  list                      List all workstreams (default)", type: :info)
+          display_message("  new <slug> [task]         Create new workstream", type: :info)
+          display_message("  rm <slug>                 Remove workstream", type: :info)
+          display_message("  status <slug>             Show workstream status", type: :info)
+          display_message("  run <slug...>             Run workstream(s) in parallel", type: :info)
+          display_message("  run-all                   Run all active workstreams in parallel", type: :info)
+          display_message("  dashboard                 Show multi-workstream dashboard", type: :info)
+          display_message("  pause <slug>              Pause workstream execution", type: :info)
+          display_message("  resume <slug>             Resume paused workstream", type: :info)
+          display_message("  complete <slug>           Mark workstream as completed", type: :info)
+          display_message("", type: :info)
+          display_message("Options:", type: :info)
+          display_message("  --base-branch <branch>    Branch to create from (for 'new')", type: :info)
+          display_message("  --delete-branch           Also delete git branch (for 'rm')", type: :info)
+          display_message("  --force                   Skip confirmation (for 'rm')", type: :info)
+          display_message("  --max-concurrent N        Max parallel workstreams (for 'run', 'run-all')", type: :info)
+          display_message("  --mode analyze|execute    Execution mode (for 'run', 'run-all')", type: :info)
+          display_message("  --steps STEP1,STEP2       Specific steps to run (for 'run', 'run-all')", type: :info)
+          display_message("", type: :info)
+          display_message("Examples:", type: :info)
+          display_message("  aidp ws list                                    # List workstreams", type: :info)
+          display_message("  aidp ws new issue-123 Fix authentication bug    # Create workstream", type: :info)
+          display_message("  aidp ws new feature-x --base-branch develop     # Create from branch", type: :info)
+          display_message("  aidp ws status issue-123                        # Show status", type: :info)
+          display_message("  aidp ws run issue-123                           # Run single workstream", type: :info)
+          display_message("  aidp ws run issue-123 feature-x --max-concurrent 5  # Run multiple in parallel", type: :info)
+          display_message("  aidp ws run-all --max-concurrent 3              # Run all active workstreams", type: :info)
+          display_message("  aidp ws dashboard                               # Monitor all workstreams", type: :info)
+          display_message("  aidp ws rm issue-123                            # Remove workstream", type: :info)
+          display_message("  aidp ws rm issue-123 --delete-branch --force    # Force remove with branch", type: :info)
+        end
+      end
+
+      def run_work_command(args)
+        require_relative "worktree"
+        require_relative "harness/state_manager"
+
+        # Parse options
+        workstream_slug = nil
+        mode = :execute
+        background = false
+
+        until args.empty?
+          token = args.shift
+          case token
+          when "--workstream"
+            workstream_slug = args.shift
+          when "--mode"
+            mode = args.shift&.to_sym || :execute
+          when "--background"
+            background = true
+          else
+            display_message("⚠️  Unknown work option: #{token}", type: :warn)
+          end
+        end
+
+        unless workstream_slug
+          display_message("❌ Missing required --workstream flag", type: :error)
+          display_message("Usage: aidp work --workstream <slug> [--mode analyze|execute] [--background]", type: :info)
+          return
+        end
+
+        # Verify workstream exists
+        ws = Aidp::Worktree.info(slug: workstream_slug, project_dir: Dir.pwd)
+        unless ws
+          display_message("❌ Workstream not found: #{workstream_slug}", type: :error)
+          return
+        end
+
+        display_message("🚀 Starting #{mode} mode in workstream: #{workstream_slug}", type: :highlight)
+        display_message("  Path: #{ws[:path]}", type: :info)
+        display_message("  Branch: #{ws[:branch]}", type: :info)
+
+        if background
+          require_relative "jobs/background_runner"
+          runner = Aidp::Jobs::BackgroundRunner.new(Dir.pwd)
+
+          display_message("Starting in background...", type: :info)
+          job_id = runner.start(mode, {workstream: workstream_slug})
+
+          display_message("✓ Started background job: #{job_id}", type: :success)
+          display_message("", type: :info)
+          display_message("Monitor progress:", type: :info)
+          display_message("  aidp jobs status #{job_id}", type: :info)
+          display_message("  aidp jobs logs #{job_id} --tail", type: :info)
+          display_message("  aidp ws status #{workstream_slug}", type: :info)
+        else
+          # Run harness inline with workstream context
+          state_manager = Aidp::Harness::StateManager.new(Dir.pwd, mode)
+          state_manager.set_workstream(workstream_slug)
+
+          # Launch harness (will cd into workstream path via enhanced_runner)
+          display_message("Starting interactive harness...", type: :info)
+          display_message("Press Ctrl+C to stop", type: :highlight)
+
+          # Re-use existing CLI.run harness launch logic but skip first-run wizard
+          # Initialize the enhanced TUI
+          require_relative "harness/ui/enhanced_tui"
+          require_relative "harness/ui/enhanced_workflow_selector"
+          require_relative "harness/enhanced_runner"
+
+          tui = Aidp::Harness::UI::EnhancedTUI.new
+          workflow_selector = Aidp::Harness::UI::EnhancedWorkflowSelector.new(tui, project_dir: Dir.pwd)
+
+          # Start TUI display loop
+          tui.start_display_loop
+
+          begin
+            # Get workflow configuration
+            workflow_config = workflow_selector.select_workflow(harness_mode: false, mode: mode)
+            actual_mode = workflow_config[:mode] || mode
+
+            # Pass workflow configuration to harness
+            harness_options = {
+              mode: actual_mode,
+              workflow_type: workflow_config[:workflow_type],
+              selected_steps: workflow_config[:steps],
+              user_input: workflow_config[:user_input]
+            }
+
+            # Create and run the enhanced harness
+            harness_runner = Aidp::Harness::EnhancedRunner.new(Dir.pwd, actual_mode, harness_options)
+            result = harness_runner.run
+            display_harness_result(result)
+          rescue Interrupt
+            display_message("\n\n⏹️  Interrupted by user", type: :warning)
+          ensure
+            tui.stop_display_loop
+          end
+        end
+      end
+
       def display_config_usage
         display_message("Usage: aidp config --interactive [--dry-run]", type: :info)
       end
+
+      def run_skill_command(args)
+        require_relative "skills"
+        require "tty-table"
+
+        subcommand = args.shift
+
+        case subcommand
+        when "list", nil
+          # List all available skills
+          begin
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            skills = registry.all
+
+            if skills.empty?
+              display_message("No skills found.", type: :info)
+              display_message("Create one in skills/ or .aidp/skills/", type: :muted)
+              return
+            end
+
+            by_source = registry.by_source
+
+            if by_source[:template].any?
+              display_message("Template Skills", type: :highlight)
+              display_message("=" * 80, type: :muted)
+              table_rows = by_source[:template].map do |skill_id|
+                skill = registry.find(skill_id)
+                [skill_id, skill.version, skill.description[0, 60]]
+              end
+              header = ["ID", "Version", "Description"]
+              table = TTY::Table.new(header, table_rows)
+              display_message(table.render(:basic), type: :info)
+              display_message("", type: :info)
+            end
+
+            if by_source[:project].any?
+              display_message("Project Skills", type: :highlight)
+              display_message("=" * 80, type: :muted)
+              table_rows = by_source[:project].map do |skill_id|
+                skill = registry.find(skill_id)
+                [skill_id, skill.version, skill.description[0, 60]]
+              end
+              header = ["ID", "Version", "Description"]
+              table = TTY::Table.new(header, table_rows)
+              display_message(table.render(:basic), type: :info)
+              display_message("", type: :info)
+            end
+
+            display_message("Use 'aidp skill show <id>' for details", type: :muted)
+          rescue => e
+            display_message("Failed to list skills: #{e.message}", type: :error)
+          end
+
+        when "show"
+          # Show detailed skill information
+          skill_id = args.shift
+
+          unless skill_id
+            display_message("Usage: aidp skill show <skill-id>", type: :info)
+            return
+          end
+
+          begin
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            skill = registry.find(skill_id)
+
+            unless skill
+              display_message("Skill not found: #{skill_id}", type: :error)
+              display_message("Use 'aidp skill list' to see available skills", type: :muted)
+              return
+            end
+
+            details = skill.details
+
+            display_message("Skill: #{details[:name]} (#{details[:id]})", type: :highlight)
+            display_message("=" * 80, type: :muted)
+            display_message("Version: #{details[:version]}", type: :info)
+            display_message("Source: #{details[:source]}", type: :muted)
+            display_message("", type: :info)
+            display_message("Description:", type: :info)
+            display_message("  #{details[:description]}", type: :info)
+            display_message("", type: :info)
+
+            if details[:expertise].any?
+              display_message("Expertise:", type: :info)
+              details[:expertise].each { |e| display_message("  • #{e}", type: :info) }
+              display_message("", type: :info)
+            end
+
+            if details[:keywords].any?
+              display_message("Keywords: #{details[:keywords].join(", ")}", type: :info)
+              display_message("", type: :info)
+            end
+
+            if details[:when_to_use].any?
+              display_message("When to Use:", type: :info)
+              details[:when_to_use].each { |w| display_message("  • #{w}", type: :info) }
+              display_message("", type: :info)
+            end
+
+            if details[:when_not_to_use].any?
+              display_message("When NOT to Use:", type: :info)
+              details[:when_not_to_use].each { |w| display_message("  • #{w}", type: :info) }
+              display_message("", type: :info)
+            end
+
+            if details[:compatible_providers].any?
+              display_message("Compatible Providers: #{details[:compatible_providers].join(", ")}", type: :info)
+            else
+              display_message("Compatible Providers: all", type: :info)
+            end
+          rescue => e
+            display_message("Failed to show skill: #{e.message}", type: :error)
+          end
+
+        when "search"
+          # Search skills by query
+          query = args.join(" ")
+
+          unless query && !query.empty?
+            display_message("Usage: aidp skill search <query>", type: :info)
+            return
+          end
+
+          begin
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            matching_skills = registry.search(query)
+
+            if matching_skills.empty?
+              display_message("No skills found matching '#{query}'", type: :info)
+              return
+            end
+
+            display_message("Skills matching '#{query}':", type: :highlight)
+            display_message("=" * 80, type: :muted)
+            matching_skills.each do |skill|
+              display_message("  • #{skill.id} - #{skill.description}", type: :info)
+            end
+          rescue => e
+            display_message("Failed to search skills: #{e.message}", type: :error)
+          end
+
+        when "preview"
+          # Preview full skill content
+          skill_id = args.shift
+
+          unless skill_id
+            display_message("Usage: aidp skill preview <skill-id>", type: :info)
+            return
+          end
+
+          begin
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            skill = registry.find(skill_id)
+
+            unless skill
+              display_message("Skill not found: #{skill_id}", type: :error)
+              display_message("Use 'aidp skill list' to see available skills", type: :muted)
+              return
+            end
+
+            require_relative "skills/wizard/builder"
+            require_relative "skills/wizard/template_library"
+
+            builder = Aidp::Skills::Wizard::Builder.new
+            full_content = builder.to_skill_md(skill)
+
+            # Check if this is a project skill with a matching template
+            source_info = registry.by_source[skill_id]
+            inheritance_info = ""
+            if source_info == :project
+              template_library = Aidp::Skills::Wizard::TemplateLibrary.new(project_dir: Dir.pwd)
+              template_skill = template_library.templates.find { |s| s.id == skill.id }
+              if template_skill
+                inheritance_info = " (inherits from template)"
+              end
+            elsif source_info == :template
+              inheritance_info = " (template)"
+            end
+
+            display_message("\n" + "=" * 60, type: :info)
+            display_message("Skill: #{skill.name} (#{skill.id}) v#{skill.version}#{inheritance_info}", type: :highlight)
+            display_message("=" * 60 + "\n", type: :info)
+            display_message(full_content, type: :info)
+            display_message("\n" + "=" * 60, type: :info)
+          rescue => e
+            display_message("Failed to preview skill: #{e.message}", type: :error)
+          end
+
+        when "diff"
+          # Show diff between project skill and template
+          skill_id = args.shift
+
+          unless skill_id
+            display_message("Usage: aidp skill diff <skill-id>", type: :info)
+            return
+          end
+
+          begin
+            require_relative "skills/wizard/template_library"
+            require_relative "skills/wizard/differ"
+
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            project_skill = registry.find(skill_id)
+
+            unless project_skill
+              display_message("Skill not found: #{skill_id}", type: :error)
+              return
+            end
+
+            # Check if it's a project skill
+            unless registry.by_source[:project].include?(skill_id)
+              display_message("Skill '#{skill_id}' is a template skill, not a project skill", type: :info)
+              display_message("Only project skills can be diffed against templates", type: :muted)
+              return
+            end
+
+            # Find the template
+            template_library = Aidp::Skills::Wizard::TemplateLibrary.new(project_dir: Dir.pwd)
+            template_skill = template_library.find(skill_id)
+
+            unless template_skill
+              display_message("No template found for skill '#{skill_id}'", type: :info)
+              display_message("This is a custom skill without a template base", type: :muted)
+              return
+            end
+
+            # Show diff
+            differ = Aidp::Skills::Wizard::Differ.new
+            diff_result = differ.diff(template_skill, project_skill)
+            differ.display(diff_result)
+          rescue => e
+            display_message("Failed to diff skill: #{e.message}", type: :error)
+          end
+
+        when "edit"
+          # Edit an existing skill
+          skill_id = args.shift
+
+          unless skill_id
+            display_message("Usage: aidp skill edit <skill-id>", type: :info)
+            return
+          end
+
+          begin
+            require_relative "skills/wizard/controller"
+
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            skill = registry.find(skill_id)
+
+            unless skill
+              display_message("Skill not found: #{skill_id}", type: :error)
+              display_message("Use 'aidp skill list' to see available skills", type: :muted)
+              return
+            end
+
+            # Check if it's editable (must be project skill or willing to copy template)
+            if registry.by_source[:template].include?(skill_id)
+              display_message("'#{skill_id}' is a template skill", type: :info)
+              display_message("Editing will create a project override in .aidp/skills/", type: :muted)
+            end
+
+            # Parse options
+            options = {}
+            while args.first&.start_with?("--")
+              opt = args.shift
+              case opt
+              when "--dry-run"
+                options[:dry_run] = true
+              when "--open-editor"
+                options[:open_editor] = true
+              else
+                display_message("Unknown option: #{opt}", type: :error)
+                return
+              end
+            end
+
+            # Pre-fill wizard with existing skill data
+            options[:id] = skill.id
+            options[:name] = skill.name
+            options[:edit_mode] = true
+            options[:existing_skill] = skill
+
+            # Run wizard in edit mode
+            wizard = Aidp::Skills::Wizard::Controller.new(
+              project_dir: Dir.pwd,
+              options: options
+            )
+            wizard.run
+          rescue => e
+            display_message("Failed to edit skill: #{e.message}", type: :error)
+          end
+
+        when "new"
+          # Create a new skill using the wizard
+          begin
+            require_relative "skills/wizard/controller"
+
+            # Parse options
+            options = {}
+            while args.first&.start_with?("--")
+              opt = args.shift
+              case opt
+              when "--minimal"
+                options[:minimal] = true
+              when "--dry-run"
+                options[:dry_run] = true
+              when "--yes", "-y"
+                options[:yes] = true
+              when "--id"
+                options[:id] = args.shift
+              when "--name"
+                options[:name] = args.shift
+              when "--from-template"
+                options[:from_template] = args.shift
+              when "--clone"
+                options[:clone] = args.shift
+              else
+                display_message("Unknown option: #{opt}", type: :error)
+                return
+              end
+            end
+
+            # Run wizard
+            wizard = Aidp::Skills::Wizard::Controller.new(
+              project_dir: Dir.pwd,
+              options: options
+            )
+            wizard.run
+          rescue => e
+            display_message("Failed to create skill: #{e.message}", type: :error)
+            Aidp.log_error("cli", "Skill wizard failed", error: e.message, backtrace: e.backtrace.first(5))
+          end
+
+        when "validate"
+          # Validate skill file format
+          skill_path = args.shift
+
+          if skill_path
+            # Validate specific file
+            unless File.exist?(skill_path)
+              display_message("File not found: #{skill_path}", type: :error)
+              return
+            end
+
+            begin
+              Aidp::Skills::Loader.load_from_file(skill_path)
+              display_message("✓ Valid skill file: #{skill_path}", type: :success)
+            rescue Aidp::Errors::ValidationError => e
+              display_message("✗ Invalid skill file: #{skill_path}", type: :error)
+              display_message("  #{e.message}", type: :error)
+            end
+          else
+            # Validate all skills in registry
+            begin
+              registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+              registry.load_skills
+
+              skills = registry.all
+
+              if skills.empty?
+                display_message("No skills found to validate", type: :info)
+                return
+              end
+
+              display_message("Validating #{skills.size} skill(s)...", type: :info)
+              display_message("", type: :info)
+
+              valid_count = 0
+              skills.each do |skill|
+                display_message("✓ #{skill.id} (v#{skill.version})", type: :success)
+                valid_count += 1
+              end
+
+              display_message("", type: :info)
+              display_message("#{valid_count}/#{skills.size} skills are valid", type: :success)
+            rescue => e
+              display_message("Validation failed: #{e.message}", type: :error)
+            end
+          end
+
+        when "delete"
+          # Delete a project skill
+          skill_id = args.shift
+
+          unless skill_id
+            display_message("Usage: aidp skill delete <skill-id>", type: :info)
+            return
+          end
+
+          begin
+            registry = Aidp::Skills::Registry.new(project_dir: Dir.pwd)
+            registry.load_skills
+
+            skill = registry.find(skill_id)
+
+            unless skill
+              display_message("Skill not found: #{skill_id}", type: :error)
+              return
+            end
+
+            # Check if it's a project skill
+            source = registry.by_source[skill_id]
+            unless source == :project
+              display_message("Cannot delete template skill '#{skill_id}'", type: :error)
+              display_message("Only project skills in .aidp/skills/ can be deleted", type: :muted)
+              return
+            end
+
+            # Get skill directory
+            skill_dir = File.dirname(skill.source_path)
+
+            # Confirm deletion
+            require "tty-prompt"
+            prompt = TTY::Prompt.new
+            confirmed = prompt.yes?("Delete skill '#{skill.name}' (#{skill_id})? This cannot be undone.")
+
+            unless confirmed
+              display_message("Deletion cancelled", type: :info)
+              return
+            end
+
+            # Delete the skill directory
+            require "fileutils"
+            FileUtils.rm_rf(skill_dir)
+
+            display_message("✓ Deleted skill: #{skill.name} (#{skill_id})", type: :success)
+          rescue => e
+            display_message("Failed to delete skill: #{e.message}", type: :error)
+            Aidp.log_error("cli", "Skill deletion failed", error: e.message, backtrace: e.backtrace.first(5))
+          end
+
+        else
+          display_message("Usage: aidp skill <command>", type: :info)
+          display_message("", type: :info)
+          display_message("Commands:", type: :info)
+          display_message("  list                List all available skills (default)", type: :info)
+          display_message("  show <id>           Show detailed skill information", type: :info)
+          display_message("  preview <id>        Preview full SKILL.md content", type: :info)
+          display_message("  diff <id>           Show diff between project skill and template", type: :info)
+          display_message("  search <query>      Search skills by keyword", type: :info)
+          display_message("  new [options]       Create a new skill using the wizard", type: :info)
+          display_message("  edit <id> [options] Edit an existing skill", type: :info)
+          display_message("  delete <id>         Delete a project skill", type: :info)
+          display_message("  validate [path]     Validate skill file format", type: :info)
+          display_message("", type: :info)
+          display_message("New Skill Options:", type: :info)
+          display_message("  --minimal           Skip optional sections", type: :info)
+          display_message("  --dry-run           Preview without saving", type: :info)
+          display_message("  --yes, -y           Skip confirmation prompts", type: :info)
+          display_message("  --id <skill_id>     Pre-set skill ID", type: :info)
+          display_message("  --name <name>       Pre-set skill name", type: :info)
+          display_message("", type: :info)
+          display_message("Edit Skill Options:", type: :info)
+          display_message("  --dry-run           Preview changes without saving", type: :info)
+          display_message("  --open-editor       Open content in $EDITOR", type: :info)
+          display_message("", type: :info)
+          display_message("Examples:", type: :info)
+          display_message("  aidp skill list                                # List all skills", type: :info)
+          display_message("  aidp skill show repository_analyst             # Show skill details", type: :info)
+          display_message("  aidp skill preview repository_analyst          # Preview full content", type: :info)
+          display_message("  aidp skill diff my_skill                       # Show diff with template", type: :info)
+          display_message("  aidp skill search git                          # Search for git-related skills", type: :info)
+          display_message("  aidp skill new                                 # Create new skill (interactive)", type: :info)
+          display_message("  aidp skill new --minimal --id my_skill         # Create with minimal prompts", type: :info)
+          display_message("  aidp skill new --from-template repo_analyst    # Inherit from template", type: :info)
+          display_message("  aidp skill new --clone my_existing_skill       # Clone existing skill", type: :info)
+          display_message("  aidp skill edit repository_analyst             # Edit existing skill", type: :info)
+          display_message("  aidp skill delete my_custom_skill              # Delete a project skill", type: :info)
+          display_message("  aidp skill validate skills/my_skill/SKILL.md   # Validate specific skill", type: :info)
+          display_message("  aidp skill validate                            # Validate all skills", type: :info)
+        end
+      end
     end # class << self
   end
 end