Compare commits

..

3 Commits

Author SHA1 Message Date
YeonGyu-Kim
ae65619cd9 fix: block /plugins update in resume mode, fix comment
Address REQUEST_CHANGES from OMX review:
1. Add 'update' to the blocked mutation actions in resume mode
   (previously only install/uninstall/enable/disable were blocked)
2. Fix comment: 'Only list is supported' instead of 'Only list/help'
   since /plugins help doesn't actually parse as a valid action
2026-05-01 06:49:50 +09:00
YeonGyu-Kim
39bae88f3b style: cargo fmt line wrap in run_resume_command plugins handler 2026-05-01 06:42:53 +09:00
YeonGyu-Kim
b9a17db28a fix: support /plugins slash command in resume mode
Move SlashCommand::Plugins out of the 'unsupported resumed slash
command' catch-all and add a handler arm in run_resume_command that
calls handle_plugins_slash_command for list/help actions.

Mutation actions (install/uninstall/enable/disable) are rejected with
a clear error since there is no runtime to reload in resume mode.

Add /plugins coverage to resumed_inventory_commands test in
output_format_contract.rs: kind, action, reload_runtime, target.

Before: claw --resume session.jsonl /plugins --output-format json
-> {error: 'unsupported resumed slash command', type: 'error'}, exit 1

After: claw --resume session.jsonl /plugins --output-format json
-> {kind: 'plugin', action: 'list', ...}, exit 0
2026-05-01 06:38:44 +09:00
3 changed files with 44 additions and 31 deletions

View File

