aia 0.9.18 → 0.9.20

data/lib/aia/session.rb

@@ -45,7 +45,28 @@ module AIA
     end
 
     def initialize_components
-      @context_manager = ContextManager.new(system_prompt: AIA.config.system_prompt)
+      # For multi-model: create separate context manager per model (ADR-002 revised + ADR-005)
+      # For single-model: maintain backward compatibility with single context manager
+      if AIA.config.model.is_a?(Array) && AIA.config.model.size > 1
+        @context_managers = {}
+        AIA.config.model.each do |model_spec|
+          # Handle both old string format and new hash format (ADR-005)
+          internal_id = if model_spec.is_a?(Hash)
+                          model_spec[:internal_id]
+                        else
+                          model_spec
+                        end
+
+          @context_managers[internal_id] = ContextManager.new(
+            system_prompt: AIA.config.system_prompt
+          )
+        end
+        @context_manager = nil # Signal we're using per-model managers
+      else
+        @context_manager = ContextManager.new(system_prompt: AIA.config.system_prompt)
+        @context_managers = nil
+      end
+
       @ui_presenter = UIPresenter.new
       @directive_processor = DirectiveProcessor.new
       @chat_processor = ChatProcessorService.new(@ui_presenter, @directive_processor)
@@ -368,11 +389,29 @@ module AIA
         @chat_prompt.text = follow_up_prompt
         processed_prompt = @chat_prompt.to_s
 
-        @context_manager.add_to_context(role: "user", content: processed_prompt)
-        conversation = @context_manager.get_context
+        # Handle per-model contexts (ADR-002 revised)
+        if @context_managers
+          # Multi-model: add user prompt to each model's context
+          @context_managers.each_value do |ctx_mgr|
+            ctx_mgr.add_to_context(role: "user", content: processed_prompt)
+          end
+
+          # Get per-model conversations
+          conversations = {}
+          @context_managers.each do |model_name, ctx_mgr|
+            conversations[model_name] = ctx_mgr.get_context
+          end
 
-        @ui_presenter.display_thinking_animation
-        response_data = @chat_processor.process_prompt(conversation)
+          @ui_presenter.display_thinking_animation
+          response_data = @chat_processor.process_prompt(conversations)
+        else
+          # Single-model: use original logic
+          @context_manager.add_to_context(role: "user", content: processed_prompt)
+          conversation = @context_manager.get_context
+
+          @ui_presenter.display_thinking_animation
+          response_data = @chat_processor.process_prompt(conversation)
+        end
 
         # Handle new response format with metrics
         if response_data.is_a?(Hash)
@@ -386,7 +425,7 @@ module AIA
         end
 
         @ui_presenter.display_ai_response(content)
-        
+
         # Display metrics if enabled and available (chat mode only)
         if AIA.config.show_metrics
           if multi_metrics
@@ -397,8 +436,22 @@ module AIA
             @ui_presenter.display_token_metrics(metrics)
           end
         end
-        
-        @context_manager.add_to_context(role: "assistant", content: content)
+
+        # Add responses to context (ADR-002 revised)
+        if @context_managers
+          # Multi-model: parse combined response and add each model's response to its own context
+          parsed_responses = parse_multi_model_response(content)
+          parsed_responses.each do |model_name, model_response|
+            @context_managers[model_name]&.add_to_context(
+              role: "assistant",
+              content: model_response
+            )
+          end
+        else
+          # Single-model: add response to single context
+          @context_manager.add_to_context(role: "assistant", content: content)
+        end
+
         @chat_processor.speak(content)
 
         @ui_presenter.display_separator
@@ -406,7 +459,10 @@ module AIA
     end
 
     def process_chat_directive(follow_up_prompt)
-      directive_output = @directive_processor.process(follow_up_prompt, @context_manager)
+      # For multi-model, use first context manager for directives (ADR-002 revised)
+      # TODO: Consider if directives should affect all contexts or just one
+      context_for_directive = @context_managers ? @context_managers.values.first : @context_manager
+      directive_output = @directive_processor.process(follow_up_prompt, context_for_directive)
 
       return handle_clear_directive if follow_up_prompt.strip.start_with?("//clear")
       return handle_checkpoint_directive(directive_output) if follow_up_prompt.strip.start_with?("//checkpoint")
