claude_swarm 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aaf0eadabd67afb0bd79738de8c7fcbfb65887d477a2c0c002017cff9de15ec
-  data.tar.gz: 777f04c044a2204477d1328dc31b0b5361fa0007d0cf637254d3531260e3149d
+  metadata.gz: fdad008c72dacb5ca491dc7c6b912c4bc8d46c7f2b578b3762ed7b5e09b4e3f4
+  data.tar.gz: a426057ff0bb859cd56a0bec71e80d02c1232fe6eb69a74e47ed3044f7121a58
 SHA512:
-  metadata.gz: cb39225f7a1f4cfd7c0d7e0e3068ad5527473a04744ed0d18525b37452e7b7d4fe67c83f03fbb5c662591e51ed9c10a2360c5943676dc944ea83680652c977b7
-  data.tar.gz: 807b10f87678f4f49df363fbcc53bf3a71d14848adf2ebbad1d701737aad8f9ce6b894ebe7f6e84c45234a1f414ec1c1d171b79189090b6d6de2a71df00e05a7
+  metadata.gz: b7fb86ea647403073665b860dde694ef2ae0c983f8fc011189d999f97d57e8b80f552b9e736b1f46cb888ac3c4877666dac060e1335db39bd2719f120ad35937
+  data.tar.gz: f1670e4c35e9681054dbe5ab2bcc87d7ef24a6ad4f33a21d3e445c32cb1e917eedbc2984c483b06750469fa08e8256109693a121f337ff813a8ff1944ecc42f1

data/.rubocop.yml

@@ -37,6 +37,9 @@ Naming/AccessorMethodName:
 Metrics/BlockLength:
   Enabled: false
 
+Metrics/BlockNesting:
+  Enabled: false  
+
 Metrics/ClassLength:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## [0.1.20]
+
+### Added
+- **External worktree directory**: Git worktrees are now created in `~/.claude-swarm/worktrees/` for better isolation from the main repository
+  - Prevents conflicts with bundler and other tools
+  - Each unique Git repository gets its own worktree with the same name
+  - Session metadata tracks worktree information for restoration
+- **Zeitwerk autoloading**: Implemented Zeitwerk for better code organization and loading
+
+### Changed
+- **Improved team coordination**: Removed circular dependencies in team configurations
+- **Better code organization**: Refactored code structure to work with Zeitwerk autoloading
+
+### Internal
+- Updated Gemfile.lock to include zeitwerk dependency
+- Added prompt best practices documentation
+
+## [0.1.19]
+
+### Added
+- **Interactive configuration generator**: New `claude-swarm generate` command launches Claude to help create swarm configurations
+  - Runs Claude in interactive mode with an initial prompt to guide configuration creation
+  - Customizable output file with `-o/--output` option
+  - When no output file is specified, Claude names the file based on the swarm's function (e.g., web-dev-swarm.yml, data-pipeline-swarm.yml)
+  - Model selection with `-m/--model` option (default: sonnet)
+  - Checks for Claude CLI installation and provides helpful error message if not found
+  - Includes comprehensive initial prompt with Claude Swarm overview, best practices, and common patterns
+  - Full README content is included in the prompt within `<full_readme>` tags for complete context
+  - Examples: 
+    - `claude-swarm generate` - Claude names file based on swarm function
+    - `claude-swarm generate -o my-team.yml --model opus` - Custom file and model
+
+### Fixed
+- **ps command path display**: The `claude-swarm ps` command now shows expanded absolute paths instead of raw YAML values
+  - Relative paths like `.` are expanded to their full absolute paths (e.g., `/Users/paulo/project`)
+  - Multiple directories are properly expanded and displayed as comma-separated values
+  - Worktree directories are correctly shown when sessions use worktrees (e.g., `/path/to/repo/.worktrees/feature-branch`)
+  - Path resolution uses the start_directory from session metadata for accurate expansion
+
 ## [0.1.18]
 
 ### Added

data/CLAUDE.md

