odysseus-cli 0.2.0 → 0.9.0

data/lib/odysseus/cli/cli.rb

@@ -1,267 +1,165 @@
 # odysseus-cli/lib/odysseus/cli/cli.rb
 
 require 'odysseus'
-require 'pastel'
 require 'yaml'
 require 'tempfile'
-require_relative 'gum'
+require_relative 'ui'
+require_relative 'rollback_commands'
+require_relative 'interactive_commands'
+require_relative 'doctor_commands'
+require_relative 'setup_commands'
 
 module Odysseus
   module CLI
     class CLI
-      def initialize(charm_mode: false)
-        @pastel = Pastel.new
-        @charm = charm_mode && Gum.available?
-        if charm_mode && !Gum.available?
-          warn @pastel.yellow("Warning: --charm mode requested but 'gum' is not installed")
-          warn @pastel.dim("Install gum: https://github.com/charmbracelet/gum")
-        end
-      end
+      include RollbackCommands
+      include InteractiveCommands
+      include DoctorCommands
+      include SetupCommands
 
-      def charm?
-        @charm
+      def initialize(debug: false)
+        @ui = UI.new(debug: debug)
       end
 
-      # Deploy command - deploys all roles to their configured hosts
-      # Usage: odysseus deploy [--config FILE] [--image TAG] [--build] [--dry-run] [--verbose]
+      # Deploy command
       def deploy(options = {})
         config_file = options[:config] || 'deploy.yml'
-        image_tag = options[:image] || 'latest'
+        image_tag = options[:image]
         should_build = options[:build] || false
         dry_run = options[:'dry-run'] || false
-        verbose = options[:verbose] || false
+        verbose = options[:verbose] || @ui.debug?
 
         config = load_config(config_file)
         uses_registry = config[:registry] && config[:registry][:server]
 
