code_healer 0.1.8 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f73aedfb97cff3da7cb4a3f62b631886ad5cd377796473b705fe86a6311ff74
-  data.tar.gz: 9e7ce1d1b49920f763684844e799724078919f657c559d49e96a2784200323d2
+  metadata.gz: 4c3f51b2e61939becd7c68f57c2f70cb9dacf3b98f8ff62cfa2b3593dc745cfe
+  data.tar.gz: 8acbfcd6a4e3abae5cb96a2f451c01f6dc8ac40ada877fba4ed673962e87ab83
 SHA512:
-  metadata.gz: 6038730a1146276943b9ec4c7e81569a1977873c303c1b36339b589800d55acd1d05beea95808fc34d71cafc0709cfcaaa0fa1940162f9437087baa5a49f0013
-  data.tar.gz: 85a7f04e29e7ae8b4ea0cb7e130432d8b5253f7fe6a0e72baa0cd826bbe6a061ee3787a8bcbe7c9080c70b08aebd8c786701aa6940ecffdff57e20e81881baa1
+  metadata.gz: 892a29730e66d2e207460dd2ede2c93b42114760a509ff05b7e17b5a28545ecb7fe1be0078d16cf7ff1f88a106a99d9e20af8ffd0baa53b8442ce2898363e1e0
+  data.tar.gz: a89f5fccbc969fd0eccc468896c0ff0532868fb9ceb6a22a1e731319f2da2f602e2917f61add01424ea4c1fb869fef47d28b7e78e379d0c52d02e9666e65663e

data/CHANGELOG.md

@@ -5,6 +5,32 @@ 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.12] - 2025-01-14
+
+### Fixed
+- **Duplicate PR creation** - Prevents duplicate pull requests when evolution handler already creates one
+- **PR workflow optimization** - Skips redundant PR creation in healing workspace manager
+
+## [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

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
@@ -121,51 +129,72 @@ module CodeHealer
       end
       
       def create_healing_branch(repo_path, workspace_path, branch_name)
-        puts "🔄 Creating healing branch for code review"
+        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 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)
+            # Check Git status
+            puts "📊 [WORKSPACE] Git status in workspace:"
+            system("git status --porcelain")
             
-            # Commit changes to the healing branch
+            # 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 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
+            # 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 and no PR was already created
             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
+              puts "🔍 [WORKSPACE] Checking if PR was already created by evolution handler..."
+              # Skip PR creation if we're in a healing workflow (PR likely already created)
+              puts "🔍 [WORKSPACE] PR creation skipped - likely already created by evolution handler"
+              puts "🔍 [WORKSPACE] Review the changes and create a pull request when ready"
             else
-              puts "🔍 Review the changes and create a pull request when ready"
+              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
-            
-            healing_branch
           end
         rescue => e
-          puts "❌ Failed to create healing branch: #{e.message}"
+          puts "❌ Failed to create healing branch from workspace: #{e.message}"
           nil
         end
       end
@@ -268,10 +297,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
@@ -291,10 +330,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
@@ -334,18 +383,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.8"
+  VERSION = "0.1.12"
 end

metadata

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