wtcode 0.2.0__tar.gz → 0.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.2.0
+Version: 0.4.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.
 
@@ -88,13 +89,14 @@ WTCODE_CMD=cursor wtcode feature  # use cursor as default tool
 
 1. **Select/specify a branch** -- pass as argument or pick interactively with fzf
 2. **Create or switch to the worktree** -- worktrees are organized under `$GIT_WORKTREE_ROOT` (defaults to `../<repo>.worktrees/`)
-3. **Launch a tool** -- runs the specified command (or smart default) inside the worktree
+3. **Provision Claude Code, if that's what you're launching** -- when the resolved tool is `claude`, the worktree is auto-trusted (skips the "do you trust this folder" dialog) and `.claude/settings.json` / `.claude/settings.local.json` are symlinked in from the main repo if not already present -- never for other tools, never clobbering a file that's already there
+4. **Launch the tool** -- runs the specified command (or smart default) inside the worktree
 
 ## Dependencies
 
 - **git** -- required
 - **[fzf](https://github.com/junegunn/fzf)** -- recommended, for interactive branch selection
-- **[jq](https://jqlang.github.io/jq/)** -- optional, for Claude Code auto-trust setup
+- **[jq](https://jqlang.github.io/jq/)** -- optional, for Claude Code auto-trust setup (no dependency needed for the settings symlinking itself)
 
 ## License
 

{wtcode-0.2.0 → wtcode-0.4.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.
 
@@ -70,13 +71,14 @@ WTCODE_CMD=cursor wtcode feature  # use cursor as default tool
 
 1. **Select/specify a branch** -- pass as argument or pick interactively with fzf
 2. **Create or switch to the worktree** -- worktrees are organized under `$GIT_WORKTREE_ROOT` (defaults to `../<repo>.worktrees/`)
-3. **Launch a tool** -- runs the specified command (or smart default) inside the worktree
+3. **Provision Claude Code, if that's what you're launching** -- when the resolved tool is `claude`, the worktree is auto-trusted (skips the "do you trust this folder" dialog) and `.claude/settings.json` / `.claude/settings.local.json` are symlinked in from the main repo if not already present -- never for other tools, never clobbering a file that's already there
+4. **Launch the tool** -- runs the specified command (or smart default) inside the worktree
 
 ## Dependencies
 
 - **git** -- required
 - **[fzf](https://github.com/junegunn/fzf)** -- recommended, for interactive branch selection
-- **[jq](https://jqlang.github.io/jq/)** -- optional, for Claude Code auto-trust setup
+- **[jq](https://jqlang.github.io/jq/)** -- optional, for Claude Code auto-trust setup (no dependency needed for the settings symlinking itself)
 
 ## License
 

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

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

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

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

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

@@ -8,6 +8,10 @@ shopt -s extglob
 ${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 +20,7 @@ ${WTCODE_DEBUG:+set -x}
     sed 's/^-//; s/-$//'           # trim leading/trailing hyphens
 }
 
-WTCODE_VERSION=0.2.0
+WTCODE_VERSION=0.4.0
 --version() { echo "wtcode $WTCODE_VERSION"; }
 --help() {
   cat <<USAGE
@@ -43,6 +47,12 @@ Environment variables:
                            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
 
@@ -69,6 +79,7 @@ WTCODE_CMDS_TO_TRY=(
 ###############################################################################
 --enter-git-worktree() {
   local branch_name=
+  WTCODE_WORKTREE_EXISTED=false
 
   # 1. determine which branch/worktree to use
   if [[ $# -gt 0 ]]; then
@@ -172,6 +183,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 +219,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"
@@ -228,6 +241,183 @@ WTCODE_CMDS_TO_TRY=(
     git checkout "$branch_name" --
 }
 
+###############################################################################
+## --provision-claude-settings -- Claude Code setup, only when launching claude
+###############################################################################
+# Everything Claude-Code-specific lives here so it runs once, synchronously,
+# before dispatch -- regardless of tmux mode -- and only when the resolved
+# tool is actually `claude`. See the call site in --launch-code-tool.
+--provision-claude-settings() {
+  # auto-trust this worktree in Claude Code's global config. Newer Claude
+  # Code versions also gate a separate "pre-approves N tool permissions"
+  # onboarding screen (shown when .claude/settings.local.json grants
+  # auto-approve rules) that hasTrustDialogAccepted alone doesn't suppress --
+  # hasCompletedProjectOnboarding is needed too.
+  if type jq &>/dev/null && [[ -f ~/.claude.json ]]; then
+    (
+      export worktree_path="$PWD"
+      jq -e '.projects[env.worktree_path]' ~/.claude.json &>/dev/null || {
+        jq '.projects[env.worktree_path] = ({} | .hasTrustDialogAccepted = true | .hasCompletedProjectOnboarding = true)' \
+          ~/.claude.json >~/.claude.json.wtcode.$$
+        mv -f ~/.claude.json.wtcode.$$ ~/.claude.json
+      }
+    )
+  fi
+
+  # symlink project-local settings from the main worktree, if not already
+  # present here -- never clobber a file that's git-tracked, hook-provisioned,
+  # or already customized in this worktree (including from a prior run: a
+  # dangling/previously-created symlink also counts as "already present").
+  local main_root
+  main_root=$(
+    git_common_dir=$(git rev-parse --git-common-dir)
+    cd "$git_common_dir"
+    cd ..
+    pwd
+  )
+  [[ -d "$main_root/.claude" ]] || return 0   # nothing to provision from
+  [[ "$main_root" == "$PWD" ]] && return 0    # already in the main worktree
+
+  local name created_names=()
+  for name in settings.json settings.local.json; do
+    local src="$main_root/.claude/$name" dst="$PWD/.claude/$name"
+    [[ -e "$src" ]] || continue                 # nothing to link
+    [[ -e "$dst" || -L "$dst" ]] && continue    # don't clobber existing/broken link
+    mkdir -p "$PWD/.claude"                     # safe no-op if .claude/ (with other content) already exists
+    ln -s "$src" "$dst"
+    --msg "symlinked .claude/$name from main worktree"
+    created_names+=("$name")
+  done
+
+  (( ${#created_names[@]} > 0 )) || return 0
+
+  local gi="$PWD/.claude/.gitignore"
+  [[ -e $gi ]] && return 0   # respect a pre-existing, possibly customized file
+
+  local already_ignored=true
+  for name in "${created_names[@]}"; do
+    git check-ignore -q ".claude/$name" || already_ignored=false
+  done
+  $already_ignored && return 0
+
+  {
+    echo '# wtcode: symlinked from the main worktree; never commit these here'
+    echo 'settings.json'
+    echo 'settings.local.json'
+  } >"$gi"
+  --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
 ###############################################################################
@@ -241,6 +431,16 @@ 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: $*"
 
   # when inside tmux, default to send-keys for command history access
@@ -251,12 +451,7 @@ WTCODE_CMDS_TO_TRY=(
     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)
@@ -287,35 +482,28 @@ WTCODE_CMDS_TO_TRY=(
     esac
   fi
 
-  # outside tmux, WTCODE_TMUX_MODE=exec, or unknown mode: exec directly
-  if [[ $(type -t "$1") == function ]]; then
-    "$@"
-  else
-    exec "$@"
+  # 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}
+    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
-}
 
-###############################################################################
-## Command wrappers -- override specific tools with pre-launch setup.
-## Define a function with the tool's name to add custom behavior.
-###############################################################################
-
-# claude: auto-trust the worktree in Claude Code's config
-claude() {
-  if type jq &>/dev/null && [[ -f ~/.claude.json ]]; then
-    (
-      export worktree_path="$PWD"
-      jq -e '.projects[env.worktree_path]' ~/.claude.json &>/dev/null || {
-        jq '
-          .projects[env.worktree_path] = ({}
-          | .hasTrustDialogAccepted = true
-          )
-        ' ~/.claude.json >~/.claude.json.wtcode.$$
-        mv -f ~/.claude.json.wtcode.$$ ~/.claude.json
-      }
-    )
-  fi
-  exec claude "$@"
+  # outside tmux, WTCODE_TMUX_MODE=exec, unsupported terminal, or unknown mode: exec directly
+  exec "$@"
 }
 
 ###############################################################################

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.2.0
+Version: 0.4.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.
 
@@ -88,13 +89,14 @@ WTCODE_CMD=cursor wtcode feature  # use cursor as default tool
 
 1. **Select/specify a branch** -- pass as argument or pick interactively with fzf
 2. **Create or switch to the worktree** -- worktrees are organized under `$GIT_WORKTREE_ROOT` (defaults to `../<repo>.worktrees/`)
-3. **Launch a tool** -- runs the specified command (or smart default) inside the worktree
+3. **Provision Claude Code, if that's what you're launching** -- when the resolved tool is `claude`, the worktree is auto-trusted (skips the "do you trust this folder" dialog) and `.claude/settings.json` / `.claude/settings.local.json` are symlinked in from the main repo if not already present -- never for other tools, never clobbering a file that's already there
+4. **Launch the tool** -- runs the specified command (or smart default) inside the worktree
 
 ## Dependencies
 
 - **git** -- required
 - **[fzf](https://github.com/junegunn/fzf)** -- recommended, for interactive branch selection
-- **[jq](https://jqlang.github.io/jq/)** -- optional, for Claude Code auto-trust setup
+- **[jq](https://jqlang.github.io/jq/)** -- optional, for Claude Code auto-trust setup (no dependency needed for the settings symlinking itself)
 
 ## License