claude-worktree 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2342da43b068cb108e2d46b17561cb7c277d050802922c5d58c81236fdd95ea
-  data.tar.gz: 2469d5abc245c02f69308f9830376f4e07ea4df9f846a36adff8de026ad66e21
+  metadata.gz: aa2000361072768df44df230f654d22c5bd8e435bceb02bb597e7bbbfc369b28
+  data.tar.gz: 7c42b53349ffcb6dc3050c68db40b869da936d94c61f4cc25ac7899adbfcdc66
 SHA512:
-  metadata.gz: 2e06fc2776a422bb7b697fa2fe0169532eb0b48e967904f88b100365fcb27dc4c77f696d17ecc96c1b485b2d0d2c03c7ded13ea1d0f1b3abf87853320a0767a1
-  data.tar.gz: 228e29e43f2156e5767746a6e399a67ab60c8a75c7780ba6a9339df5ea7e1dd2253d0c013a4a0323660bfa9355140172c44e1dec1a953beda895c98e6168f413
+  metadata.gz: c2a27c69c6d1117cadefc144e85b04816580f58acd621ce036a69a64f54200c1705c564ed11df4b481ed7d552b1554c10d8a2e7d1dfbb3e7003eb697f812a277
+  data.tar.gz: 78601cef3ca323a17c8b9333d54405209b7470545c86c15e13b5518cc17764d2edf46ca2b072fc6df4245bdbd47040924fb3fcc23e4ddbacd51e8114467a2fec

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [0.1.4] - 2026-01-30
+
+### Added
+- **Permanent CD on exit**: After quitting cwt, your shell stays in the last resumed worktree directory
+- **Visible setup output**: `.cwt/setup` script now runs with visible output on first resume (not during worktree creation)
+- **Teardown support**: Optional `.cwt/teardown` script runs before worktree deletion
+- **CWT_ROOT environment variable**: Setup and teardown scripts receive `$CWT_ROOT` pointing to the repo root
+- Integration tests for setup/teardown functionality
+- Homebrew update instructions in deploy script
+
+### Changed
+- Setup now runs on first resume instead of during worktree creation
+- Setup only runs once per worktree (tracked via `.cwt_needs_setup` marker)
+
 ## [0.1.0] - 2026-01-29
 
 - Initial release

data/lib/claude/worktree/version.rb

@@ -2,6 +2,6 @@
 
 module Claude
   module Worktree
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

data/lib/cwt/app.rb

@@ -52,7 +52,7 @@ module Cwt
           end
 
           event = tui.poll_event(timeout: 0.1)
-          
+
           # Process TUI Event
           cmd = nil
           if event.key?
@@ -62,7 +62,7 @@ module Cwt
           elsif event.none?
             cmd = Update.handle(model, { type: :tick })
           end
-          
+
           handle_command(cmd, model, tui, main_queue) if cmd
 
           # Process Background Queue
@@ -74,6 +74,12 @@ module Cwt
           end
         end
       end
+
+      # After TUI exits, cd into last worktree if one was resumed
+      if model.exit_directory && Dir.exist?(model.exit_directory)
+        Dir.chdir(model.exit_directory)
+        exec ENV.fetch('SHELL', '/bin/zsh')
+      end
     end
 
     def self.handle_command(cmd, model, tui, main_queue)
@@ -88,11 +94,18 @@ module Cwt
       case cmd[:type]
       when :quit
         model.quit
-      when :create_worktree, :delete_worktree, :refresh_list
+      when :delete_worktree
+        # Suspend TUI for visible teardown output
+        RatatuiRuby.restore_terminal
+        puts "\e[H\e[2J" # Clear screen
+        result = Update.handle(model, cmd)
+        RatatuiRuby.init_terminal
+        handle_command(result, model, tui, main_queue)
+      when :create_worktree, :refresh_list
         result = Update.handle(model, cmd)
         handle_command(result, model, tui, main_queue)
       when :resume_worktree, :suspend_and_resume
-        suspend_tui_and_run(cmd[:path], tui)
+        suspend_tui_and_run(cmd[:path], model, tui)
         Update.refresh_list(model)
         start_background_fetch(model, main_queue)
       end
