n2b 0.7.1 → 2.1.0

data/lib/n2b/jira_client.rb

@@ -2,6 +2,8 @@ require 'net/http'
 require 'uri'
 require 'json'
 require 'base64'
+require 'time'
+require_relative 'template_engine'
 
 module N2B
   class JiraClient
@@ -70,19 +72,41 @@ module N2B
       # Generate comment using template system
       template_comment = generate_templated_comment(comment)
 
+      if debug_mode?
+        puts "🔍 DEBUG: Generated template comment (#{template_comment.length} chars):"
+        puts "--- TEMPLATE COMMENT START ---"
+        puts template_comment
+        puts "--- TEMPLATE COMMENT END ---"
+      end
+
       # Prepare the comment body in Jira's Atlassian Document Format (ADF)
       comment_body = {
         "body" => format_comment_as_adf(template_comment)
       }
 
+      if debug_mode?
+        puts "🔍 DEBUG: Formatted ADF comment body:"
+        puts "--- ADF BODY START ---"
+        puts JSON.pretty_generate(comment_body)
+        puts "--- ADF BODY END ---"
+      end
+
       # Make the API call to add a comment
       path = "/rest/api/3/issue/#{ticket_key}/comment"
+      puts "🔍 DEBUG: Making API request to: #{path}" if debug_mode?
+
       _response = make_api_request('POST', path, comment_body)
 
       puts "✅ Successfully added comment to Jira ticket #{ticket_key}"
       true
     rescue JiraApiError => e
       puts "❌ Failed to update Jira ticket #{ticket_key}: #{e.message}"
+      if debug_mode?
+        puts "🔍 DEBUG: Full error details:"
+        puts "  - Ticket key: #{ticket_key}"
+        puts "  - Template comment length: #{template_comment&.length || 'nil'}"
+        puts "  - Comment body keys: #{comment_body&.keys || 'nil'}"
+      end
       false
     end
 
@@ -367,7 +391,7 @@ module N2B
           else
             formatted_date = created
           end
-        rescue
+        rescue => e
           formatted_date = created
         end
 
@@ -400,6 +424,11 @@ module N2B
     end
 
     def generate_templated_comment(comment_data)
+      # Handle structured hash data from format_analysis_for_jira
+      if comment_data.is_a?(Hash) && comment_data.key?(:implementation_summary)
+        return generate_structured_comment(comment_data)
+      end
+
       # Prepare template data from the analysis results
       template_data = prepare_template_data(comment_data)
 
@@ -412,6 +441,110 @@ module N2B
       engine.render
     end
 
