aia 1.0.0 → 1.1.0

data/lib/aia/directives/model_directives.rb

@@ -4,6 +4,8 @@ module AIA
   class ModelDirectives < Directive
     desc "List all available AI models"
     def available_models(args = nil, context_manager = nil)
+      positive_terms, negative_terms = parse_search_terms(Array(args))
+
       current_models = AIA.config.models
 
       model_names = current_models.map do |m|
@@ -13,9 +15,9 @@ module AIA
       using_local_provider = model_names.any? { |m| m.start_with?('ollama/', 'lms/') }
 
       if using_local_provider
-        show_local_models(model_names, args)
+        show_local_models(model_names, positive_terms, negative_terms)
       else
-        show_rubyllm_models(args)
+        show_rubyllm_models(positive_terms, negative_terms)
       end
 
       ""
@@ -80,7 +82,7 @@ module AIA
 
     # --- helpers (no desc → not registered) ---
 
-    def show_local_models(current_models, args)
+    def show_local_models(current_models, positive_terms, negative_terms)
       require 'net/http'
       require 'json'
 
@@ -91,15 +93,15 @@ module AIA
         if model_spec.start_with?('ollama/')
           api_base = ENV.fetch('OLLAMA_API_BASE', 'http://localhost:11434')
           api_base = api_base.gsub(%r{/v1/?$}, '')
-          show_ollama_models(api_base, args)
+          show_ollama_models(api_base, positive_terms, negative_terms)
         elsif model_spec.start_with?('lms/')
           api_base = ENV.fetch('LMS_API_BASE', 'http://localhost:1234')
-          show_lms_models(api_base, args)
+          show_lms_models(api_base, positive_terms, negative_terms)
         end
       end
     end
 
-    def show_ollama_models(api_base, args)
+    def show_ollama_models(api_base, positive_terms, negative_terms)
       begin
         uri = URI("#{api_base}/api/tags")
         response = Net::HTTP.get_response(uri)
@@ -127,8 +129,12 @@ module AIA
           modified = model['modified_at'] ? Time.parse(model['modified_at']).strftime('%Y-%m-%d') : 'unknown'
 
           entry = "- ollama/#{name} (size: #{size}, modified: #{modified})"
+          entry_down = entry.downcase
+
+          show_it = positive_terms.empty? || positive_terms.any? { |q| entry_down.include?(q) }
+          show_it &&= negative_terms.none? { |q| entry_down.include?(q) }
 
-          if args.nil? || args.empty? || args.any? { |q| entry.downcase.include?(q.downcase) }
+          if show_it
             puts entry
             counter += 1
           end
@@ -142,7 +148,7 @@ module AIA
       end
     end
 
-    def show_lms_models(api_base, args)
+    def show_lms_models(api_base, positive_terms, negative_terms)
       begin
         uri = URI("#{api_base.gsub(%r{/v1/?$}, '')}/v1/models")
         response = Net::HTTP.get_response(uri)
@@ -167,8 +173,12 @@ module AIA
         models.each do |model|
           name = model['id']
           entry = "- lms/#{name}"
+          entry_down = entry.downcase
+
+          show_it = positive_terms.empty? || positive_terms.any? { |q| entry_down.include?(q) }
+          show_it &&= negative_terms.none? { |q| entry_down.include?(q) }
 
-          if args.nil? || args.empty? || args.any? { |q| entry.downcase.include?(q.downcase) }
+          if show_it
             puts entry
             counter += 1
           end
@@ -192,22 +202,17 @@ module AIA
       "%.1f %s" % [bytes.to_f / (1024 ** exp), units[exp]]
     end
 
-    def show_rubyllm_models(args)
-      query = args
-
-      if query && 1 == query.size
-        query = query.first.split(',')
-      end
+    def show_rubyllm_models(positive_terms, negative_terms)
+      modality_terms = positive_terms.select { |q| q.include?('_to_') }
+      text_terms     = positive_terms.reject { |q| q.include?('_to_') }
 
       header = "\nAvailable LLMs"