@@ -71,14 +71,15 @@ instances:
 ```
 
 ### Worktree Behavior
-- Worktrees are created inside each repository in a `.worktrees/` directory
-- A `.gitignore` file is automatically created inside `.worktrees/` to ignore all contents
+- Worktrees are created in external directory: `~/.claude-swarm/worktrees/[session_id]/[repo_name-hash]/[worktree_name]`
+- This ensures proper isolation from the main repository and avoids conflicts with bundler and other tools
 - Each unique Git repository gets its own worktree with the same name
 - All instance directories are mapped to their worktree equivalents
 - Worktrees are automatically cleaned up when the swarm exits
 - Session metadata tracks worktree information for restoration
 - Non-Git directories are used as-is without creating worktrees
 - Existing worktrees with the same name are reused
+- The `claude-swarm clean` command removes orphaned worktrees
 
 ## Architecture
 

data/README.md

@@ -27,7 +27,13 @@ Claude Swarm orchestrates multiple Claude Code instances as a collaborative AI d
 
 ## Installation
 
-Install the gem by executing:
+Install [Claude CLI](https://docs.anthropic.com/en/docs/claude-code/overview) if you haven't already:
+
+```bash
+npm install -g @anthropic-ai/claude-code
+```
+
+Install this gem by executing:
 
 ```bash
 gem install claude_swarm
@@ -55,7 +61,7 @@ bundle install
 
 ### Quick Start
 
-1. Run `claude-swarm init` or create a `claude-swarm.yml` file in your project:
+1. Run `claude-swarm init` to create a basic template, or use `claude-swarm generate` for an interactive configuration experience with Claude's help. You can also manually create a `claude-swarm.yml` file in your project:
 
 ```yaml
 version: 1
@@ -522,17 +528,16 @@ swarm:
 
 #### Git Worktrees
 
-Claude Swarm supports running instances in Git worktrees, allowing isolated work without affecting your main repository state. Worktrees are created inside each repository in a `.worktrees/` directory following Git best practices.
+Claude Swarm supports running instances in Git worktrees, allowing isolated work without affecting your main repository state. Worktrees are created in an external directory (`~/.claude-swarm/worktrees/`) to ensure proper isolation from the main repository and avoid conflicts with bundler and other tools.
 
 **Example Structure:**
 ```
-my-repo/
-├── .git/
-├── .worktrees/        (created by Claude Swarm)
-│   ├── .gitignore     (auto-created, contains "*")
-│   └── feature-x/     (worktree for feature-x branch)
-├── src/
-└── tests/
+~/.claude-swarm/worktrees/
+└── [session_id]/
+    ├── my-repo-[hash]/
+    │   └── feature-x/     (worktree for feature-x branch)
+    └── other-repo-[hash]/
+        └── feature-x/     (worktree for feature-x branch)
 ```
 
 **CLI Option:**
@@ -577,14 +582,14 @@ swarm:
 - Omitted - Follows CLI behavior (use worktree if `--worktree` is specified)
 
 **Notes:**
-- Worktrees are created inside each repository in a `.worktrees/` directory
 - Auto-generated worktree names use the session ID (e.g., `worktree-20241206_143022`)
 - This makes it easy to correlate worktrees with their Claude Swarm sessions
-- A `.gitignore` file is automatically created inside `.worktrees/` to ignore all worktree contents
+- Worktrees are stored externally in `~/.claude-swarm/worktrees/[session_id]/`
 - All worktrees are automatically cleaned up when the swarm exits
 - Worktrees with the same name across different repositories share that name
 - Non-Git directories are unaffected by worktree settings
 - Existing worktrees with the same name are reused
+- The `claude-swarm clean` command also removes orphaned worktrees
 
 ### Command Line Options
 
@@ -612,6 +617,15 @@ claude-swarm --worktree                  # Auto-generated name (worktree-SESSION
 claude-swarm --worktree feature-branch   # Custom worktree name
 claude-swarm -w                          # Short form
 
+# Initialize a new configuration file
+claude-swarm init
+claude-swarm init --force  # Overwrite existing file
+
+# Generate configuration interactively with Claude's help
+claude-swarm generate                       # Claude names file based on swarm function
+claude-swarm generate -o my-swarm.yml       # Custom output file
+claude-swarm generate --model opus          # Use a specific model
+
 # Show version
 claude-swarm version
 
@@ -643,10 +657,10 @@ claude-swarm watch 20250617_235233 -n 50
 claude-swarm list-sessions
 claude-swarm list-sessions --limit 20
 
-# Clean up stale session symlinks
+# Clean up stale session symlinks and orphaned worktrees
 claude-swarm clean
 
-# Remove sessions older than 30 days
+# Remove sessions and worktrees older than 30 days
 claude-swarm clean --days 30
 ```
 

data/claude-swarm.yml

@@ -1,14 +1,64 @@
 version: 1
 swarm:
