Merge branch 'main' into chunk-data

app/MindWork AI Studio/Components/ChatComponent.razor.cs

@@ -107,7 +107,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
     protected override async Task OnInitializedAsync()
     {
         // Apply the filters for the message bus:
-        this.ApplyFilters([], [ Event.HAS_CHAT_UNSAVED_CHANGES, Event.RESET_CHAT_STATE, Event.CHAT_STREAMING_DONE, Event.AI_JOB_CHANGED, Event.AI_JOB_FINISHED, Event.CHAT_GENERATION_CHANGED ]);
+        this.ApplyFilters([], [ Event.HAS_CHAT_UNSAVED_CHANGES, Event.RESET_CHAT_STATE, Event.CHAT_STREAMING_DONE, Event.AI_JOB_CHANGED, Event.AI_JOB_FINISHED, Event.CHAT_GENERATION_CHANGED, Event.WORKSPACE_RENAMED ]);
         
         // Configure the spellchecking for the user input:
         this.SettingsManager.InjectSpellchecking(USER_INPUT_ATTRIBUTES);
@@ -383,6 +383,29 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
         this.WorkspaceName(this.currentWorkspaceName);
     }
 
+    private async Task RefreshRenamedWorkspaceHeaderAsync(Guid workspaceId)
+    {
+        var currentChatThread = this.ChatThread;
+        if (currentChatThread is null || currentChatThread.WorkspaceId != workspaceId)
+            return;
+
+        var syncVersion = Interlocked.Increment(ref this.workspaceHeaderSyncVersion);
+        var chatThreadId = currentChatThread.ChatId;
+        var loadedWorkspaceName = await WorkspaceBehaviour.LoadWorkspaceNameAsync(workspaceId);
+
+        if (syncVersion != this.workspaceHeaderSyncVersion)
+            return;
+
+        if (this.ChatThread is null
+            || this.ChatThread.ChatId != chatThreadId
+            || this.ChatThread.WorkspaceId != workspaceId)
+            return;
+
+        this.currentChatThreadId = chatThreadId;
+        this.currentWorkspaceId = workspaceId;
+        this.PublishWorkspaceNameIfChanged(loadedWorkspaceName);
+    }
+
     private async Task SyncForegroundChatAsync()
     {
         var nextForegroundChatId = this.ChatThread?.ChatId ?? Guid.Empty;
@@ -874,7 +897,7 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
             { x => x.ConfirmText, T("Move chat") },
         };
         
-        var dialogReference = await this.DialogService.ShowAsync<WorkspaceSelectionDialog>(T("Move Chat to Workspace"), dialogParameters, DialogOptions.FULLSCREEN);
+        var dialogReference = await this.DialogService.ShowAsync<WorkspaceSelectionDialog>(T("Move Chat to Workspace"), dialogParameters, DialogOptions.FULLSCREEN_MANUAL_ESCAPE);
         var dialogResult = await dialogReference.Result;
         if (dialogResult is null || dialogResult.Canceled)
             return;
@@ -1085,6 +1108,11 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable
                 if(this.autoSaveEnabled)
                     await this.SaveThread();
                 break;
+
+            case Event.WORKSPACE_RENAMED:
+                if (data is Guid workspaceId)
+                    await this.RefreshRenamedWorkspaceHeaderAsync(workspaceId);
+                break;
             
             case Event.AI_JOB_CHANGED:
             case Event.AI_JOB_FINISHED:

app/MindWork AI Studio/Components/ConfigurationBase.razor.cs

@@ -56,10 +56,12 @@ public abstract partial class ConfigurationBase : MSGComponentBase
 
     protected bool IsDisabled => this.Disabled() || this.IsLocked();
     
-    private string Classes => $"{this.GetClassForBase} {MARGIN_CLASS}";
+    private string Classes => $"{this.GetClassForBase} {JUSTIFIED_HELP_CLASS} {MARGIN_CLASS}";
     
     private protected virtual RenderFragment? Body => null;
 
+    private const string JUSTIFIED_HELP_CLASS = "configuration-help-justified";
+
     private const string MARGIN_CLASS = "mb-6";
     
     protected static readonly Dictionary<string, object?> SPELLCHECK_ATTRIBUTES = new();

app/MindWork AI Studio/Components/ConfigurationFile.razor

@@ -0,0 +1,27 @@
+@inherits ConfigurationBaseCore
+
+<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+    <MudTextField
+        T="string"
+        Text="@this.Text()"
+        TextChanged="@this.InternalUpdate"
+        Disabled="@this.IsDisabled"
+        Adornment="Adornment.Start"
+        AdornmentIcon="@this.Icon"
+        AdornmentColor="@this.IconColor"
+        UserAttributes="@SPELLCHECK_ATTRIBUTES"
+        Immediate="@true"
+        Underline="false"
+        Class="flex-grow-1"
+    />
+
+    <MudButton StartIcon="@Icons.Material.Filled.FolderOpen"
+               Variant="Variant.Outlined"
+               Color="Color.Primary"
+               Size="Size.Small"
+               Disabled="@this.IsDisabled"
+               Class="mb-1"
+               OnClick="@this.OpenFileDialog">
+        @T("Choose File")
+    </MudButton>
+</MudStack>

app/MindWork AI Studio/Components/ConfigurationFile.razor.cs

