aia 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ce34c18195898a722843fc5936628eebb00e16517618ffc2d2735e291caa528
-  data.tar.gz: bdf4a3fcf9d5da9546caf69f4c5b9c969e4453d53755fc0ff9e70bce273c6998
+  metadata.gz: 489e116b8ebfbfed10c2cd0d699a4e37294719d39899e65d4fec6f226dadf36d
+  data.tar.gz: 35f9488983cd2944c8638d51aacd31ba606ee3d01fcada61673a47aaba3f7645
 SHA512:
-  metadata.gz: c72b22c0321c1b54b103a74acc7b79a3e4650f8588ce0017294966fe2a895cc0942a7a44471603a3517cb78bb9234a619174a91cde30c32f4eb9c1d69ff7f200
-  data.tar.gz: 49d2253408f2e5f846aa15dc83b6165fb2f6d4fad28d029aef4536ae699e267cfb476cce375576465a5bd17a418231f1cd3686bcde00c4f206735f838f78e798
+  metadata.gz: f4bb461ff9f7ac7c775cd72be754e1698cf057033f3ae6100d9ad7d1f348de96116af1f4a7271adf32b399147ad572f2c9bb198b27bbc7909f88548d4124f577
+  data.tar.gz: 3312f7ab73822ab0c315f0842bde82223d617b08bcc0b0734ff502c58494ef9c608433a9efcff1c7923a4fa89537eee4df35247d85fa96a34cc5f0b5b71177f8

data/.version

@@ -1 +1 @@
-0.8.6
+0.9.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 ## [Unreleased]
+### [0.9.0] WIP
+- Adding MCP Client suppot
+- removed the CLI options --erb and --shell but kept them in the config file with a default of true for both
+
 ## Released
 
 ### [0.8.6] 2025-04-23

data/COMMITS.md

@@ -0,0 +1,23 @@
+<!-- ~/COMMITS.md  gem install aigcm -->
+
+The JIRA ticket reference should be the first thing mentioned in the commit message.
+It is useually the basename of the repository root. The repository root is
+found in the system environment variable $RR.
+
+A Git commit message includes:
+
+1. **Subject line**: starts with the JIRA ticket and is 50 characters or less, imperative mood.
+  - Example: `Fix bug in user login`
+
+2. **Body** (optional): Explain the "why" and "how", wrapped at 72 characters.
+  <example>
+  This commit fixes the login issue that occurs when the user
+  enters incorrect credentials. It improves error handling and
+  provides user feedback.
+  </example>
+
+  The body should also include bullet points for each change made.
+
+3. **Footer** (optional): Reference issues or breaking changes.
+  <example> Closes #123 </example>
+  <example> BREAKING CHANGE: API changed </example>

data/README.md

@@ -11,20 +11,23 @@
     [/______\]  /               * embedded directives * shell integration
    / \__AI__/ \/                * embedded Ruby       * history management
   /    /__\                     * interactive chat    * prompt workflows
