Showing sources coming from data providers (#559)

app/MindWork AI Studio/Agents/AgentDataSourceSelection.cs

@@ -131,7 +131,7 @@ public sealed class AgentDataSourceSelection (ILogger<AgentDataSourceSelection>
 
     #endregion
 
-    public async Task<List<SelectedDataSource>> PerformSelectionAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, AllowedSelectedDataSources dataSources, CancellationToken token = default)
+    public async Task<List<SelectedDataSource>> PerformSelectionAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, AllowedSelectedDataSources dataSources, CancellationToken token = default)
     {
         logger.LogInformation("The AI should select the appropriate data sources.");
 
@@ -154,7 +154,7 @@ public sealed class AgentDataSourceSelection (ILogger<AgentDataSourceSelection>
         //
         // 2. Prepare the current system and user prompts as input for the agent: 
         //
-        var lastPromptContent = lastPrompt switch
+        var lastPromptContent = lastUserPrompt switch
         {
             ContentText text => text.Text,
 

app/MindWork AI Studio/Agents/AgentRetrievalContextValidation.cs

@@ -147,12 +147,12 @@ public sealed class AgentRetrievalContextValidation (ILogger<AgentRetrievalConte
     /// <summary>
     /// Validate all retrieval contexts against the last user and the system prompt.
     /// </summary>
-    /// <param name="lastPrompt">The last user prompt.</param>
+    /// <param name="lastUserPrompt">The last user prompt.</param>
     /// <param name="chatThread">The chat thread.</param>
     /// <param name="retrievalContexts">All retrieval contexts to validate.</param>
     /// <param name="token">The cancellation token.</param>
     /// <returns>The validation results.</returns>
-    public async Task<IReadOnlyList<RetrievalContextValidationResult>> ValidateRetrievalContextsAsync(IContent lastPrompt, ChatThread chatThread, IReadOnlyList<IRetrievalContext> retrievalContexts, CancellationToken token = default)
+    public async Task<IReadOnlyList<RetrievalContextValidationResult>> ValidateRetrievalContextsAsync(IContent lastUserPrompt, ChatThread chatThread, IReadOnlyList<IRetrievalContext> retrievalContexts, CancellationToken token = default)
     {
         // Check if the retrieval context validation is enabled:
         if (!this.SettingsManager.ConfigurationData.AgentRetrievalContextValidation.EnableRetrievalContextValidation)
@@ -178,7 +178,7 @@ public sealed class AgentRetrievalContextValidation (ILogger<AgentRetrievalConte
             await semaphore.WaitAsync(token);
             
             // Start the next validation task:
-            validationTasks.Add(this.ValidateRetrievalContextAsync(lastPrompt, chatThread, retrievalContext, token, semaphore));
+            validationTasks.Add(this.ValidateRetrievalContextAsync(lastUserPrompt, chatThread, retrievalContext, token, semaphore));
         }
 
         // Wait for all validation tasks to complete:
@@ -193,13 +193,13 @@ public sealed class AgentRetrievalContextValidation (ILogger<AgentRetrievalConte
     /// can call this method in parallel for each retrieval context. You might use
     /// the ValidateRetrievalContextsAsync method to validate all retrieval contexts.
     /// </remarks>
-    /// <param name="lastPrompt">The last user prompt.</param>
+    /// <param name="lastUserPrompt">The last user prompt.</param>
     /// <param name="chatThread">The chat thread.</param>
     /// <param name="retrievalContext">The retrieval context to validate.</param>
     /// <param name="token">The cancellation token.</param>
     /// <param name="semaphore">The optional semaphore to limit the number of parallel validations.</param>
     /// <returns>The validation result.</returns>
-    public async Task<RetrievalContextValidationResult> ValidateRetrievalContextAsync(IContent lastPrompt, ChatThread chatThread, IRetrievalContext retrievalContext, CancellationToken token = default, SemaphoreSlim? semaphore = null)
+    public async Task<RetrievalContextValidationResult> ValidateRetrievalContextAsync(IContent lastUserPrompt, ChatThread chatThread, IRetrievalContext retrievalContext, CancellationToken token = default, SemaphoreSlim? semaphore = null)
     {
         try
         {
@@ -214,7 +214,7 @@ public sealed class AgentRetrievalContextValidation (ILogger<AgentRetrievalConte
             //
             // 1. Prepare the current system and user prompts as input for the agent: 
             //
-            var lastPromptContent = lastPrompt switch
+            var lastPromptContent = lastUserPrompt switch
             {
                 ContentText text => text.Text,
 

app/MindWork AI Studio/Assistants/I18N/allTexts.lua

@@ -4882,9 +4882,6 @@ UI_TEXT_CONTENT["AISTUDIO::PROVIDER::LLMPROVIDERSEXTENSIONS::T3424652889"] = "Un
 -- no model selected
 UI_TEXT_CONTENT["AISTUDIO::PROVIDER::MODEL::T2234274832"] = "no model selected"
 
--- Sources
-UI_TEXT_CONTENT["AISTUDIO::PROVIDER::SOURCEEXTENSIONS::T2730980305"] = "Sources"
-
 -- Use no chat template
 UI_TEXT_CONTENT["AISTUDIO::SETTINGS::CHATTEMPLATE::T4258819635"] = "Use no chat template"
 
@@ -5641,6 +5638,12 @@ UI_TEXT_CONTENT["AISTUDIO::TOOLS::SERVICES::UPDATESERVICE::T1015418291"] = "No u
 -- Failed to install update automatically. Please try again manually.
 UI_TEXT_CONTENT["AISTUDIO::TOOLS::SERVICES::UPDATESERVICE::T3709709946"] = "Failed to install update automatically. Please try again manually."
 
+-- Sources provided by the data providers
+UI_TEXT_CONTENT["AISTUDIO::TOOLS::SOURCEEXTENSIONS::T4174900468"] = "Sources provided by the data providers"
+
+-- Sources provided by the AI
+UI_TEXT_CONTENT["AISTUDIO::TOOLS::SOURCEEXTENSIONS::T4261248356"] = "Sources provided by the AI"
+
 -- The hostname is not a valid HTTP(S) URL.
 UI_TEXT_CONTENT["AISTUDIO::TOOLS::VALIDATION::DATASOURCEVALIDATION::T1013354736"] = "The hostname is not a valid HTTP(S) URL."
 

app/MindWork AI Studio/Chat/ContentBlockComponent.razor

@@ -1,7 +1,6 @@
 @using AIStudio.Tools
 @using MudBlazor
 @using AIStudio.Components
-@using AIStudio.Provider
 @inherits AIStudio.Components.MSGComponentBase
 <MudCard Class="@this.CardClasses" Outlined="@true">
     <MudCardHeader>

app/MindWork AI Studio/Chat/ContentImage.cs

@@ -31,7 +31,7 @@ public sealed class ContentImage : IContent, IImageSource
     public List<Source> Sources { get; set; } = [];
 
     /// <inheritdoc />
-    public Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatChatThread, CancellationToken token = default)
+    public Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastUserPrompt, ChatThread? chatChatThread, CancellationToken token = default)
     {
         throw new NotImplementedException();
     }

app/MindWork AI Studio/Chat/ContentText.cs

@@ -11,6 +11,8 @@ namespace AIStudio.Chat;
 /// </summary>
 public sealed class ContentText : IContent
 {
+    private static readonly ILogger<ContentText> LOGGER = Program.LOGGER_FACTORY.CreateLogger<ContentText>();
+    
     /// <summary>
     /// The minimum time between two streaming events, when the user
     /// enables the energy saving mode.
@@ -39,30 +41,28 @@ public sealed class ContentText : IContent
     public List<Source> Sources { get; set; } = [];
 
     /// <inheritdoc />
-    public async Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatThread, CancellationToken token = default)
+    public async Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastUserPrompt, ChatThread? chatThread, CancellationToken token = default)
     {
         if(chatThread is null)
             return new();
         
         if(!chatThread.IsLLMProviderAllowed(provider))
         {
-            var logger = Program.SERVICE_PROVIDER.GetService<ILogger<ContentText>>()!;
-            logger.LogError("The provider is not allowed for this chat thread due to data security reasons. Skipping the AI process.");
+            LOGGER.LogError("The provider is not allowed for this chat thread due to data security reasons. Skipping the AI process.");
             return chatThread;
         }
 
         // Call the RAG process. Right now, we only have one RAG process:
-        if (lastPrompt is not null)
+        if (lastUserPrompt is not null)
         {
             try
             {
                 var rag = new AISrcSelWithRetCtxVal();
-                chatThread = await rag.ProcessAsync(provider, lastPrompt, chatThread, token);
+                chatThread = await rag.ProcessAsync(provider, lastUserPrompt, chatThread, token);
             }
             catch (Exception e)
             {
-                var logger = Program.SERVICE_PROVIDER.GetService<ILogger<ContentText>>()!;
-                logger.LogError(e, "Skipping the RAG process due to an error.");
+                LOGGER.LogError(e, "Skipping the RAG process due to an error.");
             }
         }
 

app/MindWork AI Studio/Chat/IContent.cs

@@ -41,13 +41,17 @@ public interface IContent
     /// <summary>
     /// The provided sources, if any.
     /// </summary>
+    /// <remarks>
+    /// We cannot use ISource here because System.Text.Json does not support
+    /// interface serialization. So we have to use a concrete class.
+    /// </remarks>
     [JsonIgnore]
     public List<Source> Sources { get; set; }
     
     /// <summary>
     /// Uses the provider to create the content.
     /// </summary>
-    public Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatChatThread, CancellationToken token = default);
+    public Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastUserPrompt, ChatThread? chatChatThread, CancellationToken token = default);
 
     /// <summary>
     /// Creates a deep copy

app/MindWork AI Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua

@@ -4884,9 +4884,6 @@ UI_TEXT_CONTENT["AISTUDIO::PROVIDER::LLMPROVIDERSEXTENSIONS::T3424652889"] = "Un
 -- no model selected
 UI_TEXT_CONTENT["AISTUDIO::PROVIDER::MODEL::T2234274832"] = "Kein Modell ausgewählt"
 
--- Sources
-UI_TEXT_CONTENT["AISTUDIO::PROVIDER::SOURCEEXTENSIONS::T2730980305"] = "Quellen"
-
 -- Use no chat template
 UI_TEXT_CONTENT["AISTUDIO::SETTINGS::CHATTEMPLATE::T4258819635"] = "Keine Chat-Vorlage verwenden"
 
@@ -5643,6 +5640,12 @@ UI_TEXT_CONTENT["AISTUDIO::TOOLS::SERVICES::UPDATESERVICE::T1015418291"] = "Kein
 -- Failed to install update automatically. Please try again manually.
 UI_TEXT_CONTENT["AISTUDIO::TOOLS::SERVICES::UPDATESERVICE::T3709709946"] = "Fehler bei der automatischen Installation des Updates. Bitte versuchen Sie es manuell erneut."
 
+-- Sources provided by the data providers
+UI_TEXT_CONTENT["AISTUDIO::TOOLS::SOURCEEXTENSIONS::T4174900468"] = "Von den Datenanbietern bereitgestellte Quellen"
+
+-- Sources provided by the AI
+UI_TEXT_CONTENT["AISTUDIO::TOOLS::SOURCEEXTENSIONS::T4261248356"] = "Von der KI bereitgestellte Quellen"
+
 -- The hostname is not a valid HTTP(S) URL.
 UI_TEXT_CONTENT["AISTUDIO::TOOLS::VALIDATION::DATASOURCEVALIDATION::T1013354736"] = "Der Hostname ist keine gültige HTTP(S)-URL."
 

app/MindWork AI Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua

@@ -4884,9 +4884,6 @@ UI_TEXT_CONTENT["AISTUDIO::PROVIDER::LLMPROVIDERSEXTENSIONS::T3424652889"] = "Un
 -- no model selected
 UI_TEXT_CONTENT["AISTUDIO::PROVIDER::MODEL::T2234274832"] = "no model selected"
 
--- Sources
-UI_TEXT_CONTENT["AISTUDIO::PROVIDER::SOURCEEXTENSIONS::T2730980305"] = "Sources"
-
 -- Use no chat template
 UI_TEXT_CONTENT["AISTUDIO::SETTINGS::CHATTEMPLATE::T4258819635"] = "Use no chat template"
 
@@ -5643,6 +5640,12 @@ UI_TEXT_CONTENT["AISTUDIO::TOOLS::SERVICES::UPDATESERVICE::T1015418291"] = "No u
 -- Failed to install update automatically. Please try again manually.
 UI_TEXT_CONTENT["AISTUDIO::TOOLS::SERVICES::UPDATESERVICE::T3709709946"] = "Failed to install update automatically. Please try again manually."
 
+-- Sources provided by the data providers
+UI_TEXT_CONTENT["AISTUDIO::TOOLS::SOURCEEXTENSIONS::T4174900468"] = "Sources provided by the data providers"
+
+-- Sources provided by the AI
+UI_TEXT_CONTENT["AISTUDIO::TOOLS::SOURCEEXTENSIONS::T4261248356"] = "Sources provided by the AI"
+
 -- The hostname is not a valid HTTP(S) URL.
 UI_TEXT_CONTENT["AISTUDIO::TOOLS::VALIDATION::DATASOURCEVALIDATION::T1013354736"] = "The hostname is not a valid HTTP(S) URL."
 

app/MindWork AI Studio/Provider/OpenAI/ChatCompletionAnnotationStreamLine.cs

@@ -30,7 +30,7 @@ public record ChatCompletionAnnotationStreamLine(string Id, string Object, uint
             {
                 // Check if the annotation is of the expected type and extract the source information:
                 if (annotation is ChatCompletionAnnotatingURL urlAnnotation)
-                    sources.Add(new Source(urlAnnotation.UrlCitation.Title, urlAnnotation.UrlCitation.URL));
+                    sources.Add(new Source(urlAnnotation.UrlCitation.Title, urlAnnotation.UrlCitation.URL, SourceOrigin.LLM));
 
                 //
                 // Check for the unexpected annotation type of the Responses API.
@@ -46,7 +46,7 @@ public record ChatCompletionAnnotationStreamLine(string Id, string Object, uint
                 //   we are calling the chat completion endpoint.
                 //
                 if (annotation is ResponsesAnnotatingUrlCitationData citationData)
-                    sources.Add(new Source(citationData.Title, citationData.URL));
+                    sources.Add(new Source(citationData.Title, citationData.URL, SourceOrigin.LLM));
             }
         }
 

app/MindWork AI Studio/Provider/OpenAI/ResponsesAnnotationStreamLine.cs

@@ -32,11 +32,11 @@ public sealed record ResponsesAnnotationStreamLine(string Type, int AnnotationIn
         //   into that type, even though we are calling the Responses API endpoint.
         //
         if (this.Annotation is ChatCompletionAnnotatingURL urlAnnotation)
-            return [new Source(urlAnnotation.UrlCitation.Title, urlAnnotation.UrlCitation.URL)];
+            return [new Source(urlAnnotation.UrlCitation.Title, urlAnnotation.UrlCitation.URL, SourceOrigin.LLM)];
         
         // Check for the expected annotation type of the Responses API:
         if (this.Annotation is ResponsesAnnotatingUrlCitationData urlCitationData)
-            return [new Source(urlCitationData.Title, urlCitationData.URL)];
+            return [new Source(urlCitationData.Title, urlCitationData.URL, SourceOrigin.LLM)];
 
         return [];
     }

app/MindWork AI Studio/Provider/Perplexity/SearchResult.cs

@@ -5,4 +5,4 @@ namespace AIStudio.Provider.Perplexity;
 /// </summary>
 /// <param name="Title">The title of the search result.</param>
 /// <param name="URL">The URL of the search result.</param>
-public sealed record SearchResult(string Title, string URL) : Source(Title, URL);
+public sealed record SearchResult(string Title, string URL) : Source(Title, URL, SourceOrigin.LLM);

app/MindWork AI Studio/Settings/DataModel/DataSourceERI_V1.cs

@@ -58,7 +58,7 @@ public readonly record struct DataSourceERI_V1 : IERIDataSource
     public ushort MaxMatches { get; init; } = 10;
     
     /// <inheritdoc />
-    public async Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastPrompt, ChatThread thread, CancellationToken token = default)
+    public async Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastUserPrompt, ChatThread thread, CancellationToken token = default)
     {
         // Important: Do not dispose the RustService here, as it is a singleton.
         var rustService = Program.SERVICE_PROVIDER.GetRequiredService<RustService>();
@@ -70,8 +70,8 @@ public readonly record struct DataSourceERI_V1 : IERIDataSource
         {
             var retrievalRequest = new RetrievalRequest
             {
-                LatestUserPromptType = lastPrompt.ToERIContentType,
-                LatestUserPrompt = lastPrompt switch
+                LatestUserPromptType = lastUserPrompt.ToERIContentType,
+                LatestUserPrompt = lastUserPrompt switch
                 {
                     ContentText text => text.Text,
                     ContentImage image => await image.AsBase64(token),
@@ -103,7 +103,7 @@ public readonly record struct DataSourceERI_V1 : IERIDataSource
                                 Links = eriContext.Links,
                                 Category = eriContext.Type.ToRetrievalContentCategory(),
                                 MatchedText = eriContext.MatchedContent,
-                                DataSourceName = this.Name,
+                                DataSourceName = eriContext.Name,
                                 SurroundingContent = eriContext.SurroundingContent,
                             });
                             break;
@@ -117,7 +117,7 @@ public readonly record struct DataSourceERI_V1 : IERIDataSource
                                 Source = eriContext.MatchedContent,
                                 Category = eriContext.Type.ToRetrievalContentCategory(),
                                 SourceType = ContentImageSource.BASE64,
-                                DataSourceName = this.Name,
+                                DataSourceName = eriContext.Name,
                             });
                             break;
                         

app/MindWork AI Studio/Settings/DataModel/DataSourceLocalDirectory.cs

@@ -34,7 +34,7 @@ public readonly record struct DataSourceLocalDirectory : IInternalDataSource
     public ushort MaxMatches { get; init; } = 10;
     
     /// <inheritdoc />
-    public Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastPrompt, ChatThread thread, CancellationToken token = default)
+    public Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastUserPrompt, ChatThread thread, CancellationToken token = default)
     {
         IReadOnlyList<IRetrievalContext> retrievalContext = new List<IRetrievalContext>();
         return Task.FromResult(retrievalContext);

app/MindWork AI Studio/Settings/DataModel/DataSourceLocalFile.cs

@@ -34,7 +34,7 @@ public readonly record struct DataSourceLocalFile : IInternalDataSource
     public ushort MaxMatches { get; init; } = 10;
     
     /// <inheritdoc />
-    public Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastPrompt, ChatThread thread, CancellationToken token = default)
+    public Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastUserPrompt, ChatThread thread, CancellationToken token = default)
     {
         IReadOnlyList<IRetrievalContext> retrievalContext = new List<IRetrievalContext>();
         return Task.FromResult(retrievalContext);

app/MindWork AI Studio/Settings/IDataSource.cs

@@ -48,9 +48,9 @@ public interface IDataSource
     /// <summary>
     /// Perform the data retrieval process.
     /// </summary>
-    /// <param name="lastPrompt">The last prompt from the chat.</param>
+    /// <param name="lastUserPrompt">The last user prompt from the chat.</param>
     /// <param name="thread">The chat thread.</param>
     /// <param name="token">The cancellation token.</param>
     /// <returns>The retrieved data context.</returns>
-    public Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastPrompt, ChatThread thread, CancellationToken token = default);
+    public Task<IReadOnlyList<IRetrievalContext>> RetrieveDataAsync(IContent lastUserPrompt, ChatThread thread, CancellationToken token = default);
 }

app/MindWork AI Studio/Tools/ISource.cs

@@ -1,4 +1,4 @@
-namespace AIStudio.Provider;
+namespace AIStudio.Tools;
 
 /// <summary>
 /// Data model for a source used in the response.
@@ -14,4 +14,9 @@ public interface ISource
     /// The URL of the source.
     /// </summary>
     public string URL { get; }
+    
+    /// <summary>
+    /// The origin of the source, whether it was provided by the AI or by the RAG process.
+    /// </summary>
+    public SourceOrigin Origin { get; }
 }