@@ -0,0 +1,127 @@
+using AIStudio.Tools.Rust;
+using AIStudio.Tools.Services;
+
+using Microsoft.AspNetCore.Components;
+
+using Timer = System.Timers.Timer;
+
+namespace AIStudio.Components;
+
+public partial class ConfigurationFile : ConfigurationBaseCore
+{
+    /// <summary>
+    /// The text used for the textfield.
+    /// </summary>
+    [Parameter]
+    public Func<string> Text { get; set; } = () => string.Empty;
+
+    /// <summary>
+    /// An action which is called when the text was changed.
+    /// </summary>
+    [Parameter]
+    public Action<string> TextUpdate { get; set; } = _ => { };
+
+    /// <summary>
+    /// The icon to display next to the textfield.
+    /// </summary>
+    [Parameter]
+    public string Icon { get; set; } = Icons.Material.Filled.AttachFile;
+
+    /// <summary>
+    /// The color of the icon to use.
+    /// </summary>
+    [Parameter]
+    public Color IconColor { get; set; } = Color.Default;
+
+    /// <summary>
+    /// The title of the file selection dialog.
+    /// </summary>
+    [Parameter]
+    public string FileDialogTitle { get; set; } = "Select File";
+
+    /// <summary>
+    /// The optional file type filter for the file selection dialog.
+    /// </summary>
+    [Parameter]
+    public FileTypeFilter[]? Filter { get; set; }
+
+    [Inject]
+    private RustService RustService { get; init; } = null!;
+
+    private string internalText = string.Empty;
+    private readonly Timer timer = new(TimeSpan.FromMilliseconds(500))
+    {
+        AutoReset = false
+    };
+
+    #region Overrides of ConfigurationBase
+
+    /// <inheritdoc />
+    protected override bool Stretch => true;
+
+    protected override Variant Variant => Variant.Outlined;
+
+    protected override string Label => this.OptionDescription;
+
+    #endregion
+
+    #region Overrides of ConfigurationBase
+
+    protected override async Task OnInitializedAsync()
+    {
+        this.timer.Elapsed += async (_, _) => await this.InvokeAsync(async () => await this.OptionChanged(this.internalText));
+        await base.OnInitializedAsync();
+    }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        this.internalText = this.Text();
+        await base.OnParametersSetAsync();
+    }
+
+    #endregion
+
+    private void InternalUpdate(string text)
+    {
+        this.timer.Stop();
+        this.internalText = text;
+        this.timer.Start();
+    }
+
+    private async Task OpenFileDialog()
+    {
+        var response = await this.RustService.SelectFile(this.FileDialogTitle, this.Filter, string.IsNullOrWhiteSpace(this.internalText) ? null : this.internalText);
+        if (response.UserCancelled)
+            return;
+
+        this.timer.Stop();
+        this.internalText = response.SelectedFilePath;
+        await this.OptionChanged(response.SelectedFilePath);
+    }
+
+    private async Task OptionChanged(string updatedText)
+    {
+        this.TextUpdate(updatedText);
+        await this.SettingsManager.StoreSettings();
+        await this.InformAboutChange();
+    }
+
+    #region Overrides of MSGComponentBase
+
+    protected override void DisposeResources()
+    {
+        try
+        {
+            this.timer.Stop();
+            this.timer.Dispose();
+        }
+        catch
+        {
+            // ignore
+        }
+
+        base.DisposeResources();
+    }
+
+    #endregion
+}

app/MindWork AI Studio/Components/ConfigurationShortcut.razor

@@ -3,7 +3,7 @@
 <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
     <MudIcon Icon="@this.Icon" Color="@this.IconColor"/>
     <MudText Typo="Typo.body1" Class="flex-grow-1">
-        @if (string.IsNullOrWhiteSpace(this.Shortcut()))
+        @if (string.IsNullOrWhiteSpace(this.Data.Value()))
         {
             @T("No shortcut configured")
         }

app/MindWork AI Studio/Components/ConfigurationShortcut.razor.cs

@@ -1,5 +1,4 @@
 using AIStudio.Dialogs;
-using AIStudio.Tools.Rust;
 using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
@@ -19,22 +18,10 @@ public partial class ConfigurationShortcut : ConfigurationBaseCore
     private RustService RustService { get; init; } = null!;
 
     /// <summary>
-    /// The current shortcut value.
+    /// The shortcut binding data.
     /// </summary>
     [Parameter]
-    public Func<string> Shortcut { get; set; } = () => string.Empty;
-
-    /// <summary>
-    /// An action which is called when the shortcut was changed.
-    /// </summary>
-    [Parameter]
-    public Action<string> ShortcutUpdate { get; set; } = _ => { };
-
-    /// <summary>
-    /// The name/identifier of the shortcut (used for conflict detection and registration).
-    /// </summary>
-    [Parameter]
-    public Shortcut ShortcutId { get; init; }
+    public ConfigurationShortcutData Data { get; set; } = ConfigurationShortcutData.Empty;
 
     /// <summary>
     /// The icon to display.
