wtcode 0.1.1__tar.gz → 0.1.3__tar.gz

{wtcode-0.1.1/wtcode.egg-info → wtcode-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.1.1
+Version: 0.1.3
 Summary: Launch your favorite code tool in a git worktree
 Author-email: Jaeho Shin <netj@sparcs.org>
 License-Expression: MIT
@@ -18,7 +18,7 @@ Dynamic: license-file
 
 # wtcode
 
-**Launch your favorite code tool in a git worktree.**
+**Effortlessly launch your favorite code tool in a git worktree.**
 
 *worktree code* / *what-the-code* -- streamlines git worktree selection, creation, and launching tools like [Claude Code](https://claude.ai/code), [lazygit](https://github.com/jesseduffield/lazygit), your editor, or any command.
 
@@ -33,15 +33,18 @@ brew install netj/tap/wtcode
 ### PyPI (via [uv](https://docs.astral.sh/uv/))
 
 ```sh
-uvx wtcode
+uv tool install wtcode
 ```
 
-Or install globally:
+Or try it without installing:
 
 ```sh
-uv tool install wtcode
+uvx wtcode
 ```
 
+> **Note:** `uv tool install` is recommended over `uvx` for regular use.
+> `uvx` keeps a parent `uv tool run` process alive, which can interfere with tools like tmux that detect the working directory from the process tree.
+
 ### From source
 
 ```sh
@@ -53,10 +56,13 @@ ln -s "$PWD/wtcode/wtcode.sh" /usr/local/bin/wtcode
 
 ```
 wtcode [BRANCH] [CMD [CMD-ARGS...]]
+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. Prefix with `:` to create a new branch (use `:::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`.
+- **`--exec`** -- Skip the branch argument; select interactively via fzf, then launch `CMD`.
+- **`--help`** / **`--version`** -- Show help or version info.
 
 ### Examples
 
@@ -64,6 +70,7 @@ wtcode [BRANCH] [CMD [CMD-ARGS...]]
 wtcode feature-x                  # launch default tool in feature-x worktree
 wtcode feature-x lazygit          # launch lazygit
 wtcode feature-x claude --resume  # launch claude with flags
+wtcode --exec claude --resume     # select interactively, launch claude --resume
 wtcode :new-feature               # create new branch and worktree
 wtcode                            # interactive branch selection via fzf
 WTCODE_CMD=cursor wtcode feature  # use cursor as default tool

{wtcode-0.1.1 → wtcode-0.1.3}/README.md

@@ -1,6 +1,6 @@
 # wtcode
 
-**Launch your favorite code tool in a git worktree.**
+**Effortlessly launch your favorite code tool in a git worktree.**
 
 *worktree code* / *what-the-code* -- streamlines git worktree selection, creation, and launching tools like [Claude Code](https://claude.ai/code), [lazygit](https://github.com/jesseduffield/lazygit), your editor, or any command.
 
@@ -15,15 +15,18 @@ brew install netj/tap/wtcode
 ### PyPI (via [uv](https://docs.astral.sh/uv/))
 
 ```sh
-uvx wtcode
+uv tool install wtcode
 ```
 
-Or install globally:
+Or try it without installing:
 
 ```sh
-uv tool install wtcode
+uvx wtcode
 ```
 
+> **Note:** `uv tool install` is recommended over `uvx` for regular use.
+> `uvx` keeps a parent `uv tool run` process alive, which can interfere with tools like tmux that detect the working directory from the process tree.
+
 ### From source
 
 ```sh
@@ -35,10 +38,13 @@ ln -s "$PWD/wtcode/wtcode.sh" /usr/local/bin/wtcode
 
 ```
 wtcode [BRANCH] [CMD [CMD-ARGS...]]
+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. Prefix with `:` to create a new branch (use `:::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`.
+- **`--exec`** -- Skip the branch argument; select interactively via fzf, then launch `CMD`.
+- **`--help`** / **`--version`** -- Show help or version info.
 
 ### Examples
 
@@ -46,6 +52,7 @@ wtcode [BRANCH] [CMD [CMD-ARGS...]]
 wtcode feature-x                  # launch default tool in feature-x worktree
 wtcode feature-x lazygit          # launch lazygit
 wtcode feature-x claude --resume  # launch claude with flags
+wtcode --exec claude --resume     # select interactively, launch claude --resume
 wtcode :new-feature               # create new branch and worktree
 wtcode                            # interactive branch selection via fzf
 WTCODE_CMD=cursor wtcode feature  # use cursor as default tool

{wtcode-0.1.1 → wtcode-0.1.3}/pyproject.toml

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

{wtcode-0.1.1 → wtcode-0.1.3}/wtcode/__init__.py

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

{wtcode-0.1.1 → wtcode-0.1.3}/wtcode/wtcode.sh

@@ -8,14 +8,22 @@ shopt -s extglob
 ${WTCODE_DEBUG:+set -x}
 
 --msg() { echo "wtcode: $*" >&2; }
+--sanitize-branch-name() {
+  printf '%s' "$1" |
+    tr '[:upper:]' '[:lower:]' |   # lowercase
+    sed 's/[^a-z0-9/_-]/-/g' |     # replace non-alnum to hyphens
+    sed 's/--*/-/g' |              # collapse consecutive hyphens
+    sed 's/^-//; s/-$//'           # trim leading/trailing hyphens
+}
 
-WTCODE_VERSION=0.1.1
+WTCODE_VERSION=0.1.3
 --version() { echo "wtcode $WTCODE_VERSION"; }
 --help() {
   cat <<USAGE
 wtcode $WTCODE_VERSION -- launch a code tool in a git worktree
 
 Usage: wtcode [BRANCH] [CMD [CMD-ARGS...]]
+       wtcode --exec CMD [CMD-ARGS...]
 
   BRANCH     Git branch or worktree name to switch to.
              If omitted and fzf is available, interactively select one.
@@ -25,6 +33,8 @@ Usage: wtcode [BRANCH] [CMD [CMD-ARGS...]]
   CMD        Command to launch in the worktree (default: \$WTCODE_CMD,
              or first available of: ${WTCODE_CMDS_TO_TRY[*]}, \$SHELL).
 
+  --exec     Skip branch argument; select interactively, then launch CMD.
+
 Environment variables:
   WTCODE_CMD             Default tool to launch (e.g., claude, lazygit, vim)
   WTCODE_DEBUG           Enable debug tracing when set
@@ -34,6 +44,7 @@ Examples:
   wtcode feature-x                  # select/create worktree, launch default tool
   wtcode feature-x lazygit          # launch lazygit in the worktree
   wtcode feature-x claude --resume  # launch claude with --resume
+  wtcode --exec claude --resume     # select interactively, launch claude --resume
   wtcode :new-feature               # create new branch and worktree
   WTCODE_CMD=cursor wtcode feature  # use cursor as the default tool
 USAGE
@@ -48,9 +59,12 @@ WTCODE_CMDS_TO_TRY=(
 )
 
 ###############################################################################
-## --select-git-branch -- determine which branch/worktree to use
+## --enter-git-worktree -- select branch and create/switch worktree
 ###############################################################################
---select-git-branch() {
+--enter-git-worktree() {
+  local branch_name=
+
+  # 1. determine which branch/worktree to use
   if [[ $# -gt 0 ]]; then
     branch_name=$1; shift
   elif type fzf &>/dev/null; then
@@ -115,23 +129,22 @@ WTCODE_CMDS_TO_TRY=(
 
   # check if branch name starts with ':' to force new branch creation
   # supports multiple colons (e.g., :::my-branch) to avoid fzf matching
-  force_new_branch=false
+  local force_new_branch=false
   if [[ $branch_name == :* ]]; then
     force_new_branch=true
     branch_name=${branch_name##+(:)}
     : ${branch_name:?non-empty branch name required after ':'}
-    # sanitize free-form text into a valid git branch name
-    branch_name=$(printf '%s' "$branch_name" |
-      tr '[:upper:]' '[:lower:]' |   # lowercase
-      sed 's/[^a-z0-9/_-]/-/g' |     # replace non-alnum to hyphens
-      sed 's/--*/-/g' |              # collapse consecutive hyphens
-      sed 's/^-//; s/-$//'           # trim leading/trailing hyphens
-    )
+  fi
+
+  # sanitize free-form text into a valid git branch name
+  # (skip if it already matches an existing branch/ref to preserve case)
+  if $force_new_branch || ! git rev-parse --verify "$branch_name" &>/dev/null; then
+    branch_name=$(--sanitize-branch-name "$branch_name")
     : ${branch_name:?branch name is empty after sanitization}
   fi
 
   # check if branch_name refers to a remote branch (e.g., origin/feature-x)
-  remote_branch=
+  local remote_branch=
   if ! $force_new_branch; then
     for remote in $(git remote); do
       if [[ $branch_name == "$remote/"* ]]; then
@@ -142,15 +155,8 @@ WTCODE_CMDS_TO_TRY=(
     done
   fi
 
-  # remaining args are the command to launch
-  wtcode_cmd=("$@")
-}
 
-###############################################################################
-## --prepare-git-worktree -- create or switch to the worktree for $branch_name
-###############################################################################
---prepare-git-worktree() {
-  # determine root of the worktree dirs
+  # 2. create or switch to the worktree
   cd "$(git rev-parse --show-toplevel)"
   : ${GIT_WORKTREE_ROOT:=$(
     git_common_dir=$(git rev-parse --git-common-dir)
@@ -160,8 +166,7 @@ WTCODE_CMDS_TO_TRY=(
     echo "$PWD"/../"$repo_name".worktrees
   )}
 
-  # ensure worktree based on given branch name
-  worktree_path="$GIT_WORKTREE_ROOT"/"$branch_name"
+  local worktree_path="$GIT_WORKTREE_ROOT"/"$branch_name"
   if [[ -e "$worktree_path"/.git ]]; then
     --msg "using existing worktree: $worktree_path"
   elif [[ -n ${remote_branch-} ]] && ! git rev-parse --verify "refs/heads/$branch_name" &>/dev/null; then
@@ -189,17 +194,21 @@ WTCODE_CMDS_TO_TRY=(
 ## --launch-code-tool -- resolve and exec the tool in the worktree
 ###############################################################################
 --launch-code-tool() {
-  # resolve the command to launch if not specified by user
-  if [[ ${#wtcode_cmd[@]} -eq 0 ]]; then
+  # resolve the command to launch if not specified
+  if [[ $# -eq 0 ]]; then
     for _cmd in "${WTCODE_CMDS_TO_TRY[@]}"; do
-      [[ -n "$_cmd" ]] && type "$_cmd" &>/dev/null && wtcode_cmd=("$_cmd") && break
+      [[ -n "$_cmd" ]] && type "$_cmd" &>/dev/null && set -- "$_cmd" && break
     done
     # fall back to an interactive shell
-    wtcode_cmd=("${wtcode_cmd[@]:-${SHELL:-bash}}")
+    [[ $# -gt 0 ]] || set -- "${SHELL:-bash}"
   fi
 
-  --msg "launching: ${wtcode_cmd[*]}"
-  "${wtcode_cmd[@]}"
+  --msg "launching: $*"
+  if [[ $(type -t "$1") == function ]]; then
+    "$@"
+  else
+    exec "$@"
+  fi
 }
 
 ###############################################################################
@@ -222,7 +231,7 @@ claude() {
       }
     )
   fi
-  exec command claude "$@"
+  exec claude "$@"
 }
 
 ###############################################################################
@@ -231,10 +240,18 @@ claude() {
 
 -h() { --help "$@"; }
 
+--exec() {
+  --enter-git-worktree
+  --launch-code-tool "$@"
+}
+
 --() {
-  --select-git-branch "$@"
-  --prepare-git-worktree
-  --launch-code-tool
+  if [[ $# -gt 0 ]]; then
+    --enter-git-worktree "$1"; shift
+  else
+    --enter-git-worktree
+  fi
+  --launch-code-tool "$@"
 }
 
 # dispatch $1 as a function when it starts with -

{wtcode-0.1.1 → wtcode-0.1.3/wtcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.1.1
+Version: 0.1.3
 Summary: Launch your favorite code tool in a git worktree
 Author-email: Jaeho Shin <netj@sparcs.org>
 License-Expression: MIT
@@ -18,7 +18,7 @@ Dynamic: license-file
 
 # wtcode
 
-**Launch your favorite code tool in a git worktree.**
+**Effortlessly launch your favorite code tool in a git worktree.**
 
 *worktree code* / *what-the-code* -- streamlines git worktree selection, creation, and launching tools like [Claude Code](https://claude.ai/code), [lazygit](https://github.com/jesseduffield/lazygit), your editor, or any command.
 
@@ -33,15 +33,18 @@ brew install netj/tap/wtcode
 ### PyPI (via [uv](https://docs.astral.sh/uv/))
 
 ```sh
-uvx wtcode
+uv tool install wtcode
 ```
 
-Or install globally:
+Or try it without installing:
 
 ```sh
-uv tool install wtcode
+uvx wtcode
 ```
 
+> **Note:** `uv tool install` is recommended over `uvx` for regular use.
+> `uvx` keeps a parent `uv tool run` process alive, which can interfere with tools like tmux that detect the working directory from the process tree.
+
 ### From source
 
 ```sh
@@ -53,10 +56,13 @@ ln -s "$PWD/wtcode/wtcode.sh" /usr/local/bin/wtcode
 
 ```
 wtcode [BRANCH] [CMD [CMD-ARGS...]]
+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. Prefix with `:` to create a new branch (use `:::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`.
+- **`--exec`** -- Skip the branch argument; select interactively via fzf, then launch `CMD`.
+- **`--help`** / **`--version`** -- Show help or version info.
 
 ### Examples
 
@@ -64,6 +70,7 @@ wtcode [BRANCH] [CMD [CMD-ARGS...]]
 wtcode feature-x                  # launch default tool in feature-x worktree
 wtcode feature-x lazygit          # launch lazygit
 wtcode feature-x claude --resume  # launch claude with flags
+wtcode --exec claude --resume     # select interactively, launch claude --resume
 wtcode :new-feature               # create new branch and worktree
 wtcode                            # interactive branch selection via fzf
 WTCODE_CMD=cursor wtcode feature  # use cursor as default tool