sxn 0.2.3 → 0.3.0

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
@@ -26,10 +26,12 @@ module Sxn
         raise Sxn::ProjectNotFoundError, "Project '#{project_name}' not found" unless project
 
         # Determine branch name
-        # If no branch specified, use session name as the 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?
-          branch = session_name
+          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
@@ -67,7 +69,7 @@ module Sxn
           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)
@@ -81,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
@@ -237,7 +244,7 @@ module Sxn
         end
       end
 
-      def create_git_worktree(project_path, worktree_path, branch)
+      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)}",
@@ -274,15 +281,35 @@ module Sxn
               error_msg = error_msg.lines.grep(/fatal:/).first&.strip || error_msg
             end
 
-            if ENV["SXN_DEBUG"]
+            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:"
-              puts "  Command: #{cmd.join(" ")}"
-              puts "  Directory: #{project_path}"
-              puts "  STDOUT: #{stdout}"
-              puts "  STDERR: #{stderr}"
+              details.each { |line| puts "  #{line}" }
             end
 
-            raise error_msg
+            raise Sxn::WorktreeCreationError.new(error_msg, details: details.join("\n"))
           end
         end
       end

data/lib/sxn/core.rb

@@ -1,10 +1,12 @@
 # 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"
 require_relative "core/rules_manager"
+require_relative "core/template_manager"
 
 module Sxn
   # Core business logic namespace

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
 
@@ -59,11 +68,34 @@ module Sxn
   class ApplicationError < Error; end
   class RollbackError < Error; end
 
-  # Template processing errors
+  # Template processing errors (Liquid templates)
   class TemplateError < Error; end
   class TemplateNotFoundError < TemplateError; end
   class TemplateProcessingError < TemplateError; end
 
+  # Session template errors (worktree templates)
+  class SessionTemplateError < Error; end
+
+  class SessionTemplateNotFoundError < SessionTemplateError
+    def initialize(name, available: [])
+      message = "Session template '#{name}' not found"
+      message += ". Available templates: #{available.join(", ")}" if available.any?
+      super(message)
+    end
+  end
+
+  class SessionTemplateValidationError < SessionTemplateError
+    def initialize(name, message)
+      super("Invalid session template '#{name}': #{message}")
+    end
+  end
+
+  class SessionTemplateApplicationError < SessionTemplateError
+    def initialize(template_name, message)
+      super("Failed to apply template '#{template_name}': #{message}. Session has been rolled back.")
+    end
+  end
+
   # Database errors
   class DatabaseError < Error; end
   class DatabaseConnectionError < DatabaseError; 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/ui/table.rb

@@ -89,6 +89,21 @@ module Sxn
         render_table(headers, rows)
       end
 
+      def templates(templates)
+        return empty_table("No templates defined") if templates.empty?
+
+        headers = %w[Name Description Projects]
+        rows = templates.map do |template|
+          [
+            template[:name],
+            template[:description] || "-",
+            template[:project_count].to_s
+          ]
+        end
+
+        render_table(headers, rows)
+      end
+
       # Add a header to the table output
       def header(title)
         puts "\n#{@pastel.bold.underline(title)}"
@@ -99,7 +114,9 @@ module Sxn
 
       def render_table(headers, rows)
         table = TTY::Table.new(header: headers, rows: rows)
-        puts table.render(:unicode, padding: [0, 1])
+        # Use basic renderer to avoid terminal width detection issues
+        renderer = $stdout.tty? ? :unicode : :basic
+        puts table.render(renderer, padding: [0, 1])
       end
 
       def empty_table(message)

data/lib/sxn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sxn
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ernest Sim
@@ -509,16 +509,20 @@ files:
 - lib/sxn/commands/projects.rb
 - lib/sxn/commands/rules.rb
 - lib/sxn/commands/sessions.rb
+- lib/sxn/commands/templates.rb
 - lib/sxn/commands/worktrees.rb
 - lib/sxn/config.rb
 - lib/sxn/config/config_cache.rb
 - lib/sxn/config/config_discovery.rb
 - lib/sxn/config/config_validator.rb
+- lib/sxn/config/templates_config.rb
 - lib/sxn/core.rb
 - 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/template_manager.rb
 - lib/sxn/core/worktree_manager.rb
 - lib/sxn/database.rb
 - lib/sxn/database/errors.rb