Fixed for desktop module

teo-nikolov · teo-nikolov · commit 71a1a8425f9e · 2025-11-12T11:31:47.000+02:00
diff --git a/Bellatrix.LLM/Bellatrix.LLM.csproj b/Bellatrix.LLM/Bellatrix.LLM.csproj
@@ -1,23 +1,24 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\src\Bellatrix.Core\Bellatrix.Core.csproj" />
-    <ProjectReference Include="..\src\Bellatrix.KeyVault\Bellatrix.KeyVault.csproj" />
-    <ProjectReference Include="..\src\Bellatrix.Plugins.Screenshots\Bellatrix.Plugins.Screenshots.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\src\Bellatrix.Core\Bellatrix.Core.csproj" />
+        <ProjectReference Include="..\src\Bellatrix.KeyVault\Bellatrix.KeyVault.csproj" />
+        <ProjectReference Include="..\src\Bellatrix.Plugins.Screenshots\Bellatrix.Plugins.Screenshots.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.50.0" />
-    <PackageReference Include="Microsoft.KernelMemory" Version="0.98.250508.3" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="NUnit" Version="4.3.2" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
+        <PackageReference Include="Microsoft.SemanticKernel" Version="1.50.0" />
+        <!-- DO NOT update Microsoft.KernelMemory unless we move to .NET 9 -->
+        <PackageReference Include="Microsoft.KernelMemory" Version="0.97.250211.1" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+        <PackageReference Include="NUnit" Version="4.3.2" />
+    </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Bellatrix.LLM/plugins/SmartFailureAnalysisPlugin .cs b/Bellatrix.LLM/plugins/SmartFailureAnalysisPlugin .cs
@@ -15,6 +15,7 @@
 // The architecture and agent logic are original contributions by Anton Angelov, forming the foundation for a PhD dissertation.
 // Please cite or credit appropriately if reusing in academic or commercial work.</note>
 
+using Bellatrix.LLM.Settings;
 using Bellatrix.Plugins.Screenshots.Contracts;
 using Bellatrix.Plugins;
 using Bellatrix.Plugins.Screenshots.Plugins;
@@ -26,12 +27,14 @@ public class SmartFailureAnalysisPlugin : Plugin, IScreenshotPlugin
     private readonly IScreenshotOutputProvider _screenshotOutputProvider;
     private readonly IViewSnapshotProvider _viewSnapshotProvider;
     private static ThreadLocal<string> _screenshotPath = new ThreadLocal<string>();
+    private readonly bool _isEnabled;
 
 
     public SmartFailureAnalysisPlugin()
     {
         _screenshotOutputProvider = ServicesCollection.Current.Resolve<IScreenshotOutputProvider>();
         _viewSnapshotProvider = ServicesCollection.Main.Resolve<IViewSnapshotProvider>();
+        _isEnabled = ConfigurationService.GetSection<LargeLanguageModelsSettings>().EnableSmartFailureAnalysis;
     }
 
     public static void Add()
@@ -60,6 +63,7 @@ public void ScreenshotGenerated(object sender, ScreenshotPluginEventArgs args)
 
     protected override void PreTestCleanup(object sender, PluginEventArgs e)
     {
+        if (!_isEnabled) return;
         if (e.TestOutcome == TestOutcome.Passed)
         {
             var log = Logger.GetLogs();
@@ -87,7 +91,7 @@ private void RunFailureAnalysisAsync(PluginEventArgs e)
                 snapshot,
                 _screenshotPath.Value ?? string.Empty);
 
-          
+
         }
         catch (Exception ex)
         {
@@ -112,4 +116,4 @@ private void RunFailureAnalysisAsync(PluginEventArgs e)
 //{extended}
 //""");
     }
