aia 1.1.1 → 2.0.0.0.pre.alpha

data/lib/aia/config/mcp_parser.rb

@@ -3,9 +3,19 @@
 # lib/aia/config/mcp_parser.rb
 #
 # Parses MCP server JSON configuration files and converts them
-# to the format expected by AIA's config system.
+# to the nested transport format expected by robot_lab.
 #
-# Supports two JSON formats:
+# Output format (robot_lab native):
+#   {
+#     name: "server_name",
+#     transport: { type: "stdio", command: "npx", args: [...], env: {...} },
+#     timeout: 8000,
+#     topics: ["routing"],     # AIA routing metadata (optional)
+#     independent: false,      # AIA concurrency metadata (optional)
+#     group: "services"        # AIA grouping metadata (optional)
+#   }
+#
+# Supports two JSON input formats:
 #
 # 1. Simple format (single server):
 #    {
@@ -31,9 +41,10 @@ module AIA
   module McpParser
     class << self
       # Parse MCP server configuration files and return array of server configs
+      # in robot_lab's nested transport format.
       #
       # @param file_paths [Array<String>] paths to JSON configuration files
-      # @return [Array<Hash>] array of server configurations
+      # @return [Array<Hash>] array of server configurations with nested transport
       def parse_files(file_paths)
         return [] if file_paths.nil? || file_paths.empty?
 
@@ -43,7 +54,7 @@ module AIA
           expanded_path = File.expand_path(file_path)
 
           unless File.exist?(expanded_path)
-            warn "Warning: MCP config file not found: #{file_path}"
+            $stderr.puts "Warning: MCP config file not found: #{file_path}"
             next
           end
 
@@ -52,9 +63,9 @@ module AIA
             parsed = JSON.parse(json_content)
             servers.concat(convert_to_config_format(parsed, file_path))
           rescue JSON::ParserError => e
-            warn "Warning: Invalid JSON in MCP config file '#{file_path}': #{e.message}"
+            $stderr.puts "Warning: Invalid JSON in MCP config file '#{file_path}': #{e.message}"
           rescue StandardError => e
-            warn "Warning: Error reading MCP config file '#{file_path}': #{e.message}"
+            $stderr.puts "Warning: Error reading MCP config file '#{file_path}': #{e.message}"
           end
         end
 
@@ -76,43 +87,32 @@ module AIA
         end
       end
 
-      # Convert mcpServers format to config format
+      # Convert mcpServers format to robot_lab nested transport format
       #
       # @param mcp_servers [Hash] the mcpServers hash from JSON
       # @return [Array<Hash>] array of server configurations
       def convert_mcp_servers_format(mcp_servers)
         mcp_servers.map do |name, config|
-          server = { name: name }
-
-          if config['command']
-            server[:command] = config['command']
-          end
-
-          if config['args']
-            server[:args] = Array(config['args'])
-          end
-
-          if config['env']
-            server[:env] = config['env']
-          end
+          transport = { type: config['type'] || 'stdio' }
+          transport[:command] = config['command'] if config['command']
+          transport[:args]    = Array(config['args']) if config['args']
+          transport[:env]     = config['env'] if config['env']
+          transport[:url]     = config['url'] if config['url']
+          transport[:headers] = config['headers'] if config['headers']
 
-          if config['timeout']
-            server[:timeout] = config['timeout'].to_i
-          end
-
-          if config['url']
-            server[:url] = config['url']
-          end
+          server = { name: name, transport: transport }
+          server[:timeout] = config['timeout'].to_i if config['timeout']
 
-          if config['headers']
-            server[:headers] = config['headers']
-          end
+          # Preserve routing metadata for KBS/AIA
+          server[:topics]      = Array(config['topics']) if config['topics']
+          server[:independent] = config['independent'] unless config['independent'].nil?
+          server[:group]       = config['group'] if config['group']
 
           server
         end
       end
 
-      # Convert simple format to config format
+      # Convert simple format to robot_lab nested transport format
       #
       # @param parsed [Hash] parsed JSON with type and command
       # @param file_path [String] file path for deriving server name
@@ -121,28 +121,21 @@ module AIA
         # Derive name from filename (e.g., "filesystem.json" -> "filesystem")
         name = File.basename(file_path, '.*')
 
-        server = { name: name }
+        transport = { type: parsed['type'] || 'stdio' }
 
         if parsed['command'].is_a?(Array)
           # Command is an array: first element is command, rest are args
-          server[:command] = parsed['command'].first
-          server[:args] = parsed['command'][1..] || []
+          transport[:command] = parsed['command'].first
+          transport[:args] = parsed['command'][1..] || []
         elsif parsed['command']
-          server[:command] = parsed['command']
-          server[:args] = parsed['args'] || []
+          transport[:command] = parsed['command']
+          transport[:args] = parsed['args'] || []
         end
 
-        if parsed['env']
-          server[:env] = parsed['env']
-        end
-
-        if parsed['timeout']
-          server[:timeout] = parsed['timeout'].to_i
-        end
+        transport[:env] = parsed['env'] if parsed['env']
 
-        if parsed['type']
-          server[:type] = parsed['type']
-        end
+        server = { name: name, transport: transport }
+        server[:timeout] = parsed['timeout'].to_i if parsed['timeout']
 
         [server]
       end

data/lib/aia/config/model_spec.rb

@@ -13,7 +13,15 @@
 
 module AIA
   class ModelSpec
-    attr_accessor :name, :role, :instance, :internal_id
+    attr_accessor :name, :role, :instance, :internal_id, :provider
+
+    # Provider prefixes that map to RubyLLM provider slugs.
+    # 'lms' is stored as-is; RobotFactory maps it to the openai provider
+    # with a custom API base so it doesn't conflict with real OpenAI models.
+    PROVIDER_ALIASES = {
+      'ollama' => 'ollama',
+      'lms'    => 'lms'
+    }.freeze
 
     def initialize(hash = {})
       hash = hash.transform_keys(&:to_sym) if hash.respond_to?(:transform_keys)
@@ -22,6 +30,10 @@ module AIA
       @role = hash[:role]
       @instance = hash[:instance] || 1
       @internal_id = hash[:internal_id] || @name
+      @provider = hash[:provider]
+
+      # Extract provider from name if prefixed (e.g., "ollama/llama3" or "lms/my-model")
+      extract_provider_from_name! unless @provider
     end
 
     def to_h
@@ -29,7 +41,8 @@ module AIA
         name: @name,
         role: @role,
         instance: @instance,
-        internal_id: @internal_id
+        internal_id: @internal_id,
+        provider: @provider
       }
     end
 
@@ -63,5 +76,24 @@ module AIA
     def duplicate?
       @instance > 1
     end
+
+    # Check if this model uses a local provider
+    def local_provider?
+      !@provider.nil?
+    end
+
+    private
+
+    # Extract provider prefix from model name.
+    # "ollama/llama3:latest" => provider: "ollama", name: "llama3:latest"
+    # "lms/my-model" => provider: "openai", name: "my-model"
+    def extract_provider_from_name!
+      return unless @name&.include?('/')
+
+      prefix, rest = @name.split('/', 2)
+      return unless PROVIDER_ALIASES.key?(prefix)
+      @provider = PROVIDER_ALIASES[prefix]
+      @name = rest
+    end
   end
 end