feat: harden community production foundation through story 1.5

crates/crank-community-mcp/src/jsonrpc.rs

@@ -45,16 +45,35 @@ pub fn jsonrpc_result(id: Value, result: Value) -> Value {
 }
 
 pub fn jsonrpc_error(id: Value, code: i64, message: impl Into<String>) -> Value {
+    let mut error = json!({
+        "code": code,
+        "message": message.into()
+    });
+    let (request_id, trace_id) = crank_observability::current_request_correlation();
+    if request_id.is_some() && trace_id.is_some() {
+        error["data"] = correlated_error_data(json!({}));
+    }
     json!({
         "jsonrpc": "2.0",
         "id": id,
-        "error": {
-            "code": code,
-            "message": message.into()
-        }
+        "error": error
     })
 }
 
+pub fn correlated_error_data(mut data: Value) -> Value {
+    if !data.is_object() {
+        data = json!({});
+    }
+    let (request_id, trace_id) = crank_observability::current_request_correlation();
+    if let Some(request_id) = request_id {
+        data["request_id"] = Value::String(request_id);
+    }
+    if let Some(trace_id) = trace_id {
+        data["trace_id"] = Value::String(trace_id);
+    }
+    data
+}
+
 pub fn negotiated_protocol_version(requested: &str) -> Option<&'static str> {
     SUPPORTED_PROTOCOL_VERSIONS
         .iter()