sxn 0.2.2 → 0.2.5

data/lib/sxn/core/worktree_manager.rb

@@ -14,7 +14,7 @@ module Sxn
         @project_manager = ProjectManager.new(@config_manager)
       end
 
-      def add_worktree(project_name, branch = nil, session_name: nil)
+      def add_worktree(project_name, branch = nil, session_name: nil, verbose: false)
         # Use current session if not specified
         session_name ||= @config_manager.current_session
         raise Sxn::NoActiveSessionError, "No active session. Use 'sxn use <session>' first." unless session_name
@@ -25,8 +25,32 @@ module Sxn
         project = @project_manager.get_project(project_name)
         raise Sxn::ProjectNotFoundError, "Project '#{project_name}' not found" unless project
 
-        # Use default branch if not specified
-        branch ||= project[:default_branch] || "master"
+        # Determine branch name
+        # If no branch specified, use session's default branch from .sxnrc, then fallback to session name
+        # If branch starts with "remote:", handle remote branch tracking
+        if branch.nil?
+          session_config = SessionConfig.new(session[:path])
+          branch = session_config.default_branch if session_config.exists?
+          branch ||= session_name
+        elsif branch.start_with?("remote:")
+          remote_branch = branch.sub("remote:", "")
+          # Fetch the remote branch first
+          begin
+            fetch_remote_branch(project[:path], remote_branch)
+            branch = remote_branch
+          rescue StandardError => e
+            raise Sxn::WorktreeCreationError, "Failed to fetch remote branch: #{e.message}"
+          end
+        end
+
+        if ENV["SXN_DEBUG"]
+          puts "[DEBUG] Adding worktree:"
+          puts "  Project: #{project_name}"
+          puts "  Project path: #{project[:path]}"
+          puts "  Session: #{session_name}"
+          puts "  Session path: #{session[:path]}"
+          puts "  Branch: #{branch}"
+        end
 
         # Check if worktree already exists in this session
         existing_worktrees = @session_manager.get_session_worktrees(session_name)
@@ -38,9 +62,14 @@ module Sxn
         # Create worktree path
         worktree_path = File.join(session[:path], project_name)
 
+        puts "  Worktree path: #{worktree_path}" if ENV["SXN_DEBUG"]
+
         begin
+          # Handle orphaned worktree if it exists
+          handle_orphaned_worktree(project[:path], worktree_path)
+
           # Create the worktree
-          create_git_worktree(project[:path], worktree_path, branch)
+          create_git_worktree(project[:path], worktree_path, branch, verbose: verbose)
 
           # Register worktree with session
           @session_manager.add_worktree_to_session(session_name, project_name, worktree_path, branch)
@@ -54,6 +83,11 @@ module Sxn
         rescue StandardError => e
           # Clean up on failure
           FileUtils.rm_rf(worktree_path)
+
+          # If it's already our error with details, re-raise it
+          raise e if e.is_a?(Sxn::WorktreeCreationError)
+
+          # Otherwise wrap it
           raise Sxn::WorktreeCreationError, "Failed to create worktree: #{e.message}"
         end
       end
@@ -169,7 +203,48 @@ module Sxn
 
       private
 
