import aliass and configuration updates (#291)

src/app/app.tsx

@@ -8,8 +8,8 @@ import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../models";
-import { isBlank } from "../util/util";
+import { GlobalModel } from "@/models";
+import { isBlank } from "@/util/util";
 import { WorkspaceView } from "./workspace/workspaceview";
 import { PluginsView } from "./pluginsview/pluginsview";
 import { BookmarksView } from "./bookmarks/bookmarks";

src/app/bookmarks/bookmarks.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .bookmarks-view {
     background-color: @background-session;

src/app/bookmarks/bookmarks.tsx

@@ -7,14 +7,14 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel } from "../../models";
-import { CmdStrCode, Markdown } from "../common/elements";
+import { GlobalModel } from "@/models";
+import { CmdStrCode, Markdown } from "@/common/elements";
 
-import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
-import { ReactComponent as CopyIcon } from "../assets/icons/favourites/copy.svg";
-import { ReactComponent as PenIcon } from "../assets/icons/favourites/pen.svg";
-import { ReactComponent as TrashIcon } from "../assets/icons/favourites/trash.svg";
-import { ReactComponent as FavoritesIcon } from "../assets/icons/favourites.svg";
+import { ReactComponent as XmarkIcon } from "@/assets/icons/line/xmark.svg";
+import { ReactComponent as CopyIcon } from "@/assets/icons/favourites/copy.svg";
+import { ReactComponent as PenIcon } from "@/assets/icons/favourites/pen.svg";
+import { ReactComponent as TrashIcon } from "@/assets/icons/favourites/trash.svg";
+import { ReactComponent as FavoritesIcon } from "@/assets/icons/favourites.svg";
 
 import "./bookmarks.less";
 

src/app/clientsettings/clientsettings.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .clientsettings-view {
     background-color: @background-session;

src/app/clientsettings/clientsettings.tsx

@@ -6,10 +6,10 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../models";
-import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "../common/elements";
-import { commandRtnHandler, isBlank } from "../../util/util";
-import * as appconst from "../appconst";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "@/models";
+import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "@/common/elements";
+import { commandRtnHandler, isBlank } from "@/util/util";
+import * as appconst from "@/app/appconst";
 
 import "./clientsettings.less";
 

src/app/common/elements/button.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-button {
     background: none;

src/app/common/elements/checkbox.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .checkbox {
     display: flex;

src/app/common/elements/cmdstrcode.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .cmdstr-code {
     position: relative;

src/app/common/elements/cmdstrcode.tsx

@@ -6,8 +6,8 @@ import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 import { If } from "tsx-control-statements/components";
 
-import { ReactComponent as CheckIcon } from "../../assets/icons/line/check.svg";
-import { ReactComponent as CopyIcon } from "../../assets/icons/history/copy.svg";
+import { ReactComponent as CheckIcon } from "@/assets/icons/line/check.svg";
+import { ReactComponent as CopyIcon } from "@/assets/icons/history/copy.svg";
 
 import "./cmdstrcode.less";
 

src/app/common/elements/dropdown.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-dropdown {
     position: relative;

src/app/common/elements/inlinesettingstextedit.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .inline-edit {
     .icon {

src/app/common/elements/inlinesettingstextedit.tsx

@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 import { If } from "tsx-control-statements/components";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../../../util/keyutil";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 import "./inlinesettingstextedit.less";
 

src/app/common/elements/inputdecoration.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-input-decoration {
     display: flex;

src/app/common/elements/markdown.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .markdown {
     color: @term-white;

src/app/common/elements/markdown.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import cn from "classnames";
-import { GlobalModel } from "../../../models";
+import { GlobalModel } from "@/models";
 
 import "./markdown.less";
 

src/app/common/elements/modal.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-modal-container {
     position: fixed;

src/app/common/elements/passwordfield.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-password {
     .wave-textfield-inner-eye {

src/app/common/elements/resizablesidebar.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .sidebar-handle {
     position: absolute;

src/app/common/elements/resizablesidebar.tsx

@@ -6,8 +6,8 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner } from "../../../models";
-import { MagicLayout } from "../../magiclayout";
+import { GlobalModel, GlobalCommandRunner } from "@/models";
+import { MagicLayout } from "@/app/magiclayout";
 
 import "./resizablesidebar.less";
 

src/app/common/elements/showwaveshellinstallprompt.tsx

@@ -1,8 +1,8 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { GlobalModel } from "../../../models";
-import * as appconst from "../../appconst";
+import { GlobalModel } from "@/models";
+import * as appconst from "@/app/appconst";
 
 function ShowWaveShellInstallPrompt(callbackFn: () => void) {
     let message: string = `

src/app/common/elements/status.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-status-container {
     display: flex;

src/app/common/elements/textfield.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-textfield {
     display: flex;

src/app/common/elements/toggle.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .checkbox-toggle {
     position: relative;

src/app/common/elements/tooltip.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .wave-tooltip {
     display: flex;

src/app/common/icons/icons.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .front-icon {
     margin-right: 5px;

src/app/common/icons/icons.tsx

@@ -1,12 +1,12 @@
 import React from "react";
 import cn from "classnames";
-import { ReactComponent as SpinnerIndicator } from "../../assets/icons/spinner-indicator.svg";
+import { ReactComponent as SpinnerIndicator } from "@/assets/icons/spinner-indicator.svg";
 import { boundMethod } from "autobind-decorator";
 import * as mobx from "mobx";
 import * as mobxReact from "mobx-react";
-import * as appconst from "../../appconst";
+import * as appconst from "@/app/appconst";
 
-import { ReactComponent as RotateIconSvg } from "../../assets/icons/line/rotate.svg";
+import { ReactComponent as RotateIconSvg } from "@/assets/icons/line/rotate.svg";
 
 interface PositionalIconProps {
     children?: React.ReactNode;

src/app/common/modals/about.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .about-modal {
     .wave-modal-content {

src/app/common/modals/about.tsx

@@ -5,12 +5,12 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../../models";
-import { Modal, LinkButton } from "../elements";
-import * as util from "../../../util/util";
-import * as appconst from "../../appconst";
+import { GlobalModel } from "@/models";
+import { Modal, LinkButton } from "@/elements";
+import * as util from "@/util/util";
+import * as appconst from "@/app/appconst";
 
-import logo from "../../assets/waveterm-logo-with-bg.svg";
+import logo from "@/assets/waveterm-logo-with-bg.svg";
 import "./about.less";
 
 @mobxReact.observer

src/app/common/modals/alert.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .alert-modal {
     width: 500px;

src/app/common/modals/alert.tsx

@@ -5,8 +5,8 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { Markdown, Modal, Button, Checkbox } from "../elements";
-import { GlobalModel, GlobalCommandRunner } from "../../../models";
+import { Markdown, Modal, Button, Checkbox } from "@/elements";
+import { GlobalModel, GlobalCommandRunner } from "@/models";
 
 import "./alert.less";
 

src/app/common/modals/clientstop.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .clientstop-modal {
     .inner-content {

src/app/common/modals/clientstop.tsx

@@ -5,8 +5,8 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel } from "../../../models";
-import { Modal, Button } from "../elements";
+import { GlobalModel } from "@/models";
+import { Modal, Button } from "@/elements";
 
 import "./clientstop.less";
 

src/app/common/modals/createremoteconn.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .crconn-modal {
     width: 452px;

src/app/common/modals/createremoteconn.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "@/models";
 import {
     Modal,
     TextField,
@@ -16,8 +16,8 @@ import {
     PasswordField,
     Tooltip,
     ShowWaveShellInstallPrompt,
-} from "../elements";
-import * as util from "../../../util/util";
+} from "@/elements";
+import * as util from "@/util/util";
 
 import "./createremoteconn.less";
 

src/app/common/modals/disconnected.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .disconnected-modal {
     .wave-modal-content {

src/app/common/modals/disconnected.tsx

@@ -5,8 +5,8 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../../models";
-import { Modal, Button } from "../elements";
+import { GlobalModel } from "@/models";
+import { Modal, Button } from "@/elements";
 
 import "./disconnected.less";
 

src/app/common/modals/editremoteconn.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .erconn-modal {
     width: 502px;

src/app/common/modals/editremoteconn.tsx

@@ -6,9 +6,9 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { If } from "tsx-control-statements/components";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
-import { Modal, TextField, InputDecoration, Dropdown, PasswordField, Tooltip } from "../elements";
-import * as util from "../../../util/util";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "@/models";
+import { Modal, TextField, InputDecoration, Dropdown, PasswordField, Tooltip } from "@/elements";
+import * as util from "@/util/util";
 
 import "./editremoteconn.less";
 

src/app/common/modals/linesettings.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .line-settings-modal {
     width: 640px;

src/app/common/modals/linesettings.tsx

@@ -5,10 +5,10 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner } from "../../../models";
-import { SettingsError, Modal, Dropdown } from "../elements";
-import { PluginModel } from "../../../plugins/plugins";
-import { commandRtnHandler } from "../../../util/util";
+import { GlobalModel, GlobalCommandRunner } from "@/models";
+import { SettingsError, Modal, Dropdown } from "@/elements";
+import { PluginModel } from "@/plugins/plugins";
+import { commandRtnHandler } from "@/util/util";
 
 import "./linesettings.less";
 

src/app/common/modals/provider.tsx

@@ -3,7 +3,7 @@
 
 import * as React from "react";
 import * as mobxReact from "mobx-react";
-import { GlobalModel } from "../../../models";
+import { GlobalModel } from "@/models";
 import { TosModal } from "./tos";
 
 @mobxReact.observer

src/app/common/modals/registry.tsx

@@ -13,8 +13,8 @@ import {
     ScreenSettingsModal,
     LineSettingsModal,
     UserInputModal,
-} from "../modals";
-import * as constants from "../../appconst";
+} from "@/modals";
+import * as constants from "@/app/appconst";
 
 const modalsRegistry: { [key: string]: React.ComponentType } = {
     [constants.ABOUT]: AboutModal,

src/app/common/modals/screensettings.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .screen-settings-modal {
     width: 640px;

src/app/common/modals/screensettings.tsx

@@ -7,14 +7,13 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
-import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Dropdown, Tooltip } from "../elements";
-import * as util from "../../../util/util";
-import { commandRtnHandler } from "../../../util/util";
-import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
-import { ReactComponent as GlobeIcon } from "../../assets/icons/globe.svg";
-import { ReactComponent as StatusCircleIcon } from "../../assets/icons/statuscircle.svg";
-import * as appconst from "../../appconst";
+import { GlobalModel, GlobalCommandRunner, Screen } from "@/models";
+import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Dropdown, Tooltip } from "@/elements";
+import * as util from "@/util/util";
+import { ReactComponent as SquareIcon } from "@/assets/icons/tab/square.svg";
+import { ReactComponent as GlobeIcon } from "@/assets/icons/globe.svg";
+import { ReactComponent as StatusCircleIcon } from "@/assets/icons/statuscircle.svg";
+import * as appconst from "@/app/appconst";
 
 import "./screensettings.less";
 
@@ -95,7 +94,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
             return;
         }
         let prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { tabcolor: color }, false);
-        commandRtnHandler(prtn, this.errorMessage);
+        util.commandRtnHandler(prtn, this.errorMessage);
     }
 
     @boundMethod
@@ -116,7 +115,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
             return;
         }
         let prtn = GlobalCommandRunner.screenArchive(this.screenId, val);
-        commandRtnHandler(prtn, this.errorMessage);
+        util.commandRtnHandler(prtn, this.errorMessage);
     }
 
     @boundMethod
@@ -134,7 +133,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
                 return;
             }
             let prtn = GlobalCommandRunner.screenWebShare(this.screen.screenId, val);
-            commandRtnHandler(prtn, this.errorMessage);
+            util.commandRtnHandler(prtn, this.errorMessage);
         });
     }
 
@@ -167,7 +166,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
             return;
         }
         let prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { name: val }, false);
-        commandRtnHandler(prtn, this.errorMessage);
+        util.commandRtnHandler(prtn, this.errorMessage);
     }
 
     @boundMethod
@@ -179,7 +178,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
             return;
         }
         let prtn = GlobalCommandRunner.screenSetSettings(this.screenId, { sharename: val }, false);
-        commandRtnHandler(prtn, this.errorMessage);
+        util.commandRtnHandler(prtn, this.errorMessage);
     }
 
     @boundMethod
@@ -206,7 +205,7 @@ class ScreenSettingsModal extends React.Component<{}, {}> {
                 return;
             }
             let prtn = GlobalCommandRunner.screenDelete(this.screenId, false);
-            commandRtnHandler(prtn, this.errorMessage);
+            util.commandRtnHandler(prtn, this.errorMessage);
             GlobalModel.modalsModel.popModal();
         });
     }

src/app/common/modals/sessionsettings.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .session-settings-modal {
     width: 640px;

src/app/common/modals/sessionsettings.tsx

@@ -5,10 +5,9 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner, Session } from "../../../models";
-import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Tooltip } from "../elements";
-import * as util from "../../../util/util";
-import { commandRtnHandler } from "../../../util/util";
+import { GlobalModel, GlobalCommandRunner, Session } from "@/models";
+import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Tooltip } from "@/elements";
+import * as util from "@/util/util";
 
 import "./sessionsettings.less";
 
@@ -50,7 +49,7 @@ class SessionSettingsModal extends React.Component<{}, {}> {
             return;
         }
         let prtn = GlobalCommandRunner.sessionSetSettings(this.sessionId, { name: newVal }, false);
-        commandRtnHandler(prtn, this.errorMessage);
+        util.commandRtnHandler(prtn, this.errorMessage);
     }
 
     @boundMethod
@@ -62,7 +61,7 @@ class SessionSettingsModal extends React.Component<{}, {}> {
             return;
         }
         let prtn = GlobalCommandRunner.sessionArchive(this.sessionId, val);
-        commandRtnHandler(prtn, this.errorMessage);
+        util.commandRtnHandler(prtn, this.errorMessage);
     }
 
     @boundMethod
@@ -74,7 +73,7 @@ class SessionSettingsModal extends React.Component<{}, {}> {
                 return;
             }
             let prtn = GlobalCommandRunner.sessionDelete(this.sessionId);
-            commandRtnHandler(prtn, this.errorMessage, () => GlobalModel.modalsModel.popModal());
+            util.commandRtnHandler(prtn, this.errorMessage, () => GlobalModel.modalsModel.popModal());
         });
     }
 

src/app/common/modals/tabswitcher.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .tabswitcher-modal {
     width: 452px;

src/app/common/modals/tabswitcher.tsx

@@ -7,11 +7,11 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner } from "../../../models";
-import { Modal, TextField, InputDecoration, Tooltip } from "../elements";
-import * as util from "../../../util/util";
-import { Screen } from "../../../models";
-import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
+import { GlobalModel, GlobalCommandRunner } from "@/models";
+import { Modal, TextField, InputDecoration, Tooltip } from "@/elements";
+import * as util from "@/util/util";
+import { Screen } from "@/models";
+import { ReactComponent as SquareIcon } from "@/assets/icons/tab/square.svg";
 
 import "./tabswitcher.less";
 

src/app/common/modals/tos.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .tos-modal {
     width: 640px;

src/app/common/modals/tos.tsx

@@ -4,13 +4,13 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner } from "../../../models";
-import { Toggle, Modal, Button } from "../elements";
-import * as util from "../../../util/util";
+import { GlobalModel, GlobalCommandRunner } from "@/models";
+import { Toggle, Modal, Button } from "@/elements";
+import * as util from "@/util/util";
 
-import shield from "../../assets/icons/shield_check.svg";
-import help from "../../assets/icons/help_filled.svg";
-import github from "../../assets/icons/github.svg";
+import shield from "@/assets/icons/shield_check.svg";
+import help from "@/assets/icons/help_filled.svg";
+import github from "@/assets/icons/github.svg";
 
 import "./tos.less";
 

src/app/common/modals/userinput.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .userinput-modal {
     width: 500px;

src/app/common/modals/userinput.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
-import { GlobalModel } from "../../../models";
+import { GlobalModel } from "@/models";
 import { Choose, When, If } from "tsx-control-statements/components";
-import { Modal, PasswordField, Markdown } from "../elements";
+import { Modal, PasswordField, Markdown } from "@/elements";
 
 import "./userinput.less";
 

src/app/common/modals/viewremoteconndetail.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .rconndetail-modal {
     width: 631px;

src/app/common/modals/viewremoteconndetail.tsx

@@ -7,11 +7,11 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
-import { Modal, Tooltip, Button, Status } from "../elements";
-import * as util from "../../../util/util";
-import * as textmeasure from "../../../util/textmeasure";
-import * as appconst from "../../appconst";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "@/models";
+import { Modal, Tooltip, Button, Status } from "@/elements";
+import * as util from "@/util/util";
+import * as textmeasure from "@/util/textmeasure";
+import * as appconst from "@/app/appconst";
 
 import "./viewremoteconndetail.less";
 

src/app/common/prompt/prompt.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .term-prompt {
     font-weight: 300;

src/app/common/prompt/prompt.tsx

@@ -5,10 +5,10 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../models";
+import { GlobalModel } from "@/models";
 import cn from "classnames";
-import { isBlank } from "../../../util/util";
-import { ReactComponent as FolderIcon } from "../../assets/icons/folder.svg";
+import { isBlank } from "@/util/util";
+import { ReactComponent as FolderIcon } from "@/assets/icons/folder.svg";
 
 import "./prompt.less";
 

src/app/connections/connections.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .connections-view {
     .no-items {

src/app/connections/connections.tsx

@@ -7,9 +7,9 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, RemotesModel, GlobalCommandRunner } from "../../models";
-import { Button, Status, ShowWaveShellInstallPrompt } from "../common/elements";
-import * as util from "../../util/util";
+import { GlobalModel, RemotesModel, GlobalCommandRunner } from "@/models";
+import { Button, Status, ShowWaveShellInstallPrompt } from "@/common/elements";
+import * as util from "@/util/util";
 
 import "./connections.less";
 

src/app/history/history.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .history-view {
     background-color: @background-session;

src/app/history/history.tsx

@@ -8,24 +8,24 @@ import { If, For } from "tsx-control-statements/components";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Cmd } from "../../models";
+import { GlobalModel, GlobalCommandRunner, Cmd } from "@/models";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import customParseFormat from "dayjs/plugin/customParseFormat";
-import { Line } from "../line/linecomps";
-import { CmdStrCode } from "../common/elements";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../../util/keyutil";
+import { Line } from "@/app/line/linecomps";
+import { CmdStrCode } from "@/common/elements";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
-import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
-import { ReactComponent as AngleDownIcon } from "../assets/icons/history/angle-down.svg";
-import { ReactComponent as ChevronLeftIcon } from "../assets/icons/history/chevron-left.svg";
-import { ReactComponent as ChevronRightIcon } from "../assets/icons/history/chevron-right.svg";
-import { ReactComponent as RightIcon } from "../assets/icons/history/right.svg";
-import { ReactComponent as SearchIcon } from "../assets/icons/history/search.svg";
-import { ReactComponent as TrashIcon } from "../assets/icons/trash.svg";
-import { ReactComponent as CheckedCheckbox } from "../assets/icons/checked-checkbox.svg";
-import { ReactComponent as CheckIcon } from "../assets/icons/line/check.svg";
-import { ReactComponent as CopyIcon } from "../assets/icons/history/copy.svg";
+import { ReactComponent as XmarkIcon } from "@/assets/icons/line/xmark.svg";
+import { ReactComponent as AngleDownIcon } from "@/assets/icons/history/angle-down.svg";
+import { ReactComponent as ChevronLeftIcon } from "@/assets/icons/history/chevron-left.svg";
+import { ReactComponent as ChevronRightIcon } from "@/assets/icons/history/chevron-right.svg";
+import { ReactComponent as RightIcon } from "@/assets/icons/history/right.svg";
+import { ReactComponent as SearchIcon } from "@/assets/icons/history/search.svg";
+import { ReactComponent as TrashIcon } from "@/assets/icons/trash.svg";
+import { ReactComponent as CheckedCheckbox } from "@/assets/icons/checked-checkbox.svg";
+import { ReactComponent as CheckIcon } from "@/assets/icons/line/check.svg";
+import { ReactComponent as CopyIcon } from "@/assets/icons/history/copy.svg";
 
 import "./history.less";
 

src/app/line/linecomps.tsx

@@ -9,31 +9,31 @@ import { boundMethod } from "autobind-decorator";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, Cmd } from "../../models";
-import { termHeightFromRows } from "../../util/textmeasure";
+import { GlobalModel, GlobalCommandRunner, Cmd } from "@/models";
+import { termHeightFromRows } from "@/util/textmeasure";
 import cn from "classnames";
-import { getTermPtyData } from "../../util/modelutil";
+import { getTermPtyData } from "@/util/modelutil";
 
-import { renderCmdText } from "../common/elements";
-import { SimpleBlobRenderer } from "../../plugins/core/basicrenderer";
-import { IncrementalRenderer } from "../../plugins/core/incrementalrenderer";
-import { TerminalRenderer } from "../../plugins/terminal/terminal";
-import { isBlank } from "../../util/util";
-import { PluginModel } from "../../plugins/plugins";
-import { Prompt } from "../common/prompt/prompt";
+import { renderCmdText } from "@/common/elements";
+import { SimpleBlobRenderer } from "@/plugins/core/basicrenderer";
+import { IncrementalRenderer } from "@/plugins/core/incrementalrenderer";
+import { TerminalRenderer } from "@/plugins/terminal/terminal";
+import { isBlank } from "@/util/util";
+import { PluginModel } from "@/plugins/plugins";
+import { Prompt } from "@/common/prompt/prompt";
 import * as lineutil from "./lineutil";
-import { ErrorBoundary } from "../../app/common/error/errorboundary";
-import * as appconst from "../appconst";
+import { ErrorBoundary } from "@/common/error/errorboundary";
+import * as appconst from "@/app/appconst";
 
-import { ReactComponent as CheckIcon } from "../assets/icons/line/check.svg";
-import { ReactComponent as CommentIcon } from "../assets/icons/line/comment.svg";
-import { ReactComponent as QuestionIcon } from "../assets/icons/line/question.svg";
-import { ReactComponent as WarningIcon } from "../assets/icons/line/triangle-exclamation.svg";
-import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
-import { ReactComponent as FillIcon } from "../assets/icons/line/fill.svg";
-import { ReactComponent as GearIcon } from "../assets/icons/line/gear.svg";
+import { ReactComponent as CheckIcon } from "@/assets/icons/line/check.svg";
+import { ReactComponent as CommentIcon } from "@/assets/icons/line/comment.svg";
+import { ReactComponent as QuestionIcon } from "@/assets/icons/line/question.svg";
+import { ReactComponent as WarningIcon } from "@/assets/icons/line/triangle-exclamation.svg";
+import { ReactComponent as XmarkIcon } from "@/assets/icons/line/xmark.svg";
+import { ReactComponent as FillIcon } from "@/assets/icons/line/fill.svg";
+import { ReactComponent as GearIcon } from "@/assets/icons/line/gear.svg";
 
-import { RotateIcon } from "../common/icons/icons";
+import { RotateIcon } from "@/common/icons/icons";
 
 import "./lines.less";
 

src/app/line/lines.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .line.line-text {
     flex-direction: row;

src/app/line/linesview.tsx

@@ -11,7 +11,7 @@ import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import { debounce, throttle } from "throttle-debounce";
-import * as util from "../../util/util";
+import * as util from "@/util/util";
 import * as lineutil from "./lineutil";
 
 import "./lines.less";

src/app/line/lineutil.ts

@@ -3,7 +3,7 @@
 
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { isBlank, getDateStr } from "../../util/util";
+import { isBlank, getDateStr } from "@/util/util";
 
 dayjs.extend(localizedFormat);
 

src/app/line/renderer/basicrenderer.tsx

@@ -6,8 +6,8 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 
 import { debounce } from "throttle-debounce";
-import * as util from "../../../util/util";
-import { GlobalModel } from "../../../models";
+import * as util from "@/util";
+import { GlobalModel } from "@/models";
 
 class SimpleBlobRendererModel {
     context: RendererContext;

src/app/pluginsview/pluginsview.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .plugins-view {
     background-color: @background-session;

src/app/pluginsview/pluginsview.tsx

@@ -5,11 +5,11 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../models";
-import { PluginModel } from "../../plugins/plugins";
-import { Markdown } from "../common/elements";
+import { GlobalModel } from "@/models";
+import { PluginModel } from "@/plugins/plugins";
+import { Markdown } from "@/common/elements";
 
-import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
+import { ReactComponent as XmarkIcon } from "@/assets/icons/line/xmark.svg";
 
 import "./pluginsview.less";
 

src/app/sidebar/sidebar.less

@@ -1,5 +1,5 @@
-@import "../../app/common/themes/themes.less";
-@import "../../app/common/icons/icons.less";
+@import "@/common/themes/themes.less";
+@import "@/common/icons/icons.less";
 
 .main-sidebar {
     padding: 0;

src/app/sidebar/sidebar.tsx

@@ -10,19 +10,19 @@ import dayjs from "dayjs";
 import { If } from "tsx-control-statements/components";
 import { compareLoose } from "semver";
 
-import { ReactComponent as LeftChevronIcon } from "../assets/icons/chevron_left.svg";
-import { ReactComponent as AppsIcon } from "../assets/icons/apps.svg";
-import { ReactComponent as WorkspacesIcon } from "../assets/icons/workspaces.svg";
-import { ReactComponent as SettingsIcon } from "../assets/icons/settings.svg";
+import { ReactComponent as LeftChevronIcon } from "@/assets/icons/chevron_left.svg";
+import { ReactComponent as AppsIcon } from "@/assets/icons/apps.svg";
+import { ReactComponent as WorkspacesIcon } from "@/assets/icons/workspaces.svg";
+import { ReactComponent as SettingsIcon } from "@/assets/icons/settings.svg";
 
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner, Session } from "../../models";
-import { isBlank, openLink } from "../../util/util";
-import { ResizableSidebar } from "../common/elements";
-import * as appconst from "../appconst";
+import { GlobalModel, GlobalCommandRunner, Session } from "@/models";
+import { isBlank, openLink } from "@/util/util";
+import { ResizableSidebar } from "@/common/elements";
+import * as appconst from "@/app/appconst";
 
 import "./sidebar.less";
-import { ActionsIcon, CenteredIcon, FrontIcon, StatusIndicator } from "../common/icons/icons";
+import { ActionsIcon, CenteredIcon, FrontIcon, StatusIndicator } from "@/common/icons/icons";
 
 dayjs.extend(localizedFormat);
 

src/app/workspace/cmdinput/aichat.tsx

@@ -4,13 +4,13 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
-import { GlobalModel } from "../../../models";
-import { isBlank } from "../../../util/util";
+import { GlobalModel } from "@/models";
+import { isBlank } from "@/util";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 import { For } from "tsx-control-statements/components";
-import { Markdown } from "../../common/elements";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../../../util/keyutil";
+import { Markdown } from "@/elements";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 @mobxReact.observer
 class AIChat extends React.Component<{}, {}> {

src/app/workspace/cmdinput/cmdinput.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .cmd-input {
     border-radius: 6px;

src/app/workspace/cmdinput/cmdinput.tsx

@@ -9,14 +9,14 @@ import { If } from "tsx-control-statements/components";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
-import { renderCmdText } from "../../common/elements";
+import { GlobalModel, GlobalCommandRunner, Screen } from "@/models";
+import { renderCmdText } from "@/elements";
 import { TextAreaInput } from "./textareainput";
 import { InfoMsg } from "./infomsg";
 import { HistoryInfo } from "./historyinfo";
-import { Prompt } from "../../common/prompt/prompt";
-import { ReactComponent as ExecIcon } from "../../assets/icons/exec.svg";
-import { RotateIcon } from "../../common/icons/icons";
+import { Prompt } from "@/common/prompt/prompt";
+import { ReactComponent as ExecIcon } from "@/assets/icons/exec.svg";
+import { RotateIcon } from "@/common/icons/icons";
 import { AIChat } from "./aichat";
 
 import "./cmdinput.less";

src/app/workspace/cmdinput/historyinfo.tsx

@@ -10,8 +10,8 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../models";
-import { isBlank } from "../../../util/util";
+import { GlobalModel } from "@/models";
+import { isBlank } from "@/util/util";
 
 dayjs.extend(localizedFormat);
 

src/app/workspace/cmdinput/infomsg.tsx

@@ -7,8 +7,8 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../models";
-import { makeExternLink } from "../../../util/util";
+import { GlobalModel } from "@/models";
+import { makeExternLink } from "@/util/util";
 
 dayjs.extend(localizedFormat);
 

src/app/workspace/cmdinput/textareainput.tsx

@@ -4,15 +4,14 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
-import * as util from "../../../util/util";
+import * as util from "@/util/util";
 import { If } from "tsx-control-statements/components";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
-import { getMonoFontSize } from "../../../util/textmeasure";
-import { isModKeyPress, hasNoModifiers } from "../../../util/util";
-import * as appconst from "../../appconst";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../../../util/keyutil";
+import { GlobalModel, GlobalCommandRunner, Screen } from "@/models";
+import { getMonoFontSize } from "@/util/textmeasure";
+import * as appconst from "@/app/appconst";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 type OV<T> = mobx.IObservableValue<T>;
 
@@ -168,7 +167,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
     @boundMethod
     onKeyDown(e: any) {
         mobx.action(() => {
-            if (isModKeyPress(e)) {
+            if (util.isModKeyPress(e)) {
                 return;
             }
             let model = GlobalModel;

src/app/workspace/screen/screenview.less

@@ -1,4 +1,4 @@
-@import "../../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .main-content {
     .screen-view {
@@ -6,7 +6,8 @@
         position: relative;
     }
 
-    .screen-sidebar, .window-view {
+    .screen-sidebar,
+    .window-view {
         transition: width 0.5s ease-in-out;
     }
 

src/app/workspace/screen/screenview.tsx

@@ -10,19 +10,19 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import { debounce } from "throttle-debounce";
 import dayjs from "dayjs";
-import { GlobalCommandRunner, ForwardLineContainer, GlobalModel, ScreenLines, Screen, Session } from "../../../models";
+import { GlobalCommandRunner, ForwardLineContainer, GlobalModel, ScreenLines, Screen, Session } from "@/models";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { Button, TextField, Dropdown } from "../../common/elements";
-import { getRemoteStr } from "../../common/prompt/prompt";
-import { Line } from "../../line/linecomps";
-import { LinesView } from "../../line/linesview";
-import * as util from "../../../util/util";
-import { ReactComponent as EllipseIcon } from "../../assets/icons/ellipse.svg";
-import { ReactComponent as Check12Icon } from "../../assets/icons/check12.svg";
-import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
-import { ReactComponent as GlobeIcon } from "../../assets/icons/globe.svg";
-import { ReactComponent as StatusCircleIcon } from "../../assets/icons/statuscircle.svg";
-import * as appconst from "../../appconst";
+import { Button, TextField, Dropdown } from "@/elements";
+import { getRemoteStr } from "@/common/prompt/prompt";
+import { Line } from "@/app/line/linecomps";
+import { LinesView } from "@/app/line/linesview";
+import * as util from "@/util/util";
+import { ReactComponent as EllipseIcon } from "@/assets/icons/ellipse.svg";
+import { ReactComponent as Check12Icon } from "@/assets/icons/check12.svg";
+import { ReactComponent as SquareIcon } from "@/assets/icons/tab/square.svg";
+import { ReactComponent as GlobeIcon } from "@/assets/icons/globe.svg";
+import { ReactComponent as StatusCircleIcon } from "@/assets/icons/statuscircle.svg";
+import * as appconst from "@/app/appconst";
 
 import "./screenview.less";
 import "./tabs.less";

src/app/workspace/screen/tab.tsx

@@ -6,13 +6,13 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
-import { ActionsIcon, StatusIndicator, CenteredIcon } from "../../common/icons/icons";
-import { renderCmdText } from "../../common/elements";
-import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
-import * as constants from "../../appconst";
+import { GlobalModel, GlobalCommandRunner, Screen } from "@/models";
+import { ActionsIcon, StatusIndicator, CenteredIcon } from "@/common/icons/icons";
+import { renderCmdText } from "@/elements";
+import { ReactComponent as SquareIcon } from "@/assets/icons/tab/square.svg";
+import * as constants from "@/app/appconst";
 import { Reorder } from "framer-motion";
-import { MagicLayout } from "../../magiclayout";
+import { MagicLayout } from "@/app/magiclayout";
 
 @mobxReact.observer
 class ScreenTab extends React.Component<

src/app/workspace/screen/tabs.less

@@ -1,5 +1,5 @@
-@import "../../../app/common/themes/themes.less";
-@import "../../../app/common/icons/icons.less";
+@import "@/common/themes/themes.less";
+@import "@/common/icons/icons.less";
 
 #main .screen-tabs .screen-tab {
     border-top: 1px solid transparent;

src/app/workspace/screen/tabs.tsx

@@ -7,8 +7,8 @@ import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import { For } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, Session, Screen } from "../../../models";
-import { ReactComponent as AddIcon } from "../../assets/icons/add.svg";
+import { GlobalModel, GlobalCommandRunner, Session, Screen } from "@/models";
+import { ReactComponent as AddIcon } from "@/assets/icons/add.svg";
 import { Reorder } from "framer-motion";
 import { ScreenTab } from "./tab";
 

src/app/workspace/workspace.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .session-view {
     flex-grow: 1;

src/app/workspace/workspaceview.tsx

@@ -7,11 +7,11 @@ import * as mobx from "mobx";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../models";
+import { GlobalModel } from "@/models";
 import { CmdInput } from "./cmdinput/cmdinput";
 import { ScreenView } from "./screen/screenview";
 import { ScreenTabs } from "./screen/tabs";
-import { ErrorBoundary } from "../../app/common/error/errorboundary";
+import { ErrorBoundary } from "@/common/error/errorboundary";
 import { MagicLayout } from "../magiclayout";
 import "./workspace.less";
 

src/electron/emain.ts

@@ -7,14 +7,13 @@ import * as fs from "fs";
 import fetch from "node-fetch";
 import * as child_process from "node:child_process";
 import { debounce } from "throttle-debounce";
-import { handleJsonFetchResponse } from "../util/util";
 import * as winston from "winston";
-import * as util from "util";
 import { sprintf } from "sprintf-js";
+import * as util from "util";
+import { handleJsonFetchResponse } from "@/util/util";
 import { v4 as uuidv4 } from "uuid";
-import { checkKeyPressed, adaptFromElectronKeyEvent, setKeyUtilPlatform } from "../util/keyutil";
+import { checkKeyPressed, adaptFromElectronKeyEvent, setKeyUtilPlatform } from "@/util/keyutil";
 import { platform } from "os";
-import type * as T from "../types/types";
 
 const WaveAppPathVarName = "WAVETERM_APP_PATH";
 const WaveDevVarName = "WAVETERM_DEV";
@@ -257,7 +256,7 @@ function shFrameNavHandler(event: Electron.Event<Electron.WebContentsWillFrameNa
     return;
 }
 
-function createMainWindow(clientData: T.ClientDataType | null) {
+function createMainWindow(clientData: ClientDataType | null) {
     let bounds = calcBounds(clientData);
     setKeyUtilPlatform(platform());
     let win = new electron.BrowserWindow({
@@ -663,7 +662,7 @@ electron.ipcMain.on("context-editmenu", (event, { x, y }, opts) => {
 });
 
 async function createMainWindowWrap() {
-    let clientData: T.ClientDataType | null = null;
+    let clientData: ClientDataType | null = null;
     try {
         clientData = await getClientDataPoll(1);
     } catch (e) {

src/index.ts

@@ -5,7 +5,7 @@ import * as mobx from "mobx";
 import * as React from "react";
 import { createRoot } from "react-dom/client";
 import { sprintf } from "sprintf-js";
-import { App } from "./app/app";
+import { App } from "@/app/app";
 import * as DOMPurify from "dompurify";
 import { loadFonts } from "./util/util";
 

src/models/bookmarks.ts

@@ -4,8 +4,8 @@
 import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
-import { genMergeSimpleData } from "../util/util";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../util/keyutil";
+import { genMergeSimpleData } from "@/util/util";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 import { GlobalCommandRunner } from "./global";
 import { Model } from "./model";
 

src/models/cmd.ts

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import * as mobx from "mobx";
-import { stringToBase64 } from "../util/util";
-import { TermWrap } from "../plugins/terminal/term";
-import { cmdStatusIsRunning } from "../app/line/lineutil";
+import { stringToBase64 } from "@/util/util";
+import { TermWrap } from "@/plugins/terminal/term";
+import { cmdStatusIsRunning } from "@/app/line/lineutil";
 import { Model } from "./model";
 
 const InputChunkSize = 500;

src/models/forwardlinecontainer.ts

@@ -1,9 +1,9 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { TermWrap } from "../plugins/terminal/term";
-import { windowWidthToCols, windowHeightToRows } from "../util/textmeasure";
-import { MagicLayout } from "../app/magiclayout";
+import { TermWrap } from "@/plugins/terminal/term";
+import { windowWidthToCols, windowHeightToRows } from "@/util/textmeasure";
+import { MagicLayout } from "@/app/magiclayout";
 import { Model } from "./model";
 import { GlobalCommandRunner } from "./global";
 import { Cmd } from "./cmd";

src/models/historyview.ts

@@ -3,11 +3,11 @@
 
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { isBlank } from "../util/util";
-import { termWidthFromCols, termHeightFromRows } from "../util/textmeasure";
+import { isBlank } from "@/util/util";
+import { termWidthFromCols, termHeightFromRows } from "@/util/textmeasure";
 import dayjs from "dayjs";
-import * as appconst from "../app/appconst";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../util/keyutil";
+import * as appconst from "@/app/appconst";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 import { GlobalCommandRunner } from "./global";
 import { Model } from "./model";
 import { Cmd } from "./cmd";

src/models/input.ts

@@ -4,8 +4,8 @@
 import type React from "react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { isBlank } from "../util/util";
-import * as appconst from "../app/appconst";
+import { isBlank } from "@/util/util";
+import * as appconst from "@/app/appconst";
 import { Model } from "./model";
 import { GlobalCommandRunner } from "./global";
 

src/models/mainsidebar.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import * as mobx from "mobx";
-import { MagicLayout } from "../app/magiclayout";
+import { MagicLayout } from "@/app/magiclayout";
 import { Model } from "./model";
 
 class MainSidebarModel {

src/models/modals.ts

@@ -3,7 +3,7 @@
 
 import * as mobx from "mobx";
 import { v4 as uuidv4 } from "uuid";
-import { modalsRegistry } from "../app/common/modals/registry";
+import { modalsRegistry } from "@/modals/registry";
 
 class ModalsModel {
     store: OArr<ModalStoreEntry> = mobx.observable.array([], { name: "ModalsModel-store", deep: false });

src/models/model.ts

@@ -12,12 +12,12 @@ import {
     genMergeSimpleData,
     isModKeyPress,
     isBlank,
-} from "../util/util";
+} from "@/util/util";
 import { WSControl } from "./ws";
-import { cmdStatusIsRunning } from "../app/line/lineutil";
-import * as appconst from "../app/appconst";
-import { remotePtrToString, cmdPacketString } from "../util/modelutil";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent, setKeyUtilPlatform } from "../util/keyutil";
+import { cmdStatusIsRunning } from "@/app/line/lineutil";
+import * as appconst from "@/app/appconst";
+import { remotePtrToString, cmdPacketString } from "@/util/modelutil";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent, setKeyUtilPlatform } from "@/util/keyutil";
 import { Session } from "./session";
 import { ScreenLines } from "./screenlines";
 import { InputModel } from "./input";

src/models/model_old.ts-deprecated

@@ -18,9 +18,9 @@ import {
     genMergeSimpleData,
     boundInt,
     isModKeyPress,
-} from "../util/util";
-import { TermWrap } from "../plugins/terminal/term";
-import { PluginModel } from "../plugins/plugins";
+} from "@/util/util";
+import { TermWrap } from "@/plugins/terminal/term";
+import { PluginModel } from "@/plugins/plugins";
 import {
     SessionDataType,
     LineType,
@@ -76,15 +76,15 @@ import {
     windowHeightToRows,
     termWidthFromCols,
     termHeightFromRows,
-} from "../util/textmeasure";
+} from "@/util/textmeasure";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import customParseFormat from "dayjs/plugin/customParseFormat";
-import { getRendererContext, cmdStatusIsRunning } from "../app/line/lineutil";
-import { MagicLayout } from "../app/magiclayout";
-import { modalsRegistry } from "../app/common/modals/registry";
-import * as appconst from "../app/appconst";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent, setKeyUtilPlatform } from "../util/keyutil";
+import { getRendererContext, cmdStatusIsRunning } from "@/app/line/lineutil";
+import { MagicLayout } from "@/app/magiclayout";
+import { modalsRegistry } from "@/modals/registry";
+import * as appconst from "@/app/appconst";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent, setKeyUtilPlatform } from "@/util/keyutil";
 
 dayjs.extend(customParseFormat);
 dayjs.extend(localizedFormat);

src/models/plugins.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import * as mobx from "mobx";
-import { PluginModel } from "../plugins/plugins";
+import { PluginModel } from "@/plugins/plugins";
 import { Model } from "./model";
 
 class PluginsModel {

src/models/remotes.ts

@@ -3,12 +3,12 @@
 
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { stringToBase64 } from "../util/util";
-import { TermWrap } from "../plugins/terminal/term";
-import * as appconst from "../app/appconst";
+import { stringToBase64 } from "@/util/util";
+import { TermWrap } from "@/plugins/terminal/term";
+import * as appconst from "@/app/appconst";
 import { GlobalCommandRunner } from "./global";
 import { Model } from "./model";
-import { getTermPtyData } from "../util/modelutil";
+import { getTermPtyData } from "@/util/modelutil";
 
 class RemotesModel {
     globalModel: Model;

src/models/screen.ts

@@ -4,18 +4,18 @@
 import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
 import { debounce } from "throttle-debounce";
-import { base64ToArray, boundInt, isModKeyPress, isBlank } from "../util/util";
-import { TermWrap } from "../plugins/terminal/term";
-import { windowWidthToCols, windowHeightToRows, termWidthFromCols, termHeightFromRows } from "../util/textmeasure";
-import { getRendererContext } from "../app/line/lineutil";
-import { MagicLayout } from "../app/magiclayout";
-import * as appconst from "../app/appconst";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "../util/keyutil";
+import { base64ToArray, boundInt, isModKeyPress, isBlank } from "@/util/util";
+import { TermWrap } from "@/plugins/terminal/term";
+import { windowWidthToCols, windowHeightToRows, termWidthFromCols, termHeightFromRows } from "@/util/textmeasure";
+import { getRendererContext } from "@/app/line/lineutil";
+import { MagicLayout } from "@/app/magiclayout";
+import * as appconst from "@/app/appconst";
+import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 import { Model } from "./model";
 import { GlobalCommandRunner } from "./global";
 import { Cmd } from "./cmd";
 import { ScreenLines } from "./screenlines";
-import { getTermPtyData } from "../util/modelutil";
+import { getTermPtyData } from "@/util/modelutil";
 
 class Screen {
     globalModel: Model;

src/models/screenlines.ts

@@ -3,8 +3,8 @@
 
 import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
-import { genMergeSimpleData } from "../util/util";
-import { cmdStatusIsRunning } from "../app/line/lineutil";
+import { genMergeSimpleData } from "@/util/util";
+import { cmdStatusIsRunning } from "@/app/line/lineutil";
 import { Cmd } from "./cmd";
 
 class ScreenLines {

src/models/session.ts

@@ -3,7 +3,7 @@
 
 import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
-import { genMergeSimpleData, isBlank, ces } from "../util/util";
+import { genMergeSimpleData, isBlank, ces } from "@/util/util";
 import { Model } from "./model";
 import { Screen } from "./screen";
 

src/models/speciallinecontainer.ts

@@ -1,10 +1,10 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { TermWrap } from "../plugins/terminal/term";
-import { windowWidthToCols } from "../util/textmeasure";
-import { getRendererContext } from "../app/line/lineutil";
-import { getTermPtyData } from "../util/modelutil";
+import { TermWrap } from "@/plugins/terminal/term";
+import { windowWidthToCols } from "@/util/textmeasure";
+import { getRendererContext } from "@/app/line/lineutil";
+import { getTermPtyData } from "@/util/modelutil";
 import { Cmd } from "./cmd";
 import { Model } from "./model";
 

src/plugins/code/code.less

@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";
 
 .code-renderer {
     .monaco-editor {