Add Granola/GCal MCPs, /gitfix skill, ctg token guard, cbrain caution, MCP check, Telegram loop fix

- step-6: Added Granola MCP (HTTP, no creds) and Google Calendar MCP (OAuth) as options 3 and 4
- step-1: ctg moved from alias to ~/.local/bin script with token guard; cbraintg gets same guard; migrates old alias
- step-final: Installs /gitfix skill on every run; self-test verifies it
- gitfix-skill/SKILL.md: New skill — full repo consistency audit across all scripts and docs
- README: Quick MCP check before cbrain, cbrain caution (Step 7 required), Telegram loop warning in Step 8, /gitfix in Final Step, all Installation Order + You're Ready lists updated
- CHEATSHEET: /gitfix in skills table, ctg/cbrain corrected, key-distinction note updated
- update.sh: /gitfix added to end-of-run skills summary

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

Author: fidgetcoding

CHEATSHEET.md

@@ -39,7 +39,7 @@ These aliases are added to your `~/.zshrc` (or `~/.bashrc`) and available in any
 | `cc` | Short alias for `claude` |
 | `ccr` | Resume last Claude conversation (`claude --resume`) |
 | `ccc` | Continue last Claude conversation (`claude --continue`) |
-| `cbrain` | Launch Claude Code in your 2ndBrain vault with skip-permissions *(requires Obsidian — Step 7)* |
+| `cbrain` | Launch Claude Code in your 2ndBrain vault with skip-permissions *(requires Step 7 — Second Brain setup. Do not use until your vault exists.)* |
 | `cbraintg` | Same as `cbrain` but with Telegram channel connected |
 | `ctg` | Skip-permissions + Telegram channel connected (any directory) |
 | `g2` | Tile 2 Ghostty windows side by side, filling your screen *(requires Ghostty — Bonus step, macOS only)* |
@@ -97,9 +97,10 @@ These are custom skills installed by the setup scripts. Type them inside a Claud
 | `/rhive <goal>` | Step 3 | Launch a queen-led autonomous hive-mind with raft consensus |
 | `/w4w` | Step 3 | Maximum attention to detail — word for word, line for line. No skipping, no summarizing. Also works without the slash — just type `w4w` |
 | `/safetycheck` | Step 9 | Security audit — scans any project for exposed keys, missing rate limiting, input sanitization gaps, dependency vulnerabilities, and insecure configurations. Also responds to "run a safety check" in plain English |
+| `/gitfix` | Final Step | Full repo sync — reads every install script, skill file, and doc in the repo, finds every inconsistency between the code and the documentation, and fixes all of it. Run this any time you've made changes to a repo and need the README, cheatsheet, and all other docs to reflect reality |
 
 
-> These are **explicit triggers** — you type the command to activate the skill. This is different from the auto-triggered tools below, which respond to natural language. Exception: `/w4w` also works without the slash — just type `w4w` anywhere in your message. `/rmini` is the compact version of `/rswarm` — 5 agents instead of 15. `/safetycheck` also works in natural language.
+> These are **explicit triggers** — you type the command to activate the skill. This is different from the auto-triggered tools below, which respond to natural language. Exception: `/w4w` also works without the slash — just type `w4w` anywhere in your message. `/rmini` is the compact version of `/rswarm` — 5 agents instead of 15. `/safetycheck` also works in natural language ("run a safety check"). `/gitfix` also works in natural language ("fix the github", "sync the repo", "update the readme").
 
 ---
 

README.md

