fix: resolve rebase artifacts (missing impl block, stray brace, per-channel state)

Author: drew

crates/openshell-cli/src/ssh.rs

@@ -1198,4 +1198,3 @@ mod tests {
         assert!(args.contains(&format!("ServerAliveCountMax={SSH_SERVER_ALIVE_COUNT_MAX}")));
     }
 }
-}

crates/openshell-sandbox/src/ssh.rs

@@ -10,9 +10,9 @@ use crate::sandbox;
 #[cfg(target_os = "linux")]
 use crate::{register_managed_child, unregister_managed_child};
 use miette::{IntoDiagnostic, Result};
-use openshell_core::net::enable_tcp_keepalive;
 use nix::pty::{Winsize, openpty};
 use nix::unistd::setsid;
+use openshell_core::net::enable_tcp_keepalive;
 use rand_core::OsRng;
 use russh::keys::{Algorithm, PrivateKey};
 use russh::server::{Auth, Handle, Session};
@@ -542,7 +542,7 @@ impl russh::server::Handler for SshHandler {
                 self.ca_file_paths.clone(),
                 &self.provider_env,
             )?;
-            self.input_sender = Some(input_sender);
+            self.channel_state(channel).input_sender = Some(input_sender);
         } else {
             warn!(subsystem = name, "unsupported subsystem requested");
             session.channel_failure(channel)?;
@@ -1207,8 +1207,8 @@ fn is_loopback_host(host: &str) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::process::Stdio;
     use crate::policy::{FilesystemPolicy, LandlockPolicy, NetworkPolicy, ProcessPolicy};
+    use std::process::Stdio;
 
     fn test_channel_id(id: u32) -> ChannelId {
         #[allow(unsafe_code)]

crates/openshell-server/src/grpc.rs

@@ -3928,11 +3928,8 @@ async fn start_single_use_ssh_proxy(
 
         // Connect to the resolved address directly (not the hostname) to
         // prevent TOCTOU between validation and connection.
-        let Ok(connect_result) = tokio::time::timeout(
-            SSH_PROXY_CONNECT_TIMEOUT,
-            TcpStream::connect(resolved),
-        )
-        .await
+        let Ok(connect_result) =
+            tokio::time::timeout(SSH_PROXY_CONNECT_TIMEOUT, TcpStream::connect(resolved)).await
         else {
             warn!(target_host = %target_host, resolved_ip = %resolved.ip(), target_port, "SSH proxy: timed out connecting to sandbox");
             return;