Skip to content

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

fix(step/copy-ignored): drop .pi/ from built-in excludes (#2527)

Worktrunk Botf418729e2184
diff --git a/dev/config.example.toml b/dev/config.example.toml
index 18ddd7b36..545e23b2a 100644
--- a/dev/config.example.toml
+++ b/dev/config.example.toml
@@ -123,7 +123,7 @@
# [step.copy-ignored]
# exclude = [] # Additional excludes (e.g., [".cache/", ".turbo/"])
#
-# Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+# Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
#
# ### Aliases
#
diff --git a/dev/wt.example.toml b/dev/wt.example.toml
index f802e09c1..64a0a7416 100644
--- a/dev/wt.example.toml
+++ b/dev/wt.example.toml
@@ -34,7 +34,7 @@
# [step.copy-ignored]
# exclude = [".cache/", ".turbo/"]
#
-# Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+# Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
#
# ## Aliases
#
diff --git a/docs/content/config.md b/docs/content/config.md
index e171ecfe4..f1a796850 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -215,7 +215,7 @@ pager = "delta --paging=never" # Example: override git's core.pager for diff p
exclude = [] # Additional excludes (e.g., [".cache/", ".turbo/"])
```
-Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
### Aliases
@@ -392,7 +392,7 @@ Additional excludes for `wt step copy-ignored`:
exclude = [".cache/", ".turbo/"]
```
-Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
## Aliases
diff --git a/docs/content/step.md b/docs/content/step.md
index 0e448beae..aa942a216 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -327,7 +327,7 @@ copy = "wt step copy-ignored"
### What gets copied
-All gitignored files are copied by default, except for built-in excluded directories: VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). Tracked files are never touched.
+All gitignored files are copied by default, except for built-in excluded directories: VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.worktrees/`). Tracked files are never touched.
To limit what gets copied further, create `.worktreeinclude` with gitignore-style patterns. Files must be **both** gitignored **and** in `.worktreeinclude`:
@@ -360,7 +360,7 @@ exclude = [".cache/", ".turbo/"]
- Handles nested `.gitignore` files, global excludes, and `.git/info/exclude`
- Skips existing files by default (safe to re-run)
- `--force` overwrites existing files in the destination
-- Always skips built-in excluded directories — VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`) — and nested worktrees
+- Always skips built-in excluded directories — VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.worktrees/`) — and nested worktrees
### Performance
diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.md
index d2c57624c..4bd070cba 100644
--- a/skills/worktrunk/reference/config.md
+++ b/skills/worktrunk/reference/config.md
@@ -214,7 +214,7 @@ pager = "delta --paging=never" # Example: override git's core.pager for diff p
exclude = [] # Additional excludes (e.g., [".cache/", ".turbo/"])
```
-Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
### Aliases
@@ -391,7 +391,7 @@ Additional excludes for `wt step copy-ignored`:
exclude = [".cache/", ".turbo/"]
```
-Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
## Aliases
diff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.md
index 7ef627fb5..3a712419e 100644
--- a/skills/worktrunk/reference/step.md
+++ b/skills/worktrunk/reference/step.md
@@ -340,7 +340,7 @@ copy = "wt step copy-ignored"
### What gets copied
-All gitignored files are copied by default, except for built-in excluded directories: VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). Tracked files are never touched.
+All gitignored files are copied by default, except for built-in excluded directories: VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.worktrees/`). Tracked files are never touched.
To limit what gets copied further, create `.worktreeinclude` with gitignore-style patterns. Files must be **both** gitignored **and** in `.worktreeinclude`:
@@ -373,7 +373,7 @@ exclude = [".cache/", ".turbo/"]
- Handles nested `.gitignore` files, global excludes, and `.git/info/exclude`
- Skips existing files by default (safe to re-run)
- `--force` overwrites existing files in the destination
-- Always skips built-in excluded directories — VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`) — and nested worktrees
+- Always skips built-in excluded directories — VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.worktrees/`) — and nested worktrees
### Performance
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index b2cfffd02..5760842bb 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1716,7 +1716,7 @@ pager = "delta --paging=never" # Example: override git's core.pager for diff p
exclude = [] # Additional excludes (e.g., [".cache/", ".turbo/"])
```
-Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
### Aliases
@@ -1893,7 +1893,7 @@ Additional excludes for `wt step copy-ignored`:
exclude = [".cache/", ".turbo/"]
```
-Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
## Aliases
diff --git a/src/cli/step.rs b/src/cli/step.rs
index e154d4317..569c76f3f 100644
--- a/src/cli/step.rs
+++ b/src/cli/step.rs
@@ -255,7 +255,7 @@ copy = "wt step copy-ignored"
## What gets copied
-All gitignored files are copied by default, except for built-in excluded directories: VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). Tracked files are never touched.
+All gitignored files are copied by default, except for built-in excluded directories: VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.worktrees/`). Tracked files are never touched.
To limit what gets copied further, create `.worktreeinclude` with gitignore-style patterns. Files must be **both** gitignored **and** in `.worktreeinclude`:
@@ -288,7 +288,7 @@ exclude = [".cache/", ".turbo/"]
- Handles nested `.gitignore` files, global excludes, and `.git/info/exclude`
- Skips existing files by default (safe to re-run)
- `--force` overwrites existing files in the destination
-- Always skips built-in excluded directories — VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`) — and nested worktrees
+- Always skips built-in excluded directories — VCS metadata (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state (`.conductor/`, `.entire/`, `.worktrees/`) — and nested worktrees
## Performance
diff --git a/src/commands/step_commands.rs b/src/commands/step_commands.rs
index 405ed272e..877a6072b 100644
--- a/src/commands/step_commands.rs
+++ b/src/commands/step_commands.rs
@@ -566,7 +566,6 @@ const BUILTIN_COPY_IGNORED_EXCLUDES: &[&str] = &[
".entire/",
".hg/",
".jj/",
- ".pi/",
".pijul/",
".sl/",
".svn/",
diff --git a/tests/integration_tests/step_copy_ignored.rs b/tests/integration_tests/step_copy_ignored.rs
index 18ff98604..dcfcd634c 100644
--- a/tests/integration_tests/step_copy_ignored.rs
+++ b/tests/integration_tests/step_copy_ignored.rs
@@ -139,9 +139,9 @@ fn test_copy_ignored_excludes_user_config(mut repo: TestRepo) {
#[rstest]
fn test_copy_ignored_skips_built_in_excluded_dirs(mut repo: TestRepo) {
let feature_path = repo.add_worktree("feature");
- let ignored_entries = ".conductor/\n.entire/\n.pi/\n.env\n";
+ let ignored_entries = ".conductor/\n.entire/\n.env\n";
- for dir in [".conductor", ".entire", ".pi"] {
+ for dir in [".conductor", ".entire"] {
fs::create_dir_all(repo.root_path().join(dir)).unwrap();
fs::write(repo.root_path().join(dir).join("state.json"), dir).unwrap();
}
@@ -153,7 +153,7 @@ fn test_copy_ignored_skips_built_in_excluded_dirs(mut repo: TestRepo) {
assert_copy_ignored_excluded(
&feature_path,
- &[".conductor", ".entire", ".pi"],
+ &[".conductor", ".entire"],
"built-in excludes",
);
}
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index d29419c0e..075675f31 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -184,7 +184,7 @@ Creates ~/.config/worktrunk/config.toml with the following content:
  # [step.copy-ignored]
  # exclude = [] # Additional excludes (e.g., [".cache/", ".turbo/"])
  #
-  # Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+  # Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
  #
  # ### Aliases
  #
@@ -348,7 +348,7 @@ With --project, creates .config/wt.toml in the current repositor
  # [step.copy-ignored]
  # exclude = [".cache/", ".turbo/"]
  #
-  # Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.pi/`, `.worktrees/`). User config and project config exclusions are combined.
+  # Built-in excludes always apply: VCS metadata directories (`.bzr/`, `.hg/`, `.jj/`, `.pijul/`, `.sl/`, `.svn/`) and tool-state directories (`.conductor/`, `.entire/`, `.worktrees/`). User config and project config exclusions are combined.
  #
  # ## Aliases
  #
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 656769939..4c4be90e5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -232,7 +232,7 @@ Most flags are on by default. Set to false to change default behavior.
  [step.copy-ignored]
  exclude = [] # Additional excludes (e.g., [".cache/", ".turbo/"])
-Built-in excludes always apply: VCS metadata directories (.bzr/, .hg/, .jj/, .pijul/, .sl/, .svn/) and tool-state directories (.conductor/, .entire/, .pi/, .worktrees/). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (.bzr/, .hg/, .jj/, .pijul/, .sl/, .svn/) and tool-state directories (.conductor/, .entire/, .worktrees/). User config and project config exclusions are combined.
Aliases
@@ -387,7 +387,7 @@ Additional excludes for wt step copy-ignored:
  [step.copy-ignored]
  exclude = [".cache/", ".turbo/"]
-Built-in excludes always apply: VCS metadata directories (.bzr/, .hg/, .jj/, .pijul/, .sl/, .svn/) and tool-state directories (.conductor/, .entire/, .pi/, .worktrees/). User config and project config exclusions are combined.
+Built-in excludes always apply: VCS metadata directories (.bzr/, .hg/, .jj/, .pijul/, .sl/, .svn/) and tool-state directories (.conductor/, .entire/, .worktrees/). User config and project config exclusions are combined.
Aliases