Jinal-Sarvaiya opened a new pull request, #128:
URL: https://github.com/apache/camel-kit/pull/128
## Summary
- Add `--with-citrus-mcp` flag to `camel-kit init` (default: off) so the
Citrus MCP server is no longer written into every agent workspace
unconditionally
- Wrap Citrus server blocks in all 8 MCP config templates (JSON + TOML) with
`{#if CITRUS_ENABLED}` Qute guards
- Update `camel-kit doctor` to read `citrus.mcp.enabled` from config
properties — skip Citrus health checks when not opted in
- Backward compatibility: workspaces with `citrus.mcp.version` but no
`citrus.mcp.enabled` are treated as implicitly opted in
## Changes
### Source (8 files)
| File | Change |
|------|--------|
| `InitCommand` | `--with-citrus-mcp` picocli option |
| `InitRequest` | `withCitrusMcp` boolean field |
| `InitContext` | `withCitrusMcp` field; 7-arg convenience constructor
defaults to `false` |
| `InitService` | Conditionally write `citrus.mcp.version` and
`citrus.mcp.enabled` |
| `McpConfigGenerator` | Pass `CITRUS_ENABLED` boolean to Qute template data
|
| `CodexConfigMerger` | Dynamic managed-server list based on citrus opt-in |
| `DoctorService` | Property-driven citrus checks (JSON + TOML paths) with
backward compat |
### Templates (8 files)
All MCP config templates (`bob`, `claude-code`, `codex`, `copilot`,
`antigravity`, `pi`, `qwen`, `opencode`) wrap citrus server blocks in `{#if
CITRUS_ENABLED}...{/if}`.
### Tests (12 files)
- `InitServiceTest` — default omits citrus; new
`allAgentsIncludeCitrusWhenOptedInAndPassDoctorMcpChecks`
- `DoctorServiceTest` — `missingCitrusServerPassesWhenNotOptedIn`,
`missingCitrusServerFailsWhenOptedIn`, backward-compat test
- `ShippedAssetStructureTest` — conditional citrus assertions
- Generator tests (`Codex`, `Copilot`, `Pi`, `Antigravity`, `OpenCode`,
`Qwen`, `ResourceConsistency`, `CodexCliSmoke`) — use 9-arg `InitContext` with
`withCitrusMcp=true` for full-config validation
- `WorkflowManifestTest` — same fix
## Test plan
- [x] `./mvnw test -pl camel-kit-core -B` — all targeted tests pass (296
tests, 0 failures)
- [x] `./mvnw -Psourcecheck validate -B` — format check passes
- [x] `ShippedAssetStructureTest` passes (CLAUDE.md requirement for template
changes)
- [x] `./mvnw clean install -B` from root
- [x] Manual verification: `camel-kit init myproject` omits citrus;
`camel-kit init --with-citrus-mcp myproject` includes it
- [x] Manual verification: `camel-kit doctor` passes on workspaces without
citrus
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
