refactor: content-ownership dedup pass + move gh CLI to Step 7

Step 7 now owns the full GitHub stack: gh binary (unconditional) +
GitHub MCP (PAT-gated) + /gitfix skill. Moved from Step 3.
- step-3: remove install_gh, drop gh from self-test loop, banner → 10 tools
- step-7: add install_gh() for macOS+Linux, wire into main() before choose_tools,
  self-test always checks gh, summary shows INSTALLED_GH
- uninstall.sh: gh removal moved to uninstall_github (backward-compat comment)
- step-2: remove gh from the Step 3 preview line
- README + step-ordering + mcp-setup: Step 7 row/bullet updated to show gh

Cheatsheet dedup (design stack lives in creativity-maxxing, not here):
- Removed rows: 21st.dev Magic, Figma, Excalidraw, Gamma, YouTube Transcripts,
  IG/Social Transcription from CHEATSHEET.md + README-SECTIONS/cheat-sheet.md
- Add-on footnote now points to creativity-maxxing for Figma/Excalidraw/Gamma
- README uninstall: remove false "Whisper models" claim, add creativity-maxxing
  cross-ref and correct gh uninstall bullet (Step 7)

Author: fidgetcoding

CHEATSHEET.md

@@ -152,10 +152,7 @@ These activate on their own when Claude detects a relevant task via natural lang
 |------|-------------|-----------------|----------------|
 | UI/UX Pro Max | creativity-maxxing | Natural language — asks about UI, design, layouts, interfaces | "Build me a dashboard with a sidebar" |
 | Taste Skill (8 variants) | creativity-maxxing | Natural language — anything frontend/design. Stops generic AI "slop" output. Name a variant to force it: "use minimalist-ui", "redesign this with high-end-visual-design" | "Build a premium landing page" · "Redesign this dashboard" |
-| 21st.dev Magic | creativity-maxxing | Natural language — building components, pulls from 21st.dev library | "Create a hero section with a CTA" |
 | Remotion | creativity-maxxing | Natural language — video, animation, motion graphics | "Make a 30-second intro video" |
-| YouTube Transcripts | creativity-maxxing | Natural language — paste a YouTube link and ask for the transcript | "Get the transcript of this video: https://youtube.com/..." |
-| IG/Social Transcription | creativity-maxxing | Natural language — paste an Instagram, TikTok, or social media link | "Transcribe this reel: https://instagram.com/reel/..." |
 | No-flicker mode | Step 3 | Automatic — fullscreen rendering, no screen jumping while Claude works | (always on — set via environment variable) |
 | Memory auto-save hook | Step 3 | Automatic on session end — saves context from the conversation to memory | (no prompt needed — runs automatically) |
 | Notion | Step 5 | Natural language — pages, databases, knowledge management | "Search my Notion for the meeting notes" |
