Merge branch 'main' into Fix-Claude-Code-CLI-environment-variable-detection

Author: SimonCropp

readme.md

@@ -177,7 +177,7 @@ There are also individual properties to check for each specific AI CLI
 <!-- snippet: AiCliDetectorProps -->
 <a id='snippet-AiCliDetectorProps'></a>
 ```cs
-var isCopilotCli = AiCliDetector.IsCopilotCli;
+var isCopilot = AiCliDetector.IsCopilot;
 var isAider = AiCliDetector.IsAider;
 var isClaudeCode = AiCliDetector.IsClaudeCode;
 ```

src/DiffEngine.Tests/AiCliDetectorTest.cs

@@ -8,12 +8,13 @@ public void Props()
 
         #region AiCliDetectorProps
 
-        var isCopilotCli = AiCliDetector.IsCopilotCli;
+        var isCopilot = AiCliDetector.IsCopilot;
         var isAider = AiCliDetector.IsAider;
         var isClaudeCode = AiCliDetector.IsClaudeCode;
 
         #endregion
 
+        Assert.True(isCopilot);
         // ReSharper restore UnusedVariable
     }
 }

src/DiffEngine.slnx

@@ -8,7 +8,7 @@
     <File Path="../appveyor.yml" />
     <File Path="../claude.md" />
     <File Path="../readme.source.md" />
-    <File Path=".editorconfig" />
+    <File Path="../.editorconfig" />
     <File Path="Directory.Build.props" />
     <File Path="Directory.Packages.props" />
     <File Path="global.json" />

src/DiffEngine/AiCliDetector.cs

@@ -6,9 +6,9 @@ static AiCliDetector()
     {
         var variables = Environment.GetEnvironmentVariables();
 
-        // GitHub Copilot CLI
+        // GitHub Copilot
         // https://docs.github.com/en/copilot/using-github-copilot/using-github-copilot-in-the-command-line
-        IsCopilotCli = variables.Contains("GITHUB_COPILOT_CLI");
+        IsCopilot = variables.Contains("GITHUB_COPILOT_RUNTIME");
 
         // Aider
         // https://aider.chat/docs/config/dotenv.html
@@ -18,12 +18,12 @@ static AiCliDetector()
         // https://docs.anthropic.com/en/docs/build-with-claude/claude-cli
         IsClaudeCode = variables.Contains("CLAUDECODE") || variables.Contains("CLAUDE_CODE_ENTRYPOINT");
 
-        Detected = IsCopilotCli ||
+        Detected = IsCopilot ||
                    IsAider ||
                    IsClaudeCode;
     }
 
-    public static bool IsCopilotCli { get; }
+    public static bool IsCopilot { get; }
 
     public static bool IsAider { get; }
 

src/DiffEngine/Process/WindowsProcess.cs

@@ -130,7 +130,7 @@ public static bool TryTerminateProcess(int processId)
         // First, try graceful shutdown by closing the main window
         try
         {
-            using var process = System.Diagnostics.Process.GetProcessById(processId);
+            using var process = Process.GetProcessById(processId);
 
             // Try to close the main window gracefully
             if (process.CloseMainWindow())