sync: auto-sync from HOWARD-HOME at 2026-06-21 14:18:27

Author: Howard Enos
Machine: HOWARD-HOME
Timestamp: 2026-06-21 14:18:27

.claude/scripts/sync.sh

@@ -335,8 +335,17 @@ if [ -f ".gitmodules" ] && git config --file .gitmodules --get-regexp '^submodul
                     ;;
             esac
         fi
-        # Populate if missing (fresh clone) at the pinned commit.
-        git submodule update --init -- "$ppath" >/dev/null 2>&1
+        # Populate ONLY if missing (fresh clone). Do NOT re-run on an
+        # already-populated submodule: `git submodule update` checks out the
+        # parent's pinned gitlink (which CLAUDE.md intentionally lets lag main)
+        # in DETACHED HEAD, clobbering whatever branch / in-progress work the
+        # developer has checked out in the submodule and reverting it to the
+        # stale pin. (Friction 2026-06-21: this silently reset guru-rmm to a
+        # 5-commits-stale commit on every sync — detaching HEAD, discarding
+        # uncommitted edits, and making the working tree lag main.)
+        if ! git -C "$ppath" rev-parse --git-dir >/dev/null 2>&1; then
+            git submodule update --init -- "$ppath" >/dev/null 2>&1
+        fi
         # Reconcile this submodule's git identity to match identity.json — same
         # guarantee the parent repo gets at sync.sh:157-158. Without this, commits
         # in newly-cloned submodules land under the system default (e.g.