Add Kiro CLI as third coding agent with hooks and CLI skill by b0x42 · Pull Request #245 · supabitapp/supacode

b0x42 · 2026-04-15T12:36:22Z

Adds Kiro CLI as a third coding agent alongside Claude Code and Codex in Settings → Coding Agents.

Changes

New files

KiroHookSettings.swift — Hook entry struct (command + timeout_ms) and payloads for progress (userPromptSubmit → busy on, stop → busy off) and notification (stop → notify) events
KiroHookSettingsFileInstaller.swift — File installer for Kiro's flat hook format: install, uninstall, and containsMatchingHooks
KiroSettingsInstaller.swift — Targets ~/.kiro/agents/kiro_default.json, creates default agent config when file is absent
KiroSettingsClient.swift — TCA dependency client wrapping the installer

Modified files

AgentHooksInstallState.swift — Added .kiroProgress, .kiroNotifications to AgentHookSlot
SkillAgent.swift — Added .kiro case with configDirectoryName: ".kiro"
SettingsFeature.swift — Wired Kiro state, dependency, check/install/uninstall effects
DeveloperSettingsView.swift — Added Kiro section with progress, notifications, and CLI skill rows
CLISkillContent.swift — Added kiroSkillMd (SKILL.md with YAML frontmatter)
CLISkillInstaller.swift — Added .kiro case
AgentHookSocketServer.swift — Added assistant_response decoding (see below)

Assets

kiro-mark image set (SVG from kiro.dev)

Design decisions

Why `kiro_default.json`

Kiro has no global hooks file — hooks live per-agent in ~/.kiro/agents/<name>.json. The kiro_default agent is what runs in Supacode terminals, so that's the only file we target. The built-in kiro_default has no file on disk; creating kiro_default.json overrides it entirely, so the installer writes a complete config (name, tools, resources, hooks) — not just hooks.

Why a separate `KiroHookSettingsFileInstaller`

Kiro's hook format is flat:

{ "hooks": { "stop": [{ "command": "...", "timeout_ms": 10000 }] } }

Claude/Codex use a grouped format:

{ "hooks": { "Stop": [{ "hooks": [{ "type": "command", "command": "...", "timeout": 10 }] }] } }

Rather than generalizing AgentHookSettingsFileInstaller and risking regressions in Claude/Codex, this isolates the format difference in a separate installer.

Socket server: `assistant_response` field

Kiro sends the agent's final response in assistant_response rather than message (Claude) or last_assistant_message (Codex). Extended the notification body fallback chain:

let body = payload.message ?? payload.lastAssistantMessage ?? payload.assistantResponse

Without this, Kiro notifications would have empty bodies.

Uninstall safety

Uninstall is a no-op if kiro_default.json doesn't exist, preventing creation of a broken config file that would override Kiro's built-in agent with missing fields.

Verification

make check passes (swift-format + swiftlint)
make test passes (716 tests, 57 suites)

- KiroHookSettings: progress (userPromptSubmit/stop) and notification (stop) payloads in Kiro's flat format - KiroHookSettingsFileInstaller: thin wrapper for Kiro's flat hook JSON format - KiroSettingsInstaller: targets ~/.kiro/agents/kiro_default.json, creates default agent config when absent - KiroSettingsClient: TCA dependency for install/uninstall/check - AgentHookSlot: add .kiroProgress/.kiroNotifications - SkillAgent: add .kiro - SettingsFeature: wire Kiro hook checks, install/uninstall, skill install - CLISkillContent: add Kiro skill (SKILL.md with frontmatter) - AgentHookPayload: decode assistant_response for Kiro stop events - DeveloperSettingsView: add Kiro section with progress, notifications, CLI skill rows - kiro-mark asset from kiro.dev/icon.svg

# Conflicts: # SupacodeSettingsFeature/Reducer/SettingsFeature.swift # SupacodeSettingsShared/BusinessLogic/KiroHookSettings.swift # SupacodeSettingsShared/BusinessLogic/KiroHookSettingsFileInstaller.swift # SupacodeSettingsShared/BusinessLogic/KiroSettingsInstaller.swift # SupacodeSettingsShared/Models/SkillAgent.swift

sbertix

Thanks 💪 just a few changes required, though.

- Move KiroSettingsClient to SupacodeSettingsShared/Clients/CodingAgents/ with public access - Collapse Kiro section in DeveloperSettingsView (isExpanded: false by default) - Update KiroSettingsInstaller comment with Kiro version (1.x, 2026-04) - Remove KiroHookPayloadSupport; reuse AgentHookPayloadSupport.extractHookGroups - Add tests: KiroSettingsInstallerTests, KiroHookSettingsFileInstallerTests - Extend SettingsFeatureAgentHookTests with kiro hook install/uninstall cases - Update taskChecksAllFourHookSlotsOnStartup → All Six (includes kiro slots) - Update receiveStartupHookChecks to assert kiro{Progress,Notifications,Skill}State Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

# Conflicts: # SupacodeSettingsFeature/Reducer/SettingsFeature.swift

sbertix

Nice work 💪 A few testing gaps + small things inline 🙇‍♂️

…, fix skill:// URIs - Add decode test for Kiro's assistant_response fallback field - Add precedence test (message > lastAssistantMessage > assistantResponse) - Assert full JSON config contents in KiroSettingsInstallerTests (name, tools, useLegacyMcpJson, resources, hooks) instead of just fileExists - Fix firstWrite/secondWrite comparison in does-not-overwrite test - Fix skill:// URIs to use ~/ prefix for home-directory resolution (skill://.kiro/... is project-relative, skill://~/.kiro/... is global)

