diff --git a/README.md b/README.md
index af4e9bf..dbc2f93 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,7 @@ The only prerequisite is the underlying coding agent you want to use:
 - `acpx claude` -> Claude Code: https://claude.ai/code
 - `acpx gemini` -> Gemini CLI: https://github.com/google/gemini-cli
 - `acpx opencode` -> OpenCode: https://opencode.ai
+- `acpx kiro` -> Kiro CLI: https://kiro.dev
 - `acpx pi` -> Pi Coding Agent: https://github.com/mariozechner/pi
 
 ## Usage examples
diff --git a/src/agent-registry.ts b/src/agent-registry.ts
index c022c36..e2b6bfb 100644
--- a/src/agent-registry.ts
+++ b/src/agent-registry.ts
@@ -3,6 +3,7 @@ export const AGENT_REGISTRY: Record<string, string> = {
   claude: "npx -y @zed-industries/claude-agent-acp",
   gemini: "gemini",
   opencode: "npx -y opencode-ai acp",
+  kiro: "kiro-cli acp",
   pi: "npx pi-acp",
 };
 
diff --git a/test/agent-registry.test.ts b/test/agent-registry.test.ts
index 45dbd62..dcc28c4 100644
--- a/test/agent-registry.test.ts
+++ b/test/agent-registry.test.ts
@@ -12,6 +12,7 @@ test("resolveAgentCommand maps known agents to commands", () => {
     ["claude", "npx -y @zed-industries/claude-agent-acp"],
     ["gemini", "gemini"],
     ["opencode", "npx -y opencode-ai acp"],
+    ["kiro", "kiro-cli acp"],
     ["pi", "npx pi-acp"],
   ]);
 
@@ -24,12 +25,12 @@ test("resolveAgentCommand returns raw value for unknown agents", () => {
   assert.equal(resolveAgentCommand("custom-acp-server"), "custom-acp-server");
 });
 
-test("listBuiltInAgents returns exactly all 5 registered agent names", () => {
+test("listBuiltInAgents returns exactly all 6 registered agent names", () => {
   const agents = listBuiltInAgents();
-  assert.equal(agents.length, 5);
+  assert.equal(agents.length, 6);
   assert.deepEqual(
     new Set(agents),
-    new Set(["codex", "claude", "gemini", "opencode", "pi"]),
+    new Set(["codex", "claude", "gemini", "kiro", "opencode", "pi"]),
   );
 });