feat: first pass at sftp installer for waveshell

This does not completely work yet. In particular, you must attempt to
connect to the client before attempting an install. It also does not
work for auto installation yet.

go.work.sum

@@ -1,12 +1,45 @@
-github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 h1:3/gm/JTX9bX8CpzTgIlrtYpB3EVBDxyg/GY/QdcIEZw=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376 h1:tFhJgTu7lgd+hldLfPSzDCoWUpXI8wHKR3rxq5jTLkQ=
 github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/app/app.less

@@ -8,10 +8,6 @@
 }
 
 :root {
-    /* updated by GlobalModel to user's preferred fontsize */
-    --termfontsize: 12px;
-    --termlineheight: 15px;
-
     --fa-style-family: "Font Awesome 6 Sharp";
 }
 

src/app/appconst.ts

@@ -18,8 +18,7 @@ export const ConfirmKey_HideShellPrompt = "hideshellprompt";
 
 export const NoStrPos = -1;
 
-export const RemotePtyRows = 8;
-export const RemotePtyTotalRows = 25;
+export const RemotePtyRows = 8; // also in main.tsx
 export const RemotePtyCols = 80;
 export const ProdServerEndpoint = "http://127.0.0.1:1619";
 export const ProdServerWsEndpoint = "ws://127.0.0.1:1623";

src/app/common/modals/viewremoteconndetail.tsx

@@ -370,11 +370,7 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
                                 ref={this.termRef}
                                 data-remoteid={remote.remoteid}
                                 style={{
-                                    height: textmeasure.termHeightFromRows(
-                                        appconst.RemotePtyRows,
-                                        termFontSize,
-                                        appconst.RemotePtyTotalRows
-                                    ),
+                                    height: textmeasure.termHeightFromRows(appconst.RemotePtyRows, termFontSize),
                                     width: termWidth,
                                 }}
                             ></div>

src/app/line/linecomps.tsx

@@ -388,7 +388,7 @@ class LineCmd extends React.Component<
         let height = 45 + 24; // height of zero height terminal
         const usedRows = screen.getUsedRows(lineutil.getRendererContext(line), line, cmd, width);
         if (usedRows > 0) {
-            height = 48 + 24 + termHeightFromRows(usedRows, GlobalModel.termFontSize.get(), cmd.getTermMaxRows());
+            height = 48 + 24 + termHeightFromRows(usedRows, GlobalModel.termFontSize.get());
         }
         return height;
     }
@@ -753,6 +753,32 @@ class LineCmd extends React.Component<
                             />
                         </If>
                     </ErrorBoundary>
+                    <If condition={cmd.getRtnState()}>
+                        <div
+                            key="rtnstate"
+                            className="cmd-rtnstate"
+                            style={{
+                                visibility: cmd.getStatus() == "done" ? "visible" : "hidden",
+                            }}
+                        >
+                            <If condition={rsdiff == null || rsdiff == ""}>
+                                <div className="cmd-rtnstate-label">state unchanged</div>
+                                <div className="cmd-rtnstate-sep"></div>
+                            </If>
+                            <If condition={rsdiff != null && rsdiff != ""}>
+                                <div className="cmd-rtnstate-label">new state</div>
+                                <div className="cmd-rtnstate-sep"></div>
+                                <div className="cmd-rtnstate-diff" style={{ fontSize: rtnStateDiffSize }}>
+                                    <div className="cmd-rtnstate-diff-inner">{this.rtnStateDiff.get()}</div>
+                                </div>
+                            </If>
+                        </div>
+                    </If>
+                    <If condition={isSelected && !isFocused && rendererType == "terminal"}>
+                        <div className="cmd-hints">
+                            <div className="hint-item color-nohover-white">focus line ({renderCmdText("L")})</div>
+                        </div>
+                    </If>
                 </If>
             </div>
         );

src/app/line/lines.less

