ukiryu 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72da5a25186dfa4f3b3b53d0503c46f76086aaa94e219523126f331f10ca88d0
-  data.tar.gz: 6fcd4fa7a7f1af0830a1d2ea75632f63ff5b8b1333bfc4ce6b565444cc263898
+  metadata.gz: 3881776473c97e5296fbc0d0d62f88352dec64d5350490a1d0c413f32ace414f
+  data.tar.gz: 79130e5976a4a024ec19073d3e85e43137d02bf11bfd3cdf21ea77923b24f609
 SHA512:
-  metadata.gz: 264926ef984787a01fd48941daea277027fa14ae405c63e15b765464338e474ef78c7f3d98a81f41762a281b140139bf9c8d515e468bf3350b584476e5118db0
-  data.tar.gz: aa91036800ea42466283e46e05fffc47179cffe08d9340f246f5abb44d3bf9276742804ba61c8ad3e00acb384f9d5ef56b55a3e87cc2990e675f50811a1ab5ec
+  metadata.gz: c26728d9bf22917688e549deee2462d332d272d136ca4ecdceb705d618341acd65a94d35a1617bc11636fc1831f7f913775a26ab924f5fc01090be201b61fca9
+  data.tar.gz: 9c513b6900ee5d349a4d442175c8713d8f1845b5af579e43f27323dc1c8483d98153cc1581dc9a8de5a3f686f144ec4d823846febf19d9b020f12f76be2a5394

data/lib/ukiryu/action/base.rb

@@ -38,8 +38,9 @@ module Ukiryu
       # Execute this action with options
       #
       # @param options [Hash, Options::Base] the options to use
+      # @param timeout [Integer] timeout in seconds (required)
       # @return [Response::Base] the execution response
-      def run(options = {})
+      def run(options = {}, timeout:)
         # If options is a hash, create an options object
         if options.is_a?(Hash)
           options_class = @tool.options_class_for(self.class.command_name)
@@ -49,7 +50,7 @@ module Ukiryu
         end
 
         # Execute with the tool
-        @tool.execute(self.class.command_name, options)
+        @tool.execute(self.class.command_name, options, timeout: timeout)
       end
 
       # Create an options object for this action

data/lib/ukiryu/cli.rb

@@ -1,31 +1,13 @@
 # frozen_string_literal: true
 
 require 'thor'
-require_relative 'cli_commands/base_command'
-require_relative 'cli_commands/run_file_command'
-require_relative 'cli_commands/run_command'
-require_relative 'cli_commands/list_command'
-require_relative 'cli_commands/info_command'
-require_relative 'cli_commands/commands_command'
-require_relative 'cli_commands/opts_command'
-require_relative 'cli_commands/describe_command'
-require_relative 'cli_commands/which_command'
-require_relative 'cli_commands/config_command'
-require_relative 'cli_commands/version_command'
-require_relative 'cli_commands/system_command'
-require_relative 'cli_commands/validate_command'
-require_relative 'cli_commands/extract_command'
-require_relative 'cli_commands/definitions_command'
-require_relative 'cli_commands/cache_command'
-require_relative 'cli_commands/resolve_command'
-require_relative 'cli_commands/register_command'
+# thor_ext must be eagerly loaded (used at class definition time for extend)
 require_relative 'thor_ext'
-require_relative 'version'
 
 module Ukiryu
   # CLI for exploring and interacting with Ukiryu tool profiles
   #
-  # Each command is implemented as a separate class in the CliCommands::Commands namespace.
+  # Each command is implemented as a separate class in the CliCommands namespace.
   # This file just delegates to those command classes, keeping each file under 200 lines.
   class Cli < Thor
     package_name 'ukiryu'
@@ -38,6 +20,11 @@ module Ukiryu
       false
     end
 
