Repository navigation
fix(claude-code): catch up to v2.1.118 (mcp_tool hook type) #767
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -2950,6 +2950,33 @@ fn test_cc_hk_016_agent_type_valid() { | |||||||||||||||||||||||||
| assert_eq!(cc_hk_016.len(), 0); | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| #[test] | ||||||||||||||||||||||||||
| fn test_cc_hk_016_mcp_tool_type_valid() { | ||||||||||||||||||||||||||
| // Claude Code v2.1.118 added `type: "mcp_tool"` so hooks can invoke | ||||||||||||||||||||||||||
| // MCP tools directly. Without this fix, agnix would false-positive | ||||||||||||||||||||||||||
| // CC-HK-016 (unknown hook type) on every v2.1.118+ user that follows | ||||||||||||||||||||||||||
| // the docs. | ||||||||||||||||||||||||||
|
There was a problem hiding this comment. Minor: the test comment says “user that follows the docs”, but the PR description notes the docs page hasn’t been updated yet and the source of truth is the v2.1.118 release notes. Consider rewording this comment to avoid confusion about which upstream reference introduced
Suggested change
|
||||||||||||||||||||||||||
| let content = r#"{ | ||||||||||||||||||||||||||
| "hooks": { | ||||||||||||||||||||||||||
| "PostToolUse": [ | ||||||||||||||||||||||||||
| { | ||||||||||||||||||||||||||
| "hooks": [ | ||||||||||||||||||||||||||
| { "type": "mcp_tool", "tool": "mcp__server__do_thing" } | ||||||||||||||||||||||||||
| ] | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
| ] | ||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
| }"#; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| let diagnostics = validate(content); | ||||||||||||||||||||||||||
| let cc_hk_016: Vec<_> = diagnostics | ||||||||||||||||||||||||||
| .iter() | ||||||||||||||||||||||||||
| .filter(|d| d.rule == "CC-HK-016") | ||||||||||||||||||||||||||
| .collect(); | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| assert_eq!(cc_hk_016.len(), 0, "mcp_tool should be a valid hook type (Claude Code v2.1.118+)"); | ||||||||||||||||||||||||||
|
There was a problem hiding this comment. This regression test only asserts that CC-HK-016 doesn’t fire. Since
Suggested change
|
||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| #[test] | ||||||||||||||||||||||||||
| fn test_cc_hk_016_unknown_type() { | ||||||||||||||||||||||||||
| let content = r#"{ | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mcp_toolis added to the raw JSON allow-list, but typed parsing still usesschemas::hooks::Hook(internally-tagged enum) which currently only supportscommand|prompt|agent|http. That means configs containing{"type":"mcp_tool"...}will still failserde_json::from_valueand emit CC-HK-012, so this change likely shifts the failure from CC-HK-016 to CC-HK-012 rather than fully supporting v2.1.118. Consider adding anmcp_toolvariant toHook(with at least atoolfield and a#[serde(flatten)] _extramap if you want to avoid strict-field coupling) or otherwise adjusting typed parsing to accept this new type.