Skip to content

chore: trim herdr worktree keys and sync dotfiles - #6

Merged
Divkix merged 7 commits into
mainfrom
chore/herdr-trim-worktree-keys
Oct 11, 2026
Merged

Divkix merged 7 commits into
mainfrom
chore/herdr-trim-worktree-keys

Conversation

@Divkix

@Divkix Divkix commented Oct 11, 2026

Copy link
Copy Markdown
Owner

Summary

Drop herdr's built-in worktree keys (worktrunk covers both), then sync live config via ./update.sh.

 # herdr/config.toml
-[keys]
-remove_worktree = "prefix+d"        # worktrunk prefix+shift+d does this, with hooks + unmerged checks
-open_worktree = "prefix+shift+o"    # worktrunk prefix+shift+g already switches to existing worktrees
update.sh capture
├── claude/settings.json   # claude-opus-5-5 effort: high
├── fish/conf.d/abbr.fish  # bu: drop `vp upgrade` (vite-plus now via brew)
├── omp/AGENTS.md          # sync with global agent rules (+ never commit to main)
├── omp/config.yml         # default → gpt-6.1-sol:high, new judge; rest is YAML reflow
├── packages/Brewfile      # + vite-plus, + grok-bot
└── skills/skills.list     # + mattpocock/skills, + pi agent

Evidence

  • Before: prefix+d / prefix+shift+o bound to built-in worktree actions
    After: herdr config check → config: ok; herdr server reload-config → "diagnostics":[],"status":"applied"
  • Diff reviewed for secrets before push: none (fish/omp secret blanking held).

Merge Danger

Door: two-way

Config-only; revert restores the old bindings and snapshot.

Blast Radius: local

Affects only machines bootstrapped from this repo. Next bootstrap.sh installs vite-plus and grok-bot.

@Divkix
Divkix merged commit 39ac7d0 into main Oct 11, 2026
3 checks passed
@Divkix
Divkix deleted the chore/herdr-trim-worktree-keys branch October 11, 2026 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant