chore(agents): add rules for branch verification and stale git lock files

Author: ChipWolf

home/.chezmoiscripts/run_onchange_after_komorebi_reload_windows.ps1.tmpl

@@ -0,0 +1,57 @@
+{{ if eq .chezmoi.os "windows" -}}
+# Komorebi config hashes (trigger re-run when configs change):
+# komorebi.json: {{ include "dot_config/komorebi/komorebi.json" | sha256sum }}
+# whkdrc:       {{ include "dot_config/whkdrc" | sha256sum }}
+
+$ErrorActionPreference = "Stop"
+
+function Resolve-KomorebicPath {
+    $cmd = Get-Command komorebic.exe -ErrorAction SilentlyContinue
+    if (-not $cmd) {
+        $cmd = Get-Command komorebic -ErrorAction SilentlyContinue
+    }
+    if ($cmd -and -not [string]::IsNullOrWhiteSpace($cmd.Source)) {
+        return $cmd.Source
+    }
+
+    $candidates = @(
+        "$env:USERPROFILE\scoop\shims\komorebic.exe",
+        "$env:LOCALAPPDATA\Microsoft\WinGet\Links\komorebic.exe",
+        "$env:ProgramFiles\komorebi\bin\komorebic.exe"
+    )
+    return ($candidates | Where-Object {
+        -not [string]::IsNullOrWhiteSpace($_) -and (Test-Path $_)
+    } | Select-Object -First 1)
+}
+
+$komorebic = Resolve-KomorebicPath
+
+if (Get-Process -Name "komorebi" -ErrorAction SilentlyContinue) {
+    if (-not $komorebic) {
+        Write-Host "Komorebi process found but komorebic could not be resolved; skipping reload." -ForegroundColor DarkGray
+        return
+    }
+    Write-Host "Reloading Komorebi configuration..."
+    & $komorebic reload-configuration
+    if ($LASTEXITCODE -ne 0) {
+        throw "Komorebi reload failed (exit code $LASTEXITCODE)."
+    }
+
+    # whkd has no live-reload — restart it so new whkdrc takes effect.
+    if (Get-Process -Name "whkd" -ErrorAction SilentlyContinue) {
+        Write-Host "Restarting whkd to pick up new keybindings..."
+        Stop-Process -Name "whkd" -Force -ErrorAction SilentlyContinue
+        Start-Sleep -Milliseconds 500
+        $whkdCmd = Get-Command whkd.exe -ErrorAction SilentlyContinue
+        if ($whkdCmd) {
+            Start-Process -FilePath $whkdCmd.Source -WindowStyle Hidden
+        }
+    }
+} else {
+    if (-not $komorebic) {
+        Write-Host "Komorebi not found; skipping reload." -ForegroundColor DarkGray
+        return
+    }
+    Write-Host "Komorebi is installed but not running; skipping reload." -ForegroundColor DarkGray
+}
+{{- end }}

home/dot_agents/AGENTS.md

@@ -19,7 +19,7 @@ These constraints are unconditional. Apply them without being asked.
 
 ## Session close: mandatory
 
-After every non-trivial task, load the `retrospective` skill and follow it before closing out.
+After every non-trivial task, run a retrospective before closing out.
 
 ---
 
@@ -28,7 +28,7 @@ After every non-trivial task, load the `retrospective` skill and follow it befor
 Global memory is `~/.agents/AGENTS.md` (source: `~/.local/share/chezmoi/home/dot_agents/AGENTS.md`).
 Local memory is the `AGENTS.md` in the current project root (or nearest ancestor).
 
-Never edit `~/.agents/AGENTS.md` directly; it is chezmoi-managed. Load the `memory` skill for all writes.
+Never edit `~/.agents/AGENTS.md` directly; it is chezmoi-managed.
 
 For rules specific to the chezmoi dotfiles repo itself, the target is `~/.local/share/chezmoi/AGENTS.md`.
 
@@ -38,9 +38,11 @@ When updating any memory file: review nearby rules for contradictions, duplicati
 
 ## Git and commits
 
-- Load `git-commit-push` for commit or push operations.
 - Before committing, run `git diff --staged` and confirm the change is atomic and in-scope. Do not commit unrelated modifications.
 - Commit message format: `type(scope): description`. Types: `feat`, `fix`, `chore`. Check `git log --oneline` to match repo style.
+- After any branch switch (including `gh pr checkout`), immediately verify with `git branch --show-current`. `gh pr checkout` can silently leave you on the wrong branch when the local tracking branch has diverged; if it fails or the branch is wrong, use `git checkout <branch-name>` directly.
+- A stale `.git/index.lock` blocks all git operations. Remove it with `rm -f .git/index.lock` before retrying the blocked command.
+- **Worktree context.** When the cwd is inside a Claude Code worktree (e.g. `.claude/worktrees/<id>`), git and gh commands operate on the worktree branch, not the main repo. To check out a PR or named branch in the main repo, use an explicit path: `git -C /path/to/main-repo checkout <branch>`. Always confirm the active branch with `git branch --show-current` before reading or editing files.
 
 ---