From bf986800a00340f17cfb354dc491693bd51b33ee Mon Sep 17 00:00:00 2001
From: Ruud Andriessen <ruud.andriessen@gmail.com>
Date: Fri, 27 Mar 2026 22:09:16 +0100
Subject: [PATCH 1/2] fix(ui): add project picker to new task button

---
 src/components/new-task-button.tsx | 72 ++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/components/new-task-button.tsx b/src/components/new-task-button.tsx
index 3167ce8..25e0409 100644
--- a/src/components/new-task-button.tsx
+++ b/src/components/new-task-button.tsx
@@ -2,9 +2,16 @@ import { useState, type ComponentProps } from "react";
 import { useNavigate } from "@tanstack/react-router";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useHotkey } from "@tanstack/react-hotkeys";
-import { Loader2, Plus } from "lucide-react";
+import { ChevronDown, Loader2, Plus } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Kbd } from "@/components/ui/kbd";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { projectsCollection, tasksCollection } from "@/lib/collections";
 import { createDesktopRunnerSession } from "@/lib/desktop-runner";
@@ -29,12 +36,15 @@ export function NewTaskButton({
   );
 
   const [defaultProject] = projects;
+  const hasProjects = projects.length > 0;
+  const hasMultipleProjects = projects.length > 1;
+  const singleProject = hasMultipleProjects ? undefined : defaultProject;
 
   useHotkey(hotkeys.newTask.keys, () => handleNewTask(), { enabled: hotkeyEnabled });
 
-  function handleNewTask() {
-    const repoUrl = defaultProject?.repo_url;
-    if (creating || !defaultProject || !repoUrl) {
+  function handleNewTask(project = defaultProject) {
+    const repoUrl = project?.repo_url;
+    if (creating || !project || !repoUrl) {
       return;
     }
 
@@ -45,8 +55,8 @@ export function NewTaskButton({
     const taskId = crypto.randomUUID();
     tasksCollection.insert({
       id: taskId,
-      organization_id: defaultProject.organization_id,
-      project_id: defaultProject.id,
+      organization_id: project.organization_id,
+      project_id: project.id,
       title: taskTitle,
       status: "open",
       stream_id: null,
@@ -86,20 +96,64 @@ export function NewTaskButton({
   const button = (
     <Button
       type="button"
-      disabled={creating || !defaultProject}
-      onClick={() => handleNewTask()}
+      disabled={creating || !hasProjects || (!hasMultipleProjects && !singleProject?.repo_url)}
+      onClick={hasMultipleProjects ? undefined : () => handleNewTask(singleProject)}
       {...props}
     >
       {icon}
       {iconOnly ? null : (
         <>
           <span>New task</span>
-          <Kbd keys={hotkeys.newTask.keys} />
+          {hasMultipleProjects ? <ChevronDown className="w-3.5 h-3.5" /> : null}
+          {hasMultipleProjects ? null : <Kbd keys={hotkeys.newTask.keys} />}
         </>
       )}
     </Button>
   );
 
+  if (hasMultipleProjects) {
+    const content = (
+      <DropdownMenuContent align={iconOnly ? "end" : "start"} className="min-w-56">
+        <DropdownMenuLabel>Select project</DropdownMenuLabel>
+        {projects.map((project) => (
+          <DropdownMenuItem
+            key={project.id}
+            disabled={creating || !project.repo_url}
+            onSelect={() => handleNewTask(project)}
+          >
+            {project.name}
+          </DropdownMenuItem>
+        ))}
+      </DropdownMenuContent>
+    );
+
+    if (iconOnly) {
+      return (
+        <DropdownMenu>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <DropdownMenuTrigger asChild>{button}</DropdownMenuTrigger>
+            </TooltipTrigger>
+            <TooltipContent>
+              <span className="flex items-center gap-2">
+                {hotkeys.newTask.label}
+                <Kbd keys={hotkeys.newTask.keys} />
+              </span>
+            </TooltipContent>
+          </Tooltip>
+          {content}
+        </DropdownMenu>
+      );
+    }
+
+    return (
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>{button}</DropdownMenuTrigger>
+        {content}
+      </DropdownMenu>
+    );
+  }
+
   if (iconOnly) {
     return (
       <Tooltip>

From cf4ac5cebbd86940e61594ee1f6a1308afe76ba3 Mon Sep 17 00:00:00 2001
From: Ruud Andriessen <ruud.andriessen@gmail.com>
Date: Fri, 27 Mar 2026 22:11:51 +0100
Subject: [PATCH 2/2] fix(ui): use active project for new-task hotkey

---
 src/components/new-task-button.tsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/new-task-button.tsx b/src/components/new-task-button.tsx
index 25e0409..61288cf 100644
--- a/src/components/new-task-button.tsx
+++ b/src/components/new-task-button.tsx
@@ -1,5 +1,5 @@
 import { useState, type ComponentProps } from "react";
-import { useNavigate } from "@tanstack/react-router";
+import { useNavigate, useRouterState } from "@tanstack/react-router";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useHotkey } from "@tanstack/react-hotkeys";
 import { ChevronDown, Loader2, Plus } from "lucide-react";
@@ -31,16 +31,26 @@ export function NewTaskButton({
 }: NewTaskButtonProps) {
   const navigate = useNavigate();
   const [creating, setCreating] = useState(false);
+  const pathname = useRouterState({ select: (state) => state.location.pathname });
   const { data: projects } = useLiveQuery((query) =>
     query.from({ p: projectsCollection }).orderBy(({ p }) => p.created_at, "asc"),
   );
+  const { data: tasks } = useLiveQuery((query) =>
+    query.from({ t: tasksCollection }).orderBy(({ t }) => t.updated_at, "desc"),
+  );
 
   const [defaultProject] = projects;
   const hasProjects = projects.length > 0;
   const hasMultipleProjects = projects.length > 1;
   const singleProject = hasMultipleProjects ? undefined : defaultProject;
-
-  useHotkey(hotkeys.newTask.keys, () => handleNewTask(), { enabled: hotkeyEnabled });
+  const currentTaskId = pathname.startsWith("/tasks/") ? pathname.split("/")[2] : undefined;
+  const currentTask = currentTaskId ? tasks.find((task) => task.id === currentTaskId) : undefined;
+  const currentProject = currentTask?.project_id
+    ? projects.find((project) => project.id === currentTask.project_id)
+    : undefined;
+  const hotkeyProject = currentProject ?? defaultProject;
+
+  useHotkey(hotkeys.newTask.keys, () => handleNewTask(hotkeyProject), { enabled: hotkeyEnabled });
 
   function handleNewTask(project = defaultProject) {
     const repoUrl = project?.repo_url;