aia 1.0.0.pre.beta → 1.1.0

data/lib/aia/chat_loop.rb

@@ -0,0 +1,244 @@
+# lib/aia/chat_loop.rb
+# frozen_string_literal: true
+
+require "reline"
+require "pm"
+
+module AIA
+  class ChatLoop
+    include AIA::SkillUtils
+
+    def initialize(chat_processor, ui_presenter, directive_processor)
+      @chat_processor     = chat_processor
+      @ui_presenter       = ui_presenter
+      @directive_processor = directive_processor
+    end
+
+    # Start the interactive chat session
+    def start(skip_context_files: false)
+      setup_session
+      process_role_context
+      process_skill_context
+      process_initial_context(skip_context_files)
+      handle_piped_input
+      run_loop
+    ensure
+      @ui_presenter.display_chat_end
+    end
+
+    private
+
+    def setup_session
+      initialize_ui
+      setup_signals
+      Reline::HISTORY.clear
+    end
+
+    def initialize_ui
+      puts "\nEntering interactive chat mode..."
+      @ui_presenter.display_chat_header
+    end
+
+    def setup_signals
+      Signal.trap("INT") { exit }
+    end
+
+    def process_role_context
+      role = AIA.config.prompts.role
+      return if role.nil? || role.empty?
+
+      prompt_handler = AIA::PromptHandler.new
+      role_parsed = prompt_handler.fetch_role(role)
+      return if role_parsed.nil?
+
+      role_content = role_parsed.to_s
+      return if role_content.nil? || role_content.strip.empty?
+
+      return unless AIA.client.respond_to?(:chats)
+
+      system_msg = RubyLLM::Message.new(role: :system, content: role_content)
+
+      AIA.client.chats.each_value do |chat|
+        next if chat.messages.any? { |m| m.role == :system }
+        chat.add_message(system_msg)
+      end
+    end
+
+    def process_skill_context
+      skills = AIA.config.prompts.skills
+      return if skills.nil? || skills.empty?
+
+      skills_dir = AIA.config.skills.dir
+      bodies = Array(skills).filter_map do |skill_name|
+        skill_name = skill_name.to_s.strip
+        next if skill_name.empty?
+
+        skill_path = find_skill_dir(skill_name, skills_dir)
+        next unless skill_path
+
+        if File.file?(skill_path)
+          skill_body(File.read(skill_path))
+        else
+          md = File.join(skill_path, 'SKILL.md')
+          skill_body(File.read(md)) if File.exist?(md)
+        end
+      end
+
+      return if bodies.empty?
+
+      skill_content = bodies.join("\n\n")
+      response_data = @chat_processor.process_prompt(skill_content)
+      content = response_data.is_a?(Hash) ? response_data[:content] : response_data
+      @chat_processor.output_response(content)
+      @ui_presenter.display_separator
+    end
+
+    def process_initial_context(skip_context_files)
+      return if skip_context_files || !AIA.config.context_files || AIA.config.context_files.empty?
+
+      context = AIA.config.context_files.map do |file|
+        File.read(file) rescue "Error reading file: #{file}"
+      end.join("\n\n")
+
+      return if context.empty?
+
+      response_data = @chat_processor.process_prompt(context)
+      content = response_data.is_a?(Hash) ? response_data[:content] : response_data
+
+      @chat_processor.output_response(content)
+      @chat_processor.speak(content)
+      @ui_presenter.display_separator
+    end
+
+    def handle_piped_input
+      return if STDIN.tty?
+      return unless File.exist?("/dev/tty") && File.readable?("/dev/tty") && File.writable?("/dev/tty")
+
+      begin
+        original_stdin = STDIN.dup
+        piped_input = STDIN.read.strip
+        STDIN.reopen("/dev/tty")
+
+        return if piped_input.empty?
+
+        processed_input = PM.parse_string(piped_input).to_s
+
+        response_data = @chat_processor.process_prompt(processed_input)
+        content = response_data.is_a?(Hash) ? response_data[:content] : response_data
+
+        @chat_processor.output_response(content)
+        @chat_processor.speak(content) if AIA.speak?
+        @ui_presenter.display_separator
+
+        STDIN.reopen(original_stdin)
+      rescue Errno::ENXIO => e
+        warn "Warning: Unable to handle piped input due to TTY unavailability: #{e.message}"
+        return
+      rescue StandardError => e
+        warn "Warning: Error handling piped input: #{e.message}"
+        return
+      end
+    end
+
+    def run_loop
+      loop do
+        follow_up_prompt = @ui_presenter.ask_question
+
+        break if follow_up_prompt.nil? || follow_up_prompt.strip.downcase == "exit" || follow_up_prompt.strip.empty?
+
+        if AIA.config.output.file
+          File.open(AIA.config.output.file, "a") do |file|
+            file.puts "\nYou: #{follow_up_prompt}"
+          end
+        end
+
+        if @directive_processor.directive?(follow_up_prompt)
+          follow_up_prompt = process_directive(follow_up_prompt)
+          next if follow_up_prompt.nil?
+        end
+
+        begin
+          processed_prompt = PM.parse_string(follow_up_prompt).to_s
+        rescue StandardError => e
+          @ui_presenter.display_info("Error: #{e.class}: #{e.message}")
+          next
+        end
+
+        response_data = @chat_processor.process_prompt(processed_prompt)
+
+        if response_data.is_a?(Hash)
+          content = response_data[:content]
+          metrics = response_data[:metrics]
+          multi_metrics = response_data[:multi_metrics]
+        else
+          content = response_data
+          metrics = nil
+          multi_metrics = nil
+        end
+
+        @ui_presenter.display_ai_response(content)
+
+        if AIA.config.flags.tokens
+          if multi_metrics
+            @ui_presenter.display_multi_model_metrics(multi_metrics)
+          elsif metrics
+            @ui_presenter.display_token_metrics(metrics)
+          end
+        end
+
+        @chat_processor.speak(content)
+        @ui_presenter.display_separator
+      end
+    end
+
+    def process_directive(follow_up_prompt)
+      directive_output = @directive_processor.process(follow_up_prompt, nil)
+
+      if follow_up_prompt.strip.start_with?("/clear", "/checkpoint", "/restore", "/review", "/context")
+        @ui_presenter.display_info(directive_output) unless directive_output.nil? || directive_output.strip.empty?
+        return nil
+      end
+
+      return nil if directive_output.nil? || directive_output.strip.empty?
+
+      handle_successful_directive(follow_up_prompt, directive_output)
+    end
+
+    def handle_successful_directive(follow_up_prompt, directive_output)
+      puts "\n#{directive_output}\n"
+      "I executed this directive: #{follow_up_prompt}\nHere's the output: #{directive_output}\nLet's continue our conversation."
+    end
+
+    # Parse multi-model response into per-model responses (ADR-002 revised + ADR-005)
+    def parse_multi_model_response(combined_response)
+      return {} if combined_response.nil? || combined_response.empty?
+
+      responses = {}
+      current_model = nil
+      current_content = []
+
+      combined_response.each_line do |line|
+        if line =~ /^from:\s+(.+)$/
+          if current_model
+            responses[current_model] = current_content.join.strip
+          end
+
+          display_name = $1.strip
+          internal_id = display_name.sub(/\s+\([^)]+\)\s*$/, '')
+          internal_id = internal_id.sub(/\s+#/, '#')
+
+          current_model = internal_id
+          current_content = []
+        elsif current_model
+          current_content << line
+        end
+      end
+
+      if current_model
+        responses[current_model] = current_content.join.strip
+      end
+
+      responses
+    end
+  end
+end

data/lib/aia/chat_processor_service.rb

@@ -15,9 +15,9 @@ module AIA
       @speaker ||= AiClient.new(AIA.config.audio.speech_model) if AIA.config.audio.speech_model
 
       if @speaker
-        `#{AIA.config.audio.speak_command} #{@speaker.speak(text).path}`
+        system(AIA.config.audio.speak_command, @speaker.speak(text).path)
       else
-        puts "Warning: Unable to speak. Speech model not configured properly."
+        warn "Warning: Unable to speak. Speech model not configured properly."
       end
     end
 
@@ -98,7 +98,10 @@ module AIA
       first_model = models.first
       model_name = first_model.respond_to?(:name) ? first_model.name : first_model.to_s
 
-      unless model_name.downcase.include?(client_model.downcase)
+      # client_model is the full resolved ID (e.g. "claude-sonnet-4-20250514"),
+      # model_name is the configured alias (e.g. "claude-sonnet-4").
+      # The alias is always a prefix/substring of the resolved ID, so check that way.
+      unless client_model.downcase.include?(model_name.downcase)
         AIA.client = AIA.client.class.new
       end
     end

data/lib/aia/config/cli_parser.rb

@@ -6,7 +6,9 @@
 # for the Config class.
 
 require 'optparse'
+require 'yaml'
 require_relative 'model_spec'
+require_relative '../skill_utils'
 
 module AIA
   module CLIParser
@@ -21,8 +23,8 @@ module AIA
           parser = create_option_parser(options)
           parser.parse!
         rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
-          STDERR.puts "ERROR: #{e.message}"
-          STDERR.puts "       use --help for usage report"
+          warn "ERROR: #{e.message}"
+          warn "       use --help for usage report"
           exit 1
         end
 
@@ -62,7 +64,7 @@ module AIA
 
         opts.on("-f", "--fuzzy", "Use fuzzy matching for prompt search") do
           unless system("which fzf > /dev/null 2>&1")
-            STDERR.puts "Error: 'fzf' is not installed. Please install 'fzf' to use the --fuzzy option."
+            warn "Error: 'fzf' is not installed. Please install 'fzf' to use the --fuzzy option."
             exit 1
           end
           options[:fuzzy] = true
@@ -166,6 +168,23 @@ module AIA
           warn "Warning: --regex is deprecated. PM v1.0.0 uses ERB parameters (<%= param %>)."
           options[:parameter_regex] = pattern
         end
+
+        opts.on("--skills-dir DIR", "Set directory containing skill subdirectories") do |dir|
+          options[:skills_dir] = dir
+        end
+
+        opts.on("--skills-prefix PREFIX", "Set subdirectory name for skill files (default: skills)") do |prefix|
+          options[:skills_prefix] = prefix
+        end
+
+        opts.on("-s", "--skill SKILL_IDS", "Prepend skill(s) to prompt (comma-separated IDs or paths)") do |ids|
+          options[:skills] ||= []
+          options[:skills] += ids.split(',').map(&:strip)
+        end
+
+        opts.on("--list-skills", "List available skills and exit") do
+          options[:list_skills] = true
+        end
       end
 
       def setup_ai_parameters(opts, options)
@@ -249,7 +268,7 @@ module AIA
         opts.on("--log-level LEVEL", "Set log level (debug|info|warn|error|fatal)") do |level|
           level = level.downcase
           unless %w[debug info warn error fatal].include?(level)
-            STDERR.puts "ERROR: Invalid log level '#{level}'. Must be one of: debug, info, warn, error, fatal"
+            warn "ERROR: Invalid log level '#{level}'. Must be one of: debug, info, warn, error, fatal"
             exit 1
           end
           options[:log_level_override] = level
@@ -410,6 +429,13 @@ module AIA
       end
 
       def validate_role_exists(role_id)
+        if AIA::SkillUtils.path_based_id?(role_id)
+          expanded = File.expand_path(role_id)
+          expanded += '.md' if File.extname(expanded).empty?
+          raise ArgumentError, "Role file not found: #{expanded}" unless File.exist?(expanded)
+          return
+        end
+
         prompts_dir = ENV.fetch('AIA_PROMPTS__DIR', File.join(ENV['HOME'], '.prompts'))
         roles_prefix = ENV.fetch('AIA_PROMPTS__ROLES_PREFIX', 'roles')
 
@@ -442,19 +468,30 @@ module AIA
         roles_prefix = ENV.fetch('AIA_PROMPTS__ROLES_PREFIX', 'roles')
         roles_dir = File.join(prompts_dir, roles_prefix)
 
-        if Dir.exist?(roles_dir)
-          roles = list_available_role_names(prompts_dir, roles_prefix)
-
-          if roles.empty?
-            puts "No role files found in #{roles_dir}"
-            puts "Create .md files in this directory to define roles."
-          else
-            puts "Available roles in #{roles_dir}:"
-            roles.each { |role| puts "  - #{role}" }
-          end
-        else
+        unless Dir.exist?(roles_dir)
           puts "No roles directory found at #{roles_dir}"
           puts "Create this directory and add role files to use roles."
+          return
+        end
+
+        roles = list_available_role_names(prompts_dir, roles_prefix)
+
+        if roles.empty?
+          puts "No role files found in #{roles_dir}"
+          puts "Create .md files in this directory to define roles."
+          return
+        end
+
+        roles.each do |role_id|
+          role_file = File.join(roles_dir, "#{role_id}.md")
+          fm = AIA::SkillUtils.parse_front_matter(role_file)
+
+          puts "## #{role_id}"
+          puts
+          puts "| Key | Value |"
+          puts "|-----|-------|"
+          fm.each { |key, value| puts "| #{key} | #{value} |" }
+          puts
         end
       end
 
@@ -464,6 +501,7 @@ module AIA
 
         Dir.glob("**/*.md", base: roles_dir)
           .map { |f| f.chomp('.md') }
+          .reject { |f| f.split('/').any? { |part| part.start_with?('_') } }
           .sort
       end
 
@@ -519,7 +557,7 @@ module AIA
         paths = []
 
         if path_list.empty?
-          STDERR.puts "No list of paths for --tools option"
+          warn "No list of paths for --tools option"
           exit 1
         end
 
@@ -529,7 +567,7 @@ module AIA
               if '.rb' == File.extname(a_path)
                 paths << a_path
               else
-                STDERR.puts "file should have *.rb extension: #{a_path}"
+                warn "file should have *.rb extension: #{a_path}"
                 exit 1
               end
             elsif File.directory?(a_path)
@@ -537,7 +575,7 @@ module AIA
               paths += rb_files
             end
           else
-            STDERR.puts "file/dir path is not valid: #{a_path}"
+            warn "file/dir path is not valid: #{a_path}"
             exit 1
           end
         end

data/lib/aia/config/defaults.yml

@@ -59,12 +59,26 @@ defaults:
   prompts:
     dir: ~/.prompts
     extname: .md
-    roles_prefix: roles
-    roles_dir: ~/.prompts/roles
+    #
     role: ~
+    roles_dir: ~/.prompts/roles
+    roles_prefix: roles
+    #
+    skills: []
+    skills_prefix: skills
+    #
+    tool: ~
+    tools_prefix: tools
+    #
     system_prompt: ~
     parameter_regex: ~
 
+  roles:
+    dir: ~/.prompts/roles
+
+  skills:
+    dir: ~/.prompts/skills
+
   # ---------------------------------------------------------------------------
   # Output Configuration
   # Access: AIA.config.output.file, AIA.config.output.append, etc.
@@ -112,6 +126,7 @@ defaults:
   # Env: AIA_TOOLS__PATHS, AIA_TOOLS__ALLOWED, etc.
   # ---------------------------------------------------------------------------
   tools:
+    dir: ~/.prompts/tools
     paths: []
     allowed: ~
     rejected: ~

data/lib/aia/config/validator.rb

@@ -2,6 +2,7 @@
 
 require 'word_wrapper'
 require_relative '../adapter/gem_activator'
+require_relative '../skill_utils'
 
 # lib/aia/config/validator.rb
 #
@@ -31,6 +32,7 @@ module AIA
         handle_dump_config(config)
         handle_mcp_list(config)
         handle_list_tools(config)
+        handle_list_skills(config)
         handle_completion_script(config)
         validate_required_prompt_id(config)
         process_role_configuration(config)
@@ -75,7 +77,7 @@ module AIA
 
         bad_files = remaining_args.reject { |filename| AIA.good_file?(filename) }
         if bad_files.any?
-          STDERR.puts "Error: The following files do not exist: #{bad_files.join(', ')}"
+          warn "Error: The following files do not exist: #{bad_files.join(', ')}"
           exit 1
         end
 
@@ -119,7 +121,7 @@ module AIA
       def validate_required_prompt_id(config)
         return unless config.prompt_id.nil? && !(config.flags.chat == true) && !(config.flags.fuzzy == true)
 
-        STDERR.puts "Error: A prompt ID is required unless using --chat, --fuzzy, or providing context files. Use -h or --help for help."
+        warn "Error: A prompt ID is required unless using --chat, --fuzzy, or providing context files. Use -h or --help for help."
         exit 1
       end
 
@@ -128,14 +130,18 @@ module AIA
         return if role.nil? || role.empty?
 
         roles_prefix = config.prompts.roles_prefix
-        unless roles_prefix.nil? || roles_prefix.empty?
-          unless role.start_with?(roles_prefix)
-            config.prompts.role = "#{roles_prefix}/#{role}"
-            role = config.prompts.role
-          end
+
+        unless AIA::SkillUtils.path_based_id?(role) || roles_prefix.nil? || roles_prefix.empty? || role.start_with?(roles_prefix)
+          config.prompts.role = "#{roles_prefix}/#{role}"
+          role = config.prompts.role
         end
 
-        config.prompts.roles_dir ||= File.join(config.prompts.dir, roles_prefix)
+        config.prompts.roles_dir ||= File.join(config.prompts.dir, roles_prefix.to_s)
+
+        # In chat-only mode (no prompt_id), leave the role configured so ChatLoop
+        # can inject it as initial context. Promoting it to prompt_id would cause
+        # PM to receive the role path as a literal string rather than file content.
+        return if config.flags&.chat == true
 
         if config.prompt_id.nil? || config.prompt_id.empty?
           unless role.nil? || role.empty?
@@ -230,6 +236,40 @@ module AIA
         exit 0
       end
 
+      def handle_list_skills(config)
+        return unless config.list_skills
+
+        skills_dir = AIA.config.skills.dir
+
+        unless Dir.exist?(skills_dir)
+          $stderr.puts "No skills directory found at #{skills_dir}"
+          exit 0
+        end
+
+        skill_dirs = Dir.glob("*/SKILL.md", base: skills_dir).map { |f| File.dirname(f) }.sort
+
+        if skill_dirs.empty?
+          $stderr.puts "No skills found in #{skills_dir}"
+          exit 0
+        end
+
+        skill_dirs.each do |skill_name|
+          skill_md = File.join(skills_dir, skill_name, 'SKILL.md')
+          fm = AIA::SkillUtils.parse_front_matter(skill_md)
+
+          puts "## #{skill_name}"
+          puts
+          puts "| Key | Value |"
+          puts "|-----|-------|"
+          fm.each do |key, value|
+            puts "| #{key} | #{value} |"
+          end
+          puts
+        end
+
+        exit 0
+      end
+
       def list_tools_terminal(local_tools, mcp_tool_groups)
         width  = (ENV['COLUMNS'] || 80).to_i - 4
         indent = '    '
@@ -449,7 +489,7 @@ module AIA
         if File.exist?(script_path)
           puts File.read(script_path)
         else
-          STDERR.puts "ERROR: The shell '#{shell}' is not supported or the completion script is missing."
+          warn "ERROR: The shell '#{shell}' is not supported or the completion script is missing."
         end
       end
 
@@ -457,7 +497,7 @@ module AIA
         chat_mode = config.flags.chat == true
         fuzzy_mode = config.flags.fuzzy == true
         if !chat_mode && !fuzzy_mode && (config.prompt_id.nil? || config.prompt_id.empty?) && (config.context_files.nil? || config.context_files.empty?)
-          STDERR.puts "Error: A prompt ID is required unless using --chat, --fuzzy, or providing context files. Use -h or --help for help."
+          warn "Error: A prompt ID is required unless using --chat, --fuzzy, or providing context files. Use -h or --help for help."
           exit 1
         end
       end
@@ -486,7 +526,7 @@ module AIA
 
           prompt_file_path = File.join(config.prompts.dir, "#{prompt_id}#{config.prompts.extname}")
           unless File.exist?(prompt_file_path)
-            STDERR.puts "Error: Prompt ID '#{prompt_id}' does not exist at #{prompt_file_path}"
+            warn "Error: Prompt ID '#{prompt_id}' does not exist at #{prompt_file_path}"
             and_exit = true
           end
         end
@@ -518,6 +558,7 @@ module AIA
         File.write(file, content)
         puts "Config successfully dumped to #{file}"
       end
+
     end
   end
 end

data/lib/aia/config.rb

@@ -48,7 +48,7 @@ module AIA
     # ==========================================================================
 
     # Nested section attributes (defined as hashes, converted to ConfigSection)
-    attr_config :service, :llm, :prompts, :output, :audio, :image, :embedding,
+    attr_config :service, :llm, :prompts, :roles, :skills, :output, :audio, :image, :embedding,
                 :tools, :flags, :registry, :paths, :logger
 
     # Array/collection attributes
@@ -56,7 +56,7 @@ module AIA
 
     # Runtime attributes (not loaded from config files)
     attr_accessor :prompt_id, :stdin_content, :remaining_args, :dump_file,
-                  :completion, :mcp_list, :list_tools,
+                  :completion, :mcp_list, :list_tools, :list_skills,
                   :executable_prompt_content,
                   :tool_names, :loaded_tools,
                   :log_level_override, :log_file_override,
@@ -105,6 +105,8 @@ module AIA
       service: config_section_coercion(:service),
       llm: config_section_coercion(:llm),
       prompts: config_section_coercion(:prompts),
+      roles: config_section_coercion(:roles),
+      skills: config_section_coercion(:skills),
       output: config_section_coercion(:output),
       audio: config_section_coercion(:audio),
       image: config_section_coercion(:image),
@@ -169,6 +171,9 @@ module AIA
       prompts_dir: [:prompts, :dir],
       roles_prefix: [:prompts, :roles_prefix],
       role: [:prompts, :role],
+      skills_dir: [:skills, :dir],
+      skills_prefix: [:prompts, :skills_prefix],
+      skills: [:prompts, :skills],
       parameter_regex: [:prompts, :parameter_regex],
       system_prompt: [:prompts, :system_prompt],
       # output section
@@ -235,6 +240,8 @@ module AIA
         llm: llm.to_h,
         models: models.map(&:to_h),
         prompts: prompts.to_h,
+        roles: roles.to_h,
+        skills: skills.to_h,
         output: output.to_h,
         audio: audio.to_h,
         image: image.to_h,
@@ -296,7 +303,7 @@ module AIA
           send("#{key}=", Array(value)) if respond_to?("#{key}=")
         when :mcp_servers
           self.mcp_servers = Array(value)
-        when :service, :llm, :prompts, :output, :audio, :image, :embedding,
+        when :service, :llm, :prompts, :roles, :skills, :output, :audio, :image, :embedding,
              :tools, :flags, :registry, :paths, :logger
           section = send(key)
           if section.is_a?(MywayConfig::ConfigSection) && value.is_a?(Hash)
@@ -388,6 +395,18 @@ module AIA
       if output.history_file
         output.history_file = File.expand_path(output.history_file)
       end
+
+      if roles.dir
+        roles.dir = File.expand_path(roles.dir)
+      end
+
+      if skills.dir
+        skills.dir = File.expand_path(skills.dir)
+      end
+
+      if tools.dir
+        tools.dir = File.expand_path(tools.dir)
+      end
     end
 
     def ensure_arrays
@@ -401,6 +420,9 @@ module AIA
 
       # Ensure tools.paths is an array
       tools.paths = [] if tools.paths.nil?
+
+      # Ensure prompts.skills is an array
+      prompts.skills = [] if prompts.respond_to?(:skills) && prompts.skills.nil?
     end
 
     # Process MCP JSON files and merge servers into mcp_servers
@@ -441,6 +463,10 @@ module AIA
         registry.send("#{key}=", value) if registry.respond_to?("#{key}=")
       when :paths
         paths.send("#{key}=", value) if paths.respond_to?("#{key}=")
+      when :roles
+        roles.send("#{key}=", value) if roles.respond_to?("#{key}=")
+      when :skills
+        skills.send("#{key}=", value) if skills.respond_to?("#{key}=")
       end
     end
   end