diff --git a/core/llm/llms/Aider.ts b/core/llm/llms/Aider.ts index 1e9af2bb39..e419e3d5e7 100644 --- a/core/llm/llms/Aider.ts +++ b/core/llm/llms/Aider.ts @@ -468,7 +468,7 @@ public async aiderResetSession(model: string, apiKey: string | undefined): Promi } async listModels(): Promise { - return ["aider", "claude-3-5-sonnet-20240620", "pearai_model", "gpt-4o"]; + return ["claude-3-5-sonnet-20240620", "pearai_model", "gpt-4o"]; } supportsFim(): boolean { diff --git a/gui/src/components/mainInput/TipTapEditor.tsx b/gui/src/components/mainInput/TipTapEditor.tsx index 2b2fcd5ab0..c7a7ef942a 100644 --- a/gui/src/components/mainInput/TipTapEditor.tsx +++ b/gui/src/components/mainInput/TipTapEditor.tsx @@ -57,6 +57,7 @@ import { } from "./getSuggestion"; import { ComboBoxItem } from "./types"; import { isBareChatMode } from '../../util/bareChatMode'; +import { useLocation } from "react-router-dom"; const InputBoxDiv = styled.div` @@ -117,8 +118,9 @@ const HoverTextDiv = styled.div` justify-content: center; `; -const getPlaceholder = (defaultModel, historyLength: number) => { - if (defaultModel?.title?.toLowerCase().includes("aider")) { + +const getPlaceholder = (historyLength: number, location: Location | null) => { + if (location?.pathname === "/aiderMode") { return historyLength === 0 ? "Ask me to create, change, or fix anything..." : "Send a follow-up"; @@ -310,7 +312,7 @@ function TipTapEditor(props: TipTapEditorProps) { }, }), Placeholder.configure({ - placeholder: () => getPlaceholder(defaultModel, historyLengthRef.current), + placeholder: () => getPlaceholder(historyLengthRef.current, location), }), Paragraph.extend({ addKeyboardShortcuts() { @@ -483,7 +485,7 @@ function TipTapEditor(props: TipTapEditorProps) { }); const editorFocusedRef = useUpdatingRef(editor?.isFocused, [editor]); - + useEffect(() => { const handleShowFile = (event: CustomEvent) => { const filepath = event.detail.filepath; @@ -495,7 +497,7 @@ function TipTapEditor(props: TipTapEditorProps) { window.removeEventListener('showFile', handleShowFile as EventListener); }; }, [ideMessenger]); - + useEffect(() => { if (isJetBrains()) { // This is only for VS Code .ipynb files diff --git a/gui/src/components/markdown/FileCreateChip.tsx b/gui/src/components/markdown/FileCreateChip.tsx index 468eef19f4..d6cf5a2dea 100644 --- a/gui/src/components/markdown/FileCreateChip.tsx +++ b/gui/src/components/markdown/FileCreateChip.tsx @@ -45,7 +45,6 @@ const FileCreateChip = ({ rawCodeBlock }) => { // try { // // this does not work, dont waste your time - promise never resolves // const response = await ideMessenger.ide.fileExists(filePath); - // console.dir("aldsfjkalsdfjk") // setFileExists(response); // } catch (error) { // console.error(`Error checking file existence: ${error}`);