@@ -134,11 +147,24 @@ module Cwt
       end
     end
 
-    def self.suspend_tui_and_run(path, tui)
+    def self.suspend_tui_and_run(path, model, tui)
       RatatuiRuby.restore_terminal
-      
+
       puts "\e[H\e[2J" # Clear screen
-      puts "Resuming session in #{path}..."
+
+      # Run setup if this is a new worktree
+      if Git.needs_setup?(path)
+        begin
+          Git.run_setup_visible(path)
+          Git.mark_setup_complete(path)
+        rescue Interrupt
+          puts "\nSetup aborted."
+          RatatuiRuby.init_terminal
+          return
+        end
+      end
+
+      puts "Launching claude in #{path}..."
       begin
         Dir.chdir(path) do
           if defined?(Bundler)
@@ -147,6 +173,8 @@ module Cwt
             system("claude")
           end
         end
+        # Track last resumed path for exit
+        model.exit_directory = path
       rescue => e
         puts "Error: #{e.message}"
         print "Press any key to return..."

data/lib/cwt/git.rb

@@ -49,6 +49,8 @@ module Cwt
       { dirty: false }
     end
 
+    SETUP_MARKER = ".cwt_needs_setup"
+
     def self.add_worktree(name)
       # Sanitize name
       safe_name = name.strip.gsub(/[^a-zA-Z0-9_\-]/, '_')
@@ -66,13 +68,81 @@ module Cwt
         return { success: false, error: stderr }
       end
 
-      # Post-creation setup: Copy .env if it exists
-      setup_environment(path)
+      # Mark worktree as needing setup (will run on first resume)
+      mark_needs_setup(path)
 
       { success: true, path: path }
     end
 
+    def self.needs_setup?(path)
+      File.exist?(File.join(path, SETUP_MARKER))
+    end
+
+    def self.mark_needs_setup(path)
+      FileUtils.touch(File.join(path, SETUP_MARKER))
+    end
+
+    def self.mark_setup_complete(path)
+      marker = File.join(path, SETUP_MARKER)
+      File.delete(marker) if File.exist?(marker)
+    end
+
+    def self.run_setup_visible(path)
+      root = Dir.pwd
+      setup_script = File.join(root, ".cwt", "setup")
+
+      if File.exist?(setup_script) && File.executable?(setup_script)
+        puts "\e[1;36m=== Running .cwt/setup ===\e[0m"
+        puts
+
+        success = Dir.chdir(path) do
+          system({ "CWT_ROOT" => root }, setup_script)
+        end
+
+        puts
+
+        unless success
+          puts "\e[1;33mWarning: .cwt/setup failed (exit code: #{$?.exitstatus})\e[0m"
+          print "Press Enter to continue or Ctrl+C to abort..."
+          begin
+            STDIN.gets
+          rescue Interrupt
+            raise
+          end
+        end
+      else
+        # Default behavior: Symlink .env and node_modules (silent, fast)
+        setup_default_symlinks(path, root)
+      end
+    end
+
+    def self.run_teardown(path)
+      root = Dir.pwd
+      teardown_script = File.join(root, ".cwt", "teardown")
+
+      return { ran: false } unless File.exist?(teardown_script) && File.executable?(teardown_script)
+
+      puts "\e[1;36m=== Running .cwt/teardown ===\e[0m"
+      puts
+
+      success = Dir.chdir(path) do
+        system({ "CWT_ROOT" => root }, teardown_script)
+      end
+
+      puts
+
+      { ran: true, success: success }
+    end
+
     def self.remove_worktree(path, force: false)
+      # Step 0: Run teardown script if directory exists
+      if Dir.exist?(path)
+        result = run_teardown(path)
+        if result[:ran] && !result[:success] && !force
+          return { success: false, error: "Teardown script failed. Use 'D' to force delete." }
+        end
+      end
+
       # Step 1: Cleanup symlinks/copies (Best effort)
       # This helps 'safe delete' succeed if only untracked files are present.
       [".env", "node_modules"].each do |file|
@@ -153,19 +223,7 @@ module Cwt
       worktrees
     end
 
