wtcode 0.2.0__tar.gz → 0.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.2.0
+Version: 0.3.0
 Summary: Launch your favorite code tool in a git worktree
 Author-email: Jaeho Shin <netj@sparcs.org>
 License-Expression: MIT
@@ -88,13 +88,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.3.0}/README.md

@@ -70,13 +70,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.3.0}/pyproject.toml

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

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

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

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

@@ -16,7 +16,7 @@ ${WTCODE_DEBUG:+set -x}
     sed 's/^-//; s/-$//'           # trim leading/trailing hyphens
 }
 
-WTCODE_VERSION=0.2.0
+WTCODE_VERSION=0.3.0
 --version() { echo "wtcode $WTCODE_VERSION"; }
 --help() {
   cat <<USAGE
@@ -228,6 +228,73 @@ 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"
+}
+
 ###############################################################################
 ## --launch-code-tool -- resolve and exec the tool in the worktree
 ###############################################################################
@@ -241,6 +308,8 @@ WTCODE_CMDS_TO_TRY=(
     [[ $# -gt 0 ]] || set -- "${SHELL:-bash}"
   fi
 
+  [[ $1 == claude ]] && --provision-claude-settings
+
   --msg "launching: $*"
 
   # when inside tmux, default to send-keys for command history access
@@ -288,34 +357,7 @@ WTCODE_CMDS_TO_TRY=(
   fi
 
   # outside tmux, WTCODE_TMUX_MODE=exec, or unknown mode: exec directly
-  if [[ $(type -t "$1") == function ]]; then
-    "$@"
-  else
-    exec "$@"
-  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 "$@"
+  exec "$@"
 }
 
 ###############################################################################

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wtcode
-Version: 0.2.0
+Version: 0.3.0
 Summary: Launch your favorite code tool in a git worktree
 Author-email: Jaeho Shin <netj@sparcs.org>
 License-Expression: MIT
@@ -88,13 +88,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