code_healer 0.1.7 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4a7ded404d0efca6e6e111b0186cc2bdeaef8a6eaf4041fd9799fcc447d044
-  data.tar.gz: 95f4317a52fa36bc1aae2923d497a01c282486de0680548a5e80ff1f15ff6468
+  metadata.gz: 4be2602f991eaa2b9952ab40d9b582bb80482b7e1238dfa3b1019649d3a7c67a
+  data.tar.gz: c7762eeafe979d09f1620145f46357b822582770095a1ba7bb7be24645818715
 SHA512:
-  metadata.gz: ad4af34d619b3d1361a61b5dd5e7a285bb9cdc399b72d200209a84ce565f2e7740917878684e4b094254ba3fbc858765e4dc2af2a3d425dd8d343a71e180477e
-  data.tar.gz: 89b963d38d992791a738ff3ab91716939e39a1e8b84d056574bc6ffae504d66e6c192306ba28f5671efeec54967fa0eefca044e17121538055875a91875f4dbd
+  metadata.gz: 29e14dea885f980028dbe1105dd9d188ae547ecaba7a4e6e46332fe1c34af437bbf9351ca868fdbc7afb0d644e3d9a3c38ba38979d2206ca1eaa744a98bc451b
+  data.tar.gz: 7857192ea8f774737b3ed3093679a0cf46f8af3db7e10117aa414bce3e7163b64a247d4446b0fa835191cb58cb204fc405299082790f05bc7885d85fc96ed94b

data/CHANGELOG.md

@@ -5,7 +5,33 @@ 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.7] - 2025-01-14
+## [0.1.11] - 2025-01-14
+
+### Fixed
+- **Repository cloning** - Now clones from GitHub remote URL instead of local path
+- **Git remote configuration** - Ensures workspace has correct GitHub remote for PR creation
+- **Debug information** - Added Git remote and branch debugging in workspace operations
+
+## [0.1.10] - 2025-01-14
+
+### Changed
+- **Complete workspace isolation** - All Git operations now happen in isolated workspace only
+- **No file copying** - Removed file copying between workspace and main repo
+- **Direct PR creation** - Pull requests are created directly from the isolated workspace
+- **Main repo protection** - Main repository is never touched, only the isolated workspace
+
+### Fixed
+- **Git commit workflow** - Added proper change detection before committing
+- **Empty branch prevention** - Delete healing branches when no changes are detected
+- **Enhanced debugging** - Added Git status and diff logging throughout the process
+
+## [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

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

@@ -78,6 +78,14 @@ module CodeHealer
             apply_fix_to_file(file_path, fix[:new_code], class_name, method_name)
           end
           
+          # Show workspace Git status after applying fixes
+          Dir.chdir(workspace_path) do
+            puts "🔧 [WORKSPACE] Git status after fixes:"
+            system("git status --porcelain")
+            puts "🔧 [WORKSPACE] Git diff after fixes:"
+            system("git diff")
+          end
+          
           puts "✅ Fixes applied successfully in workspace"
           true
         rescue => e
@@ -120,36 +128,75 @@ 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 and PR from isolated workspace"
         
         begin
-          # Create healing branch in main repo
-          Dir.chdir(repo_path) do
+          # All Git operations happen in the isolated workspace
+          Dir.chdir(workspace_path) do
+            puts "🌿 [WORKSPACE] Working in isolated workspace: #{workspace_path}"
+            
+            # Debug Git configuration
+            puts "🌿 [WORKSPACE] Git remote origin: #{`git config --get remote.origin.url`.strip}"
+            puts "🌿 [WORKSPACE] Current branch: #{`git branch --show-current`.strip}"
+            
             # Ensure we're on the target branch
             system("git checkout #{branch_name}")
             system("git pull origin #{branch_name}")
             
-            # Create healing branch
+            # Create healing branch in the workspace
             healing_branch = "code-healer-fix-#{Time.now.to_i}"
             system("git checkout -b #{healing_branch}")
             
-            # Copy fixed files from workspace
-            copy_fixed_files(workspace_path, repo_path)
+            # Check Git status
+            puts "📊 [WORKSPACE] Git status in workspace:"
+            system("git status --porcelain")
             
-            # Commit changes
+            # Add all changes (the fixes are already applied in the workspace)
             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