@@ -417,13 +473,16 @@ module AIA
     end
 
     def handle_clear_directive
-      # The directive processor has called context_manager.clear_context
-      # but we need to also clear the LLM client's context
-
-      # First, clear the context manager's context
-      @context_manager.clear_context(keep_system_prompt: true)
+      # Clear context manager(s) - ADR-002 revised
+      if @context_managers
+        # Multi-model: clear all context managers
+        @context_managers.each_value { |ctx_mgr| ctx_mgr.clear_context(keep_system_prompt: true) }
+      else
+        # Single-model: clear single context manager
+        @context_manager.clear_context(keep_system_prompt: true)
+      end
 
-      # Second, try clearing the client's context
+      # Try clearing the client's context
       if AIA.config.client && AIA.config.client.respond_to?(:clear_context)
         begin
           AIA.config.client.clear_context
@@ -446,10 +505,9 @@ module AIA
     end
 
     def handle_restore_directive(directive_output)
-      # If the restore was successful, we also need to refresh the client's context
+      # If the restore was successful, we also need to refresh the client's context - ADR-002 revised
       if directive_output.start_with?("Context restored")
         # Clear the client's context without reinitializing the entire adapter
-        # This avoids the risk of exiting if model initialization fails
         if AIA.config.client && AIA.config.client.respond_to?(:clear_context)
           begin
             AIA.config.client.clear_context
@@ -459,17 +517,9 @@ module AIA
           end
         end
 
-        # Rebuild the conversation in the LLM client from the restored context
-        # This ensures the LLM's internal state matches what we restored
-        if AIA.config.client && @context_manager
-          begin
-            restored_context = @context_manager.get_context
-            # The client's context has been cleared, so we can safely continue
-            # The next interaction will use the restored context from context_manager
-          rescue => e
-            STDERR.puts "Warning: Error syncing restored context: #{e.message}"
-          end
-        end
+        # Note: For multi-model, only the first context manager was used for restore
+        # This is a limitation of the current directive system
+        # TODO: Consider supporting restore for all context managers
       end
 
       @ui_presenter.display_info(directive_output)
@@ -485,6 +535,48 @@ module AIA
       "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)
+    # Input:  "from: lms/model #2 (role)\nHabari!\n\nfrom: ollama/model\nKaixo!"
+    # Output: {"lms/model#2" => "Habari!", "ollama/model" => "Kaixo!"}
+    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+(.+)$/
+          # Save previous model's response
+          if current_model
+            responses[current_model] = current_content.join.strip
+          end
+
+          # Extract internal_id from display name (ADR-005)
+          # Display format: "model_name #N (role)" or "model_name (role)" or "model_name #N" or "model_name"
+          display_name = $1.strip
+
+          # Remove role part: " (role_name)"
+          internal_id = display_name.sub(/\s+\([^)]+\)\s*$/, '')
+
+          # Remove space before instance number: "model #2" -> "model#2"
+          internal_id = internal_id.sub(/\s+#/, '#')
+
+          current_model = internal_id
+          current_content = []
+        elsif current_model
+          current_content << line
+        end
+      end
+
+      # Save last model's response
+      if current_model
+        responses[current_model] = current_content.join.strip
+      end
+
+      responses
+    end
+
     def cleanup_chat_prompt
       if @chat_prompt_id
         puts "[DEBUG] Cleaning up chat prompt: #{@chat_prompt_id}" if AIA.debug?

data/lib/aia/utility.rb

@@ -28,11 +28,29 @@ 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(', ')
+            else
+              models.join(', ')
+            end
+          else
+            models.to_s
+          end
+        else
+          'unknown-model'
+        end
+
         puts <<-ROBOT
 
        ,      ,
        (\\____/) AI Assistant (v#{AIA::VERSION}) is Online
-        (_oo_)   #{AIA.config&.model || 'unknown-model'}#{supports_tools? ? ' (supports tools)' : ''}
+        (_oo_)   #{model_display}#{supports_tools? ? ' (supports tools)' : ''}
          (O)       using #{AIA.config&.adapter || 'unknown-adapter'} (v#{RubyLLM::VERSION}#{mcp_version})
        __||__    \\) model db was last refreshed on
      [/______\\]  /    #{AIA.config&.last_refresh || 'unknown'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aia
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.20
 platform: ruby
 authors:
 - Dewayne VanHoozer