diff --git a/extensions/assistant-extension/src/@types/global.d.ts b/extensions/assistant-extension/src/@types/global.d.ts index b724db8d0f..2ca4a40809 100644 --- a/extensions/assistant-extension/src/@types/global.d.ts +++ b/extensions/assistant-extension/src/@types/global.d.ts @@ -1,3 +1,2 @@ declare const NODE: string declare const VERSION: string -declare const CORTEX_API_URL: string diff --git a/extensions/conversational-extension/rolldown.config.mjs b/extensions/conversational-extension/rolldown.config.mjs index 6d396f6116..7c4b940176 100644 --- a/extensions/conversational-extension/rolldown.config.mjs +++ b/extensions/conversational-extension/rolldown.config.mjs @@ -7,7 +7,5 @@ export default defineConfig({ file: 'dist/index.js', }, platform: 'browser', - define: { - API_URL: JSON.stringify(`http://127.0.0.1:${process.env.CORTEX_API_PORT ?? "39291"}`), - }, + define: {}, }) diff --git a/extensions/conversational-extension/src/@types/global.d.ts b/extensions/conversational-extension/src/@types/global.d.ts index 4ec8b88250..840f49f453 100644 --- a/extensions/conversational-extension/src/@types/global.d.ts +++ b/extensions/conversational-extension/src/@types/global.d.ts @@ -1,5 +1,3 @@ -declare const API_URL: string - interface Core { api: APIFunctions events: EventEmitter diff --git a/src-tauri/src/core/mcp.rs b/src-tauri/src/core/mcp.rs index a5fa91463f..4a8644bc98 100644 --- a/src-tauri/src/core/mcp.rs +++ b/src-tauri/src/core/mcp.rs @@ -260,7 +260,7 @@ async fn monitor_mcp_server_handle( } } -/// Starts an MCP server with restart monitoring (similar to cortex restart) +/// Starts an MCP server with restart monitoring /// Returns the result of the first start attempt, then continues with restart monitoring async fn start_mcp_server_with_restart( app: AppHandle, diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index d5e607ff64..7083cdebe8 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -6,7 +6,6 @@ use core::{ state::{generate_app_token, AppState}, utils::download::DownloadManagerState, }; -use reqwest::Client; use std::{collections::HashMap, sync::Arc}; use tauri::{Emitter, Manager, RunEvent}; use tokio::sync::Mutex; @@ -143,10 +142,6 @@ pub fn run() { cleanup_processes(state).await; }); } - - let client = Client::new(); - let url = "http://127.0.0.1:39291/processManager/destroy"; - let _ = client.delete(url).send(); } _ => {} }) @@ -171,15 +166,6 @@ pub fn run() { // Quick cleanup with shorter timeout cleanup_processes(state).await; - - // Stop HTTP server with shorter timeout - let client = Client::new(); - let url = "http://127.0.0.1:39291/processManager/destroy"; - let _ = tokio::time::timeout( - tokio::time::Duration::from_secs(2), - client.delete(url).send(), - ) - .await; }); }); } diff --git a/web-app/src/containers/dialogs/CortexFailureDialog.tsx b/web-app/src/containers/dialogs/CortexFailureDialog.tsx deleted file mode 100644 index 48d08569d7..0000000000 --- a/web-app/src/containers/dialogs/CortexFailureDialog.tsx +++ /dev/null @@ -1,88 +0,0 @@ -import { useEffect, useState } from 'react' -import { listen } from '@tauri-apps/api/event' -import { invoke } from '@tauri-apps/api/core' - -import { - Dialog, - DialogContent, - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from '@/components/ui/dialog' -import { Button } from '@/components/ui/button' -import { useTranslation } from '@/i18n' - -export function CortexFailureDialog() { - const { t } = useTranslation() - const [showDialog, setShowDialog] = useState(false) - - useEffect(() => { - let unlisten: (() => void) | undefined - const setupListener = async () => { - unlisten = await listen('cortex_max_restarts_reached', (event) => { - console.log('Cortex max restarts reached event received:', event) - setShowDialog(true) - }) - } - - setupListener() - - return () => { - if (unlisten) { - unlisten() - } - } - }, []) - - const handleRestartJan = async () => { - try { - await invoke('relaunch') - } catch (error) { - console.error('Failed to relaunch app:', error) - alert( - 'Failed to automatically restart. Please close and reopen Jan manually.' - ) - } - } - - if (!showDialog) { - return null - } - - return ( - - - - {t('cortexFailureDialog.title')} - - - {t('cortexFailureDialog.description')} - - - - - - - - ) -} diff --git a/web-app/src/locales/de-DE/common.json b/web-app/src/locales/de-DE/common.json index 0664f52469..f418070c8c 100644 --- a/web-app/src/locales/de-DE/common.json +++ b/web-app/src/locales/de-DE/common.json @@ -257,11 +257,5 @@ "title": "Download abgebrochen", "description": "Der Download-Prozess wurde abgebrochen" } - }, - "cortexFailureDialog": { - "title": "Problem mit der lokalen KI-Engine", - "description": "Die Lokale KI-Engine (Cortex) konnte nach mehreren Versuchen nicht gestartet werden. Dies verhindert möglicherweise die korrekte Ausführung diverser Funktionalitäten.", - "contactSupport": "Support kontaktieren", - "restartJan": "Jan neu starten" } } diff --git a/web-app/src/locales/en/common.json b/web-app/src/locales/en/common.json index 62461a09f0..6ab02fbfd8 100644 --- a/web-app/src/locales/en/common.json +++ b/web-app/src/locales/en/common.json @@ -258,11 +258,5 @@ "title": "Download Cancelled", "description": "The download process was cancelled" } - }, - "cortexFailureDialog": { - "title": "Local AI Engine Issue", - "description": "The local AI engine (Cortex) failed to start after multiple attempts. This might prevent some features from working correctly.", - "contactSupport": "Contact Support", - "restartJan": "Restart Jan" } } diff --git a/web-app/src/locales/id/common.json b/web-app/src/locales/id/common.json index 0398ea2a4c..4433488d05 100644 --- a/web-app/src/locales/id/common.json +++ b/web-app/src/locales/id/common.json @@ -250,11 +250,5 @@ "title": "Unduhan Dibatalkan", "description": "Proses unduhan telah dibatalkan" } - }, - "cortexFailureDialog": { - "title": "Cortex gagal dimulai", - "description": "Cortex gagal dimulai. Silakan periksa log untuk detail lebih lanjut.", - "contactSupport": "Hubungi Dukungan", - "restartJan": "Restart Jan" } } diff --git a/web-app/src/locales/vn/common.json b/web-app/src/locales/vn/common.json index 13ac2089e7..06974aedcf 100644 --- a/web-app/src/locales/vn/common.json +++ b/web-app/src/locales/vn/common.json @@ -250,11 +250,5 @@ "title": "Đã hủy tải xuống", "description": "Quá trình tải xuống đã bị hủy" } - }, - "cortexFailureDialog": { - "title": "Cortex không khởi động được", - "description": "Cortex không khởi động được. Vui lòng kiểm tra log để biết thêm chi tiết.", - "contactSupport": "Liên hệ Hỗ trợ", - "restartJan": "Khởi động lại Jan" } } diff --git a/web-app/src/locales/zh-CN/common.json b/web-app/src/locales/zh-CN/common.json index 231bdecfc4..34af5ae954 100644 --- a/web-app/src/locales/zh-CN/common.json +++ b/web-app/src/locales/zh-CN/common.json @@ -250,11 +250,5 @@ "title": "下载已取消", "description": "下载过程已取消" } - }, - "cortexFailureDialog": { - "title": "Cortex 启动失败", - "description": "Cortex 启动失败。请检查日志以获取更多详细信息。", - "contactSupport": "联系支持", - "restartJan": "重启 Jan" } } diff --git a/web-app/src/locales/zh-TW/common.json b/web-app/src/locales/zh-TW/common.json index e633cf0172..485c41369f 100644 --- a/web-app/src/locales/zh-TW/common.json +++ b/web-app/src/locales/zh-TW/common.json @@ -250,11 +250,5 @@ "title": "下載已取消", "description": "下載過程已取消" } - }, - "cortexFailureDialog": { - "title": "Cortex 啟動失敗", - "description": "Cortex 啟動失敗。請檢查日誌以獲取更多詳細信息。", - "contactSupport": "聯繫支援", - "restartJan": "重啟 Jan" } } diff --git a/web-app/src/routes/__root.tsx b/web-app/src/routes/__root.tsx index 938c30c841..5278f73fc1 100644 --- a/web-app/src/routes/__root.tsx +++ b/web-app/src/routes/__root.tsx @@ -3,7 +3,6 @@ import { createRootRoute, Outlet, useRouterState } from '@tanstack/react-router' import LeftPanel from '@/containers/LeftPanel' import DialogAppUpdater from '@/containers/dialogs/AppUpdater' -import { CortexFailureDialog } from '@/containers/dialogs/CortexFailureDialog' // Added import import { Fragment } from 'react/jsx-runtime' import { AppearanceProvider } from '@/providers/AppearanceProvider' import { ThemeProvider } from '@/providers/ThemeProvider' @@ -167,7 +166,6 @@ function RootLayout() { {isLocalAPIServerLogsRoute ? : } {/* */} -