Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion extensions/assistant-extension/src/@types/global.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
declare const NODE: string
declare const VERSION: string
declare const CORTEX_API_URL: string
4 changes: 1 addition & 3 deletions extensions/conversational-extension/rolldown.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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: {},
})
2 changes: 0 additions & 2 deletions extensions/conversational-extension/src/@types/global.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
declare const API_URL: string

interface Core {
api: APIFunctions
events: EventEmitter
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/src/core/mcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<R: Runtime>(
app: AppHandle<R>,
Expand Down
14 changes: 0 additions & 14 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
_ => {}
})
Expand All @@ -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;
});
});
}
Expand Down
88 changes: 0 additions & 88 deletions web-app/src/containers/dialogs/CortexFailureDialog.tsx

This file was deleted.

6 changes: 0 additions & 6 deletions web-app/src/locales/de-DE/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 0 additions & 6 deletions web-app/src/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 0 additions & 6 deletions web-app/src/locales/id/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 0 additions & 6 deletions web-app/src/locales/vn/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 0 additions & 6 deletions web-app/src/locales/zh-CN/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,5 @@
"title": "下载已取消",
"description": "下载过程已取消"
}
},
"cortexFailureDialog": {
"title": "Cortex 启动失败",
"description": "Cortex 启动失败。请检查日志以获取更多详细信息。",
"contactSupport": "联系支持",
"restartJan": "重启 Jan"
}
}
6 changes: 0 additions & 6 deletions web-app/src/locales/zh-TW/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,5 @@
"title": "下載已取消",
"description": "下載過程已取消"
}
},
"cortexFailureDialog": {
"title": "Cortex 啟動失敗",
"description": "Cortex 啟動失敗。請檢查日誌以獲取更多詳細信息。",
"contactSupport": "聯繫支援",
"restartJan": "重啟 Jan"
}
}
2 changes: 0 additions & 2 deletions web-app/src/routes/__root.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { createRootRoute, Outlet, useRouterState } from '@tanstack/react-router'

Check warning on line 1 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

1 line is not covered with tests
// import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'

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'
Expand All @@ -27,53 +26,53 @@
ResizablePanel,
ResizableHandle,
} from '@/components/ui/resizable'
import { useCallback } from 'react'
import GlobalError from '@/containers/GlobalError'
import { GlobalEventHandler } from '@/providers/GlobalEventHandler'

Check warning on line 31 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

29-31 lines are not covered with tests

export const Route = createRootRoute({
component: RootLayout,
errorComponent: ({ error }) => <GlobalError error={error} />,
})

Check warning on line 36 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

33-36 lines are not covered with tests

const AppLayout = () => {
const { productAnalyticPrompt } = useAnalytic()
const {
open: isLeftPanelOpen,
setLeftPanel,
size: leftPanelSize,
setLeftPanelSize,
} = useLeftPanel()
const isSmallScreen = useSmallScreen()

Check warning on line 46 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

38-46 lines are not covered with tests

// Minimum width threshold for auto-close (10% of screen width)
const MIN_PANEL_WIDTH_THRESHOLD = 14

Check warning on line 49 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

49 line is not covered with tests

// Handle panel size changes
const handlePanelLayout = useCallback(
(sizes: number[]) => {
if (sizes.length > 0) {
const newSize = sizes[0]

Check warning on line 55 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

52-55 lines are not covered with tests

// Close panel if resized below minimum threshold
if (newSize < MIN_PANEL_WIDTH_THRESHOLD) {
setLeftPanel(false)
} else {
setLeftPanelSize(newSize)
}
}
},
[setLeftPanelSize, setLeftPanel]
)

Check warning on line 66 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

58-66 lines are not covered with tests

return (
<Fragment>
<AnalyticProvider />
<KeyboardShortcutsProvider />
<main className="relative h-svh text-sm antialiased select-none bg-app">

Check warning on line 72 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

68-72 lines are not covered with tests
{/* Fake absolute panel top to enable window drag */}
<div className="absolute w-full h-10 z-10" data-tauri-drag-region />
<DialogAppUpdater />

Check warning on line 75 in web-app/src/routes/__root.tsx

View workflow job for this annotation

GitHub Actions / coverage-check

74-75 lines are not covered with tests

{/* Use ResizablePanelGroup only on larger screens */}
{!isSmallScreen && isLeftPanelOpen ? (
Expand Down Expand Up @@ -167,7 +166,6 @@
</ExtensionProvider>
{isLocalAPIServerLogsRoute ? <LogsLayout /> : <AppLayout />}
{/* <TanStackRouterDevtools position="bottom-right" /> */}
<CortexFailureDialog />
<ToolApproval />
<LoadModelErrorDialog />
<OutOfContextPromiseModal />
Expand Down
Loading