Merge fix/gc-report-json-1257 into v5/json-envelope-unify

Takes #1273's LF-normalized contract_doc(); the bun.lockb shared-bundled
rollback counts agent failed events (no details.mode) on top of the
refused hosted pin.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: mikolalysenko

crates/socket-patch-cli/src/json_envelope.rs

@@ -1363,13 +1363,15 @@ mod tests {
     }
 
     /// The ```jsonc block under `heading` in CLI_CONTRACT.md.
+    /// CLI_CONTRACT.md with LF line endings: a Windows checkout may carry
+    /// CRLF, which the `"```jsonc\n"` fence match below would miss.
+    fn contract_doc() -> &'static str {
+        static DOC: std::sync::OnceLock<String> = std::sync::OnceLock::new();
+        DOC.get_or_init(|| include_str!("../CLI_CONTRACT.md").replace("\r\n", "\n"))
+    }
+
     fn contract_block(heading: &str) -> &'static str {
-        // A Windows checkout may carry CRLF line endings.
-        let doc: &'static str = Box::leak(
-            include_str!("../CLI_CONTRACT.md")
-                .replace("\r\n", "\n")
-                .into_boxed_str(),
-        );
+        let doc = contract_doc();
         let at = doc
             .find(heading)
             .unwrap_or_else(|| panic!("{heading} missing"));
@@ -1446,7 +1448,7 @@ mod tests {
             object_keys(value["files"][0].clone()),
             "files[] keys"
         );
-        let doc = include_str!("../CLI_CONTRACT.md");
+        let doc = contract_doc();
         for action in [
             PatchAction::Discovered,
             PatchAction::Downloaded,

crates/socket-patch-cli/tests/e2e_bun_lockb.rs

@@ -161,7 +161,16 @@ fn rollback_refuses_binary_hosted_pin_then_checkout(
         assert_eq!(env["error"]["code"], "rollback_failed", "{env}");
         assert_eq!(rollback_json::already_original(&env), 0, "{env}");
     }
-    assert_eq!(env["summary"]["failed"], 1, "{env}");
+    // `failed` spans every leg (#1066): the refused hosted pin plus any
+    // agent copy that could not be restored (a bundled copy the patch never
+    // touched reports `hash_mismatch`); agent events carry no mode.
+    let agent_failed = env["events"]
+        .as_array()
+        .into_iter()
+        .flatten()
+        .filter(|e| e["action"] == "failed" && e["details"]["mode"].is_null())
+        .count();
+    assert_eq!(env["summary"]["failed"], 1 + agent_failed, "{env}");
     let failed_view = rollback_json::hosted_failed(&env);
     let failed = failed_view.as_array().cloned().unwrap_or_default();
     assert!(