sxn 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2adba72c82bfd3b3b92c29bf497cc0c486b16261edc38c103135a7391525a4
-  data.tar.gz: fa079e0580d51496bf4d5f4af242b291847854a1d6dd6f17918730b463bb2c9d
+  metadata.gz: 52c6ed94883c7981bdbc6bc0a2faa9d800dbe81fd4af0ee7af41dda777e95421
+  data.tar.gz: 1724ced66383451b1d914285b996a8d2c8bc82643fb08a0eb674a8c0c23a6e06
 SHA512:
-  metadata.gz: d8a67b4261fb520b7b64c3c039dcabd5f47f1ae6ca377d1fa4d0a6d0dd9ac2574a83cc0024923273a754527c9e0cba96c75e0923918d1fd997ba62f8f1dd6ae7
-  data.tar.gz: 79218840d95ce17d7a62d40e2f4cfca09498973b784677175ec1cbf67a9ed801074fad18a716dba2a16f89c7499a030b53e3c9c5fbf1b5f412b7cbd0530cd628
+  metadata.gz: ec072a5436b75710595263f5667828a83d0c5c42aa44f8cde622550762b30fd1ce3b244636bbf57df70b89eeda2c765abbfd04b6b80ff3c4998358e8bad4afe2
+  data.tar.gz: d1d7fa0c3acc68746767376f8f201004c74e8930ce8069b69aa4ad080b7338d4f21da7743cfd704e20746e942ddeca497fc7baa7f81c3a4d7c638e3b6a8437eb

data/CHANGELOG.md

@@ -5,6 +5,50 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] - 2025-12-16
+
+### Added
+- Session templates support for creating sessions from predefined configurations
+  - `sxn templates list` to view available templates
+  - `sxn templates show <name>` to view template details
+  - `--template` option for `sxn sessions add` to create sessions from templates
+- TemplateManager for template operations and validation
+- TemplatesConfig for loading templates from `templates.yml`
+- Session template error classes for better error handling
+
+### Fixed
+- Project rules now correctly apply when creating sessions from templates
+
+## [0.2.5] - 2025-11-30
+
+### Added
+- `sxn enter` command to quickly navigate to current session directory
+- `sxn current enter` subcommand as alternative way to enter session
+- `--path` option for `sxn current` to output only the session path
+- `sxn shell` command to install shell integration (idempotent)
+  - Auto-detects shell type (bash/zsh)
+  - Installs `sxn-enter` function to shell config
+  - Supports `--uninstall` to remove integration
+  - Supports `--shell-type` to specify shell explicitly
+
+## [0.2.4] - 2025-11-30
+
+### Added
+- Interactive worktree wizard after session creation
+  - Prompts to add worktrees with descriptive explanations
+  - Supports adding multiple worktrees in sequence
+  - Explains branch options including remote tracking syntax
+- `--skip-worktree` flag to bypass the wizard when creating sessions
+- `--verbose` flag for worktree debugging with detailed git output
+
+### Changed
+- Sessions now automatically switch to newly created session (no need to run `sxn use` afterwards)
+- Improved project manager to safely handle nil projects configuration
+
+### Fixed
+- Fixed test mocks for verbose parameter in worktree operations
+- Fixed version spec to support semver pre-release format
+
 ## [0.2.3] - 2025-09-16
 
 ### Added
@@ -71,6 +115,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial placeholder release
 - Basic gem structure
 
+[0.3.0]: https://github.com/idl3/sxn/compare/v0.2.5...v0.3.0
+[0.2.5]: https://github.com/idl3/sxn/compare/v0.2.4...v0.2.5
+[0.2.4]: https://github.com/idl3/sxn/compare/v0.2.3...v0.2.4
 [0.2.3]: https://github.com/idl3/sxn/compare/v0.2.1...v0.2.3
 [0.2.1]: https://github.com/idl3/sxn/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/idl3/sxn/compare/v0.1.0...v0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sxn (0.2.3)
+    sxn (0.3.0)
       async (~> 2.0)
       bcrypt (~> 3.1)
       dry-configurable (~> 1.0)

data/lib/sxn/CLI.rb

@@ -41,8 +41,12 @@ module Sxn
     desc "add SESSION_NAME", "Create a new session (shortcut for 'sxn sessions add')"
     option :description, type: :string, aliases: "-d", desc: "Session description"
     option :linear_task, type: :string, aliases: "-l", desc: "Linear task ID"
+    option :branch, type: :string, aliases: "-b", desc: "Default branch for worktrees"
+    option :template, type: :string, aliases: "-t", desc: "Template to use for worktree creation"
     def add(session_name)