app/MindWork AI Studio/Tools/RAG/AugmentationProcesses/AugmentationOne.cs

@@ -10,6 +10,8 @@ namespace AIStudio.Tools.RAG.AugmentationProcesses;
 
 public sealed class AugmentationOne : IAugmentationProcess
 {
+    private static readonly ILogger<AugmentationOne> LOGGER = Program.LOGGER_FACTORY.CreateLogger<AugmentationOne>();
+    
     private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(AugmentationOne).Namespace, nameof(AugmentationOne));
     
     #region Implementation of IAugmentationProcess
@@ -24,14 +26,13 @@ public sealed class AugmentationOne : IAugmentationProcess
     public string Description => TB("This is the standard augmentation process, which uses all retrieval contexts to augment the chat thread.");
     
     /// <inheritdoc />
-    public async Task<ChatThread> ProcessAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, IReadOnlyList<IRetrievalContext> retrievalContexts, CancellationToken token = default)
+    public async Task<ChatThread> ProcessAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, IReadOnlyList<IRetrievalContext> retrievalContexts, CancellationToken token = default)
     {
-        var logger = Program.SERVICE_PROVIDER.GetService<ILogger<AugmentationOne>>()!;
         var settings = Program.SERVICE_PROVIDER.GetService<SettingsManager>()!;
         
         if(retrievalContexts.Count == 0)
         {
-            logger.LogWarning("No retrieval contexts were issued. Skipping the augmentation process.");
+            LOGGER.LogWarning("No retrieval contexts were issued. Skipping the augmentation process.");
             return chatThread;
         }
 
@@ -45,7 +46,7 @@ public sealed class AugmentationOne : IAugmentationProcess
             validationAgent.SetLLMProvider(provider);
             
             // Let's validate all retrieval contexts:
-            var validationResults = await validationAgent.ValidateRetrievalContextsAsync(lastPrompt, chatThread, retrievalContexts, token);
+            var validationResults = await validationAgent.ValidateRetrievalContextsAsync(lastUserPrompt, chatThread, retrievalContexts, token);
          
             //
             // Now, filter the retrieval contexts to the most relevant ones:
@@ -57,7 +58,7 @@ public sealed class AugmentationOne : IAugmentationProcess
             retrievalContexts = validationResults.Where(x => x.RetrievalContext is not null && x.Confidence >= threshold).Select(x => x.RetrievalContext!).ToList();
         }
         
