Merge origin/main into fix/security-hardening-phase2

Author: jamiepine

.githooks/pre-commit

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -euo pipefail
+
+mapfile -t staged_rust_files < <(git diff --cached --name-only --diff-filter=ACMR -- '*.rs')
+
+if [ "${#staged_rust_files[@]}" -eq 0 ]; then
+  exit 0
+fi
+
+if ! git diff --quiet -- "${staged_rust_files[@]}"; then
+  echo "pre-commit: staged Rust files have unstaged changes." >&2
+  echo "Please stage or stash those changes, then commit again." >&2
+  exit 1
+fi
+
+echo "pre-commit: running cargo fmt --all"
+cargo fmt --all
+
+git add -- "${staged_rust_files[@]}"

README.md

@@ -211,6 +211,31 @@ spacebot skill add anthropics/skills/pdf
 spacebot skill list
 ```
 
+### MCP Integration
+
+Connect workers to external [MCP](https://modelcontextprotocol.io/) (Model Context Protocol) servers for arbitrary tool access -- databases, APIs, SaaS products, custom integrations -- without native Rust implementations:
+
+- **Per-agent config** — each agent declares its own MCP servers in `config.toml`
+- **Both transports** — stdio (subprocess) for local tools, streamable HTTP for remote servers
+- **Automatic tool discovery** — tools are discovered via the MCP protocol and registered on worker ToolServers with namespaced names (`{server}_{tool}`)
+- **Automatic retry** — failed connections retry in the background with exponential backoff (5s initial, 60s cap, 12 attempts). A broken server never blocks agent startup
+- **Hot-reloadable** — add, remove, or change servers in config and they reconcile live
+- **API management** — full CRUD API under `/api/mcp/` for managing server definitions and monitoring connection status programmatically
+
+```toml
+[[mcp_servers]]
+name = "filesystem"
+transport = "stdio"
+command = "npx"
+args = ["-y", "@modelcontextprotocol/server-filesystem", "/workspace"]
+
+[[mcp_servers]]
+name = "sentry"
+transport = "http"
+url = "https://mcp.sentry.io"
+headers = { Authorization = "Bearer ${SENTRY_TOKEN}" }
+```
+
 ---
 
 ## How It Works
@@ -455,6 +480,7 @@ No server dependencies. Single binary. All data lives in embedded databases in a
 | [Messaging](docs/content/docs/(messaging)/messaging.mdx)         | Adapter architecture (Discord, Slack, Telegram, Twitch, Webchat, webhook) |
 | [Discord Setup](docs/content/docs/(messaging)/discord-setup.mdx) | Discord bot setup guide                                  |
 | [Browser](docs/content/docs/(features)/browser.mdx)              | Headless Chrome for workers                              |
+| [MCP](docs/content/docs/(features)/mcp.mdx)                      | External tool servers via Model Context Protocol         |
 | [OpenCode](docs/content/docs/(features)/opencode.mdx)            | OpenCode as a worker backend                             |
 | [Philosophy](docs/content/docs/(core)/philosophy.mdx)            | Why Rust                                                 |
 
@@ -476,8 +502,11 @@ Contributions welcome. Read [RUST_STYLE_GUIDE.md](RUST_STYLE_GUIDE.md) before wr
 
 1. Fork the repo
 2. Create a feature branch
-3. Make your changes
-4. Submit a PR
+3. Run `./scripts/install-git-hooks.sh` once (installs pre-commit formatting hook)
+4. Make your changes
+5. Submit a PR
+
+Formatting is still enforced in CI, but the hook catches it earlier by running `cargo fmt --all` before each commit.
 
 ---
 

docs/PRD-slack-enhancements.md

@@ -1,4 +1,4 @@
 {
   "title": "Features",
-  "pages": ["workers", "opencode", "tools", "browser", "cron", "skills", "ingestion"]
+  "pages": ["workers", "opencode", "tools", "mcp", "browser", "cron", "skills", "ingestion"]
 }