keybinding finalized

Author: mswiszcz

.claude/settings.local.json

@@ -0,0 +1,28 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npx tsc:*)",
+      "Bash(git:*)",
+      "Bash(grep -E \"\\\\.\\(ts|tsx|json|go\\)$\")",
+      "Bash(find /Users/mswiszcz/Labs/waveterm/docs -name *.md)",
+      "Bash(find /Users/mswiszcz/Labs/waveterm/frontend -name *vtab* -type f)",
+      "Bash(/Users/mswiszcz/.claude/plugins/cache/claude-plugins-official/superpowers/5.0.6/skills/brainstorming/scripts/start-server.sh --project-dir /Users/mswiszcz/Labs/waveterm)",
+      "Bash(grep -r \"registerKeybinding\\\\|registerShortcut\\\\|keybinding.*config\" /Users/mswiszcz/Labs/waveterm --include=*.ts --include=*.tsx)",
+      "Bash(gh api:*)",
+      "Bash(python3 -c \"import sys,json; data=json.load\\(sys.stdin\\); [print\\(x[''''path'''']\\) for x in data.get\\(''''tree'''',[]\\) if any\\(k in x[''''path''''].lower\\(\\) for k in [''''color'''',''''palette'''',''''theme'''',''''ansi'''']\\)]\")",
+      "WebFetch(domain:github.com)",
+      "Bash(gh repo:*)",
+      "WebSearch",
+      "WebFetch(domain:docs.warp.dev)",
+      "Bash(gh search:*)",
+      "Bash(grep -E \"\\\\.\\(ts|tsx\\)$\")",
+      "Bash(grep -E \"\\\\.\\(ts|tsx|json\\)$\")",
+      "Bash(/Users/mswiszcz/.claude/plugins/cache/claude-plugins-official/superpowers/5.0.6/scripts/start-server.sh --project-dir /Users/mswiszcz/Labs/waveterm)",
+      "Bash(ls /Users/mswiszcz/Labs/waveterm/cmd/generate*/)",
+      "Bash(bash /Users/mswiszcz/.claude/plugins/cache/claude-plugins-official/superpowers/5.0.6/skills/brainstorming/scripts/start-server.sh --project-dir /Users/mswiszcz/Labs/waveterm)",
+      "Bash(go run:*)",
+      "Read(//Users/mswiszcz/.claude/**)",
+      "Bash(ls /Users/mswiszcz/.claude/projects/-Users-mswiszcz-Labs-waveterm/settings*.json)"
+    ]
+  }
+}

.gitignore

@@ -39,3 +39,5 @@ test-results.xml
 docsite/
 
 .kilo-format-temp-*
+.superpowers
+docs/superpowers

docs/superpowers/specs/2026-03-27-keybindings-config-design.md

@@ -10,7 +10,6 @@ import { PNG } from "pngjs";
 import { Readable } from "stream";
 import { RpcApi } from "../frontend/app/store/wshclientapi";
 import { getWebServerEndpoint } from "../frontend/util/endpoints";