@@ -60,10 +47,18 @@ public partial class ConfigurationShortcut : ConfigurationBaseCore
 
     private string GetDisplayShortcut()
     {
-        var shortcut = this.Shortcut();
+        var shortcut = this.Data.Value();
         if (string.IsNullOrWhiteSpace(shortcut))
             return string.Empty;
 
+        var shortcutDisplayName = this.Data.DisplayName();
+        var shortcutDisplaySource = this.Data.DisplaySource();
+        if (!string.IsNullOrWhiteSpace(shortcutDisplayName)
+            && string.Equals(shortcutDisplaySource, shortcut, StringComparison.Ordinal))
+        {
+            return shortcutDisplayName;
+        }
+
         // Convert internal format to display format:
         return shortcut
             .Replace("CmdOrControl", OperatingSystem.IsMacOS() ? "Cmd" : "Ctrl")
@@ -80,8 +75,8 @@ public partial class ConfigurationShortcut : ConfigurationBaseCore
         {
             var dialogParameters = new DialogParameters<ShortcutDialog>
             {
-                { x => x.InitialShortcut, this.Shortcut() },
-                { x => x.ShortcutId, this.ShortcutId },
+                { x => x.InitialShortcut, this.Data.Value() },
+                { x => x.ShortcutId, this.Data.Id },
             };
 
             var dialogReference = await this.DialogService.ShowAsync<ShortcutDialog>(
@@ -93,9 +88,17 @@ public partial class ConfigurationShortcut : ConfigurationBaseCore
             if (dialogResult is null || dialogResult.Canceled)
                 return;
 
-            if (dialogResult.Data is string newShortcut)
+            if (dialogResult.Data is ShortcutDialogResult shortcutResult)
             {
-                this.ShortcutUpdate(newShortcut);
+                this.Data.ValueUpdate(shortcutResult.Shortcut);
+                this.Data.DisplayUpdate(shortcutResult.DisplayName, shortcutResult.DisplaySource);
+                await this.SettingsManager.StoreSettings();
+                await this.InformAboutChange();
+            }
+            else if (dialogResult.Data is string newShortcut)
+            {
+                this.Data.ValueUpdate(newShortcut);
+                this.Data.DisplayUpdate(string.Empty, string.Empty);
                 await this.SettingsManager.StoreSettings();
                 await this.InformAboutChange();
             }

app/MindWork AI Studio/Components/ConfigurationShortcutData.cs

@@ -0,0 +1,44 @@
+using AIStudio.Tools.Rust;
+
+namespace AIStudio.Components;
+
+/// <summary>
+/// UI binding data for a configurable keyboard shortcut.
+/// </summary>
+public sealed class ConfigurationShortcutData
+{
+    /// <summary>
+    /// Empty shortcut binding.
+    /// </summary>
+    public static ConfigurationShortcutData Empty { get; } = new();
+
+    /// <summary>
+    /// The name/identifier of the shortcut, used for conflict detection and registration.
+    /// </summary>
+    public Shortcut Id { get; init; } = Shortcut.NONE;
+
+    /// <summary>
+    /// The current shortcut value.
+    /// </summary>
+    public Func<string> Value { get; init; } = () => string.Empty;
+
+    /// <summary>
+    /// An action that is called when the shortcut was changed.
+    /// </summary>
+    public Action<string> ValueUpdate { get; init; } = _ => { };
+
+    /// <summary>
+    /// The optional user-facing shortcut label.
+    /// </summary>
+    public Func<string> DisplayName { get; init; } = () => string.Empty;
+
+    /// <summary>
+    /// The canonical shortcut value the optional user-facing label belongs to.
+    /// </summary>
+    public Func<string> DisplaySource { get; init; } = () => string.Empty;
+
+    /// <summary>
+    /// An action that is called when the user-facing shortcut label was changed.
+    /// </summary>
+    public Action<string, string> DisplayUpdate { get; init; } = (_, _) => { };
+}

app/MindWork AI Studio/Components/Settings/SettingsPanelAgentAssistantAudit.razor

@@ -3,9 +3,9 @@
 
 <ExpansionPanel HeaderIcon="@Icons.Material.Filled.Policy" HeaderText="@T("Agent: Security Audit for external Assistants")">
     <MudPaper Class="pa-3 mb-8 border-dashed border rounded-lg">
-        <MudText Typo="Typo.body1" Class="mb-3">
+        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
             @T("This Agent audits newly installed or updated external Plugin-Assistant for security risks before they are activated and stores the latest audit card until the plugin manifest changes.")
-        </MudText>
+        </MudJustifiedText>
         <MudField Label="@T("Require a security audit before activating external Assistants?")" Variant="Variant.Outlined" Underline="false" Class="mb-6" InnerPadding="false">
             <MudSwitch T="bool" Value="@this.SettingsManager.ConfigurationData.AssistantPluginAudit.RequireAuditBeforeActivation" ValueChanged="@this.RequireAuditBeforeActivationChanged" Color="Color.Primary">
                 @(this.SettingsManager.ConfigurationData.AssistantPluginAudit.RequireAuditBeforeActivation ? T("External Assistants must be audited before activation") : T("External Assistant can be activated without an audit"))

app/MindWork AI Studio/Components/Settings/SettingsPanelAgentContentCleaner.razor

@@ -2,9 +2,9 @@
 
 <ExpansionPanel HeaderIcon="@Icons.Material.Filled.TextFields" HeaderText="@T("Agent: Text Content Cleaner Options")">
     <MudPaper Class="pa-3 mb-8 border-dashed border rounded-lg">
-        <MudText Typo="Typo.body1" Class="mb-3">
+        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
             @T("Use Case: this agent is used to clean up text content. It extracts the main content, removes advertisements and other irrelevant things, and attempts to convert relative links into absolute links so that they can be used.")
-        </MudText>
+        </MudJustifiedText>
         <ConfigurationOption OptionDescription="@T("Preselect text content cleaner options?")" LabelOn="@T("Options are preselected")" LabelOff="@T("No options are preselected")" State="@(() => this.SettingsManager.ConfigurationData.TextContentCleaner.PreselectAgentOptions)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.TextContentCleaner.PreselectAgentOptions = updatedState)" OptionHelp="@T("When enabled, you can preselect some agent options. This is might be useful when you prefer an LLM.")"/>
         <ConfigurationProviderSelection Data="@this.AvailableLLMProvidersFunc()" Disabled="@(() => !this.SettingsManager.ConfigurationData.TextContentCleaner.PreselectAgentOptions)" SelectedValue="@(() => this.SettingsManager.ConfigurationData.TextContentCleaner.PreselectedAgentProvider)" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.TextContentCleaner.PreselectedAgentProvider = selectedValue)"/>
     </MudPaper>

app/MindWork AI Studio/Components/Settings/SettingsPanelAgentDataSourceSelection.razor

@@ -2,9 +2,9 @@
 
 <ExpansionPanel HeaderIcon="@Icons.Material.Filled.SelectAll" HeaderText="@T("Agent: Data Source Selection Options")">
     <MudPaper Class="pa-3 mb-8 border-dashed border rounded-lg">
-        <MudText Typo="Typo.body1" Class="mb-3">
+        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
             @T("Use Case: this agent is used to select the appropriate data sources for the current prompt.")
-        </MudText>
+        </MudJustifiedText>
         <ConfigurationOption OptionDescription="@T("Preselect data source selection options?")" LabelOn="@T("Options are preselected")" LabelOff="@T("No options are preselected")" State="@(() => this.SettingsManager.ConfigurationData.AgentDataSourceSelection.PreselectAgentOptions)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.AgentDataSourceSelection.PreselectAgentOptions = updatedState)" OptionHelp="@T("When enabled, you can preselect some agent options. This is might be useful when you prefer an LLM.")"/>
         <ConfigurationProviderSelection Data="@this.AvailableLLMProvidersFunc()" Disabled="@(() => !this.SettingsManager.ConfigurationData.AgentDataSourceSelection.PreselectAgentOptions)" SelectedValue="@(() => this.SettingsManager.ConfigurationData.AgentDataSourceSelection.PreselectedAgentProvider)" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.AgentDataSourceSelection.PreselectedAgentProvider = selectedValue)"/>
     </MudPaper>

app/MindWork AI Studio/Components/Settings/SettingsPanelAgentRetrievalContextValidation.razor

@@ -1,9 +1,9 @@
 @inherits SettingsPanelBase
 
 <ExpansionPanel HeaderIcon="@Icons.Material.Filled.Assessment" HeaderText="@T("Agent: Retrieval Context Validation Options")">
-    <MudText Typo="Typo.body1" Class="mb-3">
+    <MudJustifiedText Typo="Typo.body1" Class="mb-3">
         @T("Use Case: this agent is used to validate any retrieval context of any retrieval process. Perhaps there are many of these retrieval contexts and you want to validate them all. Therefore, you might want to use a cheap and fast LLM for this job. When using a local or self-hosted LLM, look for a small (e.g. 3B) and fast model.")
-    </MudText>
+    </MudJustifiedText>
     <ConfigurationOption OptionDescription="@T("Enable the retrieval context validation agent?")" LabelOn="@T("The validation agent is enabled")" LabelOff="@T("No validation is performed")" State="@(() => this.SettingsManager.ConfigurationData.AgentRetrievalContextValidation.EnableRetrievalContextValidation)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.AgentRetrievalContextValidation.EnableRetrievalContextValidation = updatedState)" OptionHelp="@T("When enabled, the retrieval context validation agent will check each retrieval context of any retrieval process, whether a context makes sense for the given prompt.")"/>
     @if (this.SettingsManager.ConfigurationData.AgentRetrievalContextValidation.EnableRetrievalContextValidation)
     {

app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor

@@ -37,7 +37,7 @@
     @if (PreviewFeatures.PRE_SPEECH_TO_TEXT_2026.IsEnabled(this.SettingsManager))
     {
         <ConfigurationSelect OptionDescription="@T("Select a transcription provider")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.UseTranscriptionProvider)" Data="@this.GetFilteredTranscriptionProviders()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.UseTranscriptionProvider = selectedValue)" OptionHelp="@T("Select a transcription provider for transcribing your voice. Without a selected provider, dictation and transcription features will be disabled.")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.UseTranscriptionProvider, out var meta) && meta.IsLocked"/>
-        <ConfigurationShortcut ShortcutId="Shortcut.VOICE_RECORDING_TOGGLE" OptionDescription="@T("Voice recording shortcut")" Shortcut="@(() => this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecording)" ShortcutUpdate="@(shortcut => this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecording = shortcut)" OptionHelp="@T("The global keyboard shortcut for toggling voice recording. This shortcut works system-wide, even when the app is not focused.")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.ShortcutVoiceRecording, out var meta) && meta.IsLocked"/>
+        <ConfigurationShortcut Data="@this.VoiceRecordingShortcut" OptionDescription="@T("Voice recording shortcut")" OptionHelp="@T("The global keyboard shortcut for toggling voice recording. This shortcut works system-wide, even when the app is not focused.")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.ShortcutVoiceRecording, out var meta) && meta.IsLocked"/>
     }
 
     @if (this.SettingsManager.ConfigurationData.App.ShowAdminSettings)
@@ -46,12 +46,12 @@
             @T("Enterprise Administration")
         </MudText>
 
-        <MudText Typo="Typo.body2" Class="mb-3">
+        <MudJustifiedText Typo="Typo.body2" Class="mb-3">
             @T("Generate a 256-bit encryption secret for encrypting API keys in configuration plugins. Deploy this secret to client machines via Group Policy (Windows Registry) or environment variables. Providers can then be exported with encrypted API keys using the export buttons in the provider settings.")
             <MudLink Href="https://github.com/MindWorkAI/AI-Studio/blob/main/documentation/Enterprise%20IT.md" Target="_blank">
                 @T("Read the Enterprise IT documentation for details.")
             </MudLink>
-        </MudText>
+        </MudJustifiedText>
 
         <MudButton StartIcon="@Icons.Material.Filled.Key"
                    Variant="Variant.Filled"
@@ -59,5 +59,13 @@
                    OnClick="@this.GenerateEncryptionSecret">
             @T("Generate an encryption secret and copy it to the clipboard")
         </MudButton>
+
+        <MudText Typo="Typo.h6" Class="mt-6 mb-3">
+            @T("External HTTPS certificates")
+        </MudText>
+
+        <ConfigurationOption OptionDescription="@T("Use additional root certificates for external HTTPS requests?")" LabelOn="@T("Additional root certificates are enabled")" LabelOff="@T("Additional root certificates are disabled")" State="@(() => this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificatesEnabled)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificatesEnabled = updatedState)" OptionHelp="@T("When enabled, AI Studio can trust root certificates from a configured PEM bundle for external HTTPS requests, such as self-hosted AI providers, embeddings, transcription, ERI data sources, and enterprise configuration downloads. Normal hostname and certificate validity checks still apply. Integrated cloud providers, such as OpenAI, Google, and others, will never use these additional certificates. Please note that you usually do not need this setting on macOS or Windows. If you use Linux with the AppImage version of MindWork AI Studio, you also do not need this option. A valid use case is a Linux environment where AI Studio runs from a Flatpak.")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.ExternalHttpCustomRootCertificatesEnabled, out var meta) && meta.IsLocked"/>
+        <ConfigurationFile OptionDescription="@T("Root certificate bundle path")" Icon="@Icons.Material.Filled.Folder" Text="@(() => this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificateBundlePath)" TextUpdate="@(updatedText => this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificateBundlePath = updatedText)" FileDialogTitle="@T("Select a root certificate bundle")" Filter="@([FileTypes.CERTIFICATE_BUNDLE])" Disabled="@this.AreExternalHttpCustomRootCertificateDetailsDisabled" OptionHelp="@T("Path to a PEM file containing one or more root CA certificates. For Flatpak deployments, this file must be placed in a location that is readable inside the sandbox.")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.ExternalHttpCustomRootCertificateBundlePath, out var meta) && meta.IsLocked"/>
+        <ConfigurationText OptionDescription="@T("Allowed hosts for additional root certificates")" Icon="@Icons.Material.Filled.Dns" NumLines="3" Text="@this.GetExternalHttpCustomRootCertificateAllowedHostsText" TextUpdate="@this.UpdateExternalHttpCustomRootCertificateAllowedHosts" Disabled="@this.AreExternalHttpCustomRootCertificateDetailsDisabled" OptionHelp="@T("Enter one host pattern per line. Exact hosts such as data.intra.example.org and one-label wildcards such as *.intra.example.org are supported. Cloud provider endpoints built into AI Studio, such as OpenAI, Google, etc., never use these additional root certificates.")" IsLocked="() => ManagedConfiguration.TryGet(x => x.App, x => x.ExternalHttpCustomRootCertificateAllowedHosts, out var meta) && meta.IsLocked"/>
     }
 </ExpansionPanel>

app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor.cs

@@ -1,11 +1,22 @@
 using AIStudio.Provider;
 using AIStudio.Settings;
 using AIStudio.Settings.DataModel;
+using AIStudio.Tools.Rust;
 
 namespace AIStudio.Components.Settings;
 
 public partial class SettingsPanelApp : SettingsPanelBase
 {
+    private ConfigurationShortcutData VoiceRecordingShortcut => new()
+    {
+        Id = Shortcut.VOICE_RECORDING_TOGGLE,
+        Value = () => this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecording,
+        ValueUpdate = shortcut => this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecording = shortcut,
+        DisplayName = () => this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecordingDisplayName,
+        DisplaySource = () => this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecordingDisplaySource,
+        DisplayUpdate = this.UpdateShortcutVoiceRecordingDisplay,
+    };
+
     private async Task GenerateEncryptionSecret()
     {
         var secret = EnterpriseEncryption.GenerateSecret();
@@ -67,12 +78,38 @@ public partial class SettingsPanelApp : SettingsPanelBase
         return enabled;
     }
 
+    private string GetExternalHttpCustomRootCertificateAllowedHostsText()
+    {
+        return string.Join(Environment.NewLine, this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificateAllowedHosts.Order(StringComparer.OrdinalIgnoreCase));
+    }
+
+    private bool AreExternalHttpCustomRootCertificateDetailsDisabled()
+    {
+        return !this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificatesEnabled;
+    }
+
+    private void UpdateExternalHttpCustomRootCertificateAllowedHosts(string updatedText)
+    {
+        var patterns = updatedText
+            .Split(['\r', '\n', ';', ','], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+            .Where(pattern => !string.IsNullOrWhiteSpace(pattern))
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        this.SettingsManager.ConfigurationData.App.ExternalHttpCustomRootCertificateAllowedHosts = patterns;
+    }
+
     private void UpdateEnabledPreviewFeatures(HashSet<PreviewFeatures> selectedFeatures)
     {
         selectedFeatures.UnionWith(this.GetPluginContributedPreviewFeatures());
         this.SettingsManager.ConfigurationData.App.EnabledPreviewFeatures = selectedFeatures;
     }
 
+    private void UpdateShortcutVoiceRecordingDisplay(string displayName, string displaySource)
+    {
+        this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecordingDisplayName = displayName;
+        this.SettingsManager.ConfigurationData.App.ShortcutVoiceRecordingDisplaySource = displaySource;
+    }
+
     private async Task UpdateLangBehaviour(LangBehavior behavior)
     {
         this.SettingsManager.ConfigurationData.App.LanguageBehavior = behavior;

app/MindWork AI Studio/Components/Workspaces.razor

@@ -11,6 +11,36 @@
 }
 else
 {
+    @if (this.SearchVisible)
+    {
+        <MudStack Class="mx-3 mt-2 mb-1" Spacing="1" Style="position: sticky; top: 0; z-index: 2; background-color: var(--mud-palette-background);">
+            <MudStack Row="@true" AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap" Spacing="1">
+                <MudTextField T="string"
+                              Text="@this.searchText"
+                              TextChanged="@this.OnSearchTextChanged"
+                              Placeholder="@T("Search chats")"
+                              Variant="Variant.Outlined"
+                              Margin="Margin.Dense"
+                              Immediate="@true"
+                              Adornment="Adornment.Start"
+                              AdornmentIcon="@Icons.Material.Filled.Search"/>
+                <MudTooltip Text="@T("Clear search")" Placement="@WORKSPACE_ITEM_TOOLTIP_PLACEMENT">
+                    <MudIconButton Icon="@Icons.Material.Filled.Clear" Size="Size.Medium" Color="Color.Inherit" Disabled="@(string.IsNullOrWhiteSpace(this.searchText))" OnClick="@this.ClearSearchAsync"/>
+                </MudTooltip>
+            </MudStack>
+
+            <MudStack Row="@true" AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap" Spacing="1">
+                <MudSwitch T="bool" Value="@this.includeThreadContents" ValueChanged="@this.IncludeThreadContentsChanged" Color="Color.Primary">
+                    @T("Search chat contents")
+                </MudSwitch>
+                @if (this.isSearchRunning)
+                {
+                    <MudProgressCircular Size="Size.Small" Indeterminate="@true"/>
+                }
+            </MudStack>
+        </MudStack>
+    }
+
     <MudTreeView T="ITreeItem" Items="@this.treeItems" SelectionMode="SelectionMode.SingleSelection" Hover="@true" ExpandOnClick="@true" Class="ma-3">
         <ItemTemplate Context="item">
             @switch (item.Value)
@@ -35,7 +65,7 @@ else
                         <MudTreeViewItem T="ITreeItem" Icon="@this.GetTreeItemIcon(treeItem)" Value="@item.Value" Expanded="@item.Expanded" CanExpand="@treeItem.Expandable" Items="@(treeItem.Children!)" OnClick="@(() => this.LoadChatAsync(treeItem.Path, true))">
                             <BodyContent>
                                 <div style="display: grid; grid-template-columns: 1fr auto; align-items: center; width: 100%">
-                                    <MudText Style="justify-self: start;">
+                                    <MudText Style="@this.GetChatTreeItemTextStyle(treeItem)">
                                         @if (string.IsNullOrWhiteSpace(treeItem.Text))
                                         {
                                             @T("Empty chat")
@@ -71,15 +101,22 @@ else
                                     <MudText Style="justify-self: start;">
                                         @treeItem.Text
                                     </MudText>
-                                    <div style="justify-self: end;">
-                                        <MudTooltip Text="@T("Rename")" Placement="@WORKSPACE_ITEM_TOOLTIP_PLACEMENT">
-                                            <MudIconButton Icon="@Icons.Material.Filled.Edit" Size="Size.Medium" Color="Color.Inherit" OnClick="@(() => this.RenameWorkspaceAsync(treeItem.Path))"/>
-                                        </MudTooltip>
+                                    @if (!this.HasSearchQuery)
+                                    {
+                                        <div style="justify-self: end;">
+                                            <MudTooltip Text="@this.GetAddChatToWorkspaceTooltip(treeItem.Text)" Placement="@WORKSPACE_ITEM_TOOLTIP_PLACEMENT">
+                                                <MudIconButton Icon="@Icons.Material.Filled.AddComment" Size="Size.Medium" Color="Color.Inherit" OnClick="@(() => this.AddChatAsync(treeItem.Path))"/>
+                                            </MudTooltip>
 
-                                        <MudTooltip Text="@T("Delete")" Placement="@WORKSPACE_ITEM_TOOLTIP_PLACEMENT">
-                                            <MudIconButton Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" Color="Color.Error" OnClick="@(() => this.DeleteWorkspaceAsync(treeItem.Path))"/>
-                                        </MudTooltip>
-                                    </div>
+                                            <MudTooltip Text="@T("Rename")" Placement="@WORKSPACE_ITEM_TOOLTIP_PLACEMENT">
+                                                <MudIconButton Icon="@Icons.Material.Filled.Edit" Size="Size.Medium" Color="Color.Inherit" OnClick="@(() => this.RenameWorkspaceAsync(treeItem.Path))"/>
+                                            </MudTooltip>
+
+                                            <MudTooltip Text="@T("Delete")" Placement="@WORKSPACE_ITEM_TOOLTIP_PLACEMENT">
+                                                <MudIconButton Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" Color="Color.Error" OnClick="@(() => this.DeleteWorkspaceAsync(treeItem.Path))"/>
+                                            </MudTooltip>
+                                        </div>
+                                    }
                                 </div>
                             </BodyContent>
                         </MudTreeViewItem>

app/MindWork AI Studio/Components/Workspaces.razor.cs

@@ -3,7 +3,6 @@ using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Dialogs;
-using AIStudio.Settings;
 using AIStudio.Tools.AIJobs;
 
 using Microsoft.AspNetCore.Components;
@@ -32,21 +31,32 @@ public partial class Workspaces : MSGComponentBase
     [Parameter]
     public bool ExpandRootNodes { get; set; } = true;
 
+    [Parameter]
+    public bool SearchVisible { get; set; }
+
+    [Parameter]
+    public EventCallback<bool> SearchVisibleChanged { get; set; }
+
     private const Placement WORKSPACE_ITEM_TOOLTIP_PLACEMENT = Placement.Bottom;
     private readonly SemaphoreSlim treeLoadingSemaphore = new(1, 1);
     private readonly List<TreeItemData<ITreeItem>> treeItems = [];
     private readonly HashSet<Guid> loadingWorkspaceChatLists = [];
 
     private CancellationTokenSource? prefetchCancellationTokenSource;
+    private CancellationTokenSource? searchCancellationTokenSource;
     private bool isInitialLoading = true;
     private bool isDisposed;
+    private bool includeThreadContents;
+    private bool isSearchRunning;
+    private string searchText = string.Empty;
+    private long searchRevision;
     
     #region Overrides of ComponentBase
 
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-        this.ApplyFilters([], [ Event.AI_JOB_CHANGED, Event.AI_JOB_FINISHED, Event.CHAT_GENERATION_CHANGED ]);
+        this.ApplyFilters([], [ Event.AI_JOB_CHANGED, Event.AI_JOB_FINISHED, Event.CHAT_GENERATION_CHANGED, Event.WORKSPACE_CREATED ]);
         _ = this.LoadTreeItemsAsync(startPrefetch: true);
     }
 
@@ -54,6 +64,7 @@ public partial class Workspaces : MSGComponentBase
 
     private async Task LoadTreeItemsAsync(bool startPrefetch = true, bool forceReload = false)
     {
+        var shouldRunSearch = false;
         await this.treeLoadingSemaphore.WaitAsync();
         try
         {
@@ -64,7 +75,11 @@ public partial class Workspaces : MSGComponentBase
                 await WorkspaceBehaviour.ForceReloadWorkspaceTreeAsync();
 
             var snapshot = await WorkspaceBehaviour.GetOrLoadWorkspaceTreeShellAsync();
-            this.BuildTreeItems(snapshot);
+            if (this.HasSearchQuery)
+                shouldRunSearch = true;
+            else
+                this.BuildTreeItems(snapshot);
+
             this.isInitialLoading = false;
         }
         finally
@@ -72,12 +87,40 @@ public partial class Workspaces : MSGComponentBase
             this.treeLoadingSemaphore.Release();
         }
 
-        await this.SafeStateHasChanged();
+        if (shouldRunSearch)
+            await this.SearchWorkspaceItemsAsync();
+        else
+            await this.SafeStateHasChanged();
 
         if (startPrefetch)
             await this.StartPrefetchAsync();
     }
 
+    private bool HasSearchQuery => this.SearchVisible && !string.IsNullOrWhiteSpace(this.searchText);
+
+    private string GetAddChatToWorkspaceTooltip(string workspaceName) => string.Format(T("Start a new chat in workspace '{0}'"), workspaceName);
+
+    private async Task<Func<string?, string?>> CreateWorkspaceNameValidationAsync(Guid excludedWorkspaceId = default, string? originalWorkspaceName = null)
+    {
+        var snapshot = await WorkspaceBehaviour.GetOrLoadWorkspaceTreeShellAsync();
+        return workspaceName =>
+        {
+            var normalizedWorkspaceName = WorkspaceBehaviour.NormalizeWorkspaceName(workspaceName ?? string.Empty);
+            if (string.IsNullOrWhiteSpace(normalizedWorkspaceName))
+                return null;
+
+            if (!string.IsNullOrWhiteSpace(originalWorkspaceName) &&
+                string.Equals(WorkspaceBehaviour.NormalizeWorkspaceName(originalWorkspaceName), normalizedWorkspaceName, StringComparison.OrdinalIgnoreCase))
+                return null;
+
+            var nameExists = snapshot.Workspaces.Any(workspace =>
+                workspace.WorkspaceId != excludedWorkspaceId &&
+                string.Equals(WorkspaceBehaviour.NormalizeWorkspaceName(workspace.Name), normalizedWorkspaceName, StringComparison.OrdinalIgnoreCase));
+
+            return nameExists ? T("There is already a workspace with this name. Please choose a different name.") : null;
+        };
+    }
+
     private void BuildTreeItems(WorkspaceTreeCacheSnapshot snapshot)
     {
         this.treeItems.Clear();
@@ -219,6 +262,109 @@ public partial class Workspaces : MSGComponentBase
         };
     }
 
+    private void BuildSearchTreeItems(WorkspaceSearchSnapshot snapshot)
+    {
+        this.treeItems.Clear();
+
+        if (snapshot.Workspaces.Count == 0 && snapshot.TemporaryChats.Count == 0)
+        {
+            this.treeItems.Add(new TreeItemData<ITreeItem>
+            {
+                Expandable = false,
+                Value = new TreeItemData
+                {
+                    Depth = 0,
+                    Branch = WorkspaceBranch.NONE,
+                    Text = T("No chats found"),
+                    Icon = Icons.Material.Filled.Search,
+                    Expandable = false,
+                    Path = "search_empty",
+                },
+            });
+
+            return;
+        }
+
+        if (snapshot.Workspaces.Count > 0)
+        {
+            var workspaceChildren = new List<TreeItemData<ITreeItem>>();
+            foreach (var workspace in snapshot.Workspaces)
+                workspaceChildren.Add(this.CreateSearchWorkspaceTreeItem(workspace));
+
+            this.treeItems.Add(new TreeItemData<ITreeItem>
+            {
+                Expanded = true,
+                Expandable = true,
+                Value = new TreeItemData
+                {
+                    Depth = 0,
+                    Branch = WorkspaceBranch.WORKSPACES,
+                    Text = T("Workspaces"),
+                    Icon = Icons.Material.Filled.Folder,
+                    Expandable = true,
+                    Path = "search_workspaces",
+                    Children = workspaceChildren,
+                },
+            });
+        }
+
+        if (snapshot.Workspaces.Count > 0 && snapshot.TemporaryChats.Count > 0)
+        {
+            this.treeItems.Add(new TreeItemData<ITreeItem>
+            {
+                Expandable = false,
+                Value = new TreeDivider(),
+            });
+        }
+
+        if (snapshot.TemporaryChats.Count > 0)
+        {
+            var temporaryChatsChildren = new List<TreeItemData<ITreeItem>>();
+            foreach (var temporaryChat in snapshot.TemporaryChats)
+                temporaryChatsChildren.Add(this.CreateChatTreeItem(temporaryChat.Chat, WorkspaceBranch.TEMPORARY_CHATS, depth: 1, icon: Icons.Material.Filled.Timer));
+
+            this.treeItems.Add(new TreeItemData<ITreeItem>
+            {
+                Expanded = true,
+                Expandable = true,
+                Value = new TreeItemData
+                {
+                    Depth = 0,
+                    Branch = WorkspaceBranch.TEMPORARY_CHATS,
+                    Text = T("Disappearing Chats"),
+                    Icon = Icons.Material.Filled.Timer,
+                    Expandable = true,
+                    Path = "search_temp",
+                    Children = temporaryChatsChildren,
+                },
+            });
+        }
+    }
+
+    private TreeItemData<ITreeItem> CreateSearchWorkspaceTreeItem(WorkspaceSearchWorkspace workspace)
+    {
+        var children = new List<TreeItemData<ITreeItem>>();
+        foreach (var chat in workspace.Chats)
+            children.Add(this.CreateChatTreeItem(chat.Chat, WorkspaceBranch.WORKSPACES, depth: 2, icon: Icons.Material.Filled.Chat));
+
+        return new TreeItemData<ITreeItem>
+        {
+            Expanded = true,
+            Expandable = true,
+            Value = new TreeItemData
+            {
+                Type = TreeItemType.WORKSPACE,
+                Depth = 1,
+                Branch = WorkspaceBranch.WORKSPACES,
+                Text = workspace.Name,
+                Icon = Icons.Material.Filled.Description,
+                Expandable = true,
+                Path = workspace.WorkspacePath,
+                Children = children,
+            },
+        };
+    }
+
     private string GetTreeItemIcon(TreeItemData treeItem)
     {
         if (treeItem.Type is not TreeItemType.CHAT)
@@ -233,6 +379,19 @@ public partial class Workspaces : MSGComponentBase
         return treeItem.Type is TreeItemType.CHAT && this.AIJobService.IsChatGenerationActive(treeItem.ChatId);
     }
 
+    private string GetChatTreeItemTextStyle(TreeItemData treeItem)
+    {
+        return this.IsCurrentChatTreeItem(treeItem) ? "justify-self: start; font-weight: 700;" : "justify-self: start;";
+    }
+
+    private bool IsCurrentChatTreeItem(TreeItemData treeItem)
+    {
+        return treeItem.Type is TreeItemType.CHAT
+               && this.CurrentChatThread is not null
+               && treeItem.ChatId == this.CurrentChatThread.ChatId
+               && treeItem.WorkspaceId == this.CurrentChatThread.WorkspaceId;
+    }
+
     private string GetChatTreeIcon(Guid chatId, string defaultIcon)
     {
         var snapshot = this.AIJobService.TryGetChatSnapshot(chatId);
@@ -289,6 +448,106 @@ public partial class Workspaces : MSGComponentBase
         }
     }
 
+    public async Task ToggleSearchAsync()
+    {
+        var searchVisible = !this.SearchVisible;
+        this.SearchVisible = searchVisible;
+        await this.SearchVisibleChanged.InvokeAsync(searchVisible);
+
+        if (this.SearchVisible)
+        {
+            await this.SafeStateHasChanged();
+            return;
+        }
+
+        await this.CancelSearchAsync();
+        this.searchText = string.Empty;
+        this.isSearchRunning = false;
+        await this.LoadTreeItemsAsync(startPrefetch: false);
+    }
+
+    private async Task CancelSearchAsync()
+    {
+        this.searchRevision++;
+        if (this.searchCancellationTokenSource is not null)
+        {
+            await this.searchCancellationTokenSource.CancelAsync();
+            this.searchCancellationTokenSource.Dispose();
+            this.searchCancellationTokenSource = null;
+        }
+    }
+
+    private async Task OnSearchTextChanged(string value)
+    {
+        this.searchText = value;
+        if (string.IsNullOrWhiteSpace(this.searchText))
+        {
+            await this.CancelSearchAsync();
+            this.isSearchRunning = false;
+            await this.LoadTreeItemsAsync(startPrefetch: false);
+            return;
+        }
+
+        await this.SearchWorkspaceItemsAsync();
+    }
+
+    private async Task IncludeThreadContentsChanged(bool value)
+    {
+        this.includeThreadContents = value;
+        if (this.HasSearchQuery)
+            await this.SearchWorkspaceItemsAsync();
+    }
+
+    private async Task ClearSearchAsync()
+    {
+        this.searchText = string.Empty;
+        await this.CancelSearchAsync();
+        this.isSearchRunning = false;
+        await this.LoadTreeItemsAsync(startPrefetch: false);
+    }
+
+    private async Task SearchWorkspaceItemsAsync()
+    {
+        await this.CancelSearchAsync();
+
+        var text = this.searchText;
+        if (string.IsNullOrWhiteSpace(text))
+            return;
+
+        this.searchCancellationTokenSource = new CancellationTokenSource();
+        var token = this.searchCancellationTokenSource.Token;
+        var revision = ++this.searchRevision;
+
+        this.isSearchRunning = true;
+        await this.SafeStateHasChanged();
+
+        try
+        {
+            var snapshot = await WorkspaceBehaviour.SearchWorkspaceChatsAsync(text, this.includeThreadContents, token);
+            if (this.isDisposed || token.IsCancellationRequested || revision != this.searchRevision)
+                return;
+
+            this.BuildSearchTreeItems(snapshot);
+        }
+        catch (OperationCanceledException)
+        {
+            // Expected when the user keeps typing or hides the search row.
+        }
+        catch (Exception ex)
+        {
+            this.Logger.LogWarning(ex, "Failed while searching workspace chats.");
+            this.BuildSearchTreeItems(new([], []));
+        }
+        finally
+        {
+            if (revision == this.searchRevision)
+            {
+                this.isSearchRunning = false;
+                await this.SafeStateHasChanged();
+            }
+        }
+    }
+
     private async Task OnWorkspaceClicked(TreeItemData treeItem)
     {
         if (treeItem.Type is not TreeItemType.WORKSPACE)
@@ -494,6 +753,7 @@ public partial class Workspaces : MSGComponentBase
             { x => x.ConfirmColor, Color.Info },
             { x => x.AllowEmptyInput, false },
             { x => x.EmptyInputErrorMessage, T("Please enter a workspace name.") },
+            { x => x.AdditionalValidation, await this.CreateWorkspaceNameValidationAsync(workspaceId, workspaceName) },
         };
         
         var dialogReference = await this.DialogService.ShowAsync<SingleInputDialog>(T("Rename Workspace"), dialogParameters, DialogOptions.FULLSCREEN);
@@ -502,9 +762,10 @@ public partial class Workspaces : MSGComponentBase
             return;
         
         var alteredWorkspaceName = (dialogResult.Data as string)!;
-        var workspaceNamePath = Path.Join(workspacePath, "name");
-        await File.WriteAllTextAsync(workspaceNamePath, alteredWorkspaceName, Encoding.UTF8);
-        await WorkspaceBehaviour.UpdateWorkspaceNameInCacheAsync(workspaceId, alteredWorkspaceName);
+        if (!await WorkspaceBehaviour.RenameWorkspaceAsync(workspaceId, alteredWorkspaceName))
+            return;
+
+        await this.SendMessage(Event.WORKSPACE_RENAMED, workspaceId);
         await this.LoadTreeItemsAsync(startPrefetch: false);
     }
 
