diff --git a/kiro/agent.json b/kiro/agent.json
new file mode 100644
index 000000000..12a91366e
--- /dev/null
+++ b/kiro/agent.json
@@ -0,0 +1,32 @@
+{
+  "id": "kiro",
+  "name": "Kiro CLI",
+  "version": "2.20.1",
+  "description": "An agentic coding assistant with spec-driven development, MCP, and Agent Skills",
+  "repository": "https://github.com/kirodotdev/Kiro",
+  "website": "https://kiro.dev/docs/cli/acp/",
+  "authors": [
+    "Kiro"
+  ],
+  "license": "proprietary",
+  "distribution": {
+    "binary": {
+      "linux-x86_64": {
+        "archive": "https://prod.download.cli.kiro.dev/stable/2.20.1/kirocli-x86_64-linux.tar.gz",
+        "sha256": "db3d20a96d7ceddc414d3e689762ac7d62277f5463da2bcd6167e4055320bd0c",
+        "cmd": "./kirocli/bin/kiro-cli",
+        "args": [
+          "acp"
+        ]
+      },
+      "linux-aarch64": {
+        "archive": "https://prod.download.cli.kiro.dev/stable/2.20.1/kirocli-aarch64-linux.tar.gz",
+        "sha256": "e999055bd515db2cca4ebe1bf3a5f6fe1dc10c5e40c180c790ea51c0efddd860",
+        "cmd": "./kirocli/bin/kiro-cli",
+        "args": [
+          "acp"
+        ]
+      }
+    }
+  }
+}
diff --git a/kiro/icon.svg b/kiro/icon.svg
new file mode 100644
index 000000000..0b1397583
--- /dev/null
+++ b/kiro/icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="currentColor" fill-rule="evenodd" d="M3.6 2.5h8.8A2.6 2.6 0 0 1 15 5.1v5.8a2.6 2.6 0 0 1-2.6 2.6H3.6A2.6 2.6 0 0 1 1 10.9V5.1A2.6 2.6 0 0 1 3.6 2.5Zm2.55 3.05c-.62 0-.95.85-.95 1.75s.33 1.75.95 1.75.95-.85.95-1.75-.33-1.75-.95-1.75Zm3.7 0c-.62 0-.95.85-.95 1.75s.33 1.75.95 1.75.95-.85.95-1.75-.33-1.75-.95-1.75Z" clip-rule="evenodd"/>
+</svg>