-        logger.LogInformation($"Starting the augmentation process over {numTotalRetrievalContexts:###,###,###,###} retrieval contexts.");
+        LOGGER.LogInformation($"Starting the augmentation process over {numTotalRetrievalContexts:###,###,###,###} retrieval contexts.");
         
         //
         // We build a huge prompt from all retrieval contexts:

app/MindWork AI Studio/Tools/RAG/DataSourceSelectionProcesses/AgenticSrcSelWithDynHeur.cs

@@ -9,6 +9,8 @@ namespace AIStudio.Tools.RAG.DataSourceSelectionProcesses;
 
 public class AgenticSrcSelWithDynHeur : IDataSourceSelectionProcess
 {
+    private static readonly ILogger<AgenticSrcSelWithDynHeur> LOGGER = Program.LOGGER_FACTORY.CreateLogger<AgenticSrcSelWithDynHeur>();
+    
     private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(AgenticSrcSelWithDynHeur).Namespace, nameof(AgenticSrcSelWithDynHeur));
     
     #region Implementation of IDataSourceSelectionProcess
@@ -23,15 +25,12 @@ public class AgenticSrcSelWithDynHeur : IDataSourceSelectionProcess
     public string Description => TB("Automatically selects the appropriate data sources based on the last prompt. Applies a heuristic reduction at the end to reduce the number of data sources.");
     
     /// <inheritdoc />
