Implement the ability to quickly switch between tasks with CMD+0-9 keyboard shortcut

Author: charlesvien

apps/twig/src/renderer/components/GlobalEventHandlers.tsx

@@ -1,12 +1,15 @@
 import { usePanelLayoutStore } from "@features/panels/store/panelLayoutStore";
 import { useRightSidebarStore } from "@features/right-sidebar";
+import { usePinnedTasksStore } from "@features/sidebar/stores/pinnedTasksStore";
 import { useSidebarStore } from "@features/sidebar/stores/sidebarStore";
+import { useTasks } from "@features/tasks/hooks/useTasks";
 import { useWorkspaceStore } from "@features/workspace/stores/workspaceStore";
 import { SHORTCUTS } from "@renderer/constants/keyboard-shortcuts";
 import { clearApplicationStorage } from "@renderer/lib/clearStorage";
 import { useRegisteredFoldersStore } from "@renderer/stores/registeredFoldersStore";
+import type { Task } from "@shared/types";
 import { useNavigationStore } from "@stores/navigationStore";
-import { useCallback, useEffect } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { trpcReact } from "@/renderer/trpc";
 
@@ -25,6 +28,7 @@ export function GlobalEventHandlers({
   const navigateToTaskInput = useNavigationStore(
     (state) => state.navigateToTaskInput,
   );
+  const navigateToTask = useNavigationStore((state) => state.navigateToTask);
   const navigateToFolderSettings = useNavigationStore(
     (state) => state.navigateToFolderSettings,
   );
@@ -37,6 +41,40 @@ export function GlobalEventHandlers({
   const toggleLeftSidebar = useSidebarStore((state) => state.toggle);
   const toggleRightSidebar = useRightSidebarStore((state) => state.toggle);
 
+  const { data: allTasks = [] } = useTasks();
+  const pinnedTaskIds = usePinnedTasksStore((state) => state.pinnedTaskIds);
+
+  // Build ordered task list for CMD+0-9 switching (pinned → active → recent)
+  const orderedTasks = useMemo((): Task[] => {
+    if (allTasks.length === 0) return [];
+
+    const sortedByActivity = [...allTasks].sort(
+      (a, b) =>
+        new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime(),
+    );
+
+    const pinned = sortedByActivity.filter((t) => pinnedTaskIds.has(t.id));
+    const unpinned = sortedByActivity.filter((t) => !pinnedTaskIds.has(t.id));
+
+    return [...pinned, ...unpinned];
+  }, [allTasks, pinnedTaskIds]);
+
+  const handleSwitchTask = useCallback(
+    (index: number) => {
+      if (index === 0) {
+        // mod+0 goes to home/task input
+        navigateToTaskInput();
+      } else {
+        // mod+1-9 switches to task at that index (1-based)
+        const task = orderedTasks[index - 1];
+        if (task) {
+          navigateToTask(task);
+        }
+      }
+    },
+    [orderedTasks, navigateToTask, navigateToTaskInput],
+  );
+
   const handleOpenSettings = useCallback(() => {
     toggleSettings();
   }, [toggleSettings]);
@@ -91,6 +129,19 @@ export function GlobalEventHandlers({
   useHotkeys(SHORTCUTS.TOGGLE_RIGHT_SIDEBAR, toggleRightSidebar, globalOptions);
   useHotkeys(SHORTCUTS.SHORTCUTS_SHEET, onToggleShortcutsSheet, globalOptions);
 
+  // Task switching with mod+0-9
+  useHotkeys(
+    SHORTCUTS.SWITCH_TASK,
+    (_event, handler) => {
+      const keyPressed = handler.keys?.[0];
+      if (!keyPressed) return;
+      const index = parseInt(keyPressed, 10);
+      handleSwitchTask(index);
+    },
+    globalOptions,
+    [handleSwitchTask],
+  );
+
   // Mouse back/forward buttons
   useEffect(() => {
     const handleMouseButton = (event: MouseEvent) => {

apps/twig/src/renderer/constants/keyboard-shortcuts.ts

@@ -8,7 +8,9 @@ export const SHORTCUTS = {
   TOGGLE_LEFT_SIDEBAR: "mod+b",
   TOGGLE_RIGHT_SIDEBAR: "mod+shift+b",
   CLOSE_TAB: "mod+w",
-  SWITCH_TAB: "mod+1,mod+2,mod+3,mod+4,mod+5,mod+6,mod+7,mod+8,mod+9",
+  SWITCH_TAB:
+    "mod+shift+1,mod+shift+2,mod+shift+3,mod+shift+4,mod+shift+5,mod+shift+6,mod+shift+7,mod+shift+8,mod+shift+9",
+  SWITCH_TASK: "mod+0,mod+1,mod+2,mod+3,mod+4,mod+5,mod+6,mod+7,mod+8,mod+9",
   OPEN_IN_EDITOR: "mod+o",
   COPY_PATH: "mod+shift+c",
   TASK_REFRESH: "mod+r",
@@ -57,6 +59,12 @@ export const KEYBOARD_SHORTCUTS: KeyboardShortcut[] = [
     description: "Show keyboard shortcuts",
     category: "general",
   },
+  {
+    id: "switch-task",
+    keys: "mod+0-9",
+    description: "Switch to task 1-9 (0 = home)",
+    category: "navigation",
+  },
   {
     id: "go-back",
     keys: SHORTCUTS.GO_BACK,
@@ -83,7 +91,7 @@ export const KEYBOARD_SHORTCUTS: KeyboardShortcut[] = [
   },
   {
     id: "switch-tab",
-    keys: "mod+1-9",
+    keys: "mod+shift+1-9",
     description: "Switch to tab 1-9",
     category: "panels",
     context: "Task detail",