+    def generate_structured_comment(data)
+      # Generate a properly formatted comment from structured analysis data
+      git_info = extract_git_info
+      timestamp = Time.now.strftime("%Y-%m-%d %H:%M UTC")
+
+      comment_parts = []
+
+      # Header
+      comment_parts << "*N2B Code Analysis Report*"
+      comment_parts << ""
+
+      # Implementation Summary (always expanded)
+      comment_parts << "*Implementation Summary:*"
+      comment_parts << (data[:implementation_summary] || "Unknown")
+      comment_parts << ""
+
+      # Custom message if provided (also expanded)
+      if data[:custom_analysis_focus] && !data[:custom_analysis_focus].empty?
+        comment_parts << "*Custom Analysis Focus:*"
+        comment_parts << data[:custom_analysis_focus]
+        comment_parts << ""
+      end
+
+      comment_parts << "---"
+      comment_parts << ""
+
+      # Automated Analysis Findings
+      comment_parts << "*Automated Analysis Findings:*"
+      comment_parts << ""
+
+      # Critical Issues (collapsed by default)
+      critical_issues = classify_issues_by_severity(data[:issues] || [], 'CRITICAL')
+      if critical_issues.any?
+        comment_parts << "{expand:🚨 Critical Issues (Must Fix Before Merge)}"
+        critical_issues.each { |issue| comment_parts << "☐ #{issue}" }
+        comment_parts << "{expand}"
+      else
+        comment_parts << "✅ No critical issues found"
+      end
+      comment_parts << ""
+
+      # Important Issues (collapsed by default)
+      important_issues = classify_issues_by_severity(data[:issues] || [], 'IMPORTANT')
+      if important_issues.any?
+        comment_parts << "{expand:⚠️ Important Issues (Should Address)}"
+        important_issues.each { |issue| comment_parts << "☐ #{issue}" }
+        comment_parts << "{expand}"
+      else
+        comment_parts << "✅ No important issues found"
+      end
+      comment_parts << ""
+
+      # Suggested Improvements (collapsed by default)
+      if data[:improvements] && data[:improvements].any?
+        comment_parts << "{expand:💡 Suggested Improvements (Nice to Have)}"
+        data[:improvements].each { |improvement| comment_parts << "☐ #{improvement}" }
+        comment_parts << "{expand}"
+      else
+        comment_parts << "✅ No specific improvements suggested"
+      end
+      comment_parts << ""
+
+      # Test Coverage Assessment
+      comment_parts << "{expand:🧪 Test Coverage Assessment}"
+      if data[:test_coverage] && !data[:test_coverage].empty?
+        comment_parts << "*Overall Assessment:* #{data[:test_coverage]}"
+      else
+        comment_parts << "*Overall Assessment:* Not assessed"
+      end
+      comment_parts << "{expand}"
+      comment_parts << ""
+
+      # Missing Test Coverage
+      comment_parts << "*Missing Test Coverage:*"
+      comment_parts << "☐ No specific missing tests identified"
+      comment_parts << ""
+
+      # Requirements Evaluation
+      comment_parts << "*📋 Requirements Evaluation:*"
+      if data[:requirements_evaluation] && !data[:requirements_evaluation].empty?
+        comment_parts << "#{data[:requirements_evaluation]}"
+      else
+        comment_parts << "🔍 *UNCLEAR:* Requirements not provided or assessed"
+      end
+      comment_parts << ""
+
+      comment_parts << "---"
+      comment_parts << ""
+
+      # Footer with metadata (simplified)
+      comment_parts << "Analysis completed on #{timestamp} | Branch: #{git_info[:branch]}"
+
+      comment_parts.join("\n")
+    end
+
+    def classify_issues_by_severity(issues, target_severity)
+      return [] unless issues.is_a?(Array)
+
+      issues.select do |issue|
+        severity = classify_error_severity(issue)
+        severity == target_severity
+      end
+    end
+
     def prepare_template_data(comment_data)
       # Handle both string and hash inputs
       if comment_data.is_a?(String)
@@ -641,15 +774,17 @@ module N2B
     end
 
     def get_config(reconfigure: false, advanced_flow: false)
-      # This should match the config loading from the main CLI
-      # For now, return empty hash - will be enhanced when config system is unified
-      {}
+      # Return the config that was passed during initialization
+      # This is used for template resolution and other configuration needs
+      @config
     end
 
     def convert_markdown_to_adf(markdown_text)
       content = []
       lines = markdown_text.split("\n")
       current_paragraph = []
+      current_expand = nil
+      expand_content = []
 
       lines.each do |line|
         case line
@@ -680,75 +815,118 @@ module N2B
             current_paragraph = []
           end
 
-          # Create expand section
+          # Start collecting expand content
           expand_title = $1.strip
