Resolve merge conflicts: use ediscord alias and detailed usage from master

- Accept master version with ediscord alias
- Keep detailed usage examples section
- Resolve all merge conflicts

Author: jmjava

README.md

@@ -60,7 +60,7 @@ See [CONFIGURATION.md](CONFIGURATION.md) for detailed configuration options.
 | **Generate daily checklist**   | `echecklist`                  |
 | **Catch up after break**       | `ecatchup`                    |
 | **Embabel repo summaries**     | `esummary`                    |
-| **Sync Discord messages**      | `./discord-sync/sync-discord.sh --channel ID --after DATE` |
+| **Sync Discord messages**     | `ediscord --channel ID --after DATE` |
 
 ## 🚀 Quick Start (5 minutes)
 
@@ -188,10 +188,10 @@ embabel-learning/
 
 ### Discord Integration
 
-| Script/Tool                    | Description                                                          |
-| ------------------------------ | -------------------------------------------------------------------- |
-| `discord-sync/sync-discord.sh` | Export and summarize Discord messages with filtering options          |
-|                                | See [discord-sync/README.md](discord-sync/README.md) for full docs   |
+| Script/Tool                    | Alias     | Description                                                          |
+| ------------------------------ | --------- | -------------------------------------------------------------------- |
+| `discord-sync/sync-discord.sh` | `ediscord` | Export and summarize Discord messages with filtering options          |
+|                                |           | See [discord-sync/README.md](discord-sync/README.md) for full docs   |
 
 **Features:**
 - Date range filtering (`--after`, `--before`)
@@ -203,9 +203,7 @@ embabel-learning/
 **Quick Example:**
 ```bash
 # Export today's messages
-./discord-sync/sync-discord.sh \
-  --channel YOUR_CHANNEL_ID \
-  --after "2026-01-25"
+ediscord --channel YOUR_CHANNEL_ID --after "2026-01-25"
 ```
 
 ### Navigation & Workspace
@@ -321,6 +319,71 @@ cd ~/github/jmjava/guide
 git diff upstream/main
 ```
 
+### Syncing Discord Messages
+
+Export and summarize Discord messages from channels you're a member of:
+
+```bash
+# Basic: Export today's messages
+ediscord --channel YOUR_CHANNEL_ID --after "2026-01-25"
+
+# With date range
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25T00:00:00" \
+  --before "2026-01-26T00:00:00"
+
+# Filter by specific users
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25" \
+  --username "alice" \
+  --username "bob"
+
+# Filter by topics/keywords
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25" \
+  --topic "embabel" \
+  --topic "agent"
+
+# Combined filters (users AND topics)
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25" \
+  --username "alice" \
+  --topic "embabel"
+
+# Different output formats
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25" \
+  --format json    # Default, enables summary generation
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25" \
+  --format txt     # Plain text
+ediscord --channel YOUR_CHANNEL_ID \
+  --after "2026-01-25" \
+  --format html    # HTML format
+
+# Get help
+ediscord --help
+```
+
+**Finding Your Channel ID:**
+1. Enable Developer Mode in Discord (User Settings → Advanced → Developer Mode)
+2. Right-click on the channel
+3. Select "Copy ID"
+
+**Output Files:**
+- Exports saved to: `exports/discord/`
+- JSON exports automatically generate summary markdown files with:
+  - Statistics (message count, unique authors, date range)
+  - Top contributors
+  - Recent messages
+  - Topic analysis
+  - Media & links count
+
+**Configuration:**
+Set `DISCORD_TOKEN` in your `.env` file (see [discord-sync/README.md](discord-sync/README.md) for token setup instructions).
+
+See [discord-sync/README.md](discord-sync/README.md) for complete documentation.
+
 ## 🎓 Learning Resources
 
 ### Documentation
@@ -377,21 +440,18 @@ For exporting and summarizing Discord messages:
 
 ```bash
 # Export messages from a channel
-./discord-sync/sync-discord.sh \
-  --channel YOUR_CHANNEL_ID \
+ediscord --channel YOUR_CHANNEL_ID \
   --after "2026-01-25" \
   --before "2026-01-26"
 
 # Filter by username
-./discord-sync/sync-discord.sh \
-  --channel YOUR_CHANNEL_ID \
+ediscord --channel YOUR_CHANNEL_ID \
   --after "2026-01-25" \
   --username "alice" \
   --username "bob"
 
 # Filter by topic
-./discord-sync/sync-discord.sh \
-  --channel YOUR_CHANNEL_ID \
+ediscord --channel YOUR_CHANNEL_ID \
   --after "2026-01-25" \
   --topic "embabel" \
   --topic "agent"

scripts/setup-aliases.sh

@@ -83,6 +83,7 @@ alias epush='$SCRIPT_DIR/safe-push.sh'
 alias ereset='$SCRIPT_DIR/reset-to-upstream.sh'
 alias elearn='cd $LEARNING_DIR'
 alias eworkspace='$SCRIPT_DIR/open-workspace.sh'
+alias ediscord='$LEARNING_DIR/discord-sync/sync-discord.sh'
 ${REPO_ALIASES}
 # Git shortcuts
 alias gst='git status'
@@ -124,6 +125,7 @@ echo "  epush      - Safe push with GitGuardian & pre-commit checks"
 echo "  ereset     - Reset fork to match upstream (discards local changes)"
 echo "  elearn     - cd to learning workspace"
 echo "  eworkspace - Open multi-repo workspace in Cursor"
+echo "  ediscord   - Sync and summarize Discord messages (use --help for options)"
 if [ -n "$MONITOR_REPOS" ]; then
     echo "  Repo aliases:"
     for repo in $MONITOR_REPOS; do