sync: auto-sync from DESKTOP-0O8A1RL at 2026-05-15 06:22:21

Author: Mike Swanson
Machine: DESKTOP-0O8A1RL
Timestamp: 2026-05-15 06:22:21

session-logs/2026-05-15-session.md

@@ -1,5 +1,56 @@
 # Session Log — 2026-05-15
 
+---
+
+## Update: 06:21 UTC — Session log housekeeping, submodule sync fix
+
+### Session Summary
+
+After completing the main RMM work (fleet update, dead write-half fix), the session turned to housekeeping: establishing correct session log placement for GuruRMM work and fixing the submodule to stay current on sync.
+
+Session log placement was corrected end-to-end. The convention had been ambiguous — session logs were being committed to the gururmm submodule repo, then the claudetools parent repo updated the submodule pointer, creating unnecessary double commits and coupling session notes to a code repo. The rule was established: GuruRMM session logs belong in claudetools `session-logs/` root, not in the gururmm repo. CLAUDE.md and FILE_PLACEMENT_GUIDE.md were updated with explicit rules. Today's session log (written earlier in the session) was moved from the gururmm repo to the correct location in claudetools.
+
+All historical session logs in the gururmm repo were then audited and migrated. Nine files were found: four were unique to gururmm and copied to claudetools, four had duplicates in claudetools where the gururmm version was more complete (replaced), and one where the claudetools version was longer (kept). All nine were then deleted from gururmm (commit `02d10b7` on gururmm, `3042975` → `02d10b7` on server). The gururmm repo is now session-log-free.
+
+The sync.sh script was updated in two passes to properly maintain the submodule. First pass added a Phase 1a that ran `git submodule update --remote` — this fetched the latest gururmm commits but left the submodule in detached HEAD state. Second pass replaced this with a `set +e`-guarded block that runs `git fetch origin`, `git checkout main`, and `git merge --ff-only origin/main` inside each submodule, ensuring the working tree is on the `main` branch and fast-forwarded. `.gitmodules` was also updated to declare `branch = main` so git knows which remote branch to track with `--remote`.
+
+### Key Decisions
+
+- **Session logs in claudetools, not gururmm**: gururmm is a code repo; mixing session notes into it creates noise in git history and couples operational logs to a repo that developers and tools may clone independently.
+- **Replace claudetools with longer gururmm version**: where the same date existed in both repos, line count was used as a proxy for completeness (more lines = session was appended to over time). The one case where claudetools was longer (04-20), claudetools was kept.
+- **`set +e` / `set -e` wrapper for submodule ops**: git emits non-fatal status messages ("Your branch is behind") that, under `set -e`, were triggering exit code 128 and killing the script. Temporarily disabling errexit for the submodule section is the standard solution.
+- **`git merge --ff-only` rather than `git pull --rebase`**: submodule should never have local commits that need rebasing; if it does, fast-forward failing is the right signal to investigate rather than silently rebase.
+
+### Problems Encountered
+
+- **`set -e` + `git checkout main` = exit 128**: "Your branch is behind 'origin/main'" is stdout output from a successful checkout, but something in the submodule context caused exit code 128. Resolution: wrap the entire submodule block in `set +e` / `set -e`.
+- **`git submodule update --remote` leaves detached HEAD**: `--remote` checks out the target commit directly rather than staying on a branch. Resolution: follow with explicit `git checkout main` and `git merge --ff-only` inside the submodule.
+- **Binary deployed to wrong path on first try**: copied new server binary to `/usr/local/bin/` but systemd unit points to `/opt/gururmm/`. Resolution: stop service, copy to correct path, start.
+- **`cp: Text file busy`**: attempted to copy new binary while service was running. Resolution: stop first, then copy.
+
+### Configuration Changes
+
+| File | Change |
+|------|--------|
+| `.claude/CLAUDE.md` | Added explicit GuruRMM session log placement rule (root session-logs/, not submodule) |
+| `.claude/FILE_PLACEMENT_GUIDE.md` | Added GuruRMM row to quick reference table |
+| `.claude/scripts/sync.sh` | Added Phase 1a: submodule fetch + checkout main + ff-merge |
+| `.gitmodules` | Added `branch = main` to gururmm submodule entry |
+| `session-logs/2025-12-15-session.md` | Migrated from gururmm (created) |
+| `session-logs/2025-12-20-session.md` | Migrated from gururmm (created) |
+| `session-logs/2026-04-19-session.md` | Replaced with longer gururmm version |
+| `session-logs/2026-04-21-session.md` | Replaced with longer gururmm version |
+| `session-logs/2026-05-12-session.md` | Replaced with longer gururmm version |
+| `session-logs/2026-05-12-guru-rmm-macos-agent-phase1.md` | Migrated from gururmm (created) |
+| `session-logs/2026-05-13-session.md` | Replaced with longer gururmm version |
+| `session-logs/2026-05-14-session.md` | Migrated from gururmm (created) |
+
+### Reference Information
+
+- gururmm session log removal commit: `3042975` (server local), pushed as `02d10b7` (Gitea)
+- sync.sh submodule fix commits: `415476e` (first pass, --remote), `b6c981d` (second pass, branch-aware)
+- claudetools migration commit: `39bc5f1` (session log migration)
+
 ## User
 - **User:** Mike Swanson (mike)
 - **Machine:** DESKTOP-0O8A1RL