+    # Autoload CLI command classes (lazy load on first use)
+    autoload :ValidateCommand, 'ukiryu/cli_commands/validate_command'
+    autoload :DefinitionsCommand, 'ukiryu/cli_commands/definitions_command'
+    autoload :CacheCommand, 'ukiryu/cli_commands/cache_command'
+
     desc 'run-file REQUEST_FILE', 'Execute a Ukiryu Structured Execution Request from a YAML file'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     method_option :output, aliases: :o, desc: 'Output file for response (default: stdout)', type: :string
@@ -47,7 +34,7 @@ module Ukiryu
     method_option :shell, desc: 'Shell to use for command execution (bash, zsh, fish, sh, powershell, cmd)',
                           type: :string
     def run_file(request_file)
-      CliCommands::RunFileCommand.new(options).run(request_file)
+      Ukiryu::CliCommands::RunFileCommand.new(options).run(request_file)
     end
 
     desc 'exec TOOL [COMMAND] [KEY=VALUE ...]', 'Execute a tool command inline'
@@ -62,13 +49,13 @@ module Ukiryu
     method_option :stdin, desc: 'Read input from stdin (pass to command)', type: :boolean, default: false
     method_option :raw, desc: 'Output raw stdout/stderr (for pipe composition)', type: :boolean, default: false
     def exec(tool_name, command_name = nil, *params)
-      CliCommands::RunCommand.new(options).run(tool_name, command_name, *params)
+      Ukiryu::CliCommands::RunCommand.new(options).run(tool_name, command_name, *params)
     end
 
     desc 'list', 'List all available tools in the register'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     def list
-      CliCommands::ListCommand.new(options).run
+      Ukiryu::CliCommands::ListCommand.new(options).run
     end
 
     desc 'info [TOOL]', 'Show detailed information about a tool'
@@ -79,38 +66,38 @@ module Ukiryu
         # No tool specified - show help
         help
       else
-        CliCommands::InfoCommand.new(options).run(tool_name)
+        Ukiryu::CliCommands::InfoCommand.new(options).run(tool_name)
       end
     end
 
     desc 'commands TOOL', 'List all commands available for a tool'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     def commands(tool_name)
-      CliCommands::CommandsCommand.new(options).run(tool_name)
+      Ukiryu::CliCommands::CommandsCommand.new(options).run(tool_name)
     end
 
     desc 'opts TOOL [COMMAND]', 'Show options for a tool or specific command'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     def opts(tool_name, command_name = nil)
-      CliCommands::OptsCommand.new(options).run(tool_name, command_name)
+      Ukiryu::CliCommands::OptsCommand.new(options).run(tool_name, command_name)
     end
 
     desc 'describe TOOL [COMMAND]', 'Show comprehensive documentation for a tool or specific command'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     method_option :format, aliases: :f, desc: 'Output format (text, yaml, json)', type: :string, default: 'text'
     def describe(tool_name, command_name = nil)
-      CliCommands::DescribeCommand.new(options).run(tool_name, command_name)
+      Ukiryu::CliCommands::DescribeCommand.new(options).run(tool_name, command_name)
     end
 
     desc 'system [SUBCOMMAND]', 'Show system information (shells, etc.)'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     def system(subcommand = nil)
-      CliCommands::SystemCommand.new(options).run(subcommand)
+      Ukiryu::CliCommands::SystemCommand.new(options).run(subcommand)
     end
 
     desc 'version', 'Show Ukiryu version'
     def version
-      CliCommands::VersionCommand.new(options).run
+      Ukiryu::CliCommands::VersionCommand.new(options).run
     end
 
     desc 'which IDENTIFIER', 'Show which tool implementation would be selected'
@@ -118,42 +105,42 @@ module Ukiryu
     method_option :platform, desc: 'Platform to check (macos, linux, windows)', type: :string
     method_option :shell, desc: 'Shell to check (bash, zsh, fish, sh, powershell, cmd)', type: :string
     def which(identifier)