-  name: "Swarm Name"
-  main: claude_swarm_architect
+  name: "Codex CLI Integration Team"
+  main: claude_swarm_developer
   instances:
-    claude_swarm_architect:
-      description: "Lead architect"
+    claude_swarm_developer:
+      description: "Claude Swarm developer implementing Codex CLI integration to enable OpenAI model support"
       directory: .
       model: opus
-      prompt: "You are an expert in Claude swarm architecture"
       vibe: true
-      connections: [claudeception_architect]
+      connections: [codex_cli_expert]
+      prompt: |
+        You are an expert Claude Swarm developer responsible for integrating Codex CLI functionality into Claude Swarm to enable the use of OpenAI models alongside Claude models.
 
-    
+        Your primary objectives:
+        1. Work closely with the codex_cli_expert to understand how Codex CLI works
+        2. Design and implement the integration of Codex CLI into Claude Swarm
+        3. Ensure seamless interoperability between Claude and OpenAI models in swarm configurations
+        4. Extend the YAML configuration format to support OpenAI model specifications
+        5. Implement the necessary Ruby code to launch and manage Codex CLI instances
+        6. Ensure proper session management and MCP communication for Codex instances
+        7. Update documentation and examples to showcase the new capabilities
+
+        When working on this integration:
+        - First, consult with the codex_cli_expert to understand Codex CLI's architecture, API, and usage patterns
+        - Identify the key integration points and design patterns needed
+        - Implement the changes incrementally, testing as you go
+        - Consider backward compatibility with existing Claude Swarm configurations
+        - Think about how users will specify OpenAI models in their swarm configurations
+
+        For maximum efficiency, whenever you need to perform multiple independent operations, invoke all relevant tools simultaneously rather than sequentially.
+
+        Start by asking the codex_cli_expert for a comprehensive overview of how Codex CLI works, its command-line interface, configuration format, and any relevant APIs or extension points.
+
+    codex_cli_expert:
+      description: "Codex CLI expert providing detailed information about Codex CLI architecture and integration points"
+      directory: /Users/paulo/src/github.com/openai/codex
+      model: opus
+      vibe: true
+      prompt: |
+        You are an expert on the Codex CLI codebase with deep knowledge of its architecture, implementation, and usage patterns. Your role is to help understand how Codex CLI works so they can integrate it into Claude Swarm.
+
+        Your responsibilities:
+        1. Analyze and explain the Codex CLI codebase structure and architecture
+        2. Document the command-line interface, flags, and configuration options
+        3. Identify key APIs, interfaces, and extension points that could be used for integration
+        4. Explain how Codex CLI manages sessions, contexts, and model interactions
+        5. Provide code examples and usage patterns
+        6. Suggest integration strategies based on your understanding of both systems
+        7. Answer any technical questions about Codex CLI implementation details
+
+        When analyzing the codebase:
+        - Start with a high-level overview of the project structure
+        - Examine the main entry points and command processing logic
+        - Look for configuration file formats and parsing logic
+        - Understand how Codex CLI communicates with OpenAI models
+        - Identify any MCP or similar protocol support
+        - Look for session management and state persistence features
+        - Look for logging output, log streams, log to a file, JSON logs, verbose mode, etc.
+        - Check for any existing integration or extension mechanisms
+
+        For maximum efficiency, whenever you need to perform multiple independent operations, invoke all relevant tools simultaneously rather than sequentially.
+
+        Be proactive in providing comprehensive information. Don't wait to be asked for every detail - anticipate what the claude_swarm_developer will need to know for a successful integration.

data/examples/monitoring-demo.yml

@@ -6,7 +6,7 @@ swarm:
     coordinator:
       description: "Main coordinator managing the team"
       directory: .
-      model: haiku
+      model: sonnet
       connections: [analyzer, reporter]
       prompt: "You coordinate analysis and reporting tasks"
       allowed_tools: [Read, Edit]
@@ -14,13 +14,13 @@ swarm:
     analyzer:
       description: "Data analyzer processing information"
       directory: ./data
-      model: haiku  
+      model: sonnet  
       prompt: "You analyze data and provide insights"
       allowed_tools: [Read, Bash]
     
     reporter:
       description: "Report generator creating summaries"
       directory: ./reports
-      model: haiku
+      model: sonnet
       prompt: "You generate reports from analysis"
-      allowed_tools: [Write, Edit]
+      allowed_tools: [Write, Edit]

