n2b 0.4.0 → 0.5.0

data/lib/n2b/base.rb

@@ -14,99 +14,216 @@ module N2B
       end
     end
     
-    def get_config( reconfigure: false)
+    def get_config(reconfigure: false, advanced_flow: false)
       config = load_config
       api_key = ENV['CLAUDE_API_KEY'] || config['access_key'] # This will be used as default or for existing configs
-      model = config['model'] # Model will be handled per LLM
-  
-      if api_key.nil? || api_key == '' || config['llm'].nil? || reconfigure # Added config['llm'].nil? to force config if llm type isn't set
-        print "choose a language model to use (1:claude, 2:openai, 3:gemini, 4:openrouter, 5:ollama) #{ config['llm'] }: "
-        llm = $stdin.gets.chomp
-        llm = config['llm'] if llm.empty? && !config['llm'].nil? # Keep current if input is empty and current exists
-
-        unless ['claude', 'openai', 'gemini', 'openrouter', 'ollama', '1', '2', '3', '4', '5'].include?(llm)
-          puts "Invalid language model. Choose from: claude, openai, gemini, openrouter, ollama, or 1-5"
-          exit 1
-        end
-        llm = 'claude' if llm == '1'
-        llm = 'openai' if llm == '2'
-        llm = 'gemini' if llm == '3'
-        llm = 'openrouter' if llm == '4'
-        llm = 'ollama' if llm == '5'
-
-        # Set default LLM if needed
-        if llm.nil? || llm.empty?
-          llm = 'claude'
-        end
+      _model = config['model'] # Unused but kept for potential future use # Model will be handled per LLM
 
-        config['llm'] = llm
+      # Determine if it's effectively a first-time setup for core LLM details
+      is_first_time_core_setup = config['llm'].nil?
 
-        if llm == 'ollama'
-          # Ollama specific configuration
+      if api_key.nil? || api_key == '' || config['llm'].nil? || reconfigure
+        puts "--- N2B Core LLM Configuration ---"
+        print "Choose a language model to use (1:claude, 2:openai, 3:gemini, 4:openrouter, 5:ollama) [current: #{config['llm']}]: "
+        llm_choice = $stdin.gets.chomp
+        llm_choice = config['llm'] if llm_choice.empty? && !config['llm'].nil? # Keep current if input is empty
+
+        unless ['claude', 'openai', 'gemini', 'openrouter', 'ollama', '1', '2', '3', '4', '5'].include?(llm_choice)
+          puts "Invalid language model selection. Defaulting to 'claude' or previous if available."
+          llm_choice = config['llm'] || 'claude' # Fallback
+        end
+
+        selected_llm = case llm_choice
+                       when '1', 'claude' then 'claude'
+                       when '2', 'openai' then 'openai'
+                       when '3', 'gemini' then 'gemini'
+                       when '4', 'openrouter' then 'openrouter'
+                       when '5', 'ollama' then 'ollama'
+                       else config['llm'] || 'claude' # Should not happen due to validation
+                       end
+        config['llm'] = selected_llm
+
+        if selected_llm == 'ollama'
+          puts "\n--- Ollama Specific Configuration ---"
           puts "Ollama typically runs locally and doesn't require an API key."
 
           # Use new model configuration system
           current_model = config['model']
-          model = N2B::ModelConfig.get_model_choice(llm, current_model)
+          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model) # Renamed to model_choice to avoid conflict
+          config['model'] = model_choice
 
-          # Configure Ollama API URL
           current_ollama_api_url = config['ollama_api_url'] || N2M::Llm::Ollama::DEFAULT_OLLAMA_API_URI
-          print "Enter Ollama API base URL (default: #{current_ollama_api_url}): "
+          print "Enter Ollama API base URL [current: #{current_ollama_api_url}]: "
           ollama_api_url_input = $stdin.gets.chomp
           config['ollama_api_url'] = ollama_api_url_input.empty? ? current_ollama_api_url : ollama_api_url_input
           config.delete('access_key') # Remove access_key if switching to ollama
         else
-          # Configuration for API key based LLMs (Claude, OpenAI, Gemini, OpenRouter)
-          current_api_key = config['access_key'] # Use existing key from config as default
-          print "Enter your #{llm} API key: #{ current_api_key.nil? || current_api_key.empty? ? '' : '(leave blank to keep the current key)' }"
+          # Configuration for API key based LLMs
+          puts "\n--- #{selected_llm.capitalize} Specific Configuration ---"
+          current_api_key = config['access_key']
+          print "Enter your #{selected_llm} API key #{ current_api_key.nil? || current_api_key.empty? ? '' : '[leave blank to keep current]' }: "
           api_key_input = $stdin.gets.chomp
           config['access_key'] = api_key_input if !api_key_input.empty?
           config['access_key'] = current_api_key if api_key_input.empty? && !current_api_key.nil? && !current_api_key.empty?
 
-          # Ensure API key is present if not Ollama
           if config['access_key'].nil? || config['access_key'].empty?
