Skip to content

Commit ee35964

Browse files
committed
docs: update README and CHANGELOG for v0.2.14
1 parent 3293543 commit ee35964

2 files changed

Lines changed: 23 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
---
99

10+
## [0.2.14] - 2025-12-09
11+
12+
### 🐛 Fixed
13+
14+
- **Windows UTF-8 encoding** - Fixed encoding error when applying worktree diffs containing UTF-8 characters on Windows. Now explicitly uses UTF-8 encoding for `git apply` operations.
15+
- **Auto-cleanup after --apply** - Worktrees are now automatically cleaned up (with force) after successfully applying changes to the main project. Previously, worktrees with modified/untracked files would remain and require manual cleanup.
16+
- **Exclude .klondike/ from worktree diffs** - When the agent runs `klondike feature start/verify` commands inside a worktree, those state changes no longer conflict when applying code back to the main project. Only actual code changes are applied; the main project's `.klondike/` state remains authoritative.
17+
18+
### 📝 Changed
19+
20+
- Updated README documentation for worktree commands
21+
- `klondike copilot cleanup` now documented with `--force` option for worktrees with uncommitted changes
22+
23+
---
24+
1025
## [0.2.13] - 2025-12-09
1126

1227
### ✨ Added

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ klondike copilot start -w --name "refactor-auth"
8686
# Auto-cleanup worktree when session ends
8787
klondike copilot start -w --cleanup
8888

89-
# Apply changes back to main project after session
89+
# Apply changes back to main project after session (auto-cleans up)
9090
klondike copilot start -w --apply
9191

92+
# Force cleanup worktrees with uncommitted changes
93+
klondike copilot cleanup --force
94+
9295
# List all active worktree sessions
9396
klondike copilot list
94-
95-
# Remove all worktree sessions
96-
klondike copilot cleanup
9797
```
9898

9999
### Worktree Directory Structure
@@ -111,10 +111,12 @@ Worktrees are created in a centralized location outside your project:
111111
```
112112

113113
The agent works in the worktree with a dedicated branch (`klondike/f001-abc123`), commits freely, and when done you can:
114-
- Apply the changes with `--apply`
114+
- Apply the changes with `--apply` (automatically cleans up the worktree)
115115
- Cherry-pick specific commits
116116
- Merge the branch manually
117-
- Or just delete it with `klondike copilot cleanup`
117+
- Or just delete it with `klondike copilot cleanup --force`
118+
119+
> **Note**: When using `--apply`, klondike automatically excludes `.klondike/` state files from the diff, so only your code changes are applied. The klondike state in the main project remains authoritative.
118120
119121
---
120122

0 commit comments

Comments
 (0)