aidp 0.49.15 → 0.49.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0088a7c834709e32224adf25831bfd282f1f9a8019261b9055251699d8b5b99a'
-  data.tar.gz: b00f8596f8cc68cc26f13553a1f1e1c37f0e1d3a6fb7b21dc79ebbc704fede23
+  metadata.gz: 58a524647b6ac1b6ef0c819508de7693794689414d6f5bde4f1cba5cddf8799f
+  data.tar.gz: 6c7da67512e7c04941c0afa6db927b348fcd9f31809526723a107b419ab91866
 SHA512:
-  metadata.gz: dd15f595a34f2d6258eb0c62d787c0bdc78b18f69d09ea9cf7db26846badede64dc469ff9d3adc9a8a99c13d6bf2b3a6ca794744953883000331b380a7bd1de4
-  data.tar.gz: b3d0e0710c139d6a509cc7aaf1b07d205b3c1a35b38c61339fa6b83e3ca5ca14708547a7d0af32cf069841bdc7ded1cb493366ab1f672895056e21452e04dec3
+  metadata.gz: 56a49eaffe7e9f81e0fa4457634814622867fb335e54ac182b4fd31b05c3063ad726790c7376820101e6b57bd2b07c7b4ac6c3ac8b0f69220f248681a0ba8e65
+  data.tar.gz: 610e7e0a8e151208fd5c623a3937974ec3cdab2ca72741d421bb6bab003cb6514ff8dc449d35f52c06ca0083dd3e40b2ef114a54269703137ed00cc95bfefe0b

data/lib/aidp/cli/issue_importer.rb

@@ -120,14 +120,15 @@ module Aidp
     end
 
     def fetch_via_gh_cli(owner, repo, number)
-      cmd = [
+      # Keep the gh CLI and its flags as separate argv entries so the
+      # library-provided owner/repo values are never interpreted by a shell.
+      Aidp.log_debug(COMPONENT, "Running gh cli", owner: owner, repo: repo, number: number, command: "gh issue view")
+      stdout, stderr, status = capture3_with_timeout(
         "gh", "issue", "view", number,
         "--repo", "#{owner}/#{repo}",
-        "--json", "title,body,labels,milestone,comments,state,assignees,number,url"
-      ]
-
-      Aidp.log_debug(COMPONENT, "Running gh cli", owner: owner, repo: repo, number: number, command: cmd.join(" "))
-      stdout, stderr, status = capture3_with_timeout(*cmd, timeout: gh_cli_timeout)
+        "--json", "title,body,labels,milestone,comments,state,assignees,number,url",
+        timeout: gh_cli_timeout
+      )
       Aidp.log_debug(COMPONENT, "Completed gh cli", owner: owner, repo: repo, number: number, exitstatus: status.exitstatus)
 
       unless status.success?
@@ -320,14 +321,17 @@ module Aidp
       false
     end
 
-    def capture3_with_timeout(*cmd, timeout:)
+    # Run a command without shell interpretation: the executable is passed as
+    # a separate leading argument, so shell metacharacters in any argument
+    # value are treated as literal data.
+    def capture3_with_timeout(command, *args, timeout:)
       stdout_str = +""
       stderr_str = +""
       status = nil
       wait_thr = nil
 
       Timeout.timeout(timeout) do
-        Open3.popen3(*cmd) do |stdin, stdout_io, stderr_io, thread|
+        Open3.popen3(command, *args) do |stdin, stdout_io, stderr_io, thread|
           wait_thr = thread
           stdin.close
           stdout_str = stdout_io.read

data/lib/aidp/version.rb

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

data/lib/aidp/watch/repository_client.rb

@@ -23,6 +23,11 @@ module Aidp
 
       attr_reader :owner, :repo
 