- (\   /____\
+ (\   /____\                    # Experimental support of MCP servers via ruby_llm extension
 ```
 
 AIA leverages the [prompt_manager gem](https://github.com/madbomber/prompt_manager) to manage prompts. It utilizes the [CLI tool fzf](https://github.com/junegunn/fzf) for prompt selection.
 
 **Most Recent Change**: Refer to the [Changelog](CHANGELOG.md)
-- Added support for the `ruby_llm` gem as an alternative to `ai_client`
+- Replaced `ai_client` with `ruby_llm` gem
+- Added --adapter w/default ruby_llm in case there is a need to consider something else
 - //include directive now supports web URLs
 - //webpage insert web URL content as markdown into context
 
 **Wiki**: [Checkout the AIA Wiki](https://github.com/MadBomber/aia/wiki)
 
 **Notable Recent Changes:**
-- **RubyLLM Integration:** AIA now supports the RubyLLM gem as an alternative to ai_client. Use `--adapter ruby_llm` to switch. Why am I replacing my on gem ai_client with the ruby_llm gem?  Because its better, newer, elegant and will easily support some of the new features I have planned for AIA.  Its not fully integrated but its close ofenough to work on text-to-text generation.  Other modes will be added in the future.
+- **RubyLLM Integration:** AIA now uses the `ruby_llm` gem as a replacement to ai_client. The option `--adapter ruby_llm` is the default.  The `--adapter` option is there in case in the future an alternative to ruby_llm may be needed. I replacing my on gem ai_client with the ruby_llm gem? Because its better, newer, elegant and will easily support some of the new features I have planned for AIA.
+
+- **MCP Server Support:** AIA now supports Model Context Protocol (MCP) servers through an extension to the ruby_llm gem. This experimental feature allows AIA to interact with various external tools and services through MCP servers using the --mcp and --allowed_tools CLI options.
 
 <!-- Tocer[start]: Auto-generated, don't remove. -->
 
@@ -67,6 +70,13 @@ AIA leverages the [prompt_manager gem](https://github.com/madbomber/prompt_manag
   - [Development](#development)
   - [Contributing](#contributing)
   - [Roadmap](#roadmap)
+  - [Model Context Protocol (MCP) Support](#model-context-protocol-mcp-support)
+    - [What is MCP?](#what-is-mcp)
+    - [Using MCP Servers with AIA](#using-mcp-servers-with-aia)
+    - [Focusing on Specific Tools with --allowed_tools](#focusing-on-specific-tools-with---allowed_tools)
+    - [How It Works](#how-it-works)
+    - [Current Limitations](#current-limitations)
+    - [Sounds like directives](#sounds-like-directives)
   - [License](#license)
 
 <!-- Tocer[finish]: Auto-generated, don't remove. -->
@@ -75,39 +85,49 @@ AIA leverages the [prompt_manager gem](https://github.com/madbomber/prompt_manag
 
 The following table provides a comprehensive list of configuration options, their default values, and the associated environment variables:
 
-| Option                  | Default Value                   | Environment Variable      |
-|-------------------------|---------------------------------|---------------------------|
-| adapter                 | ai_client                       | AIA_ADAPTER               |
-| out_file                | temp.md                         | AIA_OUT_FILE              |
-| log_file                | ~/.prompts/_prompts.log         | AIA_LOG_FILE              |
-| prompts_dir             | ~/.prompts                      | AIA_PROMPTS_DIR           |
-| roles_prefix            | roles                           | AIA_ROLES_PREFIX          |
-| model                   | gpt-4o-mini                     | AIA_MODEL                 |
-| speech_model            | tts-1                           | AIA_SPEECH_MODEL          |
-| transcription_model     | whisper-1                       | AIA_TRANSCRIPTION_MODEL   |
-| verbose                 | false                           | AIA_VERBOSE               |
-| markdown                | true                            | AIA_MARKDOWN              |
-| shell                   | false                           | AIA_SHELL                 |
-| erb                     | false                           | AIA_ERB                   |
-| chat                    | false                           | AIA_CHAT                  |
-| clear                   | false                           | AIA_CLEAR                 |
-| terse                   | false                           | AIA_TERSE                 |
-| debug                   | false                           | AIA_DEBUG                 |
-| fuzzy                   | false                           | AIA_FUZZY                 |
-| speak                   | false                           | AIA_SPEAK                 |
-| append                  | false                           | AIA_APPEND                |
-| temperature             | 0.7                             | AIA_TEMPERATURE           |
-| max_tokens              | 2048                            | AIA_MAX_TOKENS            |
-| top_p                   | 1.0                             | AIA_TOP_P                 |
-| frequency_penalty       | 0.0                             | AIA_FREQUENCY_PENALTY     |
-| presence_penalty        | 0.0                             | AIA_PRESENCE_PENALTY      |
-| image_size              | 1024x1024                       | AIA_IMAGE_SIZE            |
-| image_quality           | standard                        | AIA_IMAGE_QUALITY         |
-| image_style             | vivid                           | AIA_IMAGE_STYLE           |
-| embedding_model         | text-embedding-ada-002          | AIA_EMBEDDING_MODEL       |
-| speak_command           | afplay                          | AIA_SPEAK_COMMAND         |
-| require_libs            | []                              | AIA_REQUIRE_LIBS          |
-| regex                   | '(?-mix:(\\[[A-Z _|]+\\]))'     | AIA_REGEX                 |
+| Config Item Name     | CLI Options | Default Value               | Environment Variable      |
+|----------------------|-------------|-----------------------------|---------------------------|
+| adapter              | --adapter   | ruby_llm                    | AIA_ADAPTER               |
+| aia_dir              |             | ~/.aia                      | AIA_DIR                   |
+| append               | -a, --append | false                      | AIA_APPEND                |
+| chat                 | --chat      | false                       | AIA_CHAT                  |
+| clear                | --clear     | false                       | AIA_CLEAR                 |
+| config_file          | -c, --config_file | ~/.aia/config.yml      | AIA_CONFIG_FILE           |
+| debug                | -d, --debug | false                       | AIA_DEBUG                 |
+| embedding_model      | --em, --embedding_model | text-embedding-ada-002 | AIA_EMBEDDING_MODEL       |
+| erb                  |             | true                       | AIA_ERB                   |
+| frequency_penalty    | --frequency_penalty | 0.0                  | AIA_FREQUENCY_PENALTY     |
+| fuzzy                | -f, --fuzzy | false                       | AIA_FUZZY                 |
+| image_quality        | --iq, --image_quality | standard          | AIA_IMAGE_QUALITY         |
+| image_size           | --is, --image_size | 1024x1024           | AIA_IMAGE_SIZE            |
+| image_style          | --style, --image_style | vivid            | AIA_IMAGE_STYLE           |
+| log_file             | -l, --log_file | ~/.prompts/_prompts.log  | AIA_LOG_FILE              |
+| markdown             | --md, --markdown | true                   | AIA_MARKDOWN              |
+| max_tokens           | --max_tokens | 2048                      | AIA_MAX_TOKENS            |
+| mcp_servers          | --mcp       | []                          | AIA_MCP_SERVERS           |
+| model                | -m, --model | gpt-4o-mini                 | AIA_MODEL                 |
+| next                 | -n, --next  | nil                         | AIA_NEXT                  |
+| out_file             | -o, --out_file | temp.md                  | AIA_OUT_FILE              |
+| parameter_regex      | --regex     | '(?-mix:(\[[A-Z _|]+\]))' | AIA_PARAMETER_REGEX       |
+| pipeline             | --pipeline  | []                          | AIA_PIPELINE              |
+| presence_penalty     | --presence_penalty | 0.0                   | AIA_PRESENCE_PENALTY      |
+| prompt_extname       |             | .txt                        | AIA_PROMPT_EXTNAME        |
+| prompts_dir          | -p, --prompts_dir | ~/.prompts            | AIA_PROMPTS_DIR           |
+| require_libs         | --rq        | []                          | AIA_REQUIRE_LIBS          |
+| role                 | -r, --role  |                             | AIA_ROLE                  |
+| roles_dir            |             | ~/.prompts/roles            | AIA_ROLES_DIR             |
+| roles_prefix         | --roles_prefix | roles                    | AIA_ROLES_PREFIX          |
+| shell                |             | true                        | AIA_SHELL                 |
+| speak                | --speak     | false                       | AIA_SPEAK                 |
+| speak_command        |             | afplay                      | AIA_SPEAK_COMMAND         |
+| speech_model         | --sm, --speech_model | tts-1               | AIA_SPEECH_MODEL          |
+| system_prompt        | --system_prompt |                         | AIA_SYSTEM_PROMPT         |
+| temperature          | -t, --temperature | 0.7                   | AIA_TEMPERATURE           |
+| terse                | --terse     | false                       | AIA_TERSE                 |
+| top_p                | --top_p     | 1.0                         | AIA_TOP_P                 |
+| transcription_model  | --tm, --transcription_model | whisper-1    | AIA_TRANSCRIPTION_MODEL   |
+| verbose              | -v, --verbose | false                     | AIA_VERBOSE               |
+| voice                | --voice     | alloy                       | AIA_VOICE                 |
 
 These options can be configured via command-line arguments, environment variables, or configuration files.
 
@@ -566,7 +586,7 @@ export AIA_MODEL=gpt-4o-mini
 # for feedback while waiting for the LLM to respond.
 export AIA_VERBOSE=true
 
-alias chat='aia --chat --shell --erb --terse'
+alias chat='aia --chat --terse'
 
 # rest of the file is the completion function
 ```
@@ -629,14 +649,14 @@ aia --help
 
 Key command-line options include:
 
-- `--adapter ADAPTER`: Choose the LLM interface adapter to use. Valid options are 'ai_client' (default) or 'ruby_llm'. See [RubyLLM Integration Guide](README_RUBY_LLM.md) for details.
+- `--adapter ADAPTER`: Choose the LLM interface adapter to use. Valid options are 'ruby_llm' (default) or something else in the future. See [RubyLLM Integration Guide](README_RUBY_LLM.md) for details.
 - `--model MODEL`: Specify which LLM model to use
 - `--chat`: Start an interactive chat session
-- `--shell`: Enable shell command integration
-- `--erb`: Enable ERB processing
 - `--role ROLE`: Specify a role/system prompt
 - And many more (use --help to see all options)
 
+**Note:** ERB and shell processing are now standard features and always enabled. This allows you to use embedded Ruby code and shell commands in your prompts without needing to specify any additional options.
+
 ## Development
 
 **ShellCommandExecutor Refactor:**
@@ -655,11 +675,61 @@ I'm not happy with the way where some command line options for external command
 
 ## Roadmap
 
-- I'm thinking about removing the --erb and --shell options and just making those two integrations available all the time.
 - restore the prompt text file search. currently fzf only looks a prompt IDs.
 - continue integration of the ruby_llm gem
 - support for Model Context Protocol
 
+## Model Context Protocol (MCP) Support
+
+AIA now includes experimental support for Model Context Protocol (MCP) servers through an extension to the `ruby_llm` gem, which utilizes the `ruby-mcp-client` gem for communication with MCP servers.
+
+### What is MCP?
+
+Model Context Protocol (MCP) is a standardized way for AI models to interact with external tools and services. It allows AI assistants to perform actions beyond mere text generation, such as searching the web, accessing databases, or interacting with APIs.
+
+### Using MCP Servers with AIA
+
+To use MCP with AIA, you can specify one or more MCP servers using the `--mcp` CLI option:
+
+```bash
+aia --chat --mcp server1,server2
+```
+
+This will connect your AIA session to the specified MCP servers, allowing the AI model to access tools provided by those servers.
+
+### Focusing on Specific Tools with --allowed_tools
+
+If you want to limit which MCP tools are available to the AI model during your session, you can use the `--allowed_tools` option:
+
+```bash
+aia --chat --mcp server1 --allowed_tools tool1,tool2,tool3
+```
+
+This restricts the AI model to only use the specified tools, which can be helpful for:
+
+- Focusing the AI on a specific task
+- Preventing the use of unnecessary or potentially harmful tools
+- Reducing the cognitive load on the AI by limiting available options
+
+### How It Works
+
+Behind the scenes, AIA leverages a new `with_mcp` method in `RubyLLM::Chat` to set up the MCP tools for chat sessions. This method processes the hash-structured MCP tool definitions and makes them available for the AI to use during the conversation.
+
+When you specify `--mcp` and optionally `--allowed_tools`, AIA configures the underlying `ruby_llm` adapter to connect to the appropriate MCP servers and expose only the tools you've explicitly allowed.
+
+### Current Limitations
+
+As this is an experimental feature:
+
+- Not all AI models support MCP tools
+- The available tools may vary depending on the MCP server
+- Tool behavior may change as the MCP specification evolves
+
+### Sounds like directives
+
+Anthropic's MCP standard came months after the aia appeared with its inherent support of dynamic prompt context enhancements via directives, shell integration and ERB support.  Yes you can argue that if you have a working MCP client and access to appropriate MCP servers then the dynamic prompt context enhancements via directives, shell integration and ERB support are superfluous.  I don't agree with that argument.  I think the dynamic prompt context enhancements via directives, shell integration and ERB support are powerful tools in and of themselves.  I think they are a better way to do things.
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/aia/chat_processor_service.rb

@@ -60,7 +60,20 @@ module AIA
 
 
     def maybe_change_model
-      if AIA.client.model != AIA.config.model
+      if AIA.client.model.is_a?(String)
+        client_model = AIA.client.model     # AiClient instance
+      else
+        client_model = AIA.client.model.id  # RubyLLM::Model instance
+      end
+
+      debug_me('== dynamic model change? =='){[
+        :client_model,
+        "AIA.config.model"
+      ]}
+
+      # when adapter is ruby_llm must use model.id as the name
+      unless AIA.config.model.downcase.include?(client_model.downcase)
+        # FIXME: assumes that the adapter is AiClient.  It might be RUbyLLM
         AIA.client = AIClientAdapter.new
       end
     end

data/lib/aia/config.rb

@@ -9,6 +9,9 @@ require 'yaml'
 require 'toml-rb'
 require 'erb'
 require 'optparse'
+require 'json'
+require 'tempfile'
+require 'fileutils'
 
 module AIA
   class Config
@@ -26,10 +29,14 @@ module AIA
       role:         '',
       system_prompt: '',
 
+      # MCP configuration
+      mcp_servers:   [],
+      allowed_tools: nil, # nil means all tools are allowed; otherwise an Array of Strings which are the tool names
+
       # Flags
       markdown: true,
-      shell:    false,
-      erb:      false,
+      shell:    true,
+      erb:      true,
       chat:     false,
       clear:    false,
       terse:    false,
@@ -60,7 +67,7 @@ module AIA
       speech_model:         'tts-1',
       transcription_model:  'whisper-1',
       voice:                'alloy',
-      adapter:              'ai_client', # 'ai_client' or 'ruby_llm'
+      adapter:              'ruby_llm', # 'ruby_llm' or ???
 
       # Embedding parameters
       embedding_model: 'text-embedding-ada-002',
@@ -193,6 +200,13 @@ module AIA
         PromptManager::Prompt.parameter_regex = Regexp.new(config.parameter_regex)
       end
 
+      debug_me{[ 'config.mcp_servers' ]}
+
+      unless config.mcp_servers.empty?
+        # create a single JSON file contain all of the MCP server definitions specified my the --mcp option
+        config.mcp_servers = combine_mcp_server_json_files config.mcp_servers
+      end
+
       config
     end
 
@@ -239,7 +253,7 @@ module AIA
 
         opts.on("--adapter ADAPTER", "Interface that adapts AIA to the LLM") do |adapter|
           adapter.downcase!
-          valid_adapters = %w[ ai_client ruby_llm]
+          valid_adapters = %w[ ruby_llm ]  # NOTE: Add additional adapters here when needed
           if valid_adapters.include? adapter
             config.adapter = adapter
           else
@@ -253,15 +267,7 @@ module AIA
           config.model = model
         end
 
-        opts.on("--shell", "Enables `aia` to access your terminal's shell environment from inside the prompt text, allowing for dynamic content insertion using system environment variables and shell commands. Includes safety features to confirm or block dangerous commands.") do
-          config.shell = true
-        end
-
-        opts.on("--erb", "Turns the prompt text file into a fully functioning ERB template, allowing for embedded Ruby code processing within the prompt text. This enables dynamic content generation and complex logic within prompts.") do
-          config.erb = true
-        end
-
-        opts.on("--terse", "Add terse instruction to prompt") do
+        opts.on("--terse", "Adds a special instruction to the prompt asking the AI to keep responses short and to the point") do
           config.terse = true
         end
 
@@ -428,6 +434,44 @@ module AIA
         opts.on("--rq LIBS", "Ruby libraries to require for Ruby directive") do |libs|
           config.require_libs = libs.split(',')
         end
+
+        opts.on("--mcp FILE", "Add MCP server configuration from JSON file. Can be specified multiple times.") do |file|
+          # debug_me FIXME ruby-mcp-client is looking for a single JSON file that
+          # could contain multiple server definitions that looks like this:
+          # {
+          #   "mcpServers": {
+          #     "server one": { ... },
+          #     "server two": { ... }, ....
+          #   }
+          # }
+          # FIXME: need to rurn multiple JSON files into one.
+          if AIA.good_file?(file)
+            config.mcp_servers ||= []
+            config.mcp_servers << file
+            begin
+              server_config = JSON.parse(File.read(file))
+              config.mcp_servers_config ||= []
+              config.mcp_servers_config << server_config
+            rescue JSON::ParserError => e
+              STDERR.puts "Error parsing MCP server config file #{file}: #{e.message}"
+              exit 1
+            end
+          else
+            STDERR.puts "MCP server config file not found: #{file}"
+            exit 1
+          end
+        end
+
+        opts.on("--at", "--allowed_tools TOOLS_LIST", "Allow only these tools to be used") do |tools_list|
+          config.allowed_tools ||= []
+          if tools_list.empty?
+            STDERR.puts "No list of tool names provided for --allowed_tools option"
+            exit 1
+          else
+            config.allowed_tools += tools_list.split(',').map(&:strip)
+            config.allowed_tools.uniq!
+          end
+        end
       end
 
       args = ARGV.dup
@@ -513,5 +557,95 @@ module AIA
       File.write(file, content)
       puts "Config successfully dumped to #{file}"
     end
+
+
+    # Combine multiple MCP server JSON files into a single file
+    def self.combine_mcp_server_json_files(file_paths)
+      raise ArgumentError, "No JSON files provided" if file_paths.nil? || file_paths.empty?
+
+      # The output will have only one top-level key: "mcpServers"
+      mcp_servers = {} # This will store all collected server_name => server_config pairs
+
+      file_paths.each do |file_path|
+        file_content = JSON.parse(File.read(file_path))
+        # Clean basename, e.g., "filesystem.json" -> "filesystem", "foo.json.erb" -> "foo"
+        cleaned_basename = File.basename(file_path).sub(/\.json\.erb$/, '').sub(/\.json$/, '')
+
+        if file_content.is_a?(Hash)
+          if file_content.key?("mcpServers") && file_content["mcpServers"].is_a?(Hash)
+            # Case A: {"mcpServers": {"name1": {...}, "name2": {...}}}
+            file_content["mcpServers"].each do |server_name, server_data|
+              if mcp_servers.key?(server_name)
+                STDERR.puts "Warning: Duplicate MCP server name '#{server_name}' found. Overwriting with definition from #{file_path}."
+              end
+              mcp_servers[server_name] = server_data
+            end
+          # Check if the root hash itself is a single server definition
+          elsif is_single_server_definition?(file_content)
+            # Case B: {"type": "stdio", ...} or {"url": "...", ...}
+            # Use "name" property from JSON if present, otherwise use cleaned_basename
+            server_name = file_content["name"] || cleaned_basename
+            if mcp_servers.key?(server_name)
+              STDERR.puts "Warning: Duplicate MCP server name '#{server_name}' (from file #{file_path}). Overwriting."
+            end
+            mcp_servers[server_name] = file_content
+          else
+            # Case D: Fallback for {"custom_name1": {server_config1}, "custom_name2": {server_config2}}
+            # This assumes top-level keys are server names and values are server configs.
+            file_content.each do |server_name, server_data|
+              if server_data.is_a?(Hash) && is_single_server_definition?(server_data)
+                if mcp_servers.key?(server_name)
+                  STDERR.puts "Warning: Duplicate MCP server name '#{server_name}' found in #{file_path}. Overwriting."
+                end
+                mcp_servers[server_name] = server_data
+              else
+                STDERR.puts "Warning: Unrecognized structure for key '#{server_name}' in #{file_path}. Value is not a valid server definition. Skipping."
+              end
+            end
+          end
+        elsif file_content.is_a?(Array)
+          # Case C: [ {server_config1}, {server_config2_with_name} ]
+          file_content.each_with_index do |server_data, index|
+            if server_data.is_a?(Hash) && is_single_server_definition?(server_data)
+              # Use "name" property from JSON if present, otherwise generate one
+              server_name = server_data["name"] || "#{cleaned_basename}_#{index}"
+              if mcp_servers.key?(server_name)
+                STDERR.puts "Warning: Duplicate MCP server name '#{server_name}' (from array in #{file_path}). Overwriting."
+              end
+              mcp_servers[server_name] = server_data
+            else
+              STDERR.puts "Warning: Unrecognized item in array in #{file_path} at index #{index}. Skipping."
+            end
+          end
+        else
+          STDERR.puts "Warning: Unrecognized JSON structure in #{file_path}. Skipping."
+        end
+      end
+
+      # Create the final output structure
+      output    = {"mcpServers" => mcp_servers}
+      temp_file = Tempfile.new(['combined', '.json'])
+      temp_file.write(JSON.pretty_generate(output))
+      temp_file.close
+
+      temp_file.path
+    end
+
+    # Helper method to determine if a hash represents a valid MCP server definition
+    def self.is_single_server_definition?(config)
+      return false unless config.is_a?(Hash)
+      type = config['type']
+      if type
+        return true if type == 'stdio' && config.key?('command')
+        return true if type == 'sse' && config.key?('url')
+        # Potentially other explicit types if they exist in MCP
+        return false # Known type but missing required fields for it, or unknown type
+      else
+        # Infer type
+        return true if config.key?('command') || config.key?('args') || config.key?('env') # stdio
+        return true if config.key?('url') # sse
+      end
+      false
+    end
   end
 end

data/lib/aia/prompt_handler.rb

@@ -48,14 +48,8 @@ module AIA
           erb_flag: AIA.config.erb,
           envar_flag: AIA.config.shell
         )
-        
-        # Ensure parameters are extracted even if no history file exists
-        if prompt && prompt.parameters.empty?
-          # Force re-reading of the prompt text to extract parameters
-          # This ensures parameters are found even without a .json file
-          prompt.reload
-        end
 
+        # Parameters should be extracted during initialization or to_s
         return prompt if prompt
       else
         puts "Warning: Invalid prompt ID or file not found: #{prompt_id}"
@@ -147,8 +141,11 @@ module AIA
     end
 
 
+    # FIXME: original implementation used a search_proc to look into the content of the prompt
+    #        files.  The use of the select statement does not work.
     def search_prompt_id_with_fzf(initial_query)
-      prompt_files = Dir.glob(File.join(@prompts_dir, "*.txt")).map { |file| File.basename(file, ".txt") }
+      prompt_files = Dir.glob(File.join(@prompts_dir, "*.txt"))
+                       .map { |file| File.basename(file, ".txt") }
       fzf = AIA::Fzf.new(
         list: prompt_files,
         directory: @prompts_dir,
@@ -160,7 +157,8 @@ module AIA
     end
 
     def search_role_id_with_fzf(initial_query)
-      role_files = Dir.glob(File.join(@roles_dir, "*.txt")).map { |file| File.basename(file, ".txt") }
+      role_files = Dir.glob(File.join(@roles_dir, "*.txt"))
+                    .map { |file| File.basename(file, ".txt") }
       fzf = AIA::Fzf.new(
         list: role_files,
         directory: @prompts_dir,