Merge remote-tracking branch 'origin/dev-1.10.1' into dev-1.10.1

src/ui/desktop/apps/dashboard/apps/alerts/AlertManager.tsx

@@ -4,6 +4,7 @@ import { Button } from "@/components/ui/button.tsx";
 import { getUserAlerts, dismissAlert } from "@/ui/main-axios.ts";
 import { useTranslation } from "react-i18next";
 import type { TermixAlert } from "../../../../../../types";
+import { toast } from "sonner";
 
 interface AlertManagerProps {
   userId: string | null;
@@ -53,7 +54,6 @@ export function AlertManager({
       setAlerts(sortedAlerts);
       setCurrentAlertIndex(0);
     } catch {
-      const { toast } = await import("sonner");
       toast.error(t("homepage.failedToLoadAlerts"));
       setError(t("homepage.failedToLoadAlerts"));
     } finally {

src/ui/desktop/apps/features/docker/DockerManager.tsx

@@ -18,6 +18,7 @@ import {
   keepaliveDockerSession,
   verifyDockerTOTP,
   logActivity,
+  getSSHHosts,
 } from "@/ui/main-axios.ts";
 import { SimpleLoader } from "@/ui/desktop/navigation/animations/SimpleLoader.tsx";
 import { AlertCircle } from "lucide-react";
@@ -121,7 +122,6 @@ export function DockerManager({
     const fetchLatestHostConfig = async () => {
       if (hostConfig?.id) {
         try {
-          const { getSSHHosts } = await import("@/ui/main-axios.ts");
           const hosts = await getSSHHosts();
           const updatedHost = hosts.find((h) => h.id === hostConfig.id);
           if (updatedHost) {
@@ -138,7 +138,6 @@ export function DockerManager({
     const handleHostsChanged = async () => {
       if (hostConfig?.id) {
         try {
-          const { getSSHHosts } = await import("@/ui/main-axios.ts");
           const hosts = await getSSHHosts();
           const updatedHost = hosts.find((h) => h.id === hostConfig.id);
           if (updatedHost) {

src/ui/desktop/apps/features/server-stats/ServerStats.tsx

@@ -11,6 +11,8 @@ import {
   submitMetricsTOTP,
   executeSnippet,
   logActivity,
+  sendMetricsHeartbeat,
+  getSSHHosts,
   type ServerMetrics,
 } from "@/ui/main-axios.ts";
 import { TOTPDialog } from "@/ui/desktop/navigation/TOTPDialog.tsx";
@@ -145,7 +147,6 @@ export function ServerStats({
 
     const heartbeatInterval = setInterval(async () => {
       try {
-        const { sendMetricsHeartbeat } = await import("@/ui/main-axios.ts");
         await sendMetricsHeartbeat(viewerSessionId);
       } catch (error) {
         console.error("Failed to send heartbeat:", error);
@@ -273,7 +274,6 @@ export function ServerStats({
     const fetchLatestHostConfig = async () => {
       if (hostConfig?.id) {
         try {
-          const { getSSHHosts } = await import("@/ui/main-axios.ts");
           const hosts = await getSSHHosts();
           const updatedHost = hosts.find((h) => h.id === hostConfig.id);
           if (updatedHost) {
@@ -290,7 +290,6 @@ export function ServerStats({
     const handleHostsChanged = async () => {
       if (hostConfig?.id) {
         try {
-          const { getSSHHosts } = await import("@/ui/main-axios.ts");
           const hosts = await getSSHHosts();
           const updatedHost = hosts.find((h) => h.id === hostConfig.id);
           if (updatedHost) {

src/ui/desktop/apps/features/terminal/Terminal.tsx

@@ -18,6 +18,8 @@ import {
   isElectron,
   logActivity,
   getSnippets,
+  deleteCommandFromHistory,
+  getCommandHistory,
 } from "@/ui/main-axios.ts";
 import { TOTPDialog } from "@/ui/desktop/navigation/TOTPDialog.tsx";
 import { SSHAuthDialog } from "@/ui/desktop/navigation/SSHAuthDialog.tsx";
@@ -212,8 +214,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
       if (showHistoryDialog && hostConfig.id) {
         setIsLoadingHistory(true);
         setIsLoadingRef.current(true);
-        import("@/ui/main-axios.ts")
-          .then((module) => module.getCommandHistory(hostConfig.id!))
+        getCommandHistory(hostConfig.id!)
           .then((history) => {
             setCommandHistory(history);
             setCommandHistoryContextRef.current(history);
@@ -235,8 +236,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
         localStorage.getItem("commandAutocomplete") === "true";
 
       if (hostConfig.id && autocompleteEnabled) {
-        import("@/ui/main-axios.ts")
-          .then((module) => module.getCommandHistory(hostConfig.id!))
+        getCommandHistory(hostConfig.id!)
           .then((history) => {
             autocompleteHistory.current = history;
           })
@@ -1107,8 +1107,6 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
         if (!hostConfig.id) return;
 
         try {
-          const { deleteCommandFromHistory } =
-            await import("@/ui/main-axios.ts");
           await deleteCommandFromHistory(hostConfig.id, command);
 
           setCommandHistory((prev) => {

src/ui/desktop/apps/features/tunnel/TunnelManager.tsx

@@ -3,6 +3,7 @@ import { useSidebar } from "@/components/ui/sidebar.tsx";
 import { Separator } from "@/components/ui/separator.tsx";
 import { Tunnel } from "@/ui/desktop/apps/features/tunnel/Tunnel.tsx";
 import { useTranslation } from "react-i18next";
+import { getSSHHosts } from "@/ui/main-axios.ts";
 
 interface HostConfig {
   id: number;
@@ -44,7 +45,6 @@ export function TunnelManager({
     const fetchLatestHostConfig = async () => {
       if (hostConfig?.id) {
         try {
-          const { getSSHHosts } = await import("@/ui/main-axios.ts");
           const hosts = await getSSHHosts();
           const updatedHost = hosts.find((h) => h.id === hostConfig.id);
           if (updatedHost) {
@@ -61,7 +61,6 @@ export function TunnelManager({
     const handleHostsChanged = async () => {
       if (hostConfig?.id) {
         try {
-          const { getSSHHosts } = await import("@/ui/main-axios.ts");
           const hosts = await getSSHHosts();
           const updatedHost = hosts.find((h) => h.id === hostConfig.id);
           if (updatedHost) {

src/ui/desktop/apps/host-manager/credentials/CredentialSelector.tsx

@@ -5,6 +5,7 @@ import { FormControl, FormItem, FormLabel } from "@/components/ui/form.tsx";
 import { getCredentials } from "@/ui/main-axios.ts";
 import { useTranslation } from "react-i18next";
 import type { Credential } from "../../../../../types";
+import { toast } from "sonner";
 
 interface CredentialSelectorProps {
   value?: number | null;
@@ -36,7 +37,6 @@ export function CredentialSelector({
           : data.credentials || data.data || [];
         setCredentials(credentialsArray);
       } catch {
-        const { toast } = await import("sonner");
         toast.error(t("credentials.failedToFetchCredentials"));
         setCredentials([]);
       } finally {

src/ui/desktop/apps/host-manager/hosts/HostManagerEditor.tsx

@@ -52,6 +52,7 @@ import {
   getHostAccess,
   revokeHostAccess,
   getSSHHostById,
+  notifyHostCreatedOrUpdated,
   type Role,
   type AccessRecord,
 } from "@/ui/main-axios.ts";
@@ -819,8 +820,6 @@ export function HostManagerEditor({
       window.dispatchEvent(new CustomEvent("ssh-hosts:changed"));
 
       if (savedHost?.id) {
-        const { notifyHostCreatedOrUpdated } =
-          await import("@/ui/main-axios.ts");
         notifyHostCreatedOrUpdated(savedHost.id);
       }
     } catch (error) {

src/ui/desktop/apps/host-manager/hosts/HostManagerViewer.tsx

@@ -26,6 +26,7 @@ import {
   updateFolderMetadata,
   deleteAllHostsInFolder,
   getServerStatusById,
+  refreshServerPolling,
 } from "@/ui/main-axios.ts";
 import { toast } from "sonner";
 import { useTranslation } from "react-i18next";
@@ -313,7 +314,6 @@ export function HostManagerViewer({ onEditHost }: SSHManagerHostViewerProps) {
           await fetchHosts();
           window.dispatchEvent(new CustomEvent("ssh-hosts:changed"));
 
-          const { refreshServerPolling } = await import("@/ui/main-axios.ts");
           refreshServerPolling();
         } catch {
           toast.error(t("hosts.failedToDeleteHost"));