From 38fb2c2d966faf5f799fe95f6dbe1770f799bbb6 Mon Sep 17 00:00:00 2001
From: Brandon Barker <brandon.barker@gmail.com>
Date: Wed, 15 Apr 2026 17:15:53 -0400
Subject: [PATCH 1/2] docs for adding unison mcp for kiro

---
 docs/mcp.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/docs/mcp.md b/docs/mcp.md
index 7f688662a76..659b216e7b3 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -76,6 +76,46 @@ Restart `codex`; you should now be able to see the Unison MCP server by entering
 list-project-definitions, list-project-libraries, search-by-type, search-definitions-by-name, share-project-readme, share-project-search, typecheck-code, view-definitions
 ```
 
+#### Kiro CLI
+
+Kiro CLI supports MCP servers at both global and workspace scope.
+
+**Workspace scope** (recommended — scoped to this project):
+
+Create `.kiro/settings/mcp.json` in the project root:
+
+``` json
+{
+  "mcpServers": {
+    "unison": {
+      "command": "<path-to-ucm>",
+      "args": ["mcp"]
+    }
+  }
+}
+```
+
+**Global scope** (available in all projects):
+
+``` bash
+kiro-cli mcp add --name unison --command <path-to-ucm> --args mcp --scope global
+```
+
+If you're using a custom agent (e.g. defined in `~/.kiro/agents/my-agent.json`), workspace and global MCP servers are not automatically included. Instead, add the server directly to the agent's `mcpServers` block:
+
+``` json
+{
+  "mcpServers": {
+    "unison": {
+      "command": "<path-to-ucm>",
+      "args": ["mcp"]
+    }
+  }
+}
+```
+
+After saving, restart Kiro CLI. You can verify the server is loaded with `/mcp` in chat.
+
 ### Connecting to a running UCM executable (not recommended)
 
 If instead you wish to connect an agent to a running UCM executable you can use an HTTP MCP connection.

From 8fc4e2ae2ef404ef63ecc6dce26a9f609529b98c Mon Sep 17 00:00:00 2001
From: Brandon Barker <brandon.barker@gmail.com>
Date: Wed, 15 Apr 2026 17:54:18 -0400
Subject: [PATCH 2/2] consolidate

---
 docs/mcp.md | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/docs/mcp.md b/docs/mcp.md
index 659b216e7b3..a5a77544828 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -101,18 +101,7 @@ Create `.kiro/settings/mcp.json` in the project root:
 kiro-cli mcp add --name unison --command <path-to-ucm> --args mcp --scope global
 ```
 
-If you're using a custom agent (e.g. defined in `~/.kiro/agents/my-agent.json`), workspace and global MCP servers are not automatically included. Instead, add the server directly to the agent's `mcpServers` block:
-
-``` json
-{
-  "mcpServers": {
-    "unison": {
-      "command": "<path-to-ucm>",
-      "args": ["mcp"]
-    }
-  }
-}
-```
+If you're using a custom agent (e.g. defined in `~/.kiro/agents/my-agent.json`), workspace and global MCP servers are not automatically included. Instead, add the same `mcpServers` entry above directly to the agent's JSON config file.
 
 After saving, restart Kiro CLI. You can verify the server is loaded with `/mcp` in chat.