-            system("git push origin #{healing_branch}")
-            
-            puts "✅ Healing branch created: #{healing_branch}"
-            healing_branch
+            # Check if there are changes to commit
+            if system("git diff --cached --quiet") == false
+              puts "📝 [WORKSPACE] Changes detected, committing to healing branch..."
+              commit_message = "Fix applied by CodeHealer: #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"
+              system("git commit -m '#{commit_message}'")
+              
+              # Push healing branch from workspace
+              puts "🚀 [WORKSPACE] Pushing healing branch from workspace..."
+              system("git push origin #{healing_branch}")
+              
+              puts "✅ [WORKSPACE] Healing branch created and pushed: #{healing_branch}"
+              puts "🔒 Main repository (#{repo_path}) remains completely untouched"
+              puts "📝 All changes committed in isolated workspace"
+              
+              # 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 "🔗 [WORKSPACE] Pull request created: #{pr_url}"
+                else
+                  puts "⚠️ [WORKSPACE] Failed to create pull request, but branch is ready"
+                end
+              else
+                puts "🔍 [WORKSPACE] Review the changes and create a pull request when ready"
+              end
+              
+              healing_branch
+            else
+              puts "⚠️ [WORKSPACE] No changes detected in workspace"
+              puts "🔍 This might indicate that:"
+              puts "   - The fixes were not applied to the workspace"
+              puts "   - There was an issue with the healing process"
+              
+              # Delete the empty branch
+              system("git checkout #{branch_name}")
+              system("git branch -D #{healing_branch}")
+              puts "🗑️ [WORKSPACE] Deleted empty healing branch: #{healing_branch}"
+              nil
+            end
           end
         rescue => e
-          puts "❌ Failed to merge fixes back: #{e.message}"
+          puts "❌ Failed to create healing branch from workspace: #{e.message}"
           nil
         end
       end
@@ -197,6 +244,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 +299,20 @@ module CodeHealer
         Dir.chdir(repo_path) do
           current_branch = branch_name || `git branch --show-current`.strip
           puts "🌿 [WORKSPACE] Current branch: #{current_branch}"
-          puts "🌿 [WORKSPACE] Executing: git clone --single-branch --branch #{current_branch} #{repo_path} #{workspace_path}"
           
-          # Clone only the current branch
-          result = system("git clone --single-branch --branch #{current_branch} #{repo_path} #{workspace_path}")
+          # Get the GitHub remote URL instead of local path
+          remote_url = `git config --get remote.origin.url`.strip
+          puts "🌿 [WORKSPACE] Remote origin URL: #{remote_url}"
+          
+          if remote_url.empty?
+            puts "❌ [WORKSPACE] No remote origin found in #{repo_path}"
+            return false
+          end
+          
+          puts "🌿 [WORKSPACE] Executing: git clone --single-branch --branch #{current_branch} #{remote_url} #{workspace_path}"
+          
+          # Clone from GitHub remote URL, not local path
+          result = system("git clone --single-branch --branch #{current_branch} #{remote_url} #{workspace_path}")
           puts "🌿 [WORKSPACE] Clone result: #{result ? 'SUCCESS' : 'FAILED'}"
           
           if result
@@ -230,10 +332,20 @@ module CodeHealer
         Dir.chdir(repo_path) do
           current_branch = branch_name || `git branch --show-current`.strip
           puts "🌿 [WORKSPACE] Target branch: #{current_branch}"
-          puts "🌿 [WORKSPACE] Executing: git clone #{repo_path} #{workspace_path}"
           
-          # Clone full repo
-          result = system("git clone #{repo_path} #{workspace_path}")
+          # Get the GitHub remote URL instead of local path
+          remote_url = `git config --get remote.origin.url`.strip
+          puts "🌿 [WORKSPACE] Remote origin URL: #{remote_url}"
+          
+          if remote_url.empty?
+            puts "❌ [WORKSPACE] No remote origin found in #{repo_path}"
+            return false
+          end
+          
+          puts "🌿 [WORKSPACE] Executing: git clone #{remote_url} #{workspace_path}"
+          
+          # Clone from GitHub remote URL, not local path
+          result = system("git clone #{remote_url} #{workspace_path}")
           puts "🌿 [WORKSPACE] Clone result: #{result ? 'SUCCESS' : 'FAILED'}"
           
           if result
@@ -273,18 +385,10 @@ module CodeHealer
         Dir.glob("**/*.rb")
       end
       
-      def copy_fixed_files(workspace_path, repo_path)
-        # Copy all Ruby files from workspace to repo
-        Dir.glob(File.join(workspace_path, "**/*.rb")).each do |workspace_file|
-          relative_path = workspace_file.sub(workspace_path + "/", "")
-          repo_file = File.join(repo_path, relative_path)
-          
-          if File.exist?(repo_file)
-            FileUtils.cp(workspace_file, repo_file)
-            puts "📁 Copied fixed file: #{relative_path}"
-          end
-        end
-      end
+      # This method is no longer needed since we work entirely in the isolated workspace
+      # def copy_fixed_files(workspace_path, repo_path)
+      #   # Removed - no longer copying files between directories
+      # end
       
       def workspace_expired?(workspace_path, hours)
         return false unless hours && hours > 0

data/lib/code_healer/version.rb

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

metadata

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