+      # `gh` commands are executed in argument form: the executable is passed
+      # as a literal leading argument and every remaining token is a separate
+      # argument, so shell metacharacters in library-provided values
+      # (owner/repo, issue numbers, labels, comment bodies) are treated as
+      # literal data rather than interpreted by a shell.
       def self.parse_issues_url(issues_url)
         case issues_url
         when %r{\Ahttps://github\.com/([^/]+)/([^/]+)(?:/issues)?/?\z}
@@ -382,7 +387,7 @@ module Aidp
           cmd += ["--label", label]
         end
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         unless status.success?
           warn("GitHub CLI list failed: #{stderr}")
           return []
@@ -416,7 +421,7 @@ module Aidp
           fields = %w[number title body comments labels state assignees url updatedAt author]
           cmd = ["gh", "issue", "view", number.to_s, "--repo", full_repo, "--json", fields.join(",")]
 
-          stdout, stderr, status = Open3.capture3(*cmd)
+          stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
           raise "GitHub CLI error: #{stderr.strip}" unless status.success?
 
           data = JSON.parse(stdout)
@@ -442,7 +447,7 @@ module Aidp
         with_gh_retry("post_comment") do
           cmd = ["gh", "api", "repos/#{full_repo}/issues/#{number}/comments",
             "-X", "POST", "-f", "body=#{body}"]
-          stdout, stderr, status = Open3.capture3(*cmd)
+          stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
           raise "Failed to post comment via gh: #{stderr.strip}" unless status.success?
 
           response = JSON.parse(stdout)
@@ -467,7 +472,7 @@ module Aidp
             values.each { |value| cmd.concat([flag, value]) }
           end
 
-          _stdout, stderr, status = Open3.capture3(*cmd)
+          _stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
           raise "Failed to update issue via gh: #{stderr.strip}" unless status.success?
 
           true
@@ -533,7 +538,7 @@ module Aidp
 
       def update_comment_via_gh(comment_id, body)
         cmd = ["gh", "api", "repos/#{full_repo}/issues/comments/#{comment_id}", "-X", "PATCH", "-f", "body=#{body}"]
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to update comment via gh: #{stderr.strip}" unless status.success?
 
         stdout.strip
@@ -557,7 +562,7 @@ module Aidp
       def fetch_comment_reactions_via_gh(comment_id)
         with_gh_retry("fetch_comment_reactions") do
           cmd = ["gh", "api", "repos/#{full_repo}/issues/comments/#{comment_id}/reactions"]
-          stdout, stderr, status = Open3.capture3(*cmd)
+          stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
           raise "Failed to fetch reactions via gh: #{stderr.strip}" unless status.success?
 
           reactions = JSON.parse(stdout)
@@ -651,7 +656,7 @@ module Aidp
           command: cmd.join(" ")
         )
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
 
         Aidp.log_debug(
           "repository_client",
@@ -700,7 +705,7 @@ module Aidp
         cmd = ["gh", "issue", "edit", number.to_s, "--repo", full_repo]
         labels.each { |label| cmd += ["--add-label", label] }
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to add labels via gh: #{stderr.strip}" unless status.success?
 
         stdout.strip
@@ -729,7 +734,7 @@ module Aidp
         cmd = ["gh", "issue", "edit", number.to_s, "--repo", full_repo]
         labels.each { |label| cmd += ["--remove-label", label] }
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to remove labels via gh: #{stderr.strip}" unless status.success?
 
         stdout.strip
@@ -784,7 +789,7 @@ module Aidp
           "-F", "number=#{number}"
         ]
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         unless status.success?
           Aidp.log_warn("repository_client", "Failed to fetch label events via GraphQL", error: stderr.strip)
           return nil
@@ -815,7 +820,7 @@ module Aidp
           cmd += ["--label", label]
         end
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         unless status.success?
           warn("GitHub CLI PR list failed: #{stderr}")
           return []
@@ -848,7 +853,7 @@ module Aidp
         fields = %w[number title body labels state url headRefName baseRefName headRefOid commits author mergeable mergeStateStatus]
         cmd = ["gh", "pr", "view", number.to_s, "--repo", full_repo, "--json", fields.join(",")]
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "GitHub CLI error: #{stderr.strip}" unless status.success?
 
         data = JSON.parse(stdout)
@@ -868,7 +873,7 @@ module Aidp
 
       def fetch_pull_request_diff_via_gh(number)
         cmd = ["gh", "pr", "diff", number.to_s, "--repo", full_repo]
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to fetch PR diff via gh: #{stderr.strip}" unless status.success?
 
         stdout
@@ -891,7 +896,7 @@ module Aidp
       def fetch_pull_request_files_via_gh(number)
         # Use gh api to fetch changed files
         cmd = ["gh", "api", "repos/#{full_repo}/pulls/#{number}/files", "--jq", "."]
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to fetch PR files via gh: #{stderr.strip}" unless status.success?
 
         JSON.parse(stdout).map { |file| normalize_pr_file(file) }
@@ -916,7 +921,7 @@ module Aidp
 
         # Fetch check runs for the commit
         cmd = ["gh", "api", "repos/#{full_repo}/commits/#{head_sha}/check-runs", "--jq", "."]
-        stdout, _stderr, status = Open3.capture3(*cmd)
+        stdout, _stderr, status = Open3.capture3("gh", *cmd[1..])
 
         check_runs = if status.success?
           data = JSON.parse(stdout)
@@ -975,7 +980,7 @@ module Aidp
         else
           # Post general review comment
           cmd = ["gh", "pr", "comment", number.to_s, "--repo", full_repo, "--body", body]
-          stdout, stderr, status = Open3.capture3(*cmd)
+          stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
           raise "Failed to post review comment via gh: #{stderr.strip}" unless status.success?
 
           stdout.strip