-      CliCommands::WhichCommand.new(options).run(identifier)
+      Ukiryu::CliCommands::WhichCommand.new(options).run(identifier)
     end
 
     desc 'config [ACTION] [KEY] [VALUE]', 'Manage configuration (list, get, set, unset)'
     method_option :register, aliases: :r, desc: 'Path to tool register', type: :string
     def config(action = 'list', key = nil, value = nil)
-      CliCommands::ConfigCommand.new(options).run(action, key, value)
+      Ukiryu::CliCommands::ConfigCommand.new(options).run(action, key, value)
     end
 
     desc 'validate [COMMAND]', 'Validate tool definitions'
-    subcommand 'validate', CliCommands::ValidateCommand
+    subcommand 'validate', Ukiryu::CliCommands::ValidateCommand
 
     desc 'extract TOOL', 'Extract tool definition from an installed CLI tool'
     method_option :output, aliases: :o, desc: 'Output file for extracted definition', type: :string
     method_option :method, aliases: :m, desc: 'Extraction method (auto, native, help)', type: :string, default: 'auto'
     method_option :verbose, aliases: :v, desc: 'Enable verbose output', type: :boolean, default: false
     def extract(tool_name)
-      CliCommands::ExtractCommand.new(options).run(tool_name)
+      Ukiryu::CliCommands::ExtractCommand.new(options).run(tool_name)
     end
 
     desc 'definitions [COMMAND]', 'Manage tool definitions'
-    subcommand 'definitions', CliCommands::DefinitionsCommand
+    subcommand 'definitions', Ukiryu::CliCommands::DefinitionsCommand
 
     desc 'cache [ACTION]', 'Manage definition cache'
-    subcommand 'cache', CliCommands::CacheCommand
+    subcommand 'cache', Ukiryu::CliCommands::CacheCommand
 
     desc 'resolve TOOL [VERSION]', 'Resolve which definition would be used for a tool'
     def resolve(tool_name, version_constraint = nil)
-      CliCommands::ResolveCommand.new(options).run(tool_name, version_constraint)
+      Ukiryu::CliCommands::ResolveCommand.new(options).run(tool_name, version_constraint)
     end
 
     desc 'register [SUBCOMMAND]', 'Manage the tool register'
     method_option :force, aliases: :f, desc: 'Force re-clone the register', type: :boolean, default: false
     method_option :verbose, aliases: :v, desc: 'Show verbose output', type: :boolean, default: false
     def register(subcommand = nil)
-      CliCommands::RegisterCommand.new(options).run(subcommand, options)
+      Ukiryu::CliCommands::RegisterCommand.new(options).run(subcommand, options)
     end
   end
 end

data/lib/ukiryu/cli_commands/base_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../config'
-require_relative '../register'
-
 module Ukiryu
   module CliCommands
     # Base class for CLI commands
@@ -39,7 +36,7 @@ module Ukiryu
         register_path = custom_path || config.register || default_register_path
         return unless register_path && Dir.exist?(register_path)
 
-        Register.default_register_path = register_path
+        Ukiryu::Register.default_register_path = register_path
       end
 
       # Apply CLI options to the Config instance
@@ -86,8 +83,7 @@ module Ukiryu
       # @return [String, nil] the default register path from RegisterAutoManager
       def default_register_path
         # Use RegisterAutoManager to find or create the register
-        require_relative '../register_auto_manager'
-        RegisterAutoManager.register_path
+        Ukiryu::RegisterAutoManager.register_path
       rescue StandardError
         nil
       end

data/lib/ukiryu/cli_commands/cache_command.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require_relative '../definition/definition_cache'
 
 module Ukiryu
   module CliCommands

data/lib/ukiryu/cli_commands/commands_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../tool'
-
 module Ukiryu
   module CliCommands
     # List all commands available for a tool
@@ -13,9 +10,9 @@ module Ukiryu
       def run(tool_name)
         setup_register
 
