Merge branch 'main' of https://github.com/VerifyTests/DiffEngine

Author: SimonCropp

readme.md

@@ -233,8 +233,17 @@ var isCopilot = AiCliDetector.IsCopilot;
 var isCursor = AiCliDetector.IsCursor;
 var isAider = AiCliDetector.IsAider;
 var isClaudeCode = AiCliDetector.IsClaudeCode;
+var isGeminiCli = AiCliDetector.IsGeminiCli;
+var isCodex = AiCliDetector.IsCodex;
+var isAmazonQ = AiCliDetector.IsAmazonQ;
+var isOpenCode = AiCliDetector.IsOpenCode;
+var isCline = AiCliDetector.IsCline;
+var isAugment = AiCliDetector.IsAugment;
+var isTraeAi = AiCliDetector.IsTraeAi;
+var isGoose = AiCliDetector.IsGoose;
+var isAmp = AiCliDetector.IsAmp;
 ```
-<sup><a href='/src/DiffEngine.Tests/AiCliDetectorTest.cs#L8-L15' title='Snippet source file'>snippet source</a> | <a href='#snippet-AiCliDetectorProps' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/AiCliDetectorTest.cs#L8-L24' title='Snippet source file'>snippet source</a> | <a href='#snippet-AiCliDetectorProps' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

src/DiffEngine.Tests/AiCliDetectorTest.cs

@@ -11,6 +11,15 @@ public void Props()
         var isCursor = AiCliDetector.IsCursor;
         var isAider = AiCliDetector.IsAider;
         var isClaudeCode = AiCliDetector.IsClaudeCode;
+        var isGeminiCli = AiCliDetector.IsGeminiCli;
+        var isCodex = AiCliDetector.IsCodex;
+        var isAmazonQ = AiCliDetector.IsAmazonQ;
+        var isOpenCode = AiCliDetector.IsOpenCode;
+        var isCline = AiCliDetector.IsCline;
+        var isAugment = AiCliDetector.IsAugment;
+        var isTraeAi = AiCliDetector.IsTraeAi;
+        var isGoose = AiCliDetector.IsGoose;
+        var isAmp = AiCliDetector.IsAmp;
 
         #endregion
 

src/DiffEngine/AiCliDetector.cs

@@ -22,10 +22,47 @@ static AiCliDetector()
         // https://cursor.com/docs/agent/terminal
         IsCursor = variables.Contains("CURSOR_AGENT");
 
+        // Gemini CLI
+        // https://google-gemini.github.io/gemini-cli/docs/tools/shell.html
+        IsGeminiCli = variables.Contains("GEMINI_CLI");
+
+        // OpenAI Codex CLI
+        IsCodex = variables.Contains("CODEX_SANDBOX");
+
+        // Amazon Q Developer CLI
+        // https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line.html
+        IsAmazonQ = variables.Contains("Q_TERM");
+
+        // OpenCode
+        IsOpenCode = variables.Contains("OPENCODE_CLIENT");
+
+        // Cline
+        IsCline = variables.Contains("CLINE_ACTIVE");
+
+        // Augment Code
+        IsAugment = variables.Contains("AUGMENT_AGENT");
+
+        // TRAE AI
+        IsTraeAi = variables.Contains("TRAE_AI_SHELL_ID");
+
+        // Goose / Amp share the generic AGENT variable, distinguished by value
+        var agent = Environment.GetEnvironmentVariable("AGENT");
+        IsGoose = string.Equals(agent, "goose", StringComparison.OrdinalIgnoreCase);
+        IsAmp = string.Equals(agent, "amp", StringComparison.OrdinalIgnoreCase);
+
         Detected = IsCopilot ||
                    IsAider ||
                    IsClaudeCode ||
-                   IsCursor;
+                   IsCursor ||
+                   IsGeminiCli ||
+                   IsCodex ||
+                   IsAmazonQ ||
+                   IsOpenCode ||
+                   IsCline ||
+                   IsAugment ||
+                   IsTraeAi ||
+                   IsGoose ||
+                   IsAmp;
     }
 
     public static bool IsCursor { get; set; }
@@ -36,5 +73,23 @@ static AiCliDetector()
 
     public static bool IsClaudeCode { get; }
 
+    public static bool IsGeminiCli { get; }
+
+    public static bool IsCodex { get; }
+
+    public static bool IsAmazonQ { get; }
+
+    public static bool IsOpenCode { get; }
+
+    public static bool IsCline { get; }
+
+    public static bool IsAugment { get; }
+
+    public static bool IsTraeAi { get; }
+
+    public static bool IsGoose { get; }
+
+    public static bool IsAmp { get; }
+
     public static bool Detected { get; set; }
 }

src/DiffEngineTray.Tests/FilePurgerTest.cs

@@ -0,0 +1,101 @@
+public class FilePurgerTest
+{
+    [Test]
+    public async Task DeleteSucceeds_WhenFileNotLocked()
+    {
+        var file = Path.Combine(Path.GetTempPath(), $"FilePurgerTest_{Guid.NewGuid()}.verified.txt");
+        File.WriteAllText(file, "content");
+
+        var result = FilePurger.TryDeleteWithLockKill(file);
+
+        await Assert.That(result.Deleted).IsTrue();
+        await Assert.That(result.Exception).IsNull();
+        await Assert.That(File.Exists(file)).IsFalse();
+    }
+
+    [Test]
+    public async Task DeleteSucceeds_WhenFileDoesNotExist()
+    {
+        var file = Path.Combine(Path.GetTempPath(), $"FilePurgerTest_{Guid.NewGuid()}.verified.txt");
+
+        var result = FilePurger.TryDeleteWithLockKill(file);
+
+        await Assert.That(result.Deleted).IsTrue();
+        await Assert.That(result.Exception).IsNull();
+    }
+
+    [Test]
+    public async Task DeleteSucceeds_WhenFileLocked_KillsLockingProcess()
+    {
+        var file = Path.Combine(Path.GetTempPath(), $"FilePurgerTest_{Guid.NewGuid()}.verified.txt");
+        File.WriteAllText(file, "content");
+
+        var lockProcess = StartFileLockProcess(file);
+
+        try
+        {
+            await Assert.That(IsFileLocked(file)).IsTrue();
+
+            var result = FilePurger.TryDeleteWithLockKill(file);
+
+            await Assert.That(result.Deleted).IsTrue();
+            await Assert.That(result.Exception).IsNull();
+            await Assert.That(File.Exists(file)).IsFalse();
+
+            var exited = lockProcess.WaitForExit(5000);
+            await Assert.That(exited).IsTrue();
+        }
+        finally
+        {
+            if (!lockProcess.HasExited)
+            {
+                lockProcess.Kill();
+            }
+
+            lockProcess.Dispose();
+
+            if (File.Exists(file))
+            {
+                File.Delete(file);
+            }
+        }
+    }
+
+    static Process StartFileLockProcess(string path)
+    {
+        var script = $"$f = [System.IO.File]::Open('{path.Replace("'", "''")}', 'Open', 'ReadWrite', 'None'); [Console]::WriteLine('locked'); Start-Sleep -Seconds 60";
+        var process = new Process
+        {
+            StartInfo = new()
+            {
+                FileName = "powershell.exe",
+                Arguments = $"-NoProfile -Command \"{script}\"",
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                RedirectStandardOutput = true
+            }
+        };
+        process.Start();
+
+        var line = process.StandardOutput.ReadLine();
+        if (line != "locked")
+        {
+            throw new InvalidOperationException($"Expected 'locked' but got '{line}'");
+        }
+
+        return process;
+    }
+
+    static bool IsFileLocked(string path)
+    {
+        try
+        {
+            using var stream = File.Open(path, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+            return false;
+        }
+        catch (IOException)
+        {
+            return true;
+        }
+    }
+}

src/DiffEngineTray/FilePurger.cs

@@ -53,36 +53,64 @@ static void DeleteFiles(string[] files)
         for (var index = 0; index < files.Length; index++)
         {
             var file = files[index];
-            try
+            var result = TryDeleteWithLockKill(file);
+            if (result.Deleted)
             {
-                if (File.Exists(file))
-                {
-                    File.Delete(file);
-                }
+                continue;
+            }
+
+            var failedResult = AskQuestion(
+                $"""
+                 Could not delete file: {file}
+                 Exception: {result.Exception!.Message}
+                 """,
+                "Delete failed",
+                MessageBoxButtons.AbortRetryIgnore);
+
+            if (failedResult == DialogResult.Abort)
+            {
+                return;
+            }
+
+            if (failedResult == DialogResult.Retry)
+            {
+                index--;
+            }
+        }
+    }
+
+    internal static DeleteResult TryDeleteWithLockKill(string file)
+    {
+        try
+        {
+            if (File.Exists(file))
+            {
+                File.Delete(file);
             }
-            catch (Exception exception)
+
+            return new(true, null);
+        }
+        catch (Exception exception)
+        {
+            if (FileLockKiller.KillLockingProcesses(file))
             {
-                var failedResult = AskQuestion(
-                    $"""
-                     Could not delete file: {file}
-                     Exception: {exception.Message}
-                     """,
-                    "Delete failed",
-                    MessageBoxButtons.AbortRetryIgnore);
-
-                if (failedResult == DialogResult.Abort)
+                try
                 {
-                    return;
+                    File.Delete(file);
+                    return new(true, null);
                 }
-
-                if (failedResult == DialogResult.Retry)
+                catch (Exception retryException)
                 {
-                    index--;
+                    return new(false, retryException);
                 }
             }
+
+            return new(false, exception);
         }
     }
 
+    internal record DeleteResult(bool Deleted, Exception? Exception);
+
     static DialogResult AskQuestion(string text, string caption, MessageBoxButtons buttons) =>
         MessageBox.Show(
             text,

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;NU1608;NU1109</NoWarn>
-    <Version>19.1.3</Version>
+    <Version>19.2.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
     <Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>