-    public async Task<DataSelectionResult> SelectDataSourcesAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, AllowedSelectedDataSources dataSources, CancellationToken token = default)
+    public async Task<DataSelectionResult> SelectDataSourcesAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, AllowedSelectedDataSources dataSources, CancellationToken token = default)
     {
         var proceedWithRAG = true;
         IReadOnlyList<IDataSource> selectedDataSources = [];
         IReadOnlyList<DataSourceAgentSelected> finalAISelection = [];
         
-        // Get the logger:
-        var logger = Program.SERVICE_PROVIDER.GetService<ILogger<AgenticSrcSelWithDynHeur>>()!;
-        
         // Get the settings manager:
         var settings = Program.SERVICE_PROVIDER.GetService<SettingsManager>()!;
         
@@ -41,12 +40,12 @@ public class AgenticSrcSelWithDynHeur : IDataSourceSelectionProcess
         try
         {
             // Let the AI agent do its work:
-            var aiSelectedDataSources = await selectionAgent.PerformSelectionAsync(provider, lastPrompt, chatThread, dataSources, token);
+            var aiSelectedDataSources = await selectionAgent.PerformSelectionAsync(provider, lastUserPrompt, chatThread, dataSources, token);
 
             // Check if the AI selected any data sources:
             if (aiSelectedDataSources.Count is 0)
             {
-                logger.LogWarning("The AI did not select any data sources. The RAG process is skipped.");
+                LOGGER.LogWarning("The AI did not select any data sources. The RAG process is skipped.");
                 proceedWithRAG = false;
                 
                 return new(proceedWithRAG, selectedDataSources);
@@ -54,7 +53,7 @@ public class AgenticSrcSelWithDynHeur : IDataSourceSelectionProcess
 
             // Log the selected data sources:
             var selectedDataSourceInfo = aiSelectedDataSources.Select(ds => $"[Id={ds.Id}, reason={ds.Reason}, confidence={ds.Confidence}]").Aggregate((a, b) => $"'{a}', '{b}'");
-            logger.LogInformation($"The AI selected the data sources automatically. {aiSelectedDataSources.Count} data source(s) are selected: {selectedDataSourceInfo}.");
+            LOGGER.LogInformation($"The AI selected the data sources automatically. {aiSelectedDataSources.Count} data source(s) are selected: {selectedDataSourceInfo}.");
 
             //
             // Check how many data sources were hallucinated by the AI:
@@ -69,7 +68,7 @@ public class AgenticSrcSelWithDynHeur : IDataSourceSelectionProcess
 
             var numHallucinatedSources = totalAISelectedDataSources - aiSelectedDataSources.Count;
             if (numHallucinatedSources > 0)
-                logger.LogWarning($"The AI hallucinated {numHallucinatedSources} data source(s). We ignore them.");
+                LOGGER.LogWarning($"The AI hallucinated {numHallucinatedSources} data source(s). We ignore them.");
 
             if (aiSelectedDataSources.Count > 3)
             {
@@ -85,7 +84,7 @@ public class AgenticSrcSelWithDynHeur : IDataSourceSelectionProcess
                     if (aiSelectedDataSources.Any(x => x.Id == dataSource.DataSource.Id))
                         dataSource.Selected = true;
 
-                logger.LogInformation($"The AI selected {aiSelectedDataSources.Count} data source(s) with a confidence of at least {threshold}.");
+                LOGGER.LogInformation($"The AI selected {aiSelectedDataSources.Count} data source(s) with a confidence of at least {threshold}.");
 
                 // Transform the final data sources to the actual data sources:
                 selectedDataSources = aiSelectedDataSources.Select(x => settings.ConfigurationData.DataSources.FirstOrDefault(ds => ds.Id == x.Id)).Where(ds => ds is not null).ToList()!;

app/MindWork AI Studio/Tools/RAG/IAugmentationProcess.cs

@@ -24,10 +24,10 @@ public interface IAugmentationProcess
     /// Starts the augmentation process.
     /// </summary>
     /// <param name="provider">The LLM provider. Gets used, e.g., for automatic retrieval context validation.</param>
-    /// <param name="lastPrompt">The last prompt that was issued by the user.</param>
+    /// <param name="lastUserPrompt">The last user prompt that was issued by the user.</param>
     /// <param name="chatThread">The chat thread.</param>
     /// <param name="retrievalContexts">The retrieval contexts that were issued by the retrieval process.</param>
     /// <param name="token">The cancellation token.</param>
     /// <returns>The altered chat thread.</returns>
-    public Task<ChatThread> ProcessAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, IReadOnlyList<IRetrievalContext> retrievalContexts, CancellationToken token = default);
+    public Task<ChatThread> ProcessAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, IReadOnlyList<IRetrievalContext> retrievalContexts, CancellationToken token = default);
 }

app/MindWork AI Studio/Tools/RAG/IDataSourceSelectionProcess.cs

@@ -24,10 +24,10 @@ public interface IDataSourceSelectionProcess
     /// Starts the data source selection process.
     /// </summary>
     /// <param name="provider">The LLM provider. Used as default for data selection agents.</param>
-    /// <param name="lastPrompt">The last prompt that was issued by the user.</param>
+    /// <param name="lastUserPrompt">The last prompt that was issued by the user.</param>
     /// <param name="chatThread">The chat thread.</param>
     /// <param name="dataSources">The allowed data sources yielded by the data source service.</param>
     /// <param name="token">The cancellation token.</param>
     /// <returns></returns>
-    public Task<DataSelectionResult> SelectDataSourcesAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, AllowedSelectedDataSources dataSources, CancellationToken token = default);
+    public Task<DataSelectionResult> SelectDataSourcesAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, AllowedSelectedDataSources dataSources, CancellationToken token = default);
 }