-import * as keyutil from "../frontend/util/keyutil";
 import { fireAndForget, parseDataUrl } from "../frontend/util/util";
 import {
     incrementTermCommandsDurable,
@@ -22,16 +21,13 @@ import {
 import { createBuilderWindow, getAllBuilderWindows, getBuilderWindowByWebContentsId } from "./emain-builder";
 import { callWithOriginalXdgCurrentDesktopAsync, unamePlatform } from "./emain-platform";
 import { getWaveTabViewByWebContentsId } from "./emain-tabview";
-import { handleCtrlShiftState } from "./emain-util";
+import { setWebviewKeys } from "./emain-util";
 import { getWaveVersion } from "./emain-wavesrv";
 import { createNewWaveWindow, getWaveWindowByWebContentsId } from "./emain-window";
 import { ElectronWshClient } from "./emain-wsh";
 
 const electronApp = electron.app;
 
-let webviewFocusId: number = null;
-let webviewKeys: string[] = [];
-
 export function openBuilderWindow(appId?: string) {
     const normalizedAppId = appId || "";
     const existingBuilderWindows = getAllBuilderWindows();
@@ -236,6 +232,14 @@ export function initIpcHandlers() {
         menu.popup();
     });
 
+    electron.ipcMain.on("webview-mouse-navigate", (event: electron.IpcMainEvent, direction: string) => {
+        if (direction === "back") {
+            event.sender.goBack();
+        } else if (direction === "forward") {
+            event.sender.goForward();
+        }
+    });
+
     electron.ipcMain.on("download", (event, payload) => {
         const baseName = encodeURIComponent(path.basename(payload.filePath));
         const streamingUrl =
@@ -280,48 +284,12 @@ export function initIpcHandlers() {
         event.returnValue = event.sender.getZoomFactor();
     });
 
-    const hasBeforeInputRegisteredMap = new Map<number, boolean>();
-
-    electron.ipcMain.on("webview-focus", (event: Electron.IpcMainEvent, focusedId: number) => {
-        webviewFocusId = focusedId;
+    electron.ipcMain.on("webview-focus", (_event: Electron.IpcMainEvent, focusedId: number) => {
         console.log("webview-focus", focusedId);
-        if (focusedId == null) {
-            return;
-        }
-        const parentWc = event.sender;
-        const webviewWc = electron.webContents.fromId(focusedId);
-        if (webviewWc == null) {
-            webviewFocusId = null;
-            return;
-        }
-        if (!hasBeforeInputRegisteredMap.get(focusedId)) {
-            hasBeforeInputRegisteredMap.set(focusedId, true);
-            webviewWc.on("before-input-event", (e, input) => {
-                let waveEvent = keyutil.adaptFromElectronKeyEvent(input);
-                handleCtrlShiftState(parentWc, waveEvent);
-                if (webviewFocusId != focusedId) {
-                    return;
-                }
-                if (input.type != "keyDown") {
-                    return;
-                }
-                for (let keyDesc of webviewKeys) {
-                    if (keyutil.checkKeyPressed(waveEvent, keyDesc)) {
-                        e.preventDefault();
-                        parentWc.send("reinject-key", waveEvent);
-                        console.log("webview reinject-key", keyDesc);
-                        return;
-                    }
-                }
-            });
-            webviewWc.on("destroyed", () => {
-                hasBeforeInputRegisteredMap.delete(focusedId);
-            });
-        }
     });
 
     electron.ipcMain.on("register-global-webview-keys", (event, keys: string[]) => {
-        webviewKeys = keys ?? [];
+        setWebviewKeys(keys);
     });
 
     electron.ipcMain.on("set-keyboard-chord-mode", (event) => {

emain/emain-ipc.ts

@@ -12,6 +12,7 @@ import { setWasActive } from "./emain-activity";
 import { getElectronAppBasePath, isDevVite, unamePlatform } from "./emain-platform";
 import {
     decreaseZoomLevel,
+    getWebviewKeys,
     handleCtrlShiftFocus,
     handleCtrlShiftState,
     increaseZoomLevel,
@@ -322,6 +323,20 @@ export async function getOrCreateWebViewForTab(waveWindowId: string, tabId: stri
             tabView.webContents.send("webview-new-window", wc.id, details);
             return { action: "deny" };
         });
+        wc.on("before-input-event", (e, input) => {
+            if (input.type != "keyDown") {
+                return;
+            }
+            const waveEvent = adaptFromElectronKeyEvent(input);
+            handleCtrlShiftState(tabView.webContents, waveEvent);
+            for (const keyDesc of getWebviewKeys()) {
+                if (checkKeyPressed(waveEvent, keyDesc)) {
+                    e.preventDefault();
+                    tabView.webContents.send("reinject-key", waveEvent);
+                    return;
+                }
+            }
+        });
     });
     tabView.webContents.on("before-input-event", (e, input) => {
         const waveEvent = adaptFromElectronKeyEvent(input);

emain/emain-tabview.ts

@@ -8,6 +8,16 @@ export const WaveAppPathVarName = "WAVETERM_APP_PATH";
 export const WaveAppResourcesPathVarName = "WAVETERM_RESOURCES_PATH";
 export const WaveAppElectronExecPath = "WAVETERM_ELECTRONEXECPATH";
 
+let webviewKeys: string[] = [];
+
+export function getWebviewKeys(): string[] {
+    return webviewKeys;
+}
+
+export function setWebviewKeys(keys: string[]) {
+    webviewKeys = keys ?? [];
+}
+
 const MinZoomLevel = 0.4;
 const MaxZoomLevel = 2.6;
 const ZoomDelta = 0.2;

emain/emain-util.ts

@@ -22,7 +22,7 @@ import { delay, ensureBoundsAreVisible, waveKeyToElectronKey } from "./emain-uti
 import { ElectronWshClient } from "./emain-wsh";
 import { updater } from "./updater";
 
-const DevInitTimeoutMs = 5000;
+const DevInitTimeoutMs = 15000;
 
 export type WindowOpts = {
     unamePlatform: NodeJS.Platform;
@@ -395,7 +395,7 @@ export class WaveBrowserWindow extends BaseWindow {
         const clientId = await getClientId();
         await this.awaitWithDevTimeout(tabView.initPromise, "initPromise", tabView.waveTabId);
         const winBounds = this.getContentBounds();
-        tabView.setBounds({ x: 0, y: 0, width: winBounds.width, height: winBounds.height });
+        tabView.positionTabOffScreen(winBounds);
         this.contentView.addChildView(tabView);
         const initOpts: WaveInitOpts = {
             tabId: tabView.waveTabId,
@@ -461,6 +461,9 @@ export class WaveBrowserWindow extends BaseWindow {
             console.log("initializing a new tab", primaryStartupTab ? "(primary startup)" : "");
             await this.initializeTab(tabView, primaryStartupTab);
             this.finalizePositioning();
+        } else if (tabView.isWaveReady) {
+            console.log("reusing wave-ready tab, skipping reinit", tabView.waveTabId);
+            this.finalizePositioning();
         } else {
             console.log("reusing an existing tab, calling wave-init", tabView.waveTabId);
             tabView.webContents.send("wave-init", tabView.savedInitOpts); // reinit

emain/emain-window.ts

@@ -25,4 +25,12 @@ document.addEventListener("contextmenu", (event) => {
     // do nothing
 });
 
+document.addEventListener("mouseup", (event) => {
+    // Mouse button 3 = back, button 4 = forward
+    if (event.button === 3 || event.button === 4) {
+        event.preventDefault();
+        ipcRenderer.send("webview-mouse-navigate", event.button === 3 ? "back" : "forward");
+    }
+});
+
 console.log("loaded wave preload-webview.ts");

emain/preload-webview.ts

@@ -24,7 +24,7 @@ export function AppBackground() {
     const tabBg = useAtomValue(env.getTabMetaKeyAtom(tabId, "tab:background"));
     const configBg = useAtomValue(env.getConfigBackgroundAtom(tabBg));
     const resolvedMeta: Omit<BackgroundConfigType, "display:name"> = tabBg && configBg ? configBg : tabData?.meta;
-    const style: CSSProperties = computeBgStyleFromMeta(resolvedMeta, 0.5) ?? {};
+    const style: CSSProperties = computeBgStyleFromMeta(resolvedMeta, 1) ?? {};
     const getAvgColor = useCallback(
         debounce(30, () => {
             if (

frontend/app/app-bg.tsx

@@ -214,7 +214,8 @@ const TabBar = memo(({ workspace, noTabs }: TabBarProps) => {
         const addBtnWidth = getOuterWidth(addBtnRef.current);
         const appMenuButtonWidth = appMenuButtonRef.current?.getBoundingClientRect().width ?? 0;
         const workspaceSwitcherWidth = workspaceSwitcherRef.current?.getBoundingClientRect().width ?? 0;
-        const waveAIButtonWidth = waveAIButtonRef.current != null ? getOuterWidth(waveAIButtonRef.current) : 0;
+        const waveAIButtonWidth =
+            !hideAiButton && waveAIButtonRef.current != null ? getOuterWidth(waveAIButtonRef.current) : 0;
 
         const nonTabElementsWidth =
             windowDragLeftWidth +
@@ -301,7 +302,7 @@ const TabBar = memo(({ workspace, noTabs }: TabBarProps) => {
         // Check if all tabs are loaded
         const allLoaded = tabIds.length > 0 && tabIds.every((id) => tabsLoaded[id]);
         if (allLoaded) {
-            setSizeAndPosition(newTabId === null && prevAllLoadedRef.current);
+            setSizeAndPosition(false);
             saveTabsPosition();
             if (!prevAllLoadedRef.current) {
                 prevAllLoadedRef.current = true;