wtcode 0.4.0__tar.gz → 0.5.0__tar.gz

{wtcode-0.4.0/wtcode.egg-info → wtcode-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.4.0
+Version: 0.5.0
 Summary: Launch your favorite code tool in a git worktree
 Author-email: Jaeho Shin <netj@sparcs.org>
 License-Expression: MIT
@@ -82,6 +82,7 @@ WTCODE_CMD=cursor wtcode feature  # use cursor as default tool
 | Variable | Description |
 |---|---|
 | `WTCODE_CMD` | Default tool to launch (e.g., `claude`, `lazygit`, `vim`, `cursor`) |
+| `WTCODE_USE_CURRENT_BRANCH` | When creating a brand-new branch, fork it from the current HEAD instead of the default: `origin/HEAD` (falling back to `origin/main`, then `origin/master`) |
 | `WTCODE_DEBUG` | Enable debug tracing when set to any value |
 | `GIT_WORKTREE_ROOT` | Override the directory where worktrees are created |
 

{wtcode-0.4.0 → wtcode-0.5.0}/README.md

@@ -64,6 +64,7 @@ WTCODE_CMD=cursor wtcode feature  # use cursor as default tool
 | Variable | Description |
 |---|---|
 | `WTCODE_CMD` | Default tool to launch (e.g., `claude`, `lazygit`, `vim`, `cursor`) |
+| `WTCODE_USE_CURRENT_BRANCH` | When creating a brand-new branch, fork it from the current HEAD instead of the default: `origin/HEAD` (falling back to `origin/main`, then `origin/master`) |
 | `WTCODE_DEBUG` | Enable debug tracing when set to any value |
 | `GIT_WORKTREE_ROOT` | Override the directory where worktrees are created |
 

{wtcode-0.4.0 → wtcode-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wtcode"
-version = "0.4.0"
+version = "0.5.0"
 description = "Launch your favorite code tool in a git worktree"
 license = "MIT"
 readme = "README.md"

{wtcode-0.4.0 → wtcode-0.5.0}/wtcode/__init__.py

@@ -1,3 +1,3 @@
 """wtcode -- launch your favorite code tool in a git worktree."""
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"

{wtcode-0.4.0 → wtcode-0.5.0}/wtcode/wtcode.sh

@@ -5,6 +5,14 @@
 # Created: 2026-02-03
 set -eu
 shopt -s extglob
+
+# declare all WTCODE_* env vars and their defaults in one place
+: ${WTCODE_CMD:=}
+: ${WTCODE_USE_CURRENT_BRANCH:=false}
+: ${WTCODE_TMUX_MODE:=send-keys}
+: ${WTCODE_TERMINAL_MODE:=send-keys}
+: ${WTCODE_DEBUG:=}
+
 ${WTCODE_DEBUG:+set -x}
 
 --msg() { echo "wtcode: $*" >&2; }
@@ -20,7 +28,7 @@ ${WTCODE_DEBUG:+set -x}
     sed 's/^-//; s/-$//'           # trim leading/trailing hyphens
 }
 
-WTCODE_VERSION=0.4.0
+WTCODE_VERSION=0.5.0
 --version() { echo "wtcode $WTCODE_VERSION"; }
 --help() {
   cat <<USAGE
@@ -42,6 +50,10 @@ Usage: wtcode [BRANCH] [CMD [CMD-ARGS...]]
 
 Environment variables:
   WTCODE_CMD             Default tool to launch (e.g., claude, lazygit, vim)
+  WTCODE_USE_CURRENT_BRANCH
+                         When creating a brand-new branch, fork it from the
+                         current HEAD instead of the default: origin/HEAD
+                         (falling back to origin/main, then origin/master)
   WTCODE_TMUX_MODE       When in tmux, control how the tool is launched:
                            send-keys    - send command to current pane (default in tmux)
                            split-window - create split pane with send-keys
@@ -68,12 +80,33 @@ USAGE
 
 # commands to try as default, in order of preference
 WTCODE_CMDS_TO_TRY=(
-    ${WTCODE_CMD:-}
+    $WTCODE_CMD
     claude
     aider
     codex
 )
 
+###############################################################################
+## --default-base-ref -- ref to fork a brand-new branch from
+###############################################################################
+# defaults to origin/HEAD (falling back to origin/main, then origin/master),
+# so new worktrees start from the repo's default branch instead of whatever
+# happens to be checked out where wtcode was invoked. set
+# WTCODE_USE_CURRENT_BRANCH=true to restore the old behavior of forking from
+# the current HEAD. only consults local remote-tracking refs -- never
+# touches the network.
+--default-base-ref() {
+  if [[ $WTCODE_USE_CURRENT_BRANCH == true ]]; then
+    git rev-parse HEAD
+    return
+  fi
+  local ref
+  for ref in origin/HEAD origin/main origin/master; do
+    git rev-parse --verify -q "$ref" &>/dev/null && { echo "$ref"; return; }
+  done
+  git rev-parse HEAD
+}
+
 ###############################################################################
 ## --enter-git-worktree -- select branch and create/switch worktree
 ###############################################################################
@@ -129,9 +162,13 @@ WTCODE_CMDS_TO_TRY=(
         printf '%s\t%s %s\t%s  %s %s%s\n' \
           "$branch" "$ind" "$name_shown" "$date_shown" "$hash_shown" "$upstream_shown" "$subject"
       done |
-      fzf --ansi --color --tmux --print-query --delimiter=$'\t' --with-nth=2 --nth=1 \
+      fzf --ansi --color --tmux 90%,70% --print-query --delimiter=$'\t' --with-nth=2 --nth=1 \
           --preview 'echo {3}' --preview-window 'down:2:wrap' \
-          --prompt 'wtcode: select worktree/branch (prefix : to create new) > ' |
+          --header "$(
+              echo '[wtcode] Select the worktree/branch or create new to launch your code tool in it.'
+              echo '         Typing colons `:` avoids selecting an existing one to create new with similar names.'
+          )" \
+          --prompt '> ' |
       cut -f1 |
       tail -1
     )
@@ -230,9 +267,14 @@ WTCODE_CMDS_TO_TRY=(
     --msg "creating worktree for branch: $branch_name"
     git worktree add -B "$branch_name" "$worktree_path" "$(git rev-parse "$branch_name")"
   else
-    # fork the current HEAD and create the new worktree
-    --msg "creating worktree with new branch: $branch_name"
-    git worktree add -b "$branch_name" "$worktree_path" "$(git rev-parse HEAD)"
+    # fork a base ref and create the new worktree: defaults to origin/HEAD
+    # (falling back to origin/main, origin/master, then the current HEAD);
+    # set WTCODE_USE_CURRENT_BRANCH=true to always fork from the current
+    # branch instead
+    local base_ref
+    base_ref=$(--default-base-ref)
+    --msg "creating worktree with new branch: $branch_name (from $base_ref)"
+    git worktree add -b "$branch_name" "$worktree_path" "$base_ref"
   fi
   cd "$worktree_path"
 
@@ -446,7 +488,7 @@ APPLESCRIPT
   # when inside tmux, default to send-keys for command history access
   # set WTCODE_TMUX_MODE=exec to opt out and exec directly
   if [[ -n ${TMUX:-} ]] && type tmux &>/dev/null; then
-    local mode=${WTCODE_TMUX_MODE:-send-keys}
+    local mode=$WTCODE_TMUX_MODE
 
     case $mode in
       send-keys|split-window|new-window)
@@ -485,7 +527,7 @@ APPLESCRIPT
   # outside tmux: reuse the current tab/window if the terminal app supports
   # it (see --terminal-send-keys). set WTCODE_TERMINAL_MODE=exec to opt out
   if [[ -z ${TMUX:-} ]]; then
-    local mode=${WTCODE_TERMINAL_MODE:-send-keys}
+    local mode=$WTCODE_TERMINAL_MODE
     case $mode in
       send-keys)
         if --terminal-send-keys "$@"; then

{wtcode-0.4.0 → wtcode-0.5.0/wtcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.4.0
+Version: 0.5.0
 Summary: Launch your favorite code tool in a git worktree
 Author-email: Jaeho Shin <netj@sparcs.org>
 License-Expression: MIT
@@ -82,6 +82,7 @@ WTCODE_CMD=cursor wtcode feature  # use cursor as default tool
 | Variable | Description |
 |---|---|
 | `WTCODE_CMD` | Default tool to launch (e.g., `claude`, `lazygit`, `vim`, `cursor`) |
+| `WTCODE_USE_CURRENT_BRANCH` | When creating a brand-new branch, fork it from the current HEAD instead of the default: `origin/HEAD` (falling back to `origin/main`, then `origin/master`) |
 | `WTCODE_DEBUG` | Enable debug tracing when set to any value |
 | `GIT_WORKTREE_ROOT` | Override the directory where worktrees are created |