feat: use termwiz as backend as that enables a ptty, which can be cleaned up nicely

Cargo.toml

@@ -6,7 +6,6 @@ resolver = "2"
 version = "0.2.0"
 
 [workspace.dependencies]
-gitnow = { path = "crates/gitnow" }
 
 anyhow = { version = "1" }
 tokio = { version = "1", features = ["full"] }

crates/gitnow/Cargo.toml

@@ -25,10 +25,10 @@ prost = "0.13.2"
 prost-types = "0.13.2"
 bytes = "1.7.1"
 nucleo-matcher = "0.3.1"
-ratatui = "0.28.1"
+ratatui = { version = "0.28.1", features = ["termwiz"] }
 crossterm = { version = "0.28.0", features = ["event-stream"] }
 futures = "0.3.30"
-atty = "0.2.14"
+termwiz = "0.22.0"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

crates/gitnow/include/shell/zsh.sh

@@ -1,5 +1,5 @@
 function git-now {
-  choice=$(gitnow "$@")
+  choice=$(gitnow  "$@" --no-shell)
     if [[ $? -ne 0 ]]; then
     return $?
   fi

crates/gitnow/src/commands/root.rs

@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, io::IsTerminal};
 
 use crate::{
     app::App,
@@ -88,7 +88,7 @@ impl RootCommand {
         if clone {
             let git_clone = self.app.git_clone();
 
-            if atty::is(atty::Stream::Stdout) && shell {
+            if std::io::stdout().is_terminal() && shell {
                 let mut wrap_cmd =
                     InlineCommand::new(format!("cloning: {}", repo.to_rel_path().display()));
                 let repo = repo.clone();

crates/gitnow/src/components.rs

@@ -1,4 +1,3 @@
-use anyhow::Error;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 
 pub mod inline_command;

crates/gitnow/src/components/inline_command.rs

@@ -1,23 +1,15 @@
-use std::{
+use std::time::Duration;
-    io::{stderr, Write},
-    time::Duration,
-};
 
-use anyhow::Context;
+use crossterm::event::{EventStream, KeyCode};
-use crossterm::{
-    event::{EventStream, KeyCode, KeyEventKind},
-    terminal::{enable_raw_mode, EnterAlternateScreen},
-    ExecutableCommand,
-};
 use futures::{FutureExt, StreamExt};
 use ratatui::{
     crossterm,
     prelude::*,
-    widgets::{Block, Padding, Paragraph},
+    widgets::{Block, Padding},
     TerminalOptions, Viewport,
 };
 
-use crate::components::{BatchCommand, Command};
+use crate::components::BatchCommand;
 
 use super::{
     create_dispatch,

crates/gitnow/src/components/spinner.rs

@@ -1,11 +1,11 @@
 use std::time::{Duration, Instant};
 
 use ratatui::{
-    text::{Line, Span, Text},
+    text::{Line, Span},
     widgets::{Block, Paragraph, StatefulWidget, Widget},
 };
 
-use super::{BatchCommand, Command, IntoCommand, Msg};
+use super::{BatchCommand, IntoCommand, Msg};
 
 pub struct Spinner<'a> {
     span: Span<'a>,
@@ -68,8 +68,8 @@ impl Default for SpinnerState {
 const MINIDOT_FRAMES: [&str; 10] = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 
 impl SpinnerState {
-    pub fn update(&mut self, msg: &Msg) -> impl IntoCommand {
+    pub fn update(&mut self, _msg: &Msg) -> impl IntoCommand {
-        let mut batch = BatchCommand::default();
+        let batch = BatchCommand::default();
 
         let now = Instant::now();
         if now.duration_since(self.last_event) >= self.interval {

crates/gitnow/src/git_clone.rs

@@ -1,4 +1,4 @@
-use crate::{app::App, components::inline_command::InlineCommand, git_provider::Repository};
+use crate::{app::App, git_provider::Repository};
 
 #[derive(Debug, Clone)]
 pub struct GitClone {

crates/gitnow/src/interactive.rs

@@ -1,11 +1,5 @@
-use std::io::stderr;
-
 use app::App;
-use crossterm::{
+use ratatui::{prelude::*, Terminal};
-    terminal::{enable_raw_mode, EnterAlternateScreen},
-    ExecutableCommand,
-};
-use ratatui::{prelude::CrosstermBackend, Terminal};
 
 use crate::git_provider::Repository;
 
@@ -22,16 +16,11 @@ impl Interactive {
         &mut self,
         repositories: &[Repository],
     ) -> anyhow::Result<Option<Repository>> {
-        let backend = CrosstermBackend::new(std::io::stderr());
+        let backend = TermwizBackend::new().map_err(|e| anyhow::anyhow!(e.to_string()))?;
         let terminal = Terminal::new(backend)?;
 
-        enable_raw_mode()?;
-        stderr().execute(EnterAlternateScreen)?;
-
         let app_result = App::new(self.app, repositories).run(terminal);
 
-        ratatui::restore();
-
         app_result
     }
 }
@@ -50,7 +39,7 @@ mod app {
     use ratatui::{
         crossterm::event::{self, Event, KeyCode},
         layout::{Constraint, Layout},
-        prelude::CrosstermBackend,
+        prelude::TermwizBackend,
         style::{Style, Stylize},
         text::{Line, Span},
         widgets::{ListItem, ListState, Paragraph, StatefulWidget},
@@ -86,8 +75,6 @@ mod app {
                 .fuzzy_matcher()
                 .match_repositories(&self.current_search, self.repositories);
 
-            //res.reverse();
-
             self.matched_repos = res;
 
             if self.list.selected().is_none() {
@@ -95,9 +82,9 @@ mod app {
             }
         }
 
-        pub fn run<T: std::io::Write>(
+        pub fn run(
             mut self,
-            mut terminal: Terminal<CrosstermBackend<T>>,
+            mut terminal: Terminal<TermwizBackend>,
         ) -> anyhow::Result<Option<Repository>> {
             self.update_matched_repos();
 
@@ -117,18 +104,16 @@ mod app {
                             }
                         }
                         KeyCode::Esc => {
-                            terminal.clear()?;
                             return Ok(None);
                         }
                         KeyCode::Enter => {
                             if let Some(selected) = self.list.selected() {
                                 if let Some(repo) = self.matched_repos.get(selected).cloned() {
-                                    terminal.clear()?;
+                                    terminal.resize(ratatui::layout::Rect::ZERO)?;
                                     return Ok(Some(repo));
                                 }
                             }
 
-                            terminal.clear()?;
                             return Ok(None);
                         }
                         KeyCode::Up => self.list.select_next(),