@@ -519,6 +780,7 @@ public partial class Workspaces : MSGComponentBase
             { x => x.ConfirmColor, Color.Info },
             { x => x.AllowEmptyInput, false },
             { x => x.EmptyInputErrorMessage, T("Please enter a workspace name.") },
+            { x => x.AdditionalValidation, await this.CreateWorkspaceNameValidationAsync() },
         };
         
         var dialogReference = await this.DialogService.ShowAsync<SingleInputDialog>(T("Add Workspace"), dialogParameters, DialogOptions.FULLSCREEN);
@@ -526,14 +788,10 @@ public partial class Workspaces : MSGComponentBase
         if (dialogResult is null || dialogResult.Canceled)
             return;
         
-        var workspaceId = Guid.NewGuid();
-        var workspacePath = Path.Join(SettingsManager.DataDirectory, "workspaces", workspaceId.ToString());
-        Directory.CreateDirectory(workspacePath);
-        
         var workspaceName = (dialogResult.Data as string)!;
-        var workspaceNamePath = Path.Join(workspacePath, "name");
-        await File.WriteAllTextAsync(workspaceNamePath, workspaceName, Encoding.UTF8);
-        await WorkspaceBehaviour.AddWorkspaceToCacheAsync(workspaceId, workspacePath, workspaceName);
+        var result = await WorkspaceBehaviour.TryCreateWorkspaceAsync(workspaceName);
+        if (!result.Success)
+            return;
         
         await this.LoadTreeItemsAsync(startPrefetch: false);
     }