app/MindWork AI Studio/Tools/RAG/IRagProcess.cs

@@ -24,9 +24,9 @@ public interface IRagProcess
     /// Starts the RAG process.
     /// </summary>
     /// <param name="provider">The LLM provider. Used to check whether the data sources are allowed to be used by this LLM.</param>
-    /// <param name="lastPrompt">The last prompt that was issued by the user.</param>
+    /// <param name="lastUserPrompt">The last user prompt that was issued by the user.</param>
     /// <param name="chatThread">The chat thread.</param>
     /// <param name="token">The cancellation token.</param>
     /// <returns>The altered chat thread.</returns>
-    public Task<ChatThread> ProcessAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, CancellationToken token = default);
+    public Task<ChatThread> ProcessAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, CancellationToken token = default);
 }

app/MindWork AI Studio/Tools/RAG/IRetrievalContext.cs

@@ -9,9 +9,9 @@ public interface IRetrievalContext
     /// The name of the data source.
     /// </summary>
     /// <remarks>
-    /// Depending on the configuration, the AI is selecting the appropriate data source.
-    /// In order to inform the user about where the information is coming from, the data
-    /// source name is necessary.
+    /// This is not the name the user chooses but the name of the source where
+    /// the match was found. This could be a document or database name, a website
+    /// or a directory on a remote server, etc.
     /// </remarks>
     public string DataSourceName { get; init; }
 

