code_healer 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1ceaaefb9e7954b186c14720e3a68876975deed3d720e812420933dd6016484
-  data.tar.gz: 5299cd3f4a2e394700692d65e74d8132e1bd77b779220cda6b40c0e9db6d2f76
+  metadata.gz: 3f73aedfb97cff3da7cb4a3f62b631886ad5cd377796473b705fe86a6311ff74
+  data.tar.gz: 9e7ce1d1b49920f763684844e799724078919f657c559d49e96a2784200323d2
 SHA512:
-  metadata.gz: a84ffb72f678182aceaf0e39e206e55e9684811c1e2edbccf6bc5368a1a6330123f9215bb5fa81dd47b63042b94a01e93accaa700a958058ad155673b518b68e
-  data.tar.gz: 1a07538709f991f556c5fe407e8212aeb21f161f107494d4a07323b6db10389b1471ddc9b61834097b8a41161c6e287ec335dd739227562a56842d67b25f7097
+  metadata.gz: 6038730a1146276943b9ec4c7e81569a1977873c303c1b36339b589800d55acd1d05beea95808fc34d71cafc0709cfcaaa0fa1940162f9437087baa5a49f0013
+  data.tar.gz: 85a7f04e29e7ae8b4ea0cb7e130432d8b5253f7fe6a0e72baa0cd826bbe6a061ee3787a8bcbe7c9080c70b08aebd8c786701aa6940ecffdff57e20e81881baa1

data/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.8] - 2025-01-14
+
+### Changed
+- **Production safety** - Healing workspace no longer modifies main directory directly
+- **Git workflow** - Changes are applied to isolated healing branches only
+- **Pull request automation** - Automatic PR creation when configured
+- **Method renaming** - `merge_fixes_back` → `create_healing_branch` for clarity
+
+### Fixed
+- **Git operations in isolated healing workspace** - Preserved .git directory during cloning for proper Git operations
+- **Branch creation and commit operations** now work correctly in the isolated workspace
+- **Workspace cleanup** properly removes .git directory to prevent conflicts
+
 ## [0.1.6] - 2025-01-14
 
 ### Added

data/lib/code_healer/evolution_job.rb

@@ -22,7 +22,7 @@ class EvolutionJob
         
         if test_success
           # Merge back to main repo
-          healing_branch = CodeHealer::HealingWorkspaceManager.merge_fixes_back(
+          healing_branch = CodeHealer::HealingWorkspaceManager.create_healing_branch(
             Rails.root.to_s, 
             workspace_path, 
             CodeHealer::ConfigManager.git_settings['pr_target_branch'] || 'main'

data/lib/code_healer/healing_job.rb

@@ -33,7 +33,7 @@ module CodeHealer
 
           if test_success
             # Merge back to main repo
-            healing_branch = CodeHealer::HealingWorkspaceManager.merge_fixes_back(
+            healing_branch = CodeHealer::HealingWorkspaceManager.create_healing_branch(
               Rails.root.to_s,
               workspace_path,
               CodeHealer::ConfigManager.git_settings['pr_target_branch'] || 'main'

data/lib/code_healer/healing_workspace_manager.rb

@@ -120,8 +120,8 @@ module CodeHealer
         end
       end
       
-      def merge_fixes_back(repo_path, workspace_path, branch_name)
-        puts "🔄 Merging fixes back to main repository"
+      def create_healing_branch(repo_path, workspace_path, branch_name)
+        puts "🔄 Creating healing branch for code review"
         
         begin
           # Create healing branch in main repo
@@ -134,22 +134,38 @@ module CodeHealer
             healing_branch = "code-healer-fix-#{Time.now.to_i}"
             system("git checkout -b #{healing_branch}")
             
-            # Copy fixed files from workspace
+            # Copy fixed files from workspace to the new branch
+            # This is safe as we're on a new branch, not the main branch
             copy_fixed_files(workspace_path, repo_path)
             
-            # Commit changes
+            # Commit changes to the healing branch
             system("git add .")
             commit_message = "Fix applied by CodeHealer: #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"
             system("git commit -m '#{commit_message}'")
             
-            # Push branch
+            # Push healing branch (this doesn't affect the main branch)
             system("git push origin #{healing_branch}")
             
             puts "✅ Healing branch created: #{healing_branch}"
+            puts "🔒 Main branch (#{branch_name}) remains unchanged"
+            puts "📝 Changes are now available in branch: #{healing_branch}"
+            
+            # Create pull request if auto-create is enabled
+            if should_create_pull_request?
+              pr_url = create_pull_request(healing_branch, branch_name)
+              if pr_url
+                puts "🔗 Pull request created: #{pr_url}"
+              else
+                puts "⚠️ Failed to create pull request, but branch is ready"
+              end
+            else
+              puts "🔍 Review the changes and create a pull request when ready"
+            end
+            
             healing_branch
           end
         rescue => e
-          puts "❌ Failed to merge fixes back: #{e.message}"
+          puts "❌ Failed to create healing branch: #{e.message}"
           nil
         end
       end
@@ -161,6 +177,13 @@ module CodeHealer
         
         return unless Dir.exist?(workspace_path)
         
+        # Remove .git directory first to avoid conflicts
+        git_dir = File.join(workspace_path, '.git')
+        if Dir.exist?(git_dir)
+          puts "🧹 [WORKSPACE] Removing .git directory to prevent conflicts..."
+          FileUtils.rm_rf(git_dir)
+        end
+        
         puts "🧹 [WORKSPACE] Removing workspace directory..."
         FileUtils.rm_rf(workspace_path)
         puts "🧹 [WORKSPACE] Workspace cleanup completed"
@@ -190,6 +213,51 @@ module CodeHealer
       
       private
       
+      def should_create_pull_request?
+        config = CodeHealer::ConfigManager.config
+        auto_create = config.dig('pull_request', 'auto_create')
+        auto_create = config.dig(:pull_request, :auto_create) if auto_create.nil?
+        auto_create == true
+      end
+      
+      def create_pull_request(healing_branch, target_branch)
+        puts "🔗 Creating pull request for #{healing_branch} → #{target_branch}"
+        
+        begin
+          require 'octokit'
+          
+          config = CodeHealer::ConfigManager.config
+          github_token = ENV['GITHUB_TOKEN']
+          repo_name = config['github_repo'] || config[:github_repo]
+          
+          unless github_token && repo_name
+            puts "❌ Missing GitHub token or repository configuration"
+            return nil
+          end
+          
+          # Parse repo name (owner/repo)
+          owner, repo = repo_name.split('/')
+          
+          client = Octokit::Client.new(access_token: github_token)
+          
+          # Create pull request
+          pr = client.create_pull_request(
+            repo_name,
+            target_branch,
+            healing_branch,
+            "CodeHealer: Automated Fix",
+            "This pull request contains automated fixes generated by CodeHealer.\n\n" \
+            "**Please review the changes before merging.**\n\n" \
+            "Generated at: #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"
+          )
+          
+          pr.html_url
+        rescue => e
+          puts "❌ Failed to create pull request: #{e.message}"
+          nil
+        end
+      end
+      
       def clone_strategy
         cfg = CodeHealer::ConfigManager.code_heal_directory_config
         cfg['clone_strategy'] || cfg[:clone_strategy] || "branch"
@@ -207,10 +275,9 @@ module CodeHealer
           puts "🌿 [WORKSPACE] Clone result: #{result ? 'SUCCESS' : 'FAILED'}"
           
           if result
-            puts "🌿 [WORKSPACE] Removing .git to avoid conflicts..."
-            # Remove .git to avoid conflicts
-            FileUtils.rm_rf(File.join(workspace_path, '.git'))
-            puts "🌿 [WORKSPACE] .git removed successfully"
+            puts "🌿 [WORKSPACE] Git repository preserved for healing operations"
+            # Keep .git for Git operations during healing
+            # We'll clean it up later in cleanup_workspace
           else
             puts "🌿 [WORKSPACE] Clone failed, checking workspace..."
             puts "🌿 [WORKSPACE] Workspace exists: #{Dir.exist?(workspace_path)}"
@@ -237,6 +304,7 @@ module CodeHealer
               checkout_result = system("git checkout #{current_branch}")
               puts "🌿 [WORKSPACE] Checkout result: #{checkout_result ? 'SUCCESS' : 'FAILED'}"
             end
+            puts "🌿 [WORKSPACE] Git repository preserved for healing operations"
           else
             puts "🌿 [WORKSPACE] Full repo clone failed"
           end

data/lib/code_healer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodeHealer
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_healer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Deepan Kumar