-        # Header
-        if charm?
-          puts Gum.style("⛵ Odysseus Deploy", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Deploy")
-        end
-        puts @pastel.blue("Service: #{config[:service]}")
-        puts @pastel.blue("Image: #{config[:image]}:#{image_tag}")
-        if should_build
-          distribution = uses_registry ? "registry (#{config[:registry][:server]})" : "pussh (SSH)"
-          puts @pastel.blue("Build & distribute via: #{distribution}")
-        end
-        puts ""
-
         executor = Odysseus::Deployer::Executor.new(config_file, verbose: verbose)
+        resolved = executor.deploy_version(image_tag)
+
+        distribution = uses_registry ? "registry (#{config[:registry][:server]})" : 'pussh (SSH)'
+        @ui.deploy_header(
+          service: config[:service],
+          image: config[:image],
+          image_tag: resolved.version,
+          build: should_build,
+          distribution: distribution
+        )
+
+        start_time = Time.now
 
-        # Build and distribute image if requested
         if should_build
-          if charm?
-            result = Gum.spin(title: 'Building and distributing image...') do
-              executor.build_and_distribute(image_tag: image_tag)
-            end
-          else
-            puts @pastel.cyan("=== Building and distributing image ===")
-            result = executor.build_and_distribute(image_tag: image_tag)
-          end
+          # Build phase — captured as streaming steps
+          @ui.stream_steps(title: 'Building and distributing') do
+            build_result = executor.build_and_distribute(image_tag: image_tag)
 
-          if result[:build][:success]
-            puts @pastel.green("✓ Build complete!")
-          else
-            puts @pastel.red("✗ Build failed: #{result[:build][:error]}")
-            exit 1
-          end
+            raise Odysseus::BuildError, "Build failed: #{build_result[:build][:error]}" unless build_result[:build][:success]
 
-          # Handle distribution result (either pussh or registry push)
-          if uses_registry
-            if result[:push][:success]
-              puts @pastel.green("✓ Pushed to registry!")
-            else
-              puts @pastel.red("✗ Push to registry failed!")
-              exit 1
-            end
-          else
-            if result[:pussh][:success]
-              puts @pastel.green("✓ Pussh complete!")
-              result[:pussh][:results]&.each do |host, host_result|
-                status = host_result[:success] ? @pastel.green('✓') : @pastel.red('✗')
-                puts "  #{status} #{host}"
-              end
+            if uses_registry
+              raise Odysseus::BuildError, 'Push to registry failed' unless build_result[:push][:success]
             else
-              puts @pastel.red("✗ Pussh failed!")
-              result[:pussh][:results]&.each do |host, host_result|
-                status = host_result[:success] ? @pastel.green('✓') : @pastel.red('✗')
-                puts "  #{status} #{host}"
-                puts "      #{host_result[:error]}" unless host_result[:success]
-              end
-              exit 1
+              raise Odysseus::BuildError, 'Image distribution failed' unless build_result[:pussh][:success]
             end
           end
-          puts ""
         end
 
-        if charm?
-          Gum.spin(title: 'Deploying to servers...') do
-            executor.deploy_all(image_tag: image_tag, dry_run: dry_run)
-          end
-        else
+        # Deploy phase — each orchestrator log line becomes a sub-step
+        @ui.stream_steps(title: 'Deploying service') do
           executor.deploy_all(image_tag: image_tag, dry_run: dry_run)
         end
 
-        puts ""
-        if charm?
-          puts Gum.style("✓ Deploy complete!", foreground: '82', bold: true)
-        else
-          puts @pastel.green("Deploy complete!")
-        end
+        duration = (Time.now - start_time).round(1)
+        @ui.deploy_complete(duration: duration)
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Build command - builds Docker image locally or on a build host
-      # Usage: odysseus build [--config FILE] [--image TAG] [--push] [--context PATH] [--verbose]
+      # Build command
       def build(options = {})
         config_file = options[:config] || 'deploy.yml'
-        image_tag = options[:image] || 'latest'
+        image_tag = options[:image]
         push = options[:push] || false
         context_path = options[:context]
-        verbose = options[:verbose] || false
+        verbose = options[:verbose] || @ui.debug?
 
         config = load_config(config_file)
-        builder_config = config[:builder] || {}
-        strategy = builder_config[:strategy] || :local
-
-        if charm?
-          puts Gum.style("🔨 Odysseus Build", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Build")
-        end
-        puts @pastel.blue("Service: #{config[:service]}")
-        puts @pastel.blue("Image: #{config[:image]}:#{image_tag}")
-        puts @pastel.blue("Strategy: #{strategy}")
-        puts @pastel.blue("Build host: #{builder_config[:host]}") if builder_config[:host]
-        puts @pastel.blue("Push: #{push ? 'yes' : 'no'}")
-        puts ""
 
         executor = Odysseus::Deployer::Executor.new(config_file, verbose: verbose)
+        resolved = executor.deploy_version(image_tag)
 
-        if charm?
-          result = Gum.spin(title: 'Building image...') do
-            executor.build(image_tag: image_tag, push: push, context_path: context_path)
-          end
-        else
-          result = executor.build(image_tag: image_tag, push: push, context_path: context_path)
+        @ui.header 'Odysseus Build'
+        @ui.info 'Image', "#{config[:image]}:#{resolved.version}"
+        @ui.info 'Strategy', (config.dig(:builder, :strategy) || :local).to_s
+        @ui.blank
+
+        result = @ui.spin_step("Building image #{config[:image]}:#{resolved.version}") do
+          executor.build(image_tag: image_tag, push: push, context_path: context_path)
         end
 
         if result[:success]
-          puts ""
-          if charm?
-            puts Gum.style("✓ Build complete!", foreground: '82', bold: true)
-          else
-            puts @pastel.green("Build complete!")
-          end
-          puts @pastel.blue("Image: #{result[:image]}")
-          if result[:pushed]
-            puts @pastel.blue("Pushed to registry: yes")
-          end
+          @ui.step_ok 'Pushed to registry' if result[:pushed]
+          @ui.step_ok 'Build complete'
         else
-          puts ""
-          puts @pastel.red("✗ Build failed: #{result[:error]}")
+          @ui.step_fail "Build failed: #{result[:error]}"
           exit 1
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Pussh command - push image to hosts via SSH (no registry needed)
-      # Usage: odysseus pussh [--config FILE] [--image TAG] [--build] [--verbose]
+      # Pussh command
       def pussh(options = {})
         config_file = options[:config] || 'deploy.yml'
-        image_tag = options[:image] || 'latest'
+        image_tag = options[:image]
         should_build = options[:build] || false
-        verbose = options[:verbose] || false
+        verbose = options[:verbose] || @ui.debug?
 
         config = load_config(config_file)
 
-        if charm?
-          puts Gum.style("📦 Odysseus Pussh", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Pussh")
-        end
-        puts @pastel.blue("Service: #{config[:service]}")
-        puts @pastel.blue("Image: #{config[:image]}:#{image_tag}")
-        puts @pastel.blue("Build first: #{should_build ? 'yes' : 'no'}")
-        puts ""
-
         executor = Odysseus::Deployer::Executor.new(config_file, verbose: verbose)
+        resolved = executor.deploy_version(image_tag)
+
+        @ui.header 'Odysseus Pussh'
+        @ui.info 'Image', "#{config[:image]}:#{resolved.version}"
+        @ui.blank
 
         if should_build
-          if charm?
-            result = Gum.spin(title: 'Building and pushing image via SSH...') do
-              executor.build_and_pussh(image_tag: image_tag)
-            end
-          else
-            result = executor.build_and_pussh(image_tag: image_tag)
+          result = @ui.spin_step("Building image #{config[:image]}:#{resolved.version}") do
+            executor.build_and_pussh(image_tag: image_tag)
           end
 
-          if result[:build][:success]
-            puts @pastel.green("✓ Build complete!")
-          else
-            puts @pastel.red("✗ Build failed: #{result[:build][:error]}")
+          unless result[:build][:success]
+            @ui.step_fail "Build failed: #{result[:build][:error]}"
             exit 1
           end
+          pussh_result = result[:pussh]
         else
-          if charm?
-            result = Gum.spin(title: 'Pushing image via SSH...') do
-              executor.pussh(image_tag: image_tag)
-            end
-          else
-            result = executor.pussh(image_tag: image_tag)
+          pussh_result = @ui.spin_step('Pushing image via SSH...') do
+            executor.pussh(image_tag: image_tag)
           end
         end
 
-        pussh_result = should_build ? result[:pussh] : result
-
         if pussh_result[:success]
-          puts ""
-          if charm?
-            puts Gum.style("✓ Pussh complete!", foreground: '82', bold: true)
-          else
-            puts @pastel.green("Pussh complete!")
-          end
-          pussh_result[:results]&.each do |host, host_result|
-            status = host_result[:success] ? @pastel.green('✓') : @pastel.red('✗')
-            puts "  #{status} #{host}"
-          end
+          @ui.step_ok "Pussh complete (#{pussh_result[:results]&.size || 0} host(s))"
         else
-          puts ""
-          puts @pastel.red("✗ Pussh failed!")
-          pussh_result[:results]&.each do |host, host_result|
-            status = host_result[:success] ? @pastel.green('✓') : @pastel.red('✗')
-            puts "  #{status} #{host}"
-            puts "      #{host_result[:error]}" unless host_result[:success]
-          end
+          @ui.step_fail 'Pussh failed'
           exit 1
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Status command - show full service status on a server
-      # Usage: odysseus status <server> [--config FILE]
+      # Status command
       def status(server, options = {})
         config_file = options[:config] || 'deploy.yml'
-
         config = load_config(config_file)
         service_name = config[:service]
 
-        if charm?
-          puts Gum.style("⛵ Odysseus Status", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Status: #{service_name}")
-        end
-        puts @pastel.blue("Service: #{service_name}")
-        puts @pastel.blue("Server: #{server}")
-        puts ""
+        @ui.header 'Odysseus Status'
+        @ui.info 'Service', service_name
+        @ui.info 'Server', server
+        @ui.blank
 
         ssh = connect_to_server(server, config)
 
@@ -270,162 +168,97 @@ module Odysseus
           caddy = Odysseus::Caddy::Client.new(ssh: ssh, docker: docker)
 
           # Web containers
-          if charm?
-            puts Gum.style(" Web ", foreground: '212', bold: true)
-          else
-            puts @pastel.cyan("Web:")
-          end
+          @ui.section 'Web'
           web_containers = docker.list(service: service_name)
           if web_containers.empty?
-            puts "  (no containers running)"
-          elsif charm?
-            rows = web_containers.map do |c|
-              health = c['Status'].include?('healthy') ? '✓' : ''
-              [c['Names'], c['State'], c['Image'], health]
-            end
-            puts Gum.table(headers: ['Name', 'State', 'Image', 'Health'], rows: rows)
+            @ui.step '(no containers running)'
           else
-            web_containers.each do |c|
-              status_color = c['State'] == 'running' ? :green : :red
-              health = c['Status'].include?('healthy') ? ' (healthy)' : ''
-              puts "  #{@pastel.send(status_color, c['State'])} #{c['Names']}#{health}"
-              puts "    Image: #{c['Image']}"
-            end
+            rows = web_containers.map { |c| web_container_row(c) }
+            @ui.table(headers: %w[Version Ref Deployed Image State Health], rows: rows)
           end
 
-          # Show Caddy route for this service
           caddy_status = caddy.status
           if caddy_status[:running]
             svc_route = caddy_status[:services].find { |s| s[:service] == service_name }
             if svc_route
-              puts "  Proxy: #{svc_route[:hosts].join(', ')}"
-              puts "  Upstreams: #{svc_route[:upstreams].join(', ')}"
+              @ui.info 'Proxy', svc_route[:hosts].join(', ')
+              @ui.info 'Upstreams', svc_route[:upstreams].join(', ')
             end
           end
+          @ui.blank
 
-          puts ""
-
-          # Job/worker containers (non-web roles)
+          # Workers
           non_web_roles = config[:servers].keys.reject { |r| r == :web }
           if non_web_roles.any?
-            if charm?
-              puts Gum.style(" Jobs/Workers ", foreground: '212', bold: true)
-            else
-              puts @pastel.cyan("Jobs/Workers:")
-            end
-
-            if charm?
-              rows = []
-              non_web_roles.each do |role|
-                role_service = "#{service_name}-#{role}"
-                containers = docker.list(service: role_service)
-                if containers.empty?
-                  rows << [role.to_s, 'stopped', '-', '-']
-                else
-                  containers.each do |c|
-                    rows << [role.to_s, c['State'], c['Names'], c['Image']]
-                  end
-                end
-              end
-              puts Gum.table(headers: ['Role', 'State', 'Name', 'Image'], rows: rows)
-            else
-              non_web_roles.each do |role|
-                role_service = "#{service_name}-#{role}"
-                containers = docker.list(service: role_service)
-                if containers.empty?
-                  puts "  #{@pastel.yellow(role.to_s)}: #{@pastel.red('not running')}"
-                else
-                  containers.each do |c|
-                    status_color = c['State'] == 'running' ? :green : :red
-                    puts "  #{@pastel.yellow(role.to_s)}: #{@pastel.send(status_color, c['State'])} #{c['Names']}"
-                    puts "    Image: #{c['Image']}"
-                  end
+            @ui.section 'Workers'
+            rows = []
+            non_web_roles.each do |role|
+              role_service = "#{service_name}-#{role}"
+              containers = docker.list(service: role_service)
+              if containers.empty?
+                rows << [role.to_s, 'stopped', '-', '-']
+              else
+                containers.each do |c|
+                  rows << [role.to_s, c['State'], c['Names'], c['Image']]
                 end
               end
             end
-            puts ""
-          end
-
-          # Accessories
-          if config[:accessories]&.any?
-            if charm?
-              puts Gum.style(" Accessories ", foreground: '212', bold: true)
-              rows = config[:accessories].map do |name, acc_config|
-                acc_service = "#{service_name}-#{name}"
-                containers = docker.list(service: acc_service, all: true)
-                running = containers.find { |c| c['State'] == 'running' }
-                if running
-                  health = running['Status'].include?('healthy') ? '✓' : ''
-                  [name.to_s, 'running', acc_config[:image], running['ID'][0..11], health]
-                else
-                  [name.to_s, 'stopped', acc_config[:image], '-', '']
-                end
-              end
-              puts Gum.table(headers: ['Name', 'State', 'Image', 'Container', 'Health'], rows: rows)
-            else
-              puts @pastel.cyan("Accessories:")
-              config[:accessories].each do |name, acc_config|
-                acc_service = "#{service_name}-#{name}"
-                containers = docker.list(service: acc_service, all: true)
-                running = containers.find { |c| c['State'] == 'running' }
-
-                if running
-                  health = running['Status'].include?('healthy') ? ' (healthy)' : ''
-                  puts "  #{@pastel.yellow(name.to_s)}: #{@pastel.green('running')}#{health}"
-                  puts "    Image: #{acc_config[:image]}"
-                  puts "    Container: #{running['ID'][0..11]}"
-                else
-                  puts "  #{@pastel.yellow(name.to_s)}: #{@pastel.red('stopped')}"
-                  puts "    Image: #{acc_config[:image]}"
-                end
+            @ui.table(headers: %w[Role State Name Image], rows: rows)
+            @ui.blank
+          end
+
+          # Dependencies
+          if config[:dependencies]&.any?
+            @ui.section 'Dependencies'
+            rows = config[:dependencies].map do |name, acc_config|
+              acc_service = "#{service_name}-#{name}"
+              containers = docker.list(service: acc_service, all: true)
+              running = containers.find { |c| c['State'] == 'running' }
+              if running
+                health = running['Status'].include?('healthy') ? '✓' : ''
+                [name.to_s, 'running', acc_config[:image], running['ID'][0..11], health]
+              else
+                [name.to_s, 'stopped', acc_config[:image], '-', '']
               end
             end
-            puts ""
+            @ui.table(headers: %w[Name State Image Container Health], rows: rows)
+            @ui.blank
           end
 
-          # TLS status for this service's domains
+          # TLS
           if config[:proxy][:hosts]&.any?
-            if charm?
-              puts Gum.style(" TLS ", foreground: '212', bold: true)
-            else
-              puts @pastel.cyan("TLS:")
-            end
+            @ui.section 'TLS'
             if caddy_status[:running] && caddy_status[:tls][:enabled]
               service_hosts = config[:proxy][:hosts]
               relevant_policy = caddy_status[:tls][:policies].find do |p|
-                (p[:subjects] & service_hosts).any?
+                p[:subjects].intersect?(service_hosts)
               end
               if relevant_policy
-                puts "  Domains: #{(relevant_policy[:subjects] & service_hosts).join(', ')}"
-                puts "  Issuer: #{relevant_policy[:issuer]}"
-                puts "  Email: #{relevant_policy[:email] || '(not set)'}"
+                @ui.info 'Domains', (relevant_policy[:subjects] & service_hosts).join(', ')
+                @ui.info 'Issuer', relevant_policy[:issuer]
+                @ui.info 'Email', relevant_policy[:email] || '(not set)'
               else
-                puts "  (not configured for this service)"
+                @ui.step '(not configured for this service)'
               end
             else
-              puts "  (Caddy not running or TLS not configured)"
+              @ui.step '(Caddy not running or TLS not configured)'
             end
           end
         ensure
           ssh.close
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # Containers command - list running containers for a service
-      # Usage: odysseus containers <server> [--config FILE] [--service NAME]
+      # Containers command
       def containers(server, options = {})
         config_file = options[:config] || 'deploy.yml'
 
-        if charm?
-          puts Gum.style("📦 Odysseus Containers", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Containers")
-        end
-        puts @pastel.blue("Server: #{server}")
-        puts ""
+        @ui.header 'Odysseus Containers'
+        @ui.info 'Server', server
+        @ui.blank
 
         config = load_config(config_file)
         service_name = options[:service] || config[:service]
@@ -436,270 +269,144 @@ module Odysseus
           containers = docker.list(service: service_name)
 
           if containers.empty?
-            puts "No containers found for service: #{service_name}"
-          elsif charm?
-            puts Gum.style(" #{service_name} ", foreground: '212', bold: true)
+            @ui.step "No containers found for #{service_name}"
+          else
             rows = containers.map do |c|
               [c['ID'][0..11], c['State'], c['Names'], c['Image'], c['Status']]
             end
-            puts Gum.table(headers: ['ID', 'State', 'Name', 'Image', 'Status'], rows: rows)
-          else
-            puts @pastel.cyan("Containers for #{service_name}:")
-            containers.each do |c|
-              status_color = c['State'] == 'running' ? :green : :red
-              puts "  #{c['ID'][0..11]} #{@pastel.send(status_color, c['State'])} #{c['Names']} (#{c['Image']})"
-              puts "    Created: #{c['CreatedAt']}"
-              puts "    Status: #{c['Status']}"
-            end
+            @ui.table(headers: %w[ID State Name Image Status], rows: rows)
           end
         ensure
           ssh.close
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
       # Validate command
-      # Usage: odysseus validate [--config FILE]
       def validate(options = {})
         config_file = options[:config] || 'deploy.yml'
 
-        puts @pastel.cyan("Validating #{config_file}...")
-
+        @ui.header "Validating #{config_file}"
         config = load_config(config_file)
 
-        puts @pastel.green("Configuration is valid!")
-        puts ""
-        puts "Service: #{config[:service]}"
-        puts "Image: #{config[:image]}"
-        puts "Servers: #{config[:servers].keys.join(', ')}"
-        puts "Proxy hosts: #{config[:proxy][:hosts]&.join(', ')}"
-        if config[:accessories]&.any?
-          puts "Accessories: #{config[:accessories].keys.join(', ')}"
-        end
+        @ui.success 'Configuration is valid'
+        @ui.info 'Service', config[:service]
+        @ui.info 'Image', config[:image]
+        @ui.info 'Servers', config[:servers].keys.join(', ')
+        @ui.info 'Proxy', config[:proxy][:hosts]&.join(', ')
+        @ui.info 'Dependencies', config[:dependencies].keys.join(', ') if config[:dependencies]&.any?
       rescue Odysseus::Error => e
-        puts @pastel.red("Validation failed: #{e.message}")
+        @ui.error "Validation failed: #{e.message}"
         exit 1
       end
 
-      # Accessory boot command
-      # Usage: odysseus accessory boot --name NAME [--config FILE]
-      def accessory_boot(options = {})
+      # Dependency commands
+      def dependency_boot(options = {})
         config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
-
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
-          exit 1
-        end
+        name = require_name!(options)
 
-        if charm?
-          puts Gum.style("🔌 Accessory Boot", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Accessory Boot")
-        end
-        puts @pastel.blue("Accessory: #{name}")
-        puts ""
+        @ui.header 'Dependency Boot'
+        @ui.info 'Dependency', name
+        @ui.blank
 
         executor = Odysseus::Deployer::Executor.new(config_file)
-
-        if charm?
-          Gum.spin(title: "Booting #{name}...") do
-            executor.deploy_accessory(name: name)
-          end
-          puts Gum.style("✓ Accessory #{name} deployed!", foreground: '82', bold: true)
-        else
-          executor.deploy_accessory(name: name)
-          puts @pastel.green("Accessory #{name} deployed!")
-        end
+        @ui.spin_step("Booting #{name}...") { executor.deploy_dependency(name: name) }
+        @ui.step_ok "Dependency #{name} deployed"
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Boot all accessories
-      # Usage: odysseus accessory boot-all [--config FILE]
-      def accessory_boot_all(options = {})
+      def dependency_boot_all(options = {})
         config_file = options[:config] || 'deploy.yml'
 
-        if charm?
-          puts Gum.style("🔌 Accessory Boot All", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Accessory Boot All")
-        end
-        puts ""
+        @ui.header 'Dependency Boot All'
+        @ui.blank
 
         executor = Odysseus::Deployer::Executor.new(config_file)
-
-        if charm?
-          Gum.spin(title: 'Booting all accessories...') do
-            executor.boot_accessories
-          end
-          puts Gum.style("✓ All accessories deployed!", foreground: '82', bold: true)
-        else
-          executor.boot_accessories
-          puts @pastel.green("All accessories deployed!")
-        end
+        @ui.spin_step('Booting all dependencies...') { executor.boot_dependencies }
+        @ui.step_ok 'All dependencies deployed'
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Accessory remove command
-      # Usage: odysseus accessory remove --name NAME [--config FILE]
-      def accessory_remove(options = {})
+      def dependency_remove(options = {})
         config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
+        name = require_name!(options)
 
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
-          exit 1
-        end
-
-        if charm?
-          puts Gum.style("🗑️  Accessory Remove", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Accessory Remove")
-        end
-        puts @pastel.blue("Accessory: #{name}")
-        puts ""
-
-        # Charm mode: ask for confirmation
-        if charm?
-          unless Gum.confirm("Remove accessory #{name}?")
-            puts @pastel.yellow("Cancelled.")
-            return
-          end
-        end
+        @ui.header 'Dependency Remove'
+        @ui.info 'Dependency', name
+        @ui.blank
 
         executor = Odysseus::Deployer::Executor.new(config_file)
-
-        if charm?
-          Gum.spin(title: "Removing #{name}...") do
-            executor.remove_accessory(name: name)
-          end
-          puts Gum.style("✓ Accessory #{name} removed!", foreground: '82', bold: true)
-        else
-          executor.remove_accessory(name: name)
-          puts @pastel.green("Accessory #{name} removed!")
-        end
+        @ui.spin_step("Removing #{name}...") { executor.remove_dependency(name: name) }
+        @ui.step_ok "Dependency #{name} removed"
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Accessory restart command
-      # Usage: odysseus accessory restart --name NAME [--config FILE]
-      def accessory_restart(options = {})
+      def dependency_restart(options = {})
         config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
+        name = require_name!(options)
 
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
-          exit 1
-        end
-
-        if charm?
-          puts Gum.style("🔄 Accessory Restart", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Accessory Restart")
-        end
-        puts @pastel.blue("Accessory: #{name}")
-        puts ""
+        @ui.header 'Dependency Restart'
+        @ui.info 'Dependency', name
+        @ui.blank
 
         executor = Odysseus::Deployer::Executor.new(config_file)
-
-        if charm?
-          Gum.spin(title: "Restarting #{name}...") do
-            executor.restart_accessory(name: name)
-          end
-          puts Gum.style("✓ Accessory #{name} restarted!", foreground: '82', bold: true)
-        else
-          executor.restart_accessory(name: name)
-          puts @pastel.green("Accessory #{name} restarted!")
-        end
+        @ui.spin_step("Restarting #{name}...") { executor.restart_dependency(name: name) }
+        @ui.step_ok "Dependency #{name} restarted"
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Accessory upgrade command - upgrade to new image version (preserves volumes)
-      # Usage: odysseus accessory upgrade --name NAME [--config FILE]
-      def accessory_upgrade(options = {})
+      def dependency_upgrade(options = {})
         config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
-
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
-          exit 1
-        end
+        name = require_name!(options)
 
-        if charm?
-          puts Gum.style("⬆️  Accessory Upgrade", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Accessory Upgrade")
-        end
-        puts @pastel.blue("Accessory: #{name}")
-        puts ""
+        @ui.header 'Dependency Upgrade'
+        @ui.info 'Dependency', name
+        @ui.blank
 
         executor = Odysseus::Deployer::Executor.new(config_file)
-
-        if charm?
-          Gum.spin(title: "Upgrading #{name}...") do
-            executor.upgrade_accessory(name: name)
-          end
-          puts Gum.style("✓ Accessory #{name} upgraded!", foreground: '82', bold: true)
-        else
-          executor.upgrade_accessory(name: name)
-          puts @pastel.green("Accessory #{name} upgraded!")
-        end
+        @ui.spin_step("Upgrading #{name}...") { executor.upgrade_dependency(name: name) }
+        @ui.step_ok "Dependency #{name} upgraded"
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.step_fail e.message
         exit 1
       end
 
-      # Accessory status command
-      # Usage: odysseus accessory status [--config FILE]
-      def accessory_status(options = {})
+      def dependency_status(options = {})
         config_file = options[:config] || 'deploy.yml'
 
-        if charm?
-          puts Gum.style("🔌 Accessory Status", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Accessory Status")
-        end
-        puts ""
+        @ui.header 'Dependency Status'
+        @ui.blank
 
         executor = Odysseus::Deployer::Executor.new(config_file)
-        statuses = executor.accessory_status
+        statuses = executor.dependency_status
 
         if statuses.empty?
-          puts "No accessories configured"
-        elsif charm?
-          rows = statuses.map do |status|
-            state = status[:running] ? 'running' : 'stopped'
-            container = status[:container_id] ? status[:container_id][0..11] : '-'
-            proxy = status[:has_proxy] ? '✓' : ''
-            [status[:name].to_s, status[:host], state, status[:image], container, proxy]
-          end
-          puts Gum.table(headers: ['Name', 'Host', 'State', 'Image', 'Container', 'Proxy'], rows: rows)
+          @ui.step 'No dependencies configured'
         else
-          statuses.each do |status|
-            status_text = status[:running] ? @pastel.green('running') : @pastel.red('stopped')
-            puts "  #{@pastel.yellow(status[:name].to_s)} @ #{status[:host]}: #{status_text}"
-            puts "    Image: #{status[:image]}"
-            puts "    Container: #{status[:container_id] ? status[:container_id][0..11] : '(none)'}"
-            puts "    Has proxy: #{status[:has_proxy] ? 'yes' : 'no'}"
+          rows = statuses.map do |s|
+            state = s[:running] ? 'running' : 'stopped'
+            container = s[:container_id] ? s[:container_id][0..11] : '-'
+            proxy = s[:has_proxy] ? '✓' : ''
+            [s[:name].to_s, s[:host], state, s[:image], container, proxy]
           end
+          @ui.table(headers: %w[Name Host State Image Container Proxy], rows: rows)
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # Logs command - tail logs for a service
-      # Usage: odysseus logs <server> [--config FILE] [--role ROLE] [--follow] [--lines N] [--since TIME]
+      # Logs command
       def logs(server, options = {})
         config_file = options[:config] || 'deploy.yml'
         role = (options[:role] || 'web').to_sym
@@ -708,240 +415,144 @@ module Odysseus
         since = options[:since]
 
         config = load_config(config_file)
-        service_name = role == :web ? config[:service] : "#{config[:service]}-#{role}"
+        service_name = Odysseus::Docker::Labels.service_for(service: config[:service], role: role)
 
-        puts @pastel.cyan("Odysseus Logs: #{service_name}")
-        puts @pastel.blue("Server: #{server}")
-        puts ""
+        @ui.header "Logs: #{service_name}"
+        @ui.info 'Server', server
+        @ui.blank
 
         ssh = connect_to_server(server, config)
 
         begin
           docker = Odysseus::Docker::Client.new(ssh)
-          containers = docker.list(service: service_name)
-
-          if containers.empty?
-            puts @pastel.yellow("No running containers found for #{service_name}")
-            return
-          end
-
-          container = containers.first
-          container_id = container['ID']
+          container_id = log_container_id!(docker, service_name, server, config, role: role)
 
           if follow
-            puts @pastel.dim("Following logs (Ctrl+C to stop)...")
-            puts ""
-            docker.logs(container_id, follow: true, tail: lines, since: since) do |line|
-              print line
-            end
+            @ui.step 'Following logs (Ctrl+C to stop)...'
+            @ui.blank
+            docker.logs(container_id, follow: true, tail: lines, since: since) { |line| print line }
           else
-            output = docker.logs(container_id, tail: lines, since: since)
-            puts output
+            puts docker.logs(container_id, tail: lines, since: since)
           end
         ensure
           ssh.close
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # Accessory logs command
-      # Usage: odysseus accessory logs <server> --name NAME [--config FILE] [--follow] [--lines N] [--since TIME]
-      def accessory_logs(server, options = {})
+      # Dependency logs
+      def dependency_logs(server, options = {})
         config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
+        name = require_name!(options)
         follow = options[:follow] || false
         lines = options[:lines] || 100
         since = options[:since]
 
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
-          exit 1
-        end
-
         config = load_config(config_file)
         service_name = "#{config[:service]}-#{name}"
 
-        puts @pastel.cyan("Odysseus Accessory Logs: #{service_name}")
-        puts @pastel.blue("Server: #{server}")
-        puts ""
+        @ui.header "Dependency Logs: #{service_name}"
+        @ui.info 'Server', server
+        @ui.blank
 
         ssh = connect_to_server(server, config)
 
         begin
           docker = Odysseus::Docker::Client.new(ssh)
-          containers = docker.list(service: service_name)
-
-          if containers.empty?
-            puts @pastel.yellow("No running containers found for #{service_name}")
-            return
-          end
-
-          container = containers.first
-          container_id = container['ID']
+          container_id = log_container_id!(docker, service_name, server, config)
 
           if follow
-            puts @pastel.dim("Following logs (Ctrl+C to stop)...")
-            puts ""
-            docker.logs(container_id, follow: true, tail: lines, since: since) do |line|
-              print line
-            end
+            @ui.step 'Following logs (Ctrl+C to stop)...'
+            @ui.blank
+            docker.logs(container_id, follow: true, tail: lines, since: since) { |line| print line }
           else
-            output = docker.logs(container_id, tail: lines, since: since)
-            puts output
+            puts docker.logs(container_id, tail: lines, since: since)
           end
         ensure
           ssh.close
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # App exec command - run a command in a new container using the app image
-      # Usage: odysseus app exec <server> <command> [--config FILE]
+      # App exec
       def app_exec(server, options = {})
         config_file = options[:config] || 'deploy.yml'
+        role = (options[:role] || 'web').to_sym
         command = options[:command]
 
         unless command
-          puts @pastel.red("Error: command required")
+          @ui.error 'Command required (--command)'
           exit 1
         end
 
         config = load_config(config_file)
-        image = "#{config[:image]}:latest"
+        image = running_image(server, config, role)
 
-        puts @pastel.cyan("Odysseus App Exec")
-        puts @pastel.blue("Server: #{server}")
-        puts @pastel.blue("Image: #{image}")
-        puts @pastel.blue("Command: #{command}")
-        puts ""
+        @ui.header 'App Exec'
+        @ui.info 'Server', server
+        @ui.info 'Role', role
+        @ui.info 'Command', command
+        @ui.blank
 
         ssh = connect_to_server(server, config)
 
         begin
           docker = Odysseus::Docker::Client.new(ssh)
+          env = build_environment(config, config_file, ssh)
 
-          # Build environment from config
-          env = {}
-          config[:env][:clear]&.each { |k, v| env[k.to_s] = v.to_s }
-
-          output = docker.run_once(
-            image: image,
-            command: command,
-            options: {
-              env: env,
-              network: 'odysseus'
-            }
-          )
-
-          puts output
+          puts docker.run_once(image: image, command: command, options: { env: env, network: 'odysseus' })
         ensure
           ssh.close
         end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # App shell command - open an interactive shell in a temporary container
-      # Usage: odysseus app shell <server> [--config FILE]
-      def app_shell(server, options = {})
+      # Dependency exec
+      def dependency_exec(server, options = {})
         config_file = options[:config] || 'deploy.yml'
+        name = require_name!(options)
+        command = options[:command]
 
-        config = load_config(config_file)
-        image = "#{config[:image]}:latest"
-
-        puts @pastel.cyan("Odysseus App Shell")
-        puts @pastel.blue("Server: #{server}")
-        puts @pastel.blue("Image: #{image}")
-        puts ""
-
-        ssh_keys = config[:ssh][:keys].map { |k| "-i #{File.expand_path(k)}" }.join(' ')
-        env_flags = config[:env][:clear]&.map { |k, v| "-e #{k}=#{v}" }&.join(' ') || ''
-
-        system("ssh #{ssh_keys} -t #{config[:ssh][:user]}@#{server} 'docker run -it --rm --network odysseus #{env_flags} #{image} /bin/sh'")
-      rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
-        exit 1
-      end
-
-      # App console command - run an interactive console in a new container
-      # Usage: odysseus app console <server> [--config FILE] [--cmd COMMAND]
-      def app_console(server, options = {})
-        config_file = options[:config] || 'deploy.yml'
-        console_cmd = options[:cmd] || '/bin/sh'
-
-        config = load_config(config_file)
-        image = "#{config[:image]}:latest"
-
-        puts @pastel.cyan("Odysseus App Console")
-        puts @pastel.blue("Server: #{server}")
-        puts @pastel.blue("Image: #{image}")
-        puts @pastel.blue("Console: #{console_cmd}")
-        puts ""
-        puts @pastel.dim("Note: This runs 'docker run -it' via SSH. For full interactivity, use:")
-        puts @pastel.dim("  ssh #{config[:ssh][:user]}@#{server} -t 'docker run -it --rm --network odysseus #{image} #{console_cmd}'")
-        puts ""
-
-        # For truly interactive sessions, we need to exec through SSH directly
-        # The CLI can't easily support full TTY passthrough
-        ssh_keys = config[:ssh][:keys].map { |k| "-i #{File.expand_path(k)}" }.join(' ')
-        env_flags = config[:env][:clear]&.map { |k, v| "-e #{k}=#{v}" }&.join(' ') || ''
-
-        system("ssh #{ssh_keys} -t #{config[:ssh][:user]}@#{server} 'docker run -it --rm --network odysseus #{env_flags} #{image} #{console_cmd}'")
-      rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
-        exit 1
-      end
-
-      # Accessory shell command - open an interactive shell in a running accessory container
-      # Usage: odysseus accessory shell <server> --name NAME [--config FILE]
-      def accessory_shell(server, options = {})
-        config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
-
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
+        unless command
+          @ui.error 'Command required (--command)'
           exit 1
         end
 
         config = load_config(config_file)
         service_name = "#{config[:service]}-#{name}"
 
-        puts @pastel.cyan("Odysseus Accessory Shell")
-        puts @pastel.blue("Server: #{server}")
-        puts @pastel.blue("Accessory: #{name}")
-        puts ""
+        @ui.header 'Dependency Exec'
+        @ui.info 'Dependency', name
+        @ui.info 'Command', command
+        @ui.blank
 
-        # Get container ID first
         ssh = connect_to_server(server, config)
+
         begin
           docker = Odysseus::Docker::Client.new(ssh)
           containers = docker.list(service: service_name)
 
           if containers.empty?
-            puts @pastel.red("No running containers found for #{service_name}")
+            @ui.error "No running containers found for #{service_name}"
             exit 1
           end
 
-          container_id = containers.first['ID']
+          puts docker.exec(containers.first['ID'], command)
         ensure
           ssh.close
         end
-
-        # Now exec with SSH passthrough for TTY
-        ssh_keys = config[:ssh][:keys].map { |k| "-i #{File.expand_path(k)}" }.join(' ')
-        system("ssh #{ssh_keys} -t #{config[:ssh][:user]}@#{server} 'docker exec -it #{container_id} /bin/sh'")
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # Cleanup command - remove containers for this service
-      # Usage: odysseus cleanup <server> [--config FILE] [--prune-images]
+      # Cleanup command
       def cleanup(server, options = {})
         config_file = options[:config] || 'deploy.yml'
         prune_images = options[:all] || false
@@ -949,14 +560,10 @@ module Odysseus
         config = load_config(config_file)
         service_name = config[:service]
 
-        if charm?
-          puts Gum.style("🧹 Odysseus Cleanup", border: 'rounded', foreground: '212', padding: '0 1')
-        else
-          puts @pastel.cyan("Odysseus Cleanup: #{service_name}")
-        end
-        puts @pastel.blue("Service: #{service_name}")
-        puts @pastel.blue("Server: #{server}")
-        puts ""
+        @ui.header 'Odysseus Cleanup'
+        @ui.info 'Service', service_name
+        @ui.info 'Server', server
+        @ui.blank
 
         ssh = connect_to_server(server, config)
 
@@ -964,38 +571,17 @@ module Odysseus
           docker = Odysseus::Docker::Client.new(ssh)
           caddy = Odysseus::Caddy::Client.new(ssh: ssh, docker: docker)
 
-          # Show current disk usage
-          puts @pastel.cyan("Current disk usage:")
-          puts docker.disk_usage
-          puts ""
-
-          # Collect all service names for this deploy.yml
-          service_names = [service_name]
-          config[:servers].keys.reject { |r| r == :web }.each do |role|
-            service_names << "#{service_name}-#{role}"
-          end
-          config[:accessories]&.each_key do |name|
-            service_names << "#{service_name}-#{name}"
-          end
-
-          # Count containers to be removed
-          total_to_remove = service_names.sum do |svc|
-            docker.list(service: svc, all: true).size
+          if @ui.debug?
+            @ui.section 'Disk usage (before)'
+            puts docker.disk_usage
+            @ui.blank
           end
 
-          # Charm mode: ask for confirmation
-          if charm? && total_to_remove > 0
-            unless Gum.confirm("Remove #{total_to_remove} container(s) for #{service_name}?")
-              puts @pastel.yellow("Cleanup cancelled.")
-              return
-            end
-          end
-
-          puts @pastel.yellow("Removing containers for #{service_name}...")
+          service_names = [service_name]
+          config[:servers].keys.reject { |r| r == :web }.each { |role| service_names << "#{service_name}-#{role}" }
+          config[:dependencies]&.each_key { |name| service_names << "#{service_name}-#{name}" }
 
           total_removed = 0
-
-          # Remove all containers for each service (not just old ones)
           service_names.each do |svc|
             containers = docker.list(service: svc, all: true)
             containers.each do |c|
@@ -1005,249 +591,163 @@ module Odysseus
             end
           end
 
-          puts "  Removed #{total_removed} container(s)"
-
-          # Remove routes from Caddy for this service
-          puts ""
-          puts @pastel.yellow("Removing Caddy routes for #{service_name}...")
+          @ui.step "Removed #{total_removed} container(s)"
 
+          # Clean Caddy routes
           if caddy.running?
-            # Remove web service route
-            caddy.remove_upstream(service: service_name, upstream: nil) rescue nil
-
-            # Remove accessory routes
-            config[:accessories]&.each do |name, acc_config|
-              if acc_config[:proxy]
-                acc_service = "#{service_name}-#{name}"
-                caddy.remove_upstream(service: acc_service, upstream: nil) rescue nil
-              end
+            begin
+              caddy.remove_upstream(service: service_name, upstream: nil)
+            rescue StandardError
+              nil
             end
+            config[:dependencies]&.each do |name, acc_config|
+              next unless acc_config[:proxy]
 
-            # Check if Caddy still has other services
-            remaining_services = caddy.list_services
-            remaining_services.reject! { |s| s[:service] == 'unknown' || s[:service].empty? }
+              begin
+                caddy.remove_upstream(service: "#{service_name}-#{name}", upstream: nil)
+              rescue StandardError
+                nil
+              end
+            end
 
-            if remaining_services.empty?
-              puts @pastel.yellow("No other services using Caddy, stopping Caddy...")
-              docker.stop('odysseus-caddy', timeout: 10) rescue nil
-              docker.remove('odysseus-caddy', force: true) rescue nil
-              puts "  Caddy removed"
+            remaining = caddy.list_services.reject { |s| s[:service] == 'unknown' || s[:service].empty? }
+            if remaining.empty?
+              begin
+                docker.stop('odysseus-caddy', timeout: 10)
+              rescue StandardError
+                nil
+              end
+              begin
+                docker.remove('odysseus-caddy', force: true)
+              rescue StandardError
+                nil
+              end
+              @ui.step 'Caddy removed (no other services)'
             else
-              puts @pastel.dim("  Keeping Caddy (#{remaining_services.size} other service(s) configured)")
+              @ui.step "Caddy kept (#{remaining.size} other service(s))"
             end
           end
 
-          # Optionally prune dangling images
           if prune_images
-            puts ""
-            puts @pastel.yellow("Pruning dangling images...")
-            results = docker.prune(containers: false, images: true, volumes: false, networks: false)
-            puts results[:images]
+            @ui.step 'Pruning dangling images...'
+            docker.prune(containers: false, images: true, volumes: false, networks: false)
           end
 
-          puts ""
-          puts @pastel.cyan("Disk usage after cleanup:")
-          puts docker.disk_usage
+          @ui.blank
+          @ui.success 'Cleanup complete'
         ensure
           ssh.close
         end
-
-        puts ""
-        if charm?
-          puts Gum.style("✓ Cleanup complete!", foreground: '82', bold: true)
-        else
-          puts @pastel.green("Cleanup complete!")
-        end
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # Accessory exec command - run a command in a running accessory container
-      # Usage: odysseus accessory exec <server> --name NAME <command> [--config FILE]
-      def accessory_exec(server, options = {})
-        config_file = options[:config] || 'deploy.yml'
-        name = options[:name]
-        command = options[:command]
-
-        unless name
-          puts @pastel.red("Error: accessory name required (--name)")
-          exit 1
-        end
-
-        unless command
-          puts @pastel.red("Error: command required")
-          exit 1
-        end
-
-        config = load_config(config_file)
-        service_name = "#{config[:service]}-#{name}"
-
-        puts @pastel.cyan("Odysseus Accessory Exec")
-        puts @pastel.blue("Server: #{server}")
-        puts @pastel.blue("Accessory: #{name}")
-        puts @pastel.blue("Command: #{command}")
-        puts ""
-
-        ssh = connect_to_server(server, config)
-
-        begin
-          docker = Odysseus::Docker::Client.new(ssh)
-          containers = docker.list(service: service_name)
-
-          if containers.empty?
-            puts @pastel.red("No running containers found for #{service_name}")
-            exit 1
-          end
-
-          container_id = containers.first['ID']
-          output = docker.exec(container_id, command)
-          puts output
-        ensure
-          ssh.close
-        end
-      rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
-        exit 1
-      end
-
-      # Generate a new master key for encrypting secrets
-      # Usage: odysseus secrets generate-key
+      # Secrets commands
       def secrets_generate_key(_options = {})
-        puts @pastel.cyan("Odysseus Secrets: Generate Key")
-        puts ""
+        @ui.header 'Secrets: Generate Key'
+        @ui.blank
 
         key = Odysseus::Secrets::EncryptedFile.generate_key
-
-        puts @pastel.green("Generated master key:")
-        puts ""
+        @ui.success 'Generated master key:'
+        @ui.blank
         puts "  #{key}"
-        puts ""
-        puts @pastel.yellow("Save this key securely!")
-        puts @pastel.dim("Set it as ODYSSEUS_MASTER_KEY environment variable for encrypt/decrypt operations.")
+        @ui.blank
+        @ui.warn 'Save this key securely!'
+        @ui.step 'Set as ODYSSEUS_MASTER_KEY environment variable'
       end
 
-      # Encrypt a secrets file
-      # Usage: odysseus secrets encrypt --input secrets.yml --file secrets.yml.enc
       def secrets_encrypt(options = {})
         input_file = options[:input]
         output_file = options[:file] || 'secrets.yml.enc'
 
         unless input_file
-          puts @pastel.red("Error: input file required (--input)")
+          @ui.error 'Input file required (--input)'
           exit 1
         end
 
         unless File.exist?(input_file)
-          puts @pastel.red("Error: input file not found: #{input_file}")
+          @ui.error "Input file not found: #{input_file}"
           exit 1
         end
 
-        puts @pastel.cyan("Odysseus Secrets: Encrypt")
-        puts @pastel.blue("Input: #{input_file}")
-        puts @pastel.blue("Output: #{output_file}")
-        puts ""
+        @ui.header 'Secrets: Encrypt'
+        @ui.info 'Input', input_file
+        @ui.info 'Output', output_file
+        @ui.blank
 
         secrets = YAML.load_file(input_file)
         encrypted_file = Odysseus::Secrets::EncryptedFile.new(output_file)
         encrypted_file.write(secrets)
 
-        puts @pastel.green("Secrets encrypted to #{output_file}")
-        puts ""
-        puts @pastel.dim("You can now delete the plaintext file: rm #{input_file}")
-        puts @pastel.dim("Add to deploy.yml: secrets_file: #{output_file}")
+        @ui.success "Secrets encrypted to #{output_file}"
       rescue Odysseus::Secrets::EncryptedFile::MissingKeyError => e
-        puts @pastel.red("Error: #{e.message}")
-        puts @pastel.dim("Generate a key with: odysseus secrets generate-key")
+        @ui.error e.message
+        @ui.step 'Generate a key with: odysseus secrets generate-key'
         exit 1
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
-      # Decrypt and display secrets
-      # Usage: odysseus secrets decrypt --file secrets.yml.enc
       def secrets_decrypt(options = {})
         secrets_file = options[:file] || 'secrets.yml.enc'
 
         unless File.exist?(secrets_file)
-          puts @pastel.red("Error: secrets file not found: #{secrets_file}")
+          @ui.error "Secrets file not found: #{secrets_file}"
           exit 1
         end
 
-        puts @pastel.cyan("Odysseus Secrets: Decrypt")
-        puts @pastel.blue("File: #{secrets_file}")
-        puts ""
+        @ui.header 'Secrets: Decrypt'
+        @ui.info 'File', secrets_file
+        @ui.blank
 
         encrypted_file = Odysseus::Secrets::EncryptedFile.new(secrets_file)
         secrets = encrypted_file.read
 
-        puts @pastel.yellow("Decrypted secrets:")
-        puts ""
         secrets.each do |key, value|
-          # Mask values for display
-          masked_value = value.to_s.length > 4 ? "#{value[0..3]}#{'*' * (value.length - 4)}" : '****'
-          puts "  #{key}: #{masked_value}"
+          masked = value.to_s.length > 4 ? "#{value[0..3]}#{'*' * (value.length - 4)}" : '****'
+          @ui.info key, masked
         end
-        puts ""
-        puts @pastel.dim("(Values are masked for security)")
-      rescue Odysseus::Secrets::EncryptedFile::MissingKeyError => e
-        puts @pastel.red("Error: #{e.message}")
-        exit 1
-      rescue Odysseus::Secrets::EncryptedFile::DecryptionError => e
-        puts @pastel.red("Error: #{e.message}")
-        exit 1
-      rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.blank
+        @ui.step '(values masked)'
+      rescue Odysseus::Secrets::EncryptedFile::MissingKeyError, Odysseus::Secrets::EncryptedFile::DecryptionError => e
+        @ui.error e.message
         exit 1
       end
 
-      # Edit encrypted secrets using $EDITOR
-      # Usage: odysseus secrets edit --file secrets.yml.enc
       def secrets_edit(options = {})
         secrets_file = options[:file] || 'secrets.yml.enc'
         editor = ENV['EDITOR'] || 'vi'
 
-        puts @pastel.cyan("Odysseus Secrets: Edit")
-        puts @pastel.blue("File: #{secrets_file}")
-        puts @pastel.blue("Editor: #{editor}")
-        puts ""
+        @ui.header 'Secrets: Edit'
+        @ui.info 'File', secrets_file
+        @ui.info 'Editor', editor
+        @ui.blank
 
         encrypted_file = Odysseus::Secrets::EncryptedFile.new(secrets_file)
+        secrets = encrypted_file.exists? ? encrypted_file.read : {}
 
-        # Load existing secrets or start with empty hash
-        secrets = if encrypted_file.exists?
-          encrypted_file.read
-        else
-          {}
-        end
-
-        # Write to temp file for editing
         temp_file = Tempfile.new(['secrets', '.yml'])
         begin
           temp_file.write(YAML.dump(secrets))
           temp_file.close
 
-          # Open in editor
           system("#{editor} #{temp_file.path}")
 
-          # Read back and encrypt
           edited_secrets = YAML.load_file(temp_file.path)
           encrypted_file.write(edited_secrets)
 
-          puts @pastel.green("Secrets updated and encrypted to #{secrets_file}")
+          @ui.success 'Secrets updated and encrypted'
         ensure
           temp_file.unlink
         end
       rescue Odysseus::Secrets::EncryptedFile::MissingKeyError => e
-        puts @pastel.red("Error: #{e.message}")
-        puts @pastel.dim("Generate a key with: odysseus secrets generate-key")
-        exit 1
-      rescue Odysseus::Secrets::EncryptedFile::DecryptionError => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
+        @ui.step 'Generate a key with: odysseus secrets generate-key'
         exit 1
       rescue Odysseus::Error => e
-        puts @pastel.red("Error: #{e.message}")
+        @ui.error e.message
         exit 1
       end
 
@@ -1258,14 +758,141 @@ module Odysseus
         parser.parse
       end
 
-      def connect_to_server(server, config)
+      def web_container_row(container)
+        labels = Odysseus::Docker::Labels.parse(container['Labels'])
+        version = labels['odysseus.version'] || '(unlabelled)'
+        ref = labels['odysseus.git_ref'] || '-'
+        deployed_at = labels['odysseus.deployed_at'] || '-'
+        health = container['Status'].include?('(healthy)') ? '✓' : ''
+        [version, ref, deployed_at, container['Image'], container['State'], health]
+      end
+
+      # The image reference that is actually serving, so a one-off container runs
+      # the same code as the deployed one. Prefers the container's own Image
+      # field, which docker ps reports directly, over reconstructing a tag from
+      # the odysseus.version label: a container deployed before this branch
+      # carries a deploy timestamp in that label and was built from an image
+      # tagged `latest`, so reconstruction would name a tag that was never
+      # pushed. Falling back to reconstruction only covers the case where
+      # Image is somehow absent from docker's own output.
+      #
+      # The lookup goes through Labels.service_for because only the web role is
+      # labelled with the bare service name. Asking for that name on a jobs host
+      # matches nothing, and on a service with no web role it matches nothing
+      # anywhere — which is what these commands did before they took a role.
+      def running_image(server, config, role)
+        service_name = Odysseus::Docker::Labels.service_for(service: config[:service], role: role)
+        ssh = connect_to_server(server, config)
+
+        begin
+          docker = Odysseus::Docker::Client.new(ssh)
+          container = docker.list(service: service_name).first
+
+          # No search of other roles: running a command against a role other
+          # than the one asked for is worse than being told what to type.
+          no_container!(server, config, service_name, role: role, state: 'running') unless container
+
+          container['Image'] || "#{config[:image]}:#{Odysseus::Docker::Labels.version_of(container)}"
+        ensure
+          ssh.close
+        end
+      end
+
+      # The container to read logs from, chosen from everything carrying the
+      # service label — stopped containers included. `docker ps` without -a
+      # hides the container that has just exited, which is precisely the one
+      # whose logs you came for.
+      #
+      # Note what that container is NOT: a previous version. A deploy stops AND
+      # removes the container it replaces (web_deploy.rb:252-253), and the
+      # keep: 2 sweep selects only containers already in state `exited`
+      # (docker/client.rb:299-301) — so what it retains is crashes, not
+      # history. A stopped container here means something exited on its own,
+      # which is exactly the case worth reading logs for. `status` and
+      # `cleanup` already read with all: true.
+      #
+      # Finding nothing is a failed request for logs, not a success, so it
+      # exits non-zero. And when the only match is stopped, say so: otherwise
+      # the log just ends and the reader has no way to know why.
+      #
+      # That notice goes to stderr. This command's stdout is a log stream —
+      # `odysseus logs web1 > app.log`, or a pipe into something that parses it
+      # — so a line about the logs must not arrive inside them, while still
+      # reaching the terminal of whoever ran the command.
+      #
+      # @param role [Symbol, nil] the role the label came from, or nil for a
+      #   dependency, which is named with --name rather than --role
+      def log_container_id!(docker, service_name, server, config, role: nil)
+        containers = docker.list(service: service_name, all: true)
+        no_container!(server, config, service_name, role: role, state: 'running or stopped') if containers.empty?
+
+        container = containers.find { |c| c['State'] == 'running' } || containers.first
+        unless container['State'] == 'running'
+          @ui.warn "No running container for #{service_name}: showing logs from " \
+                   "#{container['State']} container #{container['ID'][0..11]}", io: $stderr
+        end
+
+        container['ID']
+      end
+
+      # What a container lookup that found nothing says, for every command that
+      # finds one by its odysseus.service label. A mistyped --role is the
+      # ordinary reason nothing matches, so the message names the role, the
+      # exact label searched, the option that changes it and the roles this
+      # config declares. `logs` used to say only `No containers found for
+      # myapp-jbos on w1 (stopped ones included)`, naming a label the reader
+      # never typed: one job, two messages, and only one of them any use.
+      #
+      # A dependency passes no role. It is chosen with --name, and advising
+      # --role would send the reader to an option that command does not have.
+      def no_container!(server, config, service_name, role: nil, state: 'running')
+        subject = role ? "role '#{role}'" : service_name
+        @ui.error "No #{state} container for #{subject} on #{server} " \
+                  "(nothing labelled odysseus.service=#{service_name})", io: $stderr
+        if role
+          @ui.step "Name the role with --role. Roles in this config: #{config[:servers].keys.join(', ')}",
+                   io: $stderr
+        end
+        exit 1
+      end
+
+      # The environment a one-off container starts with, built by the same class
+      # the deploy paths use. These commands used to inject env.clear alone, so
+      # `app exec … --command "rails db:migrate"` ran against a container with
+      # no DATABASE_URL while the container deployed seconds earlier had one.
+      #
+      # The secrets loader resolves a relative secrets_file against the
+      # directory holding deploy.yml rather than the working directory, which is
+      # what Executor does and what `--config ../other/deploy.yml` needs.
+      def build_environment(config, config_file, ssh)
+        loader = Odysseus::Secrets::Loader.new(config, config_dir: File.dirname(config_file))
+        Odysseus::Core::Environment.new(config: config, secrets_loader: loader, ssh: ssh).build
+      end
+
+      # --debug (or ODYSSEUS_DEBUG=1) reaches the SSH layer here rather than
+      # only the UI, so every command built on this connection can show the
+      # commands it actually sent. Deploy, build and pussh already did this
+      # via `options[:verbose] || @ui.debug?`; the connection builder itself
+      # did not, which left doctor, status, containers and logs unable to
+      # show anything under --debug however loudly it was asked.
+      def connect_to_server(server, config, verbose: @ui.debug?)
         Odysseus::Deployer::SSH.new(
           host: server,
           user: config[:ssh][:user],
           keys: config[:ssh][:keys],
-          use_tailscale: true
+          use_tailscale: true,
+          verbose: verbose
         )
       end
+
+      def require_name!(options)
+        name = options[:name]
+        unless name
+          @ui.error 'Dependency name required (--name)'
+          exit 1
+        end
+        name
+      end
     end
   end
 end