MCP: validate numeric transform steps before editing (#6488)

This commit is contained in:
yoriswind
2026-11-10 19:17:39 -08:00
parent 1d0a1e90d1
commit 8dbe7bd3cb
2 changed files with 49 additions and 1 deletions
+40
View File
@@ -1921,3 +1921,43 @@ fn add_text_reports_overflow_and_takes_a_fit() {
let point = made(&call(&mut s, 3, "add_text", json!({"text": "NEON DRIVE", "x": 0, "y": 300, "size": 60})));
assert!(point.get("overflow").is_none(), "{point}");
}
#[test]
fn transform_rejects_nonnumeric_steps_before_editing() {
let inspect = |s: &mut Server, id| serde_json::from_str::<Value>(&text_of(&call(s, id, "doc_inspect", json!({})))).unwrap();
let mut s = server();
let first = id_of(&call(&mut s, 1, "draw_path", json!({"d": "M10 10 L30 10 L30 25 Z"})));
let second = id_of(&call(&mut s, 2, "draw_path", json!({"d": "M40 40 L60 40 L60 55 Z"})));
let before = inspect(&mut s, 3);
assert_eq!(before["selection"], json!([second]));
let cases = [
("rotate", json!({"dx": 10, "rotate": "bad"})),
("scale", json!({"dx": 10, "scale": "bad"})),
("scaleX", json!({"dx": 10, "scaleX": "bad", "scaleY": 150})),
("scaleY", json!({"dx": 10, "scaleX": 150, "scaleY": "bad"})),
("shear", json!({"dx": 10, "shear": "bad"})),
];
for (index, (field, mut args)) in cases.into_iter().enumerate() {
args["ids"] = json!([first]);
let request_id = 4 + index as u64 * 2;
let rejected = call(&mut s, request_id, "transform", args);
assert_eq!(rejected["isError"], true, "{field}: {rejected}");
assert!(text_of(&rejected).contains(field), "{field}: {rejected}");
assert_eq!(inspect(&mut s, request_id + 1), before, "{field}");
}
let applied = call(&mut s, 14, "transform", json!({"ids": [first], "dx": 10, "rotate": null, "scale": 150, "scaleX": 125}));
assert_eq!(applied["isError"], false, "{applied}");
let applied: Value = serde_json::from_str(&text_of(&applied)).unwrap();
assert_eq!(applied["applied"], json!(["move", "scale"]));
let after = inspect(&mut s, 15);
assert_ne!(after, before);
assert_eq!(after["objects"], before["objects"]);
assert_eq!(after["selection"], json!([first]));
let bounds = &after["selectionBounds"];
assert!((bounds["width"].as_f64().unwrap() - 25.0).abs() < 1e-6, "{bounds}");
assert!((bounds["height"].as_f64().unwrap() - 22.5).abs() < 1e-6, "{bounds}");
assert!(after["history"].as_array().unwrap().contains(&json!("Move")));
assert!(after["history"].as_array().unwrap().contains(&json!("Scale")));
}
+9 -1
View File
@@ -251,7 +251,15 @@ fn dispatch(b: &mut dyn Backend, name: &str, a: &Args) -> Result<ToolResult, Str
select_ids(b, a)?;
j(exec(b, &format!("object.pathfinder.{}", req_str(a, "operation")?), json!({}))?)
}
"transform" => j(transform(b, a)?),
"transform" => {
// Validate all numeric steps before the handler changes selection or runs a step.
for field in ["rotate", "scale", "scaleX", "scaleY", "shear"] {
if a.get(field).is_some_and(|value| !value.is_null() && value.as_f64().is_none()) {
return Err(format!("`{field}` must be a number"));
}
}
j(transform(b, a)?)
}
"create_graph" => {
let mut p = Value::Object(a.clone());
if p.get("type").is_none() {