Motion-first calendar priority, /gitfix push phase, Google Calendar confirmation gate

- step-6: Google Calendar install now requires explicit confirmation with a warning that Motion is the primary calendar; natural language and commands always route to Motion first
- README: Google Calendar section rewritten to make Motion-first priority clear; edge-case framing for Google Calendar
- gitfix-skill/SKILL.md: Added Phase 7 — lists all unpushed commits, asks for confirmation, then pushes to main

Co-Authored-By: claude-flow <ruv@ruv.net>

Author: fidgetcoding

README.md

@@ -773,12 +773,14 @@ Built by [@notionhq](https://github.com/makenotion/notion-mcp-server) — the of
 
 ### Google Calendar
 
-Direct Google Calendar access via OAuth. Use this if you primarily live in Google Calendar rather than Motion.
+> **Motion is your primary calendar.** If you have Motion Calendar installed, Claude always uses Motion for all calendar reads and changes — by natural language or by command, every time. Motion aggregates Google Calendar, Outlook, and others, so you're already covered. Only install this if you need direct access to a Google account that is NOT synced to Motion.
 
-- **See your schedule.** Ask Claude what's on your calendar, check availability, or search for specific events.
-- **Create and manage events.** Add, update, or remove calendar events through conversation.
+Direct Google Calendar access via OAuth for edge cases and secondary accounts.
 
-> **Requires:** A Google account and ~5 minutes to create OAuth credentials in Google Cloud Console. The setup script walks you through it step by step.
+- **Direct Google access.** Reads and writes events on a specific Google Calendar account.
+- **Secondary account support.** Useful when you have a Google Calendar not connected to Motion.
+
+> **Requires:** A Google account and ~5 minutes to create OAuth credentials in Google Cloud Console. The setup script confirms your intent before installing, since Motion is the preferred calendar tool.
 
 ### Run Step 6
 

gitfix-skill/SKILL.md

@@ -132,12 +132,29 @@ Fixed:
 
 Verified (no changes needed):
 - [list sections that were checked and already accurate]
+```
+
+Do not produce the report until all fixes are applied.
+
+### Phase 7 — Push to Live
+
+After the report is produced, check for unpushed commits:
 
-Watch list (could not verify — manual check recommended):
-- [anything that requires human judgment or external verification]
+```bash
+git log origin/main..HEAD --oneline
 ```
 
-Do not produce the report until all fixes are applied. The report is the last thing output.
+If there are unpushed commits:
+
+1. List every unpushed commit in order, oldest first, with its hash and message
+2. Ask the user: **"Ready to push these X commits to main? (yes/no)"**
+3. Wait for explicit confirmation before pushing
+4. If confirmed: run `git push origin main`
+5. Report the push result
+
+If there are no unpushed commits, skip Phase 7 entirely — do not mention it.
+
+Never push without asking first. Never skip listing the commits. The user must see exactly what is going out before it goes out.
 
 ## Rules
 

step-6/step-6-install.sh

@@ -275,6 +275,17 @@ install_google_calendar() {
         return
     fi
 
+    echo ""
+    echo -e "${YELLOW}  ⚠️  IMPORTANT — Motion Calendar is your primary calendar.${NC}"
+    echo -e "${YELLOW}  Claude will ALWAYS use Motion for calendar reads and changes.${NC}"
+    echo -e "${YELLOW}  Only install Google Calendar if you need direct access to events${NC}"
+    echo -e "${YELLOW}  that are NOT synced to Motion (e.g. a secondary Google account).${NC}"
+    echo ""
+    read -rp "  Continue with Google Calendar install? (y/N): " GCAL_CONFIRM
+    if [[ ! "$GCAL_CONFIRM" =~ ^[Yy]$ ]]; then
+        info "Google Calendar install skipped."
+        return
+    fi
     echo ""
     echo -e "${BLUE}  Google Calendar MCP requires OAuth credentials from Google Cloud.${NC}"
     echo ""