-          content << {
+          current_expand = {
             "type" => "expand",
             "attrs" => { "title" => expand_title },
             "content" => []
           }
+          expand_content = []
         when /^\{expand\}$/  # Jira expand end
-          # End of expand section - handled by the expand start
+          # End of expand section - add collected content
+          if current_expand
+            current_expand["content"] = expand_content
+            content << current_expand if expand_content.any?  # Only add if has content
+            current_expand = nil
+            expand_content = []
+          end
         when /^☐\s+(.+)$/  # Unchecked checkbox
           # Flush current paragraph
           if current_paragraph.any?
-            content << create_paragraph(current_paragraph.join(" "))
+            paragraph = create_paragraph(current_paragraph.join(" "))
+            if current_expand
+              expand_content << paragraph
+            else
+              content << paragraph
+            end
             current_paragraph = []
           end
 
-          content << {
-            "type" => "taskList",
-            "content" => [
-              {
-                "type" => "taskItem",
-                "attrs" => { "state" => "TODO" },
-                "content" => [
-                  create_paragraph($1.strip)
-                ]
-              }
-            ]
-          }
+          # Convert checkbox to simple paragraph (no bullet points)
+          checkbox_paragraph = create_paragraph("☐ " + $1.strip)
+
+          if current_expand
+            expand_content << checkbox_paragraph
+          else
+            content << checkbox_paragraph
+          end
         when /^☑\s+(.+)$/  # Checked checkbox
           # Flush current paragraph
           if current_paragraph.any?
-            content << create_paragraph(current_paragraph.join(" "))
+            paragraph = create_paragraph(current_paragraph.join(" "))
+            if current_expand
+              expand_content << paragraph
+            else
+              content << paragraph
+            end
             current_paragraph = []
           end
 
-          content << {
-            "type" => "taskList",
-            "content" => [
-              {
-                "type" => "taskItem",
-                "attrs" => { "state" => "DONE" },
-                "content" => [
-                  create_paragraph($1.strip)
-                ]
-              }
-            ]
-          }
+          # Convert checkbox to simple paragraph (no bullet points)
+          checkbox_paragraph = create_paragraph("☑ " + $1.strip)
+
+          if current_expand
+            expand_content << checkbox_paragraph
+          else
+            content << checkbox_paragraph
+          end
         when /^---$/  # Horizontal rule
           # Flush current paragraph
           if current_paragraph.any?
-            content << create_paragraph(current_paragraph.join(" "))
+            paragraph = create_paragraph(current_paragraph.join(" "))
+            if current_expand
+              expand_content << paragraph
+            else
+              content << paragraph
+            end
             current_paragraph = []
           end
 
-          content << { "type" => "rule" }
+          rule = { "type" => "rule" }
+          if current_expand
+            expand_content << rule
+          else
+            content << rule
+          end
         when ""  # Empty line
           # Flush current paragraph
           if current_paragraph.any?
-            content << create_paragraph(current_paragraph.join(" "))
+            paragraph = create_paragraph(current_paragraph.join(" "))
+            if current_expand
+              expand_content << paragraph
+            else
+              content << paragraph
+            end
             current_paragraph = []
           end
         else  # Regular text
-          current_paragraph << line
+          # Skip empty or whitespace-only content
+          unless line.strip.empty? || line.strip == "{}"
+            current_paragraph << line
+          end
         end
       end
 
       # Flush any remaining paragraph
       if current_paragraph.any?
-        content << create_paragraph(current_paragraph.join(" "))
+        paragraph = create_paragraph(current_paragraph.join(" "))
+        if current_expand
+          expand_content << paragraph
+        else
+          content << paragraph
+        end
+      end
+
+      # Close any remaining expand section
+      if current_expand && expand_content.any?
+        current_expand["content"] = expand_content
+        content << current_expand
+      end
+
+      # Ensure we have at least one content element
+      if content.empty?
+        content << create_paragraph("Analysis completed.")
       end
 
       {
@@ -772,6 +950,10 @@ module N2B
 
     private
 
+    def debug_mode?
+      ENV['N2B_DEBUG'] == 'true'
+    end
+
     def format_comment_as_adf(comment_data)
       # If comment_data is a string (from template), convert to simple ADF
       if comment_data.is_a?(String)
@@ -1096,8 +1278,26 @@ module N2B
       request['Content-Type'] = 'application/json'
       request['Accept'] = 'application/json'
 
+      if debug_mode?
+        puts "🔍 DEBUG: Making #{method} request to: #{full_url}"
+        puts "🔍 DEBUG: Request headers: Content-Type=#{request['Content-Type']}, Accept=#{request['Accept']}"
+        if body
+          puts "🔍 DEBUG: Request body size: #{body.to_json.length} bytes"
+          puts "🔍 DEBUG: Request body preview: #{body.to_json[0..500]}#{'...' if body.to_json.length > 500}"
+        end
+      end
+
       response = http.request(request)
 
+      if debug_mode?
+        puts "🔍 DEBUG: Response code: #{response.code} #{response.message}"
+        if response.body && !response.body.empty?
+          # Force UTF-8 encoding to handle character encoding issues
+          response_body = response.body.force_encoding('UTF-8')
+          puts "🔍 DEBUG: Response body: #{response_body}"
+        end
+      end
+
       unless response.is_a?(Net::HTTPSuccess)
         error_message = "Jira API Error: #{response.code} #{response.message}"
         error_message += " - #{response.body}" if response.body && !response.body.empty?

data/lib/n2b/llm/claude.rb

@@ -1,6 +1,6 @@
 require_relative '../model_config'
 
-module N2M
+module N2B
   module Llm
     class Claude
       API_URI = URI.parse('https://api.anthropic.com/v1/messages')

data/lib/n2b/llm/gemini.rb

@@ -1,15 +1,16 @@
 require 'net/http'
 require 'json'
 require 'uri'
+# Removed googleauth require
 require_relative '../model_config'
 
-module N2M
+module N2B
   module Llm
     class Gemini
       API_URI = URI.parse('https://generativelanguage.googleapis.com/v1beta/models')
 
       def initialize(config)
-        @config = config
+        @config = config # Used for access_key and model
       end
 
       def get_model_name
@@ -29,6 +30,8 @@ module N2M
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
 
+        # Removed Authorization header and token fetching logic
+
         request.body = JSON.dump({
           "contents" => [{
             "parts" => [{
@@ -82,6 +85,8 @@ module N2M
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
 
+        # Removed Authorization header and token fetching logic
+
         request.body = JSON.dump({
           "contents" => [{
             "parts" => [{

data/lib/n2b/llm/open_ai.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'uri'
 require_relative '../model_config'
 
-module N2M
+module N2B
   module Llm
     class OpenAi
       API_URI = URI.parse('https://api.openai.com/v1/chat/completions')

data/lib/n2b/llm/vertex_ai.rb

@@ -0,0 +1,225 @@
+require 'net/http'
+require 'json'
+require 'uri'
+require 'googleauth' # For service account authentication
+require_relative '../model_config'
+require_relative '../errors'
+
+module N2B
+  module Llm
+    class VertexAi
+      # Vertex AI API endpoint format
+      DEFAULT_LOCATION = 'us-central1'
+      COMMON_LOCATIONS = [
+        'us-central1',    # Iowa, USA
+        'us-east1',       # South Carolina, USA
+        'us-west1',       # Oregon, USA
+        'europe-west1',   # Belgium
+        'europe-west4',   # Netherlands
+        'asia-northeast1', # Tokyo, Japan
+        'asia-southeast1'  # Singapore
+      ].freeze
+
+      # HTTP timeout in seconds
+      REQUEST_TIMEOUT = 60
+
+      def initialize(config)
+        @config = config # Contains 'vertex_credential_file' and 'model'
+        @project_id = nil
+        @location = DEFAULT_LOCATION
+        load_project_info
+      end
+
+      private
+
+      def load_project_info
+        # Extract project_id from the credential file
+        credential_data = JSON.parse(File.read(@config['vertex_credential_file']))
+        @project_id = credential_data['project_id']
+
+        # Allow location override from config, with intelligent defaults
+        @location = determine_location
+      rescue JSON::ParserError => e
+        raise N2B::LlmApiError.new("Invalid JSON in credential file: #{e.message}")
+      rescue Errno::ENOENT => e
+        raise N2B::LlmApiError.new("Credential file not found: #{e.message}")
+      rescue => e
+        raise N2B::LlmApiError.new("Failed to load project info from credential file: #{e.message}")
+      end
+
+      def determine_location
+        # 1. Use explicit config if provided
+        return @config['vertex_location'] if @config['vertex_location']
+
+        # 2. Try to detect from project_id patterns (some projects have region hints)
+        # 3. Default to us-central1 but provide helpful error message if it fails
+        DEFAULT_LOCATION
+      end
+
+      def build_api_uri(model)
+        "https://#{@location}-aiplatform.googleapis.com/v1/projects/#{@project_id}/locations/#{@location}/publishers/google/models/#{model}:generateContent"
+      end
+
+      public
+
+      def get_model_name
+        # Resolve model name using the centralized configuration for 'vertexai'
+        model_name = N2B::ModelConfig.resolve_model('vertexai', @config['model'])
+        if model_name.nil? || model_name.empty?
+          # Fallback to default if no model specified for vertexai
+          model_name = N2B::ModelConfig.resolve_model('vertexai', N2B::ModelConfig.default_model('vertexai'))
+        end
+        # If still no model, a generic default could be used, or an error raised.
+        # For now, assume ModelConfig handles returning a usable default or nil.
+        # If ModelConfig.resolve_model can return nil and that's an issue, add handling here.
+        # For example, if model_name is still nil, raise an error or use a hardcoded default.
+        # Let's assume ModelConfig provides a valid model or a sensible default from models.yml.
+        model_name
+      end
+
+      def make_request(content)
+        model = get_model_name
+        raise N2B::LlmApiError.new("No model configured for Vertex AI.") if model.nil? || model.empty?
+
+        uri = URI.parse(build_api_uri(model))
+
+        request = Net::HTTP::Post.new(uri)
+        request.content_type = 'application/json'
+
+        begin
+          scope = 'https://www.googleapis.com/auth/cloud-platform'
+          authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+            json_key_io: File.open(@config['vertex_credential_file']),
+            scope: scope
+          )
+          access_token = authorizer.fetch_access_token!['access_token']
+          request['Authorization'] = "Bearer #{access_token}"
+        rescue StandardError => e
+          raise N2B::LlmApiError.new("Vertex AI - Failed to obtain Google Cloud access token: #{e.message}")
+        end
+
+        request.body = JSON.dump({
+          "contents" => [{
+            "role" => "user",
+            "parts" => [{
+              "text" => content
+            }]
+          }],
+          "generationConfig" => {
+            "responseMimeType" => "application/json" # Requesting JSON output from the LLM
+          }
+        })
+
+        begin
+          response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.read_timeout = REQUEST_TIMEOUT
+            http.open_timeout = 30
+            http.request(request)
+          end
+        rescue Net::TimeoutError, Net::ReadTimeout, Net::OpenTimeout => e
+          error_msg = "Vertex AI request timed out (region: #{@location}): #{e.message}"
+          error_msg += "\n\nThis might be a region issue. Try reconfiguring with 'n2b -c' and select a different region."
+          error_msg += "\nFor EU users, try: europe-west1 (Belgium) or europe-west4 (Netherlands)"
+          error_msg += "\nCommon regions: #{COMMON_LOCATIONS.join(', ')}"
+          raise N2B::LlmApiError.new(error_msg)
+        rescue => e
+          raise N2B::LlmApiError.new("Vertex AI network error: #{e.message}")
+        end
+
+        if response.code != '200'
+          error_msg = "Vertex AI LLM API Error: #{response.code} #{response.message} - #{response.body}"
+          if response.code == '404'
+            error_msg += "\n\nThis might be a region or model availability issue. Current region: #{@location}"
+            error_msg += "\nNote: Google models via Vertex AI are not available in all regions."
+            error_msg += "\nTry reconfiguring with 'n2b -c' and:"
+            error_msg += "\n  1. Select a different region (Common regions: #{COMMON_LOCATIONS.join(', ')})"
+            error_msg += "\n  2. Choose a different model (some models are only available in specific regions)"
+          end
+          raise N2B::LlmApiError.new(error_msg)
+        end
+
+        parsed_response = JSON.parse(response.body)
+        # Vertex AI response structure is the same as Gemini API
+        answer = parsed_response['candidates'].first['content']['parts'].first['text']
+
+        begin
+          if answer.strip.start_with?('{') && answer.strip.end_with?('}')
+            answer = JSON.parse(answer) # LLM returned JSON as a string
+          else
+            # If not JSON, wrap it as per existing Gemini class (for CLI compatibility)
+            answer = { 'explanation' => answer, 'code' => nil }
+          end
+        rescue JSON::ParserError
+          answer = { 'explanation' => answer, 'code' => nil }
+        end
+        answer
+      end
+
+      def analyze_code_diff(prompt_content)
+        model = get_model_name
+        raise N2B::LlmApiError.new("No model configured for Vertex AI.") if model.nil? || model.empty?
+
+        uri = URI.parse(build_api_uri(model))
+
+        request = Net::HTTP::Post.new(uri)
+        request.content_type = 'application/json'
+
+        begin
+          scope = 'https://www.googleapis.com/auth/cloud-platform'
+          authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+            json_key_io: File.open(@config['vertex_credential_file']),
+            scope: scope
+          )
+          access_token = authorizer.fetch_access_token!['access_token']
+          request['Authorization'] = "Bearer #{access_token}"
+        rescue StandardError => e
+          raise N2B::LlmApiError.new("Vertex AI - Failed to obtain Google Cloud access token for diff analysis: #{e.message}")
+        end
+
+        request.body = JSON.dump({
+          "contents" => [{
+            "role" => "user",
+            "parts" => [{
+              "text" => prompt_content
+            }]
+          }],
+          "generationConfig" => {
+            "responseMimeType" => "application/json" # Expecting JSON response from LLM
+          }
+        })
+
+        begin
+          response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.read_timeout = REQUEST_TIMEOUT
+            http.open_timeout = 30
+            http.request(request)
+          end
+        rescue Net::TimeoutError, Net::ReadTimeout, Net::OpenTimeout => e
+          error_msg = "Vertex AI diff analysis timed out (region: #{@location}): #{e.message}"
+          error_msg += "\n\nThis might be a region issue. Try reconfiguring with 'n2b -c' and select a different region."
+          error_msg += "\nFor EU users, try: europe-west1 (Belgium) or europe-west4 (Netherlands)"
+          error_msg += "\nCommon regions: #{COMMON_LOCATIONS.join(', ')}"
+          raise N2B::LlmApiError.new(error_msg)
+        rescue => e
+          raise N2B::LlmApiError.new("Vertex AI network error during diff analysis: #{e.message}")
+        end
+
+        if response.code != '200'
+          error_msg = "Vertex AI LLM API Error for diff analysis: #{response.code} #{response.message} - #{response.body}"
+          if response.code == '404'
+            error_msg += "\n\nThis might be a region or model availability issue. Current region: #{@location}"
+            error_msg += "\nNote: Google models via Vertex AI are not available in all regions."
+            error_msg += "\nTry reconfiguring with 'n2b -c' and:"
+            error_msg += "\n  1. Select a different region (Common regions: #{COMMON_LOCATIONS.join(', ')})"
+            error_msg += "\n  2. Choose a different model (some models are only available in specific regions)"
+          end
+          raise N2B::LlmApiError.new(error_msg)
+        end
+
+        parsed_response = JSON.parse(response.body)
+        # Return the raw JSON string from the 'text' field, CLI will parse it.
+        parsed_response['candidates'].first['content']['parts'].first['text']
+      end
+    end
+  end
+end