Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
docs: fix stale marker config key and bare-repo test comment (#3066)
Worktrunk Bot33deef94c7f9
diff --git a/plugins/worktrunk/CLAUDE.md b/plugins/worktrunk/CLAUDE.mdindex 1f1218fc2..09489c34f 100644--- a/plugins/worktrunk/CLAUDE.md+++ b/plugins/worktrunk/CLAUDE.md@@ -54,7 +54,7 @@ that every repo-root skill is listed); Codex and Gemini pick up the whole### Status persists after user interrupt (Claude)-The Claude hooks track activity via git config (`worktrunk.status.{branch}`):+The Claude hooks track activity via git config (`worktrunk.state.{branch}.marker`):- `UserPromptSubmit` β π€ (working)- `Notification`, `PreToolUse`(`AskUserQuestion`), `PermissionRequest`, `Stop` β π¬ (waiting for input)- `SessionEnd` β clears statusdiff --git a/tests/integration_tests/bare_repository.rs b/tests/integration_tests/bare_repository.rsindex e578ccc19..9c300876d 100644--- a/tests/integration_tests/bare_repository.rs+++ b/tests/integration_tests/bare_repository.rs@@ -600,10 +600,13 @@ fn test_bare_repo_commands_from_bare_directory() {});}+/// Full merge workflow in a bare repo: create main + feature worktrees, merge+/// feature into main, and confirm the merge landed.///-/// Skipped on Windows due to file locking issues that prevent worktree removal-/// during background cleanup after merge. The merge functionality itself works-/// correctly - this is a timing/cleanup issue specific to Windows file handles.+/// Runs on all platforms. Background worktree cleanup after merge is tolerated+/// via `wait_for_worktree_removed` β on Windows, file locking can leave an empty+/// placeholder dir behind, which is production-harmless (see the predicate note+/// at the call site below).#[test]fn test_bare_repo_merge_workflow() {let test = BareRepoTest::new();