@@ -23,9 +23,18 @@
 
 .line.line-cmd {
     flex-direction: column;
-    scroll-margin-bottom: var(--termlineheight);
+    scroll-margin-bottom: 20px;
     position: relative;
 
+    .plus {
+        opacity: 0.5;
+    }
+    &:hover {
+        .plus {
+            opacity: 1;
+        }
+    }
+
     .sidebar-message {
         color: @term-yellow;
     }
@@ -36,14 +45,13 @@
         padding-bottom: 0.7rem;
         width: 100%;
         line-height: 1.2;
-        height: calc(var(--termlineheight) * 2);
 
         &.is-expanded {
             height: auto;
         }
 
         &.hide-prompt {
-            height: calc(var(--termlineheight) * 2);
+            height: 32px;
         }
 
         .line-icon {
@@ -73,15 +81,12 @@
             display: block;
             opacity: 1;
         }
+    }
 
-        .meta.meta-line1 {
-            color: rgba(@base-color, 0.6) !important;
-            font-size: var(--termfontsize);
-        }
-
-        .meta.meta-line2 {
-            margin-left: -2px;
-        }
+    .meta.meta-line1 {
+        margin-left: 2px;
+        color: rgba(@base-color, 0.6) !important;
+        font-size: 11px;
     }
 
     &.has-rtnstate .terminal-wrapper {
@@ -108,6 +113,11 @@
             overflow-x: hidden;
         }
 
+        .terminal {
+            margin-right: 8px;
+            padding: 0.25rem;
+        }
+
         &.cmd-done .terminal .xterm-cursor {
             display: none;
         }
@@ -198,6 +208,7 @@
 
         .simple-line-header {
             display: flex;
+            margin-top: 5px;
             flex-direction: row;
         }
 
@@ -339,9 +350,14 @@
         display: flex;
         flex-direction: row;
 
+        .simple-line-status {
+            margin-top: 5px;
+        }
+
         .user {
             color: lighten(@soft-blue, 10%);
             font-weight: bold;
+            margin-top: 1px;
             margin-right: 10px;
         }
 
