feat: add Kiro CLI agent support (#958)

* feat: add Kiro CLI agent support

Register Kiro CLI (kiro-cli) as a built-in agent with:
- Detection via `which kiro-cli`
- YOLO mode via `--trust-all-tools` flag
- Session resume via `--resume-id` flag
- Hook-based status detection via a dedicated agent config file
  (~/.kiro/agents/aoe-hooks.json) using Kiro's native hook format
  (lowercase event names, flat {command} objects)
- Container config mount for ~/.kiro (syncs agents, steering, prompts,
  and settings dirs into sandbox)
- Kiro CLI installed in the sandbox Docker image

Docs updated: README, docs/index.md, docs/guides/sandbox.md.

Closes #951

* fix(kiro): wire status hooks for sandbox sessions and isolate kiro-cli side effect

Three review fixes from PR #958:

1. Sandboxed Kiro sessions had no hook status volume mount and no
   per-instance aoe-hooks.json install (the host kiro path was gated on
   !is_sandboxed but no sandbox branch existed). Add a kiro_hooks
   special-case alongside hermes_hooks in build_container_config so the
   sidecar dir is mounted and the agent config is materialized inside
   the sandbox dir.

2. install_kiro_hooks shelled out to `kiro-cli` unconditionally, which
   meant cargo test mutated the developer's real default Kiro agent on
   any machine with kiro-cli installed. Split into pure file IO
   (install_kiro_hooks) and a separate set_kiro_default_agent_if_builtin
   that the host install path calls explicitly.

3. Update the stale comment in agents.rs that referred to "until a
   Kiro-specific hook installer is added"; the installer is here.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(kiro): use structured JSON output for default agent detection

Switch set_kiro_default_agent_if_builtin from substring-matching plain
text output to using `kiro-cli settings --format json`, which returns
`null` (unset), `"kiro_default"` (built-in), or `"custom-name"`
(user-chosen). Eliminates false matches on agent names containing
'kiro_default' or 'not set' as substrings.

Fixes #962

---------

Co-authored-by: Jason Knaster <jason.knaster@infor.com>
Co-authored-by: njbrake <nathan@mozilla.ai>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: 4 people

README.md

@@ -33,7 +33,7 @@ Running one AI agent is easy. Running five of them across different branches, ke
 
 ## Features
 
-- **Multi-agent support**: Claude Code, OpenCode, Mistral Vibe, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi.dev, Factory Droid, and Hermes
+- **Multi-agent support**: Claude Code, OpenCode, Mistral Vibe, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi.dev, Factory Droid, Hermes, and Kiro CLI
 - **TUI app**: visual interface to create, monitor, and manage sessions
 - **Web app** (Beta, stabilization in progress): create, monitor, and control your agents from any browser, installable as a PWA ([guide](docs/guides/web-dashboard.md))
 - **CLI app**: create, monitor, and control agents from the command line (integrates with tools like OpenClaw)
@@ -112,7 +112,7 @@ Nothing. Sessions are tmux sessions running in the background. Open and close `a
 
 ### Which AI tools are supported?
 
-Claude Code, OpenCode, Mistral Vibe, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi.dev, Factory Droid, and Hermes. AoE auto-detects which are installed on your system.
+Claude Code, OpenCode, Mistral Vibe, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi.dev, Factory Droid, Hermes, and Kiro CLI. AoE auto-detects which are installed on your system.
 
 ### Can I use AoE over SSH?
 

docker/Dockerfile

@@ -1,5 +1,5 @@
 # aoe-sandbox: Docker image for Agent of Empires sandbox sessions
-# This image provides Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, and Pi in an isolated environment
+# This image provides Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi, and Kiro CLI in an isolated environment
 
 FROM ubuntu:24.04
 
@@ -58,6 +58,9 @@ RUN npm install -g @github/copilot
 # Install Pi (pi.dev)
 RUN npm install -g @mariozechner/pi-coding-agent
 
+# Install Kiro CLI (AWS)
+RUN curl -fsSL https://cli.kiro.dev/install | bash
+
 # Create directories for credential mounts
 RUN mkdir -p /root/.claude \
     /root/.config/opencode \
@@ -70,6 +73,7 @@ RUN mkdir -p /root/.claude \
     /root/.copilot \
     /root/.pi \
     /root/.factory \
+    /root/.kiro \
     /root/.ssh
 
 # Allow Claude Code to use --dangerously-skip-permissions as root

docker/Dockerfile.dev

@@ -1,7 +1,7 @@
 # aoe-dev-sandbox: Extended sandbox with development tools
 # Includes: Rust, uv (Python), nvm + Node.js, pnpm, bun, gh (GitHub CLI)
 # Note: Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI,
-# Cursor CLI, Copilot CLI, and Pi are inherited from the base image
+# Cursor CLI, Copilot CLI, Pi, and Kiro CLI are inherited from the base image
 
 ARG BASE_IMAGE=ghcr.io/njbrake/aoe-sandbox:latest
 FROM ${BASE_IMAGE}

docs/guides/sandbox.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-Docker sandboxing runs your AI coding agents (Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi) inside isolated Docker containers while maintaining access to your project files and credentials.
+Docker sandboxing runs your AI coding agents (Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi, Kiro CLI) inside isolated Docker containers while maintaining access to your project files and credentials.
 
 > **Linux users:** AoE also supports [Podman](podman.md) as a daemonless, rootless-friendly alternative to Docker.
 >
@@ -192,7 +192,7 @@ AOE provides two official sandbox images:
 
 | Image | Description |
 |-------|-------------|
-| `ghcr.io/njbrake/aoe-sandbox:latest` | Base image with Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi, git, ripgrep, fzf |
+| `ghcr.io/njbrake/aoe-sandbox:latest` | Base image with Claude Code, OpenCode, Mistral Vibe, Hermes, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi, Kiro CLI, git, ripgrep, fzf |
 | `ghcr.io/njbrake/aoe-dev-sandbox:latest` | Extended image with additional dev tools |
 
 ### Dev Sandbox Tools

docs/index.md

@@ -35,7 +35,7 @@ allowfullscreen
 
 ## Supported Agents
 
-Claude Code, OpenCode, Mistral Vibe, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi, Factory Droid, and Hermes. AoE auto-detects which are installed.
+Claude Code, OpenCode, Mistral Vibe, Codex CLI, Gemini CLI, Cursor CLI, Copilot CLI, Pi, Factory Droid, Hermes, and Kiro CLI. AoE auto-detects which are installed.
 
 <div class="cta-box">
 <p><strong>Ready to get started?</strong></p>

src/agents.rs

@@ -358,6 +358,27 @@ pub const AGENTS: &[AgentDef] = &[
         install_hint:
             "curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash",
     },
+    AgentDef {
+        name: "kiro",
+        binary: "kiro-cli",
+        aliases: &["kiro-cli"],
+        detection: DetectionMethod::Which("kiro-cli"),
+        yolo: Some(YoloMode::CliFlag("--trust-all-tools")),
+        instruction_flag: None,
+        set_default_command: false,
+        detect_status: status_detection::detect_kiro_status,
+        container_env: &[("KIRO_CONFIG_DIR", "/root/.kiro")],
+        // Kiro uses a per-agent JSON config (lowercase event names, flat
+        // {command} objects) rather than the JSON settings.json schema shared
+        // by Claude/Cursor/Gemini, so hook_config: None and install is
+        // special-cased like hermes/settl. Status comes from the hook sidecar
+        // file written by install_kiro_hooks; the pane stub is unused.
+        hook_config: None,
+        resume_strategy: ResumeStrategy::Flag("--resume-id"),
+        host_only: false,
+        send_keys_enter_delay_ms: 0,
+        install_hint: "curl -fsSL https://cli.kiro.dev/install | bash",
+    },
 ];
 
 /// Look up an agent by canonical name.
@@ -441,6 +462,7 @@ mod tests {
         assert_eq!(get_agent("droid").unwrap().binary, "droid");
         assert_eq!(get_agent("settl").unwrap().binary, "settl");
         assert_eq!(get_agent("hermes").unwrap().binary, "hermes");
+        assert_eq!(get_agent("kiro").unwrap().binary, "kiro-cli");
     }
 
     #[test]
@@ -472,7 +494,7 @@ mod tests {
             names,
             vec![
                 "claude", "opencode", "vibe", "codex", "gemini", "cursor", "copilot", "pi",
-                "droid", "settl", "hermes"
+                "droid", "settl", "hermes", "kiro"
             ]
         );
     }
@@ -494,6 +516,8 @@ mod tests {
         assert_eq!(resolve_tool_name("settlers"), Some("settl"));
         assert_eq!(resolve_tool_name("catan"), Some("settl"));
         assert_eq!(resolve_tool_name("hermes"), Some("hermes"));
+        assert_eq!(resolve_tool_name("kiro"), Some("kiro"));
+        assert_eq!(resolve_tool_name("kiro-cli"), Some("kiro"));
         assert_eq!(resolve_tool_name(""), Some("claude"));
         assert_eq!(resolve_tool_name("agent"), Some("cursor"));
         assert_eq!(resolve_tool_name("unknown-tool"), None);
@@ -510,6 +534,7 @@ mod tests {
         assert_eq!(settings_index_from_name(Some("droid")), 9);
         assert_eq!(settings_index_from_name(Some("settl")), 10);
         assert_eq!(settings_index_from_name(Some("hermes")), 11);
+        assert_eq!(settings_index_from_name(Some("kiro")), 12);
 
         assert_eq!(name_from_settings_index(0), None);
         assert_eq!(name_from_settings_index(1), Some("claude"));
@@ -520,6 +545,7 @@ mod tests {
         assert_eq!(name_from_settings_index(9), Some("droid"));
         assert_eq!(name_from_settings_index(10), Some("settl"));
         assert_eq!(name_from_settings_index(11), Some("hermes"));
+        assert_eq!(name_from_settings_index(12), Some("kiro"));
         assert_eq!(name_from_settings_index(99), None);
     }
 
@@ -542,6 +568,7 @@ mod tests {
         assert_eq!(send_keys_enter_delay("claude"), 0);
         assert_eq!(send_keys_enter_delay("opencode"), 0);
         assert_eq!(send_keys_enter_delay("hermes"), 0);
+        assert_eq!(send_keys_enter_delay("kiro"), 0);
         assert_eq!(send_keys_enter_delay("unknown_agent"), 0);
     }
 
@@ -582,6 +609,10 @@ mod tests {
             install_hint("hermes"),
             Some("curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash")
         );
+        assert_eq!(
+            install_hint("kiro"),
+            Some("curl -fsSL https://cli.kiro.dev/install | bash")
+        );
         assert!(install_hint("unknown").is_none());
     }
 }