-      header += " for #{query.join(' and ')}" if query
+      header += " for #{positive_terms.join(' and ')}" unless positive_terms.empty?
+      header += " excluding: #{negative_terms.join(', ')}" unless negative_terms.empty?
 
       puts header + ':'
       puts
 
-      q1 = query ? query.select { |q| q.include?('_to_') } : []
-      q2 = query ? query.reject { |q| q.include?('_to_') } : []
-
       counter = 0
 
       RubyLLM.models.all.each do |llm|
@@ -218,16 +223,12 @@ module AIA
         mode = "#{inputs} to #{outputs}"
         in_1m = llm.pricing.text_tokens.standard.to_h[:input_per_million]
         entry = "- #{llm.id} (#{llm.provider}) in: $#{in_1m} cw: #{cw} mode: #{mode} caps: #{caps}"
-
-        if query.nil? || query.empty?
-          counter += 1
-          puts entry
-          next
-        end
+        entry_down = entry.downcase
 
         show_it = true
-        q1.each { |q| show_it &&= llm.modalities.send("#{q}?") }
-        q2.each { |q| show_it &&= entry.include?(q) }
+        modality_terms.each { |q| show_it &&= llm.modalities.send("#{q}?") }
+        text_terms.each     { |q| show_it &&= entry_down.include?(q) }
+        negative_terms.each { |q| show_it &&= !entry_down.include?(q) }
 
         if show_it
           counter += 1

data/lib/aia/directives/web_and_file_directives.rb

@@ -2,11 +2,14 @@
 
 require 'faraday'
 require 'clipboard'
+require 'yaml'
+require 'io/console'
+require 'word_wrapper'
 
 module AIA
   class WebAndFileDirectives < Directive
+    include AIA::SkillUtils
     PUREMD_API_KEY = ENV.fetch('PUREMD_API_KEY', nil)
-    SKILLS_DIR     = File.expand_path('~/.claude/skills')
 
     desc "Fetch and include content from a webpage"
     def webpage(args, _context_manager = nil)
@@ -30,49 +33,93 @@ module AIA
     alias_method :website, :webpage
     alias_method :web,     :webpage
 
-    desc "List available Claude Code skills"
-    def skills(_args = [], _context_manager = nil)
-      unless Dir.exist?(SKILLS_DIR)
-        puts "No skills directory found at #{SKILLS_DIR}"
+    desc "List available AIA skills"
+    def skills(args = [], _context_manager = nil)
+      dir = aia_skills_dir
+
+      unless Dir.exist?(dir)
+        puts "No skills directory found at #{dir}"
         return nil
       end
 
-      entries = Dir.children(SKILLS_DIR)
-                   .select { |e| Dir.exist?(File.join(SKILLS_DIR, e)) }
-                   .sort
+      positive_terms, negative_terms = parse_search_terms(Array(args))
 
-      if entries.empty?
-        puts "No skills found in #{SKILLS_DIR}"
-      else
-        puts "\nAvailable Skills"
-        puts "================"
-        entries.each { |name| puts "  #{name}" }
-        puts "\nTotal: #{entries.size} skills"
+      skill_dirs = Dir.children(dir)
+                      .select { |e| Dir.exist?(File.join(dir, e)) }
+                      .sort
+
+      if skill_dirs.empty?
+        puts "No skills found in #{dir}"
+        return nil
+      end
+
+      skill_data = skill_dirs.filter_map do |name|
+        fm = parse_front_matter(File.join(dir, name, 'SKILL.md'))
+        text = "#{name} #{fm.values.join(' ').downcase}"
+        pos_ok = positive_terms.empty? || positive_terms.all? { |t| text.include?(t) }
+        neg_ok = negative_terms.none? { |t| text.include?(t) }
+        [name, fm] if pos_ok && neg_ok
+      end
+
+      if skill_data.empty?
+        puts "No skills matching your query"
+        return nil
       end
 