app/MindWork AI Studio/Tools/RAG/RAGProcesses/AISrcSelWithRetCtxVal.cs

@@ -11,6 +11,8 @@ namespace AIStudio.Tools.RAG.RAGProcesses;
 
 public sealed class AISrcSelWithRetCtxVal : IRagProcess
 {
+    private static readonly ILogger<AISrcSelWithRetCtxVal> LOGGER = Program.LOGGER_FACTORY.CreateLogger<AISrcSelWithRetCtxVal>();
+    
     private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(AISrcSelWithRetCtxVal).Namespace, nameof(AISrcSelWithRetCtxVal));
     
     #region Implementation of IRagProcess
@@ -25,9 +27,8 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
     public string Description => TB("This RAG process filters data sources, automatically selects appropriate sources, optionally allows manual source selection, retrieves data, and automatically validates the retrieval context.");
 
     /// <inheritdoc />
-    public async Task<ChatThread> ProcessAsync(IProvider provider, IContent lastPrompt, ChatThread chatThread, CancellationToken token = default)
+    public async Task<ChatThread> ProcessAsync(IProvider provider, IContent lastUserPrompt, ChatThread chatThread, CancellationToken token = default)
     {
-        var logger = Program.SERVICE_PROVIDER.GetService<ILogger<AISrcSelWithRetCtxVal>>()!;
         var settings = Program.SERVICE_PROVIDER.GetService<SettingsManager>()!;
         var dataSourceService = Program.SERVICE_PROVIDER.GetService<DataSourceService>()!;
         
@@ -36,7 +37,7 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
         //
         if (chatThread.DataSourceOptions.IsEnabled())
         {
-            logger.LogInformation("Data sources are enabled for this chat.");
+            LOGGER.LogInformation("Data sources are enabled for this chat.");
             
             // Across the different code-branches, we keep track of whether it
             // makes sense to proceed with the RAG process:
@@ -49,13 +50,13 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
             //
             if(chatThread.Blocks.Count == 0)
             {
-                logger.LogError("The chat thread is empty. Skipping the RAG process.");
+                LOGGER.LogError("The chat thread is empty. Skipping the RAG process.");
                 return chatThread;
             }
             
             if (chatThread.Blocks.Last().Role != ChatRole.AI)
             {
-                logger.LogError("The last block in the chat thread is not the AI block. There is something wrong with the chat thread. Skipping the RAG process.");
+                LOGGER.LogError("The last block in the chat thread is not the AI block. There is something wrong with the chat thread. Skipping the RAG process.");
                 return chatThread;
             }
             
@@ -82,7 +83,7 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
             if (chatThread.DataSourceOptions.AutomaticDataSourceSelection)
             {
                 var dataSourceSelectionProcess = new AgenticSrcSelWithDynHeur();
-                var result = await dataSourceSelectionProcess.SelectDataSourcesAsync(provider, lastPrompt, chatThread, dataSources, token);
+                var result = await dataSourceSelectionProcess.SelectDataSourcesAsync(provider, lastUserPrompt, chatThread, dataSources, token);
                 proceedWithRAG = result.ProceedWithRAG;
                 selectedDataSources = result.SelectedDataSources;
             }
@@ -92,12 +93,12 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
                 // No, the user made the choice manually:
                 //
                 var selectedDataSourceInfo = selectedDataSources.Select(ds => ds.Name).Aggregate((a, b) => $"'{a}', '{b}'");
-                logger.LogInformation($"The user selected the data sources manually. {selectedDataSources.Count} data source(s) are selected: {selectedDataSourceInfo}.");
+                LOGGER.LogInformation($"The user selected the data sources manually. {selectedDataSources.Count} data source(s) are selected: {selectedDataSourceInfo}.");
             }
 
             if(selectedDataSources.Count == 0)
             {
-                logger.LogWarning("No data sources are selected. The RAG process is skipped.");
+                LOGGER.LogWarning("No data sources are selected. The RAG process is skipped.");
                 proceedWithRAG = false;
             }
             else
@@ -148,7 +149,7 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
                 };
                 
                 if (previousDataSecurity != chatThread.DataSecurity)