@@ -1025,7 +1030,7 @@ module Aidp
 
       def fetch_pr_comments_via_gh(number)
         cmd = ["gh", "api", "repos/#{full_repo}/issues/#{number}/comments", "--jq", "."]
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to fetch PR comments via gh: #{stderr.strip}" unless status.success?
 
         JSON.parse(stdout).map { |raw| normalize_pr_comment(raw) }
@@ -1046,7 +1051,7 @@ module Aidp
 
       def mark_pr_ready_for_review_via_gh(number)
         cmd = ["gh", "pr", "ready", number.to_s, "--repo", full_repo]
-        _stdout, stderr, status = Open3.capture3(*cmd)
+        _stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
 
         unless status.success?
           Aidp.log_warn("repository_client", "mark_pr_ready_failed",
@@ -1065,7 +1070,7 @@ module Aidp
       def request_reviewers_via_gh(number, reviewers:)
         reviewer_args = reviewers.flat_map { |r| ["--add-reviewer", r] }
         cmd = ["gh", "pr", "edit", number.to_s, "--repo", full_repo] + reviewer_args
-        _stdout, stderr, status = Open3.capture3(*cmd)
+        _stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
 
         unless status.success?
           Aidp.log_warn("repository_client", "request_reviewers_failed",
@@ -1111,7 +1116,7 @@ module Aidp
           "-F", "number=#{number}"
         ]
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         unless status.success?
           Aidp.log_warn("repository_client", "pr_label_actor_query_failed",
             pr: number, error: stderr.strip)
@@ -1210,7 +1215,7 @@ module Aidp
 
       def fetch_commit_statuses_via_gh(head_sha)
         cmd = ["gh", "api", "repos/#{full_repo}/commits/#{head_sha}/status", "--jq", "."]
-        stdout, _stderr, status = Open3.capture3(*cmd)
+        stdout, _stderr, status = Open3.capture3("gh", *cmd[1..])
 
         if status.success?
           data = JSON.parse(stdout)
@@ -1918,7 +1923,7 @@ module Aidp
         labels.each { |label| cmd += ["--label", label] }
         assignees.each { |assignee| cmd += ["--assignee", assignee] }
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to create issue via gh: #{stderr.strip}" unless status.success?
 
         # Parse the issue URL to get the number
@@ -1936,7 +1941,7 @@ module Aidp
         Aidp.log_debug("repository_client", "close_issue", issue_number: number)
 
         cmd = ["gh", "issue", "close", number.to_s, "--repo", full_repo]
-        _stdout, stderr, status = Open3.capture3(*cmd)
+        _stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to close issue via gh: #{stderr.strip}" unless status.success?
 
         Aidp.log_debug("repository_client", "close_issue_complete", issue_number: number)
@@ -1963,7 +1968,7 @@ module Aidp
         # Add auto-delete branch flag
         cmd << "--delete-branch"
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         raise "Failed to merge PR via gh: #{stderr.strip}" unless status.success?
 
         Aidp.log_debug("repository_client", "merge_pull_request_complete", number: number)
@@ -1980,7 +1985,7 @@ module Aidp
           cmd += [flag, "#{key}=#{value}"]
         end
 
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
         unless status.success?
           Aidp.log_warn("repository_client", "GraphQL query failed", error: stderr.strip)
           raise "GraphQL query failed: #{stderr.strip}"

data/lib/aidp/watch/repository_safety_checker.rb

@@ -128,7 +128,7 @@ module Aidp
 
       def check_visibility_via_gh
         cmd = ["gh", "repo", "view", @repository_client.full_repo, "--json", "visibility"]
-        stdout, stderr, status = Open3.capture3(*cmd)
+        stdout, stderr, status = Open3.capture3("gh", *cmd[1..])
 
         unless status.success?
           Aidp.log_warn("repository_safety", "failed to check repo visibility via gh",

data/lib/aidp/worktree.rb

@@ -344,7 +344,10 @@ module Aidp
             worktree_path: worktree_path,
             base_branch: effective_base_branch
           )
-          stdout, stderr, status = Dir.chdir(project_dir) { Open3.capture3(*cmd) }
+          # Pass the git subcommand as a separate leading argument so the
+          # library-provided branch and path values are never interpreted
+          # by a shell.
+          stdout, stderr, status = Dir.chdir(project_dir) { Open3.capture3("git", *cmd) }
 
           return if status.success?
 
@@ -367,11 +370,13 @@ module Aidp
         end
       end
 
+      # Build the worktree creation arguments (without the leading "git"),
+      # so the caller can pass them as separate argv entries.
       def build_worktree_command(branch_exists:, branch:, worktree_path:, base_branch:)
         if branch_exists
-          ["git", "worktree", "add", worktree_path, branch]
+          ["worktree", "add", worktree_path, branch]
         else
-          cmd = ["git", "worktree", "add", "-b", branch, worktree_path]
+          cmd = ["worktree", "add", "-b", branch, worktree_path]
           cmd << base_branch if base_branch
           cmd
         end

data/lib/aidp/worktree_branch_manager.rb

@@ -68,7 +68,7 @@ module Aidp
         # 3. Use git worktree list for broader search
         -> {
           begin
-            worktree_list_output = run_git_command(["git", "worktree", "list"])
+            worktree_list_output = run_git_command("git", "worktree", "list")
             worktree_list_output.split("\n").each do |line|
               path, branch_info = line.split(" ", 2)
               return path if branch_info&.include?(branch)
@@ -152,7 +152,7 @@ module Aidp
           if force_recreate
             # Attempt to remove existing worktree
             begin
-              run_git_command(["git", "worktree", "remove", existing_worktree])
+              run_git_command("git", "worktree", "remove", existing_worktree)
               Aidp.log_debug("worktree_branch_manager", "existing_worktree_removed",
                 path: existing_worktree)
             rescue => e
@@ -187,8 +187,8 @@ module Aidp
           Aidp.log_debug("worktree_branch_manager", "create_strategy_remote_tracking",
             branch: effective_branch,
             base_branch: resolved_base_branch)
-          run_git_command(["git", "fetch", "origin", resolved_base_branch])
-          run_git_command(["git", "worktree", "add", "-b", effective_branch, worktree_path, "origin/#{resolved_base_branch}"])
+          run_git_command("git", "fetch", "origin", resolved_base_branch)
+          run_git_command("git", "worktree", "add", "-b", effective_branch, worktree_path, "origin/#{resolved_base_branch}")
         },
 
         # Strategy 2: Create without remote tracking
@@ -196,7 +196,7 @@ module Aidp
           Aidp.log_debug("worktree_branch_manager", "create_strategy_local_branch",
             branch: effective_branch,
             base_branch: resolved_base_branch)
-          run_git_command(["git", "worktree", "add", "-b", effective_branch, worktree_path, resolved_base_branch])
+          run_git_command("git", "worktree", "add", "-b", effective_branch, worktree_path, resolved_base_branch)
         },
 
         # Strategy 3: Checkout existing branch (for when branch already exists)
