diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index b0c0e1c83f0..820e4468c34 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -14,7 +14,6 @@
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.frame.JabRefFrame;
 import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;
@@ -61,7 +60,6 @@ public class JabRefGUI extends Application {
 
     // AI Service handles chat messages etc. Therefore, it is tightly coupled to the GUI.
     private static AiService aiService;
-    private static ChatHistoryService chatHistoryService;
 
     private static StateManager stateManager;
     private static ThemeManager themeManager;
@@ -102,7 +100,6 @@ public void start(Stage stage) {
                 fileUpdateMonitor,
                 preferences,
                 aiService,
-                chatHistoryService,
                 stateManager,
                 countingUndoManager,
                 Injector.instantiateModelOrService(BibEntryTypesManager.class),
@@ -168,14 +165,10 @@ public void initialize() {
         JabRefGUI.aiService = new AiService(
                 preferences.getAiPreferences(),
                 preferences.getFilePreferences(),
+                preferences.getCitationKeyPatternPreferences(),
                 dialogService,
                 taskExecutor);
         Injector.setModelOrService(AiService.class, aiService);
-
-        JabRefGUI.chatHistoryService = new ChatHistoryService(
-                preferences.getCitationKeyPatternPreferences(),
-                dialogService);
-        Injector.setModelOrService(ChatHistoryService.class, chatHistoryService);
     }
 
     private void setupProxy() {
@@ -375,8 +368,6 @@ public void stop() {
         } catch (Exception e) {
             LOGGER.error("Unable to close AI service", e);
         }
-        LOGGER.trace("Closing chat history service");
-        chatHistoryService.close();
         LOGGER.trace("Closing OpenOffice connection");
         OOBibBaseConnect.closeOfficeConnection();
         LOGGER.trace("Stopping background tasks");
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 93901045848..b95bdc12e67 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -64,6 +64,7 @@
 import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.citationstyle.CitationStyleCache;
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
@@ -169,6 +170,8 @@ private enum PanelMode { MAIN_TABLE, MAIN_TABLE_AND_ENTRY_EDITOR }
     private ImportHandler importHandler;
     private LuceneManager luceneManager;
 
+    private final AiService aiService;
+
     /**
      * @param isDummyContext Indicates whether the database context is a dummy. A dummy context is used to display a progress indicator while parsing the database.
      *                       If the context is a dummy, the Lucene index should not be created, as both the dummy context and the actual context share the same index path {@link BibDatabaseContext#getFulltextIndexPath()}.
@@ -178,6 +181,7 @@ private enum PanelMode { MAIN_TABLE, MAIN_TABLE_AND_ENTRY_EDITOR }
     private LibraryTab(BibDatabaseContext bibDatabaseContext,
                        LibraryTabContainer tabContainer,
                        DialogService dialogService,
+                       AiService aiService,
                        GuiPreferences preferences,
                        StateManager stateManager,
                        FileUpdateMonitor fileUpdateMonitor,
@@ -197,6 +201,7 @@ private LibraryTab(BibDatabaseContext bibDatabaseContext,
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
         this.directoryMonitorManager = new DirectoryMonitorManager(Injector.instantiateModelOrService(DirectoryMonitor.class));
+        this.aiService = aiService;
 
         initializeComponentsAndListeners(isDummyContext);
 
@@ -249,6 +254,8 @@ private void initializeComponentsAndListeners(boolean isDummyContext) {
 
         this.entryEditor = createEntryEditor();
 
+        aiService.setupDatabase(bibDatabaseContext);
+
         Platform.runLater(() -> {
             EasyBind.subscribe(changedProperty, this::updateTabTitle);
             stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) c ->
@@ -1052,6 +1059,7 @@ public void resetChangedProperties() {
     public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadingTask,
                                               Path file,
                                               DialogService dialogService,
+                                              AiService aiService,
                                               GuiPreferences preferences,
                                               StateManager stateManager,
                                               LibraryTabContainer tabContainer,
@@ -1067,6 +1075,7 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
                 context,
                 tabContainer,
                 dialogService,
+                aiService,
                 preferences,
                 stateManager,
                 fileUpdateMonitor,
@@ -1088,6 +1097,7 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
     public static LibraryTab createLibraryTab(BibDatabaseContext databaseContext,
                                               LibraryTabContainer tabContainer,
                                               DialogService dialogService,
+                                              AiService aiService,
                                               GuiPreferences preferences,
                                               StateManager stateManager,
                                               FileUpdateMonitor fileUpdateMonitor,
@@ -1101,6 +1111,7 @@ public static LibraryTab createLibraryTab(BibDatabaseContext databaseContext,
                 databaseContext,
                 tabContainer,
                 dialogService,
+                aiService,
                 preferences,
                 stateManager,
                 fileUpdateMonitor,
diff --git a/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java b/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
index 95e2b7bf102..29fb54f544c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
@@ -11,7 +11,6 @@
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.ai.components.aichat.AiChatGuardedComponent;
 import org.jabref.gui.ai.components.privacynotice.PrivacyNoticeComponent;
 import org.jabref.gui.ai.components.util.errorstate.ErrorStateComponent;
@@ -31,7 +30,6 @@
 public class AiChatTab extends EntryEditorTab {
     private final BibDatabaseContext bibDatabaseContext;
     private final AiService aiService;
-    private final ChatHistoryService chatHistoryService;
     private final DialogService dialogService;
     private final AiPreferences aiPreferences;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
@@ -43,7 +41,6 @@ public class AiChatTab extends EntryEditorTab {
 
     public AiChatTab(BibDatabaseContext bibDatabaseContext,
                      AiService aiService,
-                     ChatHistoryService chatHistoryService,
                      DialogService dialogService,
                      GuiPreferences preferences,
                      TaskExecutor taskExecutor
@@ -51,7 +48,6 @@ public AiChatTab(BibDatabaseContext bibDatabaseContext,
         this.bibDatabaseContext = bibDatabaseContext;
 
         this.aiService = aiService;
-        this.chatHistoryService = chatHistoryService;
         this.dialogService = dialogService;
 
         this.aiPreferences = preferences.getAiPreferences();
@@ -76,7 +72,7 @@ public boolean shouldShow(BibEntry entry) {
      */
     @Override
     protected void bindToEntry(BibEntry entry) {
-        previousBibEntry.ifPresent(previousBibEntry -> chatHistoryService.closeChatHistoryForEntry(previousBibEntry));
+        previousBibEntry.ifPresent(previousBibEntry -> aiService.getChatHistoryService().closeChatHistoryForEntry(previousBibEntry));
         previousBibEntry = Optional.of(entry);
 
         if (!aiPreferences.getEnableAi()) {
@@ -135,7 +131,7 @@ private void bindToCorrectEntry(BibEntry entry) {
 
         setContent(new AiChatGuardedComponent(
                 chatName,
-                chatHistoryService.getChatHistoryForEntry(entry),
+                aiService.getChatHistoryService().getChatHistoryForEntry(bibDatabaseContext, entry),
                 bibDatabaseContext,
                 FXCollections.observableArrayList(new ArrayList<>(List.of(entry))),
                 aiService,
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 7e99897cadb..d56182edd29 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -30,7 +30,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.citationkeypattern.GenerateCitationKeySingleAction;
 import org.jabref.gui.cleanup.CleanupSingleAction;
 import org.jabref.gui.entryeditor.citationrelationtab.CitationRelationsTab;
@@ -119,7 +118,6 @@ public class EntryEditor extends BorderPane {
     @Inject private KeyBindingRepository keyBindingRepository;
     @Inject private JournalAbbreviationRepository journalAbbreviationRepository;
     @Inject private AiService aiService;
-    @Inject private ChatHistoryService chatHistoryService;
 
     private final List<EntryEditorTab> allPossibleTabs;
     private final Collection<OffersPreview> previewTabs;
@@ -315,7 +313,7 @@ private List<EntryEditorTab> createTabs() {
         tabs.add(new LatexCitationsTab(databaseContext, preferences, dialogService, directoryMonitorManager));
         tabs.add(new FulltextSearchResultsTab(stateManager, preferences, dialogService, databaseContext, taskExecutor, libraryTab.searchQueryProperty()));
         tabs.add(new AiSummaryTab(libraryTab.getBibDatabaseContext(), aiService, dialogService, preferences));
-        tabs.add(new AiChatTab(libraryTab.getBibDatabaseContext(), aiService, chatHistoryService, dialogService, preferences, taskExecutor));
+        tabs.add(new AiChatTab(libraryTab.getBibDatabaseContext(), aiService, dialogService, preferences, taskExecutor));
 
         return tabs;
     }
diff --git a/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index d38d511fe58..573e8eb2a17 100644
--- a/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -33,7 +33,6 @@
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.importer.NewEntryAction;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
@@ -77,7 +76,6 @@ public class JabRefFrame extends BorderPane implements LibraryTabContainer, UiMe
     private final SplitPane splitPane = new SplitPane();
     private final GuiPreferences preferences;
     private final AiService aiService;
-    private final ChatHistoryService chatHistoryService;
     private final GlobalSearchBar globalSearchBar;
 
     private final FileHistoryMenu fileHistory;
@@ -106,7 +104,6 @@ public JabRefFrame(Stage mainStage,
                        FileUpdateMonitor fileUpdateMonitor,
                        GuiPreferences preferences,
                        AiService aiService,
-                       ChatHistoryService chatHistoryService,
                        StateManager stateManager,
                        CountingUndoManager undoManager,
                        BibEntryTypesManager entryTypesManager,
@@ -117,7 +114,6 @@ public JabRefFrame(Stage mainStage,
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.preferences = preferences;
         this.aiService = aiService;
-        this.chatHistoryService = chatHistoryService;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
         this.entryTypesManager = entryTypesManager;
@@ -157,7 +153,7 @@ public JabRefFrame(Stage mainStage,
         this.sidePane = new SidePane(
                 this,
                 this.preferences,
-                chatHistoryService,
+                aiService,
                 Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
                 taskExecutor,
                 dialogService,
@@ -437,6 +433,7 @@ public void addTab(@NonNull BibDatabaseContext databaseContext, boolean raisePan
                 databaseContext,
                 this,
                 dialogService,
+                aiService,
                 preferences,
                 stateManager,
                 fileUpdateMonitor,
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index a28919ef26e..4b39d4536db 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -50,7 +50,6 @@
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.search.SearchTextField;
 import org.jabref.gui.util.BindingsHelper;
@@ -59,6 +58,7 @@
 import org.jabref.gui.util.RecursiveTreeItem;
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.gui.util.ViewModelTreeTableRowFactory;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
@@ -82,7 +82,7 @@ public class GroupTreeView extends BorderPane {
 
     private final StateManager stateManager;
     private final DialogService dialogService;
-    private final ChatHistoryService chatHistoryService;
+    private final AiService aiService;
     private final TaskExecutor taskExecutor;
     private final GuiPreferences preferences;
 
@@ -108,13 +108,13 @@ public GroupTreeView(TaskExecutor taskExecutor,
                          StateManager stateManager,
                          GuiPreferences preferences,
                          DialogService dialogService,
-                         ChatHistoryService chatHistoryService
+                         AiService aiService
     ) {
         this.taskExecutor = taskExecutor;
         this.stateManager = stateManager;
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.chatHistoryService = chatHistoryService;
+        this.aiService = aiService;
 
         createNodes();
         this.getStylesheets().add(Objects.requireNonNull(GroupTreeView.class.getResource("GroupTree.css")).toExternalForm());
@@ -164,7 +164,7 @@ private void createNodes() {
 
     private void initialize() {
         this.localDragboard = stateManager.getLocalDragboard();
-        viewModel = new GroupTreeViewModel(stateManager, dialogService, chatHistoryService, preferences, taskExecutor, localDragboard);
+        viewModel = new GroupTreeViewModel(stateManager, dialogService, aiService, preferences, taskExecutor, localDragboard);
 
         // Set-up groups tree
         groupTree.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 94e4b06aec3..5575fa6837f 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -24,7 +24,6 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.ai.components.aichat.AiChatWindow;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.util.CustomLocalDragboard;
@@ -44,7 +43,6 @@
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 
-import com.airhacks.afterburner.injection.Injector;
 import com.tobiasdiez.easybind.EasyBind;
 import dev.langchain4j.data.message.ChatMessage;
 
@@ -54,7 +52,7 @@ public class GroupTreeViewModel extends AbstractViewModel {
     private final ListProperty<GroupNodeViewModel> selectedGroups = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StateManager stateManager;
     private final DialogService dialogService;
-    private final ChatHistoryService chatHistoryService;
+    private final AiService aiService;
     private final GuiPreferences preferences;
     private final TaskExecutor taskExecutor;
     private final CustomLocalDragboard localDragboard;
@@ -78,10 +76,16 @@ public class GroupTreeViewModel extends AbstractViewModel {
     };
     private Optional<BibDatabaseContext> currentDatabase = Optional.empty();
 
-    public GroupTreeViewModel(StateManager stateManager, DialogService dialogService, ChatHistoryService chatHistoryService, GuiPreferences preferences, TaskExecutor taskExecutor, CustomLocalDragboard localDragboard) {
+    public GroupTreeViewModel(StateManager stateManager,
+                              DialogService dialogService,
+                              AiService aiService,
+                              GuiPreferences preferences,
+                              TaskExecutor taskExecutor,
+                              CustomLocalDragboard localDragboard
+    ) {
         this.stateManager = Objects.requireNonNull(stateManager);
         this.dialogService = Objects.requireNonNull(dialogService);
-        this.chatHistoryService = Objects.requireNonNull(chatHistoryService);
+        this.aiService = Objects.requireNonNull(aiService);
         this.preferences = Objects.requireNonNull(preferences);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.localDragboard = Objects.requireNonNull(localDragboard);
@@ -399,7 +403,7 @@ public void chatWithGroup(GroupNodeViewModel group) {
         StringProperty nameProperty = new SimpleStringProperty(Localization.lang("Group %0", groupNameProperty.get()));
         groupNameProperty.addListener((obs, oldValue, newValue) -> nameProperty.setValue(Localization.lang("Group %0", groupNameProperty.get())));
 
-        ObservableList<ChatMessage> chatHistory = chatHistoryService.getChatHistoryForGroup(group.getGroupNode());
+        ObservableList<ChatMessage> chatHistory = aiService.getChatHistoryService().getChatHistoryForGroup(currentDatabase.get(), group.getGroupNode());
         ObservableList<BibEntry> bibEntries = FXCollections.observableArrayList(group.getGroupNode().findMatches(currentDatabase.get().getDatabase()));
 
         openAiChat(nameProperty, chatHistory, currentDatabase.get(), bibEntries);
@@ -412,7 +416,7 @@ private void openAiChat(StringProperty name, ObservableList<ChatMessage> chatHis
             existingWindow.get().requestFocus();
         } else {
             AiChatWindow aiChatWindow = new AiChatWindow(
-                    Injector.instantiateModelOrService(AiService.class),
+                    aiService,
                     dialogService,
                     preferences.getAiPreferences(),
                     preferences.getExternalApplicationsPreferences(),
diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index d30c7d79a3d..605e389e76a 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -200,6 +200,7 @@ private void openTheFile(Path file) {
                 backgroundTask,
                 file,
                 dialogService,
+                aiService,
                 preferences,
                 stateManager,
                 tabContainer,
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 267526d0ad7..ad47cc921df 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -42,6 +42,7 @@
 import org.jabref.gui.undo.UndoableKeyChange;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationstyle.CitationStyle;
@@ -103,6 +104,7 @@ public class OpenOfficePanel {
     private final ClipBoardManager clipBoardManager;
     private final UndoManager undoManager;
     private final UiTaskExecutor taskExecutor;
+    private final AiService aiService;
     private final StyleLoader loader;
     private final LibraryTabContainer tabContainer;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -121,6 +123,7 @@ public OpenOfficePanel(LibraryTabContainer tabContainer,
                            JournalAbbreviationRepository abbreviationRepository,
                            UiTaskExecutor taskExecutor,
                            DialogService dialogService,
+                           AiService aiService,
                            StateManager stateManager,
                            FileUpdateMonitor fileUpdateMonitor,
                            BibEntryTypesManager entryTypesManager,
@@ -134,6 +137,7 @@ public OpenOfficePanel(LibraryTabContainer tabContainer,
         this.citationKeyPatternPreferences = citationKeyPatternPreferences;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
+        this.aiService = aiService;
         this.stateManager = stateManager;
         this.clipBoardManager = clipBoardManager;
         this.undoManager = undoManager;
@@ -322,6 +326,7 @@ private void exportEntries() {
                     databaseContext,
                     tabContainer,
                     dialogService,
+                    aiService,
                     preferences,
                     stateManager,
                     fileUpdateMonitor,
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
index c5dfc69e9de..b81bd96ba06 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
@@ -42,6 +42,21 @@
                 HBox.hgrow="ALWAYS"
                 maxWidth="Infinity"/>
 
+        <CheckBox fx:id="autoGenerateEmbeddings"
+                  mnemonicParsing="false"
+                  text="%Automatically generate embeddings for new entries"
+                  HBox.hgrow="ALWAYS"
+                  maxWidth="Infinity"/>
+
+        <CheckBox fx:id="autoGenerateSummaries"
+                  mnemonicParsing="false"
+                  text="%Automatically generate summaries for new entries"
+                  HBox.hgrow="ALWAYS"
+                  maxWidth="Infinity"/>
+
+        <Label styleClass="sectionHeader"
+               text="%Connection"/>
+
         <HBox alignment="CENTER_LEFT"
               spacing="10.0">
             <children>
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index 4cb67256603..8b7e8acd67d 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -29,6 +29,8 @@ public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements
     private static final String HUGGING_FACE_CHAT_MODEL_PROMPT = "TinyLlama/TinyLlama_v1.1 (or any other model name)";
 
     @FXML private CheckBox enableAi;
+    @FXML private CheckBox autoGenerateEmbeddings;
+    @FXML private CheckBox autoGenerateSummaries;
 
     @FXML private ComboBox<AiProvider> aiProviderComboBox;
     @FXML private ComboBox<String> chatModelComboBox;
@@ -61,6 +63,10 @@ public void initialize() {
         this.viewModel = new AiTabViewModel(preferences);
 
         enableAi.selectedProperty().bindBidirectional(viewModel.enableAi());
+        autoGenerateSummaries.selectedProperty().bindBidirectional(viewModel.autoGenerateSummaries());
+        autoGenerateSummaries.disableProperty().bind(viewModel.disableAutoGenerateSummaries());
+        autoGenerateEmbeddings.selectedProperty().bindBidirectional(viewModel.autoGenerateEmbeddings());
+        autoGenerateEmbeddings.disableProperty().bind(viewModel.disableAutoGenerateEmbeddings());
 
         new ViewModelListCellFactory<AiProvider>()
                 .withText(AiProvider::toString)
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index 8ba7c3a66c0..877bf17b499 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -37,6 +37,10 @@ public class AiTabViewModel implements PreferenceTabViewModel {
     private final Locale oldLocale;
 
     private final BooleanProperty enableAi = new SimpleBooleanProperty();
+    private final BooleanProperty autoGenerateEmbeddings = new SimpleBooleanProperty();
+    private final BooleanProperty disableAutoGenerateEmbeddings = new SimpleBooleanProperty();
+    private final BooleanProperty autoGenerateSummaries = new SimpleBooleanProperty();
+    private final BooleanProperty disableAutoGenerateSummaries = new SimpleBooleanProperty();
 
     private final ListProperty<AiProvider> aiProvidersList =
             new SimpleListProperty<>(FXCollections.observableArrayList(AiProvider.values()));
@@ -295,6 +299,8 @@ public void setValues() {
         huggingFaceChatModel.setValue(aiPreferences.getHuggingFaceChatModel());
 
         enableAi.setValue(aiPreferences.getEnableAi());
+        autoGenerateSummaries.setValue(aiPreferences.getAutoGenerateSummaries());
+        autoGenerateEmbeddings.setValue(aiPreferences.getAutoGenerateEmbeddings());
 
         selectedAiProvider.setValue(aiPreferences.getAiProvider());
 
@@ -313,6 +319,8 @@ public void setValues() {
     @Override
     public void storeSettings() {
         aiPreferences.setEnableAi(enableAi.get());
+        aiPreferences.setAutoGenerateEmbeddings(autoGenerateEmbeddings.get());
+        aiPreferences.setAutoGenerateSummaries(autoGenerateSummaries.get());
 
         aiPreferences.setAiProvider(selectedAiProvider.get());
 
@@ -407,6 +415,22 @@ public BooleanProperty enableAi() {
         return enableAi;
     }
 
+    public BooleanProperty autoGenerateEmbeddings() {
+        return autoGenerateEmbeddings;
+    }
+
+    public BooleanProperty disableAutoGenerateEmbeddings() {
+        return disableAutoGenerateEmbeddings;
+    }
+
+    public BooleanProperty autoGenerateSummaries() {
+        return autoGenerateSummaries;
+    }
+
+    public BooleanProperty disableAutoGenerateSummaries() {
+        return disableAutoGenerateSummaries;
+    }
+
     public ReadOnlyListProperty<AiProvider> aiProvidersProperty() {
         return aiProvidersList;
     }
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index ed30a868a2b..d4a89bbbf8a 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -21,6 +21,7 @@
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.ai.AiService;
+import org.jabref.logic.ai.chatting.ChatHistoryService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DBMSType;
 import org.jabref.logic.util.TaskExecutor;
@@ -59,6 +60,7 @@ public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
     @Inject private DialogService dialogService;
     @Inject private GuiPreferences preferences;
     @Inject private AiService aiService;
+    @Inject private ChatHistoryService chatHistoryService;
     @Inject private StateManager stateManager;
     @Inject private BibEntryTypesManager entryTypesManager;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
@@ -103,6 +105,7 @@ private void initialize() {
                 dialogService,
                 preferences,
                 aiService,
+                chatHistoryService,
                 stateManager,
                 entryTypesManager,
                 fileUpdateMonitor,
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index e4c9d13fc04..d1fc0b2a41b 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -33,6 +33,7 @@
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.FileFilterConverter;
 import org.jabref.logic.ai.AiService;
+import org.jabref.logic.ai.chatting.ChatHistoryService;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DBMSConnectionProperties;
@@ -85,6 +86,7 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final GuiPreferences preferences;
     private final AiService aiService;
+    private final ChatHistoryService chatHistoryService;
     private final SharedDatabasePreferences sharedDatabasePreferences = new SharedDatabasePreferences();
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
@@ -105,6 +107,7 @@ public SharedDatabaseLoginDialogViewModel(LibraryTabContainer tabContainer,
                                               DialogService dialogService,
                                               GuiPreferences preferences,
                                               AiService aiService,
+                                              ChatHistoryService chatHistoryService,
                                               StateManager stateManager,
                                               BibEntryTypesManager entryTypesManager,
                                               FileUpdateMonitor fileUpdateMonitor,
@@ -115,6 +118,7 @@ public SharedDatabaseLoginDialogViewModel(LibraryTabContainer tabContainer,
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.aiService = aiService;
+        this.chatHistoryService = chatHistoryService;
         this.stateManager = stateManager;
         this.entryTypesManager = entryTypesManager;
         this.fileUpdateMonitor = fileUpdateMonitor;
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index d3f2989b36e..c1ecff23cfb 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -175,6 +175,7 @@ public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnecti
                 bibDatabaseContext,
                 tabContainer,
                 dialogService,
+                aiService,
                 preferences,
                 stateManager,
                 fileUpdateMonitor,
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePane.java b/src/main/java/org/jabref/gui/sidepane/SidePane.java
index e4a969e663b..f4bace766a8 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePane.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePane.java
@@ -15,8 +15,8 @@
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -33,7 +33,7 @@ public class SidePane extends VBox {
 
     public SidePane(LibraryTabContainer tabContainer,
                     GuiPreferences preferences,
-                    ChatHistoryService chatHistoryService,
+                    AiService aiService,
                     JournalAbbreviationRepository abbreviationRepository,
                     TaskExecutor taskExecutor,
                     DialogService dialogService,
@@ -47,7 +47,7 @@ public SidePane(LibraryTabContainer tabContainer,
         this.viewModel = new SidePaneViewModel(
                 tabContainer,
                 preferences,
-                chatHistoryService,
+                aiService,
                 abbreviationRepository,
                 stateManager,
                 taskExecutor,
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
index 171fc8b8777..bd6027ddea5 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
@@ -8,12 +8,12 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.groups.GroupTreeView;
 import org.jabref.gui.importer.fetcher.WebSearchPaneView;
 import org.jabref.gui.openoffice.OpenOfficePanel;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.util.UiTaskExecutor;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -22,7 +22,7 @@
 public class SidePaneContentFactory {
     private final LibraryTabContainer tabContainer;
     private final GuiPreferences preferences;
-    private final ChatHistoryService chatHistoryService;
+    private final AiService aiService;
     private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
@@ -34,7 +34,7 @@ public class SidePaneContentFactory {
 
     public SidePaneContentFactory(LibraryTabContainer tabContainer,
                                   GuiPreferences preferences,
-                                  ChatHistoryService chatHistoryService,
+                                  AiService aiService,
                                   JournalAbbreviationRepository abbreviationRepository,
                                   TaskExecutor taskExecutor,
                                   DialogService dialogService,
@@ -45,7 +45,7 @@ public SidePaneContentFactory(LibraryTabContainer tabContainer,
                                   UndoManager undoManager) {
         this.tabContainer = tabContainer;
         this.preferences = preferences;
-        this.chatHistoryService = chatHistoryService;
+        this.aiService = aiService;
         this.abbreviationRepository = abbreviationRepository;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
@@ -63,7 +63,7 @@ public Node create(SidePaneType sidePaneType) {
                     stateManager,
                     preferences,
                     dialogService,
-                    chatHistoryService);
+                    aiService);
             case OPEN_OFFICE -> new OpenOfficePanel(
                     tabContainer,
                     preferences,
@@ -74,6 +74,7 @@ public Node create(SidePaneType sidePaneType) {
                     abbreviationRepository,
                     (UiTaskExecutor) taskExecutor,
                     dialogService,
+                    aiService,
                     stateManager,
                     fileUpdateMonitor,
                     entryTypesManager,
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
index 9d13d9ef56a..344ee5b1381 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -19,9 +19,9 @@
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -42,7 +42,7 @@ public class SidePaneViewModel extends AbstractViewModel {
 
     public SidePaneViewModel(LibraryTabContainer tabContainer,
                              GuiPreferences preferences,
-                             ChatHistoryService chatHistoryService,
+                             AiService aiService,
                              JournalAbbreviationRepository abbreviationRepository,
                              StateManager stateManager,
                              TaskExecutor taskExecutor,
@@ -57,7 +57,7 @@ public SidePaneViewModel(LibraryTabContainer tabContainer,
         this.sidePaneContentFactory = new SidePaneContentFactory(
                 tabContainer,
                 preferences,
-                chatHistoryService,
+                aiService,
                 abbreviationRepository,
                 taskExecutor,
                 dialogService,
diff --git a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index b17fa670867..2228de6eb84 100644
--- a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -52,6 +52,8 @@ public class AiDefaultPreferences {
     );
 
     public static final boolean ENABLE_CHAT = false;
+    public static final boolean AUTO_GENERATE_EMBEDDINGS = false;
+    public static final boolean AUTO_GENERATE_SUMMARIES = false;
 
     public static final AiProvider PROVIDER = AiProvider.OPEN_AI;
 
diff --git a/src/main/java/org/jabref/logic/ai/AiPreferences.java b/src/main/java/org/jabref/logic/ai/AiPreferences.java
index d3c8bb345ae..f675ab37a35 100644
--- a/src/main/java/org/jabref/logic/ai/AiPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiPreferences.java
@@ -31,6 +31,8 @@ public class AiPreferences {
     private static final String KEYRING_AI_SERVICE_ACCOUNT = "apiKey";
 
     private final BooleanProperty enableAi;
+    private final BooleanProperty autoGenerateEmbeddings;
+    private final BooleanProperty autoGenerateSummaries;
 
     private final ObjectProperty<AiProvider> aiProvider;
 
@@ -58,6 +60,8 @@ public class AiPreferences {
     private Runnable apiKeyChangeListener;
 
     public AiPreferences(boolean enableAi,
+                         boolean autoGenerateEmbeddings,
+                         boolean autoGenerateSummaries,
                          AiProvider aiProvider,
                          String openAiChatModel,
                          String mistralAiChatModel,
@@ -78,6 +82,8 @@ public AiPreferences(boolean enableAi,
                          double ragMinScore
     ) {
         this.enableAi = new SimpleBooleanProperty(enableAi);
+        this.autoGenerateEmbeddings = new SimpleBooleanProperty(autoGenerateEmbeddings);
+        this.autoGenerateSummaries = new SimpleBooleanProperty(autoGenerateSummaries);
 
         this.aiProvider = new SimpleObjectProperty<>(aiProvider);
 
@@ -143,6 +149,30 @@ public void setEnableAi(boolean enableAi) {
         this.enableAi.set(enableAi);
     }
 
+    public BooleanProperty autoGenerateEmbeddingsProperty() {
+        return autoGenerateEmbeddings;
+    }
+
+    public boolean getAutoGenerateEmbeddings() {
+        return autoGenerateEmbeddings.get();
+    }
+
+    public void setAutoGenerateEmbeddings(boolean autoGenerateEmbeddings) {
+        this.autoGenerateEmbeddings.set(autoGenerateEmbeddings);
+    }
+
+    public BooleanProperty autoGenerateSummariesProperty() {
+        return autoGenerateSummaries;
+    }
+
+    public boolean getAutoGenerateSummaries() {
+        return autoGenerateSummaries.get();
+    }
+
+    public void setAutoGenerateSummaries(boolean autoGenerateSummaries) {
+        this.autoGenerateSummaries.set(autoGenerateSummaries);
+    }
+
     public ObjectProperty<AiProvider> aiProviderProperty() {
         return aiProvider;
     }
diff --git a/src/main/java/org/jabref/logic/ai/AiService.java b/src/main/java/org/jabref/logic/ai/AiService.java
index 30655f1721c..a068037b423 100644
--- a/src/main/java/org/jabref/logic/ai/AiService.java
+++ b/src/main/java/org/jabref/logic/ai/AiService.java
@@ -8,6 +8,8 @@
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.ai.chatting.AiChatService;
+import org.jabref.logic.ai.chatting.ChatHistoryService;
+import org.jabref.logic.ai.chatting.chathistory.storages.MVStoreChatHistoryStorage;
 import org.jabref.logic.ai.chatting.model.JabRefChatLanguageModel;
 import org.jabref.logic.ai.ingestion.IngestionService;
 import org.jabref.logic.ai.ingestion.MVStoreEmbeddingStore;
@@ -15,9 +17,11 @@
 import org.jabref.logic.ai.ingestion.storages.MVStoreFullyIngestedDocumentsTracker;
 import org.jabref.logic.ai.summarization.SummariesService;
 import org.jabref.logic.ai.summarization.storages.MVStoreSummariesStorage;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
+import org.jabref.model.database.BibDatabaseContext;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
@@ -32,6 +36,7 @@ public class AiService implements AutoCloseable {
     private static final String EMBEDDINGS_FILE_NAME = "embeddings.mv";
     private static final String FULLY_INGESTED_FILE_NAME = "fully-ingested.mv";
     private static final String SUMMARIES_FILE_NAME = "summaries.mv";
+    private static final String CHAT_HISTORY_FILE_NAME = "chat-histories.mv";
 
     // This field is used to shut down AI-related background tasks.
     // If a background task processes a big document and has a loop, then the task should check the status
@@ -42,10 +47,12 @@ public class AiService implements AutoCloseable {
             new ThreadFactoryBuilder().setNameFormat("ai-retrieval-pool-%d").build()
     );
 
+    private final MVStoreChatHistoryStorage mvStoreChatHistoryStorage;
     private final MVStoreEmbeddingStore mvStoreEmbeddingStore;
     private final MVStoreFullyIngestedDocumentsTracker mvStoreFullyIngestedDocumentsTracker;
     private final MVStoreSummariesStorage mvStoreSummariesStorage;
 
+    private final ChatHistoryService chatHistoryService;
     private final JabRefChatLanguageModel jabRefChatLanguageModel;
     private final JabRefEmbeddingModel jabRefEmbeddingModel;
     private final AiChatService aiChatService;
@@ -54,17 +61,22 @@ public class AiService implements AutoCloseable {
 
     public AiService(AiPreferences aiPreferences,
                      FilePreferences filePreferences,
+                     CitationKeyPatternPreferences citationKeyPatternPreferences,
                      NotificationService notificationService,
                      TaskExecutor taskExecutor
     ) {
-        this.jabRefChatLanguageModel = new JabRefChatLanguageModel(aiPreferences);
 
+        this.mvStoreChatHistoryStorage = new MVStoreChatHistoryStorage(Directories.getAiFilesDirectory().resolve(CHAT_HISTORY_FILE_NAME), notificationService);
         this.mvStoreEmbeddingStore = new MVStoreEmbeddingStore(Directories.getAiFilesDirectory().resolve(EMBEDDINGS_FILE_NAME), notificationService);
         this.mvStoreFullyIngestedDocumentsTracker = new MVStoreFullyIngestedDocumentsTracker(Directories.getAiFilesDirectory().resolve(FULLY_INGESTED_FILE_NAME), notificationService);
         this.mvStoreSummariesStorage = new MVStoreSummariesStorage(Directories.getAiFilesDirectory().resolve(SUMMARIES_FILE_NAME), notificationService);
 
+        this.chatHistoryService = new ChatHistoryService(citationKeyPatternPreferences, mvStoreChatHistoryStorage);
+        this.jabRefChatLanguageModel = new JabRefChatLanguageModel(aiPreferences);
         this.jabRefEmbeddingModel = new JabRefEmbeddingModel(aiPreferences, notificationService, taskExecutor);
+
         this.aiChatService = new AiChatService(aiPreferences, jabRefChatLanguageModel, jabRefEmbeddingModel, mvStoreEmbeddingStore, cachedThreadPool);
+
         this.ingestionService = new IngestionService(
                 aiPreferences,
                 shutdownSignal,
@@ -74,7 +86,15 @@ public AiService(AiPreferences aiPreferences,
                 filePreferences,
                 taskExecutor
         );
-        this.summariesService = new SummariesService(aiPreferences, mvStoreSummariesStorage, jabRefChatLanguageModel, shutdownSignal, filePreferences, taskExecutor);
+
+        this.summariesService = new SummariesService(
+                aiPreferences,
+                mvStoreSummariesStorage,
+                jabRefChatLanguageModel,
+                shutdownSignal,
+                filePreferences,
+                taskExecutor
+        );
     }
 
     public JabRefChatLanguageModel getChatLanguageModel() {
@@ -85,6 +105,10 @@ public JabRefEmbeddingModel getEmbeddingModel() {
         return jabRefEmbeddingModel;
     }
 
+    public ChatHistoryService getChatHistoryService() {
+        return chatHistoryService;
+    }
+
     public AiChatService getAiChatService() {
         return aiChatService;
     }
@@ -97,6 +121,12 @@ public SummariesService getSummariesService() {
         return summariesService;
     }
 
+    public void setupDatabase(BibDatabaseContext context) {
+        chatHistoryService.setupDatabase(context);
+        ingestionService.setupDatabase(context);
+        summariesService.setupDatabase(context);
+    }
+
     @Override
     public void close() {
         shutdownSignal.set(true);
diff --git a/src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java b/src/main/java/org/jabref/logic/ai/chatting/ChatHistoryService.java
similarity index 77%
rename from src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java
rename to src/main/java/org/jabref/logic/ai/chatting/ChatHistoryService.java
index 872a263c7a1..cacf18d6e36 100644
--- a/src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/ChatHistoryService.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.ai.chatting.chathistory;
+package org.jabref.logic.ai.chatting;
 
 import java.util.Comparator;
 import java.util.HashSet;
@@ -7,17 +7,13 @@
 import java.util.TreeMap;
 
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.StateManager;
 import org.jabref.logic.ai.chatting.chathistory.ChatHistoryStorage;
-import org.jabref.logic.ai.chatting.chathistory.storages.MVStoreChatHistoryStorage;
 import org.jabref.logic.ai.util.CitationKeyCheck;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.util.Directories;
-import org.jabref.logic.util.NotificationService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.FieldChangedEvent;
@@ -25,7 +21,6 @@
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupTreeNode;
 
-import com.airhacks.afterburner.injection.Injector;
 import com.google.common.eventbus.Subscribe;
 import dev.langchain4j.data.message.ChatMessage;
 import org.slf4j.Logger;
@@ -56,14 +51,12 @@
 public class ChatHistoryService implements AutoCloseable {
     private static final Logger LOGGER = LoggerFactory.getLogger(ChatHistoryService.class);
 
-    private static final String CHAT_HISTORY_FILE_NAME = "chat-histories.mv";
-
-    private final StateManager stateManager = Injector.instantiateModelOrService(StateManager.class);
-
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
-
     private final ChatHistoryStorage implementation;
 
+    // Note about `Optional<BibDatabaseContext>`: it was necessary in previous version, but currently we never save an `Optional.empty()`.
+    // However, we decided to left it here: to reduce migrations and to make possible to chat with a {@link BibEntry} without {@link BibDatabaseContext}
+    // ({@link BibDatabaseContext} is required only for load/store of the chat).
     private record ChatHistoryManagementRecord(Optional<BibDatabaseContext> bibDatabaseContext, ObservableList<ChatMessage> chatHistory) { }
 
     // We use a {@link TreeMap} here to store {@link BibEntry} chat histories by their id.
@@ -73,37 +66,14 @@ private record ChatHistoryManagementRecord(Optional<BibDatabaseContext> bibDatab
     private final TreeMap<BibEntry, ChatHistoryManagementRecord> bibEntriesChatHistory = new TreeMap<>(Comparator.comparing(BibEntry::getId));
 
     // We use {@link TreeMap} for group chat history for the same reason as for {@link BibEntry}ies.
-    private final TreeMap<GroupTreeNode, ChatHistoryManagementRecord> groupsChatHistory = new TreeMap<>((o1, o2) -> {
-        // The most important thing is to catch equality/non-equality.
-        // For "less" or "bigger" comparison, we will fall back to group names.
-        return o1 == o2 ? 0 : o1.getGroup().getName().compareTo(o2.getGroup().getName());
-    });
+    private final TreeMap<GroupTreeNode, ChatHistoryManagementRecord> groupsChatHistory = new TreeMap<>(Comparator.comparing(GroupTreeNode::getName));
 
-    public ChatHistoryService(CitationKeyPatternPreferences citationKeyPatternPreferences, NotificationService notificationService) {
-        this.citationKeyPatternPreferences = citationKeyPatternPreferences;
-        this.implementation = new MVStoreChatHistoryStorage(Directories.getAiFilesDirectory().resolve(CHAT_HISTORY_FILE_NAME), notificationService);
-        configureHistoryTransfer();
-    }
-
-    public ChatHistoryService(CitationKeyPatternPreferences citationKeyPatternPreferences,
-                              ChatHistoryStorage implementation) {
+    public ChatHistoryService(CitationKeyPatternPreferences citationKeyPatternPreferences, ChatHistoryStorage implementation) {
         this.citationKeyPatternPreferences = citationKeyPatternPreferences;
         this.implementation = implementation;
-
-        configureHistoryTransfer();
     }
 
-    private void configureHistoryTransfer() {
-        stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    change.getAddedSubList().forEach(this::configureHistoryTransfer);
-                }
-            }
-        });
-    }
-
-    private void configureHistoryTransfer(BibDatabaseContext bibDatabaseContext) {
+    public void setupDatabase(BibDatabaseContext bibDatabaseContext) {
         bibDatabaseContext.getMetaData().getGroups().ifPresent(rootGroupTreeNode -> {
             rootGroupTreeNode.iterateOverTree().forEach(groupNode -> {
                 groupNode.getGroup().nameProperty().addListener((observable, oldValue, newValue) -> {
@@ -125,20 +95,18 @@ private void configureHistoryTransfer(BibDatabaseContext bibDatabaseContext) {
         });
     }
 
-    public ObservableList<ChatMessage> getChatHistoryForEntry(BibEntry entry) {
+    public ObservableList<ChatMessage> getChatHistoryForEntry(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
         return bibEntriesChatHistory.computeIfAbsent(entry, entryArg -> {
-            Optional<BibDatabaseContext> bibDatabaseContext = findBibDatabaseForEntry(entry);
-
             ObservableList<ChatMessage> chatHistory;
 
-            if (bibDatabaseContext.isEmpty() || entry.getCitationKey().isEmpty() || !correctCitationKey(bibDatabaseContext.get(), entry) || bibDatabaseContext.get().getDatabasePath().isEmpty()) {
+            if (entry.getCitationKey().isEmpty() || !correctCitationKey(bibDatabaseContext, entry) || bibDatabaseContext.getDatabasePath().isEmpty()) {
                 chatHistory = FXCollections.observableArrayList();
             } else {
-                List<ChatMessage> chatMessagesList = implementation.loadMessagesForEntry(bibDatabaseContext.get().getDatabasePath().get(), entry.getCitationKey().get());
+                List<ChatMessage> chatMessagesList = implementation.loadMessagesForEntry(bibDatabaseContext.getDatabasePath().get(), entry.getCitationKey().get());
                 chatHistory = FXCollections.observableArrayList(chatMessagesList);
             }
 
-            return new ChatHistoryManagementRecord(bibDatabaseContext, chatHistory);
+            return new ChatHistoryManagementRecord(Optional.of(bibDatabaseContext), chatHistory);
         }).chatHistory;
     }
 
@@ -173,24 +141,22 @@ public void closeChatHistoryForEntry(BibEntry entry) {
         bibEntriesChatHistory.remove(entry);
     }
 
-    public ObservableList<ChatMessage> getChatHistoryForGroup(GroupTreeNode group) {
+    public ObservableList<ChatMessage> getChatHistoryForGroup(BibDatabaseContext bibDatabaseContext, GroupTreeNode group) {
         return groupsChatHistory.computeIfAbsent(group, groupArg -> {
-            Optional<BibDatabaseContext> bibDatabaseContext = findBibDatabaseForGroup(group);
-
             ObservableList<ChatMessage> chatHistory;
 
-            if (bibDatabaseContext.isEmpty() || bibDatabaseContext.get().getDatabasePath().isEmpty()) {
+            if (bibDatabaseContext.getDatabasePath().isEmpty()) {
                 chatHistory = FXCollections.observableArrayList();
             } else {
                 List<ChatMessage> chatMessagesList = implementation.loadMessagesForGroup(
-                        bibDatabaseContext.get().getDatabasePath().get(),
+                        bibDatabaseContext.getDatabasePath().get(),
                         group.getGroup().getName()
                 );
 
                 chatHistory = FXCollections.observableArrayList(chatMessagesList);
             }
 
-            return new ChatHistoryManagementRecord(bibDatabaseContext, chatHistory);
+            return new ChatHistoryManagementRecord(Optional.of(bibDatabaseContext), chatHistory);
         }).chatHistory;
     }
 
@@ -235,26 +201,6 @@ private void tryToGenerateCitationKey(BibDatabaseContext bibDatabaseContext, Bib
         new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences).generateAndSetKey(bibEntry);
     }
 
-    private Optional<BibDatabaseContext> findBibDatabaseForEntry(BibEntry entry) {
-        return stateManager
-                .getOpenDatabases()
-                .stream()
-                .filter(dbContext -> dbContext.getDatabase().getEntries().contains(entry))
-                .findFirst();
-    }
-
-    private Optional<BibDatabaseContext> findBibDatabaseForGroup(GroupTreeNode group) {
-        return stateManager
-                .getOpenDatabases()
-                .stream()
-                .filter(dbContext ->
-                        dbContext.getMetaData().groupsBinding().get().map(groupTreeNode ->
-                                groupTreeNode.containsGroup(group.getGroup())
-                        ).orElse(false)
-                )
-                .findFirst();
-    }
-
     @Override
     public void close() {
         // We need to clone `bibEntriesChatHistory.keySet()` because closeChatHistoryForEntry() modifies the `bibEntriesChatHistory` map.
@@ -264,6 +210,7 @@ public void close() {
         new HashSet<>(groupsChatHistory.keySet()).forEach(this::closeChatHistoryForGroup);
 
         implementation.commit();
+        implementation.close();
     }
 
     private void transferGroupHistory(BibDatabaseContext bibDatabaseContext, GroupTreeNode groupTreeNode, String oldName, String newName) {
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java b/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
index 6d113891a36..d38940002e6 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.ai.ingestion;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
+import java.util.TreeMap;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.StringProperty;
@@ -14,8 +14,12 @@
 import org.jabref.logic.ai.processingstatus.ProcessingState;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.event.FieldChangedEvent;
+import org.jabref.model.entry.field.StandardField;
 
+import com.google.common.eventbus.Subscribe;
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.store.embedding.EmbeddingStore;
@@ -25,10 +29,12 @@
  * Use this class in the logic and UI.
  */
 public class IngestionService {
-    private final Map<LinkedFile, ProcessingInfo<LinkedFile, Void>> ingestionStatusMap = new HashMap<>();
+    // We use a {@link TreeMap} here for the same reasons we use it in {@link ChatHistoryService}.
+    private final TreeMap<LinkedFile, ProcessingInfo<LinkedFile, Void>> ingestionStatusMap = new TreeMap<>(Comparator.comparing(LinkedFile::getLink));
 
     private final List<List<LinkedFile>> listsUnderIngestion = new ArrayList<>();
 
+    private final AiPreferences aiPreferences;
     private final FilePreferences filePreferences;
     private final TaskExecutor taskExecutor;
 
@@ -44,6 +50,7 @@ public IngestionService(AiPreferences aiPreferences,
                             FilePreferences filePreferences,
                             TaskExecutor taskExecutor
     ) {
+        this.aiPreferences = aiPreferences;
         this.filePreferences = filePreferences;
         this.taskExecutor = taskExecutor;
 
@@ -58,6 +65,37 @@ public IngestionService(AiPreferences aiPreferences,
         this.shutdownSignal = shutdownSignal;
     }
 
+    public void setupDatabase(BibDatabaseContext bibDatabaseContext) {
+        // GC was eating the listeners, so we have to fall back to the event bus.
+        bibDatabaseContext.getDatabase().registerListener(new EntriesChangedListener(bibDatabaseContext));
+    }
+
+    private class EntriesChangedListener {
+        private final BibDatabaseContext bibDatabaseContext;
+
+        public EntriesChangedListener(BibDatabaseContext bibDatabaseContext) {
+            this.bibDatabaseContext = bibDatabaseContext;
+        }
+
+        @Subscribe
+        public void listen(EntriesAddedEvent e) {
+            e.getBibEntries().forEach(entry -> {
+                if (aiPreferences.getAutoGenerateEmbeddings()) {
+                    entry.getFiles().forEach(linkedFile -> ingest(linkedFile, bibDatabaseContext));
+                }
+
+                entry.registerListener(this);
+            });
+        }
+
+        @Subscribe
+        public void listen(FieldChangedEvent e) {
+            if (e.getField() == StandardField.FILE && aiPreferences.getAutoGenerateEmbeddings()) {
+                e.getBibEntry().getFiles().forEach(linkedFile -> ingest(linkedFile, bibDatabaseContext));
+            }
+        }
+    }
+
     /**
      * Start ingesting of a {@link LinkedFile}, if it was not ingested.
      * This method returns a {@link ProcessingInfo} that can be used for tracking state of the ingestion.
@@ -101,6 +139,7 @@ public List<ProcessingInfo<LinkedFile, Void>> ingest(StringProperty name, List<L
 
     private void startEmbeddingsGenerationTask(LinkedFile linkedFile, BibDatabaseContext bibDatabaseContext, ProcessingInfo<LinkedFile, Void> processingInfo) {
         new GenerateEmbeddingsTask(linkedFile, fileEmbeddingsManager, bibDatabaseContext, filePreferences, shutdownSignal)
+                .showToUser(true)
                 .onSuccess(v -> processingInfo.setState(ProcessingState.SUCCESS))
                 .onFailure(processingInfo::setException)
                 .executeWith(taskExecutor);
diff --git a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
index c71db69cdf8..2411539e596 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.ai.summarization;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Comparator;
 import java.util.Optional;
+import java.util.TreeMap;
 
 import javafx.beans.property.BooleanProperty;
 
@@ -14,8 +14,12 @@
 import org.jabref.logic.ai.util.CitationKeyCheck;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.event.FieldChangedEvent;
+import org.jabref.model.entry.field.StandardField;
 
+import com.google.common.eventbus.Subscribe;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,7 +36,7 @@
 public class SummariesService {
     private static final Logger LOGGER = LoggerFactory.getLogger(SummariesService.class);
 
-    private final Map<BibEntry, ProcessingInfo<BibEntry, Summary>> summariesStatusMap = new HashMap<>();
+    private final TreeMap<BibEntry, ProcessingInfo<BibEntry, Summary>> summariesStatusMap = new TreeMap<>(Comparator.comparing(BibEntry::getId));
 
     private final AiPreferences aiPreferences;
     private final SummariesStorage summariesStorage;
@@ -56,6 +60,35 @@ public SummariesService(AiPreferences aiPreferences,
         this.taskExecutor = taskExecutor;
     }
 
+    public void setupDatabase(BibDatabaseContext bibDatabaseContext) {
+        // GC was eating the listeners, so we have to fall back to the event bus.
+        bibDatabaseContext.getDatabase().registerListener(new EntriesChangedListener(bibDatabaseContext));
+    }
+
+    private class EntriesChangedListener {
+        private final BibDatabaseContext bibDatabaseContext;
+
+        public EntriesChangedListener(BibDatabaseContext bibDatabaseContext) {
+            this.bibDatabaseContext = bibDatabaseContext;
+        }
+
+        @Subscribe
+        public void listen(EntriesAddedEvent e) {
+            e.getBibEntries().forEach(entry -> {
+                if (aiPreferences.getAutoGenerateSummaries()) {
+                    summarize(entry, bibDatabaseContext);
+                }
+            });
+        }
+
+        @Subscribe
+        public void listen(FieldChangedEvent e) {
+            if (e.getField() == StandardField.FILE && aiPreferences.getAutoGenerateSummaries()) {
+                summarize(e.getBibEntry(), bibDatabaseContext);
+            }
+        }
+    }
+
     /**
      * Start generating summary of a {@link BibEntry}, if it was already generated.
      * This method returns a {@link ProcessingInfo} that can be used for tracking state of the summarization.
diff --git a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 3423df38a8d..336c6b7f749 100644
--- a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -340,6 +340,8 @@ public class JabRefCliPreferences implements CliPreferences {
     private static final String REMOTE_SERVER_PORT = "remoteServerPort";
 
     private static final String AI_ENABLED = "aiEnabled";
+    private static final String AI_AUTO_GENERATE_EMBEDDINGS = "aiAutoGenerateEmbeddings";
+    private static final String AI_AUTO_GENERATE_SUMMARIES = "aiAutoGenerateSummaries";
     private static final String AI_PROVIDER = "aiProvider";
     private static final String AI_OPEN_AI_CHAT_MODEL = "aiOpenAiChatModel";
     private static final String AI_MISTRAL_AI_CHAT_MODEL = "aiMistralAiChatModel";
@@ -620,6 +622,8 @@ protected JabRefCliPreferences() {
 
         // region:AI
         defaults.put(AI_ENABLED, AiDefaultPreferences.ENABLE_CHAT);
+        defaults.put(AI_AUTO_GENERATE_EMBEDDINGS, AiDefaultPreferences.AUTO_GENERATE_EMBEDDINGS);
+        defaults.put(AI_AUTO_GENERATE_SUMMARIES, AiDefaultPreferences.AUTO_GENERATE_SUMMARIES);
         defaults.put(AI_PROVIDER, AiDefaultPreferences.PROVIDER.name());
         defaults.put(AI_OPEN_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.OPEN_AI));
         defaults.put(AI_MISTRAL_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.MISTRAL_AI));
@@ -1811,6 +1815,8 @@ public AiPreferences getAiPreferences() {
 
         aiPreferences = new AiPreferences(
                 aiEnabled,
+                getBoolean(AI_AUTO_GENERATE_EMBEDDINGS),
+                getBoolean(AI_AUTO_GENERATE_SUMMARIES),
                 AiProvider.valueOf(get(AI_PROVIDER)),
                 get(AI_OPEN_AI_CHAT_MODEL),
                 get(AI_MISTRAL_AI_CHAT_MODEL),
@@ -1831,6 +1837,8 @@ public AiPreferences getAiPreferences() {
                 getDouble(AI_RAG_MIN_SCORE));
 
         EasyBind.listen(aiPreferences.enableAiProperty(), (obs, oldValue, newValue) -> putBoolean(AI_ENABLED, newValue));
+        EasyBind.listen(aiPreferences.autoGenerateEmbeddingsProperty(), (obs, oldValue, newValue) -> putBoolean(AI_AUTO_GENERATE_EMBEDDINGS, newValue));
+        EasyBind.listen(aiPreferences.autoGenerateSummariesProperty(), (obs, oldValue, newValue) -> putBoolean(AI_AUTO_GENERATE_SUMMARIES, newValue));
 
         EasyBind.listen(aiPreferences.aiProviderProperty(), (obs, oldValue, newValue) -> put(AI_PROVIDER, newValue.name()));
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 454a38cf4a6..e81f8f29134 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2637,6 +2637,9 @@ RAG\ minimum\ score\ must\ be\ a\ number=RAG minimum score must be a number
 RAG\ minimum\ score\ must\ be\ greater\ than\ 0\ and\ less\ than\ 1=RAG minimum score must be greater than 0 and less than 1
 Temperature\ must\ be\ a\ number=Temperature must be a number
 If\ you\ have\ chosen\ %0\ as\ an\ AI\ provider,\ the\ privacy\ policy\ of\ %0\ applies.\ You\ find\ it\ at\ %1.=If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.
+Automatically\ generate\ embeddings\ for\ new\ entries=Automatically generate embeddings for new entries
+Automatically\ generate\ summaries\ for\ new\ entries=Automatically generate summaries for new entries
+Connection=Connection
 
 Link=Link
 Source\ URL=Source URL
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index e7bcacebfce..fd3b781a4b6 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -5,9 +5,9 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.util.CustomLocalDragboard;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
@@ -52,7 +52,7 @@ void setUp() {
                 true,
                 true,
                 GroupHierarchyType.INDEPENDENT));
-        groupTree = new GroupTreeViewModel(stateManager, mock(DialogService.class), mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        groupTree = new GroupTreeViewModel(stateManager, mock(DialogService.class), mock(AiService.class), preferences, taskExecutor, new CustomLocalDragboard());
     }
 
     @Test
@@ -100,7 +100,7 @@ void shouldNotShowDialogWhenGroupNameChanges() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(AiService.class), preferences, taskExecutor, new CustomLocalDragboard());
         assertTrue(model.onlyMinorChanges(oldGroup, newGroup));
     }
 
@@ -112,7 +112,7 @@ void shouldNotShowDialogWhenGroupsAreEqual() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(AiService.class), preferences, taskExecutor, new CustomLocalDragboard());
         assertTrue(model.onlyMinorChanges(oldGroup, newGroup));
     }
 
@@ -124,7 +124,7 @@ void shouldShowDialogWhenKeywordDiffers() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(AiService.class), preferences, taskExecutor, new CustomLocalDragboard());
         assertFalse(model.onlyMinorChanges(oldGroup, newGroup));
     }
 
@@ -136,7 +136,7 @@ void shouldShowDialogWhenCaseSensitivyDiffers() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(AiService.class), preferences, taskExecutor, new CustomLocalDragboard());
         assertFalse(model.onlyMinorChanges(oldGroup, newGroup));
     }
 }
diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
index 00612d16ba9..9a5eeeac518 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -13,11 +13,11 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.frame.SidePanePreferences;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.OptionalObjectProperty;
+import org.jabref.logic.ai.AiService;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -38,7 +38,7 @@ class SidePaneViewModelTest {
 
     LibraryTabContainer tabContainer = mock(LibraryTabContainer.class);
     GuiPreferences preferences = mock(GuiPreferences.class);
-    ChatHistoryService chatHistoryService = mock(ChatHistoryService.class);
+    AiService aiService = mock(AiService.class);
     JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
     StateManager stateManager = mock(StateManager.class);
     TaskExecutor taskExecutor = mock(TaskExecutor.class);
@@ -67,7 +67,7 @@ void setUp() {
         sidePaneViewModel = new SidePaneViewModel(
                 tabContainer,
                 preferences,
-                chatHistoryService,
+                aiService,
                 abbreviationRepository,
                 stateManager,
                 taskExecutor,