diff --git a/markbase-core/src/ssh_server/channel.rs b/markbase-core/src/ssh_server/channel.rs
index f273067..8904b2e 100644
--- a/markbase-core/src/ssh_server/channel.rs
+++ b/markbase-core/src/ssh_server/channel.rs
@@ -194,6 +194,7 @@ impl ChannelManager {
             direct_tcpip: None,
             forwarded_tcpip: None,
             auth_agent_socket: None,
+            x11_forward_context: None, // Phase 2: X11 forwarding
         };
 
         self.channels.insert(server_channel, channel);
@@ -275,6 +276,7 @@ impl ChannelManager {
             direct_tcpip: Some(direct_tcpip),
             forwarded_tcpip: None,
             auth_agent_socket: None,
+            x11_forward_context: None, // Phase 2: X11 forwarding
         };
 
         self.channels.insert(server_channel, channel);
@@ -350,9 +352,10 @@ impl ChannelManager {
             scp_input_buffer: Vec::new(),  // ⭐⭐⭐⭐⭐ Phase 14.4修复
             scp_state: ScpState::Idle,       // ⭐⭐⭐⭐⭐ Phase 8.3: SCP state machine
             scp_output_file: None,           // Phase 17: SCP file receive
-            direct_tcpip: None,
-            forwarded_tcpip: Some(forwarded_tcpip),
+direct_tcpip: None,
+            forwarded_tcpip: None,
             auth_agent_socket: None,
+            x11_forward_context: None, // Phase 2: X11 forwarding
         };
 
         self.channels.insert(server_channel, channel);
@@ -429,6 +432,7 @@ impl ChannelManager {
             direct_tcpip: None,
             forwarded_tcpip: None,
             auth_agent_socket: None,
+            x11_forward_context: None, // Phase 2: X11 forwarding
         };
         
         self.channels.insert(server_channel, channel);
@@ -2291,6 +2295,8 @@ struct Channel {
     forwarded_tcpip: Option<ForwardedTcpipChannel>, // forwarded-tcpip channel（Local forwarding）
     // SSH Agent forwarding
     auth_agent_socket: Option<String>, // SSH agent socket path (SSH_AUTH_SOCK)
+    // Phase 2: X11 forwarding context
+    x11_forward_context: Option<super::x11_forward::X11ForwardContext>, // X11 forwarding context
 }
 
 /// SSH Channel状态（参考OpenSSH channel.c）