@@ -578,7 +836,7 @@ public partial class Workspaces : MSGComponentBase
             { x => x.ConfirmText, T("Move chat") },
         };
         
-        var dialogReference = await this.DialogService.ShowAsync<WorkspaceSelectionDialog>(T("Move Chat to Workspace"), dialogParameters, DialogOptions.FULLSCREEN);
+        var dialogReference = await this.DialogService.ShowAsync<WorkspaceSelectionDialog>(T("Move Chat to Workspace"), dialogParameters, DialogOptions.FULLSCREEN_MANUAL_ESCAPE);
         var dialogResult = await dialogReference.Result;
         if (dialogResult is null || dialogResult.Canceled)
             return;
@@ -642,6 +900,10 @@ public partial class Workspaces : MSGComponentBase
                 await this.ForceRefreshFromDiskAsync();
                 break;
 
+            case Event.WORKSPACE_CREATED:
+                await this.LoadTreeItemsAsync(startPrefetch: false);
+                break;
+
             case Event.AI_JOB_CHANGED:
             case Event.AI_JOB_FINISHED:
             case Event.CHAT_GENERATION_CHANGED:
@@ -656,9 +918,12 @@ public partial class Workspaces : MSGComponentBase
         this.prefetchCancellationTokenSource?.Cancel();
         this.prefetchCancellationTokenSource?.Dispose();
         this.prefetchCancellationTokenSource = null;
+        this.searchCancellationTokenSource?.Cancel();
+        this.searchCancellationTokenSource?.Dispose();
+        this.searchCancellationTokenSource = null;
 
         base.DisposeResources();
     }
 
     #endregion
-}
+}