@@ -0,0 +1,149 @@
+# Git Fix — Full Repo Sync
+
+When this skill is invoked, perform a comprehensive audit of the current GitHub repository — reading every relevant local file, cross-referencing all documentation, and fixing every inconsistency so the repo is fully in sync.
+
+## Invocation
+
+This skill activates when the user types `/gitfix`, or says "gitfix", "fix the github", "sync the repo", "update the readme", "the github is out of date", or "make sure the repo matches the code".
+
+## What This Skill Does
+
+`/gitfix` is a full-repo consistency pass. It reads everything — install scripts, skill files, config files, the README, the cheatsheet, troubleshooting sections, tables, step descriptions, and any other documentation — and fixes every place where the docs don't match reality.
+
+This is not a partial update. When `/gitfix` runs, every section of every doc file gets checked against the actual state of the repo.
+
+## Execution
+
+### Phase 1 — Understand the Repo Structure
+
+Before reading any file, build a complete map of the repo:
+
+1. List all top-level directories and files
+2. For each `step-*/`, `bonus-*/`, `gitfix-skill/`, and other feature folders, list their contents
+3. Note every install script (`*.sh`), skill file (`SKILL.md`), and documentation file (`*.md`)
+4. Identify the primary documentation files: `README.md`, `CHEATSHEET.md`, `SECURITY.md`, and any files in `README-SECTIONS/` or `docs/`
+
+Do not skip any folder. The map must be complete before Phase 2 begins.
+
+### Phase 2 — Read Everything
+
+Read every file that could affect documentation accuracy:
+
+**Install scripts** — Read each `step-*/install*.sh` and `step-final/step-final-install.sh`:
+- What does each step actually install?
+- What commands, aliases, or scripts does it create?
+- What credentials or prerequisites does it require?
+- What are the exact command names (aliases, scripts in `~/.local/bin/`, etc.)?
+
+**Skill files** — Read every `*/SKILL.md` and `~/.claude/skills/*/SKILL.md`:
+- What is the skill's invocation trigger?
+- What does it do?
+- Which step installs it?
+
+**The one-shot script** (`update.sh`) — Read it completely:
+- Which steps does it run?
+- Which steps are skipped in non-interactive mode and why?
+- What does it print at the end?
+
+**Bonus scripts** — Read `bonus-*/`:
+- What do they install?
+- Are they optional or required?
+
+**Config and utility files** — Read `uninstall.sh`, any files in `docs/`, `README-SECTIONS/`, `templates/`, and `tests/` that contain documentation-relevant content.
+
+### Phase 3 — Read All Documentation
+
+Read the full content of every documentation file:
+
+- `README.md` — every section: Quick Nav, overview blurbs, step-by-step sections, troubleshooting, "You're Ready", Installation Order table, Staying Up to Date, Appendix
+- `CHEATSHEET.md` — every table and section
+- `SECURITY.md` — verify it reflects current security practices
+- Any `.md` files in `README-SECTIONS/`, `docs/`, or bonus folders
+
+Read them fully. Do not skim.
+
+### Phase 4 — Cross-Reference and Find Every Gap
+
+Compare what the code actually does (Phase 2) against what the docs say (Phase 3). Find every discrepancy:
+
+**Step descriptions** — Does the README describe each step accurately?
+- Correct name and number?
+- Correct description of what it installs?
+- Correct time estimate?
+- Correct prerequisites?
+
+**Quick nav table** — Does it list every step, bonus, and section that exists?
+
+**Install commands in docs** — Are all `curl` install commands accurate? Do they point to the right script paths?
+
+**Command tables** — Does the cheatsheet list every alias, script, and command that step-1 actually installs? (`cskip`, `cc`, `ccr`, `ccc`, `ctg`, `cbrain`, `cbraintg` — check all)
+
+**Skills table** — Does the cheatsheet list every skill? Is the "Installed in" column accurate for each?
+
+**Step detail sections** — For each step's full section in the README:
+- Do the tool descriptions match what's actually installed?
+- Are the "What it does" bullet points accurate?
+- Are any new tools missing?
+- Are any removed tools still listed?
+
+**Troubleshooting section** — Is every known issue documented? Are the fix instructions accurate?
+
+**One-shot / update.sh coverage** — Does `update.sh` run every step? Are any new steps missing from it?
+
+**Installation Order table** — Does it list every step including any added since it was last updated?
+
+**"You're Ready" section** — Is the daily command still `cbrain`? Are the command descriptions accurate?
+
+**CHEATSHEET auto-triggered tools table** — Does it reflect the actual MCP servers installed across all steps?
+
+**Cross-references between docs** — Does the README point to the right section anchors? Do links resolve?
+
+### Phase 5 — Fix Everything
+
+Fix every gap found in Phase 4. Apply edits in this order:
+
+1. Quick nav table — add/remove/correct entries
+2. Overview blurbs — update step descriptions to match reality
+3. Step detail sections — fix tool descriptions, add missing tools, remove stale ones
+4. Troubleshooting — add missing issues, update stale fix instructions
+5. CHEATSHEET command table — sync with actual aliases and scripts
+6. CHEATSHEET skills table — add new skills, update install step references
+7. CHEATSHEET auto-triggered tools — sync with actual MCP servers
+8. Installation Order table — ensure all steps listed
+9. "You're Ready" section — verify accuracy
+10. `update.sh` — add any missing step calls, fix any stale step references
+11. Any other file where a discrepancy was found
+
+For each fix, make the edit precisely. Do not rewrite sections that are already accurate. Do not add padding or filler. Match the existing tone and formatting exactly.
+
+### Phase 6 — Verify and Report
+
+After all fixes are applied:
+
+1. Re-read the modified sections to confirm edits are correct
+2. Check that no new inconsistencies were introduced
+3. Produce a concise summary report:
+
+```
+/gitfix complete
+
+Fixed:
+- [list each change made, one line each]
+
+Verified (no changes needed):
+- [list sections that were checked and already accurate]
+
+Watch list (could not verify — manual check recommended):
+- [anything that requires human judgment or external verification]
+```
+
+Do not produce the report until all fixes are applied. The report is the last thing output.
+
+## Rules
+
+- **Read before fixing.** Never edit a file you haven't fully read in this session.
+- **Precision over coverage.** A precise fix to the right line is better than a sweeping rewrite of a section.
+- **Match the existing style.** Every repo has a voice. Match it. Don't introduce new formatting patterns.
+- **No invented content.** If you don't know the current state of something, read the file. Don't guess.
+- **Flag what you can't verify.** If something requires running a command or checking an external URL, flag it in the Watch list rather than silently skipping it.
+- **Touch every section.** The value of `/gitfix` is that nothing gets missed. If a section is fine, say so in the report. If it's wrong, fix it.

