aidp 0.23.0 → 0.24.0

data/lib/aidp/worktree.rb

@@ -2,6 +2,7 @@
 
 require "fileutils"
 require "json"
+require "open3"
 require_relative "workstream_state"
 
 module Aidp
@@ -32,16 +33,14 @@ module Aidp
           raise WorktreeExists, "Worktree already exists at #{worktree_path}"
         end
 
-        # Create the worktree
-        cmd = ["git", "worktree", "add", "-b", branch, worktree_path]
-        cmd << base_branch if base_branch
-
-        Dir.chdir(project_dir) do
-          success = system(*cmd, out: File::NULL, err: File::NULL)
-          unless success
-            raise Error, "Failed to create worktree: #{$?.exitstatus}"
-          end
-        end
+        branch_exists = branch_exists?(project_dir, branch)
+        run_worktree_add!(
+          project_dir: project_dir,
+          branch: branch,
+          branch_exists: branch_exists,
+          worktree_path: worktree_path,
+          base_branch: base_branch
+        )
 
         # Initialize .aidp directory in the worktree
         ensure_aidp_dir(worktree_path)
@@ -203,6 +202,64 @@ module Aidp
       def registry_file_path(project_dir)
         File.join(project_dir, ".aidp", "worktrees.json")
       end
+
+      def branch_exists?(project_dir, branch)
+        Dir.chdir(project_dir) do
+          system("git", "show-ref", "--verify", "--quiet", "refs/heads/#{branch}")
+        end
+      end
+
+      def run_worktree_add!(project_dir:, branch:, branch_exists:, worktree_path:, base_branch:)
+        prune_attempted = false
+
+        loop do
+          cmd = build_worktree_command(branch_exists: branch_exists, branch: branch, worktree_path: worktree_path, base_branch: base_branch)
+          stdout, stderr, status = Dir.chdir(project_dir) { Open3.capture3(*cmd) }
+
+          return if status.success?
+
+          error_output = stderr.strip.empty? ? stdout.strip : stderr.strip
+
+          if !branch_exists && branch_already_exists?(error_output, branch)
+            Aidp.log_debug("worktree", "branch_exists_retry", branch: branch)
+            branch_exists = true
+            next
+          end
+
+          if !prune_attempted && missing_registered_worktree?(error_output)
+            Aidp.log_debug("worktree", "prune_missing_worktree", branch: branch, path: worktree_path)
+            Dir.chdir(project_dir) { Open3.capture3("git", "worktree", "prune") }
+            prune_attempted = true
+            next
+          end
+
+          raise Error, "Failed to create worktree (status=#{status.exitstatus}): #{error_output}"
+        end
+      end
+
+      def build_worktree_command(branch_exists:, branch:, worktree_path:, base_branch:)
+        if branch_exists
+          ["git", "worktree", "add", worktree_path, branch]
+        else
+          cmd = ["git", "worktree", "add", "-b", branch, worktree_path]
+          cmd << base_branch if base_branch
+          cmd
+        end
+      end
+
+      def branch_already_exists?(error_output, branch)
+        return false if error_output.nil? || error_output.empty?
+
+        normalized = error_output.downcase
+        normalized.include?("branch '#{branch.downcase}' already exists") ||
+          normalized.include?("a branch named '#{branch.downcase}' already exists")
+      end
+
+      def missing_registered_worktree?(error_output)
+        return false if error_output.nil? || error_output.empty?
+
+        error_output.downcase.include?("missing but already registered worktree")
+      end
     end
   end
 end

data/templates/work_loop/decide_whats_next.md

@@ -0,0 +1,21 @@
+# Decide the Next Work Loop Unit
+
+You are operating inside the Aidp hybrid work loop. Review the recent deterministic outputs, consider the latest agent summary, and choose the next unit by emitting `NEXT_UNIT: <unit_name>` on its own line.
+
+## Deterministic Outputs
+
+{{DETERMINISTIC_OUTPUTS}}
+
+## Previous Agent Summary
+
+{{PREVIOUS_AGENT_SUMMARY}}
+
+## Guidance
+
+- Pick whichever unit will unblock progress the fastest. Options include deterministic unit names (`run_full_tests`, `run_lint`, etc.), `agentic` to resume coding, or `wait_for_github` if the system must await an external event.
+- Cite concrete evidence from the outputs above when selecting a unit so future readers understand the decision.
+- Keep the rationale tight—two or three sentences max.
+
+## Rationale
+
+Provide the reasoning for your `NEXT_UNIT` decision here.

data/templates/work_loop/diagnose_failures.md

@@ -0,0 +1,21 @@
+# Diagnose Recent Failures
+
+You are operating inside the Aidp work loop. Analyze the most recent deterministic failures and decide how to unblock progress. Finish by emitting `NEXT_UNIT: <unit_name>` on its own line.
+
+## Recent Deterministic Outputs
+
+{{DETERMINISTIC_OUTPUTS}}
+
+## Previous Agent Summary
+
+{{PREVIOUS_AGENT_SUMMARY}}
+
+## Instructions
+
+- Identify the concrete failures and hypothesize root causes.
+- Propose the next best action (run another deterministic unit, resume agentic editing, or wait for GitHub updates).
+- Keep the analysis crisp—focus on evidence and required follow-up work.
+
+## Analysis
+
+Summarize key findings here, then state your `NEXT_UNIT` decision.

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: aidp
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Bart Agapinan
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -231,7 +231,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/aidp
+- exe/aidp
 - lib/aidp.rb
 - lib/aidp/analyze/error_handler.rb
 - lib/aidp/analyze/feature_analyzer.rb
@@ -297,6 +297,7 @@ files:
 - lib/aidp/harness/provider_factory.rb
 - lib/aidp/harness/provider_info.rb
 - lib/aidp/harness/provider_manager.rb
+- lib/aidp/harness/provider_metrics.rb
 - lib/aidp/harness/provider_type_checker.rb
 - lib/aidp/harness/runner.rb
 - lib/aidp/harness/simple_user_interface.rb
@@ -347,10 +348,13 @@ files:
 - lib/aidp/prompt_optimization/style_guide_indexer.rb
 - lib/aidp/prompt_optimization/template_indexer.rb
 - lib/aidp/provider_manager.rb
+- lib/aidp/providers/adapter.rb
 - lib/aidp/providers/anthropic.rb
 - lib/aidp/providers/base.rb
+- lib/aidp/providers/capability_registry.rb
 - lib/aidp/providers/codex.rb
 - lib/aidp/providers/cursor.rb
+- lib/aidp/providers/error_taxonomy.rb
 - lib/aidp/providers/gemini.rb
 - lib/aidp/providers/github_copilot.rb
 - lib/aidp/providers/opencode.rb
@@ -360,6 +364,7 @@ files:
 - lib/aidp/setup/devcontainer/generator.rb
 - lib/aidp/setup/devcontainer/parser.rb
 - lib/aidp/setup/devcontainer/port_manager.rb
+- lib/aidp/setup/provider_registry.rb
 - lib/aidp/setup/wizard.rb
 - lib/aidp/skills.rb
 - lib/aidp/skills/composer.rb
@@ -438,6 +443,8 @@ files:
 - templates/skills/product_strategist/SKILL.md
 - templates/skills/repository_analyst/SKILL.md
 - templates/skills/test_analyzer/SKILL.md
+- templates/work_loop/decide_whats_next.md
+- templates/work_loop/diagnose_failures.md
 homepage: https://github.com/viamin/aidp
 licenses:
 - MIT