diff --git a/.github/workflows/lint_build_publish.yml b/.github/workflows/lint_build_publish.yml
index 251a3d8..60741cd 100644
--- a/.github/workflows/lint_build_publish.yml
+++ b/.github/workflows/lint_build_publish.yml
@@ -17,6 +17,11 @@ jobs:
         with:
           vs-version: '[17.0, )'
 
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.x # dotnet 9 breaks "dotnet format" command: https://github.com/dotnet/sdk/issues/43017
+
       - name: Format check
         run: dotnet format --verify-no-changes --verbosity diagnostic
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6928fe9..05d30a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+## [1.7.0] - 2024-12-11
+
+- Add AI remediations for IaC and SAST
+
 ## [1.6.1] - 2024-10-31
 
 - Code refactoring
@@ -69,6 +73,8 @@
 
 The first public release of the extension.
 
+[1.7.0]: https://github.com/cycodehq/visual-studio-extension/releases/tag/v1.7.0
+
 [1.6.1]: https://github.com/cycodehq/visual-studio-extension/releases/tag/v1.6.1
 
 [1.6.0]: https://github.com/cycodehq/visual-studio-extension/releases/tag/v1.6.0
@@ -97,4 +103,4 @@ The first public release of the extension.
 
 [1.0.0]: https://github.com/cycodehq/visual-studio-extension/releases/tag/v1.0.0
 
-[Unreleased]: https://github.com/cycodehq/visual-studio-extension/compare/v1.6.1...HEAD
+[Unreleased]: https://github.com/cycodehq/visual-studio-extension/compare/v1.7.0...HEAD
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..9cdb723
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.404",
+    "rollForward": "latestFeature"
+  }
+}
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.14.0-16.0/source.extension.vsixmanifest b/src/extension/Cycode.VisualStudio.Extension.14.0-16.0/source.extension.vsixmanifest
index e97798b..9d152c5 100644
--- a/src/extension/Cycode.VisualStudio.Extension.14.0-16.0/source.extension.vsixmanifest
+++ b/src/extension/Cycode.VisualStudio.Extension.14.0-16.0/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Cycode.7e1a0714-9b3b-4e0e-9c0a-d23fb20ab86e" Version="1.6.1" Language="en-US" Publisher="cycodehq" />
+        <Identity Id="Cycode.7e1a0714-9b3b-4e0e-9c0a-d23fb20ab86e" Version="1.7.0" Language="en-US" Publisher="cycodehq" />
         <DisplayName>Cycode</DisplayName>
         <Description xml:space="preserve">Cycode for Visual Studio IDE</Description>
         <MoreInfo>https://github.com/cycodehq/visual-studio-extension</MoreInfo>
diff --git a/src/extension/Cycode.VisualStudio.Extension.17.0/source.extension.vsixmanifest b/src/extension/Cycode.VisualStudio.Extension.17.0/source.extension.vsixmanifest
index d32cd0f..dd63434 100644
--- a/src/extension/Cycode.VisualStudio.Extension.17.0/source.extension.vsixmanifest
+++ b/src/extension/Cycode.VisualStudio.Extension.17.0/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Cycode.f2c5020e-67a2-46f8-a888-609412fd59db" Version="1.6.1" Language="en-US" Publisher="cycodehq" />
+        <Identity Id="Cycode.f2c5020e-67a2-46f8-a888-609412fd59db" Version="1.7.0" Language="en-US" Publisher="cycodehq" />
         <DisplayName>Cycode</DisplayName>
         <Description xml:space="preserve">Cycode for Visual Studio IDE</Description>
         <MoreInfo>https://github.com/cycodehq/visual-studio-extension</MoreInfo>
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/AuthCheckResult.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/AiRemediationResult.cs
similarity index 64%
rename from src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/AuthCheckResult.cs
rename to src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/AiRemediationResult.cs
index 3292e88..b265dd4 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/AuthCheckResult.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/AiRemediationResult.cs
@@ -1,10 +1,8 @@
-#nullable enable
-
 using Newtonsoft.Json;
 
 namespace Cycode.VisualStudio.Extension.Shared.Cli.DTO;
 
