diff --git a/docs/src/content/docs/setup/cli.md b/docs/src/content/docs/setup/cli.md
index d3192bd13b..2b4e0dfd96 100644
--- a/docs/src/content/docs/setup/cli.md
+++ b/docs/src/content/docs/setup/cli.md
@@ -517,13 +517,20 @@ gh aw pr transfer <pr-url> --repo target-owner/target-repo
 Run MCP server exposing gh-aw commands as tools. Spawns subprocesses to isolate GitHub tokens.
 
 ```bash wrap
-gh aw mcp-server              # stdio transport
-gh aw mcp-server --port 8080  # HTTP server with SSE
+gh aw mcp-server                      # stdio transport
+gh aw mcp-server --port 8080          # HTTP server with SSE
+gh aw mcp-server --validate-actor     # Enable actor validation
 ```
 
-**Options:** `--port`, `--cmd`
+**Options:**
+- `--port`: HTTP server port for SSE transport
+- `--cmd`: Custom command for subprocess execution
+- `--validate-actor`: Enforce actor validation for logs and audit tools
+
 **Available Tools:** status, compile, logs, audit, mcp-inspect, add, update
 
+**Actor Validation:** When `--validate-actor` is enabled, logs and audit tools require write+ repository access. The server uses `GITHUB_ACTOR` and `GITHUB_REPOSITORY` environment variables to validate permissions via GitHub API. Permission checks are cached for 1 hour.
+
 See [MCP Server Guide](/gh-aw/setup/mcp-server/).
 
 ### Utility Commands
diff --git a/docs/src/content/docs/setup/mcp-server.md b/docs/src/content/docs/setup/mcp-server.md
index 4cccb8c40a..a5dc05bdc8 100644
--- a/docs/src/content/docs/setup/mcp-server.md
+++ b/docs/src/content/docs/setup/mcp-server.md
@@ -31,6 +31,57 @@ Run with HTTP/SSE transport using `--port`:
 gh aw mcp-server --port 8080
 ```
 
+### Actor Validation
+
+Control access to logs and audit tools based on repository permissions using `--validate-actor`:
+
+```bash wrap
+gh aw mcp-server --validate-actor
+```
+
+When actor validation is enabled:
+- Logs and audit tools require write, maintain, or admin repository access
+- The server reads `GITHUB_ACTOR` and `GITHUB_REPOSITORY` environment variables to determine actor permissions
+- Permission checks are performed at runtime using the GitHub API
+- Results are cached for 1 hour to minimize API calls
+
+When actor validation is disabled (default):
+- All tools are available without permission checks
+- Backward compatible with existing configurations
+
+**Environment Variables:**
+- `GITHUB_ACTOR`: GitHub username of the current actor (required when validation enabled)
+- `GITHUB_REPOSITORY`: Repository in `owner/repo` format (optional, improves performance)
+
+**Permission Requirements:**
+
+Restricted tools (logs, audit) require:
+- Minimum role: write, maintain, or admin
+- Permission check via GitHub API: `GET /repos/{owner}/{repo}/collaborators/{username}/permission`
+
+**Error Handling:**
+
+When `GITHUB_ACTOR` is not set and validation is enabled:
+```json
+{
+  "error": "GITHUB_ACTOR environment variable not set",
+  "tool": "logs",
+  "reason": "This tool requires at least write access to the repository. Set GITHUB_ACTOR environment variable to enable access."
+}
+```
+
+When actor has insufficient permissions:
+```json
+{
+  "error": "insufficient repository permissions",
+  "actor": "username",
+  "repository": "owner/repo",
+  "role": "read",
+  "required": "write, maintain, or admin",
+  "reason": "Actor username has read access to owner/repo. This tool requires at least write access."
+}
+```
+
 ## Configuring with GitHub Copilot Agent
 
 Configure GitHub Copilot Agent to use gh-aw MCP server: