fix: split the apple locale on the region for LANG

We use AppleLocale to get the desired language when running on macos.
Unfortunately, if a region is set, the locale is not equivalent to the
LANG environment variable. It appends an extra region field that we did
not previously filter out. This change ensures that it will be filtered
out when present.

assets/default-keybindings.json

@@ -3,10 +3,6 @@
       "command": "system:toggleDeveloperTools",
       "keys": ["Cmd:Option:i"]
     },
-    {
-      "command": "system:hideWindow",
-      "keys": ["Cmd:m"]
-    },
     {
       "command": "generic:cancel",
       "keys": ["Escape"]
@@ -36,7 +32,7 @@
       "keys": ["PageDown"]
     },
     {
-      "command": "app:openHistoryView",
+      "command": "app:openHistory",
       "keys": ["Cmd:h"]
     },
     {
@@ -45,13 +41,11 @@
     },
     {
       "command": "app:openConnectionsView", 
-      "keys": [],
-      "commandStr": "/mainview connections"
+      "keys": []
     },
     {
       "command": "app:openSettingsView", 
-      "keys": [],
-      "commandStr": "/mainview clientsettings"
+      "keys": []
     },
     {
       "command": "app:newTab",
@@ -131,48 +125,39 @@
     },
     {
       "command": "app:selectWorkspace-1",
-      "keys": ["Cmd:Ctrl:1"],
-      "commandStr": "/session 1"
+      "keys": ["Cmd:Ctrl:1"]
     },
     {
       "command": "app:selectWorkspace-2",
-      "keys": ["Cmd:Ctrl:2"],
-      "commandStr": "/session 2"
+      "keys": ["Cmd:Ctrl:2"]
     },
     {
       "command": "app:selectWorkspace-3",
-      "keys": ["Cmd:Ctrl:3"],
-      "commandStr": "/session 3"
+      "keys": ["Cmd:Ctrl:3"]
     },
     {
       "command": "app:selectWorkspace-4",
-      "keys": ["Cmd:Ctrl:4"],
-      "commandStr": "/session 4"
+      "keys": ["Cmd:Ctrl:4"]
     },
     {
       "command": "app:selectWorkspace-5",
-      "keys": ["Cmd:Ctrl:5"],
-      "commandStr": "/session 5"
+      "keys": ["Cmd:Ctrl:5"]
     },
     {
       "command": "app:selectWorkspace-6",
-      "keys": ["Cmd:Ctrl:6"],
-      "commandStr": "/session 6"
+      "keys": ["Cmd:Ctrl:6"]
     },
     {
       "command": "app:selectWorkspace-7",
-      "keys": ["Cmd:Ctrl:7"],
-      "commandStr": "/session 7"
+      "keys": ["Cmd:Ctrl:7"]
     },
     {
       "command": "app:selectWorkspace-8",
-      "keys": ["Cmd:Ctrl:8"],
-      "commandStr": "/session 8"
+      "keys": ["Cmd:Ctrl:8"]
     },
     {
       "command": "app:selectWorkspace-9",
-      "keys": ["Cmd:Ctrl:9"],
-      "commandStr": "/session 9"
+      "keys": ["Cmd:Ctrl:9"]
     },
     {
       "command": "app:toggleSidebar",
@@ -183,9 +168,8 @@
       "keys": ["Cmd:d"]
     },
     {
-      "command": "app:openBookmarksView",
-      "keys": ["Cmd:b"],
-      "commandStr": "/bookmarks:show"
+      "command": "app:bookmarkActiveLine",
+      "keys": ["Cmd:b"]
     },
     {
       "command": "bookmarks:edit",
@@ -229,8 +213,7 @@
     },
     {
       "command": "cmdinput:openHistory",
-      "keys": ["Ctrl:r"],
-      "commandStr": "/history"
+      "keys": ["Ctrl:r"]
     },
     {
       "command": "cmdinput:openAIChat",

src/app/bookmarks/bookmarks.tsx

@@ -193,7 +193,7 @@ class BookmarksView extends React.Component<{}, {}> {
         let bookmarks = GlobalModel.bookmarksModel.bookmarks;
         let bookmark: BookmarkType = null;
         return (
-            <MainView className="bookmarks-view" title="Bookmarks" onClose={this.handleClose}>
+            <MainView viewName="bookmarks" title="Bookmarks" onClose={this.handleClose}>
                 <div className="bookmarks-list">
                     <For index="idx" each="bookmark" of={bookmarks}>
                         <Bookmark key={bookmark.bookmarkid} bookmark={bookmark} />

src/app/common/modals/alert.tsx

@@ -44,7 +44,7 @@ class AlertModal extends React.Component<{}, {}> {
                         <Markdown text={message?.message ?? ""} extraClassName="bottom-margin" />
                     </If>
                     <If condition={!message?.markdown}>{message?.message}</If>
-                    <If condition={message?.confirmflag}>
+                    <If condition={message.confirmflag}>
                         <Checkbox
                             onChange={this.handleDontShowAgain}
                             label={"Don't show me this again"}

src/app/line/renderer/basicrenderer.tsx

@@ -0,0 +1,276 @@
+// Copyright 2023, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import * as React from "react";
+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";
+
+class SimpleBlobRendererModel {
+    context: RendererContext;
+    opts: RendererOpts;
+    isDone: OV<boolean>;
+    api: RendererModelContainerApi;
+    savedHeight: number;
+    loading: OV<boolean>;
+    loadError: OV<string> = mobx.observable.box(null, {
+        name: "renderer-loadError",
+    });
+    lineState: LineStateType;
+    ptyData: PtyDataType;
+    ptyDataSource: (termContext: TermContextUnion) => Promise<PtyDataType>;
+    dataBlob: Blob;
+    readOnly: boolean;
+    notFound: boolean;
+
+    initialize(params: RendererModelInitializeParams): void {
+        this.loading = mobx.observable.box(true, { name: "renderer-loading" });
+        this.isDone = mobx.observable.box(params.isDone, {
+            name: "renderer-isDone",
+        });
+        this.context = params.context;
+        this.opts = params.opts;
+        this.api = params.api;
+        this.lineState = params.lineState;
+        this.savedHeight = params.savedHeight;
+        this.ptyDataSource = params.ptyDataSource;
+        if (this.isDone.get()) {
+            setTimeout(() => this.reload(0), 10);
+        }
+    }
+
+    dispose(): void {
+        return;
+    }
+
+    giveFocus(): void {
+        return;
+    }
+
+    updateOpts(update: RendererOptsUpdate): void {
+        Object.assign(this.opts, update);
+    }
+
+    updateHeight(newHeight: number): void {
+        if (this.savedHeight != newHeight) {
+            this.savedHeight = newHeight;
+            this.api.saveHeight(newHeight);
+        }
+    }
+
+    setIsDone(): void {
+        if (this.isDone.get()) {
+            return;
+        }
+        mobx.action(() => {
+            this.isDone.set(true);
+        })();
+        this.reload(0);
+    }
+
+    reload(delayMs: number): void {
+        mobx.action(() => {
+            this.loading.set(true);
+        })();
+        if (delayMs == 0) {
+            this.reload_noDelay();
+        } else {
+            setTimeout(() => {
+                this.reload_noDelay();
+            }, delayMs);
+        }
+    }
+
+    reload_noDelay(): void {
+        let source = this.lineState["prompt:source"] || "pty";
+        if (source == "pty") {
+            this.reloadPtyData();
+        } else if (source == "file") {
+            this.reloadFileData();
+        } else {
+            mobx.action(() => {
+                this.loadError.set("error: invalid load source: " + source);
+            })();
+        }
+    }
+
+    reloadFileData(): void {
+        // todo add file methods to API, so we don't have a GlobalModel dependency here!
+        let path = this.lineState["prompt:file"];
+        if (util.isBlank(path)) {
+            mobx.action(() => {
+                this.loadError.set("renderer has file source, but no prompt:file specified");
+            })();
+            return;
+        }
+        let rtnp = GlobalModel.readRemoteFile(this.context.screenId, this.context.lineId, path);
+        rtnp.then((file) => {
+            this.notFound = (file as any).notFound;
+            this.readOnly = (file as any).readOnly;
+            this.dataBlob = file;
+            mobx.action(() => {
+                this.loading.set(false);
+                this.loadError.set(null);
+            })();
+        }).catch((e) => {
+            mobx.action(() => {
+                this.loadError.set("error loading file data: " + e);
+            })();
+        });
+    }
+
+    reloadPtyData(): void {
+        this.readOnly = true;
+        let rtnp = this.ptyDataSource(this.context);
+        if (rtnp == null) {
+            console.log("no promise returned from ptyDataSource (simplerenderer)", this.context);
+            return;
+        }
+        rtnp.then((ptydata) => {
+            this.ptyData = ptydata;
+            this.dataBlob = new Blob([this.ptyData.data]);
+            mobx.action(() => {
+                this.loading.set(false);
+                this.loadError.set(null);
+            })();
+        }).catch((e) => {
+            mobx.action(() => {
+                this.loadError.set("error loading data: " + e);
+            })();
+        });
+    }
+
+    receiveData(pos: number, data: Uint8Array, reason?: string): void {
+        // this.dataBuf.receiveData(pos, data, reason);
+    }
+}
+
+@mobxReact.observer
+class SimpleBlobRenderer extends React.Component<
+    {
+        rendererContainer: RendererContainerType;
+        lineId: string;
+        plugin: RendererPluginType;
+        onHeightChange: () => void;
+        initParams: RendererModelInitializeParams;
+        scrollToBringIntoViewport: () => void;
+        isSelected: boolean;
+        shouldFocus: boolean;
+    },
+    {}
+> {
+    model: SimpleBlobRendererModel;
+    wrapperDivRef: React.RefObject<any> = React.createRef();
+    rszObs: ResizeObserver;
+    updateHeight_debounced: (newHeight: number) => void;
+
+    constructor(props: any) {
+        super(props);
+        let { rendererContainer, lineId, plugin, initParams } = this.props;
+        this.model = new SimpleBlobRendererModel();
+        this.model.initialize(initParams);
+        rendererContainer.registerRenderer(lineId, this.model);
+        this.updateHeight_debounced = debounce(1000, this.updateHeight.bind(this));
+    }
+
+    updateHeight(newHeight: number): void {
+        this.model.updateHeight(newHeight);
+    }
+
+    handleResize(entries: ResizeObserverEntry[]): void {
+        if (this.model.loading.get()) {
+            return;
+        }
+        if (this.props.onHeightChange) {
+            this.props.onHeightChange();
+        }
+        if (!this.model.loading.get() && this.wrapperDivRef.current != null) {
+            let height = this.wrapperDivRef.current.offsetHeight;
+            this.updateHeight_debounced(height);
+        }
+    }
+
+    checkRszObs() {
+        if (this.rszObs != null) {
+            return;
+        }
+        if (this.wrapperDivRef.current == null) {
+            return;
+        }
+        this.rszObs = new ResizeObserver(this.handleResize.bind(this));
+        this.rszObs.observe(this.wrapperDivRef.current);
+    }
+
+    componentDidMount() {
+        this.checkRszObs();
+    }
+
+    componentWillUnmount() {
+        let { rendererContainer, lineId } = this.props;
+        rendererContainer.unloadRenderer(lineId);
+        if (this.rszObs != null) {
+            this.rszObs.disconnect();
+            this.rszObs = null;
+        }
+    }
+
+    componentDidUpdate() {
+        this.checkRszObs();
+    }
+
+    render() {
+        let { plugin } = this.props;
+        let model = this.model;
+        if (model.loadError.get() != null) {
+            let errorText = model.loadError.get();
+            let height = this.model.savedHeight;
+            return (
+                <div ref={this.wrapperDivRef} style={{ minHeight: height, fontSize: model.opts.termFontSize }}>
+                    <div className="load-error-text">ERROR: {errorText}</div>
+                </div>
+            );
+        }
+        if (model.loading.get()) {
+            let height = this.model.savedHeight;
+            return (
+                <div
+                    ref={this.wrapperDivRef}
+                    className="renderer-loading"
+                    style={{ minHeight: height, fontSize: model.opts.termFontSize }}
+                >
+                    loading content <i className="fa fa-ellipsis fa-fade" />
+                </div>
+            );
+        }
+        let Comp = plugin.simpleComponent;
+        if (Comp == null) {
+            <div ref={this.wrapperDivRef}>(no component found in plugin)</div>;
+        }
+        let { festate, cmdstr, exitcode } = this.props.initParams.rawCmd;
+        return (
+            <div ref={this.wrapperDivRef} className="sr-wrapper">
+                <Comp
+                    cwd={festate.cwd}
+                    cmdstr={cmdstr}
+                    exitcode={exitcode}
+                    data={model.dataBlob as ExtBlob}
+                    readOnly={model.readOnly}
+                    notFound={model.notFound}
+                    lineState={model.lineState}
+                    context={model.context}
+                    opts={model.opts}
+                    savedHeight={model.savedHeight}
+                    scrollToBringIntoViewport={this.props.scrollToBringIntoViewport}
+                    isSelected={this.props.isSelected}
+                    shouldFocus={this.props.shouldFocus}
+                    rendererApi={model.api}
+                />
+            </div>
+        );
+    }
+}
+
+export { SimpleBlobRendererModel, SimpleBlobRenderer };

src/electron/emain.ts

@@ -263,12 +263,7 @@ const menuTemplate: Electron.MenuItemConstructorOptions[] = [
             { type: "separator" },
             { role: "services" },
             { type: "separator" },
-            {
-                label: "Hide",
-                click: () => {
-                    app.hide();
-                },
-            },
+            { role: "hide" },
             { role: "hideOthers" },
             { type: "separator" },
             { role: "quit" },
@@ -308,21 +303,16 @@ function shFrameNavHandler(event: Electron.Event<Electron.WebContentsWillFrameNa
         // only use this handler to process iframe events (non-iframe events go to shNavHandler)
         return;
     }
+    event.preventDefault();
     const url = event.url;
     console.log(`frame-navigation url=${url} frame=${event.frame.name}`);
     if (event.frame.name == "webview") {
         // "webview" links always open in new window
         // this will *not* effect the initial load because srcdoc does not count as an electron navigation
         console.log("open external, frameNav", url);
-        event.preventDefault();
         electron.shell.openExternal(url);
         return;
     }
-    if (event.frame.name == "pdfview" && url.startsWith("blob:file:///")) {
-        // allowed
-        return;
-    }
-    event.preventDefault();
     console.log("frame navigation canceled");
 }
 
@@ -523,13 +513,6 @@ electron.ipcMain.on("toggle-developer-tools", (event) => {
     event.returnValue = true;
 });
 
-electron.ipcMain.on("hide-window", (event) => {
-    if (MainWindow != null) {
-        MainWindow.hide();
-    }
-    event.returnValue = true;
-});
-
 electron.ipcMain.on("get-id", (event) => {
     event.returnValue = instanceId + ":" + event.processId;
 });

src/electron/preload.js

@@ -1,7 +1,6 @@
 let { contextBridge, ipcRenderer } = require("electron");
 
 contextBridge.exposeInMainWorld("api", {
-    hideWindow: () => ipc.Renderer.send("hide-window"),
     toggleDeveloperTools: () => ipcRenderer.send("toggle-developer-tools"),
     getId: () => ipcRenderer.sendSync("get-id"),
     getPlatform: () => ipcRenderer.sendSync("get-platform"),

src/models/bookmarks.ts

@@ -206,7 +206,7 @@ class BookmarksModel {
     }
 
     handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             if (this.editingBookmark.get() != null) {

src/models/clientsettingsview.ts

@@ -3,7 +3,6 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ClientSettingsViewModel {
     globalModel: Model;
@@ -22,15 +21,6 @@ class ClientSettingsViewModel {
             this.globalModel.activeMainView.set("clientsettings");
         })();
     }
-
-    handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            this.closeView();
-            return;
-        }
-    }
 }
 
 export { ClientSettingsViewModel };

src/models/commandrunner.ts

@@ -304,10 +304,6 @@ class CommandRunner {
         GlobalModel.clientSettingsViewModel.showClientSettingsView();
     }
 
-    syncShellState() {
-        GlobalModel.submitCommand("sync", null, null, { nohist: "1" }, false);
-    }
-
     historyView(params: HistorySearchParams) {
         let kwargs = { nohist: "1" };
         kwargs["offset"] = String(params.offset);

src/models/connectionsview.ts

@@ -3,7 +3,6 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ConnectionsViewModel {
     globalModel: Model;
@@ -22,15 +21,6 @@ class ConnectionsViewModel {
             this.globalModel.activeMainView.set("connections");
         })();
     }
-
-    handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            this.closeView();
-            return;
-        }
-    }
 }
 
 export { ConnectionsViewModel };

