Change directory to repo root when deleting current worktree by agarcher · Pull Request #18 · agarcher/wt

agarcher · 2026-01-12T02:19:07Z

Summary

When deleting a worktree that the user is currently in (wt delete or wt cleanup), automatically change to the repository root
Previously users would be left in a deleted directory and had to manually run wt exit or cd

Test plan

All existing tests pass
Linter passes
Manual test: wt create test-delete && wt delete - should return to repo root
Manual test: Create merged worktree, run wt cleanup from within it - should return to repo root

🤖 Generated with Claude Code

Summary by CodeRabbit

Release Notes

Improvements

Automatically navigate to the repository root when deleting the worktree you're currently in
Enhanced shell wrapper support for delete and cleanup operations

_{✏️ Tip: You can customize this high-level summary in your review settings.}

When a user deletes a worktree they're currently in (via `wt delete` or `wt cleanup`), the shell wrapper now automatically changes to the repository root instead of leaving them in a deleted directory. - delete.go: Output repo root to stdout when user is in deleted worktree - cleanup.go: Track if current directory is in any deleted worktree - shell.go: Add delete/cleanup to commands that handle directory changes Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

coderabbitai · 2026-01-12T02:19:15Z

📝 Walkthrough

Walkthrough

These changes enhance the worktree deletion and cleanup flow by detecting when users are operating from within a worktree being deleted, then outputting the repository root path to enable automatic directory navigation via the shell wrapper.

Changes

Cohort / File(s)	Summary
Worktree Deletion Detection `internal/commands/delete.go`, `internal/commands/cleanup.go`	Replaces hard warnings with dynamic detection of whether the current working directory is inside the target worktree(s) using `strings.HasPrefix`. After successful deletion/cleanup, outputs repository root to stdout when applicable.
Shell Wrapper Post-Execution Handling `internal/shell/shell.go`	Extends cd-handling logic to treat `delete` and `cleanup` commands identically to `create`, extracting and evaluating the last output line. If it's a valid directory, performs automatic cd; otherwise, prints the line. Updates bash/zsh generator blocks to include these commands in switch cases.

Sequence Diagram

sequenceDiagram
    actor User
    participant Shell as Shell Wrapper
    participant Cmd as Command Handler
    participant FS as File System
    
    User->>Shell: wt delete [worktree]
    Shell->>Cmd: Execute delete command
    
    Note over Cmd: Check if cwd inside worktree
    Cmd->>FS: Verify current directory location
    FS-->>Cmd: inDeletedWorktree status
    
    Cmd->>Cmd: Perform deletion
    Cmd->>FS: Remove worktree
    
    alt User was in deleted worktree
        Cmd-->>Shell: Output repo root (last line)
        Shell->>FS: Evaluate last line as directory
        Shell->>Shell: cd to repo root
    else User not affected
        Cmd-->>Shell: Output status message
        Shell->>User: Display output
    end

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Poem

🐰 A worktree falls, but fear not the plight,
The root path whispers, guiding us right,
No more stranded in deleted terrain,
Our shells now dance through the directory lane,
Cleanup and delete, with grace they align! 🎯

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 60.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change: automatically changing directory to repo root when deleting the current worktree, which is the primary objective of this PR.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

📝 Generate docstrings

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 0

🧹 Nitpick comments (2)

internal/commands/cleanup.go (1)
193-201: Path prefix check may produce false positives for sibling directories.

Using strings.HasPrefix(cwd, c.path) can incorrectly match if a worktree path is a prefix of another directory name (e.g., /repo/worktrees/foo would match /repo/worktrees/foobar). Consider appending a path separator or using filepath.Rel for a more robust check.

Additionally, the error from os.Getwd() is silently ignored. If Getwd fails, cwd will be empty and the prefix check will always be false, which is a reasonable fallback, but worth noting.
♻️ Suggested fix using path separator
 	// Check if user is in any of the worktrees being deleted
 	cwd, _ := os.Getwd()
 	inDeletedWorktree := false
 	for _, c := range candidates {
-		if strings.HasPrefix(cwd, c.path) {
+		if cwd == c.path || strings.HasPrefix(cwd, c.path+string(filepath.Separator)) {
 			inDeletedWorktree = true
 			break
 		}
 	}
internal/commands/delete.go (1)
126-128: Same path prefix false-positive concern and potential code duplication.

The strings.HasPrefix(cwd, worktreePath) check has the same issue as in cleanup.go - it could match sibling directories with similar prefixes.

Note that cwd is retrieved via os.Getwd() twice: once at line 67 (in the auto-detect branch) and again at line 127. When args is provided (explicit worktree name), the first retrieval is skipped, so this second call is necessary. The current structure is correct.
♻️ Suggested fix for path comparison
 	// Check if user is in the worktree being deleted
 	cwd, _ := os.Getwd()
-	inDeletedWorktree := strings.HasPrefix(cwd, worktreePath)
+	inDeletedWorktree := cwd == worktreePath || strings.HasPrefix(cwd, worktreePath+string(filepath.Separator))

📜 Review details

Configuration used: defaults

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0650413 and 0ade83e.

📒 Files selected for processing (3)

internal/commands/cleanup.go
internal/commands/delete.go
internal/shell/shell.go

🧰 Additional context used

📓 Path-based instructions (3)

internal/shell/**/*.go

📄 CodeRabbit inference engine (CLAUDE.md)

Place shell integration function generation in internal/shell/ package

Files:

internal/shell/shell.go

internal/commands/**/*.go

📄 CodeRabbit inference engine (CLAUDE.md)

internal/commands/**/*.go: Use go test -v -run TestName ./internal/commands/ to run a single test
Place Cobra command implementations in internal/commands/ package
Use cmd.Println() for stderr output and fmt.Fprintln(cmd.OutOrStdout(), ...) for stdout output (paths, listings) in Cobra commands

Files:

internal/commands/cleanup.go
internal/commands/delete.go

internal/{git,commands}/**/*.go

📄 CodeRabbit inference engine (CLAUDE.md)

Detect if running in main repo vs worktree by checking if .git is a file (worktree) or directory (main repo)

Files:

internal/commands/cleanup.go
internal/commands/delete.go

🧠 Learnings (9)

📓 Common learnings

Learnt from: CR
Repo: agarcher/wt PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-01-12T02:19:51.920Z
Learning: `wt` is a Git worktree manager CLI built with Go and Cobra that manages worktree lifecycle with hooks

Learnt from: CR
Repo: agarcher/wt PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-01-12T02:19:51.920Z
Learning: Use shell wrapper function (`wt()`) generated by `wt init <shell>` to handle the actual `cd`, solving the subprocess directory change limitation

Learnt from: CR
Repo: agarcher/wt PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-01-12T02:19:51.920Z
Learning: Applies to internal/{git,hooks}/**/*.go : Store worktree numeric index in `.git/worktrees/<name>/wt-index` for use in port offsets and resource isolation

Learnt from: CR
Repo: agarcher/wt PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-01-12T02:19:51.920Z
Learning: Applies to internal/{git,commands}/**/*.go : Detect if running in main repo vs worktree by checking if `.git` is a file (worktree) or directory (main repo)

Learnt from: CR
Repo: agarcher/wt PR: 0
File: CLAUDE.md:0-0
Timestamp: 2026-01-12T02:19:51.920Z
Learning: Applies to internal/git/**/*.go : Place Git worktree command wrappers and porcelain output parsing in internal/git/ package