From 8b4c65420473fdfc475e7b976781a7141774416b Mon Sep 17 00:00:00 2001
From: Igor Costa <igor@autohand.ai>
Date: Thu, 15 Oct 2026 19:12:49 +1300
Subject: [PATCH] Document Autohand Code MCP setup with OAuth bridge

---
 .github/ISSUE_TEMPLATE/bug_report.yml |  1 +
 README.md                             | 30 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 031cda78..e9f07db2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -18,6 +18,7 @@ body:
         - Cursor
         - Windsurf
         - VS Code (Copilot)
+        - Autohand Code CLI
         - Other (please specify below)
     validations:
       required: true
diff --git a/README.md b/README.md
index dbdc2b17..4eabbd80 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,36 @@ Create a [Cloudflare API token](https://dash.cloudflare.com/profile/api-tokens)
 | MCP URL      | `https://mcp.cloudflare.com/mcp`                                            |
 | Bearer Token | Your [Cloudflare API Token](https://dash.cloudflare.com/profile/api-tokens) |
 
+### Autohand Code
+
+Install [Autohand Code CLI](https://autohand.ai/code/cli/) and register this server using [`mcp-remote`](https://github.com/geelen/mcp-remote), which handles OAuth for the stdio connection:
+
+```sh
+npm install -g autohand-cli
+autohand mcp add cloudflare npx -y mcp-remote https://mcp.cloudflare.com/mcp
+```
+
+Start `autohand` and complete the Cloudflare authorization flow in your browser. Use `/mcp` to check the connection and `/mcp list` to view the available tools. The configuration is saved in `~/.autohand/config.json` by default; the OAuth bridge manages credentials separately.
+
+Autohand uses `mcp.servers` rather than the `mcpServers` object shown above. To configure it manually, merge this server entry into your existing `mcp.servers` array:
+
+```json
+{
+  "mcp": {
+    "servers": [
+      {
+        "name": "cloudflare",
+        "transport": "stdio",
+        "command": "npx",
+        "args": ["-y", "mcp-remote", "https://mcp.cloudflare.com/mcp"]
+      }
+    ]
+  }
+}
+```
+
+See [Autohand's MCP documentation](https://github.com/autohandai/code-cli/blob/main/docs/mcp.md) for configuration details and [Cloudflare Skills](https://github.com/cloudflare/skills#autohand-code) for installing local skills.
+
 ### Disable Code Mode
 
 If your MCP client already uses code mode, or you're composing this server with another server that uses code mode, you can disable it with the `?codemode=false` query parameter. This registers an individual tool for each of the ~2,500 Cloudflare API endpoints instead of the code mode API tools. The `docs` and `whoami` tools remain available in both modes.