fix(powershell): work around issue with PowerShell 7.5.0

PowerShell/PowerShell#24986

Author: ltrzesniewski

crates/atuin/src/command/client/search.rs

@@ -1,4 +1,5 @@
-use std::io::{IsTerminal as _, stderr};
+use std::fs::File;
+use std::io::{IsTerminal as _, Write, stderr};
 
 use atuin_common::utils::{self, Escapable as _};
 use clap::Parser;
@@ -127,6 +128,10 @@ pub struct Cmd {
     /// Include duplicate commands in the output (non-interactive only)
     #[arg(long)]
     include_duplicates: bool,
+
+    /// File name to write the result to (hidden from help as this is meant to be used from a script)
+    #[arg(long = "result-file", hide = true)]
+    result_file: Option<String>,
 }
 
 impl Cmd {
@@ -209,7 +214,11 @@ impl Cmd {
 
         if self.interactive {
             let item = interactive::history(&query, settings, db, &history_store, theme).await?;
-            if stderr().is_terminal() {
+
+            if let Some(result_file) = self.result_file {
+                let mut file = File::create(result_file)?;
+                write!(file, "{item}")?;
+            } else if stderr().is_terminal() {
                 eprintln!("{}", item.escape_control());
             } else {
                 eprintln!("{item}");

crates/atuin/src/command/mod.rs

@@ -16,6 +16,7 @@ mod gen_completions;
 
 #[derive(Subcommand)]
 #[command(infer_subcommands = true)]
+#[allow(clippy::large_enum_variant)]
 pub enum AtuinCmd {
     #[cfg(feature = "client")]
     #[command(flatten)]

crates/atuin/src/shell/atuin.ps1

@@ -63,29 +63,21 @@ New-Module -Name Atuin -ScriptBlock {
     function RunSearch {
         param([string]$ExtraArgs = "")
 
-        $line = $null
-        [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$line, [ref]$null)
-
-        # Atuin is started through Start-Process to avoid interfering with the current shell,
-        # and to capture its output which is provided in stderr (redirected to a temporary file).
-
-        $suggestion = ""
+        $previousOutputEncoding = [System.Console]::OutputEncoding
         $resultFile = New-TemporaryFile
-        try {
-            $env:ATUIN_SHELL_POWERSHELL = "true"
-            $argString = "search -i $ExtraArgs -- $line"
-            Start-Process -Wait -NoNewWindow -RedirectStandardError $resultFile.FullName -FilePath atuin -ArgumentList $argString
-            $suggestion = (Get-Content -Raw $resultFile -Encoding UTF8 | Out-String).Trim()
-        }
-        finally {
-            $env:ATUIN_SHELL_POWERSHELL = $null
-            Remove-Item $resultFile
-        }
 
-        $previousOutputEncoding = [System.Console]::OutputEncoding
         try {
             [System.Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 
+            $line = $null
+            [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$line, [ref]$null)
+
+            # Atuin is started through Start-Process to avoid interfering with the current shell.
+            $env:ATUIN_SHELL_POWERSHELL = "true"
+            $argString = "search -i --result-file ""$resultFile"" $ExtraArgs -- $line"
+            Start-Process -Wait -NoNewWindow -FilePath atuin -ArgumentList $argString
+            $suggestion = (Get-Content -Raw $resultFile -Encoding UTF8 | Out-String).Trim()
+
             # PSReadLine maintains its own cursor position, which will no longer be valid if Atuin scrolls the display in inline mode.
             # Fortunately, InvokePrompt can receive a new Y position and reset the internal state.
             [Microsoft.PowerShell.PSConsoleReadLine]::InvokePrompt($null, $Host.UI.RawUI.CursorPosition.Y + [int]$env:ATUIN_POWERSHELL_PROMPT_OFFSET)
@@ -108,6 +100,8 @@ New-Module -Name Atuin -ScriptBlock {
         }
         finally {
             [System.Console]::OutputEncoding = $previousOutputEncoding
+            $env:ATUIN_SHELL_POWERSHELL = $null
+            Remove-Item $resultFile
         }
     }