Skip to content

feat: add MCP support for Kiro (same servers than claude code)#412

Open
jeromevdl wants to merge 3 commits into
awslabs:v2from
jeromevdl:fix/kiro-mcp
Open

feat: add MCP support for Kiro (same servers than claude code)#412
jeromevdl wants to merge 3 commits into
awslabs:v2from
jeromevdl:fix/kiro-mcp

Conversation

@jeromevdl

Copy link
Copy Markdown

Summary

Add the same MCP servers than Claude Code (AWS + Context7)

Recreates #358 (its original base branch v2-unified was deleted); rebased onto v2.

Changes

  • harness/kiro/settings/mcp.json (new) — 5-server registry (context7 + 4 AWS), mirrors Claude's .mcp.json.
  • harness/kiro/manifest.ts — ships settings/mcp.json as a harnessFile.
  • harness/kiro/agents/aidlc-architect-agent.json — includeMcpJson: true + 5 @server tools; dropped $schema.
  • harness/kiro/agents/aidlc-developer-agent.json — same.
  • harness/kiro/agents/aidlc.json — dropped $schema only (no MCP).
  • harness/kiro/onboarding.fills.ts — MCP-servers line updated.
  • docs/guide/harnesses/kiro-cli.md — comparison-table row updated.

+ regenerated the dist
+ version/changelog

User experience

  • mcp servers are added in .kiro/settings/mcp.json (kiro syntax).
  • Use includeMcpJson in the 2 agents (not in main one).

Checklist

If your change doesn't seem to apply, please leave them unchecked.

  • I have reviewed the contributing guidelines
  • I have performed a self-review of this change
  • Changes have been tested
  • Changes are documented

Test Plan

  • MCP are only enabled for Architect and Dev agents, not the main one (to be discussed)

Acknowledgment

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the project license.

Adds the Kiro counterpart to t110: validates dist/kiro/.kiro/settings/mcp.json
shape/cardinality/secrets and guards that every @<server> grant across the
three Kiro agent JSONs names a declared server (catches dangling/typo'd grants).
Also reword the CHANGELOG $schema bullet with the correct reason (the old
schema's additionalProperties:false + useLegacyMcpJson would fail self-validation
once includeMcpJson is added), per review.
Kiro IDE drives MCP entirely from .kiro/settings/mcp.json (workspace-wide);
unlike the CLI it has no per-agent includeMcpJson/@server grant model. So the
IDE ships the same 5-server registry (context7 + 4 AWS) but no agent-JSON
changes. Extends t111 registry-integrity checks across both kiro and kiro-ide
dist roots (with a byte-identical guard) while keeping the @server grant-model
checks CLI-only.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant