Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

chore: correct stale docs and skill references to the trash drain and picker tabs (#4529)

Worktrunk Bot5acc8da7c555
diff --git a/.claude/skills/release/SKILL.md b/.claude/skills/release/SKILL.md
index dea788cba..f9f0d877e 100644
--- a/.claude/skills/release/SKILL.md
+++ b/.claude/skills/release/SKILL.md
@@ -83,10 +83,10 @@ Give each a distinct charter. At least two receive no grep and no keyword list,
- **Behavioral (no grep):** read each change and ask what it could destroy: files, branches, worktrees, uncommitted or untracked work, committed-but-unpushed commits. Flag any change whose worst case is lost user data.
- **Blast-radius (no grep):** for every function and file the diff touches, trace callers and callees. Flag any path that can now reach a destructive primitive (branch deletion, worktree removal, filesystem removal, history rewrite), even when that call sits outside the diff.
- **Automation diff (no grep):** compare shipped automation before and after: `plugins/*/hooks/hooks.json`, `hooks/hooks.json`, `hooks/wt.sh`, and skill or alias examples users copy. Flag any new or altered invocation that removes or force-overwrites anything.
-- **Keyword scan (grep):** one finder runs the pattern filter over the full diff as a cross-check, never as the primary method. It takes no pathspec; a path allowlist would recreate the blind spots the no-grep finders exist to avoid (the densest destructive code, the trash sweep in `src/commands/process.rs`, sits outside `src/git/`).
+- **Keyword scan (grep):** one finder runs the pattern filter over the full diff as a cross-check, never as the primary method. It takes no pathspec; a path allowlist would recreate the blind spots the no-grep finders exist to avoid (the densest destructive code, the tree walk in `src/remove_dir.rs`, sits outside `src/git/`).
```bash
git log v<last-version>..HEAD -p \
- | grep -nE -- '--force-delete|--force| -D| -f |branch -[dD]|worktree remove|reset --hard|checkout -f|clean -[fdx]|remove_dir_all|remove_file|rm -rf'
+ | grep -nE -- '--force-delete|--force| -D| -f |branch -[dD]|worktree remove|reset --hard|checkout -f|clean -[fdx]|remove_dir_all|remove_file|unlinkat|rm -rf'
```
### Analyze: adjudicate each candidate
diff --git a/.claude/skills/writing-user-outputs/SKILL.md b/.claude/skills/writing-user-outputs/SKILL.md
index d7939455b..6a51e6355 100644
--- a/.claude/skills/writing-user-outputs/SKILL.md
+++ b/.claude/skills/writing-user-outputs/SKILL.md
@@ -707,7 +707,7 @@ time-to-first-output with work the user didn't ask for.
Worktrunk marks the boundary with `WORKTRUNK_FIRST_OUTPUT`: handlers
early-return where output begins, so work before that return is on the hot
path, work after it is not. See `handle_remove_command` —
-`sweep_stale_trash` runs after `handle_remove_output`.
+`run_internal_sweep` runs after `handle_remove_output`.
## Information Display: Show Once, Not Twice
diff --git a/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md b/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md
index 7ca50ad7e..d4bfd15a6 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/troubleshooting.md
@@ -33,7 +33,7 @@ Common issues:
1. View config path: `wt config show` shows location
2. Verify file exists: `ls -la ~/.config/worktrunk/config.toml`
3. Check TOML syntax: `cat ~/.config/worktrunk/config.toml`
-4. Look for validation errors (path must be relative, not absolute)
+4. Look for validation errors
### Template config errors
@@ -91,7 +91,7 @@ The timeout warning names the tasks that didn't finish:
```
Listing worktrees timed out after 120s (170 results received); blocked tasks:
- <branch>: working-tree-diff, working-tree-conflicts
+ <branch>: working-tree diff, working-tree conflict check
```
Both tasks run `git status --porcelain` first. When the named worktree has `core.fsmonitor=true` and its `git fsmonitor--daemon` is wedged, `git status` blocks until the IPC attempt fails (several minutes), and the 120s drain deadline fires first.
diff --git a/skills/worktrunk/reference/troubleshooting.md b/skills/worktrunk/reference/troubleshooting.md
index 7ca50ad7e..d4bfd15a6 100644
--- a/skills/worktrunk/reference/troubleshooting.md
+++ b/skills/worktrunk/reference/troubleshooting.md
@@ -33,7 +33,7 @@ Common issues:
1. View config path: `wt config show` shows location
2. Verify file exists: `ls -la ~/.config/worktrunk/config.toml`
3. Check TOML syntax: `cat ~/.config/worktrunk/config.toml`
-4. Look for validation errors (path must be relative, not absolute)
+4. Look for validation errors
### Template config errors
@@ -91,7 +91,7 @@ The timeout warning names the tasks that didn't finish:
```
Listing worktrees timed out after 120s (170 results received); blocked tasks:
- <branch>: working-tree-diff, working-tree-conflicts
+ <branch>: working-tree diff, working-tree conflict check
```
Both tasks run `git status --porcelain` first. When the named worktree has `core.fsmonitor=true` and its `git fsmonitor--daemon` is wedged, `git status` blocks until the IPC attempt fails (several minutes), and the 120s drain deadline fires first.
diff --git a/src/commands/config/state.rs b/src/commands/config/state.rs
index f42b2d09f..dba0660ed 100644
--- a/src/commands/config/state.rs
+++ b/src/commands/config/state.rs
@@ -15,7 +15,7 @@
//! **Authoritative** (hand-authored or override state; lost permanently if
//! cleared). `state clear` prompts before removing these unless `--yes`:
//!
-//! - Default branch override (git config `worktrunk.default_branch.*`)
+//! - Default branch override (git config `worktrunk.default-branch`)
//! - Branch markers (git config `worktrunk.state.<branch>.marker`)
//! - Vars (git config `worktrunk.state.<branch>.vars.*`)
//! - Logs (`.git/wt/logs/`)
diff --git a/src/config/user/sections.rs b/src/config/user/sections.rs
index ad8a1ba3f..fd4c014ed 100644
--- a/src/config/user/sections.rs
+++ b/src/config/user/sections.rs
@@ -160,7 +160,7 @@ pub struct ListConfig {
#[serde(skip_serializing_if = "Option::is_none")]
pub remotes: Option<bool>,
- /// Enable LLM-generated branch summaries (picker tab 5 + list Summary column).
+ /// Enable LLM-generated branch summaries (picker tab 6 + list Summary column).
/// Requires `[commit.generation] command` to be configured.
#[serde(skip_serializing_if = "Option::is_none")]
pub summary: Option<bool>,
diff --git a/src/git/remove.rs b/src/git/remove.rs
index 649592a1e..772bb6bad 100644
--- a/src/git/remove.rs
+++ b/src/git/remove.rs
@@ -806,7 +806,6 @@ fn open_drain_lock(trash_dir: &Path) -> anyhow::Result<fs::File> {
/// Delete every staged entry in `trash_dir`, unless another drain is running.
///
-/// Every staged removal starts a drain, so a prune starts one per worktree.
/// Concurrent deletions on one filesystem add CPU without adding throughput:
/// a 193-worktree prune ran 193 `rm -rf` processes using about three cores to
/// delete 1,500 files/s, where one process alone deleted 3,000–5,000 files/s
diff --git a/tests/integration_tests/switch_picker_dry_run.rs b/tests/integration_tests/switch_picker_dry_run.rs
index f500c4af2..8fc0d9158 100644
--- a/tests/integration_tests/switch_picker_dry_run.rs
+++ b/tests/integration_tests/switch_picker_dry_run.rs
@@ -24,7 +24,7 @@ fn worktree_row_id(path: &std::path::Path) -> String {
/// Install a strict fake summary command through TestRepo's cross-platform
/// mock-PATH wiring. Tests observe its external call log to distinguish the
-/// generated-summary route from the static mode-5 config hint.
+/// generated-summary route from the static mode-6 config hint.
fn install_summary_probe(repo: &mut TestRepo) {
repo.setup_mock_gh();
let mock_bin = repo