-    def self.setup_environment(target_path)
-      root = Dir.pwd
-      setup_script = File.join(root, ".cwt", "setup")
-
-      # 1. Custom Setup Script
-      if File.exist?(setup_script) && File.executable?(setup_script)
-        # Execute the script inside the new worktree
-        # passing the root path as an argument might be helpful, but relying on relative paths is standard.
-        Open3.capture2(setup_script, chdir: target_path)
-        return
-      end
-
-      # 2. Default Behavior: Symlink .env and node_modules
+    def self.setup_default_symlinks(target_path, root)
       files_to_link = [".env", "node_modules"]
 
       files_to_link.each do |file|

data/lib/cwt/model.rb

@@ -1,6 +1,7 @@
 module Cwt
   class Model
     attr_reader :worktrees, :selection_index, :mode, :input_buffer, :message, :running, :fetch_generation, :filter_query
+    attr_accessor :exit_directory
 
     def initialize
       @worktrees = []
@@ -11,6 +12,7 @@ module Cwt
       @message = "Welcome to CWT"
       @running = true
       @fetch_generation = 0
+      @exit_directory = nil
     end
 
     def update_worktrees(list)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claude-worktree
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Garcia
@@ -35,8 +35,6 @@ files:
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
-- Rakefile
-- assets/demo.gif
 - exe/cwt
 - lib/claude/worktree.rb
 - lib/claude/worktree/version.rb
@@ -45,7 +43,6 @@ files:
 - lib/cwt/model.rb
 - lib/cwt/update.rb
 - lib/cwt/view.rb
-- scripts/setup_demo.rb
 - sig/claude/worktree.rbs
 homepage: https://github.com/bengarcia/claude-worktree
 licenses:

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "minitest/test_task"
-
-Minitest::TestTask.create
-
-task default: :test

data/scripts/setup_demo.rb

@@ -1,70 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-require 'open3'
-
-# Configuration
-DEMO_DIR = "cwt_demo_repo"
-WORKTREES_DIR = ".worktrees"
-
-# Funny session names (The Prototyper's chaos)
-SESSIONS = [
-  "feature/add-lasers-to-ui",
-  "fix/undefined-is-not-a-function-again",
-  "chore/upgrade-everything-yolo",
-  "experiment/rewrite-in-assembly",
-  "refactor/rename-all-variables-to-emoji",
-  "feature/dark-mode-for-logs",
-  "bug/why-is-production-down",
-  "wip/ai-will-fix-it-eventually",
-]
-
-def run(cmd)
-  stdout, stderr, status = Open3.capture3(cmd)
-  unless status.success?
-    puts "Error running: #{cmd}"
-    puts stderr
-    exit 1
-  end
-  stdout
-end
-
-puts "🚀 Setting up CWT Demo Environment..."
-
-# 1. Create and Init Repo
-if Dir.exist?(DEMO_DIR)
-  puts "Cleaning up old demo..."
-  FileUtils.rm_rf(DEMO_DIR)
-end
-FileUtils.mkdir_p(DEMO_DIR)
-Dir.chdir(DEMO_DIR)
-
-puts "📦 Initializing git repo..."
-run "git init"
-run "git config user.email 'demo@example.com'"
-run "git config user.name 'Demo User'"
-run "touch README.md"
-run "git add README.md"
-run "git commit -m 'Initial commit'"
-
-# 2. Create Worktrees
-puts "🌳 Spawning worktrees..."
-SESSIONS.each do |session|
-  # Create branch and worktree
-  path = File.join(WORKTREES_DIR, session.gsub('/', '-'))
-  run "git worktree add -b #{session} #{path}"
-  
-  # Add some "dirty" state to random sessions
-  if rand < 0.4
-    puts "   - Making #{session} dirty..."
-    File.write(File.join(path, "dirty_file.txt"), "This is uncommitted work")
-  end
-end
-
-# 3. Create a fake .env to show off symlinking
-File.write(".env", "SECRET_KEY=12345\nAPI_HOST=localhost:3000")
-File.write("node_modules", "fake_node_modules") # Just a file for demo
-
-puts "\n✨ Demo Ready!"
-puts "To run the demo:"
-puts "  cd #{DEMO_DIR}"
-puts "  cwt"