-        # Use find_by for interface-based discovery (ping -> ping_bsd/ping_gnu)
-        tool = Tool.find_by(tool_name.to_sym)
-        error!("Tool not found: #{tool_name}\nAvailable tools: #{Register.tools.sort.join(', ')}") unless tool
+        # Use get for direct tool loading (find_by is being migrated)
+        tool = Ukiryu::Tool.get(tool_name.to_sym)
+        error!("Tool not found: #{tool_name}\nAvailable tools: #{Ukiryu::Register.tools.sort.join(', ')}") unless tool
 
         tool_commands = tool.commands
         error! "No commands defined for #{tool_name}" unless tool_commands

data/lib/ukiryu/cli_commands/config_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../config'
-require_relative '../register_auto_manager'
 require 'yaml'
 require 'fileutils'
 
@@ -54,7 +51,6 @@ module Ukiryu
           'Shell' => format_config_value(config.shell, '(auto-detect)'),
           'Format' => format_config_value(config.format),
           'Output' => format_config_value(config.output, '(stdout)'),
-          'Search paths' => format_config_value(config.search_paths, '(not set)'),
           'Use color' => format_config_value(config.use_color)
         }
 
@@ -94,7 +90,6 @@ module Ukiryu
           'UKIRYU_SHELL' => ENV['UKIRYU_SHELL'],
           'UKIRYU_FORMAT' => ENV['UKIRYU_FORMAT'],
           'UKIRYU_OUTPUT' => ENV['UKIRYU_OUTPUT'],
-          'UKIRYU_SEARCH_PATHS' => ENV['UKIRYU_SEARCH_PATHS'],
           'UKIRYU_USE_COLOR' => ENV['UKIRYU_USE_COLOR']
         }
 
@@ -123,10 +118,9 @@ module Ukiryu
                 when :shell then config.shell
                 when :format then config.format
                 when :output then config.output
-                when :search_paths then config.search_paths
                 when :use_color then config.use_color
                 else
-                  error! "Unknown config key: #{key}\nValid keys: register, timeout, debug, dry_run, metrics, shell, format, output, search_paths, use_color"
+                  error! "Unknown config key: #{key}\nValid keys: register, timeout, debug, dry_run, metrics, shell, format, output, use_color"
                 end
 
         say "#{key}: #{format_config_value(value, '(not set)')}", :white
@@ -211,7 +205,6 @@ module Ukiryu
         when :format then config.format = value
         when :output then config.output = value
         when :register then config.register = value
-        when :search_paths then config.search_paths = value
         when :use_color then config.use_color = value
         end
       end
@@ -229,7 +222,7 @@ module Ukiryu
       #
       # @return [String] formatted register display
       def format_register_display
-        info = RegisterAutoManager.register_info
+        info = Ukiryu::RegisterAutoManager.register_info
 
         case info[:status]
         when :ok

data/lib/ukiryu/cli_commands/definitions_command.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../definition'
-
 module Ukiryu
   module CliCommands
     # CLI commands for managing tool definitions
@@ -21,13 +19,13 @@ module Ukiryu
       desc 'list', 'List all discovered definitions'
       method_option :verbose, aliases: :v, desc: 'Show detailed information', type: :boolean, default: false
       def list
-        definitions = Definition::Discovery.discover
+        definitions = Ukiryu::Definition::Discovery.discover
 
         if definitions.empty?
           puts 'No definitions found.'
           puts
           puts 'Search paths:'
-          Definition::Discovery.search_paths.each do |path|
+          Ukiryu::Definition::Discovery.search_paths.each do |path|
             puts "  - #{path}"
           end
           return
@@ -93,7 +91,7 @@ module Ukiryu
         # Load the definition to get metadata
         begin
           metadata = Definition::Loader.load_from_file(source_path, validation: :strict)
-        rescue DefinitionLoadError, DefinitionValidationError => e
+        rescue Ukiryu::Errors::DefinitionLoadError, Ukiryu::Errors::DefinitionValidationError => e
           warn "Error: Failed to load definition: #{e.message}"
           exit 1
         end
