code_healer 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a88b89f7bf244566728987fa8a20b3db2d6ee1e6b0a249956c06907441eb5a13
-  data.tar.gz: 349d7d045fa176d54454d7d42ae354369001eddeee2764cedf9f82c62bf4a49f
+  metadata.gz: c459c5cc71ce5eb54b3a1798f45698c8910c71de4c9359aca6ebe143c90c9b2a
+  data.tar.gz: e521d7a05da6c0653efa4845c4d2e3770569331c699afb5a72b0df5fa7d70d90
 SHA512:
-  metadata.gz: 50dd2dc5f4af17274e9854ea43581a794b55d88d50e2fbc2ffbde5c450dfadc9801929454d4f0f4f34d523c16bb7921f5c060c273d43448f300f8ab3d25e2ad5
-  data.tar.gz: b7f287a9b342cd8ad8e110c4eb480ac7c7f1dbc2b8fc753b272e32ff767eabe8d947b1c790c65cbe9eb13fdac2701aad91ff23ed2c228b53f7729cefbbe36a84
+  metadata.gz: 72c3f09042c407fa37e82e88bae86a3df5fe6c0dd5ad4db832dfa69fe5531da9c2b60e4b5ae2c9e871d97a7b1b0603e205ebda328d4bcf1b88bf2b04c5df3322
+  data.tar.gz: defe95f38e8783909646739c05dc77ac8745847d13a00090fd8665027e506cb423eb367a4cb9ff05c5214594041ab3ba8ba9fe0f590f1231931bd3f28ecf0467

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.19] - 2025-08-21
+
+### Fixed
+- **Critical Git Operations Duplication**: Fixed duplicate Git operations between evolution handler and workspace manager.
+- **Branch Detection**: Fixed automatic detection of repository's default branch (master vs main).
+- **Configuration Loading**: Fixed pr_target_branch configuration loading from both git section and root level.
+- **Workspace Isolation**: Improved Git operations to occur only in isolated workspace, preventing conflicts.
+
+### Changed
+- **Evolution Handler**: Removed duplicate Git operations to prevent conflicts with workspace manager.
+- **Setup Script**: Enhanced with automatic branch detection and better configuration structure.
+
 ## [0.1.18] - 2025-08-21
 
 ### Fixed

data/lib/code_healer/claude_code_evolution_handler.rb

@@ -31,8 +31,9 @@ module CodeHealer
             reload_modified_files
             
             # 🚀 Trigger Git operations (commit, push, PR creation)
-            puts "🔄 Starting Git operations..."
-            trigger_git_operations(error, class_name, method_name, file_path)
+            # Note: Git operations are now handled by the isolated workspace manager
+            # to prevent duplication and ensure proper isolation
+            puts "🔄 Git operations will be handled by isolated workspace manager..."
             
             return true
           else

data/lib/code_healer/config_manager.rb

@@ -189,7 +189,8 @@ module CodeHealer
       end
 
       def pr_target_branch
-        git_settings['pr_target_branch'] || 'main'
+        # Check both git section and root level for backward compatibility
+        git_settings['pr_target_branch'] || config['pr_target_branch'] || 'main'
       end
 
       def commit_message_template

data/lib/code_healer/evolution_job.rb

@@ -25,7 +25,7 @@ class EvolutionJob
           healing_branch = CodeHealer::HealingWorkspaceManager.create_healing_branch(
             Rails.root.to_s, 
             workspace_path, 
-            CodeHealer::ConfigManager.git_settings['pr_target_branch'] || 'main'
+            CodeHealer::ConfigManager.pr_target_branch
           )
           
           if healing_branch

data/lib/code_healer/healing_job.rb

@@ -68,7 +68,7 @@ module CodeHealer
             healing_branch = CodeHealer::HealingWorkspaceManager.create_healing_branch(
               Rails.root.to_s,
               workspace_path,
-              CodeHealer::ConfigManager.git_settings['pr_target_branch'] || 'main'
+              CodeHealer::ConfigManager.pr_target_branch
             )
             git_time_ms = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - git_started_at) * 1000).round
 

data/lib/code_healer/pull_request_creator.rb

@@ -27,7 +27,7 @@ module CodeHealer
           puts "Creating pull request for branch: #{branch_name}"
           
           # Get target branch from configuration
-          target_branch = ConfigManager.pr_target_branch || 'main'
+          target_branch = ConfigManager.pr_target_branch
           puts "📋 Target branch for PR: #{target_branch}"
           
           pr = client.create_pull_request(

data/lib/code_healer/setup.rb

@@ -256,7 +256,17 @@ github_repo_url = normalize_repository_url(github_repo, github_token)
 puts
 puts "🌿 Git Branch Configuration:"
 branch_prefix = ask_for_input("Enter branch prefix for healing branches (default: evolve):", default: "evolve")
-pr_target_branch = ask_for_input("Enter target branch for pull requests (default: main):", default: "main")
+
+# Detect the actual default branch from git
+default_branch = "main"
+if system("git rev-parse --verify master >/dev/null 2>&1")
+  default_branch = "master"
+elsif system("git rev-parse --verify main >/dev/null 2>&1")
+  default_branch = "main"
+end
+
+puts "🔍 Detected default branch: #{default_branch}"
+pr_target_branch = ask_for_input("Enter target branch for pull requests (default: #{default_branch}):", default: default_branch)
 
 # Code Heal Directory Configuration
 puts
@@ -442,7 +452,9 @@ create_file_with_content('.env', env_content, dry_run: options[:dry_run])
       auto_push: true
       branch_prefix: "#{branch_prefix}"
       commit_message_template: 'Fix {{class_name}}\#\#{{method_name}}: {{error_type}}'
-      pr_target_branch: "#{pr_target_branch}"
+    
+    # Pull Request target branch (for backward compatibility)
+    pr_target_branch: "#{pr_target_branch}"
     
     # Pull Request Configuration
     pull_request:

data/lib/code_healer/version.rb

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

metadata

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