fix: Build ordered task list for CMD+0-9 switching, matching sidebar visual order (#719)

Author: charlesvien

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

@@ -1,7 +1,9 @@
 import { usePanelLayoutStore } from "@features/panels/store/panelLayoutStore";
 import { useRightSidebarStore } from "@features/right-sidebar";
+import { useSessions } from "@features/sessions/stores/sessionStore";
 import { usePinnedTasksStore } from "@features/sidebar/stores/pinnedTasksStore";
 import { useSidebarStore } from "@features/sidebar/stores/sidebarStore";
+import { useTaskViewedStore } from "@features/sidebar/stores/taskViewedStore";
 import { useTasks } from "@features/tasks/hooks/useTasks";
 import { useWorkspaceStore } from "@features/workspace/stores/workspaceStore";
 import { SHORTCUTS } from "@renderer/constants/keyboard-shortcuts";
@@ -43,21 +45,55 @@ export function GlobalEventHandlers({
 
   const { data: allTasks = [] } = useTasks();
   const pinnedTaskIds = usePinnedTasksStore((state) => state.pinnedTaskIds);
+  const sessions = useSessions();
+  const lastViewedAt = useTaskViewedStore((state) => state.lastViewedAt);
+  const localActivityAt = useTaskViewedStore((state) => state.lastActivityAt);
 
-  // Build ordered task list for CMD+0-9 switching (pinned → active → recent)
+  // Build ordered task list for CMD+0-9 switching, matching sidebar visual order:
+  // pinned (by activity) → active (by activity) → recent (by creation)
   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 getLastActivityAt = (task: Task): number => {
+      const apiUpdatedAt = new Date(task.updated_at).getTime();
+      const localActivity = localActivityAt[task.id];
+      return localActivity
+        ? Math.max(apiUpdatedAt, localActivity)
+        : apiUpdatedAt;
+    };
+
+    const isTaskUnread = (task: Task): boolean => {
+      const taskLastViewedAt = lastViewedAt[task.id];
+      return (
+        taskLastViewedAt !== undefined &&
+        getLastActivityAt(task) > taskLastViewedAt
+      );
+    };
+
+    const taskNeedsPermission = (task: Task): boolean => {
+      const session = Object.values(sessions).find((s) => s.taskId === task.id);
+      return (session?.pendingPermissions?.size ?? 0) > 0;
+    };
+
+    const pinned = allTasks
+      .filter((t) => pinnedTaskIds.has(t.id))
+      .sort((a, b) => getLastActivityAt(b) - getLastActivityAt(a));
+
+    const unpinned = allTasks.filter((t) => !pinnedTaskIds.has(t.id));
+
+    const active = unpinned
+      .filter((t) => isTaskUnread(t) || taskNeedsPermission(t))
+      .sort((a, b) => getLastActivityAt(b) - getLastActivityAt(a));
 
-    const pinned = sortedByActivity.filter((t) => pinnedTaskIds.has(t.id));
-    const unpinned = sortedByActivity.filter((t) => !pinnedTaskIds.has(t.id));
+    const recent = unpinned
+      .filter((t) => !isTaskUnread(t) && !taskNeedsPermission(t))
+      .sort(
+        (a, b) =>
+          new Date(b.created_at).getTime() - new Date(a.created_at).getTime(),
+      );
 
-    return [...pinned, ...unpinned];
-  }, [allTasks, pinnedTaskIds]);
+    return [...pinned, ...active, ...recent];
+  }, [allTasks, pinnedTaskIds, sessions, lastViewedAt, localActivityAt]);
 
   const handleSwitchTask = useCallback(
     (index: number) => {

apps/twig/src/renderer/components/action-selector/ActionSelector.tsx

@@ -173,7 +173,7 @@ export function ActionSelector({
           h.handleCancel();
           break;
         default:
-          if (/^[1-9]$/.test(e.key)) {
+          if (/^[1-9]$/.test(e.key) && !e.metaKey && !e.ctrlKey) {
             e.preventDefault();
             e.stopPropagation();
             h.selectByIndex(Number.parseInt(e.key, 10) - 1);