sweep: update MCP package names post-rename (motion-calendar-mcp -> motion-mcp, morgen-mcp -> fidgetcoding-morgen-mcp)

Author: fidgetcoding

README.md

@@ -739,7 +739,7 @@ Direct Google Calendar access via OAuth. This is a secondary calendar tool — i
 
 ### Motion Calendar
 
-Built by [@lorecraft-io](https://github.com/lorecraft-io/motion-calendar-mcp). A Motion-specific MCP that fills a few gaps Morgen doesn't cover — install this only if you specifically need Motion's teammate features or full event search.
+Built by [@lorecraft-io](https://github.com/lorecraft-io/motion-mcp). A Motion-specific MCP that fills a few gaps Morgen doesn't cover — install this only if you specifically need Motion's teammate features or full event search.
 
 - **Teammate visibility.** See when teammates are busy or out of office — something Morgen's API doesn't expose.
 - **Full event search.** Query events by title or description across all your Motion calendars.
@@ -1239,7 +1239,7 @@ If you need to remove everything installed by this setup, the uninstall script r
 - All skills (rswarm, rmini, rhive, w4w, get-api-docs, gitfix, safetycheck) — UI/UX Pro Max, Taste Skill pack, and Remotion are managed by creativity-maxxing
 - Dev tools (pandoc, jq, ripgrep, gh, tree, fzf, wget, weasyprint, ffmpeg, xlsx2csv, poppler)
 - Whisper models (~/.whisper/)
-- Motion Calendar config (~/.motion-calendar-mcp/)
+- Motion Calendar config (~/.motion-mcp/)
 - Google Calendar config (~/.google-calendar-mcp/)
 - Arc Browser (if installed via the bonus script)
 - Ghostty config (the app itself is kept — only the config file installed by this setup is removed)

SECURITY.md

@@ -20,7 +20,7 @@ If you discover a security vulnerability, please report it responsibly:
 CLI-MAXXING install scripts collect API credentials interactively. Some are persisted to local `.env` files with restrictive permissions (`chmod 700` dir, `chmod 600` file); the rest live inside Claude Code's MCP config via `claude mcp add -e`. Credentials are never committed to this repository.
 
 **Persisted to `.env` files (edit by re-running the step):**
-- Motion Calendar: `~/.motion-calendar-mcp/.env` — Motion API key, Firebase API key, Firebase refresh token, Motion user ID
+- Motion Calendar: `~/.motion-mcp/.env` — Motion API key, Firebase API key, Firebase refresh token, Motion user ID
 - Google Calendar: `~/.google-calendar-mcp/.env` — Google OAuth Client ID and Client Secret
 - Telegram Bot: `~/.claude/channels/telegram/.env` — Telegram bot token
 

step-6/step-6-install.sh

@@ -124,7 +124,7 @@ choose_tools() {
             CHOICES="$CHOICES 5"
             INSTALLED_MORGEN=true
         fi
-        if claude mcp list 2>/dev/null | grep -q "motion-calendar" 2>/dev/null; then
+        if claude mcp list 2>/dev/null | grep -q "^motion\b\|[[:space:]]motion\b" 2>/dev/null; then
             CHOICES="$CHOICES 6"
             INSTALLED_MOTION=true
             MOTION_PREEXISTING=true
@@ -352,7 +352,7 @@ install_google_calendar() {
     fi
 
     # If a primary calendar is already installed, warn that it takes priority
-    if claude mcp list 2>/dev/null | grep -q "morgen\|motion-calendar"; then
+    if claude mcp list 2>/dev/null | grep -q "morgen\|^motion\b\|[[:space:]]motion\b"; then
         echo ""
         echo -e "${YELLOW}  You already have a primary calendar MCP installed${NC}"
         echo -e "${YELLOW}  (Morgen or Motion). Claude will use that by default.${NC}"
@@ -450,7 +450,7 @@ install_morgen() {
     echo "    2. Sign in with your Morgen account"
     echo "    3. Generate an API key and copy it"
     echo ""
-    echo -e "${BLUE}  Package: morgen-mcp (published by lorecraft-io)${NC}"
+    echo -e "${BLUE}  Package: fidgetcoding-morgen-mcp (published by lorecraft-io)${NC}"
     echo -e "${BLUE}  Source:  https://github.com/lorecraft-io/morgen-mcp${NC}"
     echo ""
 
@@ -475,7 +475,7 @@ install_morgen() {
     claude mcp add --scope user \
         -e MORGEN_API_KEY="$MORGEN_API_KEY" \
         -e MORGEN_TIMEZONE="$MORGEN_TIMEZONE" \
-        morgen -- npx -y morgen-mcp 2>/dev/null
+        morgen -- npx -y fidgetcoding-morgen-mcp 2>/dev/null
 
     if claude mcp list 2>/dev/null | grep -q "morgen"; then
         success "Morgen MCP installed (timezone: $MORGEN_TIMEZONE)"
@@ -491,7 +491,7 @@ install_morgen() {
 install_motion_calendar() {
     info "Installing Motion Calendar MCP server..."
 
-    if claude mcp list 2>/dev/null | grep -q "motion-calendar"; then
+    if claude mcp list 2>/dev/null | grep -q "^motion\b\|[[:space:]]motion\b"; then
         success "Motion Calendar MCP already installed"
         INSTALLED_MOTION=true
         MOTION_PREEXISTING=true
@@ -504,8 +504,8 @@ install_motion_calendar() {
     echo -e "${YELLOW}  Motion-specific features (teammate events, full-text${NC}"
     echo -e "${YELLOW}  search across events, custom calendar management).${NC}"
     echo ""
-    echo -e "${BLUE}  Package: motion-calendar-mcp (published by lorecraft-io)${NC}"
-    echo -e "${BLUE}  Source:  https://github.com/lorecraft-io/motion-calendar-mcp${NC}"
+    echo -e "${BLUE}  Package: fidgetcoding-motion-mcp (published by lorecraft-io)${NC}"
+    echo -e "${BLUE}  Source:  https://github.com/lorecraft-io/motion-mcp${NC}"
     echo ""
     echo -e "${BLUE}  Motion Calendar requires a few API credentials from your${NC}"
     echo -e "${BLUE}  Motion account settings.${NC}"
@@ -522,24 +522,24 @@ install_motion_calendar() {
 
     if [ -z "$MOTION_API_KEY" ] || [ -z "$FIREBASE_API_KEY" ] || [ -z "$FIREBASE_REFRESH_TOKEN" ] || [ -z "$MOTION_USER_ID" ]; then
         warn "One or more Motion credentials were left blank."
-        warn "You can fill them in later at ~/.motion-calendar-mcp/.env"
+        warn "You can fill them in later at ~/.motion-mcp/.env"
     fi
 
     # Write config
-    mkdir -p "$HOME/.motion-calendar-mcp"
-    chmod 700 "$HOME/.motion-calendar-mcp"
+    mkdir -p "$HOME/.motion-mcp"
+    chmod 700 "$HOME/.motion-mcp"
     {
       printf 'MOTION_API_KEY=%s\n' "$MOTION_API_KEY"
       printf 'FIREBASE_API_KEY=%s\n' "$FIREBASE_API_KEY"
       printf 'FIREBASE_REFRESH_TOKEN=%s\n' "$FIREBASE_REFRESH_TOKEN"
       printf 'MOTION_USER_ID=%s\n' "$MOTION_USER_ID"
-    } > "$HOME/.motion-calendar-mcp/.env"
-    chmod 600 "$HOME/.motion-calendar-mcp/.env"
+    } > "$HOME/.motion-mcp/.env"
+    chmod 600 "$HOME/.motion-mcp/.env"
 
-    # Register the MCP server (it reads credentials from ~/.motion-calendar-mcp/.env)
-    claude mcp add --scope user motion-calendar -- npx -y motion-calendar-mcp 2>/dev/null
+    # Register the MCP server (it reads credentials from ~/.motion-mcp/.env)
+    claude mcp add --scope user motion -- npx -y fidgetcoding-motion-mcp 2>/dev/null
 
-    if claude mcp list 2>/dev/null | grep -q "motion-calendar"; then
+    if claude mcp list 2>/dev/null | grep -q "^motion\b\|[[:space:]]motion\b"; then
         success "Motion Calendar MCP installed"
         INSTALLED_MOTION=true
     else
@@ -663,7 +663,7 @@ run_self_test() {
     if $INSTALLED_N8N;      then check_registered "n8n"             "n8n";             else info "TEST: n8n — skipped";             TEST_SKIP=$((TEST_SKIP + 1)); fi
     if $INSTALLED_GCAL;     then check_registered "Google Calendar" "google-calendar"; else info "TEST: Google Calendar — skipped"; TEST_SKIP=$((TEST_SKIP + 1)); fi
     if $INSTALLED_MORGEN;   then check_registered "Morgen"          "morgen";          else info "TEST: Morgen — skipped";          TEST_SKIP=$((TEST_SKIP + 1)); fi
-    if $INSTALLED_MOTION;   then check_registered "Motion Calendar" "motion-calendar"; else info "TEST: Motion Calendar — skipped"; TEST_SKIP=$((TEST_SKIP + 1)); fi
+    if $INSTALLED_MOTION;   then check_registered "Motion Calendar" "motion"; else info "TEST: Motion Calendar — skipped"; TEST_SKIP=$((TEST_SKIP + 1)); fi
     if $INSTALLED_PLAYWRIGHT; then check_registered "Playwright"    "playwright";      else info "TEST: Playwright — skipped";      TEST_SKIP=$((TEST_SKIP + 1)); fi
     if $INSTALLED_SWIFTKIT;  then check_registered "SwiftKit"     "swiftkit";        else info "TEST: SwiftKit — skipped";        TEST_SKIP=$((TEST_SKIP + 1)); fi
 
@@ -678,7 +678,7 @@ run_self_test() {
         fi
     fi
     if $INSTALLED_MOTION; then
-        if [ -f "$HOME/.motion-calendar-mcp/.env" ]; then
+        if [ -f "$HOME/.motion-mcp/.env" ]; then
             success "TEST: Motion Calendar config exists"
             TEST_PASS=$((TEST_PASS + 1))
         elif $MOTION_PREEXISTING; then

tests/install-flow-walkthrough.md

@@ -117,7 +117,7 @@ Installs 7 optional productivity MCPs. Obsidian MCP has moved to [2ndbrain-maxxi
 | (3) n8n | Prompts for user's own n8n instance URL + optional Bearer token, registers via `--transport http` with `-H "Authorization: Bearer …"` if provided | PASS |
 | (4) Google Calendar | Prompts for OAuth Client ID + Secret, writes `~/.google-calendar-mcp/.env` (chmod 700 dir / 600 file), registers with `-e GOOGLE_CLIENT_ID=... -e GOOGLE_CLIENT_SECRET=...` | PASS |
 | (5) Morgen *(recommended)* | Prompts for API key + optional IANA timezone, registers via `-e MORGEN_API_KEY=... -e MORGEN_TIMEZONE=...`. No local `.env` — credentials live in Claude Code's MCP config | PASS |
-| (6) Motion Calendar | Prompts for Motion API key, Firebase API key, Firebase refresh token, Motion user ID. Writes `~/.motion-calendar-mcp/.env` (chmod 700/600). Registers via `claude mcp add motion-calendar` | PASS |
+| (6) Motion Calendar | Prompts for Motion API key, Firebase API key, Firebase refresh token, Motion user ID. Writes `~/.motion-mcp/.env` (chmod 700/600). Registers via `claude mcp add motion` | PASS |
 | (7) Playwright | No credentials required. Registers Microsoft's official `@playwright/mcp` via `claude mcp add playwright -- npx -y @playwright/mcp@latest`. Chromium binaries auto-download on first use. | PASS |
 | Obsidian | NOT in this repo — see 2ndbrain-maxxing | N/A |
 | Self-test | `check_registered` covers all 7 tools, verifies Motion + GCal `.env` files exist for their respective installs | PASS |

uninstall.sh

@@ -223,7 +223,7 @@ uninstall_productivity_mcps() {
     echo ""
     echo -e "${BLUE}--- Step 6: Productivity Tools ---${NC}"
 
-    for mcp in notion granola n8n google-calendar morgen motion-calendar playwright; do
+    for mcp in notion granola n8n google-calendar morgen motion playwright; do
         if claude mcp list 2>/dev/null | grep -qi "$mcp" 2>/dev/null; then
             claude mcp remove "$mcp" 2>/dev/null || true
             success "$mcp MCP"
@@ -241,9 +241,9 @@ uninstall_productivity_mcps() {
     fi
 
     # Motion Calendar config
-    if [ -d "$HOME/.motion-calendar-mcp" ]; then
-        rm -rf "$HOME/.motion-calendar-mcp"
-        success "Motion Calendar config (~/.motion-calendar-mcp)"
+    if [ -d "$HOME/.motion-mcp" ]; then
+        rm -rf "$HOME/.motion-mcp"
+        success "Motion Calendar config (~/.motion-mcp)"
     else
         skip "Motion Calendar config (not found)"
     fi