@@ -349,10 +365,12 @@
         .termopts,
         .renderer {
             display: flex;
+            margin-top: 5px;
         }
 
         .renderer {
             margin-left: 3px;
+            margin-top: 5px;
             svg {
                 width: 1em;
                 margin-right: 0.5em;
@@ -363,6 +381,7 @@
         .settings {
             display: none;
             margin-left: 0.5em;
+            margin-top: 0.65em;
             cursor: pointer;
             width: 1em;
             height: 1em;
@@ -377,6 +396,7 @@
         }
 
         .termopts {
+            margin-top: 5px;
             display: none;
             .resize-button {
                 cursor: pointer;
@@ -387,6 +407,7 @@
 
         .metapart-mono {
             margin-left: 8px;
+            margin-top: 4px;
             white-space: nowrap;
         }
 
@@ -445,7 +466,6 @@
     padding: 0 0 10px 0;
     flex-grow: 1;
     position: relative;
-    overflow-x: hidden;
 
     &::-webkit-scrollbar-thumb {
         background-color: transparent !important;
@@ -462,6 +482,10 @@
         }
     }
 
+    .line:nth-child(2) {
+        padding-top: 1px;
+    }
+
     .lines-spacer {
         flex-grow: 1;
     }
@@ -469,8 +493,7 @@
     .line-sep {
         display: flex;
         align-items: center;
-        height: var(--termlineheight);
-        font-size: var(--termfontsize);
+        margin-top: 1em;
         color: rgba(@base-color, 0.5);
     }
 

src/app/magiclayout.ts

@@ -18,6 +18,8 @@ let MagicLayout = {
     ScreenMinContentSize: 100,
     ScreenMaxContentSize: 5000,
 
+    // the 3 is for descenders, which get cut off in the terminal without this
+    TermDescendersHeight: 3,
     TermWidthBuffer: 15,
 
     TabWidth: 154,

src/app/sidebar/sidebar.less

@@ -119,6 +119,7 @@
     }
 
     .middle {
+        max-height: calc(100vh - 32em);
         padding: 4px 6px 8px 6px;
         border-bottom: 1px solid @base-border;
         .item {
@@ -141,10 +142,9 @@
 
     .bottom {
         position: absolute;
-        bottom: 2rem;
+        bottom: 2em;
         left: 0;
         width: 100%;
-        padding-top: 0.8rem;
     }
 
     .item {

src/app/sidebar/sidebar.tsx

@@ -64,7 +64,7 @@ interface MainSideBarProps {
 
 @mobxReact.observer
 class MainSideBar extends React.Component<MainSideBarProps, {}> {
-    middleHeightSubtractor = mobx.observable.box(404);
+    sidebarRef = React.createRef<HTMLDivElement>();
 
     handleSessionClick(sessionId: string) {
         GlobalCommandRunner.switchSession(sessionId);
@@ -203,37 +203,14 @@ class MainSideBar extends React.Component<MainSideBarProps, {}> {
         });
     }
 
-    /**
-     * Calculate the subtractor portion for the middle div's height calculation, which should be `100vh - subtractor`.
-     */
-    setMiddleHeightSubtractor() {
-        const windowHeight = window.innerHeight;
-        const bottomHeight = windowHeight - window.document.getElementById("sidebar-bottom")?.offsetTop;
-        const middleTop = document.getElementById("sidebar-middle")?.offsetTop;
-        const newMiddleHeightSubtractor = bottomHeight + middleTop;
-        if (!Number.isNaN(newMiddleHeightSubtractor)) {
-            mobx.action(() => {
-                this.middleHeightSubtractor.set(newMiddleHeightSubtractor);
-            })();
-        }
-    }
-
-    componentDidMount() {
-        this.setMiddleHeightSubtractor();
-    }
-
-    componentDidUpdate() {
-        this.setMiddleHeightSubtractor();
-    }
-
     render() {
-        const clientData = this.props.clientData;
+        let clientData = this.props.clientData;
         let needsUpdate = false;
         if (!clientData?.clientopts.noreleasecheck && !isBlank(clientData?.releaseinfo?.latestversion)) {
             needsUpdate = compareLoose(appconst.VERSION, clientData.releaseinfo.latestversion) < 0;
         }
-        const mainSidebar = GlobalModel.mainSidebarModel;
-        const isCollapsed = mainSidebar.getCollapsed();
+        let mainSidebar = GlobalModel.mainSidebarModel;
+        let isCollapsed = mainSidebar.getCollapsed();
         return (
             <ResizableSidebar
                 className="main-sidebar"
@@ -294,16 +271,8 @@ class MainSideBar extends React.Component<MainSideBarProps, {}> {
                                     </CenteredIcon>,
                                 ]}
                             />
-                            <div
-                                className="middle hideScrollbarUntillHover"
-                                id="sidebar-middle"
-                                style={{
-                                    maxHeight: `calc(100vh - ${this.middleHeightSubtractor.get()}px)`,
-                                }}
-                            >
-                                {this.getSessions()}
-                            </div>
-                            <div className="bottom" id="sidebar-bottom">
+                            <div className="middle hideScrollbarUntillHover">{this.getSessions()}</div>
+                            <div className="bottom">
                                 <If condition={needsUpdate}>
                                     <SideBarItem
                                         key="update-available"

src/app/workspace/cmdinput/aichat.tsx

@@ -5,7 +5,7 @@ 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 { isBlank } from "@/util";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
 import { For } from "tsx-control-statements/components";
@@ -92,7 +92,7 @@ class AIChat extends React.Component<{}, {}> {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
                 e.stopPropagation();
-                inputModel.closeAIAssistantChat(true);
+                inputModel.closeAIAssistantChat();
             }
 
             if (checkKeyPressed(waveEvent, "Ctrl:l")) {

src/app/workspace/cmdinput/textareainput.tsx

@@ -232,7 +232,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
                 if (inputModel.inputMode.get() != null) {
                     inputModel.resetInputMode();
                 }
-                inputModel.closeAIAssistantChat(true);
+                inputModel.closeAIAssistantChat();
                 return;
             }
             if (checkKeyPressed(waveEvent, "Cmd:e")) {

src/app/workspace/screen/screenview.tsx

@@ -109,7 +109,6 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
             return <div className="screen-view" ref={this.screenViewRef}></div>;
         }
         let fontSize = GlobalModel.termFontSize.get();
-        let dprStr = sprintf("%0.3f", GlobalModel.devicePixelRatio.get());
         let viewOpts = screen.viewOpts.get();
         let hasSidebar = viewOpts?.sidebar?.open;
         let winWidth = "100%";
@@ -146,7 +145,7 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
         return (
             <div className="screen-view" data-screenid={screen.screenId} ref={this.screenViewRef}>
                 <ScreenWindowView
-                    key={screen.screenId + ":" + fontSize + ":" + dprStr}
+                    key={screen.screenId + ":" + fontSize}
                     session={session}
                     screen={screen}
                     width={winWidth}

src/electron/emain.ts

@@ -177,7 +177,6 @@ function readAuthKey() {
     return authKeyStr.trim();
 }
 const reloadAcceleratorKey = unamePlatform == "darwin" ? "Option+R" : "Super+R";
-let cmdOrAlt = process.platform === "darwin" ? "Cmd" : "Alt";
 let menuTemplate: Electron.MenuItemConstructorOptions[] = [
     {
         role: "appMenu",
@@ -206,41 +205,9 @@ let menuTemplate: Electron.MenuItemConstructorOptions[] = [
             { role: "reload", accelerator: reloadAcceleratorKey },
             { role: "toggleDevTools" },
             { type: "separator" },
-            {
-                label: "Actual Size",
-                accelerator: cmdOrAlt + "+0",
-                click: () => {
-                    if (MainWindow == null) {
-                        return;
-                    }
-                    MainWindow.webContents.setZoomFactor(1);
-                    MainWindow.webContents.send("zoom-changed");
-                },
-            },
-            {
-                label: "Zoom In",
-                accelerator: cmdOrAlt + "+Plus",
-                click: () => {
-                    if (MainWindow == null) {
-                        return;
-                    }
-                    const zoomFactor = MainWindow.webContents.getZoomFactor();
-                    MainWindow.webContents.setZoomFactor(zoomFactor * 1.1);
-                    MainWindow.webContents.send("zoom-changed");
-                },
-            },
-            {
-                label: "Zoom Out",
-                accelerator: cmdOrAlt + "+-",
-                click: () => {
-                    if (MainWindow == null) {
-                        return;
-                    }
-                    const zoomFactor = MainWindow.webContents.getZoomFactor();
-                    MainWindow.webContents.setZoomFactor(zoomFactor / 1.1);
-                    MainWindow.webContents.send("zoom-changed");
-                },
-            },
+            { role: "resetZoom" },
+            { role: "zoomIn" },
+            { role: "zoomOut" },
             { type: "separator" },
             { role: "togglefullscreen" },
         ],
@@ -408,9 +375,6 @@ function createMainWindow(clientData: ClientDataType | null) {
     win.on("close", () => {
         MainWindow = null;
     });
-    win.webContents.on("zoom-changed", (e) => {
-        win.webContents.send("zoom-changed");
-    });
     win.webContents.setWindowOpenHandler(({ url, frameName }) => {
         if (url.startsWith("https://docs.waveterm.dev/")) {
             console.log("openExternal docs", url);

src/electron/preload.js

@@ -21,7 +21,6 @@ contextBridge.exposeInMainWorld("api", {
     onWCmd: (callback) => ipcRenderer.on("w-cmd", callback),
     onPCmd: (callback) => ipcRenderer.on("p-cmd", callback),
     onRCmd: (callback) => ipcRenderer.on("r-cmd", callback),
-    onZoomChanged: (callback) => ipcRenderer.on("zoom-changed", callback),
     onMetaArrowUp: (callback) => ipcRenderer.on("meta-arrowup", callback),
     onMetaArrowDown: (callback) => ipcRenderer.on("meta-arrowdown", callback),
     onMetaPageUp: (callback) => ipcRenderer.on("meta-pageup", callback),

src/index.ts

@@ -8,7 +8,6 @@ import { sprintf } from "sprintf-js";
 import { App } from "@/app/app";
 import * as DOMPurify from "dompurify";
 import { loadFonts } from "./util/util";
-import * as textmeasure from "./util/textmeasure";
 
 // @ts-ignore
 let VERSION = __WAVETERM_VERSION__;
@@ -21,14 +20,18 @@ document.addEventListener("DOMContentLoaded", () => {
     let reactElem = React.createElement(App, null, null);
     let elem = document.getElementById("app");
     let root = createRoot(elem);
-    document.fonts.ready.then(() => {
+    let isFontLoaded = document.fonts.check("12px 'JetBrains Mono'");
+    if (isFontLoaded) {
         root.render(reactElem);
-    });
+    } else {
+        document.fonts.ready.then(() => {
+            root.render(reactElem);
+        });
+    }
 });
 
 (window as any).mobx = mobx;
 (window as any).sprintf = sprintf;
 (window as any).DOMPurify = DOMPurify;
-(window as any).textmeasure = textmeasure;
 
 console.log("WaveTerm", VERSION, BUILD);

src/models/cmd.ts

@@ -88,11 +88,6 @@ class Cmd {
         return this.data.get().termopts;
     }
 
-    getTermMaxRows(): number {
-        let termOpts = this.getTermOpts();
-        return termOpts?.rows;
-    }
-
     getCmdStr(): string {
         return this.data.get().cmdstr;
     }

src/models/historyview.ts

@@ -115,7 +115,7 @@ class HistoryViewModel {
             } else {
                 this.activeItem.set(hitem.historyid);
                 let width = termWidthFromCols(80, this.globalModel.termFontSize.get());
-                let height = termHeightFromRows(25, this.globalModel.termFontSize.get(), 25);
+                let height = termHeightFromRows(25, this.globalModel.termFontSize.get());
                 this.specialLineContainer = new SpecialLineContainer(
                     this,
                     { width, height },
@@ -149,7 +149,7 @@ class HistoryViewModel {
     }
 
     _deleteSelected(): void {
-        let lineIds: string[] = Array.from(this.selectedItems.keys());
+        let lineIds = Array.from(this.selectedItems.keys());
         let prtn = GlobalCommandRunner.historyPurgeLines(lineIds);
         prtn.then((result: CommandRtnType) => {
             if (!result.success) {

src/models/input.ts

@@ -618,17 +618,10 @@ class InputModel {
         })();
     }
 
-    // pass true to give focus to the input (e.g. if this is an 'active' close of the chat)
-    // when resetting the input (when switching screens, don't give focus)
-    closeAIAssistantChat(giveFocus: boolean): void {
-        if (!this.aIChatShow.get()) {
-            return;
-        }
+    closeAIAssistantChat(): void {
         mobx.action(() => {
             this.aIChatShow.set(false);
-            if (giveFocus) {
-                this.giveFocus();
-            }
+            this.giveFocus();
         })();
     }
 
@@ -730,7 +723,7 @@ class InputModel {
     resetInput(): void {
         mobx.action(() => {
             this.setHistoryShow(false);
-            this.closeAIAssistantChat(false);
+            this.closeAIAssistantChat();
             this.infoShow.set(false);
             this.inputMode.set(null);
             this.resetHistory();

src/models/model.ts

@@ -32,8 +32,13 @@ import { MainSidebarModel } from "./mainsidebar";
 import { Screen } from "./screen";
 import { Cmd } from "./cmd";
 import { GlobalCommandRunner } from "./global";
-import { clearMonoFontCache } from "@/util/textmeasure";
-import type { TermWrap } from "@/plugins/terminal/term";
+
+type KeyModsType = {
+    meta?: boolean;
+    ctrl?: boolean;
+    alt?: boolean;
+    shift?: boolean;
+};
 
 type SWLinePtr = {
     line: LineType;
@@ -41,6 +46,36 @@ type SWLinePtr = {
     screen: Screen;
 };
 
+type ElectronApi = {
+    getId: () => string;
+    getIsDev: () => boolean;
+    getPlatform: () => string;
+    getAuthKey: () => string;
+    getWaveSrvStatus: () => boolean;
+    restartWaveSrv: () => boolean;
+    reloadWindow: () => void;
+    openExternalLink: (url: string) => void;
+    reregisterGlobalShortcut: (shortcut: string) => void;
+    onTCmd: (callback: (mods: KeyModsType) => void) => void;
+    onICmd: (callback: (mods: KeyModsType) => void) => void;
+    onLCmd: (callback: (mods: KeyModsType) => void) => void;
+    onHCmd: (callback: (mods: KeyModsType) => void) => void;
+    onPCmd: (callback: (mods: KeyModsType) => void) => void;
+    onRCmd: (callback: (mods: KeyModsType) => void) => void;
+    onWCmd: (callback: (mods: KeyModsType) => void) => void;
+    onMenuItemAbout: (callback: () => void) => void;
+    onMetaArrowUp: (callback: () => void) => void;
+    onMetaArrowDown: (callback: () => void) => void;
+    onMetaPageUp: (callback: () => void) => void;
+    onMetaPageDown: (callback: () => void) => void;
+    onBracketCmd: (callback: (event: any, arg: { relative: number }, mods: KeyModsType) => void) => void;
+    onDigitCmd: (callback: (event: any, arg: { digit: number }, mods: KeyModsType) => void) => void;
+    contextScreen: (screenOpts: { screenId: string }, position: { x: number; y: number }) => void;
+    contextEditMenu: (position: { x: number; y: number }, opts: ContextMenuOpts) => void;
+    onWaveSrvStatusChange: (callback: (status: boolean, pid: number) => void) => void;
+    getLastLogs: (numOfLines: number, callback: (logs: any) => void) => void;
+};
+
 function getApi(): ElectronApi {
     return (window as any).api;
 }
@@ -98,10 +133,7 @@ class Model {
     });
     lineSettingsModal: OV<number> = mobx.observable.box(null, {
         name: "lineSettingsModal",
-    });
-    devicePixelRatio: OV<number> = mobx.observable.box(window.devicePixelRatio, {
-        name: "devicePixelRatio",
-    });
+    }); // linenum
     remotesModel: RemotesModel;
 
     inputModel: InputModel;
@@ -157,10 +189,6 @@ class Model {
             }
             return fontSize;
         });
-        mobx.autorun(() => {
-            const fontSize = this.termFontSize.get();
-            this._setCssTermFontSize(fontSize);
-        });
         getApi().onTCmd(this.onTCmd.bind(this));
         getApi().onICmd(this.onICmd.bind(this));
         getApi().onLCmd(this.onLCmd.bind(this));
@@ -168,7 +196,6 @@ class Model {
         getApi().onPCmd(this.onPCmd.bind(this));
         getApi().onWCmd(this.onWCmd.bind(this));
         getApi().onRCmd(this.onRCmd.bind(this));
-        getApi().onZoomChanged(this.onZoomChanged.bind(this));
         getApi().onMenuItemAbout(this.onMenuItemAbout.bind(this));
         getApi().onMetaArrowUp(this.onMetaArrowUp.bind(this));
         getApi().onMetaArrowDown(this.onMetaArrowDown.bind(this));
@@ -318,10 +345,16 @@ class Model {
         return appconst.ProdServerEndpoint;
     }
 
-    _setCssTermFontSize(fontSize: number) {
-        const root = document.documentElement;
-        root.style.setProperty("--termfontsize", fontSize + "px");
-        root.style.setProperty("--termlinehight", Math.ceil(fontSize * 1.2) + "px");
+    setTermFontSize(fontSize: number) {
+        if (fontSize < appconst.MinFontSize) {
+            fontSize = appconst.MinFontSize;
+        }
+        if (fontSize > appconst.MaxFontSize) {
+            fontSize = appconst.MaxFontSize;
+        }
+        mobx.action(() => {
+            this.termFontSize.set(fontSize);
+        })();
     }
 
     getBaseWsHostPort(): string {
@@ -481,30 +514,6 @@ class Model {
         }
     }
 
-    onZoomChanged(): void {
-        mobx.action(() => {
-            this.devicePixelRatio.set(window.devicePixelRatio);
-            clearMonoFontCache();
-        })();
-    }
-
-    // for debuggin
-    getSelectedTermWrap(): TermWrap {
-        let screen = this.getActiveScreen();
-        if (screen == null) {
-            return null;
-        }
-        let lineNum = screen.selectedLine.get();
-        if (lineNum == null) {
-            return null;
-        }
-        let line = screen.getLineByNum(lineNum);
-        if (line == null) {
-            return null;
-        }
-        return screen.getTermWrap(line.lineid);
-    }
-
     clearModals(): boolean {
         let didSomething = false;
         mobx.action(() => {