claude_swarm 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44d1b33e538b1efaeca7eb223f09bd617fcb4ba2288d7844773ae5908a10248
-  data.tar.gz: 28312f81eada550b05bbf568807be51c5077366c08d168b928a35a4d356148da
+  metadata.gz: 8e0bade0292291825648214e0a1a420241ec1d6ffff018831d131d5c0f532e45
+  data.tar.gz: 74d62b916f1dbde6b725e8990924839c6ace2b6de75cb812f43305d044def7b7
 SHA512:
-  metadata.gz: 2d8ba31f8a64f91060b980ee90bea57c736e4541410eeb36c4c78bdc602f7c3335ea82a388c0b61847a04c90210fb432c2d525df4f4bfa85cbe3725a0034b260
-  data.tar.gz: 15180a4a4df3f9ccc55da9dd40769435c1ba650a575b476c10d7c0b16d650bb1f65524b8d44a10d731e9aed3dcda886b0bb63fd2b64e5665c5ba1cc22633182b
+  metadata.gz: 0f7f0b3dad9bb034a5b1cf07417df7b3cef6dc7fa88d02d4c9617db354ff0f52d7a368f678f0d2502343fdb03112cf8672f68f2dce3a77a46d769f4cc8f0afa6
+  data.tar.gz: d2c81f31e2534e4f92f519ea1b218236d68ed2e08adbd3bfdb2d0569de1a5f80a2f5b2452e3c47b75e6e4441fb70575ca1fbf381d169c0b9ee2aca4b2072c7d6

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [Unreleased]
+
+## [0.3.11]
+
+### Added
+- **Deferred directory validation for before commands**: Directories are now validated after `before` commands run, allowing them to create required directories
+  - Automatically skips initial directory validation when `before` commands are present in configuration
+  - Validates all directories after `before` commands complete successfully
+  - Enables dynamic directory creation workflows without pre-creating directory structures
+
+### Fixed
+- **--root-dir parameter path resolution**: Fixed relative config file paths to be resolved relative to the --root-dir value instead of current directory
+  - Config paths are now expanded using the root directory as the base path
+  - Allows running claude-swarm from any location with consistent path resolution
+  - Absolute paths continue to work as expected regardless of --root-dir setting
+
+### Improved
+- **Enhanced worktree cleanup on errors**: Improved error handling to ensure worktrees are always cleaned up properly
+  - Added comprehensive error handling with cleanup at all failure points
+  - Worktrees are now cleaned up when worktree setup fails, before commands fail, or directory validation fails
+  - Prevents orphaned worktrees that could clutter the system or cause issues with future runs
+
 ## [0.3.10]
 
 ### Added

data/lib/claude_swarm/cli.rb

@@ -42,16 +42,19 @@ module ClaudeSwarm
       type: :string,
       desc: "Root directory for resolving relative paths (defaults to current directory)"
     def start(config_file = nil)
+      # Set root directory early so it's available to all components
+      root_dir = options[:root_dir] || Dir.pwd
+      ENV["CLAUDE_SWARM_ROOT_DIR"] = File.expand_path(root_dir)
+
+      # Resolve config path relative to root directory
       config_path = config_file || "claude-swarm.yml"
+      config_path = File.expand_path(config_path, root_dir)
+
       unless File.exist?(config_path)
         error("Configuration file not found: #{config_path}")
         exit(1)
       end
 
-      # Set root directory early so it's available to all components
-      root_dir = options[:root_dir] || Dir.pwd
-      ENV["CLAUDE_SWARM_ROOT_DIR"] = File.expand_path(root_dir)
-
       say("Starting Claude Swarm from #{config_path}...") unless options[:prompt]
 
       # Validate stream_logs option
@@ -331,7 +334,7 @@ module ClaudeSwarm
         system!("command -v claude > /dev/null 2>&1")
       rescue Error
         error("Claude CLI is not installed or not in PATH")
-        say("To install Claude CLI, visit: https://docs.anthropic.com/en/docs/claude-code")
+        error("To install Claude CLI, visit: https://docs.anthropic.com/en/docs/claude-code")
         exit(1)
       end
 
@@ -508,7 +511,7 @@ module ClaudeSwarm
     private
 
     def error(message)
