n2b 0.3.1 → 0.5.0

data/lib/n2b/cli.rb

@@ -1,4 +1,6 @@
-module N2B 
+require_relative 'jira_client' # For N2B::JiraClient
+
+module N2B
   class CLI < Base
     def self.run(args)
       new(args).execute
@@ -10,7 +12,8 @@ module N2B
     end
 
     def execute
-      config = get_config(reconfigure: @options[:config])
+      # Pass advanced_config flag to get_config
+      config = get_config(reconfigure: @options[:config], advanced_flow: @options[:advanced_config])
       user_input = @args.join(' ') # All remaining args form user input/prompt addition
 
       if @options[:diff]
@@ -37,17 +40,113 @@ module N2B
       requirements_filepath = @options[:requirements]
       user_prompt_addition = @args.join(' ') # All remaining args are user prompt addition
 
-      requirements_content = nil
-      if requirements_filepath
-        unless File.exist?(requirements_filepath)
+      # Jira Ticket Information
+      jira_ticket = @options[:jira_ticket]
+      jira_update_flag = @options[:jira_update] # true, false, or nil
+
+      requirements_content = nil # Initialize requirements_content
+
+      if jira_ticket
+        puts "Jira ticket specified: #{jira_ticket}"
+        if config['jira'] && config['jira']['domain'] && config['jira']['email'] && config['jira']['api_key']
+          begin
+            jira_client = N2B::JiraClient.new(config) # Pass the whole config
+            puts "Fetching Jira ticket details..."
+            # If a requirements file is also provided, the Jira ticket will take precedence.
+            # Or, we could append/prepend. For now, Jira overwrites.
+            requirements_content = jira_client.fetch_ticket(jira_ticket)
+            puts "Successfully fetched Jira ticket details."
+            # The fetched content is now in requirements_content and will be passed to analyze_diff
+          rescue N2B::JiraClient::JiraApiError => e
+            puts "Error fetching Jira ticket: #{e.message}"
+            puts "Proceeding with diff analysis without Jira ticket details."
+          rescue ArgumentError => e # Catches missing Jira config in JiraClient.new
+            puts "Jira configuration error: #{e.message}"
+            puts "Please ensure Jira is configured correctly using 'n2b -c'."
+            puts "Proceeding with diff analysis without Jira ticket details."
+          rescue StandardError => e
+            puts "An unexpected error occurred while fetching Jira ticket: #{e.message}"
+            puts "Proceeding with diff analysis without Jira ticket details."
+          end
+        else
+          puts "Jira configuration is missing or incomplete in N2B settings."
+          puts "Please configure Jira using 'n2b -c' to fetch ticket details."
+          puts "Proceeding with diff analysis without Jira ticket details."
+        end
+        # Handling of jira_update_flag can be done elsewhere, e.g., after analysis
+        if jira_update_flag == true
+          puts "Note: Jira ticket update (--jira-update) is flagged."
+          # Actual update logic will be separate
+        elsif jira_update_flag == false
+          puts "Note: Jira ticket will not be updated (--jira-no-update)."
+        end
+      end
+
+      # Load requirements from file if no Jira ticket was fetched or if specifically desired even with Jira.
+      # Current logic: Jira fetch, if successful, populates requirements_content.
+      # If Jira not specified, or fetch failed, try to load from file.
+      if requirements_content.nil? && requirements_filepath
+        if File.exist?(requirements_filepath)
+          puts "Loading requirements from file: #{requirements_filepath}"
+          requirements_content = File.read(requirements_filepath)
+        else
           puts "Error: Requirements file not found: #{requirements_filepath}"
-          exit 1
+          # Decide if to exit or proceed. For now, proceed.
+          puts "Proceeding with diff analysis without file-based requirements."
         end
-        requirements_content = File.read(requirements_filepath)
+      elsif requirements_content && requirements_filepath
+        puts "Note: Both Jira ticket and requirements file were provided. Using Jira ticket content for analysis."
       end
 
       diff_output = execute_vcs_diff(vcs_type, @options[:branch])
