claude-worktree 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c13372671d9041cb88fbe74d783caec8d15cba40c9c0395b6ab64ef6105913c
-  data.tar.gz: dcf190dcc57792301fdddaf01ac7e880b56a14c97ee67f2095283ddc459b53dd
+  metadata.gz: f68f3cf3d0c293ec2a023f465bc7cd2a9dd4115011e93fb027c9ca0a94ced718
+  data.tar.gz: ebfaeb8f5ef8a443dc03b5565c682ee11300f2749a7659935ac15cf620bb51ac
 SHA512:
-  metadata.gz: c1c74c92f54d58d1799bb99fa42526899dccf851c191d3db5ac193f03b49a93438f80866c28a37cd52243722863445d8a0619f81b834d376df434c3e48b722e2
-  data.tar.gz: 3c0e53ec321f5dd06aa0d79caec3f2bca13a7647e338f30c354a1a287c2712b4f83ef161f4ce37835b5b3196d547707ee68e7d5cbfeb3da10d35391a97b33036
+  metadata.gz: 56b6b1e6f4990a10834095b1ffcea614a999c3463668fb9191ee51ac0f4fd30c9a4790b1c2757c4a84b69eb7e2c714ba424297682c19d5dd04e713dde2b27533
+  data.tar.gz: 0fad5b624dbe7ee5084dcd792c01fe6b7a8e1caafe09a1e7e09d88f8997d0b72d27c1ba7bf511e0742b5543b185966e3293fc5cd821f74458ddf98a063dd171a

data/README.md