-      Commands::Sessions.new.add(session_name)
+      cmd = Commands::Sessions.new
+      cmd.options = options
+      cmd.add(session_name)
     rescue Sxn::Error => e
       handle_error(e)
     end
@@ -62,10 +66,102 @@ module Sxn
       handle_error(e)
     end
 
-    desc "current", "Show current session (shortcut for 'sxn sessions current')"
+    desc "current [SUBCOMMAND]", "Show current session (shortcut for 'sxn sessions current')"
     option :verbose, type: :boolean, aliases: "-v", desc: "Show detailed information"
-    def current
-      Commands::Sessions.new.current
+    option :path, type: :boolean, aliases: "-p", desc: "Output only the session path"
+    def current(subcommand = nil)
+      Commands::Sessions.new.current(subcommand)
+    rescue Sxn::Error => e
+      handle_error(e)
+    end
+
+    desc "enter", "Enter current session directory (outputs cd command for shell eval)"
+    long_desc <<-LONGDESC
+      Outputs a cd command to navigate to the current session directory.
+
+      Usage with shell eval:
+        eval "$(sxn enter)"
+
+      Or install shell integration for easier use:
+        sxn shell
+
+      Then simply run:
+        sxn-enter
+    LONGDESC
+    def enter
+      Commands::Sessions.new.enter
+    rescue Sxn::Error => e
+      handle_error(e)
+    end
+
+    desc "up", "Navigate to project root from session (outputs cd command for shell eval)"
+    long_desc <<-LONGDESC
+      Outputs a cd command to navigate to the project root from within a session.
+
+      The project root is determined from the .sxnrc file in the session directory,
+      which points back to the parent .sxn folder.
+
+      Usage with shell eval:
+        eval "$(sxn up)"
+
+      Or install shell integration for easier use:
+        sxn shell
+
+      Then simply run:
+        sxn-up
+    LONGDESC
+    def up
+      require "shellwords"
+
+      session_config = Sxn::Core::SessionConfig.find_from_path(Dir.pwd)
+
+      unless session_config
+        warn "Not in a session directory."
+        warn ""
+        warn "This command works when run from within a session folder."
+        warn "Session folders contain a .sxnrc file that points back to the project."
+        warn ""
+        warn "Tip: Add this function to your shell profile for easier navigation:"
+        warn ""
+        warn "  sxn-up() { eval \"$(sxn up 2>/dev/null)\" || sxn up; }"
+        exit(1)
+      end
+
+      project_root = session_config.project_root
+
+      unless project_root && File.directory?(project_root)
+        warn "Could not determine project root from .sxnrc"
+        warn "parent_sxn_path: #{session_config.parent_sxn_path || "nil"}"
+        exit(1)
+      end
+
+      # Output the cd command for shell integration
+      puts "cd #{Shellwords.escape(project_root)}"
+    rescue Sxn::Error => e
+      handle_error(e)
+    end
+
+    desc "shell", "Install shell integration (sxn-enter function)"
+    option :shell_type, type: :string, enum: %w[bash zsh auto], default: "auto",
+                        desc: "Shell type (bash, zsh, or auto-detect)"
+    option :uninstall, type: :boolean, default: false, desc: "Remove shell integration"
+    long_desc <<-LONGDESC
+      Installs shell integration to your shell configuration file (.zshrc or .bashrc).
+
+      This adds the sxn-enter function which allows you to quickly navigate
+      to your current session directory.
+
+      The installation is idempotent - running it multiple times will not
+      add duplicate entries.
+
+      Examples:
+        sxn shell                   # Auto-detect shell and install
+        sxn shell --shell-type=zsh  # Install for zsh specifically
+        sxn shell --uninstall       # Remove shell integration
+    LONGDESC
+    map "shell" => :install_shell_wrapper
+    def install_shell_wrapper
+      Commands::Init.new.invoke(:install_shell, [], options)
     rescue Sxn::Error => e
       handle_error(e)
     end
@@ -122,6 +218,13 @@ module Sxn
       handle_error(e)
     end
 
+    desc "templates SUBCOMMAND", "Manage session templates"
+    def templates(subcommand = nil, *args)
+      Commands::Templates.start([subcommand, *args].compact)
+    rescue Sxn::Error => e
+      handle_error(e)
+    end
+
     desc "status", "Show overall sxn status"
     def status
       show_status

data/lib/sxn/commands/init.rb

@@ -8,6 +8,34 @@ module Sxn
     class Init < Thor
       include Thor::Actions
 