-}
+}
diff --git a/src/Bellatrix.Desktop/components/Core/Component.cs b/src/Bellatrix.Desktop/components/Core/Component.cs
@@ -67,8 +67,8 @@ public AppiumElement WrappedElement
     {
         get
         {
-            ReturningWrappedElement?.Invoke(this, new NativeElementActionEventArgs(GetAndWaitWebDriverElement()));
-            var element = GetWebDriverElement();
+            var element = GetAndWaitWebDriverElement();
+            ReturningWrappedElement?.Invoke(this, new NativeElementActionEventArgs(element));
             return element;
         }
         internal set => _wrappedElement = value;
@@ -253,7 +253,7 @@ protected AppiumElement GetAndWaitWebDriverElement()
                 if (_llmSettings.EnableSelfHealing)
                 {
                     var snapshot = _viewSnapshotProvider.GetCurrentViewSnapshot();
-                    LocatorSelfHealingService.SaveWorkingLocator(By.ToString(), snapshot, WrappedDriver.Title);
+                    LocatorSelfHealingService.SaveWorkingLocator(By.ToString(), snapshot, WrappedDriver.CurrentWindowHandle);
                 }
 
                 _untils.Clear();
@@ -269,7 +269,7 @@ protected AppiumElement GetAndWaitWebDriverElement()
                 Logger.LogWarning($"⚠️ Element not found with locator: {By}. Trying AI-based healing...");
 
                 var snapshot = _viewSnapshotProvider.GetCurrentViewSnapshot();
-                var healedXpath = LocatorSelfHealingService.TryHeal(By.ToString(), snapshot, WrappedDriver.Title);
+                var healedXpath = LocatorSelfHealingService.TryHeal(By.ToString(), snapshot, WrappedDriver.CurrentWindowHandle);
 
                 if (!string.IsNullOrEmpty(healedXpath))
                 {
diff --git a/src/Bellatrix.Desktop/infrastructure/App.cs b/src/Bellatrix.Desktop/infrastructure/App.cs
@@ -105,7 +105,7 @@ public static void StartAppiumServer()
             StartInfo = new ProcessStartInfo
             {
                 FileName = "powershell.exe",
-                Arguments = "-NoProfile -ExecutionPolicy RemoteSigned -Command \"appium driver list --installed --json\"",
+                Arguments = $"-NoProfile -ExecutionPolicy RemoteSigned -File \"{appiumPs1Path}\" driver list --installed --json",
                 RedirectStandardOutput = true,
                 UseShellExecute = false,
                 CreateNoWindow = true,
@@ -124,7 +124,7 @@ public static void StartAppiumServer()
             Console.WriteLine("NovaWindows driver not found. Installing...");
             Process.Start(
                 "powershell.exe",
-                $"-NoProfile -ExecutionPolicy RemoteSigned -Command \"appium driver install --source=npm appium-novawindows-driver@{latestVersion}\""
+                $"-NoProfile -ExecutionPolicy RemoteSigned -File \"{appiumPs1Path}\" driver install --source=npm appium-novawindows-driver@{latestVersion}"
             )?.WaitForExit();
         }
         else
@@ -135,7 +135,7 @@ public static void StartAppiumServer()
                 Console.WriteLine($"Updating NovaWindows driver to {latestVersion}...");
                 Process.Start(
                     "powershell.exe",
-                    "-NoProfile -ExecutionPolicy RemoteSigned -Command \"appium driver update novawindows\""
+                    $"-NoProfile -ExecutionPolicy RemoteSigned -File \"{appiumPs1Path}\" driver update novawindows"
                 )?.WaitForExit();
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`// The architecture and agent logic are original contributions by Anton Angelov, forming the foundation for a PhD dissertation.`
`16`	`16`	`// Please cite or credit appropriately if reusing in academic or commercial work.</note>`
`17`	`17`
	`18`	`+using Bellatrix.LLM.Settings;`
`18`	`19`	`using Bellatrix.Plugins.Screenshots.Contracts;`
`19`	`20`	`using Bellatrix.Plugins;`
`20`	`21`	`using Bellatrix.Plugins.Screenshots.Plugins;`
`@@ -26,12 +27,14 @@ public class SmartFailureAnalysisPlugin : Plugin, IScreenshotPlugin`
`26`	`27`	`private readonly IScreenshotOutputProvider _screenshotOutputProvider;`
`27`	`28`	`private readonly IViewSnapshotProvider _viewSnapshotProvider;`
`28`	`29`	`private static ThreadLocal<string> _screenshotPath = new ThreadLocal<string>();`
	`30`	`+ private readonly bool _isEnabled;`
`29`	`31`
`30`	`32`
`31`	`33`	`public SmartFailureAnalysisPlugin()`
`32`	`34`	`{`
`33`	`35`	`_screenshotOutputProvider = ServicesCollection.Current.Resolve<IScreenshotOutputProvider>();`
`34`	`36`	`_viewSnapshotProvider = ServicesCollection.Main.Resolve<IViewSnapshotProvider>();`
	`37`	`+ _isEnabled = ConfigurationService.GetSection<LargeLanguageModelsSettings>().EnableSmartFailureAnalysis;`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`public static void Add()`
`@@ -60,6 +63,7 @@ public void ScreenshotGenerated(object sender, ScreenshotPluginEventArgs args)`
`60`	`63`
`61`	`64`	`protected override void PreTestCleanup(object sender, PluginEventArgs e)`
`62`	`65`	`{`
	`66`	`+ if (!_isEnabled) return;`
`63`	`67`	`if (e.TestOutcome == TestOutcome.Passed)`
`64`	`68`	`{`
`65`	`69`	`var log = Logger.GetLogs();`
`@@ -87,7 +91,7 @@ private void RunFailureAnalysisAsync(PluginEventArgs e)`
`87`	`91`	`snapshot,`
`88`	`92`	`_screenshotPath.Value ?? string.Empty);`
`89`	`93`
`90`		`-`
	`94`	`+`
`91`	`95`	`}`
`92`	`96`	`catch (Exception ex)`
`93`	`97`	`{`
`@@ -112,4 +116,4 @@ private void RunFailureAnalysisAsync(PluginEventArgs e)`
`112`	`116`	`//{extended}`
`113`	`117`	`//""");`
`114`	`118`	`}`
`115`		`-}`
	`119`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ public AppiumElement WrappedElement`
`67`	`67`	`{`
`68`	`68`	`get`
`69`	`69`	`{`
`70`		`- ReturningWrappedElement?.Invoke(this, new NativeElementActionEventArgs(GetAndWaitWebDriverElement()));`
`71`		`- var element = GetWebDriverElement();`
	`70`	`+ var element = GetAndWaitWebDriverElement();`
	`71`	`+ ReturningWrappedElement?.Invoke(this, new NativeElementActionEventArgs(element));`
`72`	`72`	`return element;`
`73`	`73`	`}`
`74`	`74`	`internal set => _wrappedElement = value;`
`@@ -253,7 +253,7 @@ protected AppiumElement GetAndWaitWebDriverElement()`
`253`	`253`	`if (_llmSettings.EnableSelfHealing)`
`254`	`254`	`{`
`255`	`255`	`var snapshot = _viewSnapshotProvider.GetCurrentViewSnapshot();`
`256`		`- LocatorSelfHealingService.SaveWorkingLocator(By.ToString(), snapshot, WrappedDriver.Title);`
	`256`	`+ LocatorSelfHealingService.SaveWorkingLocator(By.ToString(), snapshot, WrappedDriver.CurrentWindowHandle);`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`_untils.Clear();`
`@@ -269,7 +269,7 @@ protected AppiumElement GetAndWaitWebDriverElement()`
`269`	`269`	`Logger.LogWarning($"⚠️ Element not found with locator: {By}. Trying AI-based healing...");`
`270`	`270`
`271`	`271`	`var snapshot = _viewSnapshotProvider.GetCurrentViewSnapshot();`
`272`		`- var healedXpath = LocatorSelfHealingService.TryHeal(By.ToString(), snapshot, WrappedDriver.Title);`
	`272`	`+ var healedXpath = LocatorSelfHealingService.TryHeal(By.ToString(), snapshot, WrappedDriver.CurrentWindowHandle);`
`273`	`273`
`274`	`274`	`if (!string.IsNullOrEmpty(healedXpath))`
`275`	`275`	`{`