Add New chat confirm modal, restructure components dir (#872)

src/commands.ts

@@ -1,5 +1,5 @@
-import { LanguageModal } from "@/components/LanguageModal";
-import { ToneModal } from "@/components/ToneModal";
+import { LanguageModal } from "@/components/modals/LanguageModal";
+import { ToneModal } from "@/components/modals/ToneModal";
 import CopilotPlugin from "@/main";
 import { Editor, Notice } from "obsidian";
 import { COMMAND_IDS } from "./constants";

src/components/Chat.tsx

@@ -1,13 +1,13 @@
-import ChainManager from "@/LLMProviders/chainManager";
 import { useAIState } from "@/aiState";
 import { updateChatMemory } from "@/chatUtils";
-import ChatInput from "@/components/ChatComponents/ChatInput";
-import ChatMessages from "@/components/ChatComponents/ChatMessages";
+import ChatInput from "@/components/chat-components/ChatInput";
+import ChatMessages from "@/components/chat-components/ChatMessages";
 import { ABORT_REASON, AI_SENDER, EVENT_NAMES, LOADING_MESSAGES, USER_SENDER } from "@/constants";
 import { AppContext } from "@/context";
 import { ContextProcessor } from "@/contextProcessor";
 import { CustomPromptProcessor } from "@/customPromptProcessor";
 import { getAIResponse } from "@/langchainStream";
+import ChainManager from "@/LLMProviders/chainManager";
 import CopilotPlugin from "@/main";
 import { Mention } from "@/mentions/Mention";
 import { useSettingsValueContext } from "@/settings/contexts/SettingsValueContext";
@@ -658,6 +658,7 @@ ${chatContent}`;
           selectedImages={selectedImages}
           onAddImage={(files: File[]) => setSelectedImages((prev) => [...prev, ...files])}
           setSelectedImages={setSelectedImages}
+          chatHistory={chatHistory}
           debug={debug}
         />
       </div>

src/components/ChatComponents/ChatControls.tsx → src/components/chat-components/ChatControls.tsx

@@ -5,13 +5,15 @@ import { App, Notice } from "obsidian";
 import React, { useEffect, useState } from "react";
 
 import { ChainType } from "@/chainFactory";
-import { AddContextNoteModal } from "@/components/AddContextNoteModal";
-import { TooltipActionButton } from "@/components/ChatComponents/TooltipActionButton";
+import { TooltipActionButton } from "@/components/chat-components/TooltipActionButton";
+import { AddContextNoteModal } from "@/components/modals/AddContextNoteModal";
 import { useSettingsValueContext } from "@/settings/contexts/SettingsValueContext";
 import { stringToChainType } from "@/utils";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { ChevronDown, Download, MessageCirclePlus, Puzzle } from "lucide-react";
 
+import { NewChatConfirmModal } from "@/components/modals/NewChatConfirmModal";
+import { ChatMessage } from "@/sharedState";
 import { TFile } from "obsidian";
 import { ChatContextMenu } from "./ChatContextMenu";
 
@@ -29,6 +31,7 @@ interface ChatControlsProps {
   setIncludeActiveNote: React.Dispatch<React.SetStateAction<boolean>>;
   contextUrls: string[];
   onRemoveUrl: (url: string) => void;
+  chatHistory: ChatMessage[];
   debug?: boolean;
 }
 
@@ -46,6 +49,7 @@ const ChatControls: React.FC<ChatControlsProps> = ({
   setIncludeActiveNote,
   contextUrls,
   onRemoveUrl,
+  chatHistory,
   debug,
 }) => {
   const [selectedChain, setSelectedChain] = useState<ChainType>(currentChain);
@@ -159,7 +163,13 @@ const ChatControls: React.FC<ChatControlsProps> = ({
         <div className="chat-icons-right">
           <TooltipActionButton
             onClick={() => {
-              onNewChat(false);
+              if (!settings.autosaveChat && chatHistory.length > 0) {
+                new NewChatConfirmModal(app, () => {
+                  onNewChat(false);
+                }).open();
+              } else {
+                onNewChat(false);
+              }
             }}
             Icon={<MessageCirclePlus className="icon-scaler" />}
           >

src/components/ChatComponents/ChatInput.tsx → src/components/chat-components/ChatInput.tsx

@@ -1,19 +1,20 @@
 import { CustomModel, SetChainOptions } from "@/aiParams";
 import { ChainType } from "@/chainFactory";
-import { ListPromptModal } from "@/components/ListPromptModal";
-import { NoteTitleModal } from "@/components/NoteTitleModal";
+import { AddImageModal } from "@/components/modals/AddImageModal";
+import { ListPromptModal } from "@/components/modals/ListPromptModal";
+import { NoteTitleModal } from "@/components/modals/NoteTitleModal";
 import { ContextProcessor } from "@/contextProcessor";
 import { CustomPromptProcessor } from "@/customPromptProcessor";
 import { COPILOT_TOOL_NAMES } from "@/LLMProviders/intentAnalyzer";
 import { Mention } from "@/mentions/Mention";
 import { useSettingsValueContext } from "@/settings/contexts/SettingsValueContext";
+import { ChatMessage } from "@/sharedState";
 import { getToolDescription } from "@/tools/toolManager";
 import { extractNoteTitles } from "@/utils";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { ArrowBigUp, ChevronUp, Command, CornerDownLeft, Image, StopCircle } from "lucide-react";
 import { App, Platform, TFile } from "obsidian";
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
-import { AddImageModal } from "../AddImageModal";
 import ChatControls from "./ChatControls";
 import { TooltipActionButton } from "./TooltipActionButton";
 
@@ -41,6 +42,7 @@ interface ChatInputProps {
   selectedImages: File[];
   onAddImage: (files: File[]) => void;
   setSelectedImages: React.Dispatch<React.SetStateAction<File[]>>;
+  chatHistory: ChatMessage[];
   debug?: boolean;
 }
 
@@ -72,6 +74,7 @@ const ChatInput = forwardRef<{ focus: () => void }, ChatInputProps>(
       selectedImages,
       onAddImage,
       setSelectedImages,
+      chatHistory,
       debug,
     },
     ref
@@ -392,6 +395,7 @@ const ChatInput = forwardRef<{ focus: () => void }, ChatInputProps>(
           setIncludeActiveNote={setIncludeActiveNote}
           contextUrls={contextUrls}
           onRemoveUrl={(url: string) => setContextUrls((prev) => prev.filter((u) => u !== url))}
+          chatHistory={chatHistory}
           debug={debug}
         />
 

src/components/ChatComponents/ChatMessages.tsx → src/components/chat-components/ChatMessages.tsx

@@ -1,6 +1,6 @@
 import { ChainType } from "@/chainFactory";
-import ChatSingleMessage from "@/components/ChatComponents/ChatSingleMessage";
-import { SuggestedPrompts } from "@/components/ChatComponents/SuggestedPrompts";
+import ChatSingleMessage from "@/components/chat-components/ChatSingleMessage";
+import { SuggestedPrompts } from "@/components/chat-components/SuggestedPrompts";
 import { ChatMessage } from "@/sharedState";
 import { App } from "obsidian";
 import React, { useEffect, useState } from "react";

src/components/ChatComponents/ChatSingleMessage.tsx → src/components/chat-components/ChatSingleMessage.tsx

@@ -1,5 +1,5 @@
-import { ChatButtons } from "@/components/ChatComponents/ChatButtons";
-import { SourcesModal } from "@/components/SourcesModal";
+import { ChatButtons } from "@/components/chat-components/ChatButtons";
+import { SourcesModal } from "@/components/modals/SourcesModal";
 import { USER_SENDER } from "@/constants";
 import { ChatMessage } from "@/sharedState";
 import { Bot, User } from "lucide-react";

src/components/modals/NewChatConfirmModal.tsx

@@ -0,0 +1,60 @@
+import { App, Modal } from "obsidian";
+
+export class NewChatConfirmModal extends Modal {
+  private onConfirm: () => void;
+
+  constructor(app: App, onConfirm: () => void) {
+    super(app);
+    this.onConfirm = onConfirm;
+  }
+
+  onOpen() {
+    const { contentEl } = this;
+    contentEl.empty();
+
+    contentEl.createEl("h2", { text: "Start New Chat" });
+
+    const warningText = contentEl.createEl("p");
+    warningText.appendChild(
+      document.createTextNode(
+        "Starting a new chat will clear the current chat history. Any unsaved messages will be lost."
+      )
+    );
+
+    const buttonContainer = contentEl.createEl("div");
+    buttonContainer.style.display = "flex";
+    buttonContainer.style.justifyContent = "space-between";
+    buttonContainer.style.gap = "10px";
+    buttonContainer.style.marginTop = "20px";
+
+    const confirmButton = buttonContainer.createEl("button", {
+      text: "Continue",
+    });
+    confirmButton.style.padding = "8px 16px";
+    confirmButton.style.borderRadius = "4px";
+    confirmButton.style.cursor = "pointer";
+    confirmButton.style.minWidth = "100px";
+    confirmButton.style.backgroundColor = "var(--interactive-accent)";
+    confirmButton.style.color = "var(--text-on-accent)";
+    confirmButton.addEventListener("click", () => {
+      this.onConfirm();
+      this.close();
+    });
+
+    const cancelButton = buttonContainer.createEl("button", {
+      text: "Cancel",
+    });
+    cancelButton.style.padding = "8px 16px";
+    cancelButton.style.borderRadius = "4px";
+    cancelButton.style.cursor = "pointer";
+    cancelButton.style.minWidth = "100px";
+    cancelButton.addEventListener("click", () => {
+      this.close();
+    });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}

src/components/OramaSearchModal.tsx → src/components/modals/OramaSearchModal.tsx

@@ -1,5 +1,5 @@
 import { App, Modal, Notice, Setting } from "obsidian";
-import CopilotPlugin from "../main";
+import CopilotPlugin from "../../main";
 
 export class OramaSearchModal extends Modal {
   plugin: CopilotPlugin;

src/main.ts

@@ -5,14 +5,14 @@ import { CustomModel, LangChainParams, SetChainOptions } from "@/aiParams";
 import { ChainType } from "@/chainFactory";
 import { parseChatContent, updateChatMemory } from "@/chatUtils";
 import { registerBuiltInCommands } from "@/commands";
-import { AddPromptModal } from "@/components/AddPromptModal";
-import { AdhocPromptModal } from "@/components/AdhocPromptModal";
 import CopilotView from "@/components/CopilotView";
-import { IndexedFilesModal } from "@/components/IndexedFilesModal";
-import { ListPromptModal } from "@/components/ListPromptModal";
-import { LoadChatHistoryModal } from "@/components/LoadChatHistoryModal";
-import { OramaSearchModal } from "@/components/OramaSearchModal";
-import { SimilarNotesModal } from "@/components/SimilarNotesModal";
+import { AddPromptModal } from "@/components/modals/AddPromptModal";
+import { AdhocPromptModal } from "@/components/modals/AdhocPromptModal";
+import { IndexedFilesModal } from "@/components/modals/IndexedFilesModal";
+import { ListPromptModal } from "@/components/modals/ListPromptModal";
+import { LoadChatHistoryModal } from "@/components/modals/LoadChatHistoryModal";
+import { OramaSearchModal } from "@/components/modals/OramaSearchModal";
+import { SimilarNotesModal } from "@/components/modals/SimilarNotesModal";
 import {
   BUILTIN_CHAT_MODELS,
   BUILTIN_EMBEDDING_MODELS,