-      def create_git_worktree(project_path, worktree_path, branch)
+      def handle_orphaned_worktree(project_path, worktree_path)
+        Dir.chdir(project_path) do
+          # Try to prune worktrees first
+          system("git worktree prune", out: File::NULL, err: File::NULL)
+
+          # Check if this worktree is registered (whether it exists or not)
+          output = `git worktree list --porcelain 2>/dev/null`
+          if output.include?(worktree_path)
+            # Force remove the orphaned/existing worktree
+            system("git worktree remove --force #{Shellwords.escape(worktree_path)}", out: File::NULL, err: File::NULL)
+          end
+        end
+
+        # Remove the directory if it still exists
+        FileUtils.rm_rf(worktree_path)
+      end
+
+      def fetch_remote_branch(project_path, branch_name)
+        Dir.chdir(project_path) do
+          # First, fetch all remotes to ensure we have the latest branches
+          raise "Failed to fetch remote branches" unless system("git fetch --all", out: File::NULL, err: File::NULL)
+
+          # Check if the branch exists on any remote
+          remotes = `git remote`.lines.map(&:strip)
+          branch_found = false
+
+          remotes.each do |remote|
+            next unless system("git show-ref --verify --quiet refs/remotes/#{remote}/#{Shellwords.escape(branch_name)}",
+                               out: File::NULL, err: File::NULL)
+
+            branch_found = true
+            # Set up tracking for the remote branch
+            system("git branch --track #{Shellwords.escape(branch_name)} #{remote}/#{Shellwords.escape(branch_name)}",
+                   out: File::NULL, err: File::NULL)
+            break
+          end
+
+          raise "Remote branch '#{branch_name}' not found on any remote" unless branch_found
+        end
+      end
+
+      def create_git_worktree(project_path, worktree_path, branch, verbose: false)
         Dir.chdir(project_path) do
           # Check if branch exists
           branch_exists = system("git show-ref --verify --quiet refs/heads/#{Shellwords.escape(branch)}",
@@ -183,8 +258,59 @@ module Sxn
                   ["git", "worktree", "add", "-b", branch, worktree_path]
                 end
 
-          success = system(*cmd, out: File::NULL, err: File::NULL)
-          raise "Git worktree command failed" unless success
+          # Capture stderr for better error messages
+          require "open3"
+          stdout, stderr, status = Open3.capture3(*cmd)
+
+          unless status.success?
+            error_msg = stderr.empty? ? stdout : stderr
+            error_msg = "Git worktree command failed" if error_msg.strip.empty?
+
+            # Add more context to common errors
+            if error_msg.include?("already exists")
+              error_msg += "\nTry removing the existing worktree first with: sxn worktree remove #{File.basename(worktree_path)}"
+            elsif error_msg.include?("is already checked out")
+              error_msg += "\nThis branch is already checked out in another worktree"
+            elsif error_msg.include?("not a git repository")
+              error_msg = "Project '#{File.basename(project_path)}' is not a git repository"
+            elsif error_msg.include?("fatal: invalid reference")
+              # This typically means the branch doesn't exist and we're trying to create from a non-existent base
+              error_msg += "\nMake sure the repository has at least one commit or specify an existing branch"
+            elsif error_msg.include?("fatal:")
+              # Extract just the fatal error message for cleaner output
+              error_msg = error_msg.lines.grep(/fatal:/).first&.strip || error_msg
+            end
+
+            details = []
+            details << "Command: #{cmd.join(" ")}"
+            details << "Working directory: #{project_path}"
+            details << "Target path: #{worktree_path}"
+            details << "Branch: #{branch}"
+            details << ""
+            details << "Git output:"
+            details << "STDOUT: #{stdout.strip.empty? ? "(empty)" : stdout}"
+            details << "STDERR: #{stderr.strip.empty? ? "(empty)" : stderr}"
+            details << "Exit status: #{status.exitstatus}"
+
+            # Check for common issues
+            if !File.directory?(project_path)
+              details << "\n⚠️  Project directory does not exist: #{project_path}"
+            elsif !File.directory?(File.join(project_path, ".git"))
+              details << "\n⚠️  Not a git repository: #{project_path}"
+              details << "    This might be a git submodule. Try:"
+              details << "    1. Ensure the project path points to the submodule directory"
+              details << "    2. Check if 'git submodule update --init' has been run"
+            end
+
+            details << "\n⚠️  Target path already exists: #{worktree_path}" if File.exist?(worktree_path)
+
+            if ENV["SXN_DEBUG"] || verbose
+              puts "[DEBUG] Git worktree command failed:"
+              details.each { |line| puts "  #{line}" }
+            end
+
+            raise Sxn::WorktreeCreationError.new(error_msg, details: details.join("\n"))
+          end
         end
       end
 

data/lib/sxn/core.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "core/config_manager"
+require_relative "core/session_config"
 require_relative "core/session_manager"
 require_relative "core/project_manager"
 require_relative "core/worktree_manager"

data/lib/sxn/errors.rb

@@ -37,7 +37,16 @@ module Sxn
   class WorktreeError < GitError; end
   class WorktreeExistsError < WorktreeError; end
   class WorktreeNotFoundError < WorktreeError; end
-  class WorktreeCreationError < WorktreeError; end
+
+  class WorktreeCreationError < WorktreeError
+    attr_reader :details
+
+    def initialize(message, details: nil)
+      super(message)
+      @details = details
+    end
+  end
+
   class WorktreeRemovalError < WorktreeError; end
   class BranchError < GitError; end
 

data/lib/sxn/ui/prompt.rb

@@ -68,6 +68,10 @@ module Sxn
         end
       end
 
+      def default_branch(session_name:)
+        branch_name("Default branch for worktrees:", default: session_name)
+      end
+
       def confirm_deletion(item_name, item_type = "item")
         ask_yes_no("Are you sure you want to delete #{item_type} '#{item_name}'? This action cannot be undone.",
                    default: false)

data/lib/sxn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sxn
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/script/setup-hooks

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+#
+# Setup git hooks for sxn development
+#
+
+set -e
+
+echo "🔧 Setting up git hooks for sxn development..."
+
+# Create hooks directory if it doesn't exist
+mkdir -p .git/hooks
+
+# Create pre-push hook
+cat > .git/hooks/pre-push << 'EOF'
+#!/bin/sh
+#
+# Pre-push hook for sxn project
+# Runs RuboCop and RSpec before allowing push
+#
+
+echo "🔍 Running pre-push checks..."
+
+# Run RuboCop
+echo "📝 Checking code style with RuboCop..."
+bundle exec rubocop
+if [ $? -ne 0 ]; then
+    echo "❌ RuboCop failed! Please fix linting issues before pushing."
+    echo "   Run: bundle exec rubocop -a"
+    exit 1
+fi
+
+# Run RSpec tests
+echo "🧪 Running tests with RSpec..."
+bundle exec rspec --format progress
+if [ $? -ne 0 ]; then
+    echo "❌ Tests failed! Please fix failing tests before pushing."
+    exit 1
+fi
+
+echo "✅ All checks passed! Proceeding with push..."
+exit 0
+EOF
+
+chmod +x .git/hooks/pre-push
+
+echo "✅ Git hooks installed successfully!"
+echo ""
+echo "The following hooks have been set up:"
+echo "  • pre-push: Runs RuboCop and RSpec before pushing"
+echo ""
+echo "To bypass hooks in emergency (not recommended):"
+echo "  git push --no-verify"

data/sxn.gemspec

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative "lib/sxn/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "sxn"
+  spec.version       = Sxn::VERSION
+  spec.authors       = ["Ernest Sim"]
+  spec.email         = ["ernest.codes@gmail.com"]
+
+  spec.summary       = "Session management for multi-repository development"
+  spec.description   = "Sxn simplifies git worktree management with intelligent project rules and secure automation"
+  spec.homepage      = "https://github.com/idl3/sxn"
+  spec.license       = "MIT"
+  spec.required_ruby_version = ">= 3.2.0"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) ||
+        f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)}) ||
+        f.match(/\.db-(?:shm|wal)\z/) || # Exclude SQLite temp files
+        f.match(/\.gem\z/) # Exclude gem files
+    end
+  end
+
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Core CLI dependencies
+  spec.add_dependency "pastel", "~> 0.8"                  # Terminal colors
+  spec.add_dependency "thor", "~> 1.3"                    # CLI framework
+  spec.add_dependency "tty-progressbar", "~> 0.18"        # Progress bars
+  spec.add_dependency "tty-prompt", "~> 0.23"             # Interactive prompts
+  spec.add_dependency "tty-table", "~> 0.12"              # Table formatting
+
+  # Configuration and data management
+  spec.add_dependency "dry-configurable", "~> 1.0"       # Configuration management
+  spec.add_dependency "sqlite3", "~> 1.6"                # Session database
+  spec.add_dependency "zeitwerk", "~> 2.6"               # Code loading
+
+  # Template engine (secure, sandboxed)
+  spec.add_dependency "liquid", "~> 5.4" # Safe template processing
+
+  # MCP server dependencies
+  spec.add_dependency "async", "~> 2.0"                  # Async operations
+  spec.add_dependency "json-schema", "~> 4.0"            # Schema validation
+
+  # Security and encryption
+  spec.add_dependency "bcrypt", "~> 3.1"                 # Password hashing
+  spec.add_dependency "openssl", ">= 3.0"                # Encryption support
+  spec.add_dependency "ostruct"                          # OpenStruct for Ruby 3.5+ compatibility
+
+  # File system operations
+  spec.add_dependency "listen", "~> 3.8"                 # File watching for config cache
+  spec.add_dependency "parallel", "~> 1.23"              # Parallel execution
+
+  # Development dependencies
+  spec.add_development_dependency "aruba", "~> 2.1" # CLI testing
+  spec.add_development_dependency "benchmark" # Benchmark for Ruby 3.5+ compatibility
+  spec.add_development_dependency "benchmark-ips", "~> 2.12" # Performance benchmarking
+  spec.add_development_dependency "bundler", "~> 2.4"
+  spec.add_development_dependency "climate_control", "~> 1.2" # Environment variable testing
+  spec.add_development_dependency "faker", "~> 3.2" # Test data generation
+  spec.add_development_dependency "memory_profiler", "~> 1.0" # Memory profiling
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.12"
+  spec.add_development_dependency "rubocop", "~> 1.50" # Code linting
+  spec.add_development_dependency "rubocop-performance", "~> 1.16"
+  spec.add_development_dependency "rubocop-rspec", "~> 2.19"
+  spec.add_development_dependency "simplecov", "~> 0.22" # Code coverage
+  spec.add_development_dependency "vcr", "~> 6.2" # HTTP interaction recording
+  spec.add_development_dependency "webmock", "~> 3.19" # HTTP mocking for MCP tests
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sxn
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Ernest Sim
@@ -518,6 +518,7 @@ files:
 - lib/sxn/core/config_manager.rb
 - lib/sxn/core/project_manager.rb
 - lib/sxn/core/rules_manager.rb
+- lib/sxn/core/session_config.rb
 - lib/sxn/core/session_manager.rb
 - lib/sxn/core/worktree_manager.rb
 - lib/sxn/database.rb
@@ -558,6 +559,7 @@ files:
 - lib/sxn/version.rb
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
+- script/setup-hooks
 - scripts/test.sh
 - sig/external/liquid.rbs
 - sig/external/thor.rbs
@@ -609,6 +611,7 @@ files:
 - sig/sxn/ui/prompt.rbs
 - sig/sxn/ui/table.rbs
 - sig/sxn/version.rbs
+- sxn.gemspec
 homepage: https://github.com/idl3/sxn
 licenses:
 - MIT