claude-nomad 0.49.0 → 0.50.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.50.0](https://github.com/funkadelic/claude-nomad/compare/v0.49.0...v0.50.0) (2026-06-11)
+
+
+### Added
+
+* **extras-sync:** overlay .planning sync so repo-only files survive ([#283](https://github.com/funkadelic/claude-nomad/issues/283)) ([8ba7e13](https://github.com/funkadelic/claude-nomad/commit/8ba7e1372a973b5d0434e7180595ddfaff2369e0))
+* **pull:** self-heal unmerged-index wedge with no active rebase ([#286](https://github.com/funkadelic/claude-nomad/issues/286)) ([977534c](https://github.com/funkadelic/claude-nomad/commit/977534c56c6160e81a835189db21913424a20242))
+* **sync:** stop double-managing gsd-owned hooks, agents, and skills ([#285](https://github.com/funkadelic/claude-nomad/issues/285)) ([aabfd8a](https://github.com/funkadelic/claude-nomad/commit/aabfd8a96ab80dc998b8df27d64f98ceaa33ec49))
+
+
+### Documentation
+
+* add GSD-aware sync page and document plugin minimum CLI version ([#287](https://github.com/funkadelic/claude-nomad/issues/287)) ([6ac4320](https://github.com/funkadelic/claude-nomad/commit/6ac4320dca12f959bd6329f0e1c813408a3b9c6a))
+* **plugin:** clarify CLI-subcommand wording in version-floor note ([#288](https://github.com/funkadelic/claude-nomad/issues/288)) ([d45adee](https://github.com/funkadelic/claude-nomad/commit/d45adeed8d01515e6cb94f6ac72feced2fb31a52))
+
 ## [0.49.0](https://github.com/funkadelic/claude-nomad/compare/v0.48.0...v0.49.0) (2026-06-10)
 
 

package/README.md

@@ -27,8 +27,11 @@ survives different file paths and your secrets never ride along.
   `claude --resume` on your laptop, and it is there. claude-nomad rewrites the machine-specific file
   paths Claude Code embeds in every transcript, so history survives projects living at different
   paths on different hosts.
-- **One shared setup, per-machine exceptions.** Agents, skills, slash commands, rules, hooks, and
-  your `CLAUDE.md` live in one place and follow you everywhere. Settings merge a shared base with a
+- **One shared setup, per-machine exceptions.** Your own skills, slash commands, rules, and your
+  `CLAUDE.md` live in one place and follow you everywhere. `hooks/` and `agents/` are installed
+  per-host by `@opengsd/gsd-core` via npm and are not synced (syncing them caused version-skew
+  churn). Skills sync as a filtered copy: your own skills travel, `gsd-*` skills are excluded (see
+  `SHARED_LINKS` and `src/skills-sync.ts` in `src/config.ts`). Settings merge a shared base with a
   per-host override, so one machine can run a different model or MCP URL without forking the rest.
 - **Every push is secret-scanned.** Only an explicit allow-list of paths ever leaves the machine,
   credentials never sync, and gitleaks scans the exact files about to be published. The push aborts
@@ -41,8 +44,11 @@ survives different file paths and your secrets never ride along.
   when `~/.claude/settings.json` no longer matches the base+host merge nomad would write, the
   silent-clobber case, with `nomad pull` as the fix), each with a fix hint.
 - **Self-healing sync.** Every overwrite is backed up first, and `nomad pull --force-remote`
-  recovers a sync repo stuck mid-rebase while parking your stranded work on a branch, refusing
-  entirely if shared config is at risk.
+  recovers two kinds of stuck sync repo: a repo stuck mid-rebase or mid-merge (aborts the operation,
+  parks stranded work on a branch, refuses if shared config is at risk), and a repo where the rebase
+  was interrupted but the git index was left with unmerged entries and no active operation (clears
+  the index via `git reset --mixed HEAD`, surfaces any orphaned stash entry left by the interrupted
+  autostash, never discards working-tree edits).
 - **Easy off.** `nomad eject` replaces every managed `~/.claude/` symlink with a real copy in one
   step, so your setup keeps working after you delete the sync checkout and uninstall the CLI.
 
@@ -105,17 +111,21 @@ All allow paths always re-scan after writing the allowlist; a surviving finding
 push. See [Recovery flows](https://funkadelic.github.io/claude-nomad/recovery/) for the full
 decision tree.
 
-If a previous `nomad pull` left the sync repo stuck mid-rebase or mid-merge, run
-`nomad pull --force-remote` to auto-recover. It aborts the in-progress operation, parks stranded
-commits on a `nomad/stranded-<ts>` branch, and resets to `origin/main`, then re-pulls. It refuses if
-any stranded or dirty tracked changes touch synced config (shared/, hosts/, path-map.json), so
-config you care about is never silently discarded.
+If a previous `nomad pull` left the sync repo in a stuck state, run `nomad pull --force-remote` to
+auto-recover. It handles two cases: a repo stuck mid-rebase or mid-merge (aborts the in-progress
+operation, parks stranded commits on a `nomad/stranded-<ts>` branch, resets to `origin/main`, then
+re-pulls; refuses if stranded or dirty tracked changes touch synced config), and a repo where the
+rebase was torn down but the git index still has unmerged entries with no active rebase or merge in
+progress (clears the stuck index via `git reset --mixed HEAD`, preserving working-tree edits,
+surfaces any orphaned autostash entry, then re-pulls). Run `nomad doctor` first if you are unsure
+which state you are in; the Repository section names the specific problem and points at the right
+fix.
 
 ## Claude Code plugin
 
 An optional companion plugin puts nomad one slash away inside Claude Code and warns you at session
 start when your synced setup has drifted. It is a thin layer over the CLI: install `claude-nomad`
-first, then add the plugin.
+first (minimum version `>= 0.35.0`), then add the plugin.
 
 ```text
 /plugin marketplace add funkadelic/claude-nomad
@@ -123,7 +133,9 @@ first, then add the plugin.
 ```
 
 It adds `/nomad:pull`, `/nomad:diff`, `/nomad:push` (preview only), `/nomad:doctor`, and
-`/nomad:clean`, plus a session-start drift check. See the
+`/nomad:clean`, plus a session-start drift check. The plugin versions independently from the CLI,
+but requires nomad `>= 0.35.0` because it calls recent subcommands (`nomad diff`,
+`nomad clean --backups`) and reads the doctor command's status output. See the
 [plugin guide](https://funkadelic.github.io/claude-nomad/plugin/) for details.
 
 ## Requirements
@@ -140,6 +152,8 @@ version-staleness check and `nomad doctor --check-schema`. The CLI works without
 
 - [How it works](https://funkadelic.github.io/claude-nomad/how-it-works/) -- path remapping,
   settings merge, what syncs and what doesn't
+- [GSD-aware sync](https://funkadelic.github.io/claude-nomad/gsd-aware-sync/) -- what nomad does for
+  GSD users out of the box
 - [Setup and migration](https://funkadelic.github.io/claude-nomad/quickstart/) -- full setup
   walkthrough, migrating an existing `~/.claude/`
 - [Commands reference](https://funkadelic.github.io/claude-nomad/commands/) -- all CLI flags