+      width = terminal_width
+      puts "\nAvailable Skills (#{dir}):"
+      puts "=" * [width, 60].min
+
+      skill_data.each do |name, fm|
+        display_name = fm['name'] || name
+        desc_text = fm['description'].to_s.strip
+        puts "\n  #{display_name}"
+        unless desc_text.empty?
+          puts WordWrapper::MinimumRaggedness.new(width - 4, desc_text).wrap
+            .split("\n").map { |l| "    #{l}" }.join("\n")
+        end
+      end
+
+      puts "\nTotal: #{skill_data.size} skill#{'s' if skill_data.size != 1}"
       nil
     end
 
-    desc "Include a Claude Code skill from ~/.claude/skills/"
+    desc "Include an AIA skill from the skills directory"
     def skill(args = [], _context_manager = nil)
       args = Array(args)
       skill_name = args.first&.strip
+
       if skill_name.nil? || skill_name.empty?
-        warn "Error: /skill requires a skill name"
+        warn "Error: /skill requires a skill name. Use /skills to list available skills."
         AIA::LoggerManager.aia_logger.error("/skill requires a skill name")
         return nil
       end
 
-      skill_dir = resolve_skill_dir(skill_name)
+      dir = aia_skills_dir
+
+      unless Dir.exist?(dir)
+        warn "Error: Skills directory not found at #{dir}"
+        AIA::LoggerManager.aia_logger.error("Skills directory not found at #{dir}")
+        return nil
+      end
+
+      skill_dir = find_skill_dir(skill_name, dir)
       unless skill_dir
-        warn "Error: No skill matching '#{skill_name}' found in #{SKILLS_DIR}"
-        AIA::LoggerManager.aia_logger.error("No skill matching '#{skill_name}' found in #{SKILLS_DIR}")
+        if path_based_id?(skill_name)
+          warn "Error: No skill directory found at '#{File.expand_path(skill_name)}'. Use /skills to list available skills."
+          AIA::LoggerManager.aia_logger.error("No skill directory found at '#{File.expand_path(skill_name)}'")
+        else
+          warn "Error: No skill matching '#{skill_name}' found in #{dir}. Use /skills to list available skills."
+          AIA::LoggerManager.aia_logger.error("No skill matching '#{skill_name}' found in #{dir}")
+        end
         return nil
       end
 
+      return File.read(skill_dir) if File.file?(skill_dir)
+
       skill_path = File.join(skill_dir, 'SKILL.md')
       unless File.exist?(skill_path)
-        warn "Error: Skill directory '#{File.basename(skill_dir)}' has no SKILL.md"
+        warn "Error: Skill directory '#{File.basename(skill_dir)}' has no SKILL.md. Use /skills to list available skills."
         AIA::LoggerManager.aia_logger.error("Skill directory '#{File.basename(skill_dir)}' has no SKILL.md")
         return nil
       end
@@ -91,28 +138,15 @@ module AIA
 
     private
 
-    def resolve_skill_dir(skill_name)
-      return nil unless Dir.exist?(SKILLS_DIR)
-
-      exact = File.join(SKILLS_DIR, skill_name)
-      return safe_skill_path(exact)  if Dir.exist?(exact)
-
-      Dir.children(SKILLS_DIR)
-         .sort
-         .each do |entry|
-        next unless entry.start_with?(skill_name)
-        candidate = File.join(SKILLS_DIR, entry)
-        return safe_skill_path(candidate) if Dir.exist?(candidate)
-      end
-
-      nil
+    def aia_skills_dir
+      AIA.config.skills.dir
     end
 
-    def safe_skill_path(path)
-      resolved = File.realpath(path)
-      resolved.start_with?(File.realpath(SKILLS_DIR)) ? resolved : nil
-    rescue Errno::ENOENT
-      nil
+    def terminal_width
+      IO.console&.winsize&.last || 80
+    rescue StandardError
+      80
     end
+
   end
 end

data/lib/aia/prompt_handler.rb

@@ -6,6 +6,14 @@ require 'erb'
 
 module AIA
   class PromptHandler
+    include AIA::SkillUtils
+
+    # Struct for path-based role content (bypasses PM parsing)
+    RoleContent = Struct.new(:content) do
+      def to_s; content; end
+      def metadata; nil; end
+    end
+
     # Root-level YAML keys that are shorthands for deeper config paths
     SHORTHAND_KEYS = %w[model temperature top_p next pipeline shell erb].freeze
 
@@ -58,6 +66,7 @@ module AIA
 
     def fetch_role(role_id)
       return handle_missing_role("roles/") if role_id.nil?
+      return fetch_role_from_path(role_id) if path_based_id?(role_id)
 
       unless role_id.start_with?(AIA.config.prompts.roles_prefix)
         role_id = "#{AIA.config.prompts.roles_prefix}/#{role_id}"
@@ -66,7 +75,9 @@ module AIA
       role_file_path = File.join(@prompts_dir, "#{role_id}#{AIA.config.prompts.extname}")
 
       parsed = if File.exist?(role_file_path)
-                 PM.parse(role_id)
+                 # PM.parse(role_id) cannot resolve subdirectory IDs like "roles/jersey_mike"
+                 # and returns the ID string as content.  Parse from raw file content instead.
+                 PM.parse_string(File.read(role_file_path))
                else
                  warn "Warning: Invalid role ID or file not found: #{role_id}"
                  logger.warn("Invalid role ID or file not found: #{role_id}")
@@ -296,6 +307,20 @@ module AIA
     end
 
 
+    def fetch_role_from_path(role_id)
+      expanded = File.expand_path(role_id)
+      expanded += '.md' if File.extname(expanded).empty?
+
+      unless File.exist?(expanded)
+        $stderr.puts "Warning: Role file not found at path: #{expanded}"
+        logger.warn("Role file not found at path: #{expanded}")
+        return handle_missing_role(role_id)
+      end
+
+      RoleContent.new(File.read(expanded))
+    end
+
+
     def fuzzy_search_prompt(prompt_id)
       new_prompt_id = search_prompt_id_with_fzf(prompt_id)
 

data/lib/aia/prompt_pipeline.rb

@@ -5,6 +5,8 @@ require "pm"
 
 module AIA
   class PromptPipeline
+    include AIA::SkillUtils
+
     def initialize(prompt_handler, chat_processor, ui_presenter, input_collector)
       @prompt_handler  = prompt_handler
       @chat_processor  = chat_processor
@@ -69,9 +71,11 @@ module AIA
       # Collect parameter values from user
       values = @input_collector.collect(all_params)
 
-      # Render role and prompt
+      # Render role, skills, and prompt.
+      # Order: role (personality) → skills (task instructions) → prompt (user request)
       parts = []
       parts << role_parsed.to_s(values) if role_parsed
+      load_skills(AIA.config.prompts.skills).each { |body| parts << body }
       parts << prompt_parsed.to_s(values)
 
       if @include_context_flag
@@ -91,6 +95,46 @@ module AIA
       prompt_text
     end
 
+    # Load skill bodies for the given skill IDs in order.
+    # Each skill lives at skills_dir/<name>/SKILL.md; supports prefix matching.
+    # Path-based IDs (starting with /, ~/, ./, ../) are resolved as direct paths.
+    # Returns only the body content (front matter stripped).
+    def load_skills(skill_ids)
+      return [] if skill_ids.nil? || skill_ids.empty?
+
+      skills_dir = AIA.config.skills.dir
+
+      Array(skill_ids).filter_map do |skill_name|
+        skill_name = skill_name.to_s.strip
+        next if skill_name.empty?
+
+        unless path_based_id?(skill_name) || Dir.exist?(skills_dir)
+          warn "Warning: No skill matching '#{skill_name}' found in #{skills_dir}"
+          next
+        end
+
+        skill_dir = find_skill_dir(skill_name, skills_dir)
+        unless skill_dir
+          if path_based_id?(skill_name)
+            warn "Warning: No skill directory found at '#{File.expand_path(skill_name)}'"
+          else
+            warn "Warning: No skill matching '#{skill_name}' found in #{skills_dir}"
+          end
+          next
+        end
+
+        next skill_body(File.read(skill_dir)) if File.file?(skill_dir)
+
+        skill_path = File.join(skill_dir, 'SKILL.md')
+        unless File.exist?(skill_path)
+          warn "Warning: Skill '#{skill_name}' has no SKILL.md in #{skill_dir}"
+          next
+        end
+
+        skill_body(File.read(skill_path))
+      end
+    end
+
     # Add context files to prompt text
     def add_context_files(prompt_text)
       return prompt_text unless AIA.config.context_files && !AIA.config.context_files.empty?

