feat(desktop/hotkeys): unbound defaults + restore prev/next tab & workspace

apps/desktop/src/renderer/hotkeys/hooks/useRecordHotkeys/useRecordHotkeys.ts

@@ -136,7 +136,10 @@ export function useRecordHotkeys(
 			}
 
 			const defaultKey = HOTKEYS[recordingId].key;
-			if (canonicalizeChord(captured) === canonicalizeChord(defaultKey)) {
+			if (
+				defaultKey &&
+				canonicalizeChord(captured) === canonicalizeChord(defaultKey)
+			) {
 				resetOverride(recordingId);
 			} else {
 				setOverride(recordingId, captured);

apps/desktop/src/renderer/hotkeys/registry.ts

@@ -101,6 +101,18 @@ export const HOTKEYS_REGISTRY = {
 		label: "Switch to Workspace 9",
 		category: "Workspace",
 	},
+	PREV_WORKSPACE: {
+		key: { mac: null, windows: null, linux: null },
+		label: "Previous Workspace",
+		category: "Workspace",
+		description: "Navigate to the previous workspace in the sidebar",
+	},
+	NEXT_WORKSPACE: {
+		key: { mac: null, windows: null, linux: null },
+		label: "Next Workspace",
+		category: "Workspace",
+		description: "Navigate to the next workspace in the sidebar",
+	},
 	CLOSE_WORKSPACE: {
 		key: {
 			mac: "meta+shift+backspace",
@@ -330,6 +342,18 @@ export const HOTKEYS_REGISTRY = {
 		label: "Next Tab (Alt)",
 		category: "Terminal",
 	},
+	PREV_TAB: {
+		key: { mac: null, windows: null, linux: null },
+		label: "Previous Tab",
+		category: "Terminal",
+		description: "Focus the previous tab in the active workspace",
+	},
+	NEXT_TAB: {
+		key: { mac: null, windows: null, linux: null },
+		label: "Next Tab",
+		category: "Terminal",
+		description: "Focus the next tab in the active workspace",
+	},
 	FOCUS_PANE_LEFT: {
 		key: {
 			mac: "meta+alt+left",

apps/desktop/src/renderer/hotkeys/types.ts

@@ -1,6 +1,10 @@
 export type Platform = "mac" | "windows" | "linux";
 
-export type PlatformKey = { mac: string; windows: string; linux: string };
+export type PlatformKey = {
+	mac: string | null;
+	windows: string | null;
+	linux: string | null;
+};
 
 export type HotkeyCategory =
 	| "Navigation"
@@ -18,7 +22,7 @@ export interface HotkeyDisplay {
 }
 
 export interface HotkeyDefinition {
-	key: string;
+	key: string | null;
 	label: string;
 	category: HotkeyCategory;
 	description?: string;

apps/desktop/src/renderer/hotkeys/utils/resolveHotkeyFromEvent.test.ts

@@ -1,6 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it } from "bun:test";
-import { HOTKEYS } from "../registry";
+import { HOTKEYS, type HotkeyId } from "../registry";
 import { useHotkeyOverridesStore } from "../stores/hotkeyOverridesStore";
+import type { HotkeyDefinition } from "../types";
 import {
 	canonicalizeChord,
 	eventToChord,
@@ -148,10 +149,13 @@ describe("resolveHotkeyFromEvent — live override index", () => {
 	});
 
 	// Resolve once so registry reorders / removals surface as a test failure
-	// here instead of silently skipping the cases below.
-	const sampleEntry = (
-		Object.entries(HOTKEYS) as [keyof typeof HOTKEYS, { key: string }][]
-	).find(([, hotkey]) => !!hotkey.key);
+	// here instead of silently skipping the cases below. The type predicate
+	// narrows to a HotkeyDefinition whose .key is guaranteed non-null after
+	// the filter, so sampleDef.key can be passed to string-only helpers below.
+	const sampleEntry = Object.entries(HOTKEYS).find(
+		(entry): entry is [HotkeyId, HotkeyDefinition & { key: string }] =>
+			entry[1].key !== null,
+	);
 	if (!sampleEntry) throw new Error("HOTKEYS has no bound default");
 	const [sampleId, sampleDef] = sampleEntry;
 

apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/hooks/useDashboardSidebarShortcuts/useDashboardSidebarShortcuts.ts

@@ -1,4 +1,4 @@
-import { useNavigate } from "@tanstack/react-router";
+import { useMatchRoute, useNavigate } from "@tanstack/react-router";
 import { useCallback, useMemo } from "react";
 import { useHotkey } from "renderer/hotkeys";
 import { navigateToV2Workspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
@@ -48,5 +48,33 @@ export function useDashboardSidebarShortcuts(
 	useHotkey("JUMP_TO_WORKSPACE_8", () => switchToWorkspace(7));
 	useHotkey("JUMP_TO_WORKSPACE_9", () => switchToWorkspace(8));
 
+	const matchRoute = useMatchRoute();
+	const currentWorkspaceMatch = matchRoute({
+		to: "/v2-workspace/$workspaceId",
+		fuzzy: true,
+	});
+	const currentWorkspaceId =
+		currentWorkspaceMatch !== false ? currentWorkspaceMatch.workspaceId : null;
+
+	useHotkey("PREV_WORKSPACE", () => {
+		if (!currentWorkspaceId || flattenedWorkspaces.length === 0) return;
+		const index = flattenedWorkspaces.findIndex(
+			(w) => w.id === currentWorkspaceId,
+		);
+		if (index === -1) return;
+		const prevIndex = index <= 0 ? flattenedWorkspaces.length - 1 : index - 1;
+		navigateToV2Workspace(flattenedWorkspaces[prevIndex].id, navigate);
+	});
+
+	useHotkey("NEXT_WORKSPACE", () => {
+		if (!currentWorkspaceId || flattenedWorkspaces.length === 0) return;
+		const index = flattenedWorkspaces.findIndex(
+			(w) => w.id === currentWorkspaceId,
+		);
+		if (index === -1) return;
+		const nextIndex = index >= flattenedWorkspaces.length - 1 ? 0 : index + 1;
+		navigateToV2Workspace(flattenedWorkspaces[nextIndex].id, navigate);
+	});
+
 	return workspaceShortcutLabels;
 }

apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useWorkspaceHotkeys/useWorkspaceHotkeys.ts

@@ -87,6 +87,23 @@ export function useWorkspaceHotkeys({
 		}
 	});
 
+	useHotkey("PREV_TAB", () => {
+		const state = store.getState();
+		if (!state.activeTabId || state.tabs.length === 0) return;
+		const index = state.tabs.findIndex((t) => t.id === state.activeTabId);
+		const prevIndex = index <= 0 ? state.tabs.length - 1 : index - 1;
+		state.setActiveTab(state.tabs[prevIndex].id);
+	});
+
+	useHotkey("NEXT_TAB", () => {
+		const state = store.getState();
+		if (!state.activeTabId || state.tabs.length === 0) return;
+		const index = state.tabs.findIndex((t) => t.id === state.activeTabId);
+		const nextIndex =
+			index >= state.tabs.length - 1 || index === -1 ? 0 : index + 1;
+		state.setActiveTab(state.tabs[nextIndex].id);
+	});
+
 	useHotkey("PREV_TAB_ALT", () => {
 		const state = store.getState();
 		if (!state.activeTabId || state.tabs.length === 0) return;

apps/desktop/src/renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/page.tsx

@@ -1,5 +1,5 @@
 import type { ExternalApp } from "@superset/local-db";
-import { createFileRoute, notFound } from "@tanstack/react-router";
+import { createFileRoute, notFound, useNavigate } from "@tanstack/react-router";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useCopyToClipboard } from "renderer/hooks/useCopyToClipboard";
 import { useFileOpenMode } from "renderer/hooks/useFileOpenMode";
@@ -8,6 +8,7 @@ import { electronTrpc } from "renderer/lib/electron-trpc";
 import { electronTrpcClient as trpcClient } from "renderer/lib/trpc-client";
 import { usePresets } from "renderer/react-query/presets";
 import type { WorkspaceSearchParams } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
+import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
 import { usePresetHotkeys } from "renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/hooks/usePresetHotkeys";
 import { useWorkspaceRunCommand } from "renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/hooks/useWorkspaceRunCommand";
 import { NotFound } from "renderer/routes/not-found";
@@ -90,6 +91,7 @@ function WorkspacePage() {
 		worktreePath: workspace?.worktreePath,
 		enabled: Boolean(workspace?.worktreePath),
 	});
+	const navigate = useNavigate();
 	const routeNavigate = Route.useNavigate();
 	const { tabId: searchTabId, paneId: searchPaneId } = Route.useSearch();
 
@@ -224,6 +226,20 @@ function WorkspacePage() {
 		}
 	});
 
+	useHotkey("PREV_TAB", () => {
+		if (!activeTabId || tabs.length === 0) return;
+		const index = tabs.findIndex((t) => t.id === activeTabId);
+		const prevIndex = index <= 0 ? tabs.length - 1 : index - 1;
+		setActiveTab(workspaceId, tabs[prevIndex].id);
+	});
+
+	useHotkey("NEXT_TAB", () => {
+		if (!activeTabId || tabs.length === 0) return;
+		const index = tabs.findIndex((t) => t.id === activeTabId);
+		const nextIndex = index >= tabs.length - 1 || index === -1 ? 0 : index + 1;
+		setActiveTab(workspaceId, tabs[nextIndex].id);
+	});
+
 	useHotkey("PREV_TAB_ALT", () => {
 		if (!activeTabId || tabs.length === 0) return;
 		const index = tabs.findIndex((t) => t.id === activeTabId);
@@ -393,6 +409,29 @@ function WorkspacePage() {
 		}
 	});
 
+	const getPreviousWorkspace =
+		electronTrpc.workspaces.getPreviousWorkspace.useQuery(
+			{ id: workspaceId },
+			{ enabled: !!workspaceId },
+		);
+	useHotkey("PREV_WORKSPACE", () => {
+		const prevWorkspaceId = getPreviousWorkspace.data;
+		if (prevWorkspaceId) {
+			navigateToWorkspace(prevWorkspaceId, navigate);
+		}
+	});
+
+	const getNextWorkspace = electronTrpc.workspaces.getNextWorkspace.useQuery(
+		{ id: workspaceId },
+		{ enabled: !!workspaceId },
+	);
+	useHotkey("NEXT_WORKSPACE", () => {
+		const nextWorkspaceId = getNextWorkspace.data;
+		if (nextWorkspaceId) {
+			navigateToWorkspace(nextWorkspaceId, navigate);
+		}
+	});
+
 	return (
 		<div className="flex-1 h-full flex flex-col overflow-hidden">
 			<div className="flex-1 min-h-0 flex overflow-hidden">