Sync ~/.claude from conrelma/claude repo (pull-only, Mac is source of truth)

OVERRIDES runtime profile: uses direct_shell (plain shell, no model) because the command chain never invokes the claude CLI or any LLM API — pure-infra task; scheduler provider env injection is a no-op (MC-4942 U12 sweep).

One-way mirror from GitHub → Luci, non-destructive. Phase 2 (MC-698): ~/.claude/ IS now the git checkout — no rsync bridge. Mac is the only authoritative writer to conrelma/claude. Luci consumes (pulls master) and authors via autopush on Stop hook.

How it works

Every 15 min (7,22,37,52 offset to stagger from git-sync / cowork-sync):

1. flock prevents concurrent runs.
2. cd ~/.claude && git fetch origin — refresh remote refs.
3. Dirty-check ONLY on tracked-config paths — skills/ rules/ vault/ agents/ hooks/. Other tracked paths (.mcp.json, env/, google/) may differ per-machine and are not considered "dirty" for sync purposes.
4. Conditional merge:
5. If on master AND the tracked-config paths are clean → git merge --ff-only origin/master. Fast-forwards Mac's commits in. Luci-specific modifications outside tracked paths survive (ff-merge doesn't touch them unless incoming commits explicitly modify those files).
6. Otherwise → SKIP-FF, preserving Luci's in-progress feature branch work or concurrent edits.
7. Log counts + branch.

Why only tracked-config paths matter for the dirty check

After MC-698 Phase 2, Luci's ~/.claude/ has legitimate local-only state in tracked paths: her .mcp.json (different MCPs), env/api_keys.env (systemd variants), google/ (Luci's own OAuth or empty). These show as M or D in git status but are NOT supposed to propagate to master — they're per-machine differences that haven't been untracked yet (follow-up work).

Autopush is the authority on what flows to master. It stages ONLY skills/ agents/ hooks/ rules/. The sync's dirty check matches that scope — if nothing in those paths is modified, a fast-forward is safe even though other noise exists.

Luci authoring

She edits in ~/.claude/skills/, agents/, etc. directly. On Stop hook, luci_autopush.sh commits + pushes to master. Mac pulls via session-start hook.

Related

• MC-633 Phase 1: original sync setup
• MC-698 Phase 2 (this): ~/.claude-repo/ bridge retired. ~/.claude/ is the git checkout.
• MC-713: luci_autopush.sh (Stop hook auto-push)
• Follow-up (not yet ticketed): untrack more per-machine paths (.mcp.json, google/, Luci-only env/ files) to reduce git-status noise.