Museum/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-04-06 19:28:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dori/commands-parity' into main

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-04-02 18:37:00 +09:00
parent b92bd88cc8 d88144d4a5
commit 6e642a002d
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,14 +221,14 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
name: "agents", name: "agents",
aliases: &[], aliases: &[],
summary: "List configured agents", summary: "List configured agents",
argument_hint: None, argument_hint: Some("[list|help]"),
resume_supported: true, resume_supported: true,
}, },
SlashCommandSpec { SlashCommandSpec {
name: "skills", name: "skills",
aliases: &[], aliases: &[],
summary: "List available skills", summary: "List available skills",
argument_hint: None, argument_hint: Some("[list|help]"),
resume_supported: true, resume_supported: true,
}, },
]; ];
@@ -1578,7 +1578,7 @@ fn normalize_optional_args(args: Option<&str>) -> Option<&str> {
fn render_agents_usage(unexpected: Option<&str>) -> String { fn render_agents_usage(unexpected: Option<&str>) -> String {
let mut lines = vec![ let mut lines = vec![
"Agents".to_string(), "Agents".to_string(),
" Usage /agents".to_string(), " Usage /agents [list|help]".to_string(),
" Direct CLI claw agents".to_string(), " Direct CLI claw agents".to_string(),
" Sources .codex/agents, .claude/agents, $CODEX_HOME/agents".to_string(), " Sources .codex/agents, .claude/agents, $CODEX_HOME/agents".to_string(),
]; ];
@@ -1591,7 +1591,7 @@ fn render_agents_usage(unexpected: Option<&str>) -> String {
fn render_skills_usage(unexpected: Option<&str>) -> String { fn render_skills_usage(unexpected: Option<&str>) -> String {
let mut lines = vec![ let mut lines = vec![
"Skills".to_string(), "Skills".to_string(),
" Usage /skills".to_string(), " Usage /skills [list|help]".to_string(),
" Direct CLI claw skills".to_string(), " Direct CLI claw skills".to_string(),
" Sources .codex/skills, .claude/skills, legacy /commands".to_string(), " Sources .codex/skills, .claude/skills, legacy /commands".to_string(),
]; ];
@@ -2056,8 +2056,8 @@ mod tests {
"/plugin [list|install <path>|enable <name>|disable <name>|uninstall <id>|update <id>]" "/plugin [list|install <path>|enable <name>|disable <name>|uninstall <id>|update <id>]"
)); ));
assert!(help.contains("aliases: /plugins, /marketplace")); assert!(help.contains("aliases: /plugins, /marketplace"));
assert!(help.contains("/agents")); assert!(help.contains("/agents [list|help]"));
assert!(help.contains("/skills")); assert!(help.contains("/skills [list|help]"));
assert_eq!(slash_command_specs().len(), 26); assert_eq!(slash_command_specs().len(), 26);
assert_eq!(resume_supported_slash_commands().len(), 14); assert_eq!(resume_supported_slash_commands().len(), 14);
} }
@@ -2365,7 +2365,7 @@ mod tests {
let agents_help = let agents_help =
super::handle_agents_slash_command(Some("help"), &cwd).expect("agents help"); super::handle_agents_slash_command(Some("help"), &cwd).expect("agents help");
assert!(agents_help.contains("Usage /agents")); assert!(agents_help.contains("Usage /agents [list|help]"));
assert!(agents_help.contains("Direct CLI claw agents")); assert!(agents_help.contains("Direct CLI claw agents"));
let agents_unexpected = let agents_unexpected =
@@ -2374,7 +2374,7 @@ mod tests {
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");
assert!(skills_help.contains("Usage /skills")); assert!(skills_help.contains("Usage /skills [list|help]"));
assert!(skills_help.contains("legacy /commands")); assert!(skills_help.contains("legacy /commands"));
let skills_unexpected = let skills_unexpected =

20
rust/crates/rusty-claude-cli/src/main.rs
View File

@@ -22,7 +22,8 @@ use api::{
use commands::{ use commands::{
handle_agents_slash_command, handle_plugins_slash_command, handle_skills_slash_command, handle_agents_slash_command, handle_plugins_slash_command, handle_skills_slash_command,
render_slash_command_help, resume_supported_slash_commands, slash_command_specs, SlashCommand, render_slash_command_help, resume_supported_slash_commands, slash_command_specs,
validate_slash_command_input, SlashCommand,
}; };
use compat_harness::{extract_manifest, UpstreamPaths}; use compat_harness::{extract_manifest, UpstreamPaths};
use init::initialize_repo; use init::initialize_repo;
@@ -5185,6 +5186,23 @@ mod tests {
assert!(error.contains("claw --resume SESSION.jsonl /status")); assert!(error.contains("claw --resume SESSION.jsonl /status"));
} }
#[test]
fn direct_slash_commands_surface_shared_validation_errors() {
let compact_error = parse_args(&["/compact".to_string(), "now".to_string()])
.expect_err("invalid /compact shape should be rejected");
assert!(compact_error.contains("Unexpected arguments for /compact."));
assert!(compact_error.contains("Usage /compact"));
let plugins_error = parse_args(&[
"/plugins".to_string(),
"list".to_string(),
"extra".to_string(),
])
.expect_err("invalid /plugins list shape should be rejected");
assert!(plugins_error.contains("Usage: /plugin list"));
assert!(plugins_error.contains("Aliases /plugins, /marketplace"));
}
#[test] #[test]
fn formats_unknown_slash_command_with_suggestions() { fn formats_unknown_slash_command_with_suggestions() {
let report = format_unknown_slash_command_message("stats"); let report = format_unknown_slash_command_message("stats");