-      analyze_diff(diff_output, config, user_prompt_addition, requirements_content)
+      analysis_result = analyze_diff(diff_output, config, user_prompt_addition, requirements_content) # Store the result
+
+      # --- Jira Update Logic ---
+      if jira_ticket && analysis_result && !analysis_result.empty?
+        # Check if Jira config is valid for updating
+        if config['jira'] && config['jira']['domain'] && config['jira']['email'] && config['jira']['api_key']
+          jira_comment_data = format_analysis_for_jira(analysis_result)
+          proceed_with_update = false
+
+          if jira_update_flag == true # --jira-update used
+            proceed_with_update = true
+          elsif jira_update_flag.nil? # Neither --jira-update nor --jira-no-update used
+            puts "\nWould you like to update Jira ticket #{jira_ticket} with this analysis? (y/n)"
+            user_choice = $stdin.gets.chomp.downcase
+            proceed_with_update = user_choice == 'y'
+          end # If jira_update_flag is false, proceed_with_update remains false
+
+          if proceed_with_update
+            begin
+              # Re-instantiate JiraClient or use an existing one if available and in scope
+              # For safety and simplicity here, re-instantiate with current config.
+              update_jira_client = N2B::JiraClient.new(config)
+              puts "Updating Jira ticket #{jira_ticket}..."
+              if update_jira_client.update_ticket(jira_ticket, jira_comment_data)
+                puts "Jira ticket #{jira_ticket} updated successfully."
+              else
+                # update_ticket currently returns true/false, but might raise error for http issues
+                puts "Failed to update Jira ticket #{jira_ticket}. The client did not report an error, but the update may not have completed."
+              end
+            rescue N2B::JiraClient::JiraApiError => e
+              puts "Error updating Jira ticket: #{e.message}"
+            rescue ArgumentError => e # From JiraClient.new if config is suddenly invalid
+              puts "Jira configuration error before update: #{e.message}"
+            rescue StandardError => e
+              puts "An unexpected error occurred while updating Jira ticket: #{e.message}"
+            end
+          else
+            puts "Jira ticket update skipped."
+          end
+        else
+          puts "Jira configuration is missing or incomplete. Cannot proceed with Jira update."
+        end
+      elsif jira_ticket && (analysis_result.nil? || analysis_result.empty?)
+        puts "Skipping Jira update as analysis result was empty or not generated."
+      end
+      # --- End of Jira Update Logic ---
+
+      analysis_result # Return analysis_result from handle_diff_analysis
     end
 
     def get_vcs_type
@@ -172,11 +271,11 @@ module N2B
 
     def validate_git_branch_exists(branch)
       # Check if branch exists locally
-      result = `git rev-parse --verify #{branch} 2>/dev/null`
+      _result = `git rev-parse --verify #{branch} 2>/dev/null`
       return true if $?.success?
 
       # Check if branch exists on remote
-      result = `git rev-parse --verify origin/#{branch} 2>/dev/null`
+      _result = `git rev-parse --verify origin/#{branch} 2>/dev/null`
       return true if $?.success?
 
       false
@@ -284,20 +383,29 @@ REQUIREMENTS_BLOCK
       end
 
       json_instruction = <<-JSON_INSTRUCTION.strip
-CRITICAL: Return ONLY a valid JSON object with the keys "summary", "errors" (as a list of strings), "improvements" (as a list of strings), "test_coverage" (as a string), and "requirements_evaluation" (as a string, only if requirements were provided).
+CRITICAL: Return ONLY a valid JSON object.
 Do not include any explanatory text before or after the JSON.
 Each error and improvement should include specific file paths and line numbers.
 