data/lib/claude_swarm/claude_code_executor.rb

@@ -4,7 +4,6 @@ require "json"
 require "open3"
 require "logger"
 require "fileutils"
-require_relative "session_path"
 
 module ClaudeSwarm
   class ClaudeCodeExecutor

data/lib/claude_swarm/claude_mcp_server.rb

@@ -2,11 +2,6 @@
 
 require "fast_mcp_annotations"
 require "json"
-require_relative "claude_code_executor"
-require_relative "task_tool"
-require_relative "session_info_tool"
-require_relative "reset_session_tool"
-require_relative "process_tracker"
 
 module ClaudeSwarm
   class ClaudeMcpServer

data/lib/claude_swarm/cli.rb

@@ -2,13 +2,11 @@
 
 require "thor"
 require "json"
-require_relative "configuration"
-require_relative "mcp_generator"
-require_relative "orchestrator"
-require_relative "claude_mcp_server"
+require "erb"
 
 module ClaudeSwarm
   class CLI < Thor
+    include SystemUtils
     def self.exit_on_failure?
       true
     end
@@ -200,6 +198,39 @@ module ClaudeSwarm
       say "Edit this file to configure your swarm, then run 'claude-swarm' to start"
     end
 
+    desc "generate", "Launch Claude to help generate a swarm configuration interactively"
+    method_option :output, aliases: "-o", type: :string,
+                           desc: "Output file path for the generated configuration"
+    method_option :model, aliases: "-m", type: :string, default: "sonnet",
+                          desc: "Claude model to use for generation"
+    def generate
+      # Check if claude command exists
+      begin
+        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"
+        exit 1
+      end
+
+      # Read README for context about claude-swarm capabilities
+      readme_path = File.join(__dir__, "../../README.md")
+      readme_content = File.exist?(readme_path) ? File.read(readme_path) : ""
+
+      # Build the pre-prompt
+      preprompt = build_generation_prompt(readme_content, options[:output])
+
+      # Launch Claude in interactive mode with the initial prompt
+      cmd = [
+        "claude",
+        "--model", options[:model],
+        preprompt
+      ]
+
+      # Execute and let the user take over
+      exec(*cmd)
+    end
+
     desc "version", "Show Claude Swarm version"
     def version
       say "Claude Swarm #{VERSION}"
@@ -207,49 +238,30 @@ module ClaudeSwarm
 
     desc "ps", "List running Claude Swarm sessions"
     def ps
-      require_relative "commands/ps"
       Commands::Ps.new.execute
     end
 
     desc "show SESSION_ID", "Show detailed session information"
     def show(session_id)
-      require_relative "commands/show"
       Commands::Show.new.execute(session_id)
     end
 
-    desc "clean", "Remove stale session symlinks"
+    desc "clean", "Remove stale session symlinks and orphaned worktrees"
     method_option :days, aliases: "-d", type: :numeric, default: 7,
                          desc: "Remove sessions older than N days"
     def clean
-      run_dir = File.expand_path("~/.claude-swarm/run")
-      unless Dir.exist?(run_dir)
-        say "No run directory found", :yellow
-        return
-      end
+      # Clean stale symlinks
+      cleaned_symlinks = clean_stale_symlinks(options[:days])
 
-      cleaned = 0
-      Dir.glob("#{run_dir}/*").each do |symlink|
-        next unless File.symlink?(symlink)
-
-        begin
-          # Remove if target doesn't exist (stale)
-          unless File.exist?(File.readlink(symlink))
-            File.unlink(symlink)
-            cleaned += 1
-            next
-          end
+      # Clean orphaned worktrees
+      cleaned_worktrees = clean_orphaned_worktrees(options[:days])
 
-          # Remove if older than specified days
-          if File.stat(symlink).mtime < Time.now - (options[:days] * 86_400)
-            File.unlink(symlink)
-            cleaned += 1
-          end
-        rescue StandardError
-          # Skip problematic symlinks
-        end
+      if cleaned_symlinks.positive? || cleaned_worktrees.positive?
+        say "Cleaned #{cleaned_symlinks} stale symlink#{"s" unless cleaned_symlinks == 1}", :green
+        say "Cleaned #{cleaned_worktrees} orphaned worktree#{"s" unless cleaned_worktrees == 1}", :green
+      else
+        say "No cleanup needed", :green
       end