@@ -69,6 +69,14 @@ npm ci
 echo "Ready to rock!"
 ```
 
+### Base Branch
+
+By default, new worktrees branch off of `HEAD`. To always branch from a specific starting point (e.g., `main`), set the `CWT_START_POINT` environment variable:
+
+```bash
+export CWT_START_POINT=main
+```
+
 ## 🎮 Usage
 
 Run `cwt` in the root of any Git repository.

data/lib/claude/worktree/version.rb

@@ -2,6 +2,6 @@
 
 module Claude
   module Worktree
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/cwt/repository.rb

@@ -80,7 +80,7 @@ module Cwt
       end
 
       worktrees.find do |wt|
-        wt.name == name_or_path || wt.path == normalized_path
+        wt.name == name_or_path || wt.branch == name_or_path || wt.path == normalized_path
       end
     end
 
@@ -89,16 +89,21 @@ module Cwt
     def create_worktree(name)
       require_relative 'worktree'
 
-      # Sanitize name
-      safe_name = name.strip.gsub(/[^a-zA-Z0-9_\-]/, '_')
+      # Sanitize name (allow / for branch name hierarchy)
+      safe_name = name.strip
+                      .gsub(%r{[^a-zA-Z0-9_\-/]}, '_')
+                      .gsub(%r{/+}, '/')
+                      .gsub(%r{^/|/$}, '')
       path = File.join(worktrees_dir, safe_name)
       absolute_path = File.join(@root, WORKTREE_DIR, safe_name)
 
-      # Ensure .worktrees exists
-      FileUtils.mkdir_p(worktrees_dir)
+      # Ensure parent directories exist (e.g. .worktrees/feat/ for feat/my-feature)
+      FileUtils.mkdir_p(File.dirname(path))
 
       # Create worktree with new branch
       cmd = ["git", "-C", @root, "worktree", "add", "-b", safe_name, path]
+      base_branch = ENV["CWT_START_POINT"]
+      cmd << base_branch if base_branch && !base_branch.strip.empty?
       _stdout, stderr, status = Open3.capture3(*cmd)
 
       unless status.success?

data/lib/cwt/view.rb

@@ -40,7 +40,7 @@ module Cwt
       )
 
       draw_header(tui, frame, header_area)
-      draw_list(model, tui, frame, list_area)
+      draw_table(model, tui, frame, list_area)
       draw_footer(model, tui, frame, footer_area)
 
       return unless model.mode == :creating
@@ -72,23 +72,32 @@ module Cwt
       frame.render_widget(title, area)
     end
 
-    def self.draw_list(model, tui, frame, area)
-      items = model.visible_worktrees.map do |wt|
-        # Status Icons
+    def self.draw_table(model, tui, frame, area)
+      rows = model.visible_worktrees.map do |wt|
         status_icon = wt.dirty ? '●' : ' '
         status_style = wt.dirty ? tui.style(**THEME[:dirty]) : tui.style(**THEME[:clean])
 
-        time = wt.last_commit || ''
-
-        # Consistent Column Widths
-        tui.text_line(spans: [
-          tui.text_span(content: " #{status_icon} ", style: status_style),
-          tui.text_span(content: wt.name.ljust(25), style: tui.style(modifiers: [:bold])),
-          tui.text_span(content: (wt.branch || 'HEAD').ljust(25), style: tui.style(**THEME[:dim])),
-          tui.text_span(content: time.rjust(15), style: tui.style(**THEME[:accent]))
+        tui.row(cells: [
+          tui.table_cell(content: " #{status_icon} ", style: status_style),
+          tui.table_cell(
+            content: tui.text_span(content: wt.name, style: tui.style(modifiers: [:bold]))
+          ),
+          tui.table_cell(
+            content: tui.text_span(content: wt.branch || 'HEAD', style: tui.style(**THEME[:dim]))
+          ),
+          tui.table_cell(
+            content: tui.text_span(content: (wt.last_commit || ''), style: tui.style(**THEME[:accent]))
+          )
         ])
       end
 
+      widths = [
+        tui.constraint_length(3),
+        tui.constraint_fill(1),
+        tui.constraint_fill(1),
+        tui.constraint_length(15)
+      ]
+
       # Dynamic Title based on context
       title_content = if model.mode == :filtering
                         tui.text_line(spans: [
@@ -102,10 +111,11 @@ module Cwt
                         tui.text_line(spans: [tui.text_span(content: ' SESSIONS ', style: tui.style(**THEME[:dim]))])
                       end
 
-      list = tui.list(
-        items: items,
-        selected_index: model.selection_index,
-        highlight_style: tui.style(**THEME[:selection]),
+      table = tui.table(
+        rows: rows,
+        widths: widths,
+        selected_row: model.selection_index,
+        row_highlight_style: tui.style(**THEME[:selection]),
         highlight_symbol: '▎',
         block: tui.block(
           titles: [{ content: title_content }],
@@ -114,7 +124,7 @@ module Cwt
         )
       )
 
-      frame.render_widget(list, area)
+      frame.render_widget(table, area)
     end
 
     def self.draw_footer(model, tui, frame, area)

data/lib/cwt/worktree.rb

@@ -21,7 +21,8 @@ module Cwt
     end
 
     def name
-      File.basename(@path)
+      resolve = ->(p) { File.realpath(p) rescue File.expand_path(p) }
+      resolve.call(@path).delete_prefix("#{resolve.call(@repository.worktrees_dir)}/")
     end
 
     def exists?
@@ -94,7 +95,10 @@ module Cwt
         end
       end
 
-      # Step 3: Delete Branch
+      # Step 3: Clean up empty parent directories under .worktrees/
+      cleanup_empty_parents
+
+      # Step 4: Delete Branch
       delete_branch(force: force)
     end
 
@@ -173,10 +177,20 @@ module Cwt
       end
     end
 
+    def cleanup_empty_parents
+      worktrees_dir = @repository.worktrees_dir
+      dir = File.dirname(@path)
+      while dir != worktrees_dir && dir.start_with?(worktrees_dir)
+        break unless Dir.exist?(dir) && (Dir.entries(dir) - %w[. ..]).empty?
+        Dir.rmdir(dir)
+        dir = File.dirname(dir)
+      end
+    end
+
     def delete_branch(force: false)
       branch_flag = force ? "-D" : "-d"
       _stdout, stderr, status = Open3.capture3(
-        "git", "-C", @repository.root, "branch", branch_flag, name
+        "git", "-C", @repository.root, "branch", branch_flag, @branch
       )
 
       if status.success?

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: claude-worktree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben Garcia
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ratatui_ruby
@@ -54,6 +55,7 @@ metadata:
   homepage_uri: https://github.com/bucket-robotics/claude-worktree
   source_code_uri: https://github.com/bucket-robotics/claude-worktree
   changelog_uri: https://github.com/bucket-robotics/claude-worktree/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,7 +70,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A TUI tool to manage Git Worktrees for AI coding agents.
 test_files: []