`9ae74bd`

fix: wait for DA1 response before sending startup commands

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 9ae74bd57aeca36bb2436f33bd24b5c0f5d13a41
Parents: 6571830
Tree: 5a94128

2 changed files

Status	File	+	-
M	`garterm/src/terminal/mod.rs`	12	0
M	`garterm/src/ui/pane.rs`	16	2

garterm/src/terminal/mod.rsmodified

      clipboard_events: VecDeque<ClipboardEvent>,
      /// Prompt ready flag (from OSC 133;A - shell integration)
      prompt_ready: bool,
 +    /// DA1 (Primary Device Attributes) has been responded to
 +    /// Used to know when shell initialization queries are complete
 +    da1_responded: bool,
+ }
  impl Terminal {
              current_hyperlink_id: 0,
              clipboard_events: VecDeque::new(),
              prompt_ready: false,
 +            da1_responded: false,
+         }
+     }
          std::mem::replace(&mut self.prompt_ready, false)
+     }
 +    /// Check if DA1 (Primary Device Attributes) has been responded to
 +    /// Used to know when shell initialization is far enough along
 +    pub fn da1_responded(&self) -> bool {
 +        self.da1_responded
 +    }
++
      /// Get current working directory (from OSC 7)
      pub fn cwd(&self) -> Option<&str> {
          self.cwd.as_deref()
                  // 9 = national replacement charsets, 15 = technical charsets,
                  // 18 = user windows, 21 = horizontal scrolling, 22 = ANSI color
                  self.term.queue_response(b"\x1b[?64;1;2;6;9;15;18;21;22c".to_vec());
 +                self.term.da1_responded = true;
 +                debug!("DA1: responded with VT420 capabilities");
+             }
              // Secondary Device Attributes (DA2)

garterm/src/ui/pane.rsmodified

          if let Some(cmd) = startup_cmd {
              pane.startup_cmd_state = StartupCmdState::WaitingForPrompt {
                  cmd: cmd.to_string(),
 -                deadline: Instant::now() + Duration::from_millis(500),
 +                // Deadline is checked only AFTER DA1 response, so this is additional wait time
 +                deadline: Instant::now() + Duration::from_millis(1000),
              };
+         }
      /// Called when terminal receives OSC 133;A prompt marker
      pub fn on_prompt_ready(&mut self) {
          if let StartupCmdState::WaitingForPrompt { ref cmd, .. } = self.startup_cmd_state {
 +            // Also require DA1 to be responded to (shell has completed basic init)
 +            if !self.terminal.da1_responded() {
 +                return;
 +            }
              let cmd_with_newline = format!("{}\n", cmd);
              if let Err(e) = self.write_pty(cmd_with_newline.as_bytes()) {
                  tracing::error!("Failed to send startup command: {}", e);
+             }
              self.startup_cmd_state = StartupCmdState::Sent;
 +            tracing::debug!("Sent startup command on prompt ready");
+         }
+     }
      /// Check startup deadline and send command if timed out
 +    /// Only sends after DA1 has been responded to (shell has started initialization)
      pub fn check_startup_deadline(&mut self) {
          if let StartupCmdState::WaitingForPrompt { ref cmd, deadline } = self.startup_cmd_state {
 +            // Wait for DA1 response before considering the deadline
 +            // This ensures the shell has at least started initialization
 +            if !self.terminal.da1_responded() {
 +                return;
 +            }
++
              if Instant::now() >= deadline {
 -                // Fallback: send anyway after timeout
 +                // Fallback: send anyway after timeout (DA1 responded + deadline passed)
                  let cmd_with_newline = format!("{}\n", cmd);
                  if let Err(e) = self.write_pty(cmd_with_newline.as_bytes()) {
                      tracing::error!("Failed to send startup command (deadline): {}", e);
+                 }
                  self.startup_cmd_state = StartupCmdState::Sent;
 +                tracing::debug!("Sent startup command after DA1 + deadline");
+             }
+         }
+     }