-
-      say "Cleaned #{cleaned} stale session#{"s" unless cleaned == 1}", :green
     end
 
     desc "watch SESSION_ID", "Watch session logs"
@@ -445,5 +457,92 @@ module ClaudeSwarm
 
       nil
     end
+
+    def clean_stale_symlinks(days)
+      run_dir = File.expand_path("~/.claude-swarm/run")
+      return 0 unless Dir.exist?(run_dir)
+
+      cleaned = 0
+      Dir.glob("#{run_dir}/*").each do |symlink|
+        next unless File.symlink?(symlink)
+
+        begin
+          # Remove if target doesn't exist (stale)
+          unless File.exist?(File.readlink(symlink))
+            File.unlink(symlink)
+            cleaned += 1
+            next
+          end
+
+          # Remove if older than specified days
+          if File.stat(symlink).mtime < Time.now - (days * 86_400)
+            File.unlink(symlink)
+            cleaned += 1
+          end
+        rescue StandardError
+          # Skip problematic symlinks
+        end
+      end
+
+      cleaned
+    end
+
+    def clean_orphaned_worktrees(days)
+      worktrees_dir = File.expand_path("~/.claude-swarm/worktrees")
+      return 0 unless Dir.exist?(worktrees_dir)
+
+      sessions_dir = File.expand_path("~/.claude-swarm/sessions")
+      cleaned = 0
+
+      Dir.glob("#{worktrees_dir}/*").each do |session_worktree_dir|
+        session_id = File.basename(session_worktree_dir)
+
+        # Skip if session still exists
+        next if Dir.glob("#{sessions_dir}/*/#{session_id}").any? { |path| File.exist?(File.join(path, "config.yml")) }
+
+        # Check age of worktree directory
+        begin
+          if File.stat(session_worktree_dir).mtime < Time.now - (days * 86_400)
+            # Remove all git worktrees in this session directory
+            Dir.glob("#{session_worktree_dir}/*/*").each do |worktree_path|
+              next unless File.directory?(worktree_path)
+
+              # Try to find the git repo and remove the worktree properly
+              git_dir = File.join(worktree_path, ".git")
+              if File.exist?(git_dir)
+                # Read the gitdir file to find the repo
+                gitdir_content = File.read(git_dir).strip
+                if gitdir_content.start_with?("gitdir:")
+                  repo_git_path = gitdir_content.sub("gitdir: ", "")
+                  # Extract repo path from .git/worktrees path
+                  repo_path = repo_git_path.split("/.git/worktrees/").first
+
+                  # Try to remove worktree via git
+                  system!("git", "-C", repo_path, "worktree", "remove", worktree_path, "--force",
+                          out: File::NULL, err: File::NULL)
+                end
+              end
+
+              # Force remove directory if it still exists
+              FileUtils.rm_rf(worktree_path)
+            end
+
+            # Remove the session worktree directory
+            FileUtils.rm_rf(session_worktree_dir)
+            cleaned += 1
+          end
+        rescue StandardError => e
+          say "Warning: Failed to clean worktree directory #{session_worktree_dir}: #{e.message}", :yellow if options[:debug]
+        end
+      end
+
+      cleaned
+    end
+
+    def build_generation_prompt(readme_content, output_file)
+      template_path = File.expand_path("templates/generation_prompt.md.erb", __dir__)
+      template = File.read(template_path)
+      ERB.new(template, trim_mode: "-").result(binding)
+    end
   end
 end

data/lib/claude_swarm/commands/ps.rb

@@ -86,6 +86,11 @@ module ClaudeSwarm
         swarm_name = config.dig("swarm", "name") || "Unknown"
         main_instance = config.dig("swarm", "main")
 
+        # Get base directory from session metadata or start_directory file
+        base_dir = Dir.pwd
+        start_dir_file = File.join(session_dir, "start_directory")
+        base_dir = File.read(start_dir_file).strip if File.exist?(start_dir_file)
+
         # Get all directories - handle both string and array formats
         dir_config = config.dig("swarm", "instances", main_instance, "directory")
         directories = if dir_config.is_a?(Array)
@@ -93,7 +98,16 @@ module ClaudeSwarm
                       else
                         [dir_config || "."]
                       end
-        directories_str = directories.join(", ")
+
+        # Expand paths relative to the base directory
+        expanded_directories = directories.map do |dir|
+          File.expand_path(dir, base_dir)
+        end
+
+        # Check for worktree information in session metadata
+        expanded_directories = apply_worktree_paths(expanded_directories, session_dir)
+
+        directories_str = expanded_directories.join(", ")
 
         # Calculate total cost from JSON log
         total_cost = calculate_total_cost(session_dir)
