aia 0.9.24 → 0.10.2

data/lib/aia/session.rb

@@ -53,8 +53,9 @@ module AIA
     end
 
     def setup_output_file
-      if AIA.config.out_file && !AIA.config.out_file.nil? && !AIA.append? && File.exist?(AIA.config.out_file)
-        File.open(AIA.config.out_file, "w") { } # Truncate the file
+      out_file = AIA.config.output.file
+      if out_file && !out_file.nil? && !AIA.append? && File.exist?(out_file)
+        File.open(out_file, "w") { } # Truncate the file
       end
     end
 
@@ -117,7 +118,7 @@ module AIA
     end
 
     def setup_prompt_processing(prompt_id)
-      role_id = AIA.config.role
+      role_id = AIA.config.prompts.role
 
       begin
         prompt = @prompt_handler.get_prompt(prompt_id, role_id)
@@ -351,8 +352,8 @@ module AIA
 
         break if follow_up_prompt.nil? || follow_up_prompt.strip.downcase == "exit" || follow_up_prompt.strip.empty?
 
-        if AIA.config.out_file
-          File.open(AIA.config.out_file, "a") do |file|
+        if AIA.config.output.file
+          File.open(AIA.config.output.file, "a") do |file|
             file.puts "\nYou: #{follow_up_prompt}"
           end
         end
@@ -383,8 +384,8 @@ module AIA
 
         @ui_presenter.display_ai_response(content)
 
-        # Display metrics if enabled and available (chat mode only)
-        if AIA.config.show_metrics
+        # Display token usage if enabled and available (chat mode only)
+        if AIA.config.flags.tokens
           if multi_metrics
             # Display metrics for each model in multi-model mode
             @ui_presenter.display_multi_model_metrics(multi_metrics)
@@ -471,7 +472,7 @@ module AIA
 
     def cleanup_chat_prompt
       if @chat_prompt_id
-        puts "[DEBUG] Cleaning up chat prompt: #{@chat_prompt_id}" if AIA.debug?
+        logger.debug("Cleaning up chat prompt", chat_prompt_id: @chat_prompt_id)
         begin
           @chat_prompt.delete
           @chat_prompt_id = nil # Prevent repeated attempts if error occurs elsewhere

data/lib/aia/ui_presenter.rb

@@ -26,8 +26,9 @@ module AIA
       puts "\nAI: "
       format_chat_response(response)
 
-      if AIA.config.out_file && !AIA.config.out_file.nil?
-        File.open(AIA.config.out_file, 'a') do |file|
+      out_file = AIA.config.output.file
+      if out_file && !out_file.nil?
+        File.open(out_file, 'a') do |file|
           file.puts "\nAI: "
           format_chat_response(response, file)
         end
@@ -125,7 +126,7 @@ module AIA
       output_lines << "═" * 55
       output_lines << "Model: #{metrics[:model_id]}"
       
-      if AIA.config.show_cost
+      if AIA.config.flags.cost
         output_lines.concat(format_metrics_with_cost(metrics))
       else
         output_lines.concat(format_metrics_basic(metrics))
@@ -137,20 +138,21 @@ module AIA
       output_lines.each { |line| puts line }
       
       # Also write to file if configured
-      if AIA.config.out_file && !AIA.config.out_file.nil?
-        File.open(AIA.config.out_file, 'a') do |file|
+      out_file = AIA.config.output.file
+      if out_file && !out_file.nil?
+        File.open(out_file, 'a') do |file|
           output_lines.each { |line| file.puts line }
         end
       end
     end
-    
+
     def display_multi_model_metrics(metrics_list)
       return unless metrics_list && !metrics_list.empty?
       
       output_lines = []
       
       # Determine table width based on whether costs are shown
-      if AIA.config.show_cost
+      if AIA.config.flags.cost
         table_width = 80
       else
         table_width = 60
@@ -161,7 +163,7 @@ module AIA
       output_lines << "─" * table_width
       
       # Build header row
-      if AIA.config.show_cost
+      if AIA.config.flags.cost
         output_lines << sprintf("%-20s %10s %10s %10s %12s %10s", 
                                 "Model", "Input", "Output", "Total", "Cost", "x1000")
         output_lines << "─" * table_width
@@ -177,15 +179,16 @@ module AIA
       total_cost = 0.0
       
       metrics_list.each do |metrics|
-        model_name = metrics[:model_id]
+        # Use display_name if available (includes role), otherwise fall back to model_id
+        model_name = metrics[:display_name] || metrics[:model_id]
         # Truncate model name if too long