gitfix-skill/SKILL.md

@@ -234,7 +234,6 @@ install_claude_code() {
     fi
     for alias_line in \
         "alias cskip='claude --dangerously-skip-permissions'" \
-        "alias ctg='claude --dangerously-skip-permissions --channels plugin:telegram@claude-plugins-official'" \
         "alias cc='claude'" \
         "alias ccr='claude --resume'" \
         "alias ccc='claude --continue'"; do
@@ -247,7 +246,13 @@ install_claude_code() {
     if [ "$ALIASES_ADDED" -gt 0 ]; then
         success "Added $ALIASES_ADDED new shortcut(s) to $SHELL_RC"
     else
-        success "All shortcuts already configured (cskip, ctg, cc, ccr, ccc)"
+        success "All shortcuts already configured (cskip, cc, ccr, ccc)"
+    fi
+
+    # Migrate old ctg alias → script (alias can't do token check; script can)
+    if grep -q 'alias ctg=' "$SHELL_RC" 2>/dev/null; then
+        sed -i.bak '/alias ctg=/d' "$SHELL_RC"
+        info "Removed old ctg alias from $SHELL_RC (replaced by ~/.local/bin/ctg)"
     fi
 
     # Add ~/.local/bin to PATH if not already present
@@ -288,11 +293,53 @@ CBRAIN_EOF
     chmod +x "$HOME/.local/bin/cbrain"
     success "cbrain command installed to ~/.local/bin/cbrain"
 
+    # Install ctg command (Telegram + skip-permissions, any directory)
+    info "Installing ctg command to ~/.local/bin..."
+    cat > "$HOME/.local/bin/ctg" << 'CTG_EOF'
+#!/usr/bin/env bash
+# ctg — Launch Claude Code with Telegram channel + dangerously-skip-permissions
+# Checks for a valid bot token before launching to avoid an infinite warning loop
+
+TOKEN_FILE="$HOME/.claude/channels/telegram/.env"
+
+if [ ! -f "$TOKEN_FILE" ] || ! grep -q 'TELEGRAM_BOT_TOKEN=.\+' "$TOKEN_FILE" 2>/dev/null; then
+  echo ""
+  echo "Telegram bot token not configured."
+  echo "Run Step 8 to set it up:"
+  echo ""
+  echo "  bash <(curl -fsSL https://raw.githubusercontent.com/lorecraft-io/cli-maxxing/main/step-8/step-8-install.sh)"
+  echo ""
+  echo "Or use 'cskip' to launch Claude without Telegram."
+  echo ""
+  exit 1
+fi
+
+exec claude --dangerously-skip-permissions --channels plugin:telegram@claude-plugins-official "$@"
+CTG_EOF
+    chmod +x "$HOME/.local/bin/ctg"
+    success "ctg command installed to ~/.local/bin/ctg"
+
     # Install cbraintg command (cbrain + Telegram channel)
     info "Installing cbraintg command to ~/.local/bin..."
     cat > "$HOME/.local/bin/cbraintg" << 'CBRAINTG_EOF'
 #!/usr/bin/env bash
 # cbraintg — Launch Claude Code in 2ndBrain vault with full permissions + Telegram
+# Checks for a valid bot token before launching to avoid an infinite warning loop
+
+TOKEN_FILE="$HOME/.claude/channels/telegram/.env"
+
+if [ ! -f "$TOKEN_FILE" ] || ! grep -q 'TELEGRAM_BOT_TOKEN=.\+' "$TOKEN_FILE" 2>/dev/null; then
+  echo ""
+  echo "Telegram bot token not configured."
+  echo "Run Step 8 to set it up:"
+  echo ""
+  echo "  bash <(curl -fsSL https://raw.githubusercontent.com/lorecraft-io/cli-maxxing/main/step-8/step-8-install.sh)"
+  echo ""
+  echo "Or use 'cbrain' to launch without Telegram."
+  echo ""
+  exit 1
+fi
+
 for candidate in \
     "$HOME/Desktop/WORK/OBSIDIAN/2ndBrain" \
     "$HOME/Desktop/2ndBrain" \
@@ -374,14 +421,14 @@ run_self_test() {
 
     # Shell aliases
     ALIAS_PASS=0
-    ALIAS_TOTAL=5
-    for alias_name in cskip ctg cc ccr ccc; do
+    ALIAS_TOTAL=4
+    for alias_name in cskip cc ccr ccc; do
         if grep -q "alias ${alias_name}=" "$SHELL_RC" 2>/dev/null; then
             ALIAS_PASS=$((ALIAS_PASS + 1))
         fi
     done
     if [ "$ALIAS_PASS" -eq "$ALIAS_TOTAL" ]; then
-        success "TEST: shell aliases — all $ALIAS_TOTAL configured (cskip, ctg, cc, ccr, ccc)"
+        success "TEST: shell aliases — all $ALIAS_TOTAL configured (cskip, cc, ccr, ccc)"
         TEST_PASS=$((TEST_PASS + 1))
     else
         soft_fail "TEST: shell aliases — only $ALIAS_PASS/$ALIAS_TOTAL found in $SHELL_RC"
@@ -397,6 +444,15 @@ run_self_test() {
         TEST_FAIL=$((TEST_FAIL + 1))
     fi
 
+    # ctg command
+    if [ -x "$HOME/.local/bin/ctg" ]; then
+        success "TEST: ctg command — installed at ~/.local/bin/ctg"
+        TEST_PASS=$((TEST_PASS + 1))
+    else
+        soft_fail "TEST: ctg command — not found or not executable"
+        TEST_FAIL=$((TEST_FAIL + 1))
+    fi
+
     # cbraintg command
     if [ -x "$HOME/.local/bin/cbraintg" ]; then
         success "TEST: cbraintg command — installed at ~/.local/bin/cbraintg"