task-observer: new-session updates from 2026-06-17#58
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 8524d5d572
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
|
||
| When work has accidentally accumulated in the main checkout and needs to move to a worktree: | ||
|
|
||
| 1. Commit or stash the main-checkout changes on the correct branch. |
There was a problem hiding this comment.
If the stash option here is used, the recovery steps never apply or pop that stash in the candidate/new worktree; the later fast-forward step only moves committed branch refs. In the case where main has uncommitted work that gets stashed, the selected worktree will still be clean and the actual changes remain hidden in the main checkout's stash, making the recovery appear to have lost the work. Either require committing before reuse or add an explicit git stash apply/pop step in the destination worktree.
Useful? React with 👍 / 👎.
1 participant
Target\nskill: .agents/skills/new-session/SKILL.md\n\n## Observations addressed\n- Observation 12 (journology/log.md): Reuse existing clean worktrees before creating another → changed: added "Worktree Recovery" section describing the 4-step process: stash/commit main-checkout work, inspect
git worktree list --porcelain, fast-forward a clean existing worktree if available, only create a new worktree as a last resort.Generated by Claude Code