@@ -204,7 +204,7 @@ module Aidp
           Aidp.log_debug("worktree_branch_manager", "create_strategy_existing_branch",
             branch: effective_branch,
             base_branch: resolved_base_branch)
-          run_git_command(["git", "worktree", "add", worktree_path, effective_branch])
+          run_git_command("git", "worktree", "add", worktree_path, effective_branch)
         }
       ]
 
@@ -317,7 +317,7 @@ module Aidp
       # If PR number is provided, try to get base branch from GitHub
       if pr_number
         begin
-          pr_info_output = run_git_command(["gh", "pr", "view", pr_number.to_s, "--json", "baseRefName"])
+          pr_info_output = run_git_command("gh", "pr", "view", pr_number.to_s, "--json", "baseRefName")
           pr_base_branch = JSON.parse(pr_info_output)["baseRefName"]
           return pr_base_branch if pr_base_branch && !pr_base_branch.empty?
         rescue => e
@@ -328,7 +328,7 @@ module Aidp
 
       # Try to fetch origin branches
       begin
-        run_git_command(["git", "fetch", "origin", default_base_branch])
+        run_git_command("git", "fetch", "origin", default_base_branch)
       rescue => e
         Aidp.log_debug("worktree_branch_manager", "base_branch_fetch_failed",
           base_branch: default_base_branch, error: e.message)
@@ -352,11 +352,12 @@ module Aidp
       end
     end
 
-    def run_git_command(cmd)
+    # Run a command with argv execution so shell metacharacters in any
+    # library-provided value (branch names, paths) are treated as literal
+    # data instead of being interpreted by a shell.
+    def run_git_command(command, *args)
       Dir.chdir(@project_dir) do
-        # Convert string command to array for safe execution (no shell interpolation)
-        args = cmd.is_a?(Array) ? cmd : cmd.split
-        output, status = Open3.capture2e(*args)
+        output, status = Open3.capture2e(command, *args)
         raise StandardError, output unless status.success?
         output
       end
@@ -444,7 +445,7 @@ module Aidp
 
       # Fetch pull request information from GitHub
       begin
-        pr_info_output = run_git_command(["gh", "pr", "view", pr_number.to_s, "--json", "headRefName"])
+        pr_info_output = run_git_command("gh", "pr", "view", pr_number.to_s, "--json", "headRefName")
         pr_branch = JSON.parse(pr_info_output)["headRefName"]
 
         if pr_branch.nil? || pr_branch.empty?

metadata

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