@@ -244,7 +242,7 @@ module Ukiryu
           puts 'Validation: ✓ Valid'
           puts "Display Name: #{tool_def.display_name}" if tool_def.display_name
           puts "Homepage: #{tool_def.homepage}" if tool_def.homepage
-        rescue DefinitionLoadError, DefinitionValidationError => e
+        rescue Ukiryu::Errors::DefinitionLoadError, Ukiryu::Errors::DefinitionValidationError => e
           puts 'Validation: ✗ Invalid'
           puts "Error: #{e.message}"
         end

data/lib/ukiryu/cli_commands/describe_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../tool'
-
 module Ukiryu
   module CliCommands
     # Show comprehensive documentation for a tool or specific command
@@ -15,8 +12,8 @@ module Ukiryu
         setup_register
 
         # Use find_by for interface-based discovery (ping -> ping_bsd/ping_gnu)
-        tool = Tool.find_by(tool_name.to_sym)
-        error!("Tool not found: #{tool_name}\nAvailable tools: #{Register.tools.sort.join(', ')}") unless tool
+        tool = Ukiryu::Tool.find_by(tool_name.to_sym)
+        error!("Tool not found: #{tool_name}\nAvailable tools: #{Ukiryu::Register.tools.sort.join(', ')}") unless tool
 
         tool_commands = tool.commands
         error! "No commands defined for #{tool_name}" unless tool_commands

data/lib/ukiryu/cli_commands/docs_command.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require_relative '../definition/documentation_generator'
 
 module Ukiryu
   module CliCommands

data/lib/ukiryu/cli_commands/extract_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../extractors/extractor'
-
 module Ukiryu
   module CliCommands
     # Extract tool definition from an installed CLI tool
@@ -15,7 +12,7 @@ module Ukiryu
       #
       # @param tool_name [String] the tool name to extract definition from
       def run(tool_name)
-        result = Extractors::Extractor.extract(tool_name, extract_options)
+        result = Ukiryu::Extractors::Extractor.extract(tool_name, extract_options)
 
         if result[:success]
           output_result(result)

data/lib/ukiryu/cli_commands/info_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../tool'
-
 module Ukiryu
   module CliCommands
     # Show detailed information about a tool
@@ -14,8 +11,8 @@ module Ukiryu
         setup_register
 
         # Use find_by for interface-based discovery (ping -> ping_bsd/ping_gnu)
-        tool = Tool.find_by(tool_name.to_sym)
-        error!("Tool not found: #{tool_name}\nAvailable tools: #{Register.tools.sort.join(', ')}") unless tool
+        tool = Ukiryu::Tool.find_by(tool_name.to_sym)
+        error!("Tool not found: #{tool_name}\nAvailable tools: #{Ukiryu::Register.tools.sort.join(', ')}") unless tool
 
         profile = tool.profile
         show_all = options[:all]
@@ -37,7 +34,7 @@ module Ukiryu
             say "All '#{tool_name}' implementations:", :yellow
             all_implementations = [profile.name, *other_implementations].sort
             all_implementations.each do |impl|
-              impl_tool = Tool.get(impl)
+              impl_tool = Ukiryu::Tool.get(impl)
               if impl_tool
                 status = impl_tool.available? ? '[✓]' : '[✗]'
                 color = impl_tool.available? ? :green : :red
@@ -45,7 +42,7 @@ module Ukiryu
               else
                 say "  [?] #{impl}", :white
               end
-            rescue Ukiryu::ToolNotFoundError, Ukiryu::ProfileNotFoundError
+            rescue Ukiryu::Errors::ToolNotFoundError, Ukiryu::Errors::ProfileNotFoundError
               # Tool exists but no compatible profile for this platform
               say "  [ ] #{impl}", :dim
             end
@@ -71,22 +68,6 @@ module Ukiryu
           say "  Modern Threshold: #{vd.modern_threshold}", :white if vd.modern_threshold
         end
 
