fix

Author: bajrangCoder

src/cm/commandRegistry.js

@@ -119,6 +119,11 @@ const commandMap = new Map();
 /** @type {Record<string, any>} */
 let resolvedKeyBindings = keyBindings;
 
+/** @type {Record<string, any>} */
+let cachedResolvedKeyBindings = {};
+
+let resolvedKeyBindingsVersion = 0;
+
 /** @type {import("@codemirror/view").KeyBinding[]} */
 let cachedKeymap = [];
 
@@ -1336,6 +1341,19 @@ function resolveBindingInfo(name) {
 	return baseBinding ? { ...baseBinding, ...override } : override;
 }
 
+function buildResolvedKeyBindingsSnapshot() {
+	const bindingNames = new Set([
+		...Object.keys(keyBindings),
+		...Object.keys(resolvedKeyBindings ?? {}),
+	]);
+
+	return Object.fromEntries(
+		Array.from(bindingNames, (name) => [name, resolveBindingInfo(name)]).filter(
+			([, binding]) => binding,
+		),
+	);
+}
+
 function toCodeMirrorKey(combo) {
 	if (!combo) return null;
 	const parts = combo
@@ -1377,6 +1395,7 @@ function toCodeMirrorKey(combo) {
 
 function rebuildKeymap() {
 	const bindings = [];
+	cachedResolvedKeyBindings = buildResolvedKeyBindingsSnapshot();
 	commandMap.forEach((command, name) => {
 		const bindingInfo = resolveBindingInfo(name);
 		command.description =
@@ -1398,6 +1417,7 @@ function rebuildKeymap() {
 		});
 	});
 	cachedKeymap = bindings;
+	resolvedKeyBindingsVersion += 1;
 	return bindings;
 }
 
@@ -1436,16 +1456,11 @@ export function getRegisteredCommands() {
 }
 
 export function getResolvedKeyBindings() {
-	const bindingNames = new Set([
-		...Object.keys(keyBindings),
-		...Object.keys(resolvedKeyBindings ?? {}),
-	]);
+	return cachedResolvedKeyBindings;
+}
 
-	return Object.fromEntries(
-		Array.from(bindingNames, (name) => [name, resolveBindingInfo(name)]).filter(
-			([, binding]) => binding,
-		),
-	);
+export function getResolvedKeyBindingsVersion() {
+	return resolvedKeyBindingsVersion;
 }
 
 export function getCommandKeymapExtension() {

src/components/terminal/terminal.js

@@ -11,7 +11,10 @@ import { Unicode11Addon } from "@xterm/addon-unicode11";
 import { WebLinksAddon } from "@xterm/addon-web-links";
 import { WebglAddon } from "@xterm/addon-webgl";
 import { Terminal as Xterm } from "@xterm/xterm";
-import { getResolvedKeyBindings } from "cm/commandRegistry";
+import {
+	getResolvedKeyBindings,
+	getResolvedKeyBindingsVersion,
+} from "cm/commandRegistry";
 import toast from "components/toast";
 import confirm from "dialogs/confirm";
 import fonts from "lib/fonts";
@@ -61,6 +64,8 @@ export default class TerminalComponent {
 		this.isConnected = false;
 		this.serverMode = options.serverMode !== false; // Default true
 		this.touchSelection = null;
+		this.parsedAppKeybindings = [];
+		this.parsedAppKeybindingsVersion = -1;
 
 		this.init();
 	}
@@ -335,6 +340,11 @@ export default class TerminalComponent {
 	 * Parse app keybindings into a format usable by the keyboard handler
 	 */
 	parseAppKeybindings() {
+		const version = getResolvedKeyBindingsVersion();
+		if (this.parsedAppKeybindingsVersion === version) {
+			return this.parsedAppKeybindings;
+		}
+
 		const parsedBindings = [];
 
 		Object.values(getResolvedKeyBindings()).forEach((binding) => {
@@ -378,7 +388,10 @@ export default class TerminalComponent {
 			});
 		});
 
-		return parsedBindings;
+		this.parsedAppKeybindings = parsedBindings;
+		this.parsedAppKeybindingsVersion = version;
+
+		return this.parsedAppKeybindings;
 	}
 
 	/**