refactor(terminal-gateway): route send_input via terminal_write

- Replace tmux_session_name + tmux_pane_id fields with terminal_id: u64
  in GatewayTerminalRuntime
- send_input now calls terminal::terminal_write instead of
  tmux::send_tmux_raw_input, bridging via the terminal_id
- session_runtime_liveness_for_binding checks state.terminals for
  presence instead of calling tmux_session_exists
- All call sites updated to pass terminal_id (the real terminal.id
  from create_terminal_runtime, or a dummy value in test code)
- send_input_marks_bound_session_running test asserts
  terminal_write_log contains the sent input

Author: pallyoung

apps/server/src/services/session_runtime.rs

@@ -421,8 +421,7 @@ pub(crate) fn session_runtime_start(
         params.workspace_id.clone(),
         params.session_id.clone(),
         session.provider.as_str().to_string(),
-        tmux_runtime.session_name.clone(),
-        tmux_runtime.pane_id.clone(),
+        terminal.id,
     );
     state
         .terminal_runtimes
@@ -545,8 +544,7 @@ mod tests {
             "ws-1".to_string(),
             "session-1".to_string(),
             "claude".to_string(),
-            String::new(),
-            String::new(),
+            0,
         ));
         drop(registry);
 

apps/server/src/services/terminal_gateway.rs

@@ -9,8 +9,7 @@ pub(crate) struct GatewayTerminalRuntime {
     pub(crate) workspace_id: String,
     pub(crate) session_id: String,
     pub(crate) provider: String,
-    pub(crate) tmux_session_name: String,
-    pub(crate) tmux_pane_id: String,
+    pub(crate) terminal_id: u64,
 }
 
 pub(crate) type TerminalRuntime = GatewayTerminalRuntime;
@@ -21,16 +20,14 @@ impl GatewayTerminalRuntime {
         workspace_id: String,
         session_id: String,
         provider: String,
-        tmux_session_name: String,
-        tmux_pane_id: String,
+        terminal_id: u64,
     ) -> Self {
         Self {
             runtime_id,
             workspace_id,
             session_id,
             provider,
-            tmux_session_name,
-            tmux_pane_id,
+            terminal_id,
         }
     }
 }
@@ -95,33 +92,23 @@ pub(crate) fn send_input(
         .cloned()
         .ok_or_else(|| "terminal_runtime_not_found".to_string())?;
 
-    #[cfg(test)]
-    {
-        let _ = input;
-        let _ = sync_session_runtime_state(
-            state,
-            &runtime.workspace_id,
-            &runtime.session_id,
-            SessionStatus::Running,
-            true,
-            Some(SessionRuntimeLiveness::Attached),
-        );
-        return Ok(());
-    }
-
-    #[cfg(not(test))]
-    {
-        crate::services::tmux::send_tmux_raw_input(&runtime.tmux_session_name, input)?;
-        let _ = sync_session_runtime_state(
-            state,
-            &runtime.workspace_id,
-            &runtime.session_id,
-            SessionStatus::Running,
-            true,
-            Some(SessionRuntimeLiveness::Attached),
-        );
-        Ok(())
-    }
+    crate::services::terminal::terminal_write(
+        runtime.workspace_id.clone(),
+        runtime.terminal_id,
+        input.to_string(),
+        crate::TerminalWriteOrigin::User,
+        state,
+    )?;
+
+    let _ = sync_session_runtime_state(
+        state,
+        &runtime.workspace_id,
+        &runtime.session_id,
+        SessionStatus::Running,
+        true,
+        Some(SessionRuntimeLiveness::Attached),
+    );
+    Ok(())
 }
 
 pub(crate) fn emit_terminal_channel_output(app: &AppHandle, runtime_id: &str, data: &str) {
@@ -135,7 +122,7 @@ mod tests {
     use crate::services::workspace::resolve_session_for_slot;
     use crate::{
         create_session, default_idle_policy, init_db, launch_workspace_record, AgentProvider,
-        ExecTarget, SessionMode, WorkspaceSource, WorkspaceSourceKind,
+        ExecTarget, SessionMode, TerminalWriteOrigin, WorkspaceSource, WorkspaceSourceKind,
     };
 
     fn test_app() -> AppHandle {
@@ -167,8 +154,7 @@ mod tests {
             workspace_id.to_string(),
             session_id.to_string(),
             "claude".to_string(),
-            format!("coder-studio-{workspace_id}-{session_id}"),
-            "%1".to_string(),
+            0,
         )
     }
 
@@ -233,14 +219,14 @@ mod tests {
             app.state(),
         )
         .unwrap();
+        let terminal_id = 42u64;
         app.state().terminal_runtimes.lock().unwrap().insert(
             TerminalRuntime::new(
                 "runtime-1".to_string(),
                 workspace_id.clone(),
                 created.id.clone(),
                 "claude".to_string(),
-                "tmux-session-1".to_string(),
-                "%1".to_string(),
+                terminal_id,
             ),
         );
 
@@ -252,5 +238,14 @@ mod tests {
             updated.runtime_liveness,
             Some(SessionRuntimeLiveness::Attached)
         );
+
+        let log = app.state().terminal_write_log.lock().unwrap();
+        assert!(
+            log.iter().any(|(ws, tid, data, origin)| {
+                ws == &workspace_id && *tid == terminal_id && data == "hello" && *origin == TerminalWriteOrigin::User
+            }),
+            "terminal_write_log should contain the sent input: {:?}",
+            &*log
+        );
     }
 }

