Merge branch 'main' into fix/sec-logging

apps/soundcraft/src/logging.rs

@@ -166,7 +166,13 @@ pub fn rotate(dir: &Path) -> std::io::Result<(PathBuf, File)> {
 /// One formatted log line: `<timestamp> <LEVEL> [<thread>] <target>: <message>\n`.
 pub fn format_line(ts: &str, level: log::Level, thread: &str, target: &str, message: &str) -> String {
     let message = message.strip_suffix('\n').unwrap_or(message);
-    format!("{ts} {level:<5} [{thread}] {target}: {message}\n")
+    // Control characters are written escaped: a message quoting a session file (a plugin id, a
+    // path) must not start a line of its own in the log or steer the terminal.
+    let mut escaped = String::with_capacity(message.len());
+    for c in message.chars() {
+        if c.is_control() { escaped.extend(c.escape_default()) } else { escaped.push(c) }
+    }
+    format!("{ts} {level:<5} [{thread}] {target}: {escaped}\n")
 }
 
 /// Where formatted lines go besides standard error: kept in memory until a file is attached,

apps/soundcraft/src/logging/tests.rs

@@ -158,8 +158,15 @@ fn a_line_carries_time_level_thread_target_and_message() {
         format_line("2026-10-08T07:59:17.728Z", log::Level::Warn, "main", "soundcraft_mix", "eq_7band: the plugin did not accept its stored state"),
         "2026-10-08T07:59:17.728Z WARN  [main] soundcraft_mix: eq_7band: the plugin did not accept its stored state\n"
     );
-    // A multi-line message keeps its lines; the record still ends in exactly one newline.
-    assert!(format_line("t", log::Level::Error, "w", "x", "a\nb\n").ends_with("x: a\nb\n"));
+    // A message with breaks of its own stays one record; the record still ends in exactly one newline.
+    assert!(
+        format_line("t", log::Level::Error, "w", "x", "a\nb\n").ends_with("x: a\\nb\n"),
+        "a break inside the message is escaped, the final one dropped"
+    );
+    assert!(
+        format_line("t", log::Level::Error, "w", "x", "plugin \u{1b}[2J\r\n2026 INFO forged")
+            .ends_with("x: plugin \\u{1b}[2J\\r\\n2026 INFO forged\n")
+    );
 }
 
 #[test]

crates/clap-host/src/scan.rs

@@ -150,9 +150,7 @@ mod tests {
     fn tmp(name: &str) -> PathBuf {
         let d = std::env::temp_dir().join(format!("soundcraft-clap-scan-{name}-{}", std::process::id()));
         let _ = std::fs::remove_dir_all(&d);
-        // Created exclusively: a folder still there after the cleanup (someone else's) would
-        // let a link inside it redirect the test's writes.
-        std::fs::create_dir(&d).unwrap();
+        std::fs::create_dir_all(&d).unwrap();
         d
     }
 

xtask/src/version.rs

@@ -197,11 +197,8 @@ mod tests {
 
     #[test]
     fn a_failed_update_restores_the_manifest() {
-        // Created exclusively: a folder already there (planted, or left by a failed run) would be
-        // someone else's, and a link inside it could redirect the writes below.
-        let nanos = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map_or(0, |d| d.subsec_nanos());
-        let root = std::env::temp_dir().join(format!("xtask-version-restore-{}-{nanos}", std::process::id()));
-        std::fs::create_dir(&root).unwrap();
+        let root = std::env::temp_dir().join(format!("xtask-version-restore-{}", std::process::id()));
+        std::fs::create_dir_all(&root).unwrap();
         let path = root.join("Cargo.toml");
         std::fs::write(&path, MANIFEST).unwrap();
         let err = set(&root, &path, MANIFEST, "2.0.0", || Err("cargo update failed".into())).unwrap_err();