- Log warning when all notification body fields are nil so field renames surface in make log-stream instead of silently delivering empty notifications - Add comment explaining the body fallback chain across agents - Add uninstallRemovesOnlyMatchingCommands test for Kiro's flat hook format, matching the existing Claude/Codex grouped-format coverage

b0x42 · 2026-04-20T08:09:46Z

Feedback addressed (2 commits)

skill:// URI fix (bug): The skill:// scheme in kiro_default.json was using project-relative paths (skill://.kiro/skills/**/SKILL.md) but CLISkillInstaller writes skills to ~/.kiro/skills/ (home directory). Per Kiro docs, custom agents need skill://~/... for global skills. Fixed to skill://~/.kiro/skills/**/SKILL.md and skill://~/.kiro/steering/**/*.md. Without this, the SKILL.md row showed "installed" but Kiro never actually loaded it.

assistant_response decode tests: Added parsesNotificationWithAssistantResponseFallback (Kiro-only field) and messageFieldTakesPrecedenceOverAllFallbacks (all three fields present → message wins) to lock the fallback chain.

Nil-body warning log: Added SupaLogger.warning when all body fields (message, lastAssistantMessage, assistantResponse) are nil, plus a comment explaining which agent uses which field. If Kiro renames the field again, it now surfaces in make log-stream.

Full config assertions in KiroSettingsInstallerTests: Tests now decode the written JSON and assert name, tools: ["*"], useLegacyMcpJson, all 4 resources entries, and hooks — instead of just fileExists. Also fixed the firstWrite/secondWrite comparison (#expect(firstWrite == secondWrite) instead of _ = firstWrite // used).

uninstallRemovesOnlyMatchingCommands for flat format: Mirrors the existing Claude/Codex grouped-format test — installs managed hooks, manually adds a user hook (echo user-hook), uninstalls, asserts only the user hook remains.

- KiroSettingsInstaller: gate `ensureDefaultAgentConfig` on a version probe (`kiro --version` via login shell) so future Kiro releases cannot be silently overridden by our hardcoded defaults; 5s watchdog + `process.terminate()` on hang; concurrent stdout/stderr drain to avoid pipe-buffer deadlock; parse stdout before stderr; log non-UTF8 output; differentiate 127 vs. other non-zero exits; `isSupportedVersion` compares the first dot-delimited component so `10.x` is rejected. - KiroHookSettingsFileInstaller: throw `invalidHooksObject` when existing `"hooks"` is non-nil but not a JSON object (previously silently overwrote user data); drop WHAT-narration comment. - KiroHookSettings: extract `defaultTimeoutMs`; `KiroHookEntry` init guards empty command / non-positive timeout via `assertionFailure` + `max(1, _)`. - AgentHookSocketServer: collapse `message` / `last_assistant_message` / `assistant_response` into a single `body` via custom `init(from:)`; each field decoded through a tolerant helper that logs on type mismatch; skip empty strings so an empty Claude `message` still yields to Codex/Kiro fallbacks. - CLISkillContent: document `-c` script UUID flag + `worktree run/stop/script list` in `kiroSkillMd`. - Tests: error paths (malformed JSON, array root, non-object hooks, non-array event, legacy pruning), version-gate matrix (missing binary, command-throw, unsupported version, unparseable output, 10.x rejection, stderr-banner precedence, file-exists short-circuit), and body-decoder edge cases (null, empty string, type mismatch, all-precedence chains).

sbertix

Thank you 💪

b0x42 force-pushed the add-kiro-agent-hooks branch from f285a2c to 30cce77 Compare April 15, 2026 12:44

b0x42 force-pushed the add-kiro-agent-hooks branch from 30cce77 to 0b831ce Compare April 15, 2026 12:44

b0x42 marked this pull request as ready for review April 15, 2026 13:08

sbertix requested changes Apr 15, 2026

View reviewed changes

b0x42 and others added 2 commits April 15, 2026 21:58

Merge remote-tracking branch 'origin/main' into add-kiro-agent-hooks

b825d62

# Conflicts: # SupacodeSettingsFeature/Reducer/SettingsFeature.swift

b0x42 requested a review from sbertix April 17, 2026 11:51

sbertix reviewed Apr 18, 2026

View reviewed changes

b0x42 added 2 commits April 20, 2026 09:03

Merge remote-tracking branch 'origin/main' into add-kiro-agent-hooks

0fde416

b0x42 requested a review from sbertix April 20, 2026 08:11

sbertix enabled auto-merge (squash) April 20, 2026 20:24

sbertix approved these changes Apr 20, 2026

View reviewed changes

sbertix merged commit 943f3fa into supabitapp:main Apr 20, 2026
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Kiro CLI as third coding agent with hooks and CLI skill#245

Add Kiro CLI as third coding agent with hooks and CLI skill#245
sbertix merged 8 commits intosupabitapp:mainfrom
b0x42:add-kiro-agent-hooks

b0x42 commented Apr 15, 2026 •

edited

Loading

Uh oh!

sbertix left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sbertix left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

b0x42 commented Apr 20, 2026

Uh oh!

sbertix left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

b0x42 commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

New files

Modified files

Assets

Design decisions

Why kiro_default.json

Why a separate KiroHookSettingsFileInstaller

Socket server: assistant_response field

Uninstall safety

Verification

Uh oh!

sbertix left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sbertix left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

b0x42 commented Apr 20, 2026

Feedback addressed (2 commits)

Uh oh!

sbertix left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

b0x42 commented Apr 15, 2026 •

edited

Loading

Why `kiro_default.json`

Why a separate `KiroHookSettingsFileInstaller`

Socket server: `assistant_response` field