aidp 0.49.8 → 0.49.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15551574a43168d1adfd3157dd3f8981c17972953e7f5285b355358e7cdc288
-  data.tar.gz: 37ef9124f109f9a615da64d86e938324bc4751322d7e32bfd39c9a93eb2f77f2
+  metadata.gz: 152b6f4bd772dffcdd49bff974dc989b987e16e1d5a2a6cbc28ff0017eb654ad
+  data.tar.gz: 6163f77e46235f25748344bd675e8ccd221a6ce56d0322d63da1e93969ffc903
 SHA512:
-  metadata.gz: b1b634b25d0aacea5def51a4e57ccc26a636fed79d144a7e6fdd8ebe248ee735abe57446e0ba98ae369dfd150cfad3abbb309dd8455be315afe7d2cd48fe1c35
-  data.tar.gz: 1b61e3ff6de42b5008c44fe96ad786fdc5fee5ea25ccec925d754dd055ab59c87b4c218fb2af03a5ad6284f2a7fed9fc3fa4aa00873fed6cfc25028416d04768
+  metadata.gz: fcde2af278ae33285b683948d102eecb16b38bd40d121135c80fceab6ed01908be325ce7cb2ff266d5e4399a9f1127b6aae538ad7eedf8442c46bd7630c3bdfe
+  data.tar.gz: a2d8a65e046f8bb81bcb4ec50bbf6838fe6119beb4872bec33f4249db67c107809fa12e65aeaa4452bd8b02e41be3bde74f2956a8faa6b0c70e0bfd4b3240f06

data/lib/aidp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aidp
-  VERSION = "0.49.8"
+  VERSION = "0.49.9"
 end

data/lib/aidp/watch/rebase_processor.rb

@@ -1,3 +1,4 @@
+require "open3"
 require "aidp/watch/base_processor"
 require "aidp/worktree"
 require "aidp/pr_worktree_manager"
@@ -116,11 +117,12 @@ module Aidp
         # Use PRWorktreeManager's method to perform rebase and conflict resolution
         with_worktree_context(worktree_path) do
           # Fetch the latest changes
-          @shell_executor.system("git fetch origin")
+          @shell_executor.system("git", "fetch", "origin")
 
-          # Attempt to rebase
-          rebase_command = "git rebase origin/#{base_branch}"
-          rebase_output = @shell_executor.system(rebase_command)
+          # Attempt to rebase. Pass args as separate argv entries (not an
+          # interpolated shell string) so branch names can never be
+          # interpreted by a shell.
+          rebase_output = @shell_executor.system("git", "rebase", "origin/#{base_branch}")
 
           unless rebase_output
             # Conflict resolution using AI
@@ -134,9 +136,8 @@ module Aidp
               if resolution
                 # Stage resolved files and continue rebase
                 # GIT_EDITOR=true prevents editor from opening during automated rebase
-                quoted_files = conflict_files.map { |f| "\"#{f}\"" }.join(" ")
-                @shell_executor.system("git add #{quoted_files}")
-                @shell_executor.system({"GIT_EDITOR" => "true"}, "git rebase --continue")
+                @shell_executor.system("git", "add", *conflict_files)
+                @shell_executor.system({"GIT_EDITOR" => "true"}, "git", "rebase", "--continue")
               else
                 return false
               end
@@ -147,15 +148,19 @@ module Aidp
           end
 
           # Push the rebased branch
-          @shell_executor.system("git push -f origin #{head_branch}")
+          @shell_executor.system("git", "push", "-f", "origin", head_branch)
         end
 
         true
       end
 
       def detect_conflicting_files(worktree_path)
-        # Use git to list conflicting files
-        `cd #{worktree_path} && git diff --name-only --diff-filter=U`.split("\n")
+        # Use git to list conflicting files. Argv form avoids shell
+        # interpretation of worktree_path or any file names in the output.
+        stdout, _stderr, _status = Dir.chdir(worktree_path) do
+          Open3.capture3("git", "diff", "--name-only", "--diff-filter=U")
+        end
+        stdout.split("\n")
       end
 
       def resolve_conflicts(worktree_path, base_branch, conflict_files)
@@ -189,8 +194,10 @@ module Aidp
 
         # Stage and continue rebase
         # GIT_EDITOR=true prevents editor from opening during automated rebase
-        @shell_executor.system("cd #{worktree_path} && git add .")
-        @shell_executor.system({"GIT_EDITOR" => "true"}, "cd #{worktree_path} && git rebase --continue")
+        Dir.chdir(worktree_path) do
+          @shell_executor.system("git", "add", ".")
+          @shell_executor.system({"GIT_EDITOR" => "true"}, "git", "rebase", "--continue")
+        end
       end
 
       def post_rebase_status(pr_number, rebase_result, error_detail = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aidp
 version: !ruby/object:Gem::Version
-  version: 0.49.8
+  version: 0.49.9
 platform: ruby
 authors:
 - Bart Agapinan