-                    logger.LogInformation($"The data security of the chat thread was updated from '{previousDataSecurity}' to '{chatThread.DataSecurity}'.");
+                    LOGGER.LogInformation($"The data security of the chat thread was updated from '{previousDataSecurity}' to '{chatThread.DataSecurity}'.");
             }
             
             //
@@ -162,7 +163,7 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
                 //
                 var retrievalTasks = new List<Task<IReadOnlyList<IRetrievalContext>>>(selectedDataSources.Count);
                 foreach (var dataSource in selectedDataSources)
-                    retrievalTasks.Add(dataSource.RetrieveDataAsync(lastPrompt, chatThreadWithoutWaitingAIBlock, token));
+                    retrievalTasks.Add(dataSource.RetrieveDataAsync(lastUserPrompt, chatThreadWithoutWaitingAIBlock, token));
             
                 //
                 // Wait for all retrieval tasks to finish:
@@ -175,7 +176,7 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
                     }
                     catch (Exception e)
                     {
-                        logger.LogError(e, "An error occurred during the retrieval process.");
+                        LOGGER.LogError(e, "An error occurred during the retrieval process.");
                     }
                 }
             }
@@ -186,8 +187,38 @@ public sealed class AISrcSelWithRetCtxVal : IRagProcess
             if (proceedWithRAG)
             {
                 var augmentationProcess = new AugmentationOne();
-                chatThread = await augmentationProcess.ProcessAsync(provider, lastPrompt, chatThread, dataContexts, token);
+                chatThread = await augmentationProcess.ProcessAsync(provider, lastUserPrompt, chatThread, dataContexts, token);
             }
+            
+            //
+            // Add sources from the selected data
+            //
+            
+            // We know that the last block is the AI answer block (cf. check above):
+            var aiAnswerBlock = chatThread.Blocks.Last();
+            var aiAnswerSources = aiAnswerBlock.Content?.Sources;
+            
+            // It should never happen that the AI answer block does not contain a content part.
+            // Just in case, we check this:
+            if(aiAnswerSources is null)
+                return chatThread;
+            
+            var ragSources = new List<ISource>();
+            foreach (var retrievalContext in dataContexts)
+            {
+                var title = retrievalContext.DataSourceName;
+                if(string.IsNullOrWhiteSpace(title))
+                    continue;
+                
+                var link = retrievalContext.Path;
+                if(!link.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                ragSources.Add(new Source(title, link, SourceOrigin.RAG));
+            }
+
+            // Merge the sources, avoiding duplicates:
+            aiAnswerSources.MergeSources(ragSources);
         }
         
         return chatThread;

app/MindWork AI Studio/Tools/Services/UpdateService.cs