+      # Shell integration marker - used to identify sxn shell functions
+      SHELL_MARKER = "# sxn shell integration"
+      SHELL_MARKER_END = "# end sxn shell integration"
+
+      # Shell function that gets installed
+      SHELL_FUNCTION = <<~SHELL.freeze
+        #{SHELL_MARKER}
+        sxn-enter() {
+          local cmd
+          cmd="$(sxn enter 2>/dev/null)"
+          if [ $? -eq 0 ] && [ -n "$cmd" ]; then
+            eval "$cmd"
+          else
+            sxn enter
+          fi
+        }
+        sxn-up() {
+          local cmd
+          cmd="$(sxn up 2>/dev/null)"
+          if [ $? -eq 0 ] && [ -n "$cmd" ]; then
+            eval "$cmd"
+          else
+            sxn up
+          fi
+        }
+        #{SHELL_MARKER_END}
+      SHELL
+
       desc "init [FOLDER]", "Initialize sxn in a project folder"
       option :force, type: :boolean, desc: "Force initialization even if already initialized"
       option :auto_detect, type: :boolean, default: true, desc: "Automatically detect and register projects"
@@ -55,8 +83,116 @@ module Sxn
         end
       end
 
+      desc "install_shell", "Install shell integration (sxn-enter function)"
+      option :shell_type, type: :string, enum: %w[bash zsh auto], default: "auto",
+                          desc: "Shell type (bash, zsh, or auto-detect)"
+      option :uninstall, type: :boolean, default: false, desc: "Remove shell integration"
+      def install_shell
+        @ui.section("Shell Integration")
+
+        shell_type = detect_shell_type
+        rc_file = shell_rc_file(shell_type)
+
+        unless rc_file
+          @ui.error("Could not determine shell configuration file")
+          @ui.info("Supported shells: bash, zsh")
+          exit(1)
+        end
+
+        if options[:uninstall]
+          uninstall_shell_integration(rc_file, shell_type)
+        else
+          install_shell_integration(rc_file, shell_type)
+        end
+      end
+
       private
 
+      def detect_shell_type
+        shell_opt = options[:shell_type] || options[:shell] || "auto"
+        return shell_opt unless shell_opt == "auto"
+
+        # Check SHELL environment variable
+        current_shell = ENV.fetch("SHELL", "")
+        if current_shell.include?("zsh")
+          "zsh"
+        elsif current_shell.include?("bash")
+          "bash"
+        else
+          # Default to bash
+          "bash"
+        end
+      end
+
+      def shell_rc_file(shell_type)
+        home = Dir.home
+        case shell_type
+        when "zsh"
+          File.join(home, ".zshrc")
+        when "bash"
+          # Prefer .bashrc, fall back to .bash_profile on macOS
+          bashrc = File.join(home, ".bashrc")
+          bash_profile = File.join(home, ".bash_profile")
+          File.exist?(bashrc) ? bashrc : bash_profile
+        end
+      end
+
+      def shell_integration_installed?(rc_file)
+        return false unless File.exist?(rc_file)
+
+        content = File.read(rc_file)
+        content.include?(SHELL_MARKER)
+      end
+
+      def install_shell_integration(rc_file, _shell_type)
+        if shell_integration_installed?(rc_file)
+          @ui.info("Shell integration already installed in #{rc_file}")
+          @ui.info("Use --uninstall to remove it first if you want to reinstall")
+          return
+        end
+
+        # Ensure rc file exists
+        FileUtils.touch(rc_file) unless File.exist?(rc_file)
+
+        # Append shell function
+        File.open(rc_file, "a") do |f|
+          f.puts "" # Add blank line before
+          f.puts SHELL_FUNCTION
+        end
+
+        @ui.success("Installed shell integration to #{rc_file}")
+        @ui.newline
+        @ui.info("The following functions were added:")
+        @ui.newline
+        puts "  sxn-enter  - Navigate to current session directory"
+        puts "  sxn-up     - Navigate to project root from session"
+        @ui.newline
+        @ui.recovery_suggestion("Run 'source #{rc_file}' or restart your shell to use them")
+      end
+
+      def uninstall_shell_integration(rc_file, _shell_type)
+        unless File.exist?(rc_file)
+          @ui.info("Shell configuration file not found: #{rc_file}")
+          return
+        end
+
+        unless shell_integration_installed?(rc_file)
+          @ui.info("Shell integration not installed in #{rc_file}")
+          return
+        end
+
+        # Read file and remove sxn block
+        content = File.read(rc_file)
+        # Remove the block between markers (including blank line before)
+        pattern = /\n?#{Regexp.escape(SHELL_MARKER)}.*?#{Regexp.escape(SHELL_MARKER_END)}\n?/m
+        new_content = content.gsub(pattern, "\n")
+
+        File.write(rc_file, new_content)
+
+        @ui.success("Removed shell integration from #{rc_file}")
+        @ui.recovery_suggestion("Run 'source #{rc_file}' or restart your shell")
+      end
+
       def determine_sessions_folder(folder)
         return folder if folder && !options[:quiet]