+The JSON object must contain the following keys:
+- "summary": (string) Brief overall description of the changes.
+- "ticket_implementation_summary": (string) A concise summary of what was implemented or achieved in relation to the ticket's goals, based *only* on the provided diff. This is for developer status updates and Jira comments.
+- "errors": (list of strings) Potential bugs or issues found.
+- "improvements": (list of strings) Suggestions for code quality, style, performance, or security.
+- "test_coverage": (string) Assessment of test coverage for the changes.
+- "requirements_evaluation": (string, include only if requirements were provided in the prompt) Evaluation of how the changes meet the provided requirements.
+
 Example format:
 {
-  "summary": "Brief description of the changes",
+  "summary": "Refactored the user authentication module and added password complexity checks.",
+  "ticket_implementation_summary": "Implemented the core logic for user password updates and strengthened security by adding complexity validation as per the ticket's primary goal. Some UI elements are pending.",
   "errors": [
-    "lib/example.rb line 42: Potential null pointer exception when accessing user.name without checking if user is nil",
-    "src/main.js lines 15-20: Missing error handling for async operation"
+    "lib/example.rb line 42: Potential null pointer exception when accessing user.name without checking if user is nil.",
+    "src/main.js lines 15-20: Missing error handling for async operation."
   ],
   "improvements": [
-    "lib/example.rb line 30: Consider using a constant for the magic number 42",
-    "src/utils.py lines 5-10: This method could be simplified using list comprehension"
+    "lib/example.rb line 30: Consider using a constant for the magic number 42.",
+    "src/utils.py lines 5-10: This method could be simplified using list comprehension."
   ],
   "test_coverage": "Good: New functionality in lib/example.rb has corresponding tests in test/example_test.rb. Missing: No tests for error handling edge cases in the new validation method.",
   "requirements_evaluation": "✅ IMPLEMENTED: User authentication feature is fully implemented in auth.rb. ⚠️ PARTIALLY IMPLEMENTED: Error handling is present but lacks specific error codes. ❌ NOT IMPLEMENTED: Email notifications are not addressed in this diff."
@@ -352,13 +460,46 @@ JSON_INSTRUCTION
           puts "\nRequirements Evaluation:"
           puts requirements_eval
         end
+
+        puts "\nTicket Implementation Summary:"
+        impl_summary = analysis_result['ticket_implementation_summary']
+        puts impl_summary && !impl_summary.to_s.strip.empty? ? impl_summary : "No implementation summary provided."
+
         puts "-------------------"
+        return analysis_result # Return the parsed hash
       rescue JSON::ParserError => e # Handles cases where the JSON string (even fallback) is malformed
         puts "Critical Error: Failed to parse JSON response for diff analysis: #{e.message}"
         puts "Raw response was: #{analysis_json_str}"
+        return {} # Return empty hash on parsing error
       end
     end
 
+    private # Make sure new helper is private
+
+    def format_analysis_for_jira(analysis_result)
+      return "No analysis result available." if analysis_result.nil? || analysis_result.empty?
+
+      # Return structured data for ADF formatting
+      {
+        implementation_summary: analysis_result['ticket_implementation_summary']&.strip,
+        technical_summary: analysis_result['summary']&.strip,
+        issues: format_issues_for_adf(analysis_result['errors']),
+        improvements: format_improvements_for_adf(analysis_result['improvements']),
+        test_coverage: analysis_result['test_coverage']&.strip,
+        requirements_evaluation: analysis_result['requirements_evaluation']&.strip
+      }
+    end
+
+    def format_issues_for_adf(errors)
+      return [] unless errors.is_a?(Array) && errors.any?
+      errors.map(&:strip).reject(&:empty?)
+    end
+
+    def format_improvements_for_adf(improvements)
+      return [] unless improvements.is_a?(Array) && improvements.any?
+      improvements.map(&:strip).reject(&:empty?)
+    end
+
     def extract_json_from_response(response)
       # First try to parse the response as-is
       begin
@@ -413,7 +554,7 @@ JSON_INSTRUCTION
           # Parse hunk header (e.g., "@@ -10,7 +10,8 @@")
           match = line.match(/@@ -(\d+),?\d* \+(\d+),?\d* @@/)
           if match
-            old_start = match[1].to_i
+            _old_start = match[1].to_i
             new_start = match[2].to_i
 
             # Use the new file line numbers for context
@@ -457,6 +598,10 @@ JSON_INSTRUCTION
                 N2M::Llm::Claude.new(config)
               when 'gemini'
                 N2M::Llm::Gemini.new(config)
+              when 'openrouter'
+                N2M::Llm::OpenRouter.new(config)
+              when 'ollama'
+                N2M::Llm::Ollama.new(config)
               else
                 # Should not happen if config is validated, but as a safeguard:
                 raise N2B::Error, "Unsupported LLM service: #{llm_service_name}"
@@ -466,6 +611,13 @@ JSON_INSTRUCTION
         response_json_str
       rescue N2B::LlmApiError => e # This catches errors from analyze_code_diff
         puts "Error communicating with the LLM: #{e.message}"
+
+        # Check if it might be a model-related error
+        if e.message.include?('model') || e.message.include?('Model') || e.message.include?('invalid') || e.message.include?('not found')
+          puts "\nThis might be due to an invalid or unsupported model configuration."
+          puts "Run 'n2b -c' to reconfigure your model settings."
+        end
+
         return '{"summary": "Error: Could not analyze diff due to LLM API error.", "errors": [], "improvements": []}'
       end
     end
@@ -485,7 +637,23 @@ JSON_INSTRUCTION
     
     def call_llm(prompt, config)
       begin # Added begin for LlmApiError rescue
-        llm = config['llm'] == 'openai' ?   N2M::Llm::OpenAi.new(config) : N2M::Llm::Claude.new(config)
+        llm_service_name = config['llm']
+        llm = case llm_service_name
+              when 'openai'
+                N2M::Llm::OpenAi.new(config)
+              when 'claude'
+                N2M::Llm::Claude.new(config)
+              when 'gemini'
+                N2M::Llm::Gemini.new(config)
+              when 'openrouter'
+                N2M::Llm::OpenRouter.new(config)
+              when 'ollama'
+                N2M::Llm::Ollama.new(config)
+              else
+                # Fallback or error, though config validation should prevent this
+                puts "Warning: Unsupported LLM service '#{llm_service_name}' configured. Falling back to Claude."
+                N2M::Llm::Claude.new(config)
+              end
 
         # This content is specific to bash command generation
       content = <<-EOF
@@ -508,24 +676,26 @@ JSON_INSTRUCTION
       # which implies it expects a Hash. Let's ensure call_llm returns a Hash.
       # This internal JSON parsing is for the *content* of a successful LLM response.
       # The LlmApiError for network/auth issues should be caught before this.
-      begin
-        # Check if response_json_str is already a Hash (parsed JSON)
-        if response_json_str.is_a?(Hash)
-          response_json_str
-        else
+        begin
           parsed_response = JSON.parse(response_json_str)
           parsed_response
+        rescue JSON::ParserError => e
+          puts "Error parsing LLM response JSON for command generation: #{e.message}"
+          # This is a fallback for when the LLM response *content* is not valid JSON.
+          { "commands" => ["echo 'Error: LLM returned invalid JSON content.'"], "explanation" => "The response from the language model was not valid JSON." }
         end
-      rescue JSON::ParserError => e
-        puts "Error parsing LLM response JSON for command generation: #{e.message}"
-        # This is a fallback for when the LLM response *content* is not valid JSON.
-        { "commands" => ["echo 'Error: LLM returned invalid JSON content.'"], "explanation" => "The response from the language model was not valid JSON." }
-      end
-    rescue N2B::LlmApiError => e
-      puts "Error communicating with the LLM: #{e.message}"
-      # This is the fallback for LlmApiError (network, auth, etc.)
-      { "commands" => ["echo 'LLM API error occurred. Please check your configuration and network.'"], "explanation" => "Failed to connect to the LLM." }
-    end
+      rescue N2B::LlmApiError => e
+        puts "Error communicating with the LLM: #{e.message}"
+
+        # Check if it might be a model-related error
+        if e.message.include?('model') || e.message.include?('Model') || e.message.include?('invalid') || e.message.include?('not found')
+          puts "\nThis might be due to an invalid or unsupported model configuration."
+          puts "Run 'n2b -c' to reconfigure your model settings."
+        end
+
+        # This is the fallback for LlmApiError (network, auth, etc.)
+        { "commands" => ["echo 'LLM API error occurred. Please check your configuration and network.'"], "explanation" => "Failed to connect to the LLM." }
+      end
     end
     
     def get_user_shell
@@ -617,7 +787,16 @@ JSON_INSTRUCTION
     
 
     def parse_options
-      options = { execute: false, config: nil, diff: false, requirements: nil, branch: nil }
+      options = {
+        execute: false,
+        config: nil,
+        diff: false,
+        requirements: nil,
+        branch: nil,
+        jira_ticket: nil,
+        jira_update: nil, # Using nil as default, true for --jira-update, false for --jira-no-update
+        advanced_config: false # New option for advanced configuration flow
+      }
 
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: n2b [options] [natural language command]"
@@ -638,6 +817,18 @@ JSON_INSTRUCTION
           options[:requirements] = file
         end
 
+        opts.on('-j', '--jira JIRA_ID_OR_URL', 'Jira ticket ID or URL for context or update') do |jira|
+          options[:jira_ticket] = jira
+        end
+
+        opts.on('--jira-update', 'Update the linked Jira ticket (requires -j)') do
+          options[:jira_update] = true
+        end
+
+        opts.on('--jira-no-update', 'Do not update the linked Jira ticket (requires -j)') do
+          options[:jira_update] = false
+        end
+
         opts.on('-h', '--help', 'Print this help') do
           puts opts
           exit
@@ -646,6 +837,11 @@ JSON_INSTRUCTION
         opts.on('-c', '--config', 'Configure the API key and model') do
           options[:config] = true
         end
+
+        opts.on('--advanced-config', 'Access advanced configuration options including Jira and privacy settings') do
+          options[:advanced_config] = true
+          options[:config] = true # Forcing config mode if advanced is chosen
+        end
       end
 
       begin
@@ -665,6 +861,27 @@ JSON_INSTRUCTION
         exit 1
       end
 
+      if options[:jira_update] == true && options[:jira_ticket].nil?
+        puts "Error: --jira-update option requires a Jira ticket to be specified with -j or --jira."
+        puts ""
+        puts parser.help
+        exit 1
+      end
+
+      if options[:jira_update] == false && options[:jira_ticket].nil?
+        puts "Error: --jira-no-update option requires a Jira ticket to be specified with -j or --jira."
+        puts ""
+        puts parser.help
+        exit 1
+      end
+
+      if options[:jira_update] == true && options[:jira_update] == false
+        puts "Error: --jira-update and --jira-no-update are mutually exclusive."
+        puts ""
+        puts parser.help
+        exit 1
+      end
+
       options
     end
   end

data/lib/n2b/config/models.yml

@@ -0,0 +1,47 @@
+# N2B Model Configuration
+# Format: display_name -> api_model_name
+# Users can select from suggested models or enter custom model names
+
+claude:
+  suggested:
+    haiku: "claude-3-haiku-20240307"
+    sonnet: "claude-3-sonnet-20240229" 
+    sonnet35: "claude-3-5-sonnet-20240620"
+    sonnet37: "claude-3-7-sonnet-20250219"
+    sonnet40: "claude-sonnet-4-20250514"
+  default: "sonnet"
+
+openai:
+  suggested:
+    gpt-4o: "gpt-4o"
+    gpt-4o-mini: "gpt-4o-mini"
+    o3: "o3"
+    o3-mini: "o3-mini"
+    o3-mini-high: "o3-mini-high"
+    o4: "o4"
+    o4-mini: "o4-mini"
+    o4-mini-high: "o4-mini-high"
+  default: "gpt-4o-mini"
+
+gemini:
+  suggested:
+    gemini-2.5-flash: "gemini-2.5-flash-preview-05-20"
+    gemini-2.5-pro: "gemini-2.5-pro-preview-05-06"
+  default: "gemini-2.5-flash"
+
+openrouter:
+  suggested:
+    deepseek-v3: "deepseek-v3-0324"
+    deepseek-r1-llama-8b: "deepseek-r1-distill-llama-8b"
+    llama-3.3-70b: "llama-3.3-70b-instruct"
+    llama-3.3-8b: "llama-3.3-8b-instruct"
+    wayfinder-large: "wayfinder-large-70b-llama-3.3"
+  default: "deepseek-v3"
+
+ollama:
+  suggested:
+    llama3: "llama3"
+    mistral: "mistral"
+    codellama: "codellama"
+    qwen: "qwen2.5"
+  default: "llama3"

data/lib/n2b/irb.rb

@@ -991,7 +991,7 @@ module N2B
         
         # If we still can't fix it, return a formatted version of the original
         "# Auto-formatted Ticket\n\n```\n#{original_response.inspect}\n```"
-      rescue => e
+      rescue => _e
         # If anything goes wrong in the fixing process, return a readable version of the original
         if original_response.is_a?(Hash)
           # Try to create a readable markdown from the hash