-public class AuthCheckResult {
+public class AiRemediationResult {
     [JsonProperty(Required = Required.Always)]
     public bool Result { get; set; }
 
@@ -12,13 +10,13 @@ public class AuthCheckResult {
     public string? Message { get; set; }
 
     [JsonProperty(Required = Required.AllowNull)]
-    public AuthCheckResultData? Data { get; set; }
+    public AiRemediationResultData? Data { get; set; }
 }
 
-public class AuthCheckResultData {
+public class AiRemediationResultData {
     [JsonProperty(Required = Required.Always)]
-    public string? UserId { get; set; }
+    public string Remediation { get; set; }
 
     [JsonProperty(Required = Required.Always)]
-    public string? TenantId { get; set; }
+    public bool IsFixAvailable { get; set; }
 }
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/ScanResult/DetectionBase.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/ScanResult/DetectionBase.cs
index e7d67e0..42154a5 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/ScanResult/DetectionBase.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/ScanResult/DetectionBase.cs
@@ -1,6 +1,7 @@
 namespace Cycode.VisualStudio.Extension.Shared.Cli.DTO.ScanResult;
 
 public abstract class DetectionBase {
+    public string Id { get; set; }
     public string Severity { get; set; }
     public abstract DetectionDetailsBase GetDetectionDetails();
     public abstract string GetFormattedMessage();
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/StatusResult.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/StatusResult.cs
new file mode 100644
index 0000000..5cf6741
--- /dev/null
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/StatusResult.cs
@@ -0,0 +1,37 @@
+using Newtonsoft.Json;
+
+namespace Cycode.VisualStudio.Extension.Shared.Cli.DTO;
+
+public class StatusResult {
+    [JsonProperty(Required = Required.Always)]
+    public string Program { get; set; }
+    
+    [JsonProperty(Required = Required.Always)]
+    public string Version { get; set; }
+    
+    [JsonProperty(Required = Required.Always)]
+    public bool IsAuthenticated { get; set; }
+    
+    [JsonProperty(Required = Required.AllowNull)]
+    public string? UserId { get; set; }
+    
+    [JsonProperty(Required = Required.AllowNull)]
+    public string? TenantId { get; set; }
+
+    [JsonProperty(Required = Required.Always)]
+    public SupportedModulesStatus SupportedModules { get; set; }
+}
+
+public class SupportedModulesStatus {
+    // TODO(MarshalX): respect enabled/disabled scanning modules
+    [JsonProperty(Required = Required.Always)]
+    public bool SecretScanning { get; set; }
+    [JsonProperty(Required = Required.Always)]
+    public bool ScaScanning { get; set; }
+    [JsonProperty(Required = Required.Always)]
+    public bool IacScanning { get; set; }
+    [JsonProperty(Required = Required.Always)]
+    public bool SastScanning { get; set; }
+    [JsonProperty(Required = Required.Always)]
+    public bool AiLargeLanguageModel { get; set; }
+}
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/VersionResult.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/VersionResult.cs
deleted file mode 100644
index 2f118e5..0000000
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Cli/DTO/VersionResult.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Cycode.VisualStudio.Extension.Shared.Cli.DTO;
-
-public class VersionResult {
-    [JsonProperty(Required = Required.Always)]
-    public string Name { get; set; }
-
-    [JsonProperty(Required = Required.Always)]
-    public string Version { get; set; }
-}
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ToolWindows/AuthControl.xaml b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ToolWindows/AuthControl.xaml
index 794bdd6..5f67d8e 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ToolWindows/AuthControl.xaml
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ToolWindows/AuthControl.xaml
@@ -4,10 +4,6 @@
              xmlns:toolWindows="clr-namespace:Cycode.VisualStudio.Extension.Shared.Components.ToolWindows">
 
     <StackPanel Margin="20" Orientation="Vertical" HorizontalAlignment="Center">
-        <TextBlock Margin="0,0,0,10" TextWrapping="Wrap">
-            <Run>Cycode extension requires pre-installed authentication to work.</Run>
-        </TextBlock>
-
         <Button Margin="0,0,0,10" Content="Authenticate" Click="AuthClickAsync"
                 Width="150" Height="30" Name="AuthBtn" HorizontalAlignment="Center" />
 
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml
index 445a1be..74accd7 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml
@@ -18,9 +18,6 @@
                 <RowDefinition />
                 <RowDefinition />
                 <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
-                <RowDefinition />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*" />
@@ -54,6 +51,18 @@
                 x:Name="CycodeGuidelines"
                 Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="2"
                 Title="Cycode Guidelines" />
+
+            <common:MarkdownBlock
+                x:Name="AiRemediation"
+                Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"
+                Title="AI Remediation" />
+            <common:Hr Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2" />
+            <Button Grid.Row="11" Grid.Column="1"
+                    Content="Generate AI Remediation"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Margin="0 0 10 10"
+                    Click="GenerateAiRemediationButton_OnClickAsync" />
         </Grid>
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml.cs
index 2068a55..d85f0aa 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/IacViolationCardControl.xaml.cs
@@ -1,16 +1,24 @@
 using System.IO;
+using System.Windows;
+using Cycode.VisualStudio.Extension.Shared.Cli.DTO;
 using Cycode.VisualStudio.Extension.Shared.Cli.DTO.ScanResult.Iac;
 using Cycode.VisualStudio.Extension.Shared.Helpers;
 using Cycode.VisualStudio.Extension.Shared.Icons;
+using Cycode.VisualStudio.Extension.Shared.Services;
 
 namespace Cycode.VisualStudio.Extension.Shared.Components.ViolationCards;
 
 public partial class IacViolationCardControl {
     private const int _customRemediationGuidelinesRowIndex = 7;
     private const int _cycodeRemediationGuidelinesRowIndex = 8;
+    private const int _aiRemediationRowIndex = 9;
+    private readonly ICycodeService _cycodeService = ServiceLocator.GetService<ICycodeService>();
+    
+    private readonly IacDetection _detection;
 
     public IacViolationCardControl(IacDetection detection) {
         InitializeComponent();
+        _detection = detection;
 
         Header.Icon.Source = ExtensionIcons.GetCardSeverityBitmapSource(detection.Severity);
         Header.Title.Text = detection.GetFormattedMessage();
@@ -34,5 +42,17 @@ public IacViolationCardControl(IacDetection detection) {
             CycodeGuidelines.Markdown = detection.DetectionDetails.RemediationGuidelines;
             GridHelper.ShowRow(Grid, _cycodeRemediationGuidelinesRowIndex);
         }
+
+        GridHelper.HideRow(Grid, _aiRemediationRowIndex);
+    }
+
+    private async void GenerateAiRemediationButton_OnClickAsync(object sender, RoutedEventArgs e) {
+        await _cycodeService.GetAiRemediationAsync(_detection.Id, OnSuccess);
+        return;
+
+        void OnSuccess(AiRemediationResultData remediationResult) {
+            AiRemediation.Markdown = remediationResult.Remediation;
+            GridHelper.ShowRow(Grid, _aiRemediationRowIndex);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml
index 79513ee..e4f5daa 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml
@@ -59,6 +59,18 @@
                 x:Name="CycodeGuidelines"
                 Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2"
                 Title="Cycode Guidelines" />
+
+            <common:MarkdownBlock
+                x:Name="AiRemediation"
+                Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2"
+                Title="AI Remediation" />
+            <common:Hr Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="2" />
+            <Button Grid.Row="13" Grid.Column="1"
+                    Content="Generate AI Remediation"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Margin="0 0 10 10"
+                    Click="GenerateAiRemediationButton_OnClickAsync" />
         </Grid>
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml.cs
index 7410fdc..b23576a 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Components/ViolationCards/SastViolationCardControl.xaml.cs
@@ -1,17 +1,25 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows;
+using Cycode.VisualStudio.Extension.Shared.Cli.DTO;
 using Cycode.VisualStudio.Extension.Shared.Cli.DTO.ScanResult.Sast;
 using Cycode.VisualStudio.Extension.Shared.Helpers;
 using Cycode.VisualStudio.Extension.Shared.Icons;
+using Cycode.VisualStudio.Extension.Shared.Services;
 
 namespace Cycode.VisualStudio.Extension.Shared.Components.ViolationCards;
 
 public partial class SastViolationCardControl {
     private const int _customRemediationGuidelinesRowIndex = 9;
     private const int _cycodeRemediationGuidelinesRowIndex = 10;
+    private const int _aiRemediationRowIndex = 11;
+    private readonly ICycodeService _cycodeService = ServiceLocator.GetService<ICycodeService>();
+    
+    private readonly SastDetection _detection;
 
     public SastViolationCardControl(SastDetection detection) {
         InitializeComponent();
+        _detection = detection;
 
         Header.Icon.Source = ExtensionIcons.GetCardSeverityBitmapSource(detection.Severity);
         Header.Title.Text = detection.GetFormattedMessage();
@@ -53,5 +61,17 @@ public SastViolationCardControl(SastDetection detection) {
             CycodeGuidelines.Markdown = detection.DetectionDetails.RemediationGuidelines;
             GridHelper.ShowRow(Grid, _cycodeRemediationGuidelinesRowIndex);
         }
+
+        GridHelper.HideRow(Grid, _aiRemediationRowIndex);
+    }
+    
+    private async void GenerateAiRemediationButton_OnClickAsync(object sender, RoutedEventArgs e) {
+        await _cycodeService.GetAiRemediationAsync(_detection.Id, OnSuccess);
+        return;
+
+        void OnSuccess(AiRemediationResultData remediationResult) {
+            AiRemediation.Markdown = remediationResult.Remediation;
+            GridHelper.ShowRow(Grid, _aiRemediationRowIndex);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Constants.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Constants.cs
index 6548103..a26ba12 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Constants.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Constants.cs
@@ -4,7 +4,7 @@ namespace Cycode.VisualStudio.Extension.Shared;
 
 public static class Constants {
     public const string AppName = "visual_studio_extension";
-    public const string RequiredCliVersion = "1.11.0";
+    public const string RequiredCliVersion = "2.1.0";
 
     public const string CycodeDomain = "cycode.com";
 
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Cycode.VisualStudio.Extension.Shared.projitems b/src/extension/Cycode.VisualStudio.Extension.Shared/Cycode.VisualStudio.Extension.Shared.projitems
index e6a3b82..aded554 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Cycode.VisualStudio.Extension.Shared.projitems
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Cycode.VisualStudio.Extension.Shared.projitems
@@ -11,7 +11,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\CliUtilities.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\CliWrapper.cs"/>
-    <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\AuthCheckResult.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\AiRemediationResult.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\AuthResult.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\CliError.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\CliIgnoreType.cs"/>
@@ -36,7 +36,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\ScanResult\Secret\SecretDetection.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\ScanResult\Secret\SecretDetectionDetails.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\ScanResult\Secret\SecretScanResult.cs"/>
-    <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\VersionResult.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Cli\DTO\StatusResult.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Cli\ErrorCode.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\ErrorHandling.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Cli\ExitCode.cs"/>
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/DTO/ExtensionState.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/DTO/ExtensionState.cs
index 3deef5f..5eddfac 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/DTO/ExtensionState.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/DTO/ExtensionState.cs
@@ -6,4 +6,5 @@ public class ExtensionState {
     public string CliVer { get; set; } = null;
     public string CliHash { get; set; } = null;
     public long? CliLastUpdateCheckedAt { get; set; } = null;
+    public bool IsAiLargeLanguageModelEnabled { get; set; } = false;
 }
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CliService.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CliService.cs
index 8064d36..40801f2 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CliService.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CliService.cs
@@ -20,8 +20,7 @@ namespace Cycode.VisualStudio.Extension.Shared.Services;
 public interface ICliService {
     void ResetPluginCliState();
 
-    Task<bool> HealthCheckAsync(CancellationToken cancellationToken = default);
-    Task<bool> CheckAuthAsync(CancellationToken cancellationToken = default);
+    Task SyncStatusAsync(CancellationToken cancellationToken = default);
     Task<bool> DoAuthAsync(CancellationToken cancellationToken = default);
 
     Task ScanPathsSecretsAsync(
@@ -43,6 +42,8 @@ Task ScanPathsSastAsync(
     Task<bool> DoIgnoreAsync(
         CliScanType scanType, CliIgnoreType ignoreType, string value, CancellationToken cancellationToken = default
     );
+    
+    Task<AiRemediationResultData> GetAiRemediationAsync(string detectionId, CancellationToken cancellationToken = default);
 }
 
 public class CliService(
@@ -54,41 +55,27 @@ IErrorTaskCreatorService errorTaskCreatorService
     private readonly CliWrapper _cli = new(SolutionHelper.GetSolutionRootDirectory);
     private readonly ExtensionState _pluginState = stateService.Load();
 
-    public async Task<bool> HealthCheckAsync(CancellationToken cancellationToken = default) {
-        CliResult<VersionResult> result = await _cli.ExecuteCommandAsync<VersionResult>(["version"], cancellationToken);
-        CliResult<VersionResult> processedResult = ProcessResult(result);
-
-        if (processedResult is CliResult<VersionResult>.Success successResult) {
-            _pluginState.CliInstalled = true;
-            _pluginState.CliVer = successResult.Result.Version;
-            stateService.Save();
-            return true;
-        }
-
-        ResetPluginCliState();
-        return false;
-    }
-
-    public async Task<bool> CheckAuthAsync(CancellationToken cancellationToken = default) {
-        CliResult<AuthCheckResult> result =
-            await _cli.ExecuteCommandAsync<AuthCheckResult>(["auth", "check"], cancellationToken);
-        CliResult<AuthCheckResult>.Success processedResult = ProcessResult(result);
+    public async Task SyncStatusAsync(CancellationToken cancellationToken = default) {
+        CliResult<StatusResult> result = await _cli.ExecuteCommandAsync<StatusResult>(["status"], cancellationToken);
+        CliResult<StatusResult>.Success processedResult = ProcessResult(result);
+        
         if (processedResult == null) {
             ResetPluginCliState();
-            return false;
+            return;
         }
 
         _pluginState.CliInstalled = true;
-        _pluginState.CliAuthed = processedResult.Result.Result;
+        _pluginState.CliVer = processedResult.Result.Version;
+        _pluginState.CliAuthed = processedResult.Result.IsAuthenticated;
+        _pluginState.IsAiLargeLanguageModelEnabled = processedResult.Result.SupportedModules.AiLargeLanguageModel;
         stateService.Save();
-
+        
         if (!_pluginState.CliAuthed)
             ShowErrorNotification("You are not authenticated in Cycode. Please authenticate");
-
-        AuthCheckResultData scopeData = processedResult.Result.Data;
-        if (scopeData != null) SentryInit.SetupScope(scopeData.UserId, scopeData.TenantId);
-
-        return _pluginState.CliAuthed;
+        else {
+            if (processedResult.Result.UserId != null && processedResult.Result.TenantId != null)
+                SentryInit.SetupScope(processedResult.Result.UserId, processedResult.Result.TenantId);
+        }
     }
 
     public async Task<bool> DoAuthAsync(CancellationToken cancellationToken = default) {
@@ -284,4 +271,19 @@ private static string MapIgnoreTypeToOptionName(CliIgnoreType type) {
             _ => throw new ArgumentException("Invalid CliIgnoreType")
         };
     }
+    
+    public async Task<AiRemediationResultData> GetAiRemediationAsync(string detectionId, CancellationToken cancellationToken = default) {
+        CliResult<AiRemediationResult> result = await _cli.ExecuteCommandAsync<AiRemediationResult>(["ai_remediation", detectionId], cancellationToken);
+        CliResult<AiRemediationResult>.Success processedResult = ProcessResult(result);
+        if (processedResult == null) {
+            logger.Warn("Failed to get AI remediation for detection: {0}", detectionId);
+            return null;
+        }
+
+        if (processedResult.Result.Result && processedResult.Result.Data != null) return processedResult.Result.Data;
+
+        logger.Warn("AI remediation is not available for detection: {0}", detectionId);
+        ShowErrorNotification("AI remediation is not available for this detection");
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CycodeService.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CycodeService.cs
index 83e6d17..42e3fde 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CycodeService.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/Services/CycodeService.cs
@@ -21,6 +21,8 @@ public interface ICycodeService {
     Task ApplyDetectionIgnoreAsync(
         CliScanType scanType, CliIgnoreType ignoreType, string value
     );
+
+    Task GetAiRemediationAsync(string detectionId, Action<AiRemediationResultData> onSuccess);
 }
 
 public class CycodeService(
@@ -107,7 +109,7 @@ public async Task InstallCliIfNeededAndCheckAuthenticationAsync() {
         await WrapWithStatusCenterAsync(
             InstallCliIfNeededAndCheckAuthenticationAsyncInternalAsync,
             "Cycode is loading...",
-            false
+            canBeCanceled: false
         );
     }
 
@@ -121,8 +123,7 @@ private async Task InstallCliIfNeededAndCheckAuthenticationAsyncInternalAsync(Ca
                 return;
             }
 
-            await cliService.HealthCheckAsync(cancellationToken);
-            await cliService.CheckAuthAsync(cancellationToken);
+            await cliService.SyncStatusAsync(cancellationToken);
 
             UpdateToolWindowDependingOnState();
         } catch (Exception e) {
@@ -134,15 +135,17 @@ public async Task StartAuthAsync() {
         await WrapWithStatusCenterAsync(
             StartAuthInternalAsync,
             "Authenticating to Cycode...",
-            true
+            canBeCanceled: true
         );
     }
 
     private async Task StartAuthInternalAsync(CancellationToken cancellationToken) {
         if (!_pluginState.CliAuthed) {
-            logger.Debug("Start auth...");
+            logger.Debug("[AUTH] Start authing");
             await cliService.DoAuthAsync(cancellationToken);
+            await cliService.SyncStatusAsync(cancellationToken);
             UpdateToolWindowDependingOnState();
+            logger.Debug("[AUTH] Finish authing");
         } else {
             logger.Debug("Already authenticated with Cycode CLI");
         }
@@ -183,7 +186,7 @@ await WrapWithStatusCenterAsync(
                 logger.Debug("[{0}] Finish scanning paths: {1}", scanType, string.Join(", ", pathsToScan));
             },
             label,
-            true
+            canBeCanceled: true
         );
     }
 
@@ -211,7 +214,7 @@ public async Task ApplyDetectionIgnoreAsync(
         await WrapWithStatusCenterAsync(
             cancellationToken => ApplyDetectionIgnoreInternalAsync(scanType, ignoreType, value, cancellationToken),
             "Cycode is applying ignores...",
-            false // we do not allow to cancel this because we will instantly remove it from UI
+            canBeCanceled: false // we do not allow to cancel this because we will instantly remove it from UI
         );
     }
 
@@ -225,4 +228,18 @@ private async Task ApplyDetectionIgnoreInternalAsync(
         await cliService.DoIgnoreAsync(scanType, ignoreType, value, cancellationToken);
         logger.Debug("[IGNORE] Finish ignoring by {0}", ignoreType);
     }
+
+    public async Task GetAiRemediationAsync(string detectionId, Action<AiRemediationResultData> onSuccess) {
+        await WrapWithStatusCenterAsync(
+            async cancellationToken => {
+                logger.Debug("[AI REMEDIATION] Start generating remediation for {0}", detectionId);
+                AiRemediationResultData aiRemediation = await cliService.GetAiRemediationAsync(detectionId, cancellationToken);
+                logger.Debug("[AI REMEDIATION] Finish generating remediation for {0}", detectionId);
+                if (aiRemediation != null)
+                    onSuccess(aiRemediation);
+            },
+            "Cycode is generating AI remediation...",
+            canBeCanceled: true
+        );
+    }
 }
\ No newline at end of file
diff --git a/src/extension/Cycode.VisualStudio.Extension.Shared/source.extension.cs b/src/extension/Cycode.VisualStudio.Extension.Shared/source.extension.cs
index dd0be36..a3a821d 100644
--- a/src/extension/Cycode.VisualStudio.Extension.Shared/source.extension.cs
+++ b/src/extension/Cycode.VisualStudio.Extension.Shared/source.extension.cs
@@ -3,5 +3,5 @@ namespace Cycode.VisualStudio.Extension.Shared;
 internal sealed class Vsix {
     public const string Name = "Cycode";
     public const string Description = "Cycode for Visual Studio IDE";
-    public const string Version = "1.6.1";
+    public const string Version = "1.7.0";
 }
\ No newline at end of file