@@ -143,6 +157,44 @@ module ClaudeSwarm
       def truncate(str, length)
         str.length > length ? "#{str[0...length - 2]}.." : str
       end
+
+      def apply_worktree_paths(directories, session_dir)
+        session_metadata_file = File.join(session_dir, "session_metadata.json")
+        return directories unless File.exist?(session_metadata_file)
+
+        metadata = JSON.parse(File.read(session_metadata_file))
+        worktree_info = metadata["worktree"]
+        return directories unless worktree_info && worktree_info["enabled"]
+
+        # Get the created worktree paths
+        created_paths = worktree_info["created_paths"] || {}
+
+        # For each directory, find the appropriate worktree path
+        directories.map do |dir|
+          # Find if this directory has a worktree created
+          repo_root = find_git_root(dir)
+          next dir unless repo_root
+
+          # Look for a worktree with this repo root
+          worktree_key = created_paths.keys.find { |key| key.start_with?("#{repo_root}:") }
+          worktree_key ? created_paths[worktree_key] : dir
+        end
+      end
+
+      def worktree_path_for(dir, worktree_name)
+        git_root = find_git_root(dir)
+        git_root ? File.join(git_root, ".worktrees", worktree_name) : dir
+      end
+
+      def find_git_root(dir)
+        current = File.expand_path(dir)
+        while current != "/"
+          return current if File.exist?(File.join(current, ".git"))
+
+          current = File.dirname(current)
+        end
+        nil
+      end
     end
   end
 end

data/lib/claude_swarm/mcp_generator.rb

@@ -4,7 +4,6 @@ require "json"
 require "fileutils"
 require "shellwords"
 require "securerandom"
-require_relative "session_path"
 
 module ClaudeSwarm
   class McpGenerator

data/lib/claude_swarm/orchestrator.rb

@@ -4,12 +4,10 @@ require "English"
 require "shellwords"
 require "json"
 require "fileutils"
-require_relative "session_path"
-require_relative "process_tracker"
-require_relative "worktree_manager"
 
 module ClaudeSwarm
   class Orchestrator
+    include SystemUtils
     RUN_DIR = File.expand_path("~/.claude-swarm/run")
 
     def initialize(configuration, mcp_generator, vibe: false, prompt: nil, stream_logs: false, debug: false,
@@ -174,7 +172,7 @@ module ClaudeSwarm
 
       command = build_main_command(main_instance)
       if @debug && !@prompt
-        puts "Running: #{command}"
+        puts "🏃 Running: #{format_command_for_display(command)}"
         puts
       end
 
@@ -184,7 +182,7 @@ module ClaudeSwarm
 
       # Execute the main instance - this will cascade to other instances via MCP
       Dir.chdir(main_instance[:directory]) do
-        system(*command)
+        system!(*command)
       end
 
       # Clean up log streaming thread
@@ -362,6 +360,16 @@ module ClaudeSwarm
       end
     end
 
+    def format_command_for_display(command)
+      command.map do |part|
+        if part.match?(/\s|'|"/)
+          "'#{part.gsub("'", "'\\\\''")}'"
+        else
+          part
+        end
+      end.join(" ")
+    end
+
     def build_main_command(instance)
       parts = [
         "claude",
@@ -456,7 +464,9 @@ module ClaudeSwarm
       end
 
       # Restore worktrees using the saved configuration
-      @worktree_manager = WorktreeManager.new(worktree_data["shared_name"])
+      # Extract session ID from the session path
+      session_id = File.basename(session_path)
+      @worktree_manager = WorktreeManager.new(worktree_data["shared_name"], session_id: session_id)
 
       # Get all instances and restore their worktree paths
       all_instances = @config.instances.values

data/lib/claude_swarm/system_utils.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "English"
+
+module ClaudeSwarm
+  module SystemUtils
+    def system!(*args)
+      success = system(*args)
+      unless success
+        exit_status = $CHILD_STATUS&.exitstatus || 1
+        command_str = args.size == 1 ? args.first : args.join(" ")
+        warn "❌ Command failed with exit status: #{exit_status}"
+        raise Error, "Command failed with exit status #{exit_status}: #{command_str}"
+      end
+      success
+    end
+  end
+end