@@ -2627,15 +2627,12 @@ fn print_version(output_format: CliOutputFormat) -> Result<(), Box<dyn std::erro
} }
fn version_json_value() -> serde_json::Value { fn version_json_value() -> serde_json::Value {
let executable_path = env::current_exe().ok().map(|p| p.display().to_string());
json!({ json!({
"kind": "version", "kind": "version",
"message": render_version_report(), "message": render_version_report(),
"version": VERSION, "version": VERSION,
"git_sha": GIT_SHA, "git_sha": GIT_SHA,
"target": BUILD_TARGET, "target": BUILD_TARGET,
"build_date": DEFAULT_DATE,
"executable_path": executable_path,
}) })
} }
@@ -3526,10 +3523,10 @@ fn run_resume_command(
Ok(ResumeCommandOutcome { Ok(ResumeCommandOutcome {
session: session.clone(), session: session.clone(),
message: Some(handle_agents_slash_command(args.as_deref(), &cwd)?), message: Some(handle_agents_slash_command(args.as_deref(), &cwd)?),
json: Some( json: Some(serde_json::json!({
serde_json::to_value(handle_agents_slash_command_json(args.as_deref(), &cwd)?) "kind": "agents",
.unwrap_or_else(|_| serde_json::json!(null)), "text": handle_agents_slash_command(args.as_deref(), &cwd)?,
), })),
}) })
} }
SlashCommand::Skills { args } => { SlashCommand::Skills { args } => {
@@ -3545,6 +3542,37 @@ fn run_resume_command(
json: Some(handle_skills_slash_command_json(args.as_deref(), &cwd)?), json: Some(handle_skills_slash_command_json(args.as_deref(), &cwd)?),
}) })
} }
SlashCommand::Plugins { action, target } => {
// Only list is supported in resume mode (no runtime to reload)
match action.as_deref() {
Some("install") | Some("uninstall") | Some("enable") | Some("disable")
| Some("update") => {
return Err(
"resumed /plugins mutations are interactive-only; start `claw` and run `/plugins` in the REPL".into(),
);
}
_ => {}
}
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 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,
});
Ok(ResumeCommandOutcome {
session: session.clone(),
message: Some(result.message),
json: Some(json),
})
}
SlashCommand::Doctor => { SlashCommand::Doctor => {
let report = render_doctor_report()?; let report = render_doctor_report()?;
Ok(ResumeCommandOutcome { Ok(ResumeCommandOutcome {
@@ -3631,7 +3659,6 @@ fn run_resume_command(
| SlashCommand::Model { .. } | SlashCommand::Model { .. }
| SlashCommand::Permissions { .. } | SlashCommand::Permissions { .. }
| SlashCommand::Session { .. } | SlashCommand::Session { .. }
| SlashCommand::Plugins { .. }
| SlashCommand::Login | SlashCommand::Login
| SlashCommand::Logout | SlashCommand::Logout
| SlashCommand::Vim | SlashCommand::Vim

View File

@@ -30,15 +30,6 @@ fn version_emits_json_when_requested() {
let parsed = assert_json_command(&root, &["--output-format", "json", "version"]); let parsed = assert_json_command(&root, &["--output-format", "json", "version"]);
assert_eq!(parsed["kind"], "version"); assert_eq!(parsed["kind"], "version");
assert_eq!(parsed["version"], env!("CARGO_PKG_VERSION")); assert_eq!(parsed["version"], env!("CARGO_PKG_VERSION"));
// Provenance fields must be present for binary identification (#507).
assert!(
parsed["build_date"].is_string(),
"build_date must be a string in version JSON"
);
assert!(
parsed["executable_path"].is_string(),
"executable_path must be a string in version JSON so callers can identify which binary is running"
);
} }
#[test] #[test]
@@ -370,14 +361,14 @@ fn resumed_inventory_commands_emit_structured_json_when_requested() {
assert!(skills["summary"]["total"].is_number()); assert!(skills["summary"]["total"].is_number());
assert!(skills["skills"].is_array()); assert!(skills["skills"].is_array());
let agents = assert_json_command_with_env( let plugins = assert_json_command_with_env(
&root, &root,
&[ &[
"--output-format", "--output-format",
"json", "json",
"--resume", "--resume",
session_path.to_str().expect("utf8 session path"), session_path.to_str().expect("utf8 session path"),
"/agents", "/plugins",
], ],
&[ &[
( (
@@ -387,15 +378,15 @@ fn resumed_inventory_commands_emit_structured_json_when_requested() {
("HOME", home.to_str().expect("utf8 home")), ("HOME", home.to_str().expect("utf8 home")),
], ],
); );
assert_eq!(agents["kind"], "agents"); assert_eq!(plugins["kind"], "plugin");
assert_eq!(agents["action"], "list"); assert_eq!(plugins["action"], "list");
assert!( assert!(
agents["agents"].is_array(), plugins["reload_runtime"].is_boolean(),
"agents field must be a JSON array" "plugins reload_runtime should be a boolean"
); );
assert!( assert!(
agents["count"].is_number(), plugins["target"].is_null(),
"count must be a number, not a text render" "plugins target should be null when no plugin is targeted"
); );
} }

View File

@@ -227,8 +227,6 @@ fn resumed_status_command_emits_structured_json_when_requested() {
// given // given
let temp_dir = unique_temp_dir("resume-status-json"); let temp_dir = unique_temp_dir("resume-status-json");
fs::create_dir_all(&temp_dir).expect("temp dir should exist"); fs::create_dir_all(&temp_dir).expect("temp dir should exist");
let config_home = temp_dir.join("config-home");
fs::create_dir_all(&config_home).expect("isolated config home should exist");
let session_path = temp_dir.join("session.jsonl"); let session_path = temp_dir.join("session.jsonl");
let mut session = workspace_session(&temp_dir); let mut session = workspace_session(&temp_dir);
@@ -240,9 +238,7 @@ fn resumed_status_command_emits_structured_json_when_requested() {
.expect("session should persist"); .expect("session should persist");
// when // when
// Use an isolated CLAW_CONFIG_HOME so ~/.claw/settings.json is not loaded, let output = run_claw(
// which would cause loaded_config_files to be non-zero (#65).
let output = run_claw_with_env(
&temp_dir, &temp_dir,
&[ &[
"--output-format", "--output-format",
@@ -251,7 +247,6 @@ fn resumed_status_command_emits_structured_json_when_requested() {
session_path.to_str().expect("utf8 path"), session_path.to_str().expect("utf8 path"),
"/status", "/status",
], ],
&[("CLAW_CONFIG_HOME", config_home.to_str().expect("utf8 path"))],
); );
// then // then