@@ -172,13 +169,10 @@ These activate on their own when Claude detects a relevant task via natural lang
 | GitHub | Step 7 | Natural language — repos, issues, PRs, code search, branches, commits | "List open PRs on cli-maxxing" · "Search my repos for any file that uses MORGEN_API_KEY" |
 | Obsidian | 2ndBrain-mogging | Natural language — read/write/search a local Obsidian vault (set up via [lorecraft-io/2ndBrain-mogging](https://github.com/lorecraft-io/2ndBrain-mogging)) | "Search my vault for notes about machine learning" |
 | Canva | Add-on | Natural language — create or edit designs, social posts, presentations | "Design a social media post for our launch" |
-| Figma | Add-on | Natural language or paste a Figma URL — design-to-code, inspect designs | "Turn this Figma into React components" |
-| Excalidraw | Add-on | Natural language — diagrams, flowcharts, whiteboard sketches | "Draw a system architecture diagram" |
-| Gamma | Add-on | Natural language — presentations, documents, webpages | "Create a pitch deck for my startup" |
 
 > **Key distinction:** Slash commands (`/fswarm`, `/fswarm1`–`/fswarmmax`, `/fmini`, `/fmini1`–`/fminimax`, `/fhive`, `/w4w`, `/safetycheck`, `/gitfix`, plus the 2ndBrain-mogging `/save`, `/wiki`, `/challenge`, `/emerge`, `/backfill`, `/aliases`, `/autoresearch`, `/canvas`, `/tether`, `/connect`) require you to type the command. Everything in this table works by just talking to Claude naturally.
 >
-> **Add-on tools** (Canva, Figma, Excalidraw, Gamma) are not part of the step-by-step setup — they're optional MCP servers you can connect separately. Claude auto-detects them when they're installed.
+> **Add-on tools** (Canva) are not part of the step-by-step setup — they're optional MCP servers you can connect separately. Claude auto-detects them when they're installed. Figma, Excalidraw, and Gamma live in [creativity-maxxing](https://github.com/lorecraft-io/creativity-maxxing).
 
 ---
 

README-SECTIONS/cheat-sheet.md

@@ -120,10 +120,7 @@ These activate on their own when Claude detects a relevant task via natural lang
 |------|-------------|-----------------|----------------|
 | UI/UX Pro Max | creativity-maxxing | Natural language — asks about UI, design, layouts, interfaces | "Build me a dashboard with a sidebar" |
 | Taste Skill (8 variants) | creativity-maxxing | Natural language — anything frontend/design. Stops generic AI "slop" output. Name a variant to force it: "use minimalist-ui", "redesign this with industrial-brutalist-ui" | "Build a premium landing page" · "Redesign this dashboard" |
-| 21st.dev Magic | creativity-maxxing | Natural language — building components, pulls from 21st.dev library | "Create a hero section with a CTA" |
 | Remotion | creativity-maxxing | Natural language — video, animation, motion graphics | "Make a 30-second intro video" |
-| YouTube Transcripts | creativity-maxxing | Natural language — paste a YouTube link and ask for the transcript | "Get the transcript of this video: https://youtube.com/..." |
-| IG/Social Transcription | creativity-maxxing | Natural language — paste an Instagram, TikTok, or social media link | "Transcribe this reel: https://instagram.com/reel/..." |
 | Notion | Step 5 | Natural language — pages, databases, knowledge management | "Search my Notion for the meeting notes" |
 | Granola | Step 5 | Natural language — meeting transcripts and notes | "What did we cover in my last meeting?" |
 | n8n (your own) | Step 5 | Natural language — trigger and inspect your own n8n workflows | "Run my lead-qualification workflow on this email" |
@@ -140,13 +137,10 @@ These activate on their own when Claude detects a relevant task via natural lang
 | No-Flicker Mode | Step 3 | Automatic — fullscreen rendering, no screen jumping while Claude works | (always on — set via environment variable) |
 | Memory Hook | Step 3 | Automatic on session end — saves context from the conversation | (no prompt needed — runs automatically) |
 | Canva | Add-on | Natural language — create or edit designs, social posts, presentations | "Design a social media post for our launch" |
-| Figma | Add-on | Natural language or paste a Figma URL — design-to-code, inspect designs | "Turn this Figma into React components" |
-| Excalidraw | Add-on | Natural language — diagrams, flowcharts, whiteboard sketches | "Draw a system architecture diagram" |
-| Gamma | Add-on | Natural language — presentations, documents, webpages | "Create a pitch deck for my startup" |
 
 > **Key distinction:** Slash commands (`/fswarm`, `/fswarm1`–`/fswarmmax`, `/fmini`, `/fmini1`–`/fminimax`, `/fhive`, `/w4w`, `/safetycheck`, `/gitfix`) require you to type the command. Everything in this table works by just talking to Claude naturally.
 >
-> **Add-on tools** (Canva, Figma, Excalidraw, Gamma) are not part of the step-by-step setup — they're optional MCP servers you can connect separately. Claude auto-detects them when they're installed.
+> **Add-on tools** (Canva) are not part of the step-by-step setup — they're optional MCP servers you can connect separately. Claude auto-detects them when they're installed. Figma, Excalidraw, and Gamma live in [creativity-maxxing](https://github.com/lorecraft-io/creativity-maxxing).
 
 ---
 

README-SECTIONS/mcp-setup.md

@@ -4,7 +4,7 @@ Claude Code connects to MCP (Model Context Protocol) servers for extended capabi
 
 - **Step 4 (FidgetFlo)** — adds the FidgetFlo MCP server automatically. This gives Claude its multi-agent orchestration, swarm tools, and persistent memory.
 - **Step 5 (Productivity Tools)** — interactive menu, pick what you use: Notion, Granola, n8n, Google Calendar, Morgen (recommended), Motion Calendar, Playwright, SwiftKit, Superhuman, Google Drive. All optional, all wired automatically when you select them.
-- **Step 7 (GitHub)** — adds the GitHub MCP server (requires a Personal Access Token). Gives Claude access to repos, issues, PRs, and code search. Also installs the `/gitfix` skill for full-repo doc sync.
+- **Step 7 (GitHub)** — installs the GitHub CLI (`gh` terminal binary, no credentials required — run `gh auth login` once after install) and adds the GitHub MCP server (requires a Personal Access Token). Together they give Claude access to repos, issues, PRs, and code search via both the `gh` binary in Bash and direct tool calls. Also installs the `/gitfix` skill for full-repo doc sync.
 
 For manual MCP setup or troubleshooting, see the [Claude Code MCP documentation](https://docs.anthropic.com/en/docs/claude-code/mcp-servers).
 

README-SECTIONS/step-ordering.md

@@ -10,7 +10,7 @@ Run the steps in this order:
 | 4 | FidgetFlo | Multi-agent orchestration — swarms, hives, persistent memory, Opus-locked |
 | 5 | Productivity Tools | Notion + Granola + n8n + Google Calendar + Morgen + Motion Calendar + Playwright + SwiftKit + Superhuman + Google Drive (all optional — pick what you use; Morgen recommended) |
 | 6 | Telegram | Telegram bot setup — message Claude from your phone. Press Enter to skip if you don't have a bot yet. |
-| 7 | GitHub | GitHub MCP (repos, issues, PRs, code search — requires PAT) + `/gitfix` skill for full-repo doc sync |
+| 7 | GitHub | GitHub CLI (`gh`) + GitHub MCP (repos, issues, PRs, code search — MCP requires PAT) + `/gitfix` skill for full-repo doc sync |
 | 8 | Safety Check | Security auditing — 8 API checks + 12 MCP checks for tool poisoning, DNS rebinding, supply chain attacks |
 | **Final** | **Status Line** | **Status indicators + system health check** |
 

README.md

@@ -322,7 +322,6 @@ Claude runs the install. If it asks you to restart your terminal, close the wind
 | pdftotext | Extracts text from PDFs. |
 | jq | Reads and edits JSON config files. |
 | ripgrep | Fast code search — Claude Code uses it internally. |
-| GitHub CLI | Manage GitHub from your terminal. |
 | tree | Shows your folder structure visually. |
 | fzf | Fuzzy-finder for files and commands. |
 | wget | Downloads files from the web. |
@@ -529,9 +528,10 @@ Open a new terminal and run `ctg` to launch Claude with Telegram connected. Insi
 
 [Back to top](#quick-navigation)
 
-The GitHub bundle — optional, for devs. Installs two things:
+The GitHub bundle — optional, for devs. Installs three things:
 
-- **GitHub MCP** ([`@modelcontextprotocol/server-github`](https://github.com/modelcontextprotocol/servers/tree/main/src/github)) — Claude gets direct access to your repos: issues, PRs, files, code search, branches, commits. *"List open PRs on cli-maxxing"*, *"search my repos for any file that uses MORGEN_API_KEY"* — it just works.
+- **GitHub CLI (`gh`)** — the terminal binary. Claude shells out to it via Bash for everyday ops (`gh pr create`, `gh issue list`, `gh repo view`). Installs unconditionally — no credentials required. Run `gh auth login` once after install to sign in.
+- **GitHub MCP** ([`@modelcontextprotocol/server-github`](https://github.com/modelcontextprotocol/servers/tree/main/src/github)) — Claude gets direct tool-call access to your repos: issues, PRs, files, code search, branches, commits. *"List open PRs on cli-maxxing"*, *"search my repos for any file that uses MORGEN_API_KEY"* — it just works. Requires a Personal Access Token.
 - **`/gitfix` skill** — full-repo doc sync. Reads every install script, skill file, and doc, finds drift between code and docs, fixes it. Run it after any significant change so the README stops lying.
 
 ### Before You Run It
@@ -555,7 +555,8 @@ Script prompts for your PAT, registers the GitHub MCP (token stored in `~/.claud
 
 | Component | What it does |
 |-----------|-------------|
-| GitHub MCP | Exposes GitHub API ops as Claude tools — read/write repos, issues, PRs, code search, branches, commits. |
+| GitHub CLI (`gh`) | Terminal binary. Claude uses it via Bash for PRs, issues, code search, branch ops. Run `gh auth login` once after install. |
+| GitHub MCP | Exposes GitHub API ops as Claude tools — read/write repos, issues, PRs, code search, branches, commits. Needs a Personal Access Token. |
 | `/gitfix` skill | Full-repo doc sync. Fixes drift between code and docs. Works on any repo, no token needed. |
 
 ### After Step 7
@@ -861,7 +862,7 @@ Run the steps in this order:
 | 4 | FidgetFlo | Multi-agent orchestration — swarms, hives, persistent memory, Opus-locked |
 | 5 | Productivity Tools | Notion + Granola + n8n + Google Calendar + Morgen + Motion Calendar + Playwright + SwiftKit + Superhuman + Google Drive (all optional — pick what you use; Morgen recommended) |
 | 6 | Telegram | Telegram bot setup — message Claude from your phone. Press Enter to skip if you don't have a bot yet. |
-| 7 | GitHub | GitHub MCP (repos, issues, PRs, code search — requires PAT) + `/gitfix` skill for full-repo doc sync |
+| 7 | GitHub | GitHub CLI (`gh`) + GitHub MCP (repos, issues, PRs, code search — MCP requires PAT) + `/gitfix` skill for full-repo doc sync |
 | 8 | Safety Check | Security auditing — 8 API checks + 12 MCP checks for tool poisoning, DNS rebinding, supply chain attacks |
 | **Final** | **Status Line** | **Status indicators + system health check** |
 
@@ -897,7 +898,7 @@ One script reverses the whole stack. Your Obsidian vault, notes, and Claude acco
 > bash <(curl -fsSL https://raw.githubusercontent.com/lorecraft-io/cli-maxxing/main/uninstall.sh)
 > ```
 
-Removes the cli-maxxing aliases (`cskip`, `cc`, `ccr`, `ccc`), the `ctg` script, all MCPs this setup installed, all FidgetFlo skills + `/w4w` + `/safetycheck` + `/gitfix`, dev tools, Whisper models, Arc Browser, and the Ghostty config. `cbrain` and `cbraintg` are managed by [2ndBrain-mogging](https://github.com/lorecraft-io/2ndBrain-mogging) and are not touched here.
+Removes the cli-maxxing aliases (`cskip`, `cc`, `ccr`, `ccc`), the `ctg` script, all MCPs this setup installed, all FidgetFlo skills + `/w4w` + `/safetycheck` + `/gitfix`, dev tools, Arc Browser, and the Ghostty config. `cbrain` and `cbraintg` are managed by [2ndBrain-mogging](https://github.com/lorecraft-io/2ndBrain-mogging) and are not touched here. The YouTube / Instagram transcription stack (yt-dlp, whisper-mcp, ffmpeg, Whisper models) lives in [creativity-maxxing](https://github.com/lorecraft-io/creativity-maxxing) — run its uninstaller separately if you installed it.
 
 **Keeps:** Homebrew, Git, Node.js, Claude Code itself, your Obsidian vault + notes, your Claude account — general-purpose tools + your data. The script prints manual-removal commands at the end if you want a fully clean machine.
 
@@ -907,8 +908,8 @@ Removes the cli-maxxing aliases (`cskip`, `cc`, `ccr`, `ccc`), the `ctg` script,
 - Claude Code shell aliases (`cskip`, `cc`, `ccr`, `ccc`) and the `ctg` script (`~/.local/bin/ctg`). `cbrain` and `cbraintg` are managed by 2ndBrain-mogging — not removed here.
 - All MCPs installed by this repo: FidgetFlo, Notion, Granola, n8n, Google Calendar, Morgen, Motion Calendar, Playwright, SwiftKit, Superhuman, Google Drive, GitHub — design + media MCPs are managed by [creativity-maxxing](https://github.com/lorecraft-io/creativity-maxxing); Obsidian is managed by [2ndBrain-mogging](https://github.com/lorecraft-io/2ndBrain-mogging)
 - All skills: `fswarm*`, `fmini*`, `fhive`, `w4w`, `gitfix`, `safetycheck` — UI/UX Pro Max + Taste Skill pack + Remotion are managed by creativity-maxxing
-- Dev tools: pandoc, jq, ripgrep, gh, tree, fzf, wget, weasyprint, ffmpeg, xlsx2csv, poppler
-- Whisper models (`~/.whisper/`)
+- Dev tools: pandoc, jq, ripgrep, tree, fzf, wget, weasyprint, ffmpeg, xlsx2csv, poppler
+- GitHub CLI (`gh` — installed by Step 7 alongside the GitHub MCP + /gitfix skill)
 - Motion Calendar config (`~/.motion-mcp/`)
 - Google Calendar config (`~/.google-calendar-mcp/`)
 - Arc Browser (if installed via Step 2)

step-2/step-2-install.sh

@@ -41,7 +41,7 @@ echo -e "${YELLOW}━━━━━━━━━━━━━━━━━━━━
 echo -e "${YELLOW}  NEXT: Continue to Step 3${NC}"
 echo -e "${YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
 echo ""
-echo "  Run Step 3 to install developer tools (Python, jq, ripgrep, gh, etc.):"
+echo "  Run Step 3 to install developer tools (Python, jq, ripgrep, tree, fzf, etc.):"
 echo ""
 echo -e "     ${GREEN}bash <(curl -fsSL https://raw.githubusercontent.com/lorecraft-io/cli-maxxing/main/step-3/step-3-install.sh)${NC}"
 echo ""

step-3/step-3-install.sh

@@ -3,7 +3,8 @@ set -uo pipefail
 
 # =============================================================================
 # Step 3 — Developer & Utility Tools
-# Installs: Python, Pandoc, xlsx2csv, pdftotext, jq, ripgrep, gh, tree, fzf, wget, weasyprint
+# Installs: Python, Pandoc, xlsx2csv, pdftotext, jq, ripgrep, tree, fzf, wget, weasyprint
+# GitHub CLI (gh) is installed by Step 7 alongside the GitHub MCP + /gitfix skill.
 # Run this in your terminal after completing Step 2
 # Usage: curl -fsSL <hosted-url>/step-3/step-3-install.sh | bash
 # =============================================================================
@@ -313,39 +314,6 @@ install_ripgrep() {
     command -v rg &>/dev/null && success "ripgrep installed ($(rg --version | head -1))"
 }
 
-# -----------------------------------------------------------------------------
-# GitHub CLI
-# -----------------------------------------------------------------------------
-install_gh() {
-    if command -v gh &>/dev/null; then
-        success "GitHub CLI already installed ($(gh --version | head -1))"
-        return
-    fi
-
-    info "Installing GitHub CLI..."
-    if [ "$OS" = "mac" ]; then
-        brew install gh || { soft_fail "GitHub CLI installation failed"; return; }
-    else
-        if command -v apt-get &>/dev/null; then
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg 2>/dev/null
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            if sudo apt-get update -qq && sudo apt-get install -y -qq gh; then
-                :
-            else
-                soft_fail "GitHub CLI installation failed"
-                return
-            fi
-        elif command -v dnf &>/dev/null; then
-            sudo dnf install -y gh || { soft_fail "GitHub CLI installation failed"; return; }
-        else
-            soft_fail "Could not install GitHub CLI — install manually: https://cli.github.com"
-            return
-        fi
-    fi
-
-    command -v gh &>/dev/null && success "GitHub CLI installed ($(gh --version | head -1))"
-}
-
 # -----------------------------------------------------------------------------
 # tree
 # -----------------------------------------------------------------------------
@@ -473,7 +441,6 @@ run_self_test() {
         "pdftotext:pdftotext" \
         "jq:jq" \
         "rg:ripgrep" \
-        "gh:GitHub CLI" \
         "tree:tree" \
         "fzf:fzf" \
         "wget:wget" \
@@ -638,7 +605,6 @@ print_summary() {
     echo "    pdftotext      $(command -v pdftotext &>/dev/null && echo 'installed' || echo '—')"
     echo "    jq             $(jq --version 2>/dev/null || echo '—')"
     echo "    ripgrep        $(rg --version 2>/dev/null | head -1 || echo '—')"
-    echo "    GitHub CLI     $(gh --version 2>/dev/null | head -1 || echo '—')"
     echo "    tree           $(command -v tree &>/dev/null && echo 'installed' || echo '—')"
     echo "    fzf            $(fzf --version 2>/dev/null | cut -d' ' -f1 || echo '—')"
     echo "    wget           $(command -v wget &>/dev/null && echo 'installed' || echo '—')"
@@ -679,7 +645,7 @@ main() {
     echo ""
     echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
     echo -e "${BLUE}  Step 3 — Developer & Utility Tools${NC}"
-    echo -e "${BLUE}  11 tools • macOS + Linux${NC}"
+    echo -e "${BLUE}  10 tools • macOS + Linux${NC}"
     echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
     echo ""
 
@@ -692,7 +658,6 @@ main() {
     install_pdftotext
     install_jq
     install_ripgrep
-    install_gh
     install_tree
     install_fzf
     install_wget