-        model_name = model_name[0..17] + ".." if model_name.length > 19
-        
+        model_name = model_name[0..17] + ".." if model_name.to_s.length > 19
+
         input_tokens = metrics[:input_tokens] || 0
         output_tokens = metrics[:output_tokens] || 0
         total_tokens = input_tokens + output_tokens
         
-        if AIA.config.show_cost
+        if AIA.config.flags.cost
           cost_data = calculate_cost(metrics)
           if cost_data[:available]
             cost_str = "$#{'%.5f' % cost_data[:total_cost]}"
@@ -211,7 +214,7 @@ module AIA
       output_lines << "─" * table_width
       total_tokens = total_input + total_output
       
-      if AIA.config.show_cost && total_cost > 0
+      if AIA.config.flags.cost && total_cost > 0
         cost_str = "$#{'%.5f' % total_cost}"
         x1000_str = "$#{'%.2f' % (total_cost * 1000)}"
         output_lines << sprintf("%-20s %10d %10d %10d %12s %10s",
@@ -227,13 +230,14 @@ module AIA
       output_lines.each { |line| puts line }
       
       # Also write to file if configured
-      if AIA.config.out_file && !AIA.config.out_file.nil?
-        File.open(AIA.config.out_file, 'a') do |file|
+      out_file = AIA.config.output.file
+      if out_file && !out_file.nil?
+        File.open(out_file, 'a') do |file|
           output_lines.each { |line| file.puts line }
         end
       end
     end
-    
+
     private
     
     def display_metrics_basic(metrics)

data/lib/aia/utility.rb

@@ -10,22 +10,49 @@ module AIA
       end
 
       def user_tools?
-        AIA.config&.tool_paths && !AIA.config.tool_paths.empty?
+        AIA.config&.tools&.paths && !AIA.config.tools.paths.empty?
       end
 
       def mcp_servers?
         AIA.config&.mcp_servers && !AIA.config.mcp_servers.empty?
       end
 
+      # Returns only successfully connected MCP server names
       def mcp_server_names
+        # Use connected_mcp_servers if available (populated during MCP setup)
+        connected = AIA.config&.connected_mcp_servers
+        return connected if connected && !connected.empty?
+
+        # Fallback to configured servers if connection status not yet known
         return [] unless mcp_servers?
         AIA.config.mcp_servers.map { |s| s[:name] || s["name"] }.compact
       end
 
+      # Returns true if there are any connected MCP servers
+      def connected_mcp_servers?
+        connected = AIA.config&.connected_mcp_servers
+        connected && !connected.empty?
+      end
+
+      # Returns list of failed MCP servers with their errors
+      def failed_mcp_servers
+        AIA.config&.failed_mcp_servers || []
+      end
+
       def supports_tools?
-        AIA.config&.client&.model&.supports_functions? || false
+        AIA.client&.model&.supports_functions? || false
       end
 
+      # Returns the last refresh date from models.json modification time
+      def models_last_refresh
+        aia_dir = AIA.config&.paths&.aia_dir
+        return nil if aia_dir.nil?
+
+        models_file = File.join(File.expand_path(aia_dir), 'models.json')
+        return nil unless File.exist?(models_file)
+
+        File.mtime(models_file).strftime('%Y-%m-%d %H:%M')
+      end
 
       # Displays the AIA robot ASCII art
       # Yes, its slightly frivolous but it does contain some
@@ -37,40 +64,45 @@ module AIA
 
         mcp_version = defined?(RubyLLM::MCP::VERSION) ? " MCP v" + RubyLLM::MCP::VERSION : ''
 
-        # Extract model names from config (handles hash format from ADR-005)
-        model_display = if AIA.config&.model
-          models = AIA.config.model
-          if models.is_a?(String)
-            models
-          elsif models.is_a?(Array)
-            if models.first.is_a?(Hash)
-              models.map { |spec| spec[:model] }.join(', ')
+        # Extract model names from config (handles ModelSpec objects or Hashes)
+        model_display = if AIA.config&.models && !AIA.config.models.empty?
+          models = AIA.config.models
+          models.map do |spec|
+            if spec.is_a?(AIA::ModelSpec)
+              spec.name
+            elsif spec.is_a?(Hash)
+              spec[:name] || spec['name'] || spec.to_s
             else
-              models.join(', ')
+              spec.to_s
             end
-          else
-            models.to_s
-          end
+          end.join(', ')
         else
           'unknown-model'
         end
 
-        mcp_line = mcp_servers? ? "MCP: #{mcp_server_names.join(', ')}" : ''
+        # Build MCP line based on connection status
+        mcp_line = if !mcp_servers?
+          ''  # No MCP servers configured
+        elsif connected_mcp_servers?
+          "MCP: #{mcp_server_names.join(', ')}"
+        else
+          "MCP: (none connected)"
+        end
 
         puts <<-ROBOT
 
        ,      ,
        (\\____/) AI Assistant (v#{AIA::VERSION}) is Online
         (_oo_)   #{model_display}#{supports_tools? ? ' (supports tools)' : ''}
-         (O)       using #{AIA.config&.adapter || 'unknown-adapter'} (v#{RubyLLM::VERSION}#{mcp_version})
+         (O)       using #{AIA.config&.llm&.adapter || 'unknown-adapter'} (v#{RubyLLM::VERSION}#{mcp_version})
        __||__    \\) model db was last refreshed on
-     [/______\\]  /    #{AIA.config&.last_refresh || 'unknown'}
+     [/______\\]  /    #{models_last_refresh || 'unknown'}
     / \\__AI__/ \\/      #{user_tools? ? 'I will also use your tools' : (tools? ? 'You can share my tools' : 'I did not bring any tools')}
    /    /__\\              #{mcp_line}
   (\\   /____\\   #{user_tools? && tools? ? 'My Toolbox contains:' : ''}
         ROBOT
         if user_tools? && tools?
-          tool_names = AIA.config.respond_to?(:tool_names) ? AIA.config.tool_names : AIA.config.tools
+          tool_names = AIA.config.tool_names
           if tool_names && !tool_names.to_s.empty?
             puts WordWrapper::MinimumRaggedness.new(
                 width,

data/lib/aia.rb

@@ -21,14 +21,20 @@ DebugMeDefaultOptions[:skip1] = true
 require_relative 'extensions/openstruct_merge'    # adds self.merge self.get_value
 require_relative 'extensions/ruby_llm/modalities' # adds model.modalities.text_to_text? etc.
 
-require_relative 'refinements/string.rb'        # adds #include_any? #include_all?
-
-
-
+require_relative 'refinements/string' # adds #include_any? #include_all?
 
 require_relative 'aia/utility'
 require_relative 'aia/version'
 require_relative 'aia/config'
+require_relative 'aia/logger'
+
+# Top-level logger method available anywhere in the application
+def logger
+  AIA::LoggerManager.aia_logger
+end
+
+require_relative 'aia/config/cli_parser'
+require_relative 'aia/config/validator'
 require_relative 'aia/prompt_handler'
 require_relative 'aia/ruby_llm_adapter'
 require_relative 'aia/directive_processor'
@@ -41,86 +47,105 @@ require_relative 'aia/session'
 # provides an interface for interacting with AI models and managing prompts.
 module AIA
   at_exit do
-    STDERR.puts "Exiting AIA application..."
-    # Clean up temporary STDIN file if it exists
-    if @config&.stdin_temp_file && File.exist?(@config.stdin_temp_file)
-      File.unlink(@config.stdin_temp_file)
-    end
+    warn 'Exiting AIA application...'
   end
 
   @config = nil
+  @client = nil
 
-  def self.config
-    @config
-  end
+  class << self
+    attr_accessor :config, :client
 
-  def self.client
-    @config.client
-  end
+    def good_file?(filename)
+      File.exist?(filename) &&
+        File.readable?(filename) &&
+        !File.directory?(filename)
+    end
 
-  def self.client=(client)
-    @config.client = client
-  end
 
-  def self.good_file?(filename)
-    File.exist?(filename) &&
-    File.readable?(filename) &&
-    !File.directory?(filename)
-  end
+    def bad_file?(filename)
+      !good_file?(filename)
+    end
 
-  def self.bad_file?(filename)
-    !good_file?(filename)
-  end
 
-  def self.build_flags
-    @config.each_pair do |key, value|
-      if [TrueClass, FalseClass].include?(value.class)
-        define_singleton_method("#{key}?") do
-          @config[key]
-        end
-      end
+    # Convenience flag accessors (delegate to config.flags section)
+    def chat?
+      @config&.flags&.chat == true
     end
-  end
 
-  def self.run
-    @config = Config.setup
 
-    build_flags
+    def debug?
+      @config&.flags&.debug == true
+    end
 
-    # Load Fzf if fuzzy search is enabled and fzf is installed
-    if @config.fuzzy
-      begin
-        # Cache fzf availability check for better performance
-        if system('which fzf >/dev/null 2>&1')
-          require_relative 'aia/fzf'
-        else
-          warn "Warning: Fuzzy search enabled but fzf not found. Install fzf for enhanced search capabilities."
-        end
-      rescue StandardError => e
-        warn "Warning: Failed to load fzf: #{e.message}"
-      end
+
+    def verbose?
+      @config&.flags&.verbose == true
+    end
+
+
+    def fuzzy?
+      @config&.flags&.fuzzy == true
+    end
+
+
+    def terse?
+      @config&.flags&.terse == true
+    end
+
+
+    def speak?
+      @config&.flags&.speak == true
+    end
+
+
+    def append?
+      @config&.output&.append == true
     end
 
-    prompt_handler = PromptHandler.new
 
-    # Initialize the appropriate client adapter based on configuration
-    @config.client = if 'ruby_llm' == @config.adapter
-                      RubyLLMAdapter.new
-                    else
-                      # TODO: ?? some other LLM API wrapper
-                      STDERR.puts "ERROR: There is no adapter for #{@config.adapter}"
-                      exit 1
-                    end
+    def run
+      # Parse CLI arguments
+      cli_overrides = CLIParser.parse
 
-    # There are two kinds of sessions: batch and chat
-    # A chat session is started when the --chat CLI option is used
-    # BUT its also possible to start a chat session with an initial prompt AND
-    # within that initial prompt there can be a workflow (aka pipeline)
-    # defined.  If that is the case, then the chat session will not start
-    # until the initial prompt has completed its workflow.
+      # Create config with CLI overrides
+      @config = Config.setup(cli_overrides)
 
-    session        = Session.new(prompt_handler)
+      # Validate and tailor configuration (handles --dump early exit)
+      ConfigValidator.tailor(@config)
 
-    session.start
+      # Load Fzf if fuzzy search is enabled and fzf is installed
+      if @config.flags.fuzzy
+        begin
+          if system('which fzf >/dev/null 2>&1')
+            require_relative 'aia/fzf'
+          else
+            warn 'Warning: Fuzzy search enabled but fzf not found. Install fzf for enhanced search capabilities.'
+          end
+        rescue StandardError => e
+          warn "Warning: Failed to load fzf: #{e.message}"
+        end
+      end
+
+      prompt_handler = PromptHandler.new
+
+      # Initialize the appropriate client adapter based on configuration
+      @client = if 'ruby_llm' == @config.llm.adapter
+                  RubyLLMAdapter.new
+                else
+                  warn "ERROR: There is no adapter for #{@config.llm.adapter}"
+                  exit 1
+                end
+
+      # There are two kinds of sessions: batch and chat
+      # A chat session is started when the --chat CLI option is used
+      # BUT its also possible to start a chat session with an initial prompt AND
+      # within that initial prompt there can be a workflow (aka pipeline)
+      # defined.  If that is the case, then the chat session will not start
+      # until the initial prompt has completed its workflow.
+
+      session = Session.new(prompt_handler)
+      session.start
+    end
   end
 end

data/lib/extensions/ruby_llm/modalities.rb

@@ -1,5 +1,7 @@
 # lib/extensions/ruby_llm/modalities.rb
 
+require 'ruby_llm'
+
 class RubyLLM::Model::Modalities
   #
   def text_to_text? = input.include?('text') && output.include?('text')

data/mcp_servers/apple-mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "apple-mcp": {
+      "command": "npx",
+      "args": ["-y", "apple-mcp"]
+    }
+  }
+}

data/mcp_servers/mcp_server_chart.json

@@ -0,0 +1,11 @@
+{
+  "mcpServers": {
+    "mcp-server-chart": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@antv/mcp-server-chart"
+      ]
+    }
+  }
+}

data/mcp_servers/playwright_one.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp"]
+    }
+  }
+}

data/mcp_servers/playwright_two.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "playwright": {
+      "command": "npx",
+      "args": ["@executeautomation/playwright-mcp-server"]
+    }
+  }
+}

data/mcp_servers/tavily_mcp_server.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "tavily-remote-mcp": {
+      "command": "npx -y mcp-remote https://mcp.tavily.com/mcp/?tavilyApiKey=$TAVILY_API_KEY",
+      "env": {}
+    }
+  }
+}