d0zingcat/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-05-27 07:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: mcp/agents/skills help envelopes set ok:false + status:error on unknown subcommand; exit 1 propagates correctly

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-05-25 13:50:51 +09:00
parent 91a0681ae9
commit c345ce6d02
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rust/crates/commands/src/lib.rs
View File

@@ -3930,6 +3930,8 @@ fn render_agents_usage_json(unexpected: Option<&str>) -> Value {
json!({ json!({
"kind": "agents", "kind": "agents",
"action": "help", "action": "help",
"ok": unexpected.is_none(),
"status": if unexpected.is_some() { "error" } else { "ok" },
"usage": { "usage": {
"slash_command": "/agents [list|help]", "slash_command": "/agents [list|help]",
"direct_cli": "claw agents [list|help]", "direct_cli": "claw agents [list|help]",
@@ -3959,6 +3961,8 @@ fn render_skills_usage_json(unexpected: Option<&str>) -> Value {
json!({ json!({
"kind": "skills", "kind": "skills",
"action": "help", "action": "help",
"ok": unexpected.is_none(),
"status": if unexpected.is_some() { "error" } else { "ok" },
"usage": { "usage": {
"slash_command": "/skills [list|install <path>|help|<skill> [args]]", "slash_command": "/skills [list|install <path>|help|<skill> [args]]",
"aliases": ["/skill"], "aliases": ["/skill"],
@@ -4001,6 +4005,8 @@ fn render_mcp_usage_json(unexpected: Option<&str>) -> Value {
json!({ json!({
"kind": "mcp", "kind": "mcp",
"action": "help", "action": "help",
"ok": unexpected.is_none(),
"status": if unexpected.is_some() { "error" } else { "ok" },
"usage": { "usage": {
"slash_command": "/mcp [list|show <server>|help]", "slash_command": "/mcp [list|show <server>|help]",
"direct_cli": "claw mcp [list|show <server>|help]", "direct_cli": "claw mcp [list|show <server>|help]",
@@ -5321,10 +5327,13 @@ mod tests {
assert_eq!(help["action"], "help"); assert_eq!(help["action"], "help");
assert_eq!(help["usage"]["direct_cli"], "claw agents [list|help]"); assert_eq!(help["usage"]["direct_cli"], "claw agents [list|help]");
let unexpected = handle_agents_slash_command_json(Some("show planner"), &workspace) // Unknown agents subcommands now return Err so CLI layer can exit 1.
.expect("agents usage"); let unexpected_err = handle_agents_slash_command_json(Some("show planner"), &workspace);
assert_eq!(unexpected["action"], "help"); assert!(unexpected_err.is_err());
assert_eq!(unexpected["unexpected"], "show planner"); assert!(unexpected_err
.unwrap_err()
.to_string()
.contains("show planner"));
let _ = fs::remove_dir_all(workspace); let _ = fs::remove_dir_all(workspace);
let _ = fs::remove_dir_all(user_home); let _ = fs::remove_dir_all(user_home);
@@ -5462,9 +5471,14 @@ mod tests {
assert!(agents_help assert!(agents_help
.contains("Sources .claw/agents, ~/.claw/agents, $CLAW_CONFIG_HOME/agents")); .contains("Sources .claw/agents, ~/.claw/agents, $CLAW_CONFIG_HOME/agents"));
let agents_unexpected = // Unknown agents subcommands now return Err (typed error) instead of Ok+help text
super::handle_agents_slash_command(Some("show planner"), &cwd).expect("agents usage"); // so that the CLI layer can exit 1. The error message names the unexpected input.
assert!(agents_unexpected.contains("Unexpected show planner")); let agents_unexpected_err = super::handle_agents_slash_command(Some("show planner"), &cwd);
assert!(agents_unexpected_err.is_err());
assert!(agents_unexpected_err
.unwrap_err()
.to_string()
.contains("show planner"));
let skills_help = let skills_help =
super::handle_skills_slash_command(Some("--help"), &cwd).expect("skills help"); super::handle_skills_slash_command(Some("--help"), &cwd).expect("skills help");