feat(shared): add Kiro CLI as a built-in terminal agent (#6765)

* feat(shared): add Kiro CLI as a built-in terminal agent

Adds AWS's Kiro CLI (`kiro-cli`) to BUILTIN_TERMINAL_AGENTS, with its
preset icon, README row, docs bullet, and marketing demo entry.

Rebased by hand from #3571 onto the current manifest shape: the prompt
launch now seeds the interactive chat via the `[INPUT]` positional
instead of `--no-interactive` (headless mode needs KIRO_API_KEY, which
most interactive users do not have), resume uses `--resume-id`, and the
headless form lives in nonInteractiveCommand.

Kiro runs as a plain terminal agent, same shape as Pi / Cursor Agent, so
no agent-setup target is needed.

Co-authored-by: Hyunwoo Kim <13450715+Kcrong@users.noreply.github.com>

Claude-Session: https://claude.ai/code/session_01DuAhw6Ao5Cru3acdkrzx9f

* feat(desktop): expose Kiro in the icon picker, settings search, and preset docs

Follow-ups from review on #6765: icon-picker entry so custom agents can pick the Kiro icon, settings-search keywords, and the terminal-presets doc line, matching kimi/grok.

Co-authored-by: Ishaan Bansal <35862574+bshaan77@users.noreply.github.com>

Claude-Session: https://claude.ai/code/session_01DuAhw6Ao5Cru3acdkrzx9f

Author: Kitenite

README.md

@@ -196,6 +196,7 @@ Superset works with any CLI-based coding agent, including:
 | <picture><source media="(prefers-color-scheme: dark)" srcset="packages/ui/src/assets/icons/preset-icons/copilot-white.svg" /><img height="16" align="top" alt="GitHub Copilot" src="packages/ui/src/assets/icons/preset-icons/copilot.svg" /></picture> &nbsp;[GitHub Copilot](https://github.com/features/copilot) | Fully supported |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="packages/ui/src/assets/icons/preset-icons/grok-white.svg" /><img height="16" align="top" alt="Grok" src="packages/ui/src/assets/icons/preset-icons/grok.svg" /></picture> &nbsp;[Grok](https://x.ai/) | Fully supported |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="packages/ui/src/assets/icons/preset-icons/kimi-white.svg" /><img height="16" align="top" alt="Kimi Code" src="packages/ui/src/assets/icons/preset-icons/kimi.svg" /></picture> &nbsp;[Kimi Code](https://www.kimi.com/) | Fully supported |
+| <img height="16" align="top" alt="Kiro" src="packages/ui/src/assets/icons/preset-icons/kiro.svg" /> &nbsp;[Kiro](https://kiro.dev/cli/) | Fully supported |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="packages/ui/src/assets/icons/preset-icons/mastracode-white.svg" /><img height="16" align="top" alt="Mastra Code" src="packages/ui/src/assets/icons/preset-icons/mastracode.svg" /></picture> &nbsp;[Mastra Code](https://mastra.ai/) | Fully supported |
 | <img height="16" align="top" alt="Mistral Vibe" src="packages/ui/src/assets/icons/preset-icons/vibe.svg" /> &nbsp;[Mistral Vibe](https://mistral.ai/) | Fully supported |
 | <picture><source media="(prefers-color-scheme: dark)" srcset="packages/ui/src/assets/icons/preset-icons/opencode-white.svg" /><img height="16" align="top" alt="OpenCode" src="packages/ui/src/assets/icons/preset-icons/opencode.svg" /></picture> &nbsp;[OpenCode](https://github.com/opencode-ai/opencode) | Fully supported |

apps/desktop/src/renderer/routes/_authenticated/settings/agents/components/V2AgentsSettings/components/AgentIconPicker/agent-icon-options.ts

@@ -22,4 +22,5 @@ export const AGENT_ICON_OPTIONS: readonly AgentIconOption[] = [
 	{ id: "vibe", label: "Mistral Vibe" },
 	{ id: "kimi", label: "Kimi Code" },
 	{ id: "grok", label: "Grok" },
+	{ id: "kiro", label: "Kiro" },
 ];

apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts

@@ -867,6 +867,8 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"moonshot",
 			"grok",
 			"xai",
+			"kiro",
+			"aws",
 		],
 	},
 	{
@@ -928,6 +930,8 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"moonshot",
 			"grok",
 			"xai",
+			"kiro",
+			"aws",
 		],
 	},
 	{

apps/docs/content/docs/agent-integration.mdx

@@ -25,6 +25,7 @@ Run AI coding agents in isolated workspaces. Each agent works independently with
 - **Cursor Agent** - Cursor AI agent
 - **Droid** - Factory's autonomous coding agent
 - **Polygraph** - Meta-harness with cross-repo visibility and persistent memory
+- **Kiro** - AWS's spec-driven CLI coding agent
 
 ## Chat
 

apps/docs/content/docs/terminal-presets.mdx

@@ -55,6 +55,7 @@ Pre-configured presets for popular AI agents. Defaults mirror the bundled Supers
 - **vibe** - `vibe --trust --auto-approve` (Mistral's coding agent; trust grants access to `AGENTS.md` and `.agents/skills/`)
 - **kimi** - `kimi` (Kimi Code CLI; prompt launches run with `kimi -p` and resume in the interactive TUI)
 - **grok** - `grok --always-approve` (xAI's Grok Build CLI; prompts seed the interactive session directly)
+- **kiro** - `kiro-cli chat --trust-all-tools` (AWS's Kiro CLI; prompts seed the interactive session directly)
 
 ## Preset Bar
 

apps/marketing/public/app-icons/kiro.svg

@@ -15,6 +15,7 @@ const AGENTS = [
 	{ name: "Mistral Vibe", icon: "/app-icons/vibe.svg", size: 18 },
 	{ name: "Kimi Code", icon: "/app-icons/kimi.svg", size: 18 },
 	{ name: "Grok CLI", icon: "/app-icons/grok.svg", size: 18 },
+	{ name: "Kiro", icon: "/app-icons/kiro.svg", size: 18 },
 ];
 
 export function UniversalCompatibilityDemo() {

apps/marketing/src/app/components/FeaturesSection/components/UniversalCompatibilityDemo/UniversalCompatibilityDemo.tsx

@@ -97,6 +97,34 @@ describe("kimi agent registration", () => {
 	});
 });
 
+describe("kiro agent registration", () => {
+	it("is a registered terminal agent with the right label", () => {
+		expect(AGENT_TYPES).toContain("kiro");
+		expect(AGENT_LABELS.kiro).toBe("Kiro");
+	});
+
+	it("seeds prompt launches into the interactive chat positionally", () => {
+		const command = buildAgentPromptCommand({
+			prompt: "hello",
+			randomId: "kiro-1234",
+			agent: "kiro",
+		});
+
+		expect(command).toStartWith(
+			"kiro-cli chat --trust-all-tools \"$(cat <<'SUPERSET_PROMPT_kiro1234'",
+		);
+		expect(command).toEndWith('\n)"');
+	});
+
+	it("derives host preset args and id-based resume from the base command", () => {
+		const preset = getPresetById("kiro");
+		expect(preset?.command).toBe("kiro-cli");
+		expect(preset?.args).toEqual(["chat", "--trust-all-tools"]);
+		expect(preset?.promptArgs).toEqual([]);
+		expect(preset?.resumeArgs).toEqual(["--resume-id"]);
+	});
+});
+
 describe("grok agent registration", () => {
 	it("is a registered terminal agent with the right label", () => {
 		expect(AGENT_TYPES).toContain("grok");

packages/shared/src/agent-command.test.ts

@@ -199,6 +199,15 @@ export const BUILTIN_TERMINAL_AGENTS = [
 		command: "polygraph session start",
 		promptCommand: "polygraph session start --",
 	}),
+	createBuiltinTerminalAgent({
+		id: "kiro",
+		label: "Kiro",
+		description:
+			"AWS's spec-driven coding agent for agentic workflows in the terminal.",
+		command: "kiro-cli chat --trust-all-tools",
+		resumeCommand: "kiro-cli chat --trust-all-tools --resume-id",
+		nonInteractiveCommand: "kiro-cli chat --no-interactive",
+	}),
 ] as const;
 
 export type BuiltinTerminalAgentType =

packages/shared/src/builtin-terminal-agents.ts

@@ -12,6 +12,7 @@ import grokIcon from "./grok.svg";
 import grokWhiteIcon from "./grok-white.svg";
 import kimiIcon from "./kimi.svg";
 import kimiWhiteIcon from "./kimi-white.svg";
+import kiroIcon from "./kiro.svg";
 import mastracodeIcon from "./mastracode.svg";
 import mastracodeWhiteIcon from "./mastracode-white.svg";
 import opencodeIcon from "./opencode.svg";
@@ -36,6 +37,7 @@ export const PRESET_ICONS: Record<string, PresetIconSet> = {
 	gemini: { light: geminiIcon, dark: geminiIcon },
 	grok: { light: grokIcon, dark: grokWhiteIcon },
 	kimi: { light: kimiIcon, dark: kimiWhiteIcon },
+	kiro: { light: kiroIcon, dark: kiroIcon },
 	pi: { light: piIcon, dark: piWhiteIcon },
 	polygraph: { light: polygraphIcon, dark: polygraphWhiteIcon },
 	superset: { light: supersetIcon, dark: supersetIcon },
@@ -81,6 +83,7 @@ export {
 	grokWhiteIcon,
 	kimiIcon,
 	kimiWhiteIcon,
+	kiroIcon,
 	mastracodeIcon,
 	mastracodeWhiteIcon,
 	opencodeIcon,