wtcode 0.3.0__tar.gz → 0.5.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.3.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
@@ -61,6 +61,7 @@ wtcode --exec CMD [CMD-ARGS...]
 
 - **`BRANCH`** -- Git branch or worktree name. If omitted and [fzf](https://github.com/junegunn/fzf) is available, interactively select one. Surround with `:` to create a new branch (use `:::name` or `name:::` to avoid fzf matching the colons).
 - **`CMD`** -- Command to launch in the worktree. Defaults to `$WTCODE_CMD`, or the first available of: `claude`, `aider`, `codex`, `$SHELL`.
+  When `CMD` resolves to plain `claude` (no extra args) in a worktree that already existed, wtcode launches `claude /resume` so it opens straight into your last session there. Press `Esc` in the picker to start a new session instead.
 - **`--exec`** -- Skip the branch argument; select interactively via fzf, then launch `CMD`.
 - **`--help`** / **`--version`** -- Show help or version info.
 
@@ -81,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.3.0 → wtcode-0.5.0}/README.md

@@ -43,6 +43,7 @@ wtcode --exec CMD [CMD-ARGS...]
 
 - **`BRANCH`** -- Git branch or worktree name. If omitted and [fzf](https://github.com/junegunn/fzf) is available, interactively select one. Surround with `:` to create a new branch (use `:::name` or `name:::` to avoid fzf matching the colons).
 - **`CMD`** -- Command to launch in the worktree. Defaults to `$WTCODE_CMD`, or the first available of: `claude`, `aider`, `codex`, `$SHELL`.
+  When `CMD` resolves to plain `claude` (no extra args) in a worktree that already existed, wtcode launches `claude /resume` so it opens straight into your last session there. Press `Esc` in the picker to start a new session instead.
 - **`--exec`** -- Skip the branch argument; select interactively via fzf, then launch `CMD`.
 - **`--help`** / **`--version`** -- Show help or version info.
 
@@ -63,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.3.0 → wtcode-0.5.0}/pyproject.toml

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

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

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

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

@@ -5,9 +5,21 @@
 # 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; }
+@q() {
+  local quoted=$({ set +x; } 2>/dev/null; exec 2>&1; PS4=; set -x; : "$@")
+  echo "${quoted:2}"  # lstrip the ': ' prefix to get the compact bash-quoted form
+}
 --sanitize-branch-name() {
   printf '%s' "$1" |
     tr '[:upper:]' '[:lower:]' |   # lowercase
@@ -16,7 +28,7 @@ ${WTCODE_DEBUG:+set -x}
     sed 's/^-//; s/-$//'           # trim leading/trailing hyphens
 }
 