-            puts "API key is required for #{llm}."
+            puts "API key is required for #{selected_llm}."
             exit 1
           end
 
-          # Use new model configuration system
           current_model = config['model']
-          model = N2B::ModelConfig.get_model_choice(llm, current_model)
+          model_choice = N2B::ModelConfig.get_model_choice(selected_llm, current_model) # Renamed
+          config['model'] = model_choice
 
-          if llm == 'openrouter'
+          if selected_llm == 'openrouter'
             current_site_url = config['openrouter_site_url'] || ""
-            print "Enter your OpenRouter Site URL (optional, for HTTP-Referer header, current: #{current_site_url}): "
+            print "Enter your OpenRouter Site URL (optional, for HTTP-Referer) [current: #{current_site_url}]: "
             openrouter_site_url_input = $stdin.gets.chomp
             config['openrouter_site_url'] = openrouter_site_url_input.empty? ? current_site_url : openrouter_site_url_input
 
             current_site_name = config['openrouter_site_name'] || ""
-            print "Enter your OpenRouter Site Name (optional, for X-Title header, current: #{current_site_name}): "
+            print "Enter your OpenRouter Site Name (optional, for X-Title) [current: #{current_site_name}]: "
             openrouter_site_name_input = $stdin.gets.chomp
             config['openrouter_site_name'] = openrouter_site_name_input.empty? ? current_site_name : openrouter_site_name_input
           end
         end
 
-        config['model'] = model # Store selected model for all types
+        # --- Advanced Configuration Flow ---
+        # Prompt for advanced settings if advanced_flow is true or if it's the first time setting up core LLM.
+        prompt_for_advanced = advanced_flow || is_first_time_core_setup
+
+        if prompt_for_advanced
+          puts "\n--- Advanced Settings ---"
+          print "Would you like to configure advanced settings (e.g., Jira integration, privacy)? (y/n) [default: n]: "
+          choice = $stdin.gets.chomp.downcase
+
+          if choice == 'y'
+            # Jira Configuration
+            puts "\n--- Jira Integration ---"
+            puts "You can generate a Jira API token here: https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/"
+            config['jira'] ||= {}
+            print "Jira Domain (e.g., your-company.atlassian.net) [current: #{config['jira']['domain']}]: "
+            config['jira']['domain'] = $stdin.gets.chomp.then { |val| val.empty? ? config['jira']['domain'] : val }
+
+            print "Jira Email Address [current: #{config['jira']['email']}]: "
+            config['jira']['email'] = $stdin.gets.chomp.then { |val| val.empty? ? config['jira']['email'] : val }
+
+            print "Jira API Token #{config['jira']['api_key'] ? '[leave blank to keep current]' : ''}: "
+            api_token_input = $stdin.gets.chomp
+            config['jira']['api_key'] = api_token_input if !api_token_input.empty?
+
+            print "Default Jira Project Key (optional, e.g., MYPROJ) [current: #{config['jira']['default_project']}]: "
+            config['jira']['default_project'] = $stdin.gets.chomp.then { |val| val.empty? ? config['jira']['default_project'] : val }
+
+            # Privacy Settings
+            puts "\n--- Privacy Settings ---"
+            config['privacy'] ||= {}
+            puts "Allow sending shell command history to the LLM? (true/false) [current: #{config['privacy']['send_shell_history']}]"
+            config['privacy']['send_shell_history'] = $stdin.gets.chomp.then { |val| val.empty? ? config['privacy']['send_shell_history'] : (val.downcase == 'true') }
+
+            puts "Allow sending LLM interaction history (your prompts and LLM responses) to the LLM? (true/false) [current: #{config['privacy']['send_llm_history']}]"
+            config['privacy']['send_llm_history'] = $stdin.gets.chomp.then { |val| val.empty? ? config['privacy']['send_llm_history'] : (val.downcase == 'true') }
+
+            puts "Allow sending current directory to the LLM? (true/false) [current: #{config['privacy']['send_current_directory']}]"
+            config['privacy']['send_current_directory'] = $stdin.gets.chomp.then { |val| val.empty? ? config['privacy']['send_current_directory'] : (val.downcase == 'true') }
+
+            puts "Append n2b generated commands to your shell history file? (true/false) [current: #{config['append_to_shell_history']}]"
+            # Note: append_to_shell_history was previously outside 'privacy' hash. Standardizing it inside.
+            config['append_to_shell_history'] = $stdin.gets.chomp.then { |val| val.empty? ? config['append_to_shell_history'] : (val.downcase == 'true') }
+            config['privacy']['append_to_shell_history'] = config['append_to_shell_history'] # Also place under privacy for consistency
+
+          else # User chose 'n' for advanced settings
+            # Ensure Jira config is empty or defaults are cleared if user opts out of advanced
+            config['jira'] ||= {} # Ensure it exists
+            # If they opt out, we don't clear existing, just don't prompt.
+            # If it's a fresh setup and they opt out, these will remain empty/nil.
+
+            # Ensure privacy settings are initialized to defaults if not already set by advanced flow
+            config['privacy'] ||= {}
+            config['privacy']['send_shell_history'] = config['privacy']['send_shell_history'] || false
+            config['privacy']['send_llm_history'] = config['privacy']['send_llm_history'] || true # Default true
+            config['privacy']['send_current_directory'] = config['privacy']['send_current_directory'] || true # Default true
+            config['append_to_shell_history'] = config['append_to_shell_history'] || false
+            config['privacy']['append_to_shell_history'] = config['append_to_shell_history']
+          end
+        else # Not prompting for advanced (neither advanced_flow nor first_time_core_setup)
+          # Ensure defaults for privacy if they don't exist from a previous config
+          config['jira'] ||= {} # Ensure Jira key exists
+          config['privacy'] ||= {}
+          config['privacy']['send_shell_history'] = config['privacy']['send_shell_history'] || false
+          config['privacy']['send_llm_history'] = config['privacy']['send_llm_history'] || true
+          config['privacy']['send_current_directory'] = config['privacy']['send_current_directory'] || true
+          config['append_to_shell_history'] = config['append_to_shell_history'] || false
+          config['privacy']['append_to_shell_history'] = config['append_to_shell_history']
+        end
+
+        # Validate configuration before saving
+        validation_errors = validate_config(config)
+        if validation_errors.any?
+          puts "\n⚠️  Configuration validation warnings:"
+          validation_errors.each { |error| puts "  - #{error}" }
+          puts "Configuration saved with warnings."
+        end
 