data/lib/aia/skill_utils.rb

@@ -0,0 +1,61 @@
+# lib/aia/skill_utils.rb
+
+require 'yaml'
+
+module AIA
+  module SkillUtils
+    extend self
+
+    def path_based_id?(id)
+      id.to_s.start_with?('/', './', '../', '~/')
+    end
+
+    def parse_front_matter(path)
+      return {} unless File.exist?(path)
+      content = File.read(path)
+      return {} unless content.start_with?('---')
+      end_marker = content.index("\n---", 3)
+      return {} unless end_marker
+      yaml_text = content[3...end_marker]
+      YAML.safe_load(yaml_text) || {}
+    rescue StandardError
+      {}
+    end
+
+    def find_skill_dir(skill_name, base_dir)
+      if path_based_id?(skill_name)
+        expanded = File.expand_path(skill_name)
+        return expanded if Dir.exist?(expanded)
+        return expanded if File.file?(expanded)
+        return nil
+      end
+
+      exact = File.join(base_dir, skill_name)
+      return safe_skill_path(exact, base_dir) if Dir.exist?(exact)
+
+      Dir.children(base_dir).sort.each do |entry|
+        next unless entry.start_with?(skill_name)
+        candidate = File.join(base_dir, entry)
+        return safe_skill_path(candidate, base_dir) if Dir.exist?(candidate)
+      end
+
+      nil
+    rescue Errno::ENOENT
+      nil
+    end
+
+    def skill_body(content)
+      return content unless content.start_with?('---')
+      end_marker = content.index("\n---", 3)
+      return content unless end_marker
+      content[(end_marker + 4)..].lstrip
+    end
+
+    def safe_skill_path(path, dir)
+      resolved = File.realpath(path)
+      resolved.start_with?(File.realpath(dir) + File::SEPARATOR) ? resolved : nil
+    rescue Errno::ENOENT
+      nil
+    end
+  end
+end

data/lib/aia.rb

@@ -25,6 +25,7 @@ require_relative 'refinements/string' # adds #include_any? #include_all?
 
 require_relative 'aia/errors'
 require_relative 'aia/utility'
+require_relative 'aia/skill_utils'
 require_relative 'aia/version'
 require_relative 'aia/config'
 require_relative 'aia/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aia
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dewayne VanHoozer
@@ -517,6 +517,7 @@ files:
 - lib/aia/prompt_pipeline.rb
 - lib/aia/ruby_llm_adapter.rb
 - lib/aia/session.rb
+- lib/aia/skill_utils.rb
 - lib/aia/ui_presenter.rb
 - lib/aia/utility.rb
 - lib/aia/version.rb
@@ -546,7 +547,7 @@ metadata:
 post_install_message: |2+
 
   ╔══════════════════════════════════════════════════════════════╗
-  ║               AIA — AI Assistant v1.0                       ║
+  ║               AIA — AI Assistant v1.0                        ║
   ╚══════════════════════════════════════════════════════════════╝
 
   Get started:  aia --help
@@ -566,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Multi-model AI CLI with dynamic prompts, consensus responses, shell & Ruby
   integration, and seamless chat workflows.