Add Kiro CLI as third coding agent with hooks and CLI skill#245
Open
b0x42 wants to merge 4 commits intosupabitapp:mainfrom
Open
Add Kiro CLI as third coding agent with hooks and CLI skill#245b0x42 wants to merge 4 commits intosupabitapp:mainfrom
b0x42 wants to merge 4 commits intosupabitapp:mainfrom
Conversation
f285a2c to
30cce77
Compare
- 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
30cce77 to
0b831ce
Compare
# Conflicts: # SupacodeSettingsFeature/Reducer/SettingsFeature.swift # SupacodeSettingsShared/BusinessLogic/KiroHookSettings.swift # SupacodeSettingsShared/BusinessLogic/KiroHookSettingsFileInstaller.swift # SupacodeSettingsShared/BusinessLogic/KiroSettingsInstaller.swift # SupacodeSettingsShared/Models/SkillAgent.swift
sbertix
requested changes
Apr 15, 2026
Collaborator
sbertix
left a comment
There was a problem hiding this comment.
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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) eventsKiroHookSettingsFileInstaller.swift— File installer for Kiro's flat hook format: install, uninstall, and containsMatchingHooksKiroSettingsInstaller.swift— Targets~/.kiro/agents/kiro_default.json, creates default agent config when file is absentKiroSettingsClient.swift— TCA dependency client wrapping the installerModified files
AgentHooksInstallState.swift— Added.kiroProgress,.kiroNotificationstoAgentHookSlotSkillAgent.swift— Added.kirocase withconfigDirectoryName: ".kiro"SettingsFeature.swift— Wired Kiro state, dependency, check/install/uninstall effectsDeveloperSettingsView.swift— Added Kiro section with progress, notifications, and CLI skill rowsCLISkillContent.swift— AddedkiroSkillMd(SKILL.md with YAML frontmatter)CLISkillInstaller.swift— Added.kirocaseAgentHookSocketServer.swift— Addedassistant_responsedecoding (see below)Assets
kiro-markimage set (SVG from kiro.dev)Design decisions
Why
kiro_default.jsonKiro has no global hooks file — hooks live per-agent in
~/.kiro/agents/<name>.json. Thekiro_defaultagent is what runs in Supacode terminals, so that's the only file we target. The built-inkiro_defaulthas no file on disk; creatingkiro_default.jsonoverrides it entirely, so the installer writes a complete config (name, tools, resources, hooks) — not just hooks.Why a separate
KiroHookSettingsFileInstallerKiro'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
AgentHookSettingsFileInstallerand risking regressions in Claude/Codex, this isolates the format difference in a separate installer.Socket server:
assistant_responsefieldKiro sends the agent's final response in
assistant_responserather thanmessage(Claude) orlast_assistant_message(Codex). Extended the notification body fallback chain:Without this, Kiro notifications would have empty bodies.
Uninstall safety
Uninstall is a no-op if
kiro_default.jsondoesn't exist, preventing creation of a broken config file that would override Kiro's built-in agent with missing fields.Verification
make checkpasses (swift-format + swiftlint)make testpasses (716 tests, 57 suites)