-        # Ensure privacy settings are initialized if not present
-        config['privacy'] ||= {}
-        # Set defaults for any privacy settings that are nil
-        config['privacy']['send_shell_history'] = false if config['privacy']['send_shell_history'].nil?
-        config['privacy']['send_llm_history'] = true if config['privacy']['send_llm_history'].nil?
-        config['privacy']['send_current_directory'] = true if config['privacy']['send_current_directory'].nil?
-        config['append_to_shell_history'] = false if config['append_to_shell_history'].nil?
-
-        puts "configure privacy settings directly in the config file #{CONFIG_FILE}"
-        config['privacy'] ||= {} 
-        config['privacy']['send_shell_history'] = false
-        config['privacy']['send_llm_history'] = true
-        config['privacy']['send_current_directory'] =true
-        config['append_to_shell_history'] = false 
-        puts "Current configuration: #{config['privacy']}"
+        puts "\nConfiguration saved to #{CONFIG_FILE}"
         FileUtils.mkdir_p(File.dirname(CONFIG_FILE)) unless File.exist?(File.dirname(CONFIG_FILE))
         File.write(CONFIG_FILE, config.to_yaml)
+      else
+        # If not reconfiguring, still ensure privacy and jira keys exist with defaults if missing
+        # This handles configs from before these settings were introduced
+        config['jira'] ||= {}
+        config['privacy'] ||= {}
+        config['privacy']['send_shell_history'] = config['privacy']['send_shell_history'] || false
+        config['privacy']['send_llm_history'] = config['privacy']['send_llm_history'] || true
+        config['privacy']['send_current_directory'] = config['privacy']['send_current_directory'] || true
+        # append_to_shell_history was outside 'privacy' before, ensure it's correctly defaulted
+        # and also placed under 'privacy' for future consistency.
+        current_append_setting = config.key?('append_to_shell_history') ? config['append_to_shell_history'] : false
+        config['append_to_shell_history'] = current_append_setting
+        config['privacy']['append_to_shell_history'] = config['privacy']['append_to_shell_history'] || current_append_setting
       end
       config
     end
+
+    private
+
+    def validate_config(config)
+      errors = []
+
+      # Validate LLM configuration
+      if config['llm'].nil? || config['llm'].empty?
+        errors << "LLM provider not specified"
+      end
+
+      # Validate model name
+      if config['model'].nil? || config['model'].empty?
+        errors << "Model not specified"
+      elsif config['model'].length < 3
+        errors << "Model name '#{config['model']}' seems too short - might be invalid"
+      elsif %w[y n yes no true false].include?(config['model'].downcase)
+        errors << "Model name '#{config['model']}' appears to be a boolean response rather than a model name"
+      end
+
+      # Validate API key for non-Ollama providers
+      if config['llm'] != 'ollama' && (config['access_key'].nil? || config['access_key'].empty?)
+        errors << "API key missing for #{config['llm']} provider"
+      end
+
+      # Validate Jira configuration if present
+      if config['jira'] && !config['jira'].empty?
+        jira_config = config['jira']
+        if jira_config['domain'] && !jira_config['domain'].empty?
+          # If domain is set, email and api_key should also be set
+          if jira_config['email'].nil? || jira_config['email'].empty?
+            errors << "Jira email missing when domain is configured"
+          end
+          if jira_config['api_key'].nil? || jira_config['api_key'].empty?
+            errors << "Jira API key missing when domain is configured"
+          end
+        end
+      end
+
+      errors
+    end
   end
 end

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
@@ -646,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]"
@@ -667,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
@@ -675,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
@@ -694,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/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