Skip to content

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

docs(changelog): document 0.69.1 drift fixes (#3567, #3579, #3560) (#3583)

Maximilian Roos88319b8bf596
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78e26ca9a..56a7fff18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,8 +42,14 @@
- **Shell-integration install/uninstall correctness**: `wt config shell` now validates the integration command name and rejects malformed values (empty, leading `-`, or shell-unsafe characters) with a clear error rather than writing a broken rc line; recognizes manually-added or older-form integration lines on `install`, reporting already-configured instead of appending a duplicate; and, on `uninstall`, scans for worktrunk-managed wrapper files and rc lines by content marker, so integration installed under an alternate binary name (`git-wt`, …) is cleaned up regardless of the name it was installed under — while a user's own file that merely mentions `wt config shell init` is left untouched. ([#2864](https://github.com/max-sixty/worktrunk/pull/2864))
+- **`wt step squash` and `wt step commit` refuse to commit unresolved conflicts; `wt list` marks every in-progress operation**: Invoked directly on a conflicted tree, `wt step squash` generated a commit message for and committed the unresolved conflict markers — clearing `MERGE_HEAD`, so the broken merge read as complete. The commit-writing step commands now refuse when the index has unmerged paths. The same broadened operation detection gives `wt list` a single `↻` gutter symbol for any in-progress git operation (rebase, merge, cherry-pick, revert, bisect), where it previously recognized only rebase and merge. Follow-up to [#3558](https://github.com/max-sixty/worktrunk/pull/3558). ([#3579](https://github.com/max-sixty/worktrunk/pull/3579))
+
+- **`wt switch` picker stops its background preview work on exit**: Accepting or cancelling the picker abandoned its background `git` preview processes rather than stopping them, leaving them running orphaned — computing diffs into a cache that no longer existed, churning disk on a repo the user had already left. The picker now cancels pending background commands and SIGTERMs running ones when it exits. ([#3560](https://github.com/max-sixty/worktrunk/pull/3560))
+
- **`wt switch` picker reflects a mid-session removal after a deleted-CWD recovery**: When the picker recovered from a deleted working directory, accepting a row reused the startup-time repository snapshot — so an in-picker `alt-x` removal of a worktree or branch during that recovered session wasn't observed on accept. The accept path now rebuilds the repository. ([#3557](https://github.com/max-sixty/worktrunk/pull/3557))
+- **`wt -C` is honoured by `wt list statusline`**: `wt -C <path> list statusline` reported the statusline for the process's current directory instead of the `-C` worktree, and printed nothing when run from outside a repository; both the text and JSON formats now resolve their worktree through the discovery path. ([#3567](https://github.com/max-sixty/worktrunk/pull/3567))
+
### Internal
- **Windows code-signing upload no longer double-zips**: The unsigned Windows artifact was uploaded wrapped in an artifact-storage zip around the already-zipped binary, so SignPath couldn't locate `wt.exe` inside it and the (non-blocking) signing request failed. The upload now sets `archive: false`, submitting the real zip to SignPath. ([#3566](https://github.com/max-sixty/worktrunk/pull/3566))