-WTCODE_VERSION=0.3.0
+WTCODE_VERSION=0.5.0
 --version() { echo "wtcode $WTCODE_VERSION"; }
 --help() {
   cat <<USAGE
@@ -38,11 +50,21 @@ 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
                            new-window   - create new window with send-keys
                            exec         - exec the tool directly (opt out of send-keys)
+  WTCODE_TERMINAL_MODE   Outside tmux, control how the tool is launched:
+                           send-keys    - reuse the current tab/window via AppleScript
+                                          (default; macOS only). Terminal.app and Ghostty
+                                          1.3+ use their own scripting support; any other
+                                          terminal falls back to simulated keystrokes
+                           exec         - exec the tool directly (opt out of send-keys)
   WTCODE_DEBUG           Enable debug tracing when set
   GIT_WORKTREE_ROOT      Override the directory where worktrees are created
 
@@ -58,17 +80,39 @@ 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
 ###############################################################################
 --enter-git-worktree() {
   local branch_name=
+  WTCODE_WORKTREE_EXISTED=false
 
   # 1. determine which branch/worktree to use
   if [[ $# -gt 0 ]]; then
@@ -118,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
     )
@@ -172,6 +220,7 @@ WTCODE_CMDS_TO_TRY=(
     if [[ -n $existing_worktree ]]; then
       --msg "branch '$branch_name' is checked out at: $existing_worktree"
       cd "$existing_worktree"
+      WTCODE_WORKTREE_EXISTED=true
       return 0
     fi
   fi
@@ -207,6 +256,7 @@ WTCODE_CMDS_TO_TRY=(
 
   if [[ -e "$worktree_path"/.git ]]; then
     --msg "using existing worktree: $worktree_path"
+    WTCODE_WORKTREE_EXISTED=true
   elif [[ -n ${remote_branch-} ]] && ! git rev-parse --verify "refs/heads/$branch_name" &>/dev/null; then
     # remote branch: create local tracking branch in a new worktree
     --msg "creating worktree for remote branch: $remote_branch"
@@ -217,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"
 
@@ -295,6 +350,116 @@ WTCODE_CMDS_TO_TRY=(
   --msg "created .claude/.gitignore"
 }
 
+###############################################################################
+## --terminal-send-keys -- tmux-like send-keys for GUI terminal apps
+###############################################################################
+# Reuses the current tab/window in the surrounding terminal app, outside
+# tmux. cd_cmd/run_cmd are sent as two separate lines rather than one
+# `cd X && cmd` line, since the shell's PROMPT_COMMAND (what updates the
+# tab/window title via OSC 7/6) only fires between commands, at the next
+# prompt -- a single `&&` line never shows one, so the title would stay
+# stale for as long as cmd runs.
+#
+# macOS-only: dispatches on $TERM_PROGRAM by looking for a matching
+# --terminal-send-keys--macos--$TERM_PROGRAM function -- add support for
+# another terminal app by just defining one, named to match its
+# $TERM_PROGRAM value exactly. `type osascript` fails (and this returns 1)
+# on any other platform, so this whole mechanism is a no-op there and
+# callers just fall back to exec. Also returns 1 if there's no terminal
+# emulator signal (TERM_PROGRAM/TERMINAL_EMULATOR, as in ~/.zprofile) at all.
+--terminal-send-keys() {
+  local worktree_path="$PWD"
+  local cd_cmd="cd $(@q "$worktree_path")"
+  local run_cmd="$(@q "$@")"
+
+  # TODO: support Linux/general-unix terminals (and SSH sessions) too --
+  # e.g. terminals with OSC 7/6 + a way to inject text (wezterm cli,
+  # kitty @ send-text, iterm2's escape sequences, etc). For now this whole
+  # mechanism is macOS-only and returns 1 (falls back to exec) elsewhere.
+  type osascript &>/dev/null || return 1
+
+  local termprog=${TERM_PROGRAM-${TERMINAL_EMULATOR-}}
+  [[ -n $termprog ]] || return 1
+  if type -- "--terminal-send-keys--macos--$termprog" &>/dev/null; then
+    "--terminal-send-keys--macos--$termprog" "$cd_cmd" "$run_cmd"
+  else
+    --terminal-send-keys--macos--system-events "$cd_cmd" "$run_cmd"
+  fi
+}
+
+# `do script ... in front window`: reuses Terminal's front window via a real
+# Apple Event, not a keystroke. `osascript -` reads the script from stdin;
+# without it, osascript treats argv[0] as a script *file* path.
+--terminal-send-keys--macos--Apple_Terminal() {
+  local result
+  result=$(osascript - "$@" <<'APPLESCRIPT'
+on run argv
+  tell application "Terminal"
+    try
+      repeat with line_cmd in argv
+        do script (line_cmd as text) in front window
+      end repeat
+      set frontmost of front window to true
+      return "OK"
+    on error
+      return "NOTFOUND"
+    end try
+  end tell
+end run
+APPLESCRIPT
+  ) || return 1
+  [[ $result == OK ]]
+}
+
+# Ghostty 1.3+ ships a real AppleScript dictionary: `input text ... to
+# term` targets the terminal focused in the front window's selected tab.
+# Falls back to --macos--system-events since this is still a young feature.
+--terminal-send-keys--macos--ghostty() {
+  local result rc
+  result=$(osascript - "$@" <<'APPLESCRIPT'
+on run argv
+  tell application "Ghostty"
+    try
+      set term to focused terminal of selected tab of front window
+      repeat with line_cmd in argv
+        input text ((line_cmd as text) & "\n") to term
+      end repeat
+      return "OK"
+    on error
+      return "NOTFOUND"
+    end try
+  end tell
+end run
+APPLESCRIPT
+  ); rc=$?
+  [[ $rc -eq 0 && $result == OK ]] || --terminal-send-keys--macos--system-events "$@"
+}
+
+# Last resort: fake keystrokes via System Events (needs Accessibility
+# permission). No `activate` call -- $TERM_PROGRAM isn't always a real app
+# name, so this relies on the calling terminal still being frontmost.
+--terminal-send-keys--macos--system-events() {
+  local result
+  result=$(osascript - "$@" <<'APPLESCRIPT'
+on run argv
+  tell application "System Events"
+    try
+      repeat with line_cmd in argv
+        keystroke (line_cmd as text)
+        key code 36 -- Return
+        delay 0.05
+      end repeat
+      return "OK"
+    on error
+      return "NOTFOUND"
+    end try
+  end tell
+end run
+APPLESCRIPT
+  ) || return 1
+  [[ $result == OK ]]
+}
+
 ###############################################################################
 ## --launch-code-tool -- resolve and exec the tool in the worktree
 ###############################################################################
@@ -308,6 +473,14 @@ WTCODE_CMDS_TO_TRY=(
     [[ $# -gt 0 ]] || set -- "${SHELL:-bash}"
   fi
 
+  # default to resuming the last session when relaunching claude in a
+  # worktree that already existed; press Esc in the picker to start fresh
+  # instead. only kicks in when no CMD-ARGS were given, so explicit flags
+  # (e.g. `claude --resume`) are never overridden.
+  if [[ $1 == claude && $# -eq 1 && ${WTCODE_WORKTREE_EXISTED:-false} == true ]]; then
+    set -- "$1" /resume
+  fi
+
   [[ $1 == claude ]] && --provision-claude-settings
 
   --msg "launching: $*"
@@ -315,17 +488,12 @@ WTCODE_CMDS_TO_TRY=(
   # 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)
         local worktree_path="$PWD"
-        # quote each argument for shell safety
-        local quoted_args=()
-        for arg in "$@"; do
-          quoted_args+=("$(printf '%q' "$arg")")
-        done
-        local cmd="cd $(printf '%q' "$worktree_path") && ${quoted_args[*]}"
+        local cmd="cd $(@q "$worktree_path") && $(@q "$@")"
 
         case $mode in
           send-keys)
@@ -356,7 +524,27 @@ WTCODE_CMDS_TO_TRY=(
     esac
   fi
 
-  # outside tmux, WTCODE_TMUX_MODE=exec, or unknown mode: exec directly
+  # 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
+    case $mode in
+      send-keys)
+        if --terminal-send-keys "$@"; then
+          return 0
+        fi
+        --msg "could not reuse the current tab/window; falling back to exec"
+        ;;
+      exec)
+        # explicitly opt out of send-keys, fall through to exec
+        ;;
+      *)
+        --msg "unknown WTCODE_TERMINAL_MODE: $mode (expected: send-keys, exec)"
+        ;;
+    esac
+  fi
+
+  # outside tmux, WTCODE_TMUX_MODE=exec, unsupported terminal, or unknown mode: exec directly
   exec "$@"
 }
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.3.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
@@ -61,6 +61,7 @@ wtcode --exec CMD [CMD-ARGS...]
 
 - **`BRANCH`** -- Git branch or worktree name. If omitted and [fzf](https://github.com/junegunn/fzf) is available, interactively select one. Surround with `:` to create a new branch (use `:::name` or `name:::` to avoid fzf matching the colons).
 - **`CMD`** -- Command to launch in the worktree. Defaults to `$WTCODE_CMD`, or the first available of: `claude`, `aider`, `codex`, `$SHELL`.
+  When `CMD` resolves to plain `claude` (no extra args) in a worktree that already existed, wtcode launches `claude /resume` so it opens straight into your last session there. Press `Esc` in the picker to start a new session instead.
 - **`--exec`** -- Skip the branch argument; select interactively via fzf, then launch `CMD`.
 - **`--help`** / **`--version`** -- Show help or version info.
 
@@ -81,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 |