apps/server/src/services/workspace.rs

@@ -940,8 +940,7 @@ mod tests {
                 workspace_id.clone(),
                 created.id.clone(),
                 "claude".to_string(),
-                "missing-tmux-session".to_string(),
-                "%1".to_string(),
+                99,
             ),
         );
         let mut rx = app.state().transport_events.subscribe();
@@ -996,8 +995,7 @@ mod tests {
                 workspace_id.clone(),
                 created.id.clone(),
                 "claude".to_string(),
-                "missing-tmux-session".to_string(),
-                "%1".to_string(),
+                77,
             ),
         );
 

apps/server/src/services/workspace_runtime.rs

@@ -351,7 +351,14 @@ pub(crate) fn session_runtime_liveness_for_binding(
         return Some(SessionRuntimeLiveness::ProviderExited);
     }
 
-    if crate::services::tmux::tmux_session_exists(&runtime.tmux_session_name) {
+    let key = crate::ws::server::terminal_key(&runtime.workspace_id, runtime.terminal_id);
+    if state
+        .terminals
+        .lock()
+        .ok()
+        .map(|terms| terms.contains_key(&key))
+        .unwrap_or(false)
+    {
         Some(SessionRuntimeLiveness::Attached)
     } else {
         Some(SessionRuntimeLiveness::TmuxMissing)
@@ -1427,8 +1434,7 @@ mod tests {
                 workspace_id.clone(),
                 other.id.to_string(),
                 "claude".to_string(),
-                "missing-tmux-session".to_string(),
-                "%1".to_string(),
+                99,
             ),
         );
 
@@ -1471,8 +1477,7 @@ mod tests {
                 workspace_id.clone(),
                 session.id.to_string(),
                 "claude".to_string(),
-                "missing-tmux-session".to_string(),
-                "%1".to_string(),
+                99,
             ),
         );
 

apps/server/src/ws/server.rs

@@ -792,8 +792,7 @@ mod tests {
             workspace_id.clone(),
             "session-1".into(),
             "claude".into(),
-            "tmux-session-1".into(),
-            "%1".into(),
+            1,
         );
         app.state()
             .terminal_runtimes
@@ -856,8 +855,7 @@ mod tests {
                     "ws-1".to_string(),
                     "session-1".to_string(),
                     "claude".to_string(),
-                    "tmux-fake".to_string(),
-                    "%1".to_string(),
+                    42,
                 ),
             );
 
@@ -919,8 +917,7 @@ mod tests {
                     "ws-1".to_string(),
                     "session-1".to_string(),
                     "claude".to_string(),
-                    "tmux-fake".to_string(),
-                    "%1".to_string(),
+                    42,
                 ),
             );