chore: release v0.7.0 — bump version, update CHANGELOG and docs

Author: johnstegeman

CHANGELOG.md

@@ -11,6 +11,49 @@ Versioning: [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
 
+## [v0.7.0] — 2026-03-26
+
+### Added
+
+- **Conflict detection** — `haven apply --files` now detects when you've edited a
+  deployed file since the last apply and asks what to do: `[s]kip`, `[o]verwrite`,
+  `[A]pply all`, or `[d]iff` (view a diff before deciding). Haven records a SHA-256
+  fingerprint of every file it writes, so it can tell the difference between "I
+  updated this in source" and "you edited this live copy". The `--on-conflict=<mode>`
+  flag skips the prompt: `skip` (CI-friendly, exits 1 when anything was skipped),
+  `overwrite` (always clobber), or `prompt` (default on a TTY).
+
+- **`C` marker in `haven status`** — files you've edited since the last apply now show
+  a `C` marker. Combined with the source-drift marker: `MC` means both the source and
+  your live copy have diverged. Run `haven status` before `haven apply` to see exactly
+  what you've locally modified.
+
+- **SkillKit `dir:` source support** — skills declared with `source = "dir:~/path"`
+  now work with the SkillKit backend. Haven expands the path and passes it to
+  `skillkit team install`, so local-development skills and marketplace skills can live
+  in the same manifest.
+
+- **`haven ai update` with SkillKit** — when the SkillKit backend is configured,
+  `haven ai update` now delegates to `skillkit team install --update` instead of the
+  native lock-clear path, letting SkillKit manage version pinning while haven manages
+  state tracking.
+
+- **SkillKit init guidance** — if `skillkit team install` exits non-zero, haven now
+  surfaces an actionable hint: run `npx skillkit@latest init` if the error looks like
+  an uninitialized agent, or `npx skillkit@latest doctor` for other failures.
+
+### Changed
+
+- **`docs/reference/skill-backends.md`** — the "native → skillkit" setup guide now
+  includes `skillkit init` as a required one-time-per-machine step. The `dir:` source
+  restriction note is corrected: `dir:` sources are now supported; only `repo:` sources
+  are unsupported with SkillKit.
+
+- **`docs/guides/ai-skills.md`** — SkillKit prerequisites now explicitly include
+  `npx skillkit@latest init` with an explanation of what it does.
+
+---
+
 ## [v0.6.0] — 2026-03-24
 
 ### Added

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "haven"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 description = "AI-first dotfiles & environment manager"
 license = "MIT"

Cargo.toml

@@ -110,10 +110,12 @@ for what's imported and what's skipped.
 haven init                    # initialize a new haven repo
 haven add ~/.zshrc            # start tracking a file
 haven remove ~/.zshrc         # stop tracking a file (live file untouched)
-haven apply                   # deploy tracked files to this machine
-haven apply --dry-run         # preview without writing anything
-haven apply --dest ~/staging  # apply to a staging directory (for testing)
-haven status                  # show drift between source and live files
+haven apply                          # deploy tracked files to this machine
+haven apply --dry-run                # preview without writing anything
+haven apply --on-conflict=skip       # skip user-edited files (CI-safe, exits 1)
+haven apply --on-conflict=overwrite  # always overwrite user-edited files
+haven apply --dest ~/staging         # apply to a staging directory (for testing)
+haven status                         # show drift; C = you edited, M = source changed
 haven diff                    # show file-level diff between source and live
 haven source-path             # print the path to the haven repo
 haven brew install <formula>  # brew install + update Brewfile
@@ -202,14 +204,22 @@ haven ai backends          # list available skill backends
 ```
 
 The default backend (`native`) fetches skills directly from GitHub with SHA-256
-verification. To use the [SkillKit](https://skillkit.dev) marketplace instead,
-add `ai/config.toml`:
+verification. To use the [SkillKit](https://skillkit.dev) marketplace instead:
+
+```sh
+npm install -g skillkit
+npx skillkit@latest init   # one-time: initialize agent directories
+```
 
 ```toml
+# ai/config.toml
 [skills]
 backend = "skillkit"   # delegates to `skillkit team install`
 ```
 
+SkillKit supports both `gh:` marketplace skills and `dir:~/path` local skills.
+Run `npx skillkit@latest init` once per machine (and again when you install a new agent).
+
 ---
 
 ## Module and profile config

README.md

@@ -472,3 +472,30 @@ dead code — replaced with `state_dir` to enable cache lookup.
 
 **Effort:** S (human) → S (CC+gstack)
 **Priority:** P3
+
+---
+
+## P3: `haven status --changed` filter
+
+**What:** Add a `--changed` flag to `haven status` that filters output to only files with
+the `C` or `MC` marker (changed since last apply).
+
+**Why:** On large repos (200+ tracked files), `haven status` will list every file. After
+the conflict detection feature ships, users will often want to see *only* the files they've
+personally modified — not all drift. `--changed` makes triage fast.
+
+**Pros:** Trivial to implement — filter the already-computed status list before printing.
+Complements `haven apply --on-conflict=skip` in CI: run `haven status --changed` to see
+what was skipped.
+
+**Cons:** Adds one CLI flag. Zero implementation risk.
+
+**Context:** The `C` marker is added by the "conflict detection" feature (office-hours
+design: `jstegeman-HEAD-design-20260326-122506.md`). This TODO is only meaningful after
+that feature ships. The filter is a one-liner on the existing status output loop.
+
+**Depends on / blocked by:** ~~Conflict detection feature~~ shipped in v0.7.0 — unblocked.
+
+**Effort:** XS (human ~30min) → XS (CC+gstack ~2min)
+**Priority:** P3
+

TODOS.md

@@ -169,7 +169,14 @@ No configuration required. This is what you get without any `ai/config.toml`.
 
 Delegates to the [SkillKit](https://skillkit.dev) CLI for access to its 400K+ skill marketplace, cross-agent skill translation, and AI-powered recommendations.
 
-**Prerequisites:** Node.js + `npm install -g skillkit` (or Bun).
+**Prerequisites:**
+
+```sh
+npm install -g skillkit      # or: bun add -g skillkit
+npx skillkit@latest init     # one-time per machine: initialize agent platforms
+```
+
+`skillkit init` detects which AI agent platforms you have installed (Claude Code, Cursor, etc.) and sets up their skill directories. Re-run it whenever you install a new agent.
 
 ```toml
 [skills]

docs/guides/ai-skills.md

@@ -47,14 +47,19 @@ backend = "native"   # "native" | "skillkit"
 
 Delegates to the [SkillKit](https://skillkit.dev) CLI. Provides access to the SkillKit marketplace, cross-agent translation, and AI-powered skill recommendations.
 
-**Prerequisites:** Node.js (for `npx`) or Bun (for `bunx`), with SkillKit installed globally:
+**Prerequisites:** Node.js (for `npx`) or Bun (for `bunx`), with SkillKit installed and initialized:
 
 ```sh
 npm install -g skillkit
 # or
 bun add -g skillkit
+
+# One-time per-machine setup: detect installed agents and create their skill directories
+npx skillkit@latest init
 ```
 
+`skillkit init` is interactive — it detects which AI agent platforms are installed on your machine (Claude Code, Cursor, etc.) and creates the necessary skill directories for each one. Run it once per machine; re-run it when you install a new agent.
+
 **Configuration:**
 
 ```toml
@@ -82,7 +87,7 @@ On `haven apply --ai`, haven:
 
 **Lock file behavior:** `haven.lock` does NOT record SHAs for SkillKit-managed skills. Version pinning is delegated to SkillKit internally. The `fetch()` step returns a synthetic `sha: "managed-by-skillkit"` and is otherwise a no-op — SkillKit handles downloading during deployment.
 
-**Source restrictions:** SkillKit only supports `gh:` sources. Skills declared with `repo:` or `dir:` sources cause an immediate error when the SkillKit backend is active.
+**Source restrictions:** SkillKit supports `gh:` and `dir:` sources. Skills declared with a `repo:` source cause an immediate error when the SkillKit backend is active — `repo:` is a haven-internal source type with no SkillKit equivalent.
 
 **Unavailability behavior:** If the configured runner is not on PATH, `haven apply` exits immediately:
 
@@ -135,20 +140,26 @@ Your skill declarations (`ai/skills/`), platform config (`ai/platforms.toml`), a
    # or: bun add -g skillkit
    ```
 
-2. Create or update `ai/config.toml`:
+2. Initialize SkillKit for your agent platforms (one-time per machine):
+   ```sh
+   npx skillkit@latest init
+   ```
+   This detects which AI agents are installed (Claude Code, Cursor, etc.) and creates their skill directories. Re-run this whenever you install a new agent platform.
+
+3. Create or update `ai/config.toml`:
    ```toml
    [skills]
    backend = "skillkit"
    runner  = "npx"   # or "bunx" if you installed via bun
    ```
 
-3. Run apply:
+4. Run apply:
    ```sh
    haven apply --ai
    ```
    haven generates a `.skills` manifest from your existing `ai/skills/` declarations and calls `skillkit team install`. Your skills are redeployed to the same `skills_dir` locations as before.
 
-4. (Optional) Commit the change:
+5. (Optional) Commit the change:
    ```sh
    git add ai/config.toml && git commit -m "chore: switch to skillkit backend"
    ```

docs/reference/skill-backends.md

@@ -481,7 +481,13 @@ fn try_convert_if_directive(directive: &str) -> Option<String> {
 ///
 /// Directories starting with `.` are skipped entirely (they are chezmoi-internal
 /// or system directories — legitimate dotfile dirs use the `dot_` prefix).
-pub fn scan(source_dir: &Path, include_ignored: bool) -> Result<(Vec<ChezmoiEntry>, Vec<ChezmoiExternalEntry>, Vec<SkippedEntry>, Vec<ChezmoiScriptEntry>, Vec<ChezmoiBrewfileEntry>)> {
+type ScanResultKeeps = Vec<ChezmoiEntry>;
+type ScanResultExternals = Vec<ChezmoiExternalEntry>;
+type ScanResultSkipped = Vec<SkippedEntry>;
+type ScanResultScripts = Vec<ChezmoiScriptEntry>;
+type ScanResultBrewfiles = Vec<ChezmoiBrewfileEntry>;
+
+pub fn scan(source_dir: &Path, include_ignored: bool) -> Result<(ScanResultKeeps, ScanResultExternals, ScanResultSkipped, ScanResultScripts, ScanResultBrewfiles)> {
     let managed = chezmoi_managed_paths(source_dir);
 
     let mut keeps: Vec<ChezmoiEntry> = Vec::new();
@@ -1240,7 +1246,7 @@ fn extract_brew_bundle_file(rest: &str) -> Option<String> {
             return Some(path.to_string());
         }
     } else if let Some(after) = rest.strip_prefix("--file ") {
-        let path = after.trim_start().split_whitespace().next()?.trim_matches(|c| c == '"' || c == '\'');
+        let path = after.split_whitespace().next()?.trim_matches(|c| c == '"' || c == '\'');
         if !path.is_empty() {
             return Some(path.to_string());
         }

src/chezmoi.rs

@@ -143,11 +143,11 @@ fn install_symlink(dest: &Path, source_file: &Path) -> Result<()> {
     use std::os::unix::fs::symlink;
 
     // If dest already is the correct symlink, nothing to do.
-    if dest.is_symlink() {
-        if std::fs::read_link(dest).ok().as_deref() == Some(source_file) {
-            println!("Symlink already in place: {}", dest.display());
-            return Ok(());
-        }
+    if dest.is_symlink()
+        && std::fs::read_link(dest).ok().as_deref() == Some(source_file)
+    {
+        println!("Symlink already in place: {}", dest.display());
+        return Ok(());
     }
 
     // Back up the existing file before replacing it.
@@ -220,7 +220,7 @@ fn add_as_extdir(repo_root: &Path, dir: &Path, _remote_name: &str, url: &str, ig
         return Ok(());
     }
 
-    if !dir.strip_prefix(&home).is_ok() {
+    if dir.strip_prefix(&home).is_err() {
         bail!("{} is not under your home directory", dir.display());
     }
 

src/commands/add.rs

@@ -16,6 +16,7 @@ use crate::ai_config::{AiConfig, BackendKind};
 use crate::ai_platform::{platform_registry, PlatformsConfig};
 use crate::ai_skill::{DeployMethod, SkillSource, SkillsConfig};
 use crate::lock::LockFile;
+use crate::skill_backend_factory::create_backend;
 use crate::skill_cache::SkillCache;
 use crate::state::State;
 
@@ -476,9 +477,18 @@ pub struct UpdateOptions<'a> {
 /// Fetch the latest version of skills, ignoring the current lock SHA.
 ///
 /// Unlike `fetch`, this clears the lock entry before fetching so that
-/// `SkillCache::ensure()` always downloads from source.
+/// `SkillCache::ensure()` always downloads from source.  When the configured
+/// backend is SkillKit the update is delegated to `skillkit team install
+/// --update` via `SkillBackend::update_all()`.
 pub fn update(opts: &UpdateOptions<'_>) -> Result<()> {
     let skills = load_skills_required(opts.repo_root)?;
+    let ai_config = AiConfig::load(opts.repo_root).unwrap_or_default();
+
+    if matches!(ai_config.backend, BackendKind::SkillKit) {
+        return update_skillkit(opts, &skills, &ai_config);
+    }
+
+    // ── Native backend path ──────────────────────────────────────────────────
     let mut lock = LockFile::load(opts.repo_root)?;
     let cache = SkillCache::new(opts.state_dir);
 
@@ -527,6 +537,48 @@ pub fn update(opts: &UpdateOptions<'_>) -> Result<()> {
     Ok(())
 }
 
+/// SkillKit-specific update path: delegates to `skillkit team install --update`.
+fn update_skillkit(
+    opts: &UpdateOptions<'_>,
+    skills: &SkillsConfig,
+    ai_config: &AiConfig,
+) -> Result<()> {
+    let backend = create_backend(ai_config, opts.state_dir)?;
+    let to_update = filter_skills(&skills.skills, opts.name);
+
+    // Collect (name, source) pairs for updatable sources.
+    // repo: skills live inside the haven repo itself — SkillKit has no concept of them.
+    let mut pairs: Vec<(&str, &str)> = Vec::new();
+    for decl in &to_update {
+        match SkillSource::parse(&decl.source)? {
+            SkillSource::Repo => {
+                if opts.name.is_some() {
+                    println!(
+                        "Skill '{}' uses a repo: source — nothing to update via SkillKit.",
+                        decl.name
+                    );
+                }
+            }
+            _ => pairs.push((&decl.name, &decl.source)),
+        }
+    }
+
+    if pairs.is_empty() {
+        println!("No updatable skills found. Nothing to update.");
+        return Ok(());
+    }
+
+    let updated = backend.update_all(&pairs)?;
+    if updated.is_empty() {
+        println!("Skills are already up to date.");
+    } else {
+        for name in &updated {
+            println!("Updated '{}'.", name);
+        }
+    }
+    Ok(())
+}
+
 // ─── remove ───────────────────────────────────────────────────────────────────
 
 /// Options for `haven ai remove`.