-        # Search paths
-        if profile.search_paths
-          say '', :clear
-          say 'Search Paths:', :yellow
-          search_paths = profile.search_paths
-
-          # Iterate over platform attributes
-          %i[macos linux windows freebsd openbsd netbsd].each do |platform|
-            paths = search_paths.send(platform)
-            next if paths.nil? || paths.empty?
-
-            say "  #{platform}:", :white
-            Array(paths).each { |p| say "    - #{p}", :white }
-          end
-        end
-
         # Profiles
         if profile.profiles
           say '', :clear
@@ -122,22 +103,20 @@ module Ukiryu
       # @param current_tool_name [String] the current tool name to exclude
       # @return [Array<String>] list of other tool names
       def find_other_implementations(interface_name, current_tool_name)
-        require_relative '../register'
-
         implementations = []
         interface_sym = interface_name.to_sym
 
         if config.debug
           say "  [DEBUG] Looking for tools implementing '#{interface_name}' (excluding '#{current_tool_name}')", :dim
-          say "  [DEBUG] Register tools: #{Register.tools.inspect}", :dim
+          say "  [DEBUG] Register tools: #{Ukiryu::Register.tools.inspect}", :dim
         end
 
-        Register.tools.each do |tool_name|
+        Ukiryu::Register.tools.each do |tool_name|
           next if tool_name == current_tool_name
 
           begin
             # Don't pass register_path - let it use the default
-            tool_metadata = Register.load_tool_metadata(tool_name.to_sym)
+            tool_metadata = Ukiryu::Register.load_tool_metadata(tool_name.to_sym)
             if config.debug
               say "  [DEBUG] #{tool_name} -> metadata: #{tool_metadata ? tool_metadata.implements : 'nil'}", :dim
             end

data/lib/ukiryu/cli_commands/lint_command.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require_relative '../definition/definition_linter'
 
 module Ukiryu
   module CliCommands

data/lib/ukiryu/cli_commands/list_command.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../tool'
-require_relative '../register'
-
 module Ukiryu
   module CliCommands
     # List all available tools in the register
@@ -12,7 +8,7 @@ module Ukiryu
       def run
         setup_register
 
-        tools = Register.tools
+        tools = Ukiryu::Register.tools
         error! 'No tools found in register' if tools.empty?
 
         say "Available tools (#{tools.count}):", :cyan
@@ -22,7 +18,7 @@ module Ukiryu
         standalone_tools = []
 
         tools.sort.each do |name|
-          metadata = Register.load_tool_metadata(name.to_sym)
+          metadata = Ukiryu::Register.load_tool_metadata(name.to_sym)
 
           if metadata&.implements
             # This tool implements an interface
@@ -36,7 +32,7 @@ module Ukiryu
             # Regular standalone tool
             standalone_tools << name
           end
-        rescue Ukiryu::Error
+        rescue Ukiryu::Errors::Error
           # If we can't load metadata, treat as standalone
           standalone_tools << name
         end
@@ -46,22 +42,22 @@ module Ukiryu
           say "  #{interface_name}:", :cyan
 
           impls.sort.each do |impl_name|
-            tool = Tool.get(impl_name)
+            tool = Ukiryu::Tool.get(impl_name)
             version_info = tool.version ? "v#{tool.version}" : 'version unknown'
             available = tool.available? ? '[✓]' : '[✗]'
             say "    #{available.ljust(4)} #{impl_name.ljust(20)} #{version_info}", tool.available? ? :green : :red
-          rescue Ukiryu::Error => e
+          rescue Ukiryu::Errors::Error => e
             say "    [?] #{impl_name.ljust(20)} error: #{e.message}", :red
           end
         end
 
         # Display standalone tools
         standalone_tools.sort.each do |name|
-          tool = Tool.get(name)
+          tool = Ukiryu::Tool.get(name)
           version_info = tool.version ? "v#{tool.version}" : 'version unknown'
           available = tool.available? ? '[✓]' : '[✗]'
           say "  #{available.ljust(4)} #{name.ljust(20)} #{version_info}", tool.available? ? :green : :red
-        rescue Ukiryu::Error => e
+        rescue Ukiryu::Errors::Error => e
           say "  [?] #{name.ljust(20)} error: #{e.message}", :red
         end
       end

data/lib/ukiryu/cli_commands/opts_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../tool'
-
 module Ukiryu
   module CliCommands
     # Show options for a tool or specific command
@@ -15,8 +12,8 @@ module Ukiryu
         setup_register
 
         # Use find_by for interface-based discovery (ping -> ping_bsd/ping_gnu)
-        tool = Tool.find_by(tool_name.to_sym)
-        error!("Tool not found: #{tool_name}\nAvailable tools: #{Register.tools.sort.join(', ')}") unless tool
+        tool = Ukiryu::Tool.find_by(tool_name.to_sym)
+        error!("Tool not found: #{tool_name}\nAvailable tools: #{Ukiryu::Register.tools.sort.join(', ')}") unless tool
 
         tool_commands = tool.commands
         error! "No commands defined for #{tool_name}" unless tool_commands

data/lib/ukiryu/cli_commands/register_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../register_auto_manager'
-require_relative '../register'
-
 module Ukiryu
   module CliCommands
     # Command to manage the register
@@ -24,7 +21,7 @@ module Ukiryu
         else
           error!("Unknown subcommand: #{subcommand}. Valid subcommands: info, update, path")
         end
-      rescue RegisterAutoManager::RegisterError => e
+      rescue Ukiryu::RegisterAutoManager::RegisterError => e
         error!("Register error: #{e.message}")
       end
 
@@ -34,7 +31,7 @@ module Ukiryu
       #
       # @param options [Hash] command options
       def show_info(_options = {})
-        info = RegisterAutoManager.register_info
+        info = Ukiryu::RegisterAutoManager.register_info
 
         say 'Register Information', :cyan
         say ''
@@ -92,7 +89,7 @@ module Ukiryu
           say 'Updating register...', :cyan
         end
 
-        RegisterAutoManager.update_register(force: force)
+        Ukiryu::RegisterAutoManager.update_register(force: force)
 
         say 'Register updated successfully!', :green
         show_info(options)
@@ -100,7 +97,7 @@ module Ukiryu
 
       # Show the register path
       def show_path
-        path = RegisterAutoManager.register_path
+        path = Ukiryu::RegisterAutoManager.register_path
 
         if path
           say path
@@ -132,7 +129,7 @@ module Ukiryu
         say 'Manual setup:', :cyan
         say ''
         say '  1. Clone the register:'
-        say "     git clone #{RegisterAutoManager::REGISTER_URL} ~/.ukiryu/register"
+        say "     git clone #{Ukiryu::RegisterAutoManager::REGISTER_URL} ~/.ukiryu/register"
         say ''
         say '  2. Or set environment variable:'
         say '     export UKIRYU_REGISTER=/path/to/register'

data/lib/ukiryu/cli_commands/resolve_command.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
-require_relative '../definition/discovery'
-require_relative '../definition/version_resolver'
-
 module Ukiryu
   module CliCommands
     # Resolve tool definitions

data/lib/ukiryu/cli_commands/response_formatter.rb

@@ -65,9 +65,11 @@ module Ukiryu
       def format_yaml_response(response, config)
         yaml_content = response.to_yaml
 
-        # Determine if we should use colors:
-        # - Config.use_color can be true, false, or nil (auto-detect)
-        # - Auto-detect: only use colors if TTY and colors are not disabled via config/NO_COLOR
+        # Determine if we should use colors
+        # Config handles environment (NO_COLOR) and TTY detection properly
+        # When config.use_color is nil, it means "auto-detect based on TTY"
+        # But Docker's pseudo-TTY makes TTY detection unreliable
+        # So we also check if NO_COLOR was set (via config.colors_disabled?)
         use_colors = if config.use_color.nil?
                        $stdout.tty? && !config.colors_disabled?
                      else