hermes-sync/sync.sh

#!/bin/bash
set -e
SYNC_DIR="$HOME/.hermes-sync"
HERMES_HOME="$HOME/.hermes"
cd "$SYNC_DIR"

echo "[$(date '+%H:%M:%S')] Syncing..."

# Stage local changes
cp "$HERMES_HOME/memories/MEMORY.md" "$SYNC_DIR/memories/MEMORY.md" 2>/dev/null || true
if [ -d "$HERMES_HOME/skills" ]; then
    mkdir -p "$SYNC_DIR/skills"
    rsync -a --delete "$HERMES_HOME/skills/" "$SYNC_DIR/skills/" 2>/dev/null || true
fi
git add -A

HAS_LOCAL=false
if ! git diff --cached --quiet || ! git diff --quiet; then
    HAS_LOCAL=true
fi

# Fetch and merge remote
git fetch origin main
if git rev-parse HEAD >/dev/null 2>&1 && \
   git rev-parse origin/main >/dev/null 2>&1 && \
   ! git merge-base --is-ancestor HEAD origin/main 2>/dev/null; then
    echo "Merging remote..."
    if [ "$HAS_LOCAL" = true ]; then
        git stash push -m "local $(date)" 2>/dev/null || true
        if ! git merge origin/main --no-edit 2>/dev/null; then
            git checkout --ours memories/MEMORY.md 2>/dev/null || true
            git add -A
            git commit -m "Auto-resolve $(date)" 2>/dev/null || true
        fi
        if git stash list | grep -q "local "; then
            git stash pop 2>/dev/null || true
            git rebase origin/main 2>/dev/null || {
                git rebase --abort 2>/dev/null || true
                git merge origin/main --no-edit 2>/dev/null || true
            }
        fi
    else
        git merge origin/main --no-edit 2>/dev/null || git merge --ff-only origin/main 2>/dev/null || git reset --hard origin/main
    fi
fi

# Push local
if [ "$HAS_LOCAL" = true ]; then
    git commit -m "Sync $(date '+%Y-%m-%d %H:%M')" 2>/dev/null || true
    if ! git push origin main 2>&1; then
        echo "Push rejected, pulling..."
        git pull origin main --no-edit 2>/dev/null || true
        git push origin main 2>&1 || echo "Push failed"
    fi
fi

# Apply to hermes
cp "$SYNC_DIR/memories/MEMORY.md" "$HERMES_HOME/memories/MEMORY.md" 2>/dev/null || true
if [ -d "$SYNC_DIR/skills" ]; then
    rsync -a --ignore-existing "$SYNC_DIR/skills/" "$HERMES_HOME/skills/" 2>/dev/null || \
        cp -rn "$SYNC_DIR/skills/"* "$HERMES_HOME/skills/" 2>/dev/null || true
fi

echo "Done"