apache · potiuk · Jul 8, 2026 · Jul 7, 2026 · Jul 8, 2026
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,8 @@ logs
 !/.agents/skills/magpie-*
 .claude/skills/*
 !/.claude/skills/magpie-*
+.kiro/skills/*
+!/.kiro/skills/magpie-*
 .github/skills/*
 !/.github/skills/magpie-*
 

diff --git a/.kiro/skills/magpie-audit-finding-fix b/.kiro/skills/magpie-audit-finding-fix
@@ -0,0 +1 @@
+../../.agents/skills/magpie-audit-finding-fix
diff --git a/.kiro/skills/magpie-ci-runner-audit b/.kiro/skills/magpie-ci-runner-audit
@@ -0,0 +1 @@
+../../.agents/skills/magpie-ci-runner-audit
diff --git a/.kiro/skills/magpie-committer-onboarding b/.kiro/skills/magpie-committer-onboarding
@@ -0,0 +1 @@
+../../.agents/skills/magpie-committer-onboarding
diff --git a/.kiro/skills/magpie-contributor-activity-sweep b/.kiro/skills/magpie-contributor-activity-sweep
@@ -0,0 +1 @@
+../../.agents/skills/magpie-contributor-activity-sweep
diff --git a/.kiro/skills/magpie-contributor-nomination b/.kiro/skills/magpie-contributor-nomination
@@ -0,0 +1 @@
+../../.agents/skills/magpie-contributor-nomination
diff --git a/.kiro/skills/magpie-contributor-sentiment b/.kiro/skills/magpie-contributor-sentiment
@@ -0,0 +1 @@
+../../.agents/skills/magpie-contributor-sentiment
diff --git a/.kiro/skills/magpie-contributor-to-committer b/.kiro/skills/magpie-contributor-to-committer
@@ -0,0 +1 @@
+../../.agents/skills/magpie-contributor-to-committer
diff --git a/.kiro/skills/magpie-dependency-audit b/.kiro/skills/magpie-dependency-audit
@@ -0,0 +1 @@
+../../.agents/skills/magpie-dependency-audit
diff --git a/.kiro/skills/magpie-flaky-test-triage b/.kiro/skills/magpie-flaky-test-triage
@@ -0,0 +1 @@
+../../.agents/skills/magpie-flaky-test-triage
diff --git a/.kiro/skills/magpie-good-first-issue-author b/.kiro/skills/magpie-good-first-issue-author
@@ -0,0 +1 @@
+../../.agents/skills/magpie-good-first-issue-author
diff --git a/.kiro/skills/magpie-good-first-issue-sweep b/.kiro/skills/magpie-good-first-issue-sweep
@@ -0,0 +1 @@
+../../.agents/skills/magpie-good-first-issue-sweep
diff --git a/.kiro/skills/magpie-issue-backlog-stats b/.kiro/skills/magpie-issue-backlog-stats
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-backlog-stats
diff --git a/.kiro/skills/magpie-issue-deduplicate b/.kiro/skills/magpie-issue-deduplicate
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-deduplicate
diff --git a/.kiro/skills/magpie-issue-fix-workflow b/.kiro/skills/magpie-issue-fix-workflow
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-fix-workflow
diff --git a/.kiro/skills/magpie-issue-reassess b/.kiro/skills/magpie-issue-reassess
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-reassess
diff --git a/.kiro/skills/magpie-issue-reassess-stats b/.kiro/skills/magpie-issue-reassess-stats
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-reassess-stats
diff --git a/.kiro/skills/magpie-issue-reproducer b/.kiro/skills/magpie-issue-reproducer
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-reproducer
diff --git a/.kiro/skills/magpie-issue-stale-sweep b/.kiro/skills/magpie-issue-stale-sweep
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-stale-sweep
diff --git a/.kiro/skills/magpie-issue-triage b/.kiro/skills/magpie-issue-triage
@@ -0,0 +1 @@
+../../.agents/skills/magpie-issue-triage
diff --git a/.kiro/skills/magpie-license-compliance-audit b/.kiro/skills/magpie-license-compliance-audit
@@ -0,0 +1 @@
+../../.agents/skills/magpie-license-compliance-audit
diff --git a/.kiro/skills/magpie-list-skills b/.kiro/skills/magpie-list-skills
@@ -0,0 +1 @@
+../../.agents/skills/magpie-list-skills
diff --git a/.kiro/skills/magpie-mentoring-welcome b/.kiro/skills/magpie-mentoring-welcome
@@ -0,0 +1 @@
+../../.agents/skills/magpie-mentoring-welcome
diff --git a/.kiro/skills/magpie-newcomer-issue-explainer b/.kiro/skills/magpie-newcomer-issue-explainer
@@ -0,0 +1 @@
+../../.agents/skills/magpie-newcomer-issue-explainer
diff --git a/.kiro/skills/magpie-onboarding-concierge b/.kiro/skills/magpie-onboarding-concierge
@@ -0,0 +1 @@
+../../.agents/skills/magpie-onboarding-concierge
diff --git a/.kiro/skills/magpie-optimize-skill b/.kiro/skills/magpie-optimize-skill
@@ -0,0 +1 @@
+../../.agents/skills/magpie-optimize-skill
diff --git a/.kiro/skills/magpie-pairing-multi-agent-review b/.kiro/skills/magpie-pairing-multi-agent-review
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pairing-multi-agent-review
diff --git a/.kiro/skills/magpie-pairing-self-review b/.kiro/skills/magpie-pairing-self-review
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pairing-self-review
diff --git a/.kiro/skills/magpie-pr-management-code-review b/.kiro/skills/magpie-pr-management-code-review
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pr-management-code-review
diff --git a/.kiro/skills/magpie-pr-management-mentor b/.kiro/skills/magpie-pr-management-mentor
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pr-management-mentor
diff --git a/.kiro/skills/magpie-pr-management-quick-merge b/.kiro/skills/magpie-pr-management-quick-merge
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pr-management-quick-merge
diff --git a/.kiro/skills/magpie-pr-management-stats b/.kiro/skills/magpie-pr-management-stats
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pr-management-stats
diff --git a/.kiro/skills/magpie-pr-management-triage b/.kiro/skills/magpie-pr-management-triage
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pr-management-triage
diff --git a/.kiro/skills/magpie-pr-stale-sweep b/.kiro/skills/magpie-pr-stale-sweep
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pr-stale-sweep
diff --git a/.kiro/skills/magpie-pre-first-pr-check b/.kiro/skills/magpie-pre-first-pr-check
@@ -0,0 +1 @@
+../../.agents/skills/magpie-pre-first-pr-check
diff --git a/.kiro/skills/magpie-release-announce-draft b/.kiro/skills/magpie-release-announce-draft
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-announce-draft
diff --git a/.kiro/skills/magpie-release-archive-sweep b/.kiro/skills/magpie-release-archive-sweep
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-archive-sweep
diff --git a/.kiro/skills/magpie-release-audit-report b/.kiro/skills/magpie-release-audit-report
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-audit-report
diff --git a/.kiro/skills/magpie-release-keys-sync b/.kiro/skills/magpie-release-keys-sync
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-keys-sync
diff --git a/.kiro/skills/magpie-release-prepare b/.kiro/skills/magpie-release-prepare
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-prepare
diff --git a/.kiro/skills/magpie-release-promote b/.kiro/skills/magpie-release-promote
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-promote
diff --git a/.kiro/skills/magpie-release-rc-cut b/.kiro/skills/magpie-release-rc-cut
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-rc-cut
diff --git a/.kiro/skills/magpie-release-verify-rc b/.kiro/skills/magpie-release-verify-rc
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-verify-rc
diff --git a/.kiro/skills/magpie-release-vote-draft b/.kiro/skills/magpie-release-vote-draft
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-vote-draft
diff --git a/.kiro/skills/magpie-release-vote-tally b/.kiro/skills/magpie-release-vote-tally
@@ -0,0 +1 @@
+../../.agents/skills/magpie-release-vote-tally
diff --git a/.kiro/skills/magpie-reviewer-routing b/.kiro/skills/magpie-reviewer-routing
@@ -0,0 +1 @@
+../../.agents/skills/magpie-reviewer-routing
diff --git a/.kiro/skills/magpie-security-cve-allocate b/.kiro/skills/magpie-security-cve-allocate
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-cve-allocate
diff --git a/.kiro/skills/magpie-security-issue-deduplicate b/.kiro/skills/magpie-security-issue-deduplicate
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-deduplicate
diff --git a/.kiro/skills/magpie-security-issue-fix b/.kiro/skills/magpie-security-issue-fix
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-fix
diff --git a/.kiro/skills/magpie-security-issue-import b/.kiro/skills/magpie-security-issue-import
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-import
diff --git a/.kiro/skills/magpie-security-issue-import-from-md b/.kiro/skills/magpie-security-issue-import-from-md
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-import-from-md
diff --git a/.kiro/skills/magpie-security-issue-import-from-pr b/.kiro/skills/magpie-security-issue-import-from-pr
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-import-from-pr
diff --git a/.kiro/skills/magpie-security-issue-import-from-scan b/.kiro/skills/magpie-security-issue-import-from-scan
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-import-from-scan
diff --git a/.kiro/skills/magpie-security-issue-import-via-forwarder b/.kiro/skills/magpie-security-issue-import-via-forwarder
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-import-via-forwarder
diff --git a/.kiro/skills/magpie-security-issue-invalidate b/.kiro/skills/magpie-security-issue-invalidate
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-invalidate
diff --git a/.kiro/skills/magpie-security-issue-sync b/.kiro/skills/magpie-security-issue-sync
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-sync
diff --git a/.kiro/skills/magpie-security-issue-triage b/.kiro/skills/magpie-security-issue-triage
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-issue-triage
diff --git a/.kiro/skills/magpie-security-tracker-stats-dashboard b/.kiro/skills/magpie-security-tracker-stats-dashboard
@@ -0,0 +1 @@
+../../.agents/skills/magpie-security-tracker-stats-dashboard
diff --git a/.kiro/skills/magpie-setup b/.kiro/skills/magpie-setup
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup
diff --git a/.kiro/skills/magpie-setup-isolated-setup-doctor b/.kiro/skills/magpie-setup-isolated-setup-doctor
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-isolated-setup-doctor
diff --git a/.kiro/skills/magpie-setup-isolated-setup-install b/.kiro/skills/magpie-setup-isolated-setup-install
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-isolated-setup-install
diff --git a/.kiro/skills/magpie-setup-isolated-setup-update b/.kiro/skills/magpie-setup-isolated-setup-update
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-isolated-setup-update
diff --git a/.kiro/skills/magpie-setup-isolated-setup-verify b/.kiro/skills/magpie-setup-isolated-setup-verify
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-isolated-setup-verify
diff --git a/.kiro/skills/magpie-setup-override-upstream b/.kiro/skills/magpie-setup-override-upstream
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-override-upstream
diff --git a/.kiro/skills/magpie-setup-shared-config-sync b/.kiro/skills/magpie-setup-shared-config-sync
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-shared-config-sync
diff --git a/.kiro/skills/magpie-setup-status b/.kiro/skills/magpie-setup-status
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-status
diff --git a/.kiro/skills/magpie-setup-upstream-fix b/.kiro/skills/magpie-setup-upstream-fix
@@ -0,0 +1 @@
+../../.agents/skills/magpie-setup-upstream-fix
diff --git a/.kiro/skills/magpie-skill-reconciler b/.kiro/skills/magpie-skill-reconciler
@@ -0,0 +1 @@
+../../.agents/skills/magpie-skill-reconciler
diff --git a/.kiro/skills/magpie-workflow-security-audit b/.kiro/skills/magpie-workflow-security-audit
@@ -0,0 +1 @@
+../../.agents/skills/magpie-workflow-security-audit
diff --git a/.kiro/skills/magpie-write-skill b/.kiro/skills/magpie-write-skill
@@ -0,0 +1 @@
+../../.agents/skills/magpie-write-skill
diff --git a/docs/vendor-neutrality.md b/docs/vendor-neutrality.md
@@ -583,24 +583,24 @@ Organization scope (declared, orthogonal to vendor): ASF = 14, agnostic = 55.
 
 | Substrate tool | Substrate | Harness support | Verdict |
 |---|---|---|---|
-| `agent-guard` | action-guard | Claude Code, OpenCode | ✅ portable |
+| `agent-guard` | action-guard | Claude Code, Kiro, OpenCode | ✅ portable |
 | `agent-isolation` | sandbox | any | ✅ agnostic |
 | `dashboard-generator` | analytics | any | ✅ agnostic |
 | `dev` | framework-dev | any | ✅ agnostic |
 | `egress-gateway` | sandbox | any | ✅ agnostic |
-| `permission-audit` | sandbox | Claude Code, OpenCode | ✅ portable |
+| `permission-audit` | sandbox | Claude Code, Kiro, OpenCode | ✅ portable |
 | `pilot-report-validator` | framework-dev | any | ✅ agnostic |
 | `pr-management-stats` | analytics | any | ✅ agnostic |
 | `preflight-audit` | analytics | any | ✅ agnostic |
 | `privacy-llm` | privacy | any | ✅ agnostic |
 | `probe-templates` | sandbox | any | ✅ agnostic |
-| `sandbox-lint` | sandbox | Claude Code, OpenCode | ✅ portable |
+| `sandbox-lint` | sandbox | Claude Code, Kiro, OpenCode | ✅ portable |
 | `security-tracker-stats-dashboard` | analytics | any | ✅ agnostic |
 | `skill-and-tool-validator` | framework-dev | any | ✅ agnostic |
 | `skill-evals` | framework-dev | any | ✅ agnostic |
 | `skill-reconciler-diff` | framework-dev | any | ✅ agnostic |
 | `spec-inventory` | framework-dev, analytics | any | ✅ agnostic |
-| `spec-loop` | framework-dev | Claude Code, Codex, Cursor, Gemini CLI, OpenCode | ✅ portable |
+| `spec-loop` | framework-dev | Claude Code, Codex, Cursor, Gemini CLI, Kiro, OpenCode | ✅ portable |
 | `spec-status-index` | framework-dev, analytics | any | ✅ agnostic |
 | `spec-validator` | framework-dev | any | ✅ agnostic |
 | `symlink-lint` | framework-dev | any | ✅ agnostic |
@@ -612,6 +612,7 @@ Harness → substrate tools it supports:
 - **Codex** (1): `spec-loop`
 - **Cursor** (1): `spec-loop`
 - **Gemini CLI** (1): `spec-loop`
+- **Kiro** (4): `agent-guard`, `permission-audit`, `sandbox-lint`, `spec-loop`
 - **OpenCode** (4): `agent-guard`, `permission-audit`, `sandbox-lint`, `spec-loop`
 - **any harness** (18): `agent-isolation`, `dashboard-generator`, `dev`, `egress-gateway`, `pilot-report-validator`, `pr-management-stats`, `preflight-audit`, `privacy-llm`, `probe-templates`, `security-tracker-stats-dashboard`, `skill-and-tool-validator`, `skill-evals`, `skill-reconciler-diff`, `spec-inventory`, `spec-status-index`, `spec-validator`, `symlink-lint`, `vendor-neutrality-score`
 

diff --git a/skills/setup/agents.md b/skills/setup/agents.md
@@ -27,6 +27,7 @@ go"*, never as *"what files contain"*.
 | `github` | `.github/skills/` | native (relay) | GitHub's skill loader |
 | `windsurf` | `.windsurf/skills/` | native (relay) | Windsurf |
 | `goose` | `.goose/skills/` | native (relay) | Goose |
+| `kiro` | `.kiro/skills/` | native (relay) | Kiro CLI |
 
 The table is **extensible**: a new agent that wants framework
 skills is one new row (`id`, project dir, kind), nothing else —

diff --git a/tools/agent-guard/README.md b/tools/agent-guard/README.md
@@ -11,6 +11,7 @@
   - [Per-command overrides](#per-command-overrides)
   - [Wiring](#wiring)
     - [OpenCode](#opencode)
+    - [Kiro CLI](#kiro-cli)
     - [Harness-neutral path (any runtime)](#harness-neutral-path-any-runtime)
   - [Contributing guards](#contributing-guards)
   - [Tests](#tests)
@@ -24,7 +25,7 @@
 
 **Capability:** substrate:action-guard
 
-**Harness:** Claude Code, OpenCode
+**Harness:** Claude Code, OpenCode, Kiro
 
 A deterministic pre-execution guard dispatcher. It inspects every shell command
 **before it runs** and **denies** the ones that would break a hard framework
@@ -40,6 +41,9 @@ so every wired harness enforces an identical rule set from one source of truth:
 - **OpenCode** — a [plugin](https://opencode.ai/docs/plugins/) on the
   `tool.execute.before` hook for the `bash` tool, which blocks a call by
   throwing (`agent-guard.py --opencode`). See [Wiring](#wiring).
+- **Kiro CLI** — a [`preToolUse`](https://kiro.dev/docs/cli/hooks) hook on the
+  `execute_bash` matcher, which blocks a call when the hook exits `2`
+  (`agent-guard.py --kiro`, reason on stderr). See [Wiring](#wiring).
 - **Any other runtime** — the `--check` and `--exec` CLI modes let any
   harness or shell wrapper enforce guard rules without a harness-specific hook
   adapter. See [Harness-neutral path (any runtime)](#harness-neutral-path-any-runtime).
@@ -145,6 +149,46 @@ to point elsewhere. Because both harnesses call `dispatch()`, the bundled and
 skill-contributed guards, the `MAGPIE_*` overrides, and the deny reasons are
 byte-for-byte identical across the two; nothing about a guard is harness-aware.
 
+### Kiro CLI
+
+The same engine backs [Kiro CLI](https://kiro.dev/docs/cli/hooks) via its
+`preToolUse` hook. Kiro pipes the hook event
+(`{"tool_name": "execute_bash", "tool_input": {"command": …}, "cwd": …}`) to
+the hook command on stdin and **blocks** the tool call when that command exits
+`2`, returning its stderr to the model — so `agent-guard.py --kiro` matches the
+shell tool, runs the shared core, and on a deny writes the reason to stderr and
+exits `2`, the Kiro equivalent of a Claude `PreToolUse` deny.
+
+Register it in the agent configuration's `hooks` field
+([reference](https://kiro.dev/docs/cli/custom-agents/configuration-reference#hooks-field)):
+
+```json
+{
+  "hooks": {
+    "preToolUse": [
+      {
+        "matcher": "execute_bash",
+        "command": "python3 \"${MAGPIE_AGENT_GUARD:-.claude/hooks/agent-guard.py}\" --kiro"
+      }
+    ]
+  }
+}
+```
+
+The engine is one shared, harness-agnostic file (`--kiro` only selects the I/O
+adapter). On a repo already wired for Claude Code it lives at
+`.claude/hooks/agent-guard.py`, so the hook reuses it; a **Kiro-only** adopter
+(no `.claude/`) points `MAGPIE_AGENT_GUARD` at wherever the engine is installed.
+Note: `/magpie-setup` currently installs the engine only on the Claude path — a
+general installer that drops it for non-Claude-only adopters is a pending
+follow-up (see [`docs/adapters/add-a-harness.md`](../../docs/adapters/add-a-harness.md)).
+
+Because every harness calls `dispatch()`, the bundled and skill-contributed
+guards, the `MAGPIE_*` overrides, and the deny reasons are identical to the
+Claude Code and OpenCode paths — verified end-to-end: with this hook wired,
+Kiro refuses a `Co-Authored-By` commit (quoting the `commit-trailer` reason and
+leaving the commit uncreated) while a clean commit proceeds.
+
 ### Harness-neutral path (any runtime)
 
 For runtimes that do not expose a pre-tool hook API (Codex CLI, Gemini CLI,

diff --git a/tools/agent-guard/src/agent_guard/__init__.py b/tools/agent-guard/src/agent_guard/__init__.py
@@ -581,6 +581,39 @@ def opencode_main() -> int:
     return ALLOW_EXIT
 
 
+def kiro_main() -> int:
+    """Harness-neutral entry point for Kiro CLI's ``preToolUse`` hook.
+
+    Reads Kiro's hook event on stdin — ``{"tool_name": "...", "tool_input":
+    {"command": "..."}, "cwd": "..."}`` — matches the shell tool
+    (``execute_bash`` / its ``shell`` alias / ``execute_cmd``), and runs the
+    **same** :func:`dispatch` core as every other harness. On a deny it writes
+    the reason to **stderr** (which Kiro returns to the model) and exits
+    ``DENY_EXIT`` (2 = block for ``PreToolUse``); on allow, a non-shell tool, or
+    any malformed input it exits ``ALLOW_EXIT`` — fail-open, exactly like the
+    Claude and OpenCode paths. Only this thin I/O shell differs; the guard
+    decisions are identical across harnesses.
+    """
+    try:
+        event = json.load(sys.stdin)
+    except (json.JSONDecodeError, ValueError):
+        return ALLOW_EXIT
+    if not isinstance(event, dict):
+        return ALLOW_EXIT
+    if event.get("tool_name") not in ("execute_bash", "shell", "execute_cmd"):
+        return ALLOW_EXIT
+    tool_input = event.get("tool_input")
+    if not isinstance(tool_input, dict):
+        return ALLOW_EXIT
+    command = str(tool_input.get("command", ""))
+    cwd = event.get("cwd")
+    reason = dispatch(command, cwd if isinstance(cwd, str) else None)
+    if reason:
+        sys.stderr.write(reason + "\n")
+        return DENY_EXIT
+    return ALLOW_EXIT
+
+
 def check_main(argv: list[str]) -> int:
     """Harness-neutral check-only entry point (``--check``).
 
@@ -698,6 +731,7 @@ def cli(argv: list[str] | None = None) -> int:
 
     No argument → the Claude Code ``PreToolUse`` hook (:func:`main`).
     ``--opencode`` → the OpenCode adapter (:func:`opencode_main`).
+    ``--kiro`` → the Kiro CLI adapter (:func:`kiro_main`).
     ``--check <cmd…>`` → harness-neutral check-only (:func:`check_main`).
     ``--exec <cmd…>`` → harness-neutral check-then-exec (:func:`exec_main`).
 
@@ -708,6 +742,8 @@ def cli(argv: list[str] | None = None) -> int:
     args = sys.argv[1:] if argv is None else argv
     if args and args[0] == "--opencode":
         return opencode_main()
+    if args and args[0] == "--kiro":
+        return kiro_main()
     if args and args[0] == "--check":
         return check_main(args[1:])
     if args and args[0] == "--exec":
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-committer-onboarding
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-contributor-activity-sweep
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-good-first-issue-author
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-issue-backlog-stats
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-issue-reassess-stats
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-license-compliance-audit
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-newcomer-issue-explainer
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-onboarding-concierge
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-pairing-multi-agent-review
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../.agents/skills/magpie-pairing-self-review