Skip to content

An agent-managed museum exhibit, built in Rust with Gajae-Code / LazyCodex — developed and maintained with no human intervention.

Rust

Merge remote-tracking branch 'origin/omx-issue-9202-release-harness'

Yeachan-Heoc0be23b4f642
diff --cc rust/crates/rusty-claude-cli/src/main.rs
index da194cc7,c0edd357..b498176d
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@@ -571,19 -421,39 +571,42 @@@ fn parse_system_prompt_args(args: &[Str
}
fn parse_resume_args(args: &[String]) -> Result<CliAction, String> {
- let (session_path, commands) = match args.first() {
- None => (PathBuf::from(LATEST_SESSION_REFERENCE), Vec::new()),
- let session_path = args
- .first()
- .ok_or_else(|| "missing session path for --resume".to_string())
- .map(PathBuf::from)?;
++ let (session_path, command_tokens): (PathBuf, &[String]) = match args.first() {
++ None => (PathBuf::from(LATEST_SESSION_REFERENCE), &[]),
+ Some(first) if first.trim_start().starts_with('/') => {
- (PathBuf::from(LATEST_SESSION_REFERENCE), args.to_vec())
++ (PathBuf::from(LATEST_SESSION_REFERENCE), args)
+ }
- Some(first) => (PathBuf::from(first), args[1..].to_vec()),
++ Some(first) => (PathBuf::from(first), &args[1..]),
+ };
- if commands
- .iter()
- .any(|command| !command.trim_start().starts_with('/'))
- {
- return Err("--resume trailing arguments must be slash commands".to_string());
+ let mut commands = Vec::new();
+ let mut current_command = String::new();
+
- for token in &args[1..] {
++ for token in command_tokens {
+ if token.trim_start().starts_with('/') {
+ if resume_command_can_absorb_token(&current_command, token) {
+ current_command.push(' ');
+ current_command.push_str(token);
+ continue;
+ }
+ if !current_command.is_empty() {
+ commands.push(current_command);
+ }
+ current_command = token.clone();
+ continue;
+ }
+
+ if current_command.is_empty() {
+ return Err("--resume trailing arguments must be slash commands".to_string());
+ }
+
+ current_command.push(' ');
+ current_command.push_str(token);
}
+
+ if !current_command.is_empty() {
+ commands.push(current_command);
+ }
+
Ok(CliAction::ResumeSession {
session_path,
commands,
@@@ -5110,14 -4618,46 +5157,54 @@@ mod tests
);
}
+ #[test]
+ fn rejects_unknown_options_with_helpful_guidance() {
+ let error = parse_args(&["--resum".to_string()]).expect_err("unknown option should fail");
+ assert!(error.contains("unknown option: --resum"));
+ assert!(error.contains("Did you mean --resume?"));
+ assert!(error.contains("claw --help"));
+ }
+
+ #[test]
+ fn parses_resume_flag_with_slash_command_arguments() {
+ let args = vec![
+ "--resume".to_string(),
+ "session.jsonl".to_string(),
+ "/export".to_string(),
+ "notes.txt".to_string(),
+ "/clear".to_string(),
+ "--confirm".to_string(),
+ ];
+ assert_eq!(
+ parse_args(&args).expect("args should parse"),
+ CliAction::ResumeSession {
+ session_path: PathBuf::from("session.jsonl"),
+ commands: vec![
+ "/export notes.txt".to_string(),
- "/clear --confirm".to_string()
++ "/clear --confirm".to_string(),
+ ],
+ }
+ );
+ }
+
+ #[test]
+ fn parses_resume_flag_with_absolute_export_path() {
+ let args = vec![
+ "--resume".to_string(),
+ "session.jsonl".to_string(),
+ "/export".to_string(),
+ "/tmp/notes.txt".to_string(),
+ "/status".to_string(),
+ ];
+ assert_eq!(
+ parse_args(&args).expect("args should parse"),
+ CliAction::ResumeSession {
+ session_path: PathBuf::from("session.jsonl"),
+ commands: vec!["/export /tmp/notes.txt".to_string(), "/status".to_string()],
+ }
+ );
+ }
+
#[test]
fn filtered_tool_specs_respect_allowlist() {
let allowed = ["read_file", "grep_search"]