src/models/historyview.ts

@@ -291,7 +291,7 @@ class HistoryViewModel {
     }
 
     handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             this.closeView();

src/models/modals.ts

@@ -18,11 +18,10 @@ class ModalsModel {
         }
     }
 
-    popModal(callback?: () => void) {
+    popModal() {
         mobx.action(() => {
             this.store.pop();
         })();
-        callback && callback();
     }
 }
 

src/models/model.ts

@@ -143,7 +143,7 @@ class Model {
             this.runUpdate(message, interactive);
         });
         this.ws.reconnect();
-        this.keybindManager = new KeybindManager(this);
+        this.keybindManager = new KeybindManager();
         this.readConfigKeybindings();
         this.initSystemKeybindings();
         this.initAppKeybindings();
@@ -222,31 +222,46 @@ class Model {
             getApi().toggleDeveloperTools();
             return true;
         });
-        this.keybindManager.registerKeybinding("system", "electron", "system:minimizeWindow", (waveEvent) => {
-            getApi().hideWindow();
-            return true;
-        });
     }
 
     initAppKeybindings() {
         for (let index = 1; index <= 9; index++) {
-            this.keybindManager.registerKeybinding("app", "model", "app:selectWorkspace-" + index, null);
+            this.keybindManager.registerKeybinding("app", "model", "app:selectWorkspace-" + index, (waveEvent) => {
+                this.onSwitchSessionCmd(index);
+                return true;
+            });
         }
+
         this.keybindManager.registerKeybinding("app", "model", "app:focusCmdInput", (waveEvent) => {
+            console.log("focus cmd input callback");
             this.onFocusCmdInputPressed();
             return true;
         });
-        this.keybindManager.registerKeybinding("app", "model", "app:openBookmarksView", null);
-        this.keybindManager.registerKeybinding("app", "model", "app:openHistoryView", (waveEvent) => {
+
+        this.keybindManager.registerKeybinding("app", "model", "app:bookmarkActiveLine", (waveEvent) => {
+            this.onBookmarkViewPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openHistory", (waveEvent) => {
             this.onOpenHistoryPressed();
             return true;
         });
+
         this.keybindManager.registerKeybinding("app", "model", "app:openTabSearchModal", (waveEvent) => {
             this.onOpenTabSearchModalPressed();
             return true;
         });
-        this.keybindManager.registerKeybinding("app", "model", "app:openConnectionsView", null);
-        this.keybindManager.registerKeybinding("app", "model", "app:openSettingsView", null);
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openConnectionsView", (waveEvent) => {
+            this.onOpenConnectionsViewPressed();
+            return true;
+        });
+
+        this.keybindManager.registerKeybinding("app", "model", "app:openSettingsView", (waveEvent) => {
+            this.onOpenSettingsViewPressed();
+            return true;
+        });
     }
 
     static getInstance(): Model {
@@ -357,6 +372,7 @@ class Model {
     cancelAlert(): void {
         mobx.action(() => {
             this.alertMessage.set(null);
+            this.modalsModel.popModal();
         })();
         if (this.alertPromiseResolver != null) {
             this.alertPromiseResolver(false);
@@ -477,7 +493,7 @@ class Model {
         if (this.alertMessage.get() != null) {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
-                this.modalsModel.popModal(() => this.cancelAlert());
+                this.cancelAlert();
                 return;
             }
             if (checkKeyPressed(waveEvent, "Enter")) {
@@ -487,10 +503,6 @@ class Model {
             }
             return;
         }
-        if (checkKeyPressed(waveEvent, "Escape") && this.modalsModel.store.length > 0) {
-            this.modalsModel.popModal();
-            return;
-        }
         if (this.activeMainView.get() == "bookmarks") {
             this.bookmarksModel.handleDocKeyDown(e);
         }
@@ -498,10 +510,10 @@ class Model {
             this.historyViewModel.handleDocKeyDown(e);
         }
         if (this.activeMainView.get() == "connections") {
-            this.connectionViewModel.handleDocKeyDown(e);
+            this.historyViewModel.handleDocKeyDown(e);
         }
         if (this.activeMainView.get() == "clientsettings") {
-            this.clientSettingsViewModel.handleDocKeyDown(e);
+            this.historyViewModel.handleDocKeyDown(e);
         } else {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
@@ -509,6 +521,9 @@ class Model {
                     this.showSessionView();
                     return;
                 }
+                if (this.clearModals()) {
+                    return;
+                }
                 const inputModel = this.inputModel;
                 inputModel.toggleInfoMsg();
                 if (inputModel.inputMode.get() != null) {
@@ -628,6 +643,33 @@ class Model {
         return screen.getTermWrap(line.lineid);
     }
 
+    clearModals(): boolean {
+        let didSomething = false;
+        mobx.action(() => {
+            if (this.screenSettingsModal.get()) {
+                this.screenSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.sessionSettingsModal.get()) {
+                this.sessionSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.screenSettingsModal.get()) {
+                this.screenSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.clientSettingsModal.get()) {
+                this.clientSettingsModal.set(false);
+                didSomething = true;
+            }
+            if (this.lineSettingsModal.get()) {
+                this.lineSettingsModal.set(null);
+                didSomething = true;
+            }
+        })();
+        return didSomething;
+    }
+
     restartWaveSrv(): void {
         getApi().restartWaveSrv();
     }
@@ -981,12 +1023,6 @@ class Model {
                                 console.warn("invalid bookmarksview in update:", update.mainview);
                             }
                             break;
-                        case "clientsettings":
-                            this.activeMainView.set("clientsettings");
-                            break;
-                        case "connections":
-                            this.activeMainView.set("connections");
-                            break;
                         case "plugins":
                             this.pluginsModel.showPluginsView();
                             break;
@@ -1050,9 +1086,6 @@ class Model {
                 this.activeMainView.set("session");
                 this.deactivateScreenLines();
                 this.ws.watchScreen(newActiveSessionId, newActiveScreenId);
-                setTimeout(() => {
-                    GlobalCommandRunner.syncShellState();
-                }, 100);
             }
         } else {
             console.warn("unknown update", genUpdate);
@@ -1550,15 +1583,12 @@ class Model {
         return remote.remotecanonicalname;
     }
 
-    readRemoteFile(screenId: string, lineId: string, path: string, mimetype?: string): Promise<ExtFile> {
-        const urlParams: Record<string, string> = {
+    readRemoteFile(screenId: string, lineId: string, path: string): Promise<ExtFile> {
+        const urlParams = {
             screenid: screenId,
             lineid: lineId,
             path: path,
         };
-        if (mimetype != null) {
-            urlParams["mimetype"] = mimetype;
-        }
         const usp = new URLSearchParams(urlParams);
         const url = new URL(this.getBaseHostPort() + "/api/read-file?" + usp.toString());
         const fetchHeaders = this.getFetchHeaders();

src/plugins/media/media.less

@@ -1,7 +0,0 @@
-.media-renderer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    padding-top: var(--termpad);
-}

src/plugins/media/media.tsx

@@ -1,49 +0,0 @@
-// Copyright 2024, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from "react";
-import * as mobx from "mobx";
-import * as mobxReact from "mobx-react";
-import { GlobalModel } from "@/models";
-
-import "./media.less";
-
-@mobxReact.observer
-class SimpleMediaRenderer extends React.Component<
-    { data: ExtBlob; context: RendererContext; opts: RendererOpts; savedHeight: number; lineState: LineStateType },
-    {}
-> {
-    objUrl: string = null;
-
-    componentWillUnmount() {
-        if (this.objUrl != null) {
-            URL.revokeObjectURL(this.objUrl);
-        }
-    }
-
-    render() {
-        let dataBlob = this.props.data;
-        if (dataBlob == null || dataBlob.notFound) {
-            return (
-                <div className="media-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
-                    <div className="load-error-text">
-                        ERROR: file {dataBlob && dataBlob.name ? JSON.stringify(dataBlob.name) : ""} not found
-                    </div>
-                </div>
-            );
-        }
-        let videoUrl = GlobalModel.getBaseHostPort() + this.props.lineState["wave:fileurl"];
-        const opts = this.props.opts;
-        const maxHeight = opts.maxSize.height - 10;
-        const maxWidth = opts.maxSize.width - 10;
-        return (
-            <div className="media-renderer">
-                <video width="320" height="240" controls>
-                    <source src={videoUrl} />
-                </video>
-            </div>
-        );
-    }
-}
-
-export { SimpleMediaRenderer };

src/plugins/pdf/pdf.less

@@ -1,7 +0,0 @@
-.pdf-renderer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    padding-top: var(--termpad);
-}

src/plugins/pdf/pdf.tsx

@@ -1,49 +0,0 @@
-// Copyright 2024, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-import * as React from "react";
-import * as mobx from "mobx";
-import * as mobxReact from "mobx-react";
-
-import "./pdf.less";
-
-@mobxReact.observer
-class SimplePdfRenderer extends React.Component<
-    { data: ExtBlob; context: RendererContext; opts: RendererOpts; savedHeight: number },
-    {}
-> {
-    objUrl: string = null;
-
-    componentWillUnmount() {
-        if (this.objUrl != null) {
-            URL.revokeObjectURL(this.objUrl);
-        }
-    }
-
-    render() {
-        let dataBlob = this.props.data;
-        if (dataBlob == null || dataBlob.notFound) {
-            return (
-                <div className="pdf-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
-                    <div className="load-error-text">
-                        ERROR: file {dataBlob && dataBlob.name ? JSON.stringify(dataBlob.name) : ""} not found
-                    </div>
-                </div>
-            );
-        }
-        if (this.objUrl == null) {
-            const pdfBlob = new File([dataBlob], dataBlob.name ?? "file.pdf", { type: "application/pdf" });
-            this.objUrl = URL.createObjectURL(pdfBlob);
-        }
-        const opts = this.props.opts;
-        const maxHeight = opts.maxSize.height - 10;
-        const maxWidth = opts.maxSize.width - 10;
-        return (
-            <div className="pdf-renderer">
-                <iframe src={this.objUrl} width={maxWidth} height={maxHeight} name="pdfview" />
-            </div>
-        );
-    }
-}
-
-export { SimplePdfRenderer };

src/plugins/plugins.ts

@@ -7,8 +7,6 @@ import { SourceCodeRenderer } from "./code/code";
 import { SimpleMustacheRenderer } from "./mustache/mustache";
 import { CSVRenderer } from "./csv/csv";
 import { OpenAIRenderer, OpenAIRendererModel } from "./openai/openai";
-import { SimplePdfRenderer } from "./pdf/pdf";
-import { SimpleMediaRenderer } from "./media/media";
 import { isBlank } from "@/util/util";
 import { sprintf } from "sprintf-js";
 
@@ -80,26 +78,6 @@ const PluginConfigs: RendererPluginType[] = [
         mimeTypes: ["image/*"],
         simpleComponent: SimpleImageRenderer,
     },
-    {
-        name: "pdf",
-        rendererType: "simple",
-        heightType: "pixels",
-        dataType: "blob",
-        collapseType: "hide",
-        globalCss: null,
-        mimeTypes: ["application/pdf"],
-        simpleComponent: SimplePdfRenderer,
-    },
-    {
-        name: "media",
-        rendererType: "simple",
-        heightType: "pixels",
-        dataType: "blob",
-        collapseType: "hide",
-        globalCss: null,
-        mimeTypes: ["video/*", "audio/*"],
-        simpleComponent: SimpleMediaRenderer,
-    },
 ];
 
 class PluginModelClass {

src/types/custom.d.ts

@@ -880,7 +880,6 @@ declare global {
     };
 
     type ElectronApi = {
-        hideWindow: () => void;
         toggleDeveloperTools: () => void;
         getId: () => string;
         getIsDev: () => boolean;

src/util/keyutil.ts

@@ -4,7 +4,7 @@ import * as electron from "electron";
 import { parse } from "node:path";
 import { v4 as uuidv4 } from "uuid";
 import defaultKeybindingsFile from "../../assets/default-keybindings.json";
-const defaultKeybindings: KeybindConfigArray = defaultKeybindingsFile;
+const defaultKeybindings: KeybindConfig = defaultKeybindingsFile;
 
 type KeyPressDecl = {
     mods: {
@@ -24,18 +24,12 @@ const KeyTypeKey = "key";
 const KeyTypeCode = "code";
 
 type KeybindCallback = (event: WaveKeyboardEvent) => boolean;
-type KeybindConfigArray = Array<KeybindConfig>;
-type KeybindConfig = { command: string; keys: Array<string>; commandStr?: string };
-
-const Callback = "callback";
-const Command = "command";
+type KeybindConfig = Array<{ command: string; keys: Array<string> }>;
 
 type Keybind = {
     domain: string;
     keybinding: string;
-    action: string;
     callback: KeybindCallback;
-    commandStr: string;
 };
 
 const KeybindLevels = ["system", "modal", "app", "pane", "plugin"];
@@ -44,12 +38,11 @@ class KeybindManager {
     domainCallbacks: Map<string, KeybindCallback>;
     levelMap: Map<string, Array<Keybind>>;
     levelArray: Array<string>;
-    keyDescriptionsMap: Map<string, KeybindConfig>;
-    userKeybindings: KeybindConfigArray;
+    keyDescriptionsMap: Map<string, Array<string>>;
+    userKeybindings: KeybindConfig;
     userKeybindingError: OV<string>;
-    globalModel: any;
 
-    constructor(GlobalModel: any) {
+    constructor() {
         this.levelMap = new Map();
         this.domainCallbacks = new Map();
         this.levelArray = KeybindLevels;
@@ -60,7 +53,6 @@ class KeybindManager {
         this.userKeybindingError = mobx.observable.box(null, {
             name: "keyutil-userKeybindingError",
         });
-        this.globalModel = GlobalModel;
         this.initKeyDescriptionsMap();
     }
 
@@ -71,7 +63,7 @@ class KeybindManager {
         let newKeyDescriptions = new Map();
         for (let index = 0; index < defaultKeybindings.length; index++) {
             let curKeybind = defaultKeybindings[index];
-            newKeyDescriptions.set(curKeybind.command, curKeybind);
+            newKeyDescriptions.set(curKeybind.command, curKeybind.keys);
         }
         let curUserCommand = "";
         if (this.userKeybindings != null && this.userKeybindings instanceof Array) {
@@ -93,15 +85,7 @@ class KeybindManager {
                             throw new Error("invalid keybind key");
                         }
                     }
-                    let defaultCmd = this.keyDescriptionsMap.get(curKeybind.command);
-                    if (
-                        defaultCmd != null &&
-                        defaultCmd.commandStr != null &&
-                        (curKeybind.commandStr == null || curKeybind.commandStr == "")
-                    ) {
-                        curKeybind.commandStr = this.keyDescriptionsMap.get(curKeybind.command).commandStr;
-                    }
-                    newKeyDescriptions.set(curKeybind.command, curKeybind);
+                    newKeyDescriptions.set(curKeybind.command, curKeybind.keys);
                 }
             } catch (e) {
                 let userError = `${curUserCommand} is invalid: error: ${e}`;
@@ -114,48 +98,16 @@ class KeybindManager {
         this.keyDescriptionsMap = newKeyDescriptions;
     }
 
-    runSlashCommand(curKeybind: Keybind): boolean {
-        let curConfigKeybind = this.keyDescriptionsMap.get(curKeybind.keybinding);
-        if (curConfigKeybind == null || curConfigKeybind.commandStr == null || curKeybind.commandStr == "") {
-            return false;
-        }
-        let commandsList = curConfigKeybind.commandStr.trim().split(";");
-        this.runIndividualSlashCommand(commandsList);
-        return true;
-    }
-
-    runIndividualSlashCommand(commandsList: Array<string>): boolean {
-        if (commandsList.length == 0) {
-            return true;
-        }
-        let curCommand = commandsList.shift();
-        console.log("running: ", curCommand);
-        let prtn = this.globalModel.submitRawCommand(curCommand, false, false);
-        prtn.then((rtn) => {
-            if (!rtn.success) {
-                console.log("error running command ", curCommand);
-                return false;
-            }
-            return this.runIndividualSlashCommand(commandsList);
-        }).catch((error) => {
-            console.log("caught error running command ", curCommand, ": ", error);
-            return false;
-        });
-    }
-
     processLevel(nativeEvent: any, event: WaveKeyboardEvent, keybindsArray: Array<Keybind>): boolean {
         // iterate through keybinds in backwards order
         for (let index = keybindsArray.length - 1; index >= 0; index--) {
             let curKeybind = keybindsArray[index];
             if (this.checkKeyPressed(event, curKeybind.keybinding)) {
                 let shouldReturn = false;
-                let shouldRunCommand = true;
                 if (curKeybind.callback != null) {
                     shouldReturn = curKeybind.callback(event);
-                    shouldRunCommand = false;
                 }
                 if (!shouldReturn && this.domainCallbacks.has(curKeybind.domain)) {
-                    shouldRunCommand = false;
                     let curDomainCallback = this.domainCallbacks.get(curKeybind.domain);
                     if (curDomainCallback != null) {
                         shouldReturn = curDomainCallback(event);
@@ -163,9 +115,6 @@ class KeybindManager {
                         console.log("domain callback for ", curKeybind.domain, " is null. This should never happen");
                     }
                 }
-                if (shouldRunCommand) {
-                    shouldReturn = this.runSlashCommand(curKeybind);
-                }
                 if (shouldReturn) {
                     nativeEvent.preventDefault();
                     nativeEvent.stopPropagation();
@@ -320,7 +269,7 @@ class KeybindManager {
         if (!this.keyDescriptionsMap.has(keyDescription)) {
             return false;
         }
-        let keyPressArray = this.keyDescriptionsMap.get(keyDescription).keys;
+        let keyPressArray = this.keyDescriptionsMap.get(keyDescription);
         for (let index = 0; index < keyPressArray.length; index++) {
             let curKeyPress = keyPressArray[index];
             let pressed = checkKeyPressed(event, curKeyPress);