@@ -115,7 +115,14 @@ public sealed class UpdateService : BackgroundService, IMessageBusReceiver
         var response = await this.rust.CheckForUpdate();
         if (response.UpdateIsAvailable)
         {
-            if (this.settingsManager.ConfigurationData.App.UpdateInstallation is UpdateInstallation.AUTOMATIC)
+            // ReSharper disable RedundantAssignment
+            var isDevEnvironment = false;
+            #if DEBUG
+            isDevEnvironment = true;
+            #endif
+            // ReSharper restore RedundantAssignment
+            
+            if (!isDevEnvironment && this.settingsManager.ConfigurationData.App.UpdateInstallation is UpdateInstallation.AUTOMATIC)
             {
                 try
                 {

app/MindWork AI Studio/Tools/Source.cs

@@ -1,8 +1,8 @@
-namespace AIStudio.Provider;
+namespace AIStudio.Tools;
 
 /// <summary>
 /// Data model for a source used in the response.
 /// </summary>
 /// <param name="Title">The title of the source.</param>
 /// <param name="URL">The URL of the source.</param>
-public record Source(string Title, string URL) : ISource;
+public record Source(string Title, string URL, SourceOrigin Origin) : ISource;

app/MindWork AI Studio/Tools/SourceExtensions.cs

@@ -2,7 +2,7 @@ using System.Text;
 
 using AIStudio.Tools.PluginSystem;
 
-namespace AIStudio.Provider;
+namespace AIStudio.Tools;
 
 public static class SourceExtensions
 {
@@ -16,11 +16,43 @@ public static class SourceExtensions
     public static string ToMarkdown(this IList<Source> sources)
     {
         var sb = new StringBuilder();
-        sb.Append("## ");
-        sb.AppendLine(TB("Sources"));
-
+        var ragSources = new List<ISource>();
         var sourceNum = 0;
+        var addedLLMHeaders = false;
         foreach (var source in sources)
+        {
+            switch (source.Origin)
+            {
+                case SourceOrigin.RAG: 
+                    ragSources.Add(source);
+                    break;
+                
+                case SourceOrigin.LLM:
+                    if (!addedLLMHeaders)
+                    {
+                        sb.Append("## ");
+                        sb.AppendLine(TB("Sources provided by the AI"));
+                        addedLLMHeaders = true;
+                    }
+                    
+                    sb.Append($"- [{++sourceNum}] ");
+                    sb.Append('[');
+                    sb.Append(source.Title);
+                    sb.Append("](");
+                    sb.Append(source.URL);
+                    sb.AppendLine(")");
+                    break;
+            }
+        }
+        
+        if(ragSources.Count == 0)
+            return sb.ToString();
+        
+        sb.AppendLine();
+        sb.Append("## ");
+        sb.AppendLine(TB("Sources provided by the data providers"));
+        
+        foreach (var source in ragSources)
         {
             sb.Append($"- [{++sourceNum}] ");
             sb.Append('[');

app/MindWork AI Studio/Tools/SourceOrigin.cs

@@ -0,0 +1,17 @@
+namespace AIStudio.Tools;
+
+/// <summary>
+/// Represents the origin of a source, whether it was provided by the LLM or by the RAG process.
+/// </summary>
+public enum SourceOrigin
+{
+    /// <summary>
+    /// The LLM provided the source.
+    /// </summary>
+    LLM,
+    
+    /// <summary>
+    /// The source was provided by the RAG process.
+    /// </summary>
+    RAG,
+}

app/MindWork AI Studio/wwwroot/changelog/v0.9.52.md

@@ -1 +1,4 @@
 # v0.9.52, build 227 (2025-09-xx xx:xx UTC)
+- Added a feature so that matching results from data sources (local data sources as well as external ones via the ERI interface) are now also displayed at the end of a chat. All sources that come directly from the AI (like web searches) appear first, followed by those that come from the data sources. This source display works regardless of whether the AI actually used these sources, so users always get all the relevant information.
+- Improved developer experience by detecting development environments and disabling update prompts in those environments.
+- Fixed an issue where external data sources using the ERI interface weren't using the correct source names during the augmentation phase.

runtime/src/app_window.rs

@@ -1,6 +1,6 @@
 use std::sync::Mutex;
 use std::time::Duration;
-use log::{error, info, warn};
+use log::{error, info, trace, warn};
 use once_cell::sync::Lazy;
 use rocket::{get, post};
 use rocket::serde::json::Json;
@@ -12,7 +12,7 @@ use tauri::api::dialog::blocking::FileDialogBuilder;
 use tokio::time;
 use crate::api_token::APIToken;
 use crate::dotnet::stop_dotnet_server;
-use crate::environment::{is_prod, CONFIG_DIRECTORY, DATA_DIRECTORY};
+use crate::environment::{is_prod, is_dev, CONFIG_DIRECTORY, DATA_DIRECTORY};
 use crate::log::switch_to_file_logging;
 use crate::pdfium::PDFIUM_LIB_PATH;
 
@@ -78,20 +78,31 @@ pub fn start_tauri() {
                     info!(Source = "Tauri"; "Updater: update is pending!");
                 }
 
-                tauri::UpdaterEvent::DownloadProgress { chunk_length, content_length } => {
-                    info!(Source = "Tauri"; "Updater: downloaded {} of {:?}", chunk_length, content_length);
+                tauri::UpdaterEvent::DownloadProgress { chunk_length, content_length: _ } => {
+                    trace!(Source = "Tauri"; "Updater: downloading chunk of {chunk_length} bytes");
                 }
 
                 tauri::UpdaterEvent::Downloaded => {
                     info!(Source = "Tauri"; "Updater: update has been downloaded!");
                     warn!(Source = "Tauri"; "Try to stop the .NET server now...");
-                    stop_dotnet_server();
+
+                    if is_prod() {
+                        stop_dotnet_server();
+                    } else {
+                        warn!(Source = "Tauri"; "Development environment detected; do not stop the .NET server.");
+                    }
                 }
 
                 tauri::UpdaterEvent::Updated => {
                     info!(Source = "Tauri"; "Updater: app has been updated");
                     warn!(Source = "Tauri"; "Try to restart the app now...");
-                    app_handle.restart();
+
+                    if is_prod() {
+                        app_handle.restart();
+                    } else {
+                        warn!(Source = "Tauri"; "Development environment detected; do not restart the app.");
+                    }
+
                 }
 
                 tauri::UpdaterEvent::AlreadyUpToDate => {
@@ -157,6 +168,16 @@ pub async fn change_location_to(url: &str) {
 /// Checks for updates.
 #[get("/updates/check")]
 pub async fn check_for_update(_token: APIToken) -> Json<CheckUpdateResponse> {
+    if is_dev() {
+        warn!(Source = "Updater"; "The app is running in development mode; skipping update check.");
+        return Json(CheckUpdateResponse {
+            update_is_available: false,
+            error: false,
+            new_version: String::from(""),
+            changelog: String::from(""),
+        });
+    }
+
     let app_handle = MAIN_WINDOW.lock().unwrap().as_ref().unwrap().app_handle();
     let response = app_handle.updater().check().await;
     match response {
@@ -212,6 +233,11 @@ pub struct CheckUpdateResponse {
 /// Installs the update.
 #[get("/updates/install")]
 pub async fn install_update(_token: APIToken) {
+    if is_dev() {
+        warn!(Source = "Updater"; "The app is running in development mode; skipping update installation.");
+        return;
+    }
+
     let cloned_response_option = CHECK_UPDATE_RESPONSE.lock().unwrap().clone();
     match cloned_response_option {
         Some(update_response) => {