-      say(message, :red)
+      $stderr.puts(Thor::Shell::Color.new.set_color(message, :red))
     end
 
     def restore_session(session_id)

data/lib/claude_swarm/configuration.rb

@@ -43,15 +43,30 @@ module ClaudeSwarm
       @swarm["after"] || []
     end
 
+    def validate_directories
+      @instances.each do |name, instance|
+        # Validate all directories in the directories array
+        instance[:directories].each do |directory|
+          raise Error, "Directory '#{directory}' for instance '#{name}' does not exist" unless File.directory?(directory)
+        end
+      end
+    end
+
     private
 
+    def has_before_commands?
+      @swarm && @swarm["before"] && !@swarm["before"].empty?
+    end
+
     def load_and_validate
       @config = YAML.load_file(@config_path)
       interpolate_env_vars!(@config)
       validate_version
       validate_swarm
       parse_swarm
-      validate_directories
+      # Skip directory validation if before commands are present
+      # They might create the directories
+      validate_directories unless has_before_commands?
     rescue Errno::ENOENT
       raise Error, "Configuration file not found: #{@config_path}"
     rescue Psych::SyntaxError => e
@@ -273,15 +288,6 @@ module ClaudeSwarm
       visited.add(instance_name)
     end
 
-    def validate_directories
-      @instances.each do |name, instance|
-        # Validate all directories in the directories array
-        instance[:directories].each do |directory|
-          raise Error, "Directory '#{directory}' for instance '#{name}' does not exist" unless File.directory?(directory)
-        end
-      end
-    end
-
     def validate_tool_field(instance_name, config, field_name)
       return unless config.key?(field_name)
 

data/lib/claude_swarm/orchestrator.rb

@@ -73,6 +73,20 @@ module ClaudeSwarm
       # Track start time
       @start_time = Time.now
 
+      begin
+        start_internal
+      rescue StandardError => e
+        # Ensure cleanup happens even on unexpected errors
+        cleanup_processes
+        cleanup_run_symlink
+        cleanup_worktrees
+        raise e
+      end
+    end
+
+    private
+
+    def start_internal
       if @restore_session_path
         non_interactive_output do
           puts "🔄 Restoring Claude Swarm: #{@config.swarm_name}"
@@ -115,16 +129,24 @@ module ClaudeSwarm
 
         # Setup worktrees if needed
         if @worktree_manager
-          non_interactive_output { print("🌳 Setting up Git worktrees...") }
+          begin
+            non_interactive_output { print("🌳 Setting up Git worktrees...") }
 
-          # Get all instances for worktree setup
-          # Note: instances.values already includes the main instance
-          all_instances = @config.instances.values
+            # Get all instances for worktree setup
+            # Note: instances.values already includes the main instance
+            all_instances = @config.instances.values
 
-          @worktree_manager.setup_worktrees(all_instances)
+            @worktree_manager.setup_worktrees(all_instances)
 
-          non_interactive_output do
-            puts "✓ Worktrees created with branch: #{@worktree_manager.worktree_name}"
+            non_interactive_output do
+              puts "✓ Worktrees created with branch: #{@worktree_manager.worktree_name}"
+            end
+          rescue StandardError => e
+            non_interactive_output { print("❌ Failed to setup worktrees: #{e.message}") }
+            cleanup_processes
+            cleanup_run_symlink
+            cleanup_worktrees
+            raise
           end
         end
 
@@ -200,6 +222,20 @@ module ClaudeSwarm
           non_interactive_output do
             puts "✓ Before commands completed successfully"
           end
+
+          # Validate directories after before commands have run
+          begin
+            @config.validate_directories
+            non_interactive_output do
+              puts "✓ All directories validated successfully"
+            end
+          rescue ClaudeSwarm::Error => e
+            non_interactive_output { print("❌ Directory validation failed: #{e.message}") }
+            cleanup_processes
+            cleanup_run_symlink
+            cleanup_worktrees
+            exit(1)
+          end
         end
 
         # Execute main Claude instance with unbundled environment to avoid bundler conflicts
@@ -249,8 +285,6 @@ module ClaudeSwarm
       cleanup_worktrees
     end
 
-    private
-
     def non_interactive_output
       return if @non_interactive_prompt
 

data/lib/claude_swarm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClaudeSwarm
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claude_swarm
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Paulo Arruda