diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rs index df4ca278..fa227928 100644 --- a/rust/crates/rusty-claude-cli/src/main.rs +++ b/rust/crates/rusty-claude-cli/src/main.rs @@ -4023,22 +4023,20 @@ fn run_resume_command( _ => {} } let cwd = env::current_dir()?; - let loader = ConfigLoader::default_for(&cwd); - let runtime_config = loader.load()?; - let mut manager = build_plugin_manager(&cwd, &loader, &runtime_config); - let result = - handle_plugins_slash_command(action.as_deref(), target.as_deref(), &mut manager)?; + let payload = plugins_command_payload_for(&cwd, action.as_deref(), target.as_deref())?; let action_str = action.as_deref().unwrap_or("list"); let json = serde_json::json!({ "kind": "plugin", "action": action_str, "target": target, - "message": &result.message, - "reload_runtime": result.reload_runtime, + "status": payload.status, + "config_load_error": payload.config_load_error, + "message": &payload.message, + "reload_runtime": payload.reload_runtime, }); Ok(ResumeCommandOutcome { session: session.clone(), - message: Some(result.message), + message: Some(payload.message), json: Some(json), }) } diff --git a/rust/crates/rusty-claude-cli/tests/output_format_contract.rs b/rust/crates/rusty-claude-cli/tests/output_format_contract.rs index a3780f5b..9ff015d8 100644 --- a/rust/crates/rusty-claude-cli/tests/output_format_contract.rs +++ b/rust/crates/rusty-claude-cli/tests/output_format_contract.rs @@ -184,8 +184,6 @@ fn inventory_commands_emit_structured_json_when_requested() { assert_eq!(plugins["action"], "list"); assert_eq!(plugins["status"], "ok"); assert!(plugins["config_load_error"].is_null()); - assert_eq!(plugins["status"], "ok"); - assert!(plugins["config_load_error"].is_null()); assert!( plugins["reload_runtime"].is_boolean(), "plugins reload_runtime should be a boolean" @@ -587,6 +585,8 @@ fn resumed_inventory_commands_emit_structured_json_when_requested() { ); assert_eq!(plugins["kind"], "plugin"); assert_eq!(plugins["action"], "list"); + assert_eq!(plugins["status"], "ok"); + assert!(plugins["config_load_error"].is_null()); assert!( plugins["reload_runtime"].is_boolean(), "plugins reload_runtime should be a boolean"