From 09b4e3e652365c4609e54eaafbfbb09e4cdb262e Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sat, 10 Jan 2026 14:31:12 -0800
Subject: [PATCH 01/18] WIP

---
 apps/desktop/package.json                     |   1 +
 .../components/ComponentsShowcase/index.tsx   | 209 +++++++++++++
 .../main/components/TasksView/TasksView.tsx   | 293 +-----------------
 .../components/StatusIcon/StatusIcon.tsx      | 164 ++++++++++
 .../components/StatusIcon/constants.ts        |  10 +
 .../TasksView/components/StatusIcon/index.ts  |   2 +
 .../TasksTableView/TasksTableView.tsx         |  57 ++++
 .../components/TasksTableView/index.ts        |   1 +
 .../cells/AssigneeCell/AssigneeCell.tsx       | 156 ++++++++++
 .../components/cells/AssigneeCell/index.ts    |   1 +
 .../cells/LabelsCell/LabelsCell.tsx           | 134 ++++++++
 .../components/cells/LabelsCell/index.ts      |   1 +
 .../cells/PriorityCell/PriorityCell.tsx       | 154 +++++++++
 .../cells/PriorityCell/constants.ts           |   7 +
 .../components/cells/PriorityCell/index.ts    |   1 +
 .../cells/StatusCell/StatusCell.tsx           | 105 +++++++
 .../components/cells/StatusCell/index.ts      |   1 +
 .../TasksView/hooks/useTasksTable/index.ts    |   1 +
 .../hooks/useTasksTable/useTasksTable.tsx     | 178 +++++++++++
 .../WorkspaceSidebarHeader.tsx                |  38 +++
 .../src/renderer/screens/main/index.tsx       |   4 +
 apps/desktop/src/renderer/stores/app-state.ts |  18 +-
 bun.lock                                      |   7 +-
 23 files changed, 1255 insertions(+), 288 deletions(-)
 create mode 100644 apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/constants.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 738586d1158..0bd431f8968 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -50,6 +50,7 @@
 		"@tanstack/electric-db-collection": "^0.2.20",
 		"@tanstack/react-db": "^0.1.60",
 		"@tanstack/react-query": "^5.90.10",
+		"@tanstack/react-table": "^8.21.3",
 		"@trpc/client": "^11.7.1",
 		"@trpc/react-query": "^11.7.1",
 		"@trpc/server": "^11.7.1",
diff --git a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
new file mode 100644
index 00000000000..593d504e6f0
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
@@ -0,0 +1,209 @@
+import { ScrollArea } from "@superset/ui/scroll-area";
+import { StatusIcon, type StatusType } from "../TasksView/components/StatusIcon";
+
+const STATUS_VARIANTS: Array<{
+	type: StatusType;
+	color: string;
+	label: string;
+}> = [
+	{ type: "backlog", color: "#6B7280", label: "Backlog (Gray)" },
+	{ type: "unstarted", color: "#3B82F6", label: "Todo (Blue)" },
+	{ type: "unstarted", color: "#EF4444", label: "Blocked (Red)" },
+	{ type: "started", color: "#F59E0B", label: "In Progress (Orange)" },
+	{ type: "started", color: "#10B981", label: "In Review (Green)" },
+	{ type: "completed", color: "#8B5CF6", label: "Done (Purple)" },
+	{ type: "cancelled", color: "#6B7280", label: "Canceled (Gray)" },
+	{ type: "cancelled", color: "#EF4444", label: "Duplicate (Red)" },
+];
+
+export function ComponentsShowcase() {
+	return (
+		<div className="flex-1 flex flex-col min-h-0 bg-background">
+			{/* Header */}
+			<div className="flex items-center justify-between border-b border-border px-6 py-4">
+				<div>
+					<h1 className="text-xl font-semibold">Components Showcase</h1>
+					<p className="text-sm text-muted-foreground mt-1">
+						View all component variants and states
+					</p>
+				</div>
+			</div>
+
+			{/* Content */}
+			<ScrollArea className="flex-1 min-h-0">
+				<div className="p-6 space-y-8">
+					{/* Status Icon Display */}
+					<section>
+						<h2 className="text-lg font-semibold mb-4">Status Icon Display</h2>
+						<p className="text-sm text-muted-foreground mb-6">
+							Linear-style status icons with support for different types and
+							colors
+						</p>
+
+						<div className="space-y-8">
+							{/* All Variants Grid */}
+							<div>
+								<h3 className="text-sm font-medium mb-3">All Variants</h3>
+								<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
+									{STATUS_VARIANTS.map((variant, index) => (
+										<div
+											key={index}
+											className="flex items-center gap-3 p-4 rounded-lg border border-border bg-card"
+										>
+											<StatusIcon
+												type={variant.type}
+												color={variant.color}
+											/>
+											<div className="flex-1 min-w-0">
+												<p className="text-sm font-medium">{variant.label}</p>
+												<p className="text-xs text-muted-foreground">
+													{variant.type}
+												</p>
+											</div>
+										</div>
+									))}
+								</div>
+							</div>
+
+							{/* Type Breakdown */}
+							<div>
+								<h3 className="text-sm font-medium mb-3">Type Breakdown</h3>
+								<div className="space-y-4">
+									{/* Backlog */}
+									<div className="p-4 rounded-lg border border-border bg-card">
+										<div className="flex items-center gap-3 mb-2">
+											<StatusIcon
+												type="backlog"
+												color="#6B7280"
+											/>
+											<span className="font-medium">Backlog Type</span>
+										</div>
+										<p className="text-sm text-muted-foreground ml-9">
+											Dashed circle outline
+										</p>
+									</div>
+
+									{/* Unstarted */}
+									<div className="p-4 rounded-lg border border-border bg-card">
+										<div className="flex items-center gap-3 mb-2">
+											<StatusIcon
+												type="unstarted"
+												color="#3B82F6"
+											/>
+											<span className="font-medium">Unstarted Type</span>
+										</div>
+										<p className="text-sm text-muted-foreground ml-9">
+											Solid circle outline
+										</p>
+									</div>
+
+									{/* Started */}
+									<div className="p-4 rounded-lg border border-border bg-card">
+										<div className="flex items-center gap-3 mb-2">
+											<StatusIcon
+												type="started"
+												color="#F59E0B"
+											/>
+											<span className="font-medium">Started Type</span>
+										</div>
+										<p className="text-sm text-muted-foreground ml-9">
+											Filled circle with thin gap between fill and border
+										</p>
+									</div>
+
+									{/* Completed */}
+									<div className="p-4 rounded-lg border border-border bg-card">
+										<div className="flex items-center gap-3 mb-2">
+											<StatusIcon
+												type="completed"
+												color="#8B5CF6"
+											/>
+											<span className="font-medium">Completed Type</span>
+										</div>
+										<p className="text-sm text-muted-foreground ml-9">
+											Filled circle with hollow check icon
+										</p>
+									</div>
+
+									{/* Cancelled */}
+									<div className="p-4 rounded-lg border border-border bg-card">
+										<div className="flex items-center gap-3 mb-2">
+											<StatusIcon
+												type="cancelled"
+												color="#6B7280"
+											/>
+											<span className="font-medium">Cancelled Type</span>
+										</div>
+										<p className="text-sm text-muted-foreground ml-9">
+											Filled circle with hollow X icon
+										</p>
+									</div>
+								</div>
+							</div>
+
+							{/* Hover States */}
+							<div>
+								<h3 className="text-sm font-medium mb-3">Hover States</h3>
+								<div className="grid grid-cols-5 gap-4 p-4 rounded-lg border border-border bg-card">
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon
+											type="backlog"
+											color="#6B7280"
+											showHover={true}
+										/>
+										<span className="text-xs text-muted-foreground">
+											Backlog
+										</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon
+											type="unstarted"
+											color="#3B82F6"
+											showHover={true}
+										/>
+										<span className="text-xs text-muted-foreground">
+											Unstarted
+										</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon
+											type="started"
+											color="#F59E0B"
+											showHover={true}
+										/>
+										<span className="text-xs text-muted-foreground">
+											Started
+										</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon
+											type="completed"
+											color="#8B5CF6"
+											showHover={true}
+										/>
+										<span className="text-xs text-muted-foreground">
+											Completed
+										</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon
+											type="cancelled"
+											color="#6B7280"
+											showHover={true}
+										/>
+										<span className="text-xs text-muted-foreground">
+											Cancelled
+										</span>
+									</div>
+								</div>
+								<p className="text-xs text-muted-foreground mt-2 ml-2">
+									Hover over any icon to see the brightness effect
+								</p>
+							</div>
+						</div>
+					</section>
+				</div>
+			</ScrollArea>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
index 5e58414e87c..edaae24726b 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
@@ -1,270 +1,10 @@
-import type { TaskPriority } from "@superset/db/enums";
-import type { SelectTask } from "@superset/db/schema";
-import { Badge } from "@superset/ui/badge";
-import { Button } from "@superset/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@superset/ui/card";
-import {
-	Dialog,
-	DialogContent,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-} from "@superset/ui/dialog";
-import { Input } from "@superset/ui/input";
-import { Label } from "@superset/ui/label";
 import { ScrollArea } from "@superset/ui/scroll-area";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@superset/ui/select";
-import { toast } from "@superset/ui/sonner";
-import { Textarea } from "@superset/ui/textarea";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useState } from "react";
-import {
-	HiCalendar,
-	HiCheckCircle,
-	HiLink,
-	HiPencil,
-	HiUser,
-} from "react-icons/hi2";
-import { useCollections } from "renderer/contexts/CollectionsProvider";
+import { HiCheckCircle } from "react-icons/hi2";
+import { TasksTableView } from "./components/TasksTableView";
+import { useTasksTable } from "./hooks/useTasksTable";
 
-interface TaskEditDialogProps {
-	task: SelectTask;
-	open: boolean;
-	onOpenChange: (open: boolean) => void;
-}
-
-function TaskEditDialog({ task, open, onOpenChange }: TaskEditDialogProps) {
-	const collections = useCollections();
-	const [title, setTitle] = useState(task.title);
-	const [description, setDescription] = useState(task.description || "");
-	const [priority, setPriority] = useState(task.priority);
-	const [isSaving, setIsSaving] = useState(false);
-
-	const handleSave = async () => {
-		setIsSaving(true);
-		try {
-			await collections.tasks.update(task.id, (draft: SelectTask) => {
-				draft.title = title;
-				draft.description = description || null;
-				draft.priority = priority as
-					| "urgent"
-					| "high"
-					| "medium"
-					| "low"
-					| "none";
-			});
-			toast.success("Task updated");
-			onOpenChange(false);
-		} catch (error) {
-			console.error("[TaskEditDialog] Update failed:", error);
-			toast.error(
-				`Failed to update task: ${error instanceof Error ? error.message : String(error)}`,
-			);
-		} finally {
-			setIsSaving(false);
-		}
-	};
-
-	return (
-		<Dialog open={open} onOpenChange={onOpenChange}>
-			<DialogContent className="sm:max-w-[500px]">
-				<DialogHeader>
-					<DialogTitle className="flex items-center gap-2">
-						{task.externalKey && (
-							<Badge variant="outline" className="text-xs">
-								{task.externalKey}
-							</Badge>
-						)}
-						Edit Task
-					</DialogTitle>
-				</DialogHeader>
-				<div className="grid gap-4 py-4">
-					<div className="grid gap-2">
-						<Label htmlFor="title">Title</Label>
-						<Input
-							id="title"
-							value={title}
-							onChange={(e) => setTitle(e.target.value)}
-						/>
-					</div>
-					<div className="grid gap-2">
-						<Label htmlFor="description">Description</Label>
-						<Textarea
-							id="description"
-							value={description}
-							onChange={(e) => setDescription(e.target.value)}
-							rows={4}
-						/>
-					</div>
-					<div className="grid gap-2">
-						<Label htmlFor="priority">Priority</Label>
-						<Select
-							value={priority}
-							onValueChange={(v) => setPriority(v as TaskPriority)}
-						>
-							<SelectTrigger>
-								<SelectValue />
-							</SelectTrigger>
-							<SelectContent>
-								<SelectItem value="urgent">Urgent</SelectItem>
-								<SelectItem value="high">High</SelectItem>
-								<SelectItem value="medium">Medium</SelectItem>
-								<SelectItem value="low">Low</SelectItem>
-								<SelectItem value="none">None</SelectItem>
-							</SelectContent>
-						</Select>
-					</div>
-				</div>
-				<DialogFooter>
-					<Button variant="outline" onClick={() => onOpenChange(false)}>
-						Cancel
-					</Button>
-					<Button onClick={handleSave} disabled={isSaving || !title.trim()}>
-						{isSaving ? "Saving..." : "Save & Sync to Linear"}
-					</Button>
-				</DialogFooter>
-			</DialogContent>
-		</Dialog>
-	);
-}
-
-function TaskCard({
-	task,
-	onEdit,
-}: {
-	task: SelectTask;
-	onEdit: (task: SelectTask) => void;
-}) {
-	const priorityColors: Record<string, string> = {
-		urgent: "bg-red-500",
-		high: "bg-orange-500",
-		medium: "bg-yellow-500",
-		low: "bg-blue-500",
-		none: "bg-gray-400",
-	};
-
-	const statusColors: Record<string, string> = {
-		backlog: "bg-gray-400",
-		todo: "bg-blue-400",
-		planning: "bg-purple-400",
-		working: "bg-yellow-400",
-		"needs-feedback": "bg-orange-400",
-		"ready-to-merge": "bg-green-400",
-		completed: "bg-green-600",
-		canceled: "bg-red-400",
-	};
-
-	return (
-		<Card className="hover:bg-muted/50 transition-colors group">
-			<CardHeader className="pb-2">
-				<div className="flex items-start justify-between gap-2">
-					<div className="flex items-center gap-2 min-w-0">
-						{task.externalKey && (
-							<Badge variant="outline" className="shrink-0 text-xs">
-								{task.externalKey}
-							</Badge>
-						)}
-						<CardTitle className="text-sm font-medium truncate">
-							{task.title}
-						</CardTitle>
-					</div>
-					<div className="flex items-center gap-1.5 shrink-0">
-						<Button
-							variant="ghost"
-							size="icon"
-							className="h-6 w-6 opacity-0 group-hover:opacity-100 transition-opacity"
-							onClick={() => onEdit(task)}
-						>
-							<HiPencil className="h-3 w-3" />
-						</Button>
-						{task.priority !== "none" && (
-							<div
-								className={`h-2 w-2 rounded-full ${priorityColors[task.priority] || "bg-gray-400"}`}
-								title={`Priority: ${task.priority}`}
-							/>
-						)}
-						<Badge
-							variant="secondary"
-							className={`text-xs text-white ${statusColors[task.status] || (task.statusColor ? "" : "bg-gray-400")}`}
-							style={
-								task.statusColor
-									? { backgroundColor: task.statusColor }
-									: undefined
-							}
-						>
-							{task.status}
-						</Badge>
-					</div>
-				</div>
-			</CardHeader>
-			<CardContent className="pt-0">
-				{task.description && (
-					<p className="text-xs text-muted-foreground line-clamp-2 mb-2">
-						{task.description}
-					</p>
-				)}
-				<div className="flex flex-wrap gap-3 text-xs text-muted-foreground">
-					{task.assigneeId && (
-						<span className="flex items-center gap-1">
-							<HiUser className="h-3 w-3" />
-							Assigned
-						</span>
-					)}
-					{task.dueDate && (
-						<span className="flex items-center gap-1">
-							<HiCalendar className="h-3 w-3" />
-							{new Date(task.dueDate).toLocaleDateString()}
-						</span>
-					)}
-					{task.branch && (
-						<span className="flex items-center gap-1 font-mono">
-							{task.branch}
-						</span>
-					)}
-					{task.externalUrl && (
-						<a
-							href={task.externalUrl}
-							target="_blank"
-							rel="noopener noreferrer"
-							className="flex items-center gap-1 hover:text-foreground"
-						>
-							<HiLink className="h-3 w-3" />
-							{task.externalProvider || "Link"}
-						</a>
-					)}
-				</div>
-				{task.labels && task.labels.length > 0 && (
-					<div className="flex flex-wrap gap-1 mt-2">
-						{(task.labels as string[]).map((label) => (
-							<Badge key={label} variant="outline" className="text-xs">
-								{label}
-							</Badge>
-						))}
-					</div>
-				)}
-			</CardContent>
-		</Card>
-	);
-}
-
-function TasksList() {
-	const collections = useCollections();
-	const [editingTask, setEditingTask] = useState<SelectTask | null>(null);
-
-	const { data: allTasks, isLoading } = useLiveQuery(
-		(q) => q.from({ tasks: collections.tasks }),
-		[collections],
-	);
-
-	// Filter out deleted tasks in JavaScript
-	const tasks = (allTasks?.filter((task) => task.deletedAt === null) ||
-		[]) as SelectTask[];
+export function TasksView() {
+	const { table, isLoading } = useTasksTable();
 
 	if (isLoading) {
 		return (
@@ -274,7 +14,7 @@ function TasksList() {
 		);
 	}
 
-	if (tasks.length === 0) {
+	if (table.getRowModel().rows.length === 0) {
 		return (
 			<div className="flex items-center justify-center h-64">
 				<div className="flex flex-col items-center gap-2 text-muted-foreground">
@@ -285,29 +25,10 @@ function TasksList() {
 		);
 	}
 
-	return (
-		<>
-			<div className="grid gap-3 p-4">
-				{tasks.map((task) => (
-					<TaskCard key={task.id} task={task} onEdit={setEditingTask} />
-				))}
-			</div>
-			{editingTask && (
-				<TaskEditDialog
-					task={editingTask}
-					open={!!editingTask}
-					onOpenChange={(open) => !open && setEditingTask(null)}
-				/>
-			)}
-		</>
-	);
-}
-
-export function TasksView() {
 	return (
 		<div className="flex-1 flex flex-col min-h-0">
 			<ScrollArea className="flex-1 min-h-0">
-				<TasksList />
+				<TasksTableView table={table} />
 			</ScrollArea>
 		</div>
 	);
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
new file mode 100644
index 00000000000..bf87a5015a6
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
@@ -0,0 +1,164 @@
+import { cn } from "@superset/ui/utils";
+
+export type StatusType =
+	| "backlog"
+	| "unstarted"
+	| "started"
+	| "completed"
+	| "cancelled";
+
+interface StatusIconProps {
+	type: StatusType;
+	color: string;
+	showHover?: boolean;
+	className?: string;
+}
+
+export function StatusIcon({
+	type,
+	color,
+	showHover = false,
+	className,
+}: StatusIconProps) {
+	const sizeClass = "w-3.5 h-3.5";
+
+	const containerClasses = cn(
+		"flex items-center justify-center rounded-full flex-shrink-0",
+		sizeClass,
+		showHover && "transition-all hover:brightness-120 duration-100",
+		className,
+	);
+
+	if (type === "backlog") {
+		return (
+			<div className={containerClasses}>
+				<svg
+					viewBox="0 0 14 14"
+					className={sizeClass}
+					fill="none"
+					xmlns="http://www.w3.org/2000/svg"
+				>
+					<circle
+						cx="7"
+						cy="7"
+						r="6"
+						stroke={color}
+						strokeWidth="1.5"
+						strokeDasharray="1.4 1.74"
+						strokeDashoffset="0.65"
+					/>
+				</svg>
+			</div>
+		);
+	}
+
+	if (type === "unstarted") {
+		return (
+			<div className={containerClasses}>
+				<svg
+					viewBox="0 0 14 14"
+					className={sizeClass}
+					fill="none"
+					xmlns="http://www.w3.org/2000/svg"
+				>
+					<circle cx="7" cy="7" r="6" stroke={color} strokeWidth="1.5" />
+				</svg>
+			</div>
+		);
+	}
+
+	if (type === "started") {
+		return (
+			<div className={containerClasses}>
+				<svg
+					viewBox="0 0 14 14"
+					className={sizeClass}
+					fill="none"
+					xmlns="http://www.w3.org/2000/svg"
+				>
+					<circle
+						cx="7"
+						cy="7"
+						r="6"
+						stroke={color}
+						strokeWidth="1.5"
+						strokeDasharray="3.14 0"
+						strokeDashoffset="-0.7"
+					/>
+					<circle cx="7" cy="7" r="2" stroke={color} strokeWidth="4" />
+				</svg>
+			</div>
+		);
+	}
+
+	if (type === "completed") {
+		return (
+			<div className={containerClasses}>
+				<svg
+					viewBox="0 0 14 14"
+					className={sizeClass}
+					fill="none"
+					xmlns="http://www.w3.org/2000/svg"
+				>
+					<circle
+						cx="7"
+						cy="7"
+						r="6"
+						stroke={color}
+						strokeWidth="1.5"
+						strokeDasharray="3.14 0"
+						strokeDashoffset="-0.7"
+					/>
+					<circle cx="7" cy="7" r="3" stroke={color} strokeWidth="6" />
+					<path
+						className="fill-background"
+						stroke="none"
+						d="M10.951 4.24896C11.283 4.58091 11.283 5.11909 10.951 5.45104L5.95104 10.451C5.61909 10.783 5.0809 10.783 4.74896 10.451L2.74896 8.45104C2.41701 8.11909 2.41701 7.5809 2.74896 7.24896C3.0809 6.91701 3.61909 6.91701 3.95104 7.24896L5.35 8.64792L9.74896 4.24896C10.0809 3.91701 10.6191 3.91701 10.951 4.24896Z"
+					/>
+				</svg>
+			</div>
+		);
+	}
+
+	if (type === "cancelled") {
+		return (
+			<div className={containerClasses}>
+				<svg
+					viewBox="0 0 14 14"
+					className={sizeClass}
+					fill="none"
+					xmlns="http://www.w3.org/2000/svg"
+				>
+					<circle
+						cx="7"
+						cy="7"
+						r="6"
+						stroke={color}
+						strokeWidth="1.5"
+						strokeDasharray="3.14 0"
+						strokeDashoffset="-0.7"
+					/>
+					<circle cx="7" cy="7" r="3" stroke={color} strokeWidth="6" />
+					<path
+						className="fill-background"
+						stroke="none"
+						d="M3.73657 3.73657C4.05199 3.42114 4.56339 3.42114 4.87881 3.73657L5.93941 4.79716L7 5.85775L9.12117 3.73657C9.4366 3.42114 9.94801 3.42114 10.2634 3.73657C10.5789 4.05199 10.5789 4.56339 10.2634 4.87881L8.14225 7L10.2634 9.12118C10.5789 9.4366 10.5789 9.94801 10.2634 10.2634C9.94801 10.5789 9.4366 10.5789 9.12117 10.2634L7 8.14225L4.87881 10.2634C4.56339 10.5789 4.05199 10.5789 3.73657 10.2634C3.42114 9.94801 3.42114 9.4366 3.73657 9.12118L4.79716 8.06059L5.85775 7L3.73657 4.87881C3.42114 4.56339 3.42114 4.05199 3.73657 3.73657Z"
+					/>
+				</svg>
+			</div>
+		);
+	}
+
+	return (
+		<div className={containerClasses}>
+			<svg
+				viewBox="0 0 14 14"
+				className={sizeClass}
+				fill="none"
+				xmlns="http://www.w3.org/2000/svg"
+			>
+				<circle cx="7" cy="7" r="6" stroke={color} strokeWidth="1.5" />
+			</svg>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/constants.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/constants.ts
new file mode 100644
index 00000000000..eb35726c298
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/constants.ts
@@ -0,0 +1,10 @@
+export const STATUS_COLORS: Record<string, string> = {
+	backlog: "text-gray-400",
+	todo: "text-blue-400",
+	planning: "text-purple-400",
+	working: "text-yellow-400",
+	"needs-feedback": "text-orange-400",
+	"ready-to-merge": "text-green-400",
+	completed: "text-green-600",
+	canceled: "text-red-400",
+};
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
new file mode 100644
index 00000000000..328c2e4860a
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
@@ -0,0 +1,2 @@
+export { StatusIcon, type StatusType } from "./StatusIcon";
+export { STATUS_COLORS } from "./constants";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
new file mode 100644
index 00000000000..4652a7c9088
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
@@ -0,0 +1,57 @@
+import { flexRender, type Table } from "@tanstack/react-table";
+import type { SelectTask } from "@superset/db/schema";
+
+interface TasksTableViewProps {
+	table: Table<SelectTask>;
+}
+
+export function TasksTableView({ table }: TasksTableViewProps) {
+	return (
+		<div className="flex flex-col">
+			{table.getRowModel().rows.map((row) => {
+				// Group header rows have subRows, leaf rows don't
+				const isGroupHeader = row.subRows && row.subRows.length > 0;
+
+				if (isGroupHeader) {
+					// Group header - only render the status column (first cell)
+					// All other cells return null because they're placeholders
+					const firstCell = row.getVisibleCells()[0];
+					return (
+						<div
+							key={row.id}
+							className="sticky top-0 z-10 bg-background border-b border-border"
+						>
+							{flexRender(firstCell.column.columnDef.cell, firstCell.getContext())}
+						</div>
+					);
+				}
+
+				// Leaf row - render all cells horizontally
+				// Layout: [ID] [Status Icon + Title .............. | Priority Assignee Labels Due]
+				// Note: Status column (index 0) returns null for leaf rows, so we skip it
+				const cells = row.getVisibleCells();
+				return (
+					<div
+						key={row.id}
+						className="flex items-center gap-2 px-4 py-2 hover:bg-accent/50 cursor-pointer border-b border-border/50"
+					>
+						{/* Left side: ID + Title (with inline status) - skip null status column */}
+						{cells.slice(1, 3).map((cell) => (
+							<div key={cell.id}>
+								{flexRender(cell.column.columnDef.cell, cell.getContext())}
+							</div>
+						))}
+						{/* Right side metadata: Priority, Assignee, Labels, Due */}
+						<div className="flex items-center gap-2 flex-shrink-0">
+							{cells.slice(3).map((cell) => (
+								<div key={cell.id}>
+									{flexRender(cell.column.columnDef.cell, cell.getContext())}
+								</div>
+							))}
+						</div>
+					</div>
+				);
+			})}
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/index.ts
new file mode 100644
index 00000000000..d6823901bbf
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/index.ts
@@ -0,0 +1 @@
+export { TasksTableView } from "./TasksTableView";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
new file mode 100644
index 00000000000..ffbd687e625
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -0,0 +1,156 @@
+import { useState, useMemo } from "react";
+import type { CellContext } from "@tanstack/react-table";
+import type { SelectTask } from "@superset/db/schema";
+import { useLiveQuery } from "@tanstack/react-db";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuSeparator,
+	DropdownMenuTrigger,
+} from "@superset/ui/dropdown-menu";
+import { Input } from "@superset/ui/input";
+import { Button } from "@superset/ui/button";
+import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { useCollections } from "renderer/contexts/CollectionsProvider";
+
+interface AssigneeCellProps {
+	info: CellContext<SelectTask, string | null>;
+}
+
+export function AssigneeCell({ info }: AssigneeCellProps) {
+	const collections = useCollections();
+	const [open, setOpen] = useState(false);
+	const [searchQuery, setSearchQuery] = useState("");
+
+	const task = info.row.original;
+	const assigneeId = info.getValue();
+
+	// Lazy load users only when dropdown opens
+	const { data: allUsers } = useLiveQuery(
+		(q) => (open ? q.from({ users: collections.users }) : null),
+		[collections, open],
+	);
+
+	const users = useMemo(() => allUsers || [], [allUsers]);
+
+	// Find current assignee
+	const currentAssignee = useMemo(() => {
+		if (!assigneeId) return null;
+		return users.find((u) => u.id === assigneeId);
+	}, [assigneeId, users]);
+
+	// Filter users based on search query
+	const filteredUsers = useMemo(() => {
+		const query = searchQuery.toLowerCase();
+		return users.filter(
+			(user) =>
+				user.name.toLowerCase().includes(query) ||
+				user.email.toLowerCase().includes(query),
+		);
+	}, [searchQuery, users]);
+
+	const handleSelectUser = async (userId: string | null) => {
+		if (userId === assigneeId) {
+			setOpen(false);
+			return;
+		}
+
+		try {
+			await collections.tasks.update(task.id, (draft) => {
+				draft.assigneeId = userId;
+			});
+			setOpen(false);
+			setSearchQuery("");
+		} catch (error) {
+			console.error("[AssigneeCell] Failed to update assignee:", error);
+		}
+	};
+
+	const getInitials = (name: string) => {
+		return name
+			.split(" ")
+			.map((n) => n[0])
+			.join("")
+			.toUpperCase()
+			.slice(0, 2);
+	};
+
+	return (
+		<DropdownMenu open={open} onOpenChange={setOpen}>
+			<DropdownMenuTrigger asChild>
+				<Button variant="ghost" size="sm" className="h-6 px-2 hover:bg-accent">
+					{currentAssignee ? (
+						<div className="flex items-center gap-2">
+							<Avatar className="h-4 w-4">
+								{currentAssignee.image && (
+									<AvatarImage src={currentAssignee.image} />
+								)}
+								<AvatarFallback className="text-xs">
+									{getInitials(currentAssignee.name)}
+								</AvatarFallback>
+							</Avatar>
+							<span className="text-xs">{currentAssignee.name}</span>
+						</div>
+					) : (
+						<span className="text-xs text-muted-foreground">Unassigned</span>
+					)}
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="start" className="w-56">
+				<div className="p-2">
+					<Input
+						placeholder="Search users..."
+						value={searchQuery}
+						onChange={(e) => setSearchQuery(e.target.value)}
+						className="h-8"
+						autoFocus
+					/>
+				</div>
+				<DropdownMenuSeparator />
+				<div className="max-h-64 overflow-y-auto">
+					<DropdownMenuItem
+						onSelect={() => handleSelectUser(null)}
+						className="flex items-center gap-2"
+					>
+						<div className="h-4 w-4 rounded-full bg-muted" />
+						<span className="text-sm">Unassigned</span>
+						{!assigneeId && (
+							<span className="ml-auto text-xs text-muted-foreground">✓</span>
+						)}
+					</DropdownMenuItem>
+					{filteredUsers.map((user) => (
+						<DropdownMenuItem
+							key={user.id}
+							onSelect={() => handleSelectUser(user.id)}
+							className="flex items-center gap-2"
+						>
+							<Avatar className="h-4 w-4">
+								{user.image && <AvatarImage src={user.image} />}
+								<AvatarFallback className="text-xs">
+									{getInitials(user.name)}
+								</AvatarFallback>
+							</Avatar>
+							<div className="flex flex-col">
+								<span className="text-sm">{user.name}</span>
+								<span className="text-xs text-muted-foreground">
+									{user.email}
+								</span>
+							</div>
+							{user.id === assigneeId && (
+								<span className="ml-auto text-xs text-muted-foreground">
+									✓
+								</span>
+							)}
+						</DropdownMenuItem>
+					))}
+					{filteredUsers.length === 0 && searchQuery && (
+						<div className="p-2 text-sm text-muted-foreground text-center">
+							No users found
+						</div>
+					)}
+				</div>
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/index.ts
new file mode 100644
index 00000000000..045be14c7e1
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/index.ts
@@ -0,0 +1 @@
+export { AssigneeCell } from "./AssigneeCell";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
new file mode 100644
index 00000000000..688ea21c3ad
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
@@ -0,0 +1,134 @@
+import { useState, useMemo } from "react";
+import type { CellContext } from "@tanstack/react-table";
+import type { SelectTask } from "@superset/db/schema";
+import { useLiveQuery } from "@tanstack/react-db";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuCheckboxItem,
+	DropdownMenuSeparator,
+	DropdownMenuTrigger,
+} from "@superset/ui/dropdown-menu";
+import { Input } from "@superset/ui/input";
+import { Button } from "@superset/ui/button";
+import { Badge } from "@superset/ui/badge";
+import { useCollections } from "renderer/contexts/CollectionsProvider";
+import { HiPlus } from "react-icons/hi2";
+
+interface LabelsCellProps {
+	info: CellContext<SelectTask, string[] | null>;
+}
+
+export function LabelsCell({ info }: LabelsCellProps) {
+	const collections = useCollections();
+	const [open, setOpen] = useState(false);
+	const [searchQuery, setSearchQuery] = useState("");
+
+	const task = info.row.original;
+	const currentLabels = info.getValue() || [];
+
+	// Lazy load all tasks to get all unique labels
+	const { data: allTasks } = useLiveQuery(
+		(q) => (open ? q.from({ tasks: collections.tasks }) : null),
+		[collections, open],
+	);
+
+	// Get all unique labels across all tasks
+	const allLabels = useMemo(() => {
+		if (!allTasks) return [];
+		const labelsSet = new Set<string>();
+		for (const t of allTasks) {
+			if (t.labels && Array.isArray(t.labels)) {
+				for (const label of t.labels) {
+					labelsSet.add(label);
+				}
+			}
+		}
+		return Array.from(labelsSet).sort();
+	}, [allTasks]);
+
+	// Filter labels based on search query
+	const filteredLabels = useMemo(() => {
+		const query = searchQuery.toLowerCase();
+		return allLabels.filter((label) => label.toLowerCase().includes(query));
+	}, [searchQuery, allLabels]);
+
+	const handleToggleLabel = async (label: string) => {
+		try {
+			await collections.tasks.update(task.id, (draft) => {
+				if (!draft.labels) {
+					draft.labels = [label];
+				} else if (draft.labels.includes(label)) {
+					draft.labels = draft.labels.filter((l) => l !== label);
+				} else {
+					draft.labels = [...draft.labels, label];
+				}
+			});
+		} catch (error) {
+			console.error("[LabelsCell] Failed to update labels:", error);
+		}
+	};
+
+	return (
+		<DropdownMenu open={open} onOpenChange={setOpen}>
+			<DropdownMenuTrigger asChild>
+				<Button
+					variant="ghost"
+					size="sm"
+					className="h-6 px-2 hover:bg-accent flex-shrink-0"
+				>
+					{currentLabels.length > 0 ? (
+						<div className="flex gap-1">
+							{currentLabels.slice(0, 2).map((label) => (
+								<Badge key={label} variant="outline" className="text-xs">
+									{label}
+								</Badge>
+							))}
+							{currentLabels.length > 2 && (
+								<Badge variant="outline" className="text-xs">
+									+{currentLabels.length - 2}
+								</Badge>
+							)}
+						</div>
+					) : (
+						<div className="flex items-center gap-1 text-muted-foreground">
+							<HiPlus className="h-3 w-3" />
+							<span className="text-xs">Labels</span>
+						</div>
+					)}
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="start" className="w-56">
+				<div className="p-2">
+					<Input
+						placeholder="Search labels..."
+						value={searchQuery}
+						onChange={(e) => setSearchQuery(e.target.value)}
+						className="h-8"
+						autoFocus
+					/>
+				</div>
+				<DropdownMenuSeparator />
+				<div className="max-h-64 overflow-y-auto">
+					{filteredLabels.map((label) => (
+						<DropdownMenuCheckboxItem
+							key={label}
+							checked={currentLabels.includes(label)}
+							onCheckedChange={() => handleToggleLabel(label)}
+							className="text-sm"
+						>
+							{label}
+						</DropdownMenuCheckboxItem>
+					))}
+					{filteredLabels.length === 0 && (
+						<div className="p-2 text-sm text-muted-foreground text-center">
+							{searchQuery
+								? "No labels found"
+								: "No labels yet. Add labels to tasks to see them here."}
+						</div>
+					)}
+				</div>
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/index.ts
new file mode 100644
index 00000000000..286fc5bed38
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/index.ts
@@ -0,0 +1 @@
+export { LabelsCell } from "./LabelsCell";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
new file mode 100644
index 00000000000..ce000dc9400
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -0,0 +1,154 @@
+import { useState, useMemo } from "react";
+import type { CellContext } from "@tanstack/react-table";
+import type { SelectTask } from "@superset/db/schema";
+import { taskPriorityValues, type TaskPriority } from "@superset/db/enums";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuTrigger,
+} from "@superset/ui/dropdown-menu";
+import { Input } from "@superset/ui/input";
+import { Button } from "@superset/ui/button";
+import { useCollections } from "renderer/contexts/CollectionsProvider";
+import { PRIORITY_COLORS } from "./constants";
+
+interface PriorityCellProps {
+	info: CellContext<SelectTask, TaskPriority>;
+}
+
+export function PriorityCell({ info }: PriorityCellProps) {
+	const collections = useCollections();
+	const [open, setOpen] = useState(false);
+	const [searchQuery, setSearchQuery] = useState("");
+
+	const task = info.row.original;
+	const currentPriority = info.getValue();
+
+	// Filter priorities based on search query
+	const filteredPriorities = useMemo(() => {
+		const query = searchQuery.toLowerCase();
+		return taskPriorityValues.filter((priority: TaskPriority) =>
+			priority.toLowerCase().includes(query),
+		);
+	}, [searchQuery]);
+
+	const handleSelectPriority = async (newPriority: TaskPriority) => {
+		if (newPriority === currentPriority) {
+			setOpen(false);
+			return;
+		}
+
+		try {
+			await collections.tasks.update(task.id, (draft) => {
+				draft.priority = newPriority;
+			});
+			setOpen(false);
+			setSearchQuery("");
+		} catch (error) {
+			console.error("[PriorityCell] Failed to update priority:", error);
+		}
+	};
+
+	// Don't render anything if priority is "none"
+	if (currentPriority === "none" && !open) {
+		return (
+			<DropdownMenu open={open} onOpenChange={setOpen}>
+				<DropdownMenuTrigger asChild>
+					<Button
+						variant="ghost"
+						size="sm"
+						className="h-4 w-4 p-0 hover:bg-accent rounded-full opacity-0 group-hover:opacity-100"
+					>
+						<div className="w-2 h-2 rounded-full bg-muted" />
+					</Button>
+				</DropdownMenuTrigger>
+				<DropdownMenuContent align="start" className="w-40">
+					<div className="p-2">
+						<Input
+							placeholder="Search priority..."
+							value={searchQuery}
+							onChange={(e) => setSearchQuery(e.target.value)}
+							className="h-8"
+							autoFocus
+						/>
+					</div>
+					<div className="max-h-64 overflow-y-auto">
+						{filteredPriorities.map((priority: TaskPriority) => (
+							<DropdownMenuItem
+								key={priority}
+								onSelect={() => handleSelectPriority(priority)}
+								className="flex items-center gap-2"
+							>
+								<div
+									className={`w-2 h-2 rounded-full ${PRIORITY_COLORS[priority]}`}
+								/>
+								<span className="text-sm capitalize">{priority}</span>
+								{priority === currentPriority && (
+									<span className="ml-auto text-xs text-muted-foreground">
+										✓
+									</span>
+								)}
+							</DropdownMenuItem>
+						))}
+						{filteredPriorities.length === 0 && (
+							<div className="p-2 text-sm text-muted-foreground text-center">
+								No priority found
+							</div>
+						)}
+					</div>
+				</DropdownMenuContent>
+			</DropdownMenu>
+		);
+	}
+
+	return (
+		<DropdownMenu open={open} onOpenChange={setOpen}>
+			<DropdownMenuTrigger asChild>
+				<Button
+					variant="ghost"
+					size="sm"
+					className="h-4 w-4 p-0 hover:bg-accent rounded-full"
+					title={currentPriority}
+				>
+					<div
+						className={`w-2 h-2 rounded-full ${PRIORITY_COLORS[currentPriority]}`}
+					/>
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="start" className="w-40">
+				<div className="p-2">
+					<Input
+						placeholder="Search priority..."
+						value={searchQuery}
+						onChange={(e) => setSearchQuery(e.target.value)}
+						className="h-8"
+						autoFocus
+					/>
+				</div>
+				<div className="max-h-64 overflow-y-auto">
+					{filteredPriorities.map((priority: TaskPriority) => (
+						<DropdownMenuItem
+							key={priority}
+							onSelect={() => handleSelectPriority(priority)}
+							className="flex items-center gap-2"
+						>
+							<div
+								className={`w-2 h-2 rounded-full ${PRIORITY_COLORS[priority]}`}
+							/>
+							<span className="text-sm capitalize">{priority}</span>
+							{priority === currentPriority && (
+								<span className="ml-auto text-xs text-muted-foreground">✓</span>
+							)}
+						</DropdownMenuItem>
+					))}
+					{filteredPriorities.length === 0 && (
+						<div className="p-2 text-sm text-muted-foreground text-center">
+							No priority found
+						</div>
+					)}
+				</div>
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts
new file mode 100644
index 00000000000..7feb29ff5a3
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts
@@ -0,0 +1,7 @@
+export const PRIORITY_COLORS: Record<string, string> = {
+	urgent: "bg-red-500",
+	high: "bg-orange-500",
+	medium: "bg-yellow-500",
+	low: "bg-blue-500",
+	none: "bg-gray-400",
+};
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/index.ts
new file mode 100644
index 00000000000..fdea06560e7
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/index.ts
@@ -0,0 +1 @@
+export { PriorityCell } from "./PriorityCell";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
new file mode 100644
index 00000000000..2872c07ee9f
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -0,0 +1,105 @@
+import { useState, useMemo } from "react";
+import type { CellContext } from "@tanstack/react-table";
+import type { SelectTask } from "@superset/db/schema";
+import { taskStatusEnumValues, type TaskStatus } from "@superset/db/enums";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuTrigger,
+} from "@superset/ui/dropdown-menu";
+import { Input } from "@superset/ui/input";
+import { Button } from "@superset/ui/button";
+import { useCollections } from "renderer/contexts/CollectionsProvider";
+import { StatusIcon, STATUS_COLORS } from "../../StatusIcon";
+
+interface StatusCellProps {
+	info: CellContext<SelectTask, string>;
+}
+
+export function StatusCell({ info }: StatusCellProps) {
+	const collections = useCollections();
+	const [open, setOpen] = useState(false);
+	const [searchQuery, setSearchQuery] = useState("");
+
+	const task = info.row.original;
+	const currentStatus = info.getValue();
+
+	// Filter statuses based on search query
+	const filteredStatuses = useMemo(() => {
+		const query = searchQuery.toLowerCase();
+		return taskStatusEnumValues.filter((status: TaskStatus) =>
+			status.replace("-", " ").toLowerCase().includes(query),
+		);
+	}, [searchQuery]);
+
+	const handleSelectStatus = async (newStatus: TaskStatus) => {
+		if (newStatus === currentStatus) {
+			setOpen(false);
+			return;
+		}
+
+		try {
+			await collections.tasks.update(task.id, (draft) => {
+				draft.status = newStatus;
+			});
+			setOpen(false);
+			setSearchQuery("");
+		} catch (error) {
+			console.error("[StatusCell] Failed to update status:", error);
+		}
+	};
+
+	return (
+		<DropdownMenu open={open} onOpenChange={setOpen}>
+			<DropdownMenuTrigger asChild>
+				<Button
+					variant="ghost"
+					size="sm"
+					className="h-6 w-6 p-0 hover:bg-accent"
+				>
+					<StatusIcon
+						type={currentStatus as any}
+						color={STATUS_COLORS[currentStatus] || "#8B5CF6"}
+					/>
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent align="start" className="w-48">
+				<div className="p-2">
+					<Input
+						placeholder="Search status..."
+						value={searchQuery}
+						onChange={(e) => setSearchQuery(e.target.value)}
+						className="h-8"
+						autoFocus
+					/>
+				</div>
+				<div className="max-h-64 overflow-y-auto">
+					{filteredStatuses.map((status: TaskStatus) => (
+						<DropdownMenuItem
+							key={status}
+							onSelect={() => handleSelectStatus(status)}
+							className="flex items-center gap-2"
+						>
+							<StatusIcon
+								type={status as any}
+								color={STATUS_COLORS[status] || "#8B5CF6"}
+							/>
+							<span className="text-sm capitalize">
+								{status.replace("-", " ")}
+							</span>
+							{status === currentStatus && (
+								<span className="ml-auto text-xs text-muted-foreground">✓</span>
+							)}
+						</DropdownMenuItem>
+					))}
+					{filteredStatuses.length === 0 && (
+						<div className="p-2 text-sm text-muted-foreground text-center">
+							No status found
+						</div>
+					)}
+				</div>
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/index.ts
new file mode 100644
index 00000000000..9a2999036a2
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/index.ts
@@ -0,0 +1 @@
+export { StatusCell } from "./StatusCell";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
new file mode 100644
index 00000000000..60a6208b821
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
@@ -0,0 +1 @@
+export { useTasksTable } from "./useTasksTable";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
new file mode 100644
index 00000000000..e599f07c9c6
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -0,0 +1,178 @@
+import { useMemo, useState } from "react";
+import {
+	type ColumnDef,
+	type ExpandedState,
+	type Table,
+	createColumnHelper,
+	getCoreRowModel,
+	getExpandedRowModel,
+	getGroupedRowModel,
+	useReactTable,
+} from "@tanstack/react-table";
+import type { SelectTask } from "@superset/db/schema";
+import { useLiveQuery } from "@tanstack/react-db";
+import { format } from "date-fns";
+import { Button } from "@superset/ui/button";
+import { HiChevronDown, HiChevronRight } from "react-icons/hi2";
+import { useCollections } from "renderer/contexts/CollectionsProvider";
+import { StatusIcon, STATUS_COLORS } from "../../components/StatusIcon";
+import { StatusCell } from "../../components/cells/StatusCell";
+import { PriorityCell } from "../../components/cells/PriorityCell";
+import { AssigneeCell } from "../../components/cells/AssigneeCell";
+import { LabelsCell } from "../../components/cells/LabelsCell";
+
+const columnHelper = createColumnHelper<SelectTask>();
+
+export function useTasksTable(): {
+	table: Table<SelectTask>;
+	isLoading: boolean;
+} {
+	const collections = useCollections();
+	const [grouping, setGrouping] = useState<string[]>(["status"]);
+	const [expanded, setExpanded] = useState<ExpandedState>(true);
+
+	const { data: allTasks, isLoading } = useLiveQuery(
+		(q) => q.from({ tasks: collections.tasks }),
+		[collections],
+	);
+
+	const data = useMemo(
+		() => allTasks?.filter((task) => task.deletedAt === null) || [],
+		[allTasks],
+	);
+
+	// TODO: Add localStorage persistence for collapsed groups
+
+	// Define columns with useMemo (following official docs pattern)
+	const columns = useMemo<ColumnDef<SelectTask>[]>(
+		() => [
+			// Status column (grouped) - only shows for group headers
+			columnHelper.accessor("status", {
+				header: "Status",
+				cell: (info) => {
+					const { row, cell } = info;
+
+					if (cell.getIsGrouped()) {
+						// Group header row
+						return (
+							<Button
+								variant="ghost"
+								className="w-full justify-start px-4 py-2 h-auto hover:bg-accent/50"
+								onClick={row.getToggleExpandedHandler()}
+							>
+								<div className="flex items-center gap-2">
+									{row.getIsExpanded() ? (
+										<HiChevronDown className="h-4 w-4 text-muted-foreground" />
+									) : (
+										<HiChevronRight className="h-4 w-4 text-muted-foreground" />
+									)}
+									<StatusIcon
+										type={info.getValue() as any}
+										color={STATUS_COLORS[info.getValue()] || "#8B5CF6"}
+									/>
+									<span className="text-sm font-medium capitalize">
+										{info.getValue().replace("-", " ")}
+									</span>
+									<span className="text-xs text-muted-foreground">
+										({row.subRows.length})
+									</span>
+								</div>
+							</Button>
+						);
+					}
+
+					// For leaf rows, return null - status icon is shown in title column
+					return null;
+				},
+			}),
+
+			// Task ID - simple inline rendering
+			columnHelper.accessor("slug", {
+				header: "ID",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					return (
+						<span className="text-xs text-muted-foreground font-mono w-20 flex-shrink-0">
+							{info.getValue()}
+						</span>
+					);
+				},
+			}),
+
+			// Title - status icon + title inline (Linear style)
+			columnHelper.accessor("title", {
+				header: "Title",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					const task = info.row.original;
+					return (
+						<div className="flex items-center gap-2 flex-1 min-w-0">
+							<StatusCell info={{ ...info, getValue: () => task.status } as any} />
+							<span className="text-sm font-medium truncate">
+								{info.getValue()}
+							</span>
+						</div>
+					);
+				},
+			}),
+
+			// Priority - clickable dropdown
+			columnHelper.accessor("priority", {
+				header: "Priority",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					return <PriorityCell info={info} />;
+				},
+			}),
+
+			// Assignee - clickable dropdown
+			columnHelper.accessor("assigneeId", {
+				header: "Assignee",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					return <AssigneeCell info={info} />;
+				},
+			}),
+
+			// Labels - multi-select dropdown
+			columnHelper.accessor("labels", {
+				header: "Labels",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					return <LabelsCell info={info} />;
+				},
+			}),
+
+			// Due date - simple inline rendering
+			columnHelper.accessor("dueDate", {
+				header: "Due",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					const date = info.getValue();
+					if (!date) return null;
+					return (
+						<span className="text-xs text-muted-foreground flex-shrink-0">
+							{format(new Date(date), "MMM d")}
+						</span>
+					);
+				},
+			}),
+		],
+		[],
+	);
+
+	// Create table instance
+	const table = useReactTable({
+		data,
+		columns,
+		state: { grouping, expanded },
+		onGroupingChange: setGrouping,
+		onExpandedChange: setExpanded,
+		getCoreRowModel: getCoreRowModel(),
+		getGroupedRowModel: getGroupedRowModel(),
+		getExpandedRowModel: getExpandedRowModel(),
+		autoResetExpanded: false,
+	});
+
+	return { table, isLoading };
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
index ec8598c5c26..b4ae0a476b8 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
@@ -5,6 +5,7 @@ import { useFeatureFlagEnabled } from "posthog-js/react";
 import { useState } from "react";
 import { HiOutlineClipboardDocumentList } from "react-icons/hi2";
 import {
+	LuBoxes,
 	LuLayers,
 	LuPanelLeft,
 	LuPanelLeftClose,
@@ -14,6 +15,7 @@ import { useWorkspaceSidebarStore } from "renderer/stores";
 import {
 	useCloseWorkspacesList,
 	useCurrentView,
+	useOpenComponents,
 	useOpenTasks,
 	useOpenWorkspacesList,
 } from "renderer/stores/app-state";
@@ -32,6 +34,7 @@ export function WorkspaceSidebarHeader({
 	const openWorkspacesList = useOpenWorkspacesList();
 	const closeWorkspacesList = useCloseWorkspacesList();
 	const openTasks = useOpenTasks();
+	const openComponents = useOpenComponents();
 	const { toggleCollapsed } = useWorkspaceSidebarStore();
 	const [isHovering, setIsHovering] = useState(false);
 	const hasTasksAccess = useFeatureFlagEnabled(
@@ -40,6 +43,7 @@ export function WorkspaceSidebarHeader({
 
 	const isWorkspacesListOpen = currentView === "workspaces-list";
 	const isTasksOpen = currentView === "tasks";
+	const isComponentsOpen = currentView === "components";
 
 	const handleClick = () => {
 		if (isWorkspacesListOpen) {
@@ -129,6 +133,24 @@ export function WorkspaceSidebarHeader({
 					</Tooltip>
 				)}
 
+				<Tooltip delayDuration={300}>
+					<TooltipTrigger asChild>
+						<button
+							type="button"
+							onClick={() => openComponents()}
+							className={cn(
+								"flex items-center justify-center size-8 rounded-md transition-colors",
+								isComponentsOpen
+									? "text-foreground bg-accent"
+									: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
+							)}
+						>
+							<LuBoxes className="size-4" strokeWidth={STROKE_WIDTH} />
+						</button>
+					</TooltipTrigger>
+					<TooltipContent side="right">Components</TooltipContent>
+				</Tooltip>
+
 				<NewWorkspaceButton isCollapsed />
 			</div>
 		);
@@ -197,6 +219,22 @@ export function WorkspaceSidebarHeader({
 				</button>
 			)}
 
+			<button
+				type="button"
+				onClick={() => openComponents()}
+				className={cn(
+					"flex items-center gap-2 px-2 py-1.5 w-full rounded-md transition-colors",
+					isComponentsOpen
+						? "text-foreground bg-accent"
+						: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
+				)}
+			>
+				<div className="flex items-center justify-center size-5">
+					<LuBoxes className="size-4" strokeWidth={STROKE_WIDTH} />
+				</div>
+				<span className="text-sm font-medium flex-1 text-left">Components</span>
+			</button>
+
 			<NewWorkspaceButton />
 		</div>
 	);
diff --git a/apps/desktop/src/renderer/screens/main/index.tsx b/apps/desktop/src/renderer/screens/main/index.tsx
index 2a20077abb7..57118b4a7a7 100644
--- a/apps/desktop/src/renderer/screens/main/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/index.tsx
@@ -32,6 +32,7 @@ import { dragDropManager } from "../../lib/dnd";
 import { AppFrame } from "./components/AppFrame";
 import { Background } from "./components/Background";
 import { ResizablePanel } from "./components/ResizablePanel";
+import { ComponentsShowcase } from "./components/ComponentsShowcase";
 import { SettingsView } from "./components/SettingsView";
 import { StartView } from "./components/StartView";
 import { TasksView } from "./components/TasksView";
@@ -300,6 +301,9 @@ export function MainScreen() {
 		if (currentView === "workspaces-list") {
 			return <WorkspacesListView />;
 		}
+		if (currentView === "components") {
+			return <ComponentsShowcase />;
+		}
 		return <WorkspaceView />;
 	};
 
diff --git a/apps/desktop/src/renderer/stores/app-state.ts b/apps/desktop/src/renderer/stores/app-state.ts
index 47fe07d2763..7d3ab1a813a 100644
--- a/apps/desktop/src/renderer/stores/app-state.ts
+++ b/apps/desktop/src/renderer/stores/app-state.ts
@@ -1,7 +1,7 @@
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 
-export type AppView = "workspace" | "settings" | "tasks" | "workspaces-list";
+export type AppView = "workspace" | "settings" | "tasks" | "workspaces-list" | "components";
 export type SettingsSection =
 	| "account"
 	| "project"
@@ -18,6 +18,7 @@ interface AppState {
 	isSettingsTabOpen: boolean;
 	isTasksTabOpen: boolean;
 	isWorkspacesListOpen: boolean;
+	isComponentsOpen: boolean;
 	settingsSection: SettingsSection;
 	setView: (view: AppView) => void;
 	openSettings: (section?: SettingsSection) => void;
@@ -28,6 +29,8 @@ interface AppState {
 	closeTasks: () => void;
 	openWorkspacesList: () => void;
 	closeWorkspacesList: () => void;
+	openComponents: () => void;
+	closeComponents: () => void;
 }
 
 export const useAppStore = create<AppState>()(
@@ -37,6 +40,7 @@ export const useAppStore = create<AppState>()(
 			isSettingsTabOpen: false,
 			isTasksTabOpen: false,
 			isWorkspacesListOpen: false,
+			isComponentsOpen: false,
 			settingsSection: "project",
 
 			setView: (view) => {
@@ -78,6 +82,14 @@ export const useAppStore = create<AppState>()(
 			closeWorkspacesList: () => {
 				set({ currentView: "workspace", isWorkspacesListOpen: false });
 			},
+
+			openComponents: () => {
+				set({ currentView: "components", isComponentsOpen: true });
+			},
+
+			closeComponents: () => {
+				set({ currentView: "workspace", isComponentsOpen: false });
+			},
 		}),
 		{ name: "AppStore" },
 	),
@@ -99,3 +111,7 @@ export const useOpenWorkspacesList = () =>
 	useAppStore((state) => state.openWorkspacesList);
 export const useCloseWorkspacesList = () =>
 	useAppStore((state) => state.closeWorkspacesList);
+export const useOpenComponents = () =>
+	useAppStore((state) => state.openComponents);
+export const useCloseComponents = () =>
+	useAppStore((state) => state.closeComponents);
diff --git a/bun.lock b/bun.lock
index 5e423dced2d..6d96e86f4a9 100644
--- a/bun.lock
+++ b/bun.lock
@@ -121,7 +121,7 @@
     },
     "apps/desktop": {
       "name": "@superset/desktop",
-      "version": "0.0.51",
+      "version": "0.0.52",
       "dependencies": {
         "@dnd-kit/core": "^6.3.1",
         "@dnd-kit/sortable": "^10.0.0",
@@ -142,6 +142,7 @@
         "@tanstack/electric-db-collection": "^0.2.20",
         "@tanstack/react-db": "^0.1.60",
         "@tanstack/react-query": "^5.90.10",
+        "@tanstack/react-table": "^8.21.3",
         "@trpc/client": "^11.7.1",
         "@trpc/react-query": "^11.7.1",
         "@trpc/server": "^11.7.1",
@@ -1337,10 +1338,14 @@
 
     "@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.91.1", "", { "dependencies": { "@tanstack/query-devtools": "5.91.1" }, "peerDependencies": { "@tanstack/react-query": "^5.90.10", "react": "^18 || ^19" } }, "sha512-tRnJYwEbH0kAOuToy8Ew7bJw1lX3AjkkgSlf/vzb+NpnqmHPdWM+lA2DSdGQSLi1SU0PDRrrCI1vnZnci96CsQ=="],
 
+    "@tanstack/react-table": ["@tanstack/react-table@8.21.3", "", { "dependencies": { "@tanstack/table-core": "8.21.3" }, "peerDependencies": { "react": ">=16.8", "react-dom": ">=16.8" } }, "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww=="],
+
     "@tanstack/react-virtual": ["@tanstack/react-virtual@3.13.13", "", { "dependencies": { "@tanstack/virtual-core": "3.13.13" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-4o6oPMDvQv+9gMi8rE6gWmsOjtUZUYIJHv7EB+GblyYdi8U6OqLl8rhHWIUZSL1dUU2dPwTdTgybCKf9EjIrQg=="],
 
     "@tanstack/store": ["@tanstack/store@0.8.0", "", {}, "sha512-Om+BO0YfMZe//X2z0uLF2j+75nQga6TpTJgLJQBiq85aOyZNIhkCgleNcud2KQg4k4v9Y9l+Uhru3qWMPGTOzQ=="],
 
+    "@tanstack/table-core": ["@tanstack/table-core@8.21.3", "", {}, "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg=="],
+
     "@tanstack/virtual-core": ["@tanstack/virtual-core@3.13.13", "", {}, "sha512-uQFoSdKKf5S8k51W5t7b2qpfkyIbdHMzAn+AMQvHPxKUPeo1SsGaA4JRISQT87jm28b7z8OEqPcg1IOZagQHcA=="],
 
     "@theguild/remark-mermaid": ["@theguild/remark-mermaid@0.3.0", "", { "dependencies": { "mermaid": "^11.0.0", "unist-util-visit": "^5.0.0" }, "peerDependencies": { "react": "^18.2.0 || ^19.0.0" } }, "sha512-Fy1J4FSj8totuHsHFpaeWyWRaRSIvpzGTRoEfnNJc1JmLV9uV70sYE3zcT+Jj5Yw20Xq4iCsiT+3Ho49BBZcBQ=="],

From 43beb678a4e92ac3196378190f01941d16f325fa Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sat, 10 Jan 2026 16:15:29 -0800
Subject: [PATCH 02/18] WIP'

---
 .../src/app/api/electric/[...path]/utils.ts   |    5 +
 .../api/integrations/linear/callback/route.ts |    6 +-
 .../api/integrations/linear/connect/route.ts  |    3 +-
 .../linear/jobs/initial-sync/route.ts         |   42 +-
 .../jobs/initial-sync/syncWorkflowStates.ts   |   90 +
 .../linear/jobs/initial-sync/utils.ts         |   65 +-
 .../linear/jobs/sync-task/route.ts            |   16 +-
 .../api/integrations/linear/webhook/route.ts  |   22 +-
 .../CollectionsProvider/collections.ts        |   20 +-
 .../components/ComponentsShowcase/index.tsx   |   33 +
 .../components/StatusIcon/StatusIcon.tsx      |   41 +-
 .../cells/StatusCell/StatusCell.tsx           |   60 +-
 .../hooks/useTasksTable/useTasksTable.tsx     |   73 +-
 .../0008_add_full_task_status_table.sql       |   29 +
 packages/db/drizzle/meta/0008_snapshot.json   | 1659 +++++++++++++++++
 packages/db/drizzle/meta/_journal.json        |    7 +
 packages/db/src/schema/relations.ts           |   23 +-
 packages/db/src/schema/schema.ts              |   51 +-
 packages/trpc/src/router/task/schema.ts       |    4 +-
 19 files changed, 2177 insertions(+), 72 deletions(-)
 create mode 100644 apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
 create mode 100644 packages/db/drizzle/0008_add_full_task_status_table.sql
 create mode 100644 packages/db/drizzle/meta/0008_snapshot.json

diff --git a/apps/api/src/app/api/electric/[...path]/utils.ts b/apps/api/src/app/api/electric/[...path]/utils.ts
index ba2b1d05ff3..4a89029accf 100644
--- a/apps/api/src/app/api/electric/[...path]/utils.ts
+++ b/apps/api/src/app/api/electric/[...path]/utils.ts
@@ -4,6 +4,7 @@ import {
 	organizations,
 	repositories,
 	tasks,
+	taskStatuses,
 	users,
 } from "@superset/db/schema";
 import { eq, inArray, sql } from "drizzle-orm";
@@ -12,6 +13,7 @@ import { QueryBuilder } from "drizzle-orm/pg-core";
 
 export type AllowedTable =
 	| "tasks"
+	| "task_statuses"
 	| "repositories"
 	| "auth.members"
 	| "auth.organizations"
@@ -42,6 +44,9 @@ export async function buildWhereClause(
 		case "tasks":
 			return build(tasks, tasks.organizationId, organizationId);
 
+		case "task_statuses":
+			return build(taskStatuses, taskStatuses.organizationId, organizationId);
+
 		case "repositories":
 			return build(repositories, repositories.organizationId, organizationId);
 
diff --git a/apps/api/src/app/api/integrations/linear/callback/route.ts b/apps/api/src/app/api/integrations/linear/callback/route.ts
index f41e4954d00..8bae5376c85 100644
--- a/apps/api/src/app/api/integrations/linear/callback/route.ts
+++ b/apps/api/src/app/api/integrations/linear/callback/route.ts
@@ -49,7 +49,8 @@ export async function GET(request: Request) {
 			grant_type: "authorization_code",
 			client_id: env.LINEAR_CLIENT_ID,
 			client_secret: env.LINEAR_CLIENT_SECRET,
-			redirect_uri: `${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/callback`,
+			// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
+			redirect_uri: "https://b02ef5887783.ngrok-free.app/api/integrations/linear/callback",
 			code,
 		}),
 	});
@@ -99,7 +100,8 @@ export async function GET(request: Request) {
 			},
 		});
 
-	const qstashBaseUrl = env.NEXT_PUBLIC_API_URL;
+	// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
+	const qstashBaseUrl = "https://b02ef5887783.ngrok-free.app";
 	try {
 		await qstash.publishJSON({
 			url: `${qstashBaseUrl}/api/integrations/linear/jobs/initial-sync`,
diff --git a/apps/api/src/app/api/integrations/linear/connect/route.ts b/apps/api/src/app/api/integrations/linear/connect/route.ts
index 6a8d123bbf8..59f3e60431d 100644
--- a/apps/api/src/app/api/integrations/linear/connect/route.ts
+++ b/apps/api/src/app/api/integrations/linear/connect/route.ts
@@ -45,7 +45,8 @@ export async function GET(request: Request) {
 	linearAuthUrl.searchParams.set("client_id", env.LINEAR_CLIENT_ID);
 	linearAuthUrl.searchParams.set(
 		"redirect_uri",
-		`${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/callback`,
+		// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
+		"https://b02ef5887783.ngrok-free.app/api/integrations/linear/callback",
 	);
 	linearAuthUrl.searchParams.set("response_type", "code");
 	linearAuthUrl.searchParams.set("scope", "read,write,issues:create");
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
index 1c2422749c9..67d239a218c 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
@@ -1,11 +1,17 @@
 import { LinearClient } from "@linear/sdk";
 import { buildConflictUpdateColumns, db } from "@superset/db";
-import { integrationConnections, tasks, users } from "@superset/db/schema";
+import {
+	integrationConnections,
+	tasks,
+	taskStatuses,
+	users,
+} from "@superset/db/schema";
 import { Receiver } from "@upstash/qstash";
 import { and, eq, inArray } from "drizzle-orm";
 import chunk from "lodash.chunk";
 import { z } from "zod";
 import { env } from "@/env";
+import { syncWorkflowStates } from "./syncWorkflowStates";
 import { fetchAllIssues, mapIssueToTask } from "./utils";
 
 const BATCH_SIZE = 100;
@@ -28,7 +34,8 @@ export async function POST(request: Request) {
 		return Response.json({ error: "Missing signature" }, { status: 401 });
 	}
 
-	const qstashBaseUrl = env.NEXT_PUBLIC_API_URL;
+	// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
+	const qstashBaseUrl = "https://b02ef5887783.ngrok-free.app";
 	const isValid = await receiver.verify({
 		body,
 		signature,
@@ -68,6 +75,25 @@ async function performInitialSync(
 	organizationId: string,
 	creatorUserId: string,
 ) {
+	// STEP 1: Sync workflow states FIRST
+	console.log("[initial-sync] Syncing workflow states");
+	await syncWorkflowStates({ client, organizationId });
+
+	// STEP 2: Load all statuses into a lookup map (avoid N+1)
+	console.log("[initial-sync] Loading status lookup map");
+	const statusByExternalId = new Map<string, string>(); // externalId -> statusId
+	const statuses = await db.query.taskStatuses.findMany({
+		where: and(
+			eq(taskStatuses.organizationId, organizationId),
+			eq(taskStatuses.externalProvider, "linear"),
+		),
+	});
+	for (const status of statuses) {
+		statusByExternalId.set(status.externalId!, status.id);
+	}
+
+	// STEP 3: Sync issues
+	console.log("[initial-sync] Syncing issues");
 	const issues = await fetchAllIssues(client);
 
 	if (issues.length === 0) {
@@ -90,7 +116,13 @@ async function performInitialSync(
 	const userByEmail = new Map(matchedUsers.map((u) => [u.email, u.id]));
 
 	const taskValues = issues.map((issue) =>
-		mapIssueToTask(issue, organizationId, creatorUserId, userByEmail),
+		mapIssueToTask(
+			issue,
+			organizationId,
+			creatorUserId,
+			userByEmail,
+			statusByExternalId,
+		),
 	);
 
 	const batches = chunk(taskValues, BATCH_SIZE);
@@ -106,9 +138,7 @@ async function performInitialSync(
 						"slug",
 						"title",
 						"description",
-						"status",
-						"statusColor",
-						"statusType",
+						"statusId",
 						"priority",
 						"assigneeId",
 						"estimate",
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
new file mode 100644
index 00000000000..6c76cb71096
--- /dev/null
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
@@ -0,0 +1,90 @@
+import type { LinearClient } from "@linear/sdk";
+import { and, eq } from "drizzle-orm";
+import { db } from "@superset/db/client";
+import { taskStatuses } from "@superset/db/schema";
+import { buildConflictUpdateColumns } from "@superset/db";
+import { calculateProgressForStates } from "./utils";
+
+/**
+ * Normalizes Linear's state type to our preferred US spelling
+ */
+function normalizeStateType(linearType: string): string {
+	if (linearType === "canceled") {
+		return "cancelled";
+	}
+	return linearType;
+}
+
+export async function syncWorkflowStates({
+	client,
+	organizationId,
+}: {
+	client: LinearClient;
+	organizationId: string;
+}): Promise<void> {
+	console.log("[syncWorkflowStates] Fetching teams");
+
+	const teams = await client.teams();
+
+	for (const team of teams.nodes) {
+		console.log(`[syncWorkflowStates] Processing team: ${team.name}`);
+
+		const states = await team.states();
+
+		// Group by type for progress calculation
+		const statesByType = new Map<string, typeof states.nodes>();
+		for (const state of states.nodes) {
+			if (!statesByType.has(state.type)) {
+				statesByType.set(state.type, []);
+			}
+			statesByType.get(state.type)!.push(state);
+		}
+
+		// Calculate progress for "started" type
+		const startedStates = statesByType.get("started") || [];
+		const progressMap = calculateProgressForStates(
+			startedStates.map((s) => ({ name: s.name, position: s.position })),
+		);
+
+		// Prepare insert values
+		const values = states.nodes.map((state) => ({
+			organizationId,
+			name: state.name,
+			color: state.color,
+			type: normalizeStateType(state.type),
+			position: state.position,
+			progressPercent:
+				state.type === "started" ? progressMap.get(state.name) ?? null : null,
+			externalProvider: "linear" as const,
+			externalId: state.id,
+		}));
+
+		// Upsert workflow states
+		if (values.length > 0) {
+			await db
+				.insert(taskStatuses)
+				.values(values)
+				.onConflictDoUpdate({
+					target: [
+						taskStatuses.organizationId,
+						taskStatuses.externalProvider,
+						taskStatuses.externalId,
+					],
+					set: {
+						...buildConflictUpdateColumns(taskStatuses, [
+							"name",
+							"color",
+							"type",
+							"position",
+							"progressPercent",
+						]),
+						updatedAt: new Date(),
+					},
+				});
+		}
+
+		console.log(
+			`[syncWorkflowStates] Synced ${values.length} states for team ${team.name}`,
+		);
+	}
+}
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
index e86c77c1093..17bebe604e8 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
@@ -13,7 +13,7 @@ export interface LinearIssue {
 	startedAt: string | null;
 	completedAt: string | null;
 	assignee: { id: string; email: string } | null;
-	state: { id: string; name: string; color: string; type: string };
+	state: { id: string; name: string; color: string; type: string; position: number };
 	labels: { nodes: Array<{ id: string; name: string }> };
 }
 
@@ -24,6 +24,51 @@ interface IssuesQueryResponse {
 	};
 }
 
+interface WorkflowStateWithPosition {
+	name: string;
+	position: number;
+}
+
+/**
+ * Calculates progress percentage for "started" type workflow states
+ * using Linear's rendering formula:
+ * - 1 state: 50%
+ * - 2 states: [50%, 75%]
+ * - 3+ states: evenly spaced using (index + 1) / (total + 1)
+ */
+export function calculateProgressForStates(
+	states: WorkflowStateWithPosition[],
+): Map<string, number> {
+	const progressMap = new Map<string, number>();
+
+	if (states.length === 0) {
+		return progressMap;
+	}
+
+	// Sort by position to get Linear's intended order
+	const sorted = [...states].sort((a, b) => a.position - b.position);
+
+	const total = sorted.length;
+
+	for (let i = 0; i < total; i++) {
+		const state = sorted[i];
+		let progress: number;
+
+		if (total === 1) {
+			progress = 50; // 50%
+		} else if (total === 2) {
+			progress = i === 0 ? 50 : 75; // [50%, 75%]
+		} else {
+			// 3+ states: evenly spaced (index + 1) / (total + 1)
+			progress = ((i + 1) / (total + 1)) * 100;
+		}
+
+		progressMap.set(state.name, Math.round(progress));
+	}
+
+	return progressMap;
+}
+
 const ISSUES_QUERY = `
   query Issues($first: Int!, $after: String, $filter: IssueFilter) {
     issues(first: $first, after: $after, filter: $filter) {
@@ -51,6 +96,7 @@ const ISSUES_QUERY = `
           name
           color
           type
+          position
         }
         labels {
           nodes {
@@ -69,6 +115,10 @@ export async function fetchAllIssues(
 	const allIssues: LinearIssue[] = [];
 	let cursor: string | undefined;
 
+	// Fetch tasks updated in the last 3 months
+	const threeMonthsAgo = new Date();
+	threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
+
 	do {
 		const response = await client.client.request<
 			IssuesQueryResponse,
@@ -76,7 +126,7 @@ export async function fetchAllIssues(
 		>(ISSUES_QUERY, {
 			first: 100,
 			after: cursor,
-			filter: { state: { type: { nin: ["canceled", "completed"] } } },
+			filter: { updatedAt: { gte: threeMonthsAgo.toISOString() } },
 		});
 		allIssues.push(...response.issues.nodes);
 		cursor =
@@ -93,20 +143,25 @@ export function mapIssueToTask(
 	organizationId: string,
 	creatorId: string,
 	userByEmail: Map<string, string>,
+	statusByExternalId: Map<string, string>,
 ) {
 	const assigneeId = issue.assignee?.email
 		? (userByEmail.get(issue.assignee.email) ?? null)
 		: null;
 
+	// Look up statusId from pre-loaded map (no DB query)
+	const statusId = statusByExternalId.get(issue.state.id);
+	if (!statusId) {
+		throw new Error(`Status not found for state ${issue.state.id}`);
+	}
+
 	return {
 		organizationId,
 		creatorId,
 		slug: issue.identifier,
 		title: issue.title,
 		description: issue.description,
-		status: issue.state.name,
-		statusColor: issue.state.color,
-		statusType: issue.state.type,
+		statusId, // FK to task_statuses
 		priority: mapPriorityFromLinear(issue.priority),
 		assigneeId,
 		estimate: issue.estimate,
diff --git a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
index e1c3680afe0..593d7a2c6be 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
@@ -1,7 +1,7 @@
 import type { LinearClient, WorkflowState } from "@linear/sdk";
 import { db } from "@superset/db/client";
 import type { LinearConfig, SelectTask } from "@superset/db/schema";
-import { integrationConnections, tasks } from "@superset/db/schema";
+import { integrationConnections, tasks, taskStatuses } from "@superset/db/schema";
 import {
 	getLinearClient,
 	mapPriorityToLinear,
@@ -69,7 +69,16 @@ async function syncTaskToLinear(
 	}
 
 	try {
-		const stateId = await findLinearState(client, teamId, task.status);
+		// Look up the status from task_statuses table
+		const taskStatus = await db.query.taskStatuses.findFirst({
+			where: eq(taskStatuses.id, task.statusId),
+		});
+
+		if (!taskStatus) {
+			return { success: false, error: "Task status not found" };
+		}
+
+		const stateId = await findLinearState(client, teamId, taskStatus.name);
 
 		if (task.externalProvider === "linear" && task.externalId) {
 			const result = await client.updateIssue(task.externalId, {
@@ -164,7 +173,8 @@ export async function POST(request: Request) {
 		return Response.json({ error: "Missing signature" }, { status: 401 });
 	}
 
-	const qstashBaseUrl = env.NEXT_PUBLIC_API_URL;
+	// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
+	const qstashBaseUrl = "https://b02ef5887783.ngrok-free.app";
 	const isValid = await receiver.verify({
 		body,
 		signature,
diff --git a/apps/api/src/app/api/integrations/linear/webhook/route.ts b/apps/api/src/app/api/integrations/linear/webhook/route.ts
index d820c6a626e..e4521000eab 100644
--- a/apps/api/src/app/api/integrations/linear/webhook/route.ts
+++ b/apps/api/src/app/api/integrations/linear/webhook/route.ts
@@ -8,6 +8,7 @@ import type { SelectIntegrationConnection } from "@superset/db/schema";
 import {
 	integrationConnections,
 	tasks,
+	taskStatuses,
 	users,
 	webhookEvents,
 } from "@superset/db/schema";
@@ -92,6 +93,23 @@ async function processIssueEvent(
 	const issue = payload.data;
 
 	if (payload.action === "create" || payload.action === "update") {
+		// Look up statusId from task_statuses
+		const taskStatus = await db.query.taskStatuses.findFirst({
+			where: and(
+				eq(taskStatuses.organizationId, connection.organizationId),
+				eq(taskStatuses.externalProvider, "linear"),
+				eq(taskStatuses.externalId, issue.state.id),
+			),
+		});
+
+		if (!taskStatus) {
+			// Status doesn't exist yet - need to sync workflow states
+			console.warn(
+				`[webhook] Status not found for state ${issue.state.id}, skipping update`,
+			);
+			return;
+		}
+
 		let assigneeId: string | null = null;
 		if (issue.assignee?.email) {
 			const matchedUser = await db.query.users.findFirst({
@@ -104,9 +122,7 @@ async function processIssueEvent(
 			slug: issue.identifier,
 			title: issue.title,
 			description: issue.description ?? null,
-			status: issue.state.name,
-			statusColor: issue.state.color,
-			statusType: issue.state.type,
+			statusId: taskStatus.id, // FK reference
 			priority: mapPriorityFromLinear(issue.priority),
 			assigneeId,
 			estimate: issue.estimate ?? null,
diff --git a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
index b8901878c20..0712242a1e0 100644
--- a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
+++ b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
@@ -4,6 +4,7 @@ import type {
 	SelectOrganization,
 	SelectRepository,
 	SelectTask,
+	SelectTaskStatus,
 	SelectUser,
 } from "@superset/db/schema";
 import type { AppRouter } from "@superset/trpc";
@@ -19,6 +20,7 @@ const electricUrl = `${env.NEXT_PUBLIC_API_URL}/api/electric/v1/shape`;
 
 interface OrgCollections {
 	tasks: Collection<SelectTask>;
+	taskStatuses: Collection<SelectTaskStatus>;
 	repositories: Collection<SelectRepository>;
 	members: Collection<SelectMember>;
 	users: Collection<SelectUser>;
@@ -80,6 +82,22 @@ function createOrgCollections(
 		}),
 	);
 
+	const taskStatuses = createCollection(
+		electricCollectionOptions<SelectTaskStatus>({
+			id: `task_statuses-${organizationId}`,
+			shapeOptions: {
+				url: electricUrl,
+				params: {
+					table: "task_statuses",
+					organization: organizationId,
+				},
+				headers,
+				columnMapper,
+			},
+			getKey: (item) => item.id,
+		}),
+	);
+
 	const repositories = createCollection(
 		electricCollectionOptions<SelectRepository>({
 			id: `repositories-${organizationId}`,
@@ -138,7 +156,7 @@ function createOrgCollections(
 		}),
 	);
 
-	return { tasks, repositories, members, users };
+	return { tasks, taskStatuses, repositories, members, users };
 }
 
 function getOrCreateOrganizationsCollection(
diff --git a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
index 593d504e6f0..5c2b2a19083 100644
--- a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
@@ -200,6 +200,39 @@ export function ComponentsShowcase() {
 									Hover over any icon to see the brightness effect
 								</p>
 							</div>
+
+							{/* Progress Variants for Started Type */}
+							<div>
+								<h3 className="text-sm font-medium mb-3">Started Progress Variants</h3>
+								<p className="text-xs text-muted-foreground mb-3">
+									Visual progress indication for "started" type statuses
+								</p>
+								<div className="grid grid-cols-5 gap-4 p-4 rounded-lg border border-border bg-card">
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon type="started" color="#F59E0B" progress={25} />
+										<span className="text-xs text-muted-foreground">25%</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon type="started" color="#F59E0B" progress={50} />
+										<span className="text-xs text-muted-foreground">50%</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon type="started" color="#10B981" progress={75} />
+										<span className="text-xs text-muted-foreground">75%</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon type="started" color="#8B5CF6" progress={83} />
+										<span className="text-xs text-muted-foreground">83%</span>
+									</div>
+									<div className="flex flex-col items-center gap-2">
+										<StatusIcon type="started" color="#8B5CF6" progress={100} />
+										<span className="text-xs text-muted-foreground">100%</span>
+									</div>
+								</div>
+								<p className="text-xs text-muted-foreground mt-2 ml-2">
+									Progress is calculated from Linear workflow state positions during sync
+								</p>
+							</div>
 						</div>
 					</section>
 				</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
index bf87a5015a6..8dbaf6d1585 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
@@ -12,6 +12,7 @@ interface StatusIconProps {
 	color: string;
 	showHover?: boolean;
 	className?: string;
+	progress?: number;
 }
 
 export function StatusIcon({
@@ -19,6 +20,7 @@ export function StatusIcon({
 	color,
 	showHover = false,
 	className,
+	progress,
 }: StatusIconProps) {
 	const sizeClass = "w-3.5 h-3.5";
 
@@ -68,6 +70,15 @@ export function StatusIcon({
 	}
 
 	if (type === "started") {
+		// Progress fills counter-clockwise starting from 12 o'clock
+		const centerRadius = 2;
+		const centerCircumference = 2 * Math.PI * centerRadius;
+		const progressPercent = progress ?? 100;
+
+		// Dash length is the visible portion (progress%)
+		const dashLength = (progressPercent / 100) * centerCircumference;
+		const gapLength = centerCircumference - dashLength;
+
 		return (
 			<div className={containerClasses}>
 				<svg
@@ -76,6 +87,7 @@ export function StatusIcon({
 					fill="none"
 					xmlns="http://www.w3.org/2000/svg"
 				>
+					{/* Outer circle - full */}
 					<circle
 						cx="7"
 						cy="7"
@@ -85,7 +97,16 @@ export function StatusIcon({
 						strokeDasharray="3.14 0"
 						strokeDashoffset="-0.7"
 					/>
-					<circle cx="7" cy="7" r="2" stroke={color} strokeWidth="4" />
+					{/* Center circle - radial progress, counter-clockwise from top */}
+					<circle
+						cx="7"
+						cy="7"
+						r={centerRadius}
+						stroke={color}
+						strokeWidth="4"
+						strokeDasharray={`${dashLength} ${gapLength}`}
+						transform="rotate(90 7 7) scale(-1, 1) translate(-14, 0)"
+					/>
 				</svg>
 			</div>
 		);
@@ -121,6 +142,10 @@ export function StatusIcon({
 	}
 
 	if (type === "cancelled") {
+		// Middle ring is 50% filled (matches Linear)
+		const middleRadius = 3;
+		const middleCircumference = 2 * Math.PI * middleRadius;
+
 		return (
 			<div className={containerClasses}>
 				<svg
@@ -129,6 +154,7 @@ export function StatusIcon({
 					fill="none"
 					xmlns="http://www.w3.org/2000/svg"
 				>
+					{/* Outer circle - full */}
 					<circle
 						cx="7"
 						cy="7"
@@ -138,7 +164,18 @@ export function StatusIcon({
 						strokeDasharray="3.14 0"
 						strokeDashoffset="-0.7"
 					/>
-					<circle cx="7" cy="7" r="3" stroke={color} strokeWidth="6" />
+					{/* Middle ring - 50% filled */}
+					<circle
+						cx="7"
+						cy="7"
+						r={middleRadius}
+						stroke={color}
+						strokeWidth="6"
+						strokeDasharray={`${middleCircumference} ${middleCircumference * 2}`}
+						strokeDashoffset="0"
+						transform="rotate(-90 7 7)"
+					/>
+					{/* X icon */}
 					<path
 						className="fill-background"
 						stroke="none"
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
index 2872c07ee9f..41461654ac6 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -1,7 +1,6 @@
 import { useState, useMemo } from "react";
-import type { CellContext } from "@tanstack/react-table";
-import type { SelectTask } from "@superset/db/schema";
-import { taskStatusEnumValues, type TaskStatus } from "@superset/db/enums";
+import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
+import { useLiveQuery } from "@tanstack/react-db";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -11,37 +10,48 @@ import {
 import { Input } from "@superset/ui/input";
 import { Button } from "@superset/ui/button";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { StatusIcon, STATUS_COLORS } from "../../StatusIcon";
+import { StatusIcon } from "../../StatusIcon";
+
+// Task with joined status data
+type TaskWithStatus = SelectTask & {
+	status: SelectTaskStatus;
+};
 
 interface StatusCellProps {
-	info: CellContext<SelectTask, string>;
+	taskWithStatus: TaskWithStatus;
 }
 
-export function StatusCell({ info }: StatusCellProps) {
+export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const collections = useCollections();
 	const [open, setOpen] = useState(false);
 	const [searchQuery, setSearchQuery] = useState("");
 
-	const task = info.row.original;
-	const currentStatus = info.getValue();
+	// Lazy load statuses only when dropdown opens
+	const { data: allStatuses } = useLiveQuery(
+		(q) => (open ? q.from({ taskStatuses: collections.taskStatuses }) : null),
+		[collections, open],
+	);
+
+	const statuses = useMemo(() => allStatuses || [], [allStatuses]);
+	const currentStatus = taskWithStatus.status;
 
 	// Filter statuses based on search query
 	const filteredStatuses = useMemo(() => {
 		const query = searchQuery.toLowerCase();
-		return taskStatusEnumValues.filter((status: TaskStatus) =>
-			status.replace("-", " ").toLowerCase().includes(query),
+		return statuses.filter((status) =>
+			status.name.toLowerCase().includes(query),
 		);
-	}, [searchQuery]);
+	}, [searchQuery, statuses]);
 
-	const handleSelectStatus = async (newStatus: TaskStatus) => {
-		if (newStatus === currentStatus) {
+	const handleSelectStatus = async (newStatus: SelectTaskStatus) => {
+		if (newStatus.id === currentStatus.id) {
 			setOpen(false);
 			return;
 		}
 
 		try {
-			await collections.tasks.update(task.id, (draft) => {
-				draft.status = newStatus;
+			await collections.tasks.update(taskWithStatus.id, (draft) => {
+				draft.statusId = newStatus.id;
 			});
 			setOpen(false);
 			setSearchQuery("");
@@ -59,8 +69,9 @@ export function StatusCell({ info }: StatusCellProps) {
 					className="h-6 w-6 p-0 hover:bg-accent"
 				>
 					<StatusIcon
-						type={currentStatus as any}
-						color={STATUS_COLORS[currentStatus] || "#8B5CF6"}
+						type={currentStatus.type as any}
+						color={currentStatus.color}
+						progress={currentStatus.progressPercent ?? undefined}
 					/>
 				</Button>
 			</DropdownMenuTrigger>
@@ -75,20 +86,19 @@ export function StatusCell({ info }: StatusCellProps) {
 					/>
 				</div>
 				<div className="max-h-64 overflow-y-auto">
-					{filteredStatuses.map((status: TaskStatus) => (
+					{filteredStatuses.map((status) => (
 						<DropdownMenuItem
-							key={status}
+							key={status.id}
 							onSelect={() => handleSelectStatus(status)}
 							className="flex items-center gap-2"
 						>
 							<StatusIcon
-								type={status as any}
-								color={STATUS_COLORS[status] || "#8B5CF6"}
+								type={status.type as any}
+								color={status.color}
+								progress={status.progressPercent ?? undefined}
 							/>
-							<span className="text-sm capitalize">
-								{status.replace("-", " ")}
-							</span>
-							{status === currentStatus && (
+							<span className="text-sm">{status.name}</span>
+							{status.id === currentStatus.id && (
 								<span className="ml-auto text-xs text-muted-foreground">✓</span>
 							)}
 						</DropdownMenuItem>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index e599f07c9c6..8ccce1a167d 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -9,48 +9,87 @@ import {
 	getGroupedRowModel,
 	useReactTable,
 } from "@tanstack/react-table";
-import type { SelectTask } from "@superset/db/schema";
+import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
 import { useLiveQuery } from "@tanstack/react-db";
 import { format } from "date-fns";
 import { Button } from "@superset/ui/button";
 import { HiChevronDown, HiChevronRight } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { StatusIcon, STATUS_COLORS } from "../../components/StatusIcon";
+import { StatusIcon } from "../../components/StatusIcon";
 import { StatusCell } from "../../components/cells/StatusCell";
 import { PriorityCell } from "../../components/cells/PriorityCell";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
 import { LabelsCell } from "../../components/cells/LabelsCell";
 
-const columnHelper = createColumnHelper<SelectTask>();
+// Task with joined status data
+type TaskWithStatus = SelectTask & {
+	status: SelectTaskStatus;
+};
+
+const columnHelper = createColumnHelper<TaskWithStatus>();
 
 export function useTasksTable(): {
-	table: Table<SelectTask>;
+	table: Table<TaskWithStatus>;
 	isLoading: boolean;
 } {
 	const collections = useCollections();
 	const [grouping, setGrouping] = useState<string[]>(["status"]);
 	const [expanded, setExpanded] = useState<ExpandedState>(true);
 
-	const { data: allTasks, isLoading } = useLiveQuery(
+	// Load tasks and statuses separately
+	const { data: allTasks, isLoading: tasksLoading } = useLiveQuery(
 		(q) => q.from({ tasks: collections.tasks }),
 		[collections],
 	);
 
-	const data = useMemo(
-		() => allTasks?.filter((task) => task.deletedAt === null) || [],
-		[allTasks],
+	const { data: allStatuses, isLoading: statusesLoading } = useLiveQuery(
+		(q) => q.from({ taskStatuses: collections.taskStatuses }),
+		[collections],
 	);
 
+	// Client-side join: merge tasks with their status
+	const data = useMemo(() => {
+		if (!allTasks || !allStatuses) return [];
+
+		const statusMap = new Map(allStatuses.map((s) => [s.id, s]));
+
+		return allTasks
+			.filter((task) => task.deletedAt === null)
+			.map((task) => {
+				const status = statusMap.get(task.statusId);
+				if (!status) {
+					console.warn(`[useTasksTable] Status not found for task ${task.id}`);
+					// Provide a fallback status to prevent crashes
+					return {
+						...task,
+						status: {
+							id: task.statusId,
+							name: "Unknown",
+							color: "#8B5CF6",
+							type: "unstarted",
+							position: 0,
+							progressPercent: null,
+						} as SelectTaskStatus,
+					};
+				}
+				return { ...task, status };
+			});
+	}, [allTasks, allStatuses]);
+
+	const isLoading = tasksLoading || statusesLoading;
+
 	// TODO: Add localStorage persistence for collapsed groups
 
 	// Define columns with useMemo (following official docs pattern)
-	const columns = useMemo<ColumnDef<SelectTask>[]>(
+	const columns = useMemo<ColumnDef<TaskWithStatus>[]>(
 		() => [
 			// Status column (grouped) - only shows for group headers
-			columnHelper.accessor("status", {
+			columnHelper.accessor((row) => row.status, {
+				id: "status",
 				header: "Status",
 				cell: (info) => {
 					const { row, cell } = info;
+					const status = info.getValue();
 
 					if (cell.getIsGrouped()) {
 						// Group header row
@@ -67,14 +106,15 @@ export function useTasksTable(): {
 										<HiChevronRight className="h-4 w-4 text-muted-foreground" />
 									)}
 									<StatusIcon
-										type={info.getValue() as any}
-										color={STATUS_COLORS[info.getValue()] || "#8B5CF6"}
+										type={status.type as any}
+										color={status.color}
+										progress={status.progressPercent ?? undefined}
 									/>
 									<span className="text-sm font-medium capitalize">
-										{info.getValue().replace("-", " ")}
+										{status.name}
 									</span>
 									<span className="text-xs text-muted-foreground">
-										({row.subRows.length})
+										{row.subRows.length}
 									</span>
 								</div>
 							</Button>
@@ -84,6 +124,7 @@ export function useTasksTable(): {
 					// For leaf rows, return null - status icon is shown in title column
 					return null;
 				},
+				getGroupingValue: (row) => row.status.name,
 			}),
 
 			// Task ID - simple inline rendering
@@ -104,10 +145,10 @@ export function useTasksTable(): {
 				header: "Title",
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
-					const task = info.row.original;
+					const taskWithStatus = info.row.original;
 					return (
 						<div className="flex items-center gap-2 flex-1 min-w-0">
-							<StatusCell info={{ ...info, getValue: () => task.status } as any} />
+							<StatusCell taskWithStatus={taskWithStatus} />
 							<span className="text-sm font-medium truncate">
 								{info.getValue()}
 							</span>
diff --git a/packages/db/drizzle/0008_add_full_task_status_table.sql b/packages/db/drizzle/0008_add_full_task_status_table.sql
new file mode 100644
index 00000000000..37b62d929e7
--- /dev/null
+++ b/packages/db/drizzle/0008_add_full_task_status_table.sql
@@ -0,0 +1,29 @@
+-- Clean up existing tasks before schema change
+DELETE FROM "tasks";
+--> statement-breakpoint
+CREATE TABLE "task_statuses" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"organization_id" uuid NOT NULL,
+	"name" text NOT NULL,
+	"color" text NOT NULL,
+	"type" text NOT NULL,
+	"position" real NOT NULL,
+	"progress_percent" real,
+	"external_provider" "integration_provider",
+	"external_id" text,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "task_statuses_org_external_unique" UNIQUE("organization_id","external_provider","external_id")
+);
+--> statement-breakpoint
+DROP INDEX "tasks_status_idx";--> statement-breakpoint
+ALTER TABLE "tasks" ADD COLUMN "status_id" uuid NOT NULL;--> statement-breakpoint
+ALTER TABLE "task_statuses" ADD CONSTRAINT "task_statuses_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "auth"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "task_statuses_organization_id_idx" ON "task_statuses" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "task_statuses_type_idx" ON "task_statuses" USING btree ("type");--> statement-breakpoint
+ALTER TABLE "tasks" ADD CONSTRAINT "tasks_status_id_task_statuses_id_fk" FOREIGN KEY ("status_id") REFERENCES "public"."task_statuses"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "tasks_status_id_idx" ON "tasks" USING btree ("status_id");--> statement-breakpoint
+ALTER TABLE "tasks" DROP COLUMN "status";--> statement-breakpoint
+ALTER TABLE "tasks" DROP COLUMN "status_color";--> statement-breakpoint
+ALTER TABLE "tasks" DROP COLUMN "status_type";--> statement-breakpoint
+ALTER TABLE "tasks" DROP COLUMN "status_position";
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/0008_snapshot.json b/packages/db/drizzle/meta/0008_snapshot.json
new file mode 100644
index 00000000000..d951561ab05
--- /dev/null
+++ b/packages/db/drizzle/meta/0008_snapshot.json
@@ -0,0 +1,1659 @@
+{
+  "id": "a303ef94-785d-41b4-ae28-defe0ec99e61",
+  "prevId": "fa87a301-b667-4c9c-9e1f-15b9d9130bb0",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "auth.accounts": {
+      "name": "accounts",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "accounts_user_id_idx": {
+          "name": "accounts_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "accounts_user_id_users_id_fk": {
+          "name": "accounts_user_id_users_id_fk",
+          "tableFrom": "accounts",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.invitations": {
+      "name": "invitations",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "invitations_organization_id_idx": {
+          "name": "invitations_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitations_email_idx": {
+          "name": "invitations_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitations_organization_id_organizations_id_fk": {
+          "name": "invitations_organization_id_organizations_id_fk",
+          "tableFrom": "invitations",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitations_inviter_id_users_id_fk": {
+          "name": "invitations_inviter_id_users_id_fk",
+          "tableFrom": "invitations",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "inviter_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.members": {
+      "name": "members",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "members_organization_id_idx": {
+          "name": "members_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "members_user_id_idx": {
+          "name": "members_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "members_organization_id_organizations_id_fk": {
+          "name": "members_organization_id_organizations_id_fk",
+          "tableFrom": "members",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "members_user_id_users_id_fk": {
+          "name": "members_user_id_users_id_fk",
+          "tableFrom": "members",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.organizations": {
+      "name": "organizations",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "organizations_slug_idx": {
+          "name": "organizations_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "organizations_slug_unique": {
+          "name": "organizations_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.sessions": {
+      "name": "sessions",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sessions_user_id_idx": {
+          "name": "sessions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sessions_user_id_users_id_fk": {
+          "name": "sessions_user_id_users_id_fk",
+          "tableFrom": "sessions",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "sessions_token_unique": {
+          "name": "sessions_token_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "token"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.users": {
+      "name": "users",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.verifications": {
+      "name": "verifications",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "verifications_identifier_idx": {
+          "name": "verifications_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "ingest.webhook_events": {
+      "name": "webhook_events",
+      "schema": "ingest",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_id": {
+          "name": "event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "retry_count": {
+          "name": "retry_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "webhook_events_provider_status_idx": {
+          "name": "webhook_events_provider_status_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_events_provider_event_id_idx": {
+          "name": "webhook_events_provider_event_id_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "event_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_events_received_at_idx": {
+          "name": "webhook_events_received_at_idx",
+          "columns": [
+            {
+              "expression": "received_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.integration_connections": {
+      "name": "integration_connections",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connected_by_user_id": {
+          "name": "connected_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_expires_at": {
+          "name": "token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_org_id": {
+          "name": "external_org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_org_name": {
+          "name": "external_org_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "integration_connections_org_idx": {
+          "name": "integration_connections_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "integration_connections_organization_id_organizations_id_fk": {
+          "name": "integration_connections_organization_id_organizations_id_fk",
+          "tableFrom": "integration_connections",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "integration_connections_connected_by_user_id_users_id_fk": {
+          "name": "integration_connections_connected_by_user_id_users_id_fk",
+          "tableFrom": "integration_connections",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "connected_by_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "integration_connections_unique": {
+          "name": "integration_connections_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "provider"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.repositories": {
+      "name": "repositories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_url": {
+          "name": "repo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_owner": {
+          "name": "repo_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_name": {
+          "name": "repo_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'main'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "repositories_organization_id_idx": {
+          "name": "repositories_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "repositories_slug_idx": {
+          "name": "repositories_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "repositories_organization_id_organizations_id_fk": {
+          "name": "repositories_organization_id_organizations_id_fk",
+          "tableFrom": "repositories",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "repositories_org_slug_unique": {
+          "name": "repositories_org_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.task_statuses": {
+      "name": "task_statuses",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "progress_percent": {
+          "name": "progress_percent",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "task_statuses_organization_id_idx": {
+          "name": "task_statuses_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "task_statuses_type_idx": {
+          "name": "task_statuses_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "task_statuses_organization_id_organizations_id_fk": {
+          "name": "task_statuses_organization_id_organizations_id_fk",
+          "tableFrom": "task_statuses",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "task_statuses_org_external_unique": {
+          "name": "task_statuses_org_external_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "external_provider",
+            "external_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.tasks": {
+      "name": "tasks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_id": {
+          "name": "status_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "priority": {
+          "name": "priority",
+          "type": "task_priority",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assignee_id": {
+          "name": "assignee_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimate": {
+          "name": "estimate",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "due_date": {
+          "name": "due_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pr_url": {
+          "name": "pr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_key": {
+          "name": "external_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_url": {
+          "name": "external_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sync_error": {
+          "name": "sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "tasks_slug_idx": {
+          "name": "tasks_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_organization_id_idx": {
+          "name": "tasks_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_repository_id_idx": {
+          "name": "tasks_repository_id_idx",
+          "columns": [
+            {
+              "expression": "repository_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_assignee_id_idx": {
+          "name": "tasks_assignee_id_idx",
+          "columns": [
+            {
+              "expression": "assignee_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_creator_id_idx": {
+          "name": "tasks_creator_id_idx",
+          "columns": [
+            {
+              "expression": "creator_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_status_id_idx": {
+          "name": "tasks_status_id_idx",
+          "columns": [
+            {
+              "expression": "status_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_created_at_idx": {
+          "name": "tasks_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_external_provider_idx": {
+          "name": "tasks_external_provider_idx",
+          "columns": [
+            {
+              "expression": "external_provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "tasks_status_id_task_statuses_id_fk": {
+          "name": "tasks_status_id_task_statuses_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "task_statuses",
+          "columnsFrom": [
+            "status_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "tasks_organization_id_organizations_id_fk": {
+          "name": "tasks_organization_id_organizations_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_repository_id_repositories_id_fk": {
+          "name": "tasks_repository_id_repositories_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "repositories",
+          "columnsFrom": [
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_assignee_id_users_id_fk": {
+          "name": "tasks_assignee_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "assignee_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "tasks_creator_id_users_id_fk": {
+          "name": "tasks_creator_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "creator_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "tasks_slug_unique": {
+          "name": "tasks_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        },
+        "tasks_external_unique": {
+          "name": "tasks_external_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "external_provider",
+            "external_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.integration_provider": {
+      "name": "integration_provider",
+      "schema": "public",
+      "values": [
+        "linear"
+      ]
+    },
+    "public.task_priority": {
+      "name": "task_priority",
+      "schema": "public",
+      "values": [
+        "urgent",
+        "high",
+        "medium",
+        "low",
+        "none"
+      ]
+    },
+    "public.task_status": {
+      "name": "task_status",
+      "schema": "public",
+      "values": [
+        "backlog",
+        "todo",
+        "planning",
+        "working",
+        "needs-feedback",
+        "ready-to-merge",
+        "completed",
+        "canceled"
+      ]
+    }
+  },
+  "schemas": {
+    "auth": "auth",
+    "ingest": "ingest"
+  },
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index b6e6ceabfa2..17fb696a222 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -57,6 +57,13 @@
       "when": 1767049518603,
       "tag": "0007_add_created_at_default",
       "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "7",
+      "when": 1768087327155,
+      "tag": "0008_add_full_task_status_table",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/schema/relations.ts b/packages/db/src/schema/relations.ts
index 0528be97677..acff0f3fb0f 100644
--- a/packages/db/src/schema/relations.ts
+++ b/packages/db/src/schema/relations.ts
@@ -8,7 +8,12 @@ import {
 	sessions,
 	users,
 } from "./auth";
-import { integrationConnections, repositories, tasks } from "./schema";
+import {
+	integrationConnections,
+	repositories,
+	tasks,
+	taskStatuses,
+} from "./schema";
 
 export const usersRelations = relations(users, ({ many }) => ({
 	sessions: many(sessions),
@@ -39,6 +44,7 @@ export const organizationsRelations = relations(organizations, ({ many }) => ({
 	invitations: many(invitations),
 	repositories: many(repositories),
 	tasks: many(tasks),
+	taskStatuses: many(taskStatuses),
 	integrations: many(integrationConnections),
 }));
 
@@ -84,6 +90,10 @@ export const tasksRelations = relations(tasks, ({ one }) => ({
 		fields: [tasks.organizationId],
 		references: [organizations.id],
 	}),
+	status: one(taskStatuses, {
+		fields: [tasks.statusId],
+		references: [taskStatuses.id],
+	}),
 	assignee: one(users, {
 		fields: [tasks.assigneeId],
 		references: [users.id],
@@ -96,6 +106,17 @@ export const tasksRelations = relations(tasks, ({ one }) => ({
 	}),
 }));
 
+export const taskStatusesRelations = relations(
+	taskStatuses,
+	({ one, many }) => ({
+		organization: one(organizations, {
+			fields: [taskStatuses.organizationId],
+			references: [organizations.id],
+		}),
+		tasks: many(tasks),
+	}),
+);
+
 export const integrationConnectionsRelations = relations(
 	integrationConnections,
 	({ one }) => ({
diff --git a/packages/db/src/schema/schema.ts b/packages/db/src/schema/schema.ts
index c85b2d194fe..b4248566d1e 100644
--- a/packages/db/src/schema/schema.ts
+++ b/packages/db/src/schema/schema.ts
@@ -55,6 +55,48 @@ export const repositories = pgTable(
 export type InsertRepository = typeof repositories.$inferInsert;
 export type SelectRepository = typeof repositories.$inferSelect;
 
+export const taskStatuses = pgTable(
+	"task_statuses",
+	{
+		id: uuid().primaryKey().defaultRandom(),
+		organizationId: uuid("organization_id")
+			.notNull()
+			.references(() => organizations.id, { onDelete: "cascade" }),
+
+		// Core fields from Linear WorkflowState
+		name: text().notNull(),
+		color: text().notNull(),
+		type: text().notNull(), // "backlog" | "unstarted" | "started" | "completed" | "canceled"
+		position: real().notNull(),
+
+		// Calculated progress for "started" type
+		progressPercent: real("progress_percent"), // 0-100, only for "started" type
+
+		// External sync
+		externalProvider: integrationProvider("external_provider"),
+		externalId: text("external_id"),
+
+		// Timestamps
+		createdAt: timestamp("created_at").notNull().defaultNow(),
+		updatedAt: timestamp("updated_at")
+			.notNull()
+			.defaultNow()
+			.$onUpdate(() => new Date()),
+	},
+	(table) => [
+		index("task_statuses_organization_id_idx").on(table.organizationId),
+		index("task_statuses_type_idx").on(table.type),
+		unique("task_statuses_org_external_unique").on(
+			table.organizationId,
+			table.externalProvider,
+			table.externalId,
+		),
+	],
+);
+
+export type InsertTaskStatus = typeof taskStatuses.$inferInsert;
+export type SelectTaskStatus = typeof taskStatuses.$inferSelect;
+
 export const tasks = pgTable(
 	"tasks",
 	{
@@ -64,10 +106,9 @@ export const tasks = pgTable(
 		slug: text().notNull().unique(),
 		title: text().notNull(),
 		description: text(),
-		status: text().notNull(), // Flexible text - stores any status name
-		statusColor: text("status_color"),
-		statusType: text("status_type"),
-		statusPosition: real("status_position"),
+		statusId: uuid("status_id")
+			.notNull()
+			.references(() => taskStatuses.id),
 		priority: taskPriority().notNull().default("none"),
 
 		// Ownership
@@ -118,7 +159,7 @@ export const tasks = pgTable(
 		index("tasks_repository_id_idx").on(table.repositoryId),
 		index("tasks_assignee_id_idx").on(table.assigneeId),
 		index("tasks_creator_id_idx").on(table.creatorId),
-		index("tasks_status_idx").on(table.status),
+		index("tasks_status_id_idx").on(table.statusId),
 		index("tasks_created_at_idx").on(table.createdAt),
 		index("tasks_external_provider_idx").on(table.externalProvider),
 		unique("tasks_external_unique").on(
diff --git a/packages/trpc/src/router/task/schema.ts b/packages/trpc/src/router/task/schema.ts
index 4a899c62303..cfab0785130 100644
--- a/packages/trpc/src/router/task/schema.ts
+++ b/packages/trpc/src/router/task/schema.ts
@@ -5,7 +5,7 @@ export const createTaskSchema = z.object({
 	slug: z.string().min(1),
 	title: z.string().min(1),
 	description: z.string().nullish(),
-	status: z.string().min(1).default("Backlog"),
+	statusId: z.string().uuid(),
 	priority: z.enum(taskPriorityValues).default("none"),
 	repositoryId: z.string().uuid().nullish(),
 	organizationId: z.string().uuid(),
@@ -20,7 +20,7 @@ export const updateTaskSchema = z.object({
 	id: z.string().uuid(),
 	title: z.string().min(1).optional(),
 	description: z.string().nullish(),
-	status: z.string().optional(),
+	statusId: z.string().uuid().optional(),
 	priority: z.enum(taskPriorityValues).optional(),
 	repositoryId: z.string().uuid().nullish(),
 	assigneeId: z.string().uuid().nullish(),

From 76264471c49ff8170dccce96fae542de3dbd2113 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sat, 10 Jan 2026 16:36:21 -0800
Subject: [PATCH 03/18] WIP'

---
 .../main/components/TasksView/TasksView.tsx   |   4 +-
 .../TasksTableView/TasksTableView.tsx         |  28 ++--
 .../cells/LabelsCell/LabelsCell.tsx           | 135 +++---------------
 .../hooks/useTasksTable/useTasksTable.tsx     |  48 +++++--
 4 files changed, 64 insertions(+), 151 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
index edaae24726b..353d3cc3194 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
@@ -4,7 +4,7 @@ import { TasksTableView } from "./components/TasksTableView";
 import { useTasksTable } from "./hooks/useTasksTable";
 
 export function TasksView() {
-	const { table, isLoading } = useTasksTable();
+	const { table, isLoading, slugColumnWidth } = useTasksTable();
 
 	if (isLoading) {
 		return (
@@ -28,7 +28,7 @@ export function TasksView() {
 	return (
 		<div className="flex-1 flex flex-col min-h-0">
 			<ScrollArea className="flex-1 min-h-0">
-				<TasksTableView table={table} />
+				<TasksTableView table={table} slugColumnWidth={slugColumnWidth} />
 			</ScrollArea>
 		</div>
 	);
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
index 4652a7c9088..8ffbc7fd980 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
@@ -3,9 +3,10 @@ import type { SelectTask } from "@superset/db/schema";
 
 interface TasksTableViewProps {
 	table: Table<SelectTask>;
+	slugColumnWidth: string;
 }
 
-export function TasksTableView({ table }: TasksTableViewProps) {
+export function TasksTableView({ table, slugColumnWidth }: TasksTableViewProps) {
 	return (
 		<div className="flex flex-col">
 			{table.getRowModel().rows.map((row) => {
@@ -26,29 +27,26 @@ export function TasksTableView({ table }: TasksTableViewProps) {
 					);
 				}
 
-				// Leaf row - render all cells horizontally
-				// Layout: [ID] [Status Icon + Title .............. | Priority Assignee Labels Due]
+				// Leaf row - render all cells horizontally with grid for consistent column widths
+				// Layout: [Priority] [ID] [Title] ... [Labels] [Assignee] [Due] [gap]
 				// Note: Status column (index 0) returns null for leaf rows, so we skip it
 				const cells = row.getVisibleCells();
 				return (
 					<div
 						key={row.id}
-						className="flex items-center gap-2 px-4 py-2 hover:bg-accent/50 cursor-pointer border-b border-border/50"
+						className="grid items-center gap-2 px-4 py-2 hover:bg-accent/50 cursor-pointer border-b border-border/50"
+						style={{
+							gridTemplateColumns: `auto ${slugColumnWidth} 1fr minmax(0,auto) auto auto 3rem`,
+						}}
 					>
-						{/* Left side: ID + Title (with inline status) - skip null status column */}
-						{cells.slice(1, 3).map((cell) => (
-							<div key={cell.id}>
+						{/* Skip status column (index 0), render priority, id, title, labels, assignee, due */}
+						{cells.slice(1).map((cell) => (
+							<div key={cell.id} className="flex items-center">
 								{flexRender(cell.column.columnDef.cell, cell.getContext())}
 							</div>
 						))}
-						{/* Right side metadata: Priority, Assignee, Labels, Due */}
-						<div className="flex items-center gap-2 flex-shrink-0">
-							{cells.slice(3).map((cell) => (
-								<div key={cell.id}>
-									{flexRender(cell.column.columnDef.cell, cell.getContext())}
-								</div>
-							))}
-						</div>
+						{/* Empty cell for right padding/growth space */}
+						<div />
 					</div>
 				);
 			})}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
index 688ea21c3ad..85c8238d794 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
@@ -1,134 +1,31 @@
-import { useState, useMemo } from "react";
 import type { CellContext } from "@tanstack/react-table";
 import type { SelectTask } from "@superset/db/schema";
-import { useLiveQuery } from "@tanstack/react-db";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuCheckboxItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@superset/ui/dropdown-menu";
-import { Input } from "@superset/ui/input";
-import { Button } from "@superset/ui/button";
 import { Badge } from "@superset/ui/badge";
-import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { HiPlus } from "react-icons/hi2";
 
 interface LabelsCellProps {
 	info: CellContext<SelectTask, string[] | null>;
 }
 
 export function LabelsCell({ info }: LabelsCellProps) {
-	const collections = useCollections();
-	const [open, setOpen] = useState(false);
-	const [searchQuery, setSearchQuery] = useState("");
-
-	const task = info.row.original;
 	const currentLabels = info.getValue() || [];
 
-	// Lazy load all tasks to get all unique labels
-	const { data: allTasks } = useLiveQuery(
-		(q) => (open ? q.from({ tasks: collections.tasks }) : null),
-		[collections, open],
-	);
-
-	// Get all unique labels across all tasks
-	const allLabels = useMemo(() => {
-		if (!allTasks) return [];
-		const labelsSet = new Set<string>();
-		for (const t of allTasks) {
-			if (t.labels && Array.isArray(t.labels)) {
-				for (const label of t.labels) {
-					labelsSet.add(label);
-				}
-			}
-		}
-		return Array.from(labelsSet).sort();
-	}, [allTasks]);
-
-	// Filter labels based on search query
-	const filteredLabels = useMemo(() => {
-		const query = searchQuery.toLowerCase();
-		return allLabels.filter((label) => label.toLowerCase().includes(query));
-	}, [searchQuery, allLabels]);
-
-	const handleToggleLabel = async (label: string) => {
-		try {
-			await collections.tasks.update(task.id, (draft) => {
-				if (!draft.labels) {
-					draft.labels = [label];
-				} else if (draft.labels.includes(label)) {
-					draft.labels = draft.labels.filter((l) => l !== label);
-				} else {
-					draft.labels = [...draft.labels, label];
-				}
-			});
-		} catch (error) {
-			console.error("[LabelsCell] Failed to update labels:", error);
-		}
-	};
+	// Don't render anything if there are no labels
+	if (currentLabels.length === 0) {
+		return null;
+	}
 
 	return (
-		<DropdownMenu open={open} onOpenChange={setOpen}>
-			<DropdownMenuTrigger asChild>
-				<Button
-					variant="ghost"
-					size="sm"
-					className="h-6 px-2 hover:bg-accent flex-shrink-0"
-				>
-					{currentLabels.length > 0 ? (
-						<div className="flex gap-1">
-							{currentLabels.slice(0, 2).map((label) => (
-								<Badge key={label} variant="outline" className="text-xs">
-									{label}
-								</Badge>
-							))}
-							{currentLabels.length > 2 && (
-								<Badge variant="outline" className="text-xs">
-									+{currentLabels.length - 2}
-								</Badge>
-							)}
-						</div>
-					) : (
-						<div className="flex items-center gap-1 text-muted-foreground">
-							<HiPlus className="h-3 w-3" />
-							<span className="text-xs">Labels</span>
-						</div>
-					)}
-				</Button>
-			</DropdownMenuTrigger>
-			<DropdownMenuContent align="start" className="w-56">
-				<div className="p-2">
-					<Input
-						placeholder="Search labels..."
-						value={searchQuery}
-						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8"
-						autoFocus
-					/>
-				</div>
-				<DropdownMenuSeparator />
-				<div className="max-h-64 overflow-y-auto">
-					{filteredLabels.map((label) => (
-						<DropdownMenuCheckboxItem
-							key={label}
-							checked={currentLabels.includes(label)}
-							onCheckedChange={() => handleToggleLabel(label)}
-							className="text-sm"
-						>
-							{label}
-						</DropdownMenuCheckboxItem>
-					))}
-					{filteredLabels.length === 0 && (
-						<div className="p-2 text-sm text-muted-foreground text-center">
-							{searchQuery
-								? "No labels found"
-								: "No labels yet. Add labels to tasks to see them here."}
-						</div>
-					)}
-				</div>
-			</DropdownMenuContent>
-		</DropdownMenu>
+		<div className="flex gap-1 flex-shrink-0">
+			{currentLabels.slice(0, 2).map((label) => (
+				<Badge key={label} variant="outline" className="text-xs">
+					{label}
+				</Badge>
+			))}
+			{currentLabels.length > 2 && (
+				<Badge variant="outline" className="text-xs">
+					+{currentLabels.length - 2}
+				</Badge>
+			)}
+		</div>
 	);
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 8ccce1a167d..fab7961f300 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -31,6 +31,7 @@ const columnHelper = createColumnHelper<TaskWithStatus>();
 export function useTasksTable(): {
 	table: Table<TaskWithStatus>;
 	isLoading: boolean;
+	slugColumnWidth: string;
 } {
 	const collections = useCollections();
 	const [grouping, setGrouping] = useState<string[]>(["status"]);
@@ -76,6 +77,23 @@ export function useTasksTable(): {
 			});
 	}, [allTasks, allStatuses]);
 
+	// Calculate optimal slug column width based on longest slug
+	const slugColumnWidth = useMemo(() => {
+		if (!data || data.length === 0) return "5rem"; // Default fallback
+
+		const longestSlug = data.reduce((longest, task) => {
+			return task.slug.length > longest.length ? task.slug : longest;
+		}, "");
+
+		// Monospace font-mono at text-xs (0.75rem = 12px)
+		// Each character is ~0.5em of the font size = 0.5 * 0.75rem = 0.375rem per char
+		const remPerChar = 0.5 * 0.75; // 0.375rem per character
+		const padding = 0.5; // rem for horizontal padding
+		const width = longestSlug.length * remPerChar + padding;
+
+		return `${Math.ceil(width * 10) / 10}rem`; // Round to 1 decimal
+	}, [data]);
+
 	const isLoading = tasksLoading || statusesLoading;
 
 	// TODO: Add localStorage persistence for collapsed groups
@@ -127,13 +145,22 @@ export function useTasksTable(): {
 				getGroupingValue: (row) => row.status.name,
 			}),
 
+			// Priority - clickable dropdown (FIRST COLUMN)
+			columnHelper.accessor("priority", {
+				header: "Priority",
+				cell: (info) => {
+					if (info.cell.getIsPlaceholder()) return null;
+					return <PriorityCell info={info} />;
+				},
+			}),
+
 			// Task ID - simple inline rendering
 			columnHelper.accessor("slug", {
 				header: "ID",
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
 					return (
-						<span className="text-xs text-muted-foreground font-mono w-20 flex-shrink-0">
+						<span className="text-xs text-muted-foreground font-mono flex-shrink-0">
 							{info.getValue()}
 						</span>
 					);
@@ -157,12 +184,12 @@ export function useTasksTable(): {
 				},
 			}),
 
-			// Priority - clickable dropdown
-			columnHelper.accessor("priority", {
-				header: "Priority",
+			// Labels - multi-select dropdown
+			columnHelper.accessor("labels", {
+				header: "Labels",
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
-					return <PriorityCell info={info} />;
+					return <LabelsCell info={info} />;
 				},
 			}),
 
@@ -175,15 +202,6 @@ export function useTasksTable(): {
 				},
 			}),
 
-			// Labels - multi-select dropdown
-			columnHelper.accessor("labels", {
-				header: "Labels",
-				cell: (info) => {
-					if (info.cell.getIsPlaceholder()) return null;
-					return <LabelsCell info={info} />;
-				},
-			}),
-
 			// Due date - simple inline rendering
 			columnHelper.accessor("dueDate", {
 				header: "Due",
@@ -215,5 +233,5 @@ export function useTasksTable(): {
 		autoResetExpanded: false,
 	});
 
-	return { table, isLoading };
+	return { table, isLoading, slugColumnWidth };
 }

From 5e65dbaf83e6f4f5c3892504ea23a6bc2e64e9ac Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sat, 10 Jan 2026 18:24:39 -0800
Subject: [PATCH 04/18] WIP'

---
 apps/api/package.json                         |   1 +
 .../linear/jobs/initial-sync/utils.ts         |   9 +-
 .../api/integrations/linear/webhook/route.ts  |   1 +
 .../components/PriorityIcon/PriorityIcon.tsx  | 119 ++++++++++++++
 .../components/PriorityIcon/index.ts          |   1 +
 .../components/StatusIcon/StatusIcon.tsx      |   6 +-
 .../TasksTableView/TasksTableView.tsx         |  14 +-
 .../cells/PriorityCell/PriorityCell.tsx       | 148 +++++-------------
 .../cells/StatusCell/StatusCell.tsx           |  70 ++++-----
 .../hooks/useTasksTable/useTasksTable.tsx     | 133 ++++++++++------
 bun.lock                                      |   1 +
 packages/ui/src/components/ui/scroll-area.tsx |   2 +-
 12 files changed, 299 insertions(+), 206 deletions(-)
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/index.ts

diff --git a/apps/api/package.json b/apps/api/package.json
index 023421e1310..b4ad65cf7a0 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -23,6 +23,7 @@
 		"@upstash/qstash": "^2.8.4",
 		"@vercel/blob": "^2.0.0",
 		"better-auth": "^1.4.9",
+		"date-fns": "^4.1.0",
 		"drizzle-orm": "0.45.1",
 		"import-in-the-middle": "2.0.1",
 		"jose": "^6.1.3",
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
index 17bebe604e8..e6cb223592b 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
@@ -1,4 +1,5 @@
 import type { LinearClient } from "@linear/sdk";
+import { subMonths } from "date-fns";
 import { mapPriorityFromLinear } from "@superset/trpc/integrations/linear";
 
 export interface LinearIssue {
@@ -9,6 +10,7 @@ export interface LinearIssue {
 	priority: number;
 	estimate: number | null;
 	dueDate: string | null;
+	createdAt: string;
 	url: string;
 	startedAt: string | null;
 	completedAt: string | null;
@@ -84,6 +86,7 @@ const ISSUES_QUERY = `
         priority
         estimate
         dueDate
+        createdAt
         url
         startedAt
         completedAt
@@ -114,10 +117,7 @@ export async function fetchAllIssues(
 ): Promise<LinearIssue[]> {
 	const allIssues: LinearIssue[] = [];
 	let cursor: string | undefined;
-
-	// Fetch tasks updated in the last 3 months
-	const threeMonthsAgo = new Date();
-	threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
+	const threeMonthsAgo = subMonths(new Date(), 3);
 
 	do {
 		const response = await client.client.request<
@@ -169,6 +169,7 @@ export function mapIssueToTask(
 		labels: issue.labels.nodes.map((l) => l.name),
 		startedAt: issue.startedAt ? new Date(issue.startedAt) : null,
 		completedAt: issue.completedAt ? new Date(issue.completedAt) : null,
+		createdAt: new Date(issue.createdAt),
 		externalProvider: "linear" as const,
 		externalId: issue.id,
 		externalKey: issue.identifier,
diff --git a/apps/api/src/app/api/integrations/linear/webhook/route.ts b/apps/api/src/app/api/integrations/linear/webhook/route.ts
index e4521000eab..f961d0c5299 100644
--- a/apps/api/src/app/api/integrations/linear/webhook/route.ts
+++ b/apps/api/src/app/api/integrations/linear/webhook/route.ts
@@ -143,6 +143,7 @@ async function processIssueEvent(
 				...taskData,
 				organizationId: connection.organizationId,
 				creatorId: connection.connectedByUserId,
+				createdAt: new Date(issue.createdAt),
 			})
 			.onConflictDoUpdate({
 				target: [tasks.externalProvider, tasks.externalId],
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
new file mode 100644
index 00000000000..23d11bed170
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -0,0 +1,119 @@
+import type { TaskPriority } from "@superset/db/enums";
+
+interface PriorityIconProps {
+	priority: TaskPriority;
+	statusType?: string;
+	className?: string;
+}
+
+export function PriorityIcon({
+	priority,
+	statusType,
+	className = "",
+}: PriorityIconProps) {
+	const sizeClass = className || "h-4 w-4";
+
+	// None: Three horizontal dashes with opacity
+	if (priority === "none") {
+		return (
+			<div className={`flex items-center justify-center ${sizeClass}`}>
+				<svg
+					viewBox="0 0 16 16"
+					fill="currentColor"
+					xmlns="http://www.w3.org/2000/svg"
+					className={sizeClass}
+				>
+					<rect x="1.5" y="7.25" width="3" height="1.5" rx="0.5" opacity="0.9" />
+					<rect x="6.5" y="7.25" width="3" height="1.5" rx="0.5" opacity="0.9" />
+					<rect
+						x="11.5"
+						y="7.25"
+						width="3"
+						height="1.5"
+						rx="0.5"
+						opacity="0.9"
+					/>
+				</svg>
+			</div>
+		);
+	}
+
+	// Urgent: Filled square with exclamation mark
+	// Orange for backlog/todo/in-progress, gray for completed/cancelled
+	if (priority === "urgent") {
+		const isActive =
+			statusType === "started" ||
+			statusType === "unstarted" ||
+			statusType === "backlog";
+		const fillColor = isActive ? "#F97316" : "currentColor";
+
+		return (
+			<div className={`flex items-center justify-center ${sizeClass}`}>
+				<svg
+					viewBox="0 0 16 16"
+					fill={fillColor}
+					xmlns="http://www.w3.org/2000/svg"
+					className={sizeClass}
+				>
+					<path d="M3 1C1.91067 1 1 1.91067 1 3V13C1 14.0893 1.91067 15 3 15H13C14.0893 15 15 14.0893 15 13V3C15 1.91067 14.0893 1 13 1H3ZM7 4L9 4L8.75391 8.99836H7.25L7 4ZM9 11C9 11.5523 8.55228 12 8 12C7.44772 12 7 11.5523 7 11C7 10.4477 7.44772 10 8 10C8.55228 10 9 10.4477 9 11Z" />
+				</svg>
+			</div>
+		);
+	}
+
+	// High: 3 bars staircase pattern (all solid)
+	if (priority === "high") {
+		return (
+			<div className={`flex items-center justify-center ${sizeClass}`}>
+				<svg
+					viewBox="0 0 16 16"
+					fill="currentColor"
+					xmlns="http://www.w3.org/2000/svg"
+					className={sizeClass}
+				>
+					<rect x="1.5" y="8" width="3" height="6" rx="1" />
+					<rect x="6.5" y="5" width="3" height="9" rx="1" />
+					<rect x="11.5" y="2" width="3" height="12" rx="1" />
+				</svg>
+			</div>
+		);
+	}
+
+	// Medium: 3 bars staircase (last bar 40% opacity)
+	if (priority === "medium") {
+		return (
+			<div className={`flex items-center justify-center ${sizeClass}`}>
+				<svg
+					viewBox="0 0 16 16"
+					fill="currentColor"
+					xmlns="http://www.w3.org/2000/svg"
+					className={sizeClass}
+				>
+					<rect x="1.5" y="8" width="3" height="6" rx="1" />
+					<rect x="6.5" y="5" width="3" height="9" rx="1" />
+					<rect x="11.5" y="2" width="3" height="12" rx="1" fillOpacity="0.4" />
+				</svg>
+			</div>
+		);
+	}
+
+	// Low: 3 bars staircase (middle and last bars 40% opacity)
+	if (priority === "low") {
+		return (
+			<div className={`flex items-center justify-center ${sizeClass}`}>
+				<svg
+					viewBox="0 0 16 16"
+					fill="currentColor"
+					xmlns="http://www.w3.org/2000/svg"
+					className={sizeClass}
+				>
+					<rect x="1.5" y="8" width="3" height="6" rx="1" />
+					<rect x="6.5" y="5" width="3" height="9" rx="1" fillOpacity="0.4" />
+					<rect x="11.5" y="2" width="3" height="12" rx="1" fillOpacity="0.4" />
+				</svg>
+			</div>
+		);
+	}
+
+	return null;
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/index.ts
new file mode 100644
index 00000000000..c6195a425fc
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/index.ts
@@ -0,0 +1 @@
+export { PriorityIcon } from "./PriorityIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
index 8dbaf6d1585..acddc3bc070 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
@@ -70,7 +70,7 @@ export function StatusIcon({
 	}
 
 	if (type === "started") {
-		// Progress fills counter-clockwise starting from 12 o'clock
+		// Progress fills clockwise starting from 12 o'clock
 		const centerRadius = 2;
 		const centerCircumference = 2 * Math.PI * centerRadius;
 		const progressPercent = progress ?? 100;
@@ -97,7 +97,7 @@ export function StatusIcon({
 						strokeDasharray="3.14 0"
 						strokeDashoffset="-0.7"
 					/>
-					{/* Center circle - radial progress, counter-clockwise from top */}
+					{/* Center circle - radial progress, clockwise from top */}
 					<circle
 						cx="7"
 						cy="7"
@@ -105,7 +105,7 @@ export function StatusIcon({
 						stroke={color}
 						strokeWidth="4"
 						strokeDasharray={`${dashLength} ${gapLength}`}
-						transform="rotate(90 7 7) scale(-1, 1) translate(-14, 0)"
+						transform="rotate(-90 7 7)"
 					/>
 				</svg>
 			</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
index 8ffbc7fd980..404be56d3d6 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
@@ -16,11 +16,13 @@ export function TasksTableView({ table, slugColumnWidth }: TasksTableViewProps)
 				if (isGroupHeader) {
 					// Group header - only render the status column (first cell)
 					// All other cells return null because they're placeholders
+					// DOM order handles stacking - later headers naturally overlap earlier ones
 					const firstCell = row.getVisibleCells()[0];
+
 					return (
 						<div
 							key={row.id}
-							className="sticky top-0 z-10 bg-background border-b border-border"
+							className="sticky top-0 bg-background z-10 border-b border-border/50"
 						>
 							{flexRender(firstCell.column.columnDef.cell, firstCell.getContext())}
 						</div>
@@ -28,25 +30,23 @@ export function TasksTableView({ table, slugColumnWidth }: TasksTableViewProps)
 				}
 
 				// Leaf row - render all cells horizontally with grid for consistent column widths
-				// Layout: [Priority] [ID] [Title] ... [Labels] [Assignee] [Due] [gap]
+				// Layout: [Checkbox] [Priority] [ID] [Title] ... [Labels] [Assignee] [Due] [gap]
 				// Note: Status column (index 0) returns null for leaf rows, so we skip it
 				const cells = row.getVisibleCells();
 				return (
 					<div
 						key={row.id}
-						className="grid items-center gap-2 px-4 py-2 hover:bg-accent/50 cursor-pointer border-b border-border/50"
+						className="grid items-center gap-3 px-4 h-9 hover:bg-accent/50 cursor-pointer border-b border-border/50"
 						style={{
-							gridTemplateColumns: `auto ${slugColumnWidth} 1fr minmax(0,auto) auto auto 3rem`,
+							gridTemplateColumns: `auto auto ${slugColumnWidth} 1fr auto auto`,
 						}}
 					>
-						{/* Skip status column (index 0), render priority, id, title, labels, assignee, due */}
+						{/* Skip status column (index 0), render checkbox, priority, id, title+labels, assignee, created */}
 						{cells.slice(1).map((cell) => (
 							<div key={cell.id} className="flex items-center">
 								{flexRender(cell.column.columnDef.cell, cell.getContext())}
 							</div>
 						))}
-						{/* Empty cell for right padding/growth space */}
-						<div />
 					</div>
 				);
 			})}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
index ce000dc9400..f9010a28fa1 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo } from "react";
+import { useState } from "react";
 import type { CellContext } from "@tanstack/react-table";
 import type { SelectTask } from "@superset/db/schema";
 import { taskPriorityValues, type TaskPriority } from "@superset/db/enums";
@@ -8,30 +8,36 @@ import {
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
-import { Input } from "@superset/ui/input";
-import { Button } from "@superset/ui/button";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { PRIORITY_COLORS } from "./constants";
+import { PriorityIcon } from "../../PriorityIcon";
 
 interface PriorityCellProps {
 	info: CellContext<SelectTask, TaskPriority>;
 }
 
+const PRIORITY_LABELS: Record<TaskPriority, string> = {
+	none: "No priority",
+	urgent: "Urgent",
+	high: "High",
+	medium: "Medium",
+	low: "Low",
+};
+
+const PRIORITY_NUMBERS: Record<TaskPriority, number> = {
+	none: 0,
+	urgent: 1,
+	high: 2,
+	medium: 3,
+	low: 4,
+};
+
 export function PriorityCell({ info }: PriorityCellProps) {
 	const collections = useCollections();
 	const [open, setOpen] = useState(false);
-	const [searchQuery, setSearchQuery] = useState("");
 
 	const task = info.row.original;
 	const currentPriority = info.getValue();
-
-	// Filter priorities based on search query
-	const filteredPriorities = useMemo(() => {
-		const query = searchQuery.toLowerCase();
-		return taskPriorityValues.filter((priority: TaskPriority) =>
-			priority.toLowerCase().includes(query),
-		);
-	}, [searchQuery]);
+	const statusType = (task as any).status?.type;
 
 	const handleSelectPriority = async (newPriority: TaskPriority) => {
 		if (newPriority === currentPriority) {
@@ -44,110 +50,38 @@ export function PriorityCell({ info }: PriorityCellProps) {
 				draft.priority = newPriority;
 			});
 			setOpen(false);
-			setSearchQuery("");
 		} catch (error) {
 			console.error("[PriorityCell] Failed to update priority:", error);
 		}
 	};
 
-	// Don't render anything if priority is "none"
-	if (currentPriority === "none" && !open) {
-		return (
-			<DropdownMenu open={open} onOpenChange={setOpen}>
-				<DropdownMenuTrigger asChild>
-					<Button
-						variant="ghost"
-						size="sm"
-						className="h-4 w-4 p-0 hover:bg-accent rounded-full opacity-0 group-hover:opacity-100"
-					>
-						<div className="w-2 h-2 rounded-full bg-muted" />
-					</Button>
-				</DropdownMenuTrigger>
-				<DropdownMenuContent align="start" className="w-40">
-					<div className="p-2">
-						<Input
-							placeholder="Search priority..."
-							value={searchQuery}
-							onChange={(e) => setSearchQuery(e.target.value)}
-							className="h-8"
-							autoFocus
-						/>
-					</div>
-					<div className="max-h-64 overflow-y-auto">
-						{filteredPriorities.map((priority: TaskPriority) => (
-							<DropdownMenuItem
-								key={priority}
-								onSelect={() => handleSelectPriority(priority)}
-								className="flex items-center gap-2"
-							>
-								<div
-									className={`w-2 h-2 rounded-full ${PRIORITY_COLORS[priority]}`}
-								/>
-								<span className="text-sm capitalize">{priority}</span>
-								{priority === currentPriority && (
-									<span className="ml-auto text-xs text-muted-foreground">
-										✓
-									</span>
-								)}
-							</DropdownMenuItem>
-						))}
-						{filteredPriorities.length === 0 && (
-							<div className="p-2 text-sm text-muted-foreground text-center">
-								No priority found
-							</div>
-						)}
-					</div>
-				</DropdownMenuContent>
-			</DropdownMenu>
-		);
-	}
-
 	return (
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
-				<Button
-					variant="ghost"
-					size="sm"
-					className="h-4 w-4 p-0 hover:bg-accent rounded-full"
-					title={currentPriority}
+				<button
+					className="p-0 cursor-pointer border-0 hover:brightness-110 transition-all"
+					title={PRIORITY_LABELS[currentPriority]}
 				>
-					<div
-						className={`w-2 h-2 rounded-full ${PRIORITY_COLORS[currentPriority]}`}
-					/>
-				</Button>
+					<PriorityIcon priority={currentPriority} statusType={statusType} />
+				</button>
 			</DropdownMenuTrigger>
-			<DropdownMenuContent align="start" className="w-40">
-				<div className="p-2">
-					<Input
-						placeholder="Search priority..."
-						value={searchQuery}
-						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8"
-						autoFocus
-					/>
-				</div>
-				<div className="max-h-64 overflow-y-auto">
-					{filteredPriorities.map((priority: TaskPriority) => (
-						<DropdownMenuItem
-							key={priority}
-							onSelect={() => handleSelectPriority(priority)}
-							className="flex items-center gap-2"
-						>
-							<div
-								className={`w-2 h-2 rounded-full ${PRIORITY_COLORS[priority]}`}
-							/>
-							<span className="text-sm capitalize">{priority}</span>
-							{priority === currentPriority && (
-								<span className="ml-auto text-xs text-muted-foreground">✓</span>
-							)}
-						</DropdownMenuItem>
-					))}
-					{filteredPriorities.length === 0 && (
-						<div className="p-2 text-sm text-muted-foreground text-center">
-							No priority found
-						</div>
-					)}
-				</div>
+			<DropdownMenuContent align="start" className="w-52 p-1">
+				{taskPriorityValues.map((priority: TaskPriority) => (
+					<DropdownMenuItem
+						key={priority}
+						onSelect={() => handleSelectPriority(priority)}
+						className="flex items-center gap-3 px-3 py-2"
+					>
+						<PriorityIcon priority={priority} statusType={statusType} />
+						<span className="text-sm flex-1">{PRIORITY_LABELS[priority]}</span>
+						{priority === currentPriority && (
+							<span className="text-sm">✓</span>
+						)}
+						<span className="text-xs text-muted-foreground tabular-nums">
+							{PRIORITY_NUMBERS[priority]}
+						</span>
+					</DropdownMenuItem>
+				))}
 			</DropdownMenuContent>
 		</DropdownMenu>
 	);
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
index 41461654ac6..c054e9f5dfc 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -7,8 +7,6 @@ import {
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
-import { Input } from "@superset/ui/input";
-import { Button } from "@superset/ui/button";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { StatusIcon } from "../../StatusIcon";
 
@@ -17,6 +15,15 @@ type TaskWithStatus = SelectTask & {
 	status: SelectTaskStatus;
 };
 
+// Status type ordering (Linear style: in progress → todo → backlog → done → cancelled)
+const STATUS_TYPE_ORDER: Record<string, number> = {
+	started: 0,
+	unstarted: 1,
+	backlog: 2,
+	completed: 3,
+	cancelled: 4,
+};
+
 interface StatusCellProps {
 	taskWithStatus: TaskWithStatus;
 }
@@ -24,7 +31,6 @@ interface StatusCellProps {
 export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const collections = useCollections();
 	const [open, setOpen] = useState(false);
-	const [searchQuery, setSearchQuery] = useState("");
 
 	// Lazy load statuses only when dropdown opens
 	const { data: allStatuses } = useLiveQuery(
@@ -35,26 +41,31 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const statuses = useMemo(() => allStatuses || [], [allStatuses]);
 	const currentStatus = taskWithStatus.status;
 
-	// Filter statuses based on search query
-	const filteredStatuses = useMemo(() => {
-		const query = searchQuery.toLowerCase();
-		return statuses.filter((status) =>
-			status.name.toLowerCase().includes(query),
-		);
-	}, [searchQuery, statuses]);
+	// Sort statuses by type order and position
+	const sortedStatuses = useMemo(() => {
+		return statuses.sort((a, b) => {
+			// Sort by status type first (started → unstarted → backlog → completed → cancelled)
+			const typeOrderA = STATUS_TYPE_ORDER[a.type] ?? 999;
+			const typeOrderB = STATUS_TYPE_ORDER[b.type] ?? 999;
+			if (typeOrderA !== typeOrderB) {
+				return typeOrderA - typeOrderB;
+			}
+			// Within same type, sort by position
+			return a.position - b.position;
+		});
+	}, [statuses]);
 
-	const handleSelectStatus = async (newStatus: SelectTaskStatus) => {
+	const handleSelectStatus = (newStatus: SelectTaskStatus) => {
 		if (newStatus.id === currentStatus.id) {
 			setOpen(false);
 			return;
 		}
 
 		try {
-			await collections.tasks.update(taskWithStatus.id, (draft) => {
+			collections.tasks.update(taskWithStatus.id, (draft) => {
 				draft.statusId = newStatus.id;
 			});
 			setOpen(false);
-			setSearchQuery("");
 		} catch (error) {
 			console.error("[StatusCell] Failed to update status:", error);
 		}
@@ -63,51 +74,34 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	return (
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
-				<Button
-					variant="ghost"
-					size="sm"
-					className="h-6 w-6 p-0 hover:bg-accent"
-				>
+				<button className="p-0 cursor-pointer border-0">
 					<StatusIcon
 						type={currentStatus.type as any}
 						color={currentStatus.color}
 						progress={currentStatus.progressPercent ?? undefined}
+						showHover={true}
 					/>
-				</Button>
+				</button>
 			</DropdownMenuTrigger>
-			<DropdownMenuContent align="start" className="w-48">
-				<div className="p-2">
-					<Input
-						placeholder="Search status..."
-						value={searchQuery}
-						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8"
-						autoFocus
-					/>
-				</div>
+			<DropdownMenuContent align="start" className="w-48 p-1">
 				<div className="max-h-64 overflow-y-auto">
-					{filteredStatuses.map((status) => (
+					{sortedStatuses.map((status) => (
 						<DropdownMenuItem
 							key={status.id}
 							onSelect={() => handleSelectStatus(status)}
-							className="flex items-center gap-2"
+							className="flex items-center gap-3 px-3 py-2"
 						>
 							<StatusIcon
 								type={status.type as any}
 								color={status.color}
 								progress={status.progressPercent ?? undefined}
 							/>
-							<span className="text-sm">{status.name}</span>
+							<span className="text-sm flex-1">{status.name}</span>
 							{status.id === currentStatus.id && (
-								<span className="ml-auto text-xs text-muted-foreground">✓</span>
+								<span className="text-sm">✓</span>
 							)}
 						</DropdownMenuItem>
 					))}
-					{filteredStatuses.length === 0 && (
-						<div className="p-2 text-sm text-muted-foreground text-center">
-							No status found
-						</div>
-					)}
 				</div>
 			</DropdownMenuContent>
 		</DropdownMenu>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index fab7961f300..c389ebc4c5c 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -12,20 +12,28 @@ import {
 import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
 import { useLiveQuery } from "@tanstack/react-db";
 import { format } from "date-fns";
-import { Button } from "@superset/ui/button";
-import { HiChevronDown, HiChevronRight } from "react-icons/hi2";
+import { HiChevronRight } from "react-icons/hi2";
+import { Badge } from "@superset/ui/badge";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { StatusIcon } from "../../components/StatusIcon";
 import { StatusCell } from "../../components/cells/StatusCell";
 import { PriorityCell } from "../../components/cells/PriorityCell";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
-import { LabelsCell } from "../../components/cells/LabelsCell";
 
 // Task with joined status data
 type TaskWithStatus = SelectTask & {
 	status: SelectTaskStatus;
 };
 
+// Status type ordering (Linear style: in progress → todo → backlog → done → cancelled)
+const STATUS_TYPE_ORDER: Record<string, number> = {
+	started: 0,
+	unstarted: 1,
+	backlog: 2,
+	completed: 3,
+	cancelled: 4,
+};
+
 const columnHelper = createColumnHelper<TaskWithStatus>();
 
 export function useTasksTable(): {
@@ -48,7 +56,7 @@ export function useTasksTable(): {
 		[collections],
 	);
 
-	// Client-side join: merge tasks with their status
+	// Client-side join: merge tasks with their status and sort
 	const data = useMemo(() => {
 		if (!allTasks || !allStatuses) return [];
 
@@ -74,6 +82,16 @@ export function useTasksTable(): {
 					};
 				}
 				return { ...task, status };
+			})
+			.sort((a, b) => {
+				// Sort by status type first (started → unstarted → backlog → completed → cancelled)
+				const typeOrderA = STATUS_TYPE_ORDER[a.status.type] ?? 999;
+				const typeOrderB = STATUS_TYPE_ORDER[b.status.type] ?? 999;
+				if (typeOrderA !== typeOrderB) {
+					return typeOrderA - typeOrderB;
+				}
+				// Within same type, sort by position
+				return a.status.position - b.status.position;
 			});
 	}, [allTasks, allStatuses]);
 
@@ -110,32 +128,38 @@ export function useTasksTable(): {
 					const status = info.getValue();
 
 					if (cell.getIsGrouped()) {
-						// Group header row
+						// Group header row with subtle gradient (Linear style, 8% opacity)
 						return (
-							<Button
-								variant="ghost"
-								className="w-full justify-start px-4 py-2 h-auto hover:bg-accent/50"
-								onClick={row.getToggleExpandedHandler()}
+							<div
+								className="w-full"
+								style={{
+									background: `linear-gradient(90deg, ${status.color}14 0%, transparent 100%)`,
+								}}
 							>
-								<div className="flex items-center gap-2">
-									{row.getIsExpanded() ? (
-										<HiChevronDown className="h-4 w-4 text-muted-foreground" />
-									) : (
-										<HiChevronRight className="h-4 w-4 text-muted-foreground" />
-									)}
-									<StatusIcon
-										type={status.type as any}
-										color={status.color}
-										progress={status.progressPercent ?? undefined}
+								<button
+									className="group w-full justify-start px-4 py-2 h-auto relative rounded-none bg-transparent flex items-center cursor-pointer border-0"
+									onClick={row.getToggleExpandedHandler()}
+								>
+									<HiChevronRight
+										className={`h-3 w-3 text-muted-foreground transition-transform duration-100 group-hover:text-foreground ${
+											row.getIsExpanded() ? "rotate-90" : ""
+										}`}
 									/>
-									<span className="text-sm font-medium capitalize">
-										{status.name}
-									</span>
-									<span className="text-xs text-muted-foreground">
-										{row.subRows.length}
-									</span>
-								</div>
-							</Button>
+									<div className="flex items-center gap-2 pl-4">
+										<StatusIcon
+											type={status.type as any}
+											color={status.color}
+											progress={status.progressPercent ?? undefined}
+										/>
+										<span className="text-sm font-medium capitalize">
+											{status.name}
+										</span>
+										<span className="text-xs text-muted-foreground">
+											{row.subRows.length}
+										</span>
+									</div>
+								</button>
+							</div>
 						);
 					}
 
@@ -145,7 +169,16 @@ export function useTasksTable(): {
 				getGroupingValue: (row) => row.status.name,
 			}),
 
-			// Priority - clickable dropdown (FIRST COLUMN)
+			// Checkbox column (placeholder for future selection)
+			columnHelper.display({
+				id: "checkbox",
+				header: "",
+				cell: () => {
+					return <div className="w-4" />;
+				},
+			}),
+
+			// Priority - clickable dropdown
 			columnHelper.accessor("priority", {
 				header: "Priority",
 				cell: (info) => {
@@ -160,39 +193,47 @@ export function useTasksTable(): {
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
 					return (
-						<span className="text-xs text-muted-foreground font-mono flex-shrink-0">
+						<span className="text-xs text-muted-foreground flex-shrink-0">
 							{info.getValue()}
 						</span>
 					);
 				},
 			}),
 
-			// Title - status icon + title inline (Linear style)
+			// Title + Labels - combined to handle overflow better
 			columnHelper.accessor("title", {
 				header: "Title",
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
 					const taskWithStatus = info.row.original;
+					const labels = taskWithStatus.labels || [];
 					return (
-						<div className="flex items-center gap-2 flex-1 min-w-0">
+						<div className="flex items-center gap-1.5 flex-1 min-w-0">
 							<StatusCell taskWithStatus={taskWithStatus} />
-							<span className="text-sm font-medium truncate">
-								{info.getValue()}
-							</span>
+							<div className="flex items-center justify-between gap-2 flex-1 min-w-0">
+								<span className="text-sm font-medium line-clamp-1 flex-shrink">
+									{info.getValue()}
+								</span>
+								{labels.length > 0 && (
+									<div className="flex gap-1 flex-shrink-0">
+										{labels.slice(0, 2).map((label) => (
+											<Badge key={label} variant="outline" className="text-xs">
+												{label}
+											</Badge>
+										))}
+										{labels.length > 2 && (
+											<Badge variant="outline" className="text-xs">
+												+{labels.length - 2}
+											</Badge>
+										)}
+									</div>
+								)}
+							</div>
 						</div>
 					);
 				},
 			}),
 
-			// Labels - multi-select dropdown
-			columnHelper.accessor("labels", {
-				header: "Labels",
-				cell: (info) => {
-					if (info.cell.getIsPlaceholder()) return null;
-					return <LabelsCell info={info} />;
-				},
-			}),
-
 			// Assignee - clickable dropdown
 			columnHelper.accessor("assigneeId", {
 				header: "Assignee",
@@ -202,9 +243,9 @@ export function useTasksTable(): {
 				},
 			}),
 
-			// Due date - simple inline rendering
-			columnHelper.accessor("dueDate", {
-				header: "Due",
+			// Created date - simple inline rendering
+			columnHelper.accessor("createdAt", {
+				header: "Created",
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
 					const date = info.getValue();
diff --git a/bun.lock b/bun.lock
index 6d96e86f4a9..19bccb4f16c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -70,6 +70,7 @@
         "@upstash/qstash": "^2.8.4",
         "@vercel/blob": "^2.0.0",
         "better-auth": "^1.4.9",
+        "date-fns": "^4.1.0",
         "drizzle-orm": "0.45.1",
         "import-in-the-middle": "2.0.1",
         "jose": "^6.1.3",
diff --git a/packages/ui/src/components/ui/scroll-area.tsx b/packages/ui/src/components/ui/scroll-area.tsx
index 28884095cf5..d80ac97404e 100644
--- a/packages/ui/src/components/ui/scroll-area.tsx
+++ b/packages/ui/src/components/ui/scroll-area.tsx
@@ -38,7 +38,7 @@ function ScrollBar({
 			data-slot="scroll-area-scrollbar"
 			orientation={orientation}
 			className={cn(
-				"flex touch-none p-px transition-colors select-none",
+				"flex touch-none p-px transition-colors select-none z-50",
 				orientation === "vertical" &&
 					"h-full w-2.5 border-l border-l-transparent",
 				orientation === "horizontal" &&

From ca4655b0fbe9f9574e2785ebf8dd00d92b6816bb Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sat, 10 Jan 2026 21:16:26 -0800
Subject: [PATCH 05/18] WIP

---
 .../CollectionsProvider/collections.ts        |  7 +-
 .../components/PriorityIcon/PriorityIcon.tsx  | 26 +++---
 .../cells/AssigneeCell/AssigneeCell.tsx       | 93 ++++++-------------
 .../cells/PriorityCell/PriorityCell.tsx       | 33 ++++---
 .../hooks/useTasksTable/useTasksTable.tsx     |  2 +-
 packages/ui/package.json                      |  1 +
 packages/ui/src/atoms/Avatar/Avatar.tsx       | 75 +++++++++++++++
 packages/ui/src/atoms/Avatar/index.ts         |  2 +
 8 files changed, 143 insertions(+), 96 deletions(-)
 create mode 100644 packages/ui/src/atoms/Avatar/Avatar.tsx
 create mode 100644 packages/ui/src/atoms/Avatar/index.ts

diff --git a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
index 0712242a1e0..d9a288fae32 100644
--- a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
+++ b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
@@ -70,8 +70,11 @@ function createOrgCollections(
 				return { txid: result.txid };
 			},
 			onUpdate: async ({ transaction }) => {
-				const { modified } = transaction.mutations[0];
-				const result = await apiClient.task.update.mutate(modified);
+				const { original, changes } = transaction.mutations[0];
+				const result = await apiClient.task.update.mutate({
+					...changes,
+					id: original.id,
+				});
 				return { txid: result.txid };
 			},
 			onDelete: async ({ transaction }) => {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index 23d11bed170..d7c9a1f2052 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -1,17 +1,22 @@
 import type { TaskPriority } from "@superset/db/enums";
+import colors from "tailwindcss/colors";
 
 interface PriorityIconProps {
 	priority: TaskPriority;
 	statusType?: string;
 	className?: string;
+	showHover?: boolean;
 }
 
 export function PriorityIcon({
 	priority,
 	statusType,
 	className = "",
+	showHover = false,
 }: PriorityIconProps) {
 	const sizeClass = className || "h-4 w-4";
+	const hoverClass = showHover ? "group-hover:brightness-150" : "";
+	const defaultColor = colors.neutral[500];
 
 	// None: Three horizontal dashes with opacity
 	if (priority === "none") {
@@ -19,9 +24,9 @@ export function PriorityIcon({
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
 					viewBox="0 0 16 16"
-					fill="currentColor"
+					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
-					className={sizeClass}
+					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
 					<rect x="1.5" y="7.25" width="3" height="1.5" rx="0.5" opacity="0.9" />
 					<rect x="6.5" y="7.25" width="3" height="1.5" rx="0.5" opacity="0.9" />
@@ -45,15 +50,14 @@ export function PriorityIcon({
 			statusType === "started" ||
 			statusType === "unstarted" ||
 			statusType === "backlog";
-		const fillColor = isActive ? "#F97316" : "currentColor";
 
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
 					viewBox="0 0 16 16"
-					fill={fillColor}
+					fill={isActive ? "#F97316" : defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
-					className={sizeClass}
+					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
 					<path d="M3 1C1.91067 1 1 1.91067 1 3V13C1 14.0893 1.91067 15 3 15H13C14.0893 15 15 14.0893 15 13V3C15 1.91067 14.0893 1 13 1H3ZM7 4L9 4L8.75391 8.99836H7.25L7 4ZM9 11C9 11.5523 8.55228 12 8 12C7.44772 12 7 11.5523 7 11C7 10.4477 7.44772 10 8 10C8.55228 10 9 10.4477 9 11Z" />
 				</svg>
@@ -67,9 +71,9 @@ export function PriorityIcon({
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
 					viewBox="0 0 16 16"
-					fill="currentColor"
+					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
-					className={sizeClass}
+					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
 					<rect x="1.5" y="8" width="3" height="6" rx="1" />
 					<rect x="6.5" y="5" width="3" height="9" rx="1" />
@@ -85,9 +89,9 @@ export function PriorityIcon({
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
 					viewBox="0 0 16 16"
-					fill="currentColor"
+					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
-					className={sizeClass}
+					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
 					<rect x="1.5" y="8" width="3" height="6" rx="1" />
 					<rect x="6.5" y="5" width="3" height="9" rx="1" />
@@ -103,9 +107,9 @@ export function PriorityIcon({
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
 					viewBox="0 0 16 16"
-					fill="currentColor"
+					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
-					className={sizeClass}
+					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
 					<rect x="1.5" y="8" width="3" height="6" rx="1" />
 					<rect x="6.5" y="5" width="3" height="9" rx="1" fillOpacity="0.4" />
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index ffbd687e625..8ff01878614 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -6,12 +6,10 @@ import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
-	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
-import { Input } from "@superset/ui/input";
-import { Button } from "@superset/ui/button";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
+import { HiOutlineUserCircle } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 
 interface AssigneeCellProps {
@@ -21,15 +19,14 @@ interface AssigneeCellProps {
 export function AssigneeCell({ info }: AssigneeCellProps) {
 	const collections = useCollections();
 	const [open, setOpen] = useState(false);
-	const [searchQuery, setSearchQuery] = useState("");
 
 	const task = info.row.original;
 	const assigneeId = info.getValue();
 
-	// Lazy load users only when dropdown opens
+	// Load all users
 	const { data: allUsers } = useLiveQuery(
-		(q) => (open ? q.from({ users: collections.users }) : null),
-		[collections, open],
+		(q) => q.from({ users: collections.users }),
+		[collections],
 	);
 
 	const users = useMemo(() => allUsers || [], [allUsers]);
@@ -40,31 +37,17 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 		return users.find((u) => u.id === assigneeId);
 	}, [assigneeId, users]);
 
-	// Filter users based on search query
-	const filteredUsers = useMemo(() => {
-		const query = searchQuery.toLowerCase();
-		return users.filter(
-			(user) =>
-				user.name.toLowerCase().includes(query) ||
-				user.email.toLowerCase().includes(query),
-		);
-	}, [searchQuery, users]);
-
-	const handleSelectUser = async (userId: string | null) => {
+	const handleSelectUser = (userId: string | null) => {
 		if (userId === assigneeId) {
 			setOpen(false);
 			return;
 		}
 
-		try {
-			await collections.tasks.update(task.id, (draft) => {
-				draft.assigneeId = userId;
-			});
-			setOpen(false);
-			setSearchQuery("");
-		} catch (error) {
-			console.error("[AssigneeCell] Failed to update assignee:", error);
-		}
+		setOpen(false);
+
+		collections.tasks.update(task.id, (draft) => {
+			draft.assigneeId = userId;
+		});
 	};
 
 	const getInitials = (name: string) => {
@@ -79,55 +62,42 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 	return (
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
-				<Button variant="ghost" size="sm" className="h-6 px-2 hover:bg-accent">
+				<button className="cursor-pointer">
 					{currentAssignee ? (
-						<div className="flex items-center gap-2">
-							<Avatar className="h-4 w-4">
-								{currentAssignee.image && (
-									<AvatarImage src={currentAssignee.image} />
-								)}
-								<AvatarFallback className="text-xs">
-									{getInitials(currentAssignee.name)}
-								</AvatarFallback>
-							</Avatar>
-							<span className="text-xs">{currentAssignee.name}</span>
-						</div>
+						<Avatar size="xs">
+							{currentAssignee.image && (
+								<AvatarImage src={currentAssignee.image} />
+							)}
+							<AvatarFallback size="xs">
+								{getInitials(currentAssignee.name)}
+							</AvatarFallback>
+						</Avatar>
 					) : (
-						<span className="text-xs text-muted-foreground">Unassigned</span>
+						<HiOutlineUserCircle className="size-5 text-muted-foreground" />
 					)}
-				</Button>
+				</button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent align="start" className="w-56">
-				<div className="p-2">
-					<Input
-						placeholder="Search users..."
-						value={searchQuery}
-						onChange={(e) => setSearchQuery(e.target.value)}
-						className="h-8"
-						autoFocus
-					/>
-				</div>
-				<DropdownMenuSeparator />
 				<div className="max-h-64 overflow-y-auto">
 					<DropdownMenuItem
 						onSelect={() => handleSelectUser(null)}
 						className="flex items-center gap-2"
 					>
-						<div className="h-4 w-4 rounded-full bg-muted" />
-						<span className="text-sm">Unassigned</span>
+						<HiOutlineUserCircle className="size-5 text-muted-foreground flex-shrink-0" />
+						<span className="text-sm">No assignee</span>
 						{!assigneeId && (
 							<span className="ml-auto text-xs text-muted-foreground">✓</span>
 						)}
 					</DropdownMenuItem>
-					{filteredUsers.map((user) => (
+					{users.map((user) => (
 						<DropdownMenuItem
 							key={user.id}
 							onSelect={() => handleSelectUser(user.id)}
 							className="flex items-center gap-2"
 						>
-							<Avatar className="h-4 w-4">
+							<Avatar size="xs">
 								{user.image && <AvatarImage src={user.image} />}
-								<AvatarFallback className="text-xs">
+								<AvatarFallback size="xs">
 									{getInitials(user.name)}
 								</AvatarFallback>
 							</Avatar>
@@ -138,17 +108,10 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 								</span>
 							</div>
 							{user.id === assigneeId && (
-								<span className="ml-auto text-xs text-muted-foreground">
-									✓
-								</span>
+								<span className="ml-auto text-xs text-muted-foreground">✓</span>
 							)}
 						</DropdownMenuItem>
 					))}
-					{filteredUsers.length === 0 && searchQuery && (
-						<div className="p-2 text-sm text-muted-foreground text-center">
-							No users found
-						</div>
-					)}
 				</div>
 			</DropdownMenuContent>
 		</DropdownMenu>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
index f9010a28fa1..f99d2a3a7e0 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import type { CellContext } from "@tanstack/react-table";
 import type { SelectTask } from "@superset/db/schema";
-import { taskPriorityValues, type TaskPriority } from "@superset/db/enums";
+import { type TaskPriority } from "@superset/db/enums";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -23,13 +23,13 @@ const PRIORITY_LABELS: Record<TaskPriority, string> = {
 	low: "Low",
 };
 
-const PRIORITY_NUMBERS: Record<TaskPriority, number> = {
-	none: 0,
-	urgent: 1,
-	high: 2,
-	medium: 3,
-	low: 4,
-};
+const PRIORITY_DISPLAY_ORDER: TaskPriority[] = [
+	"none",
+	"urgent",
+	"high",
+	"medium",
+	"low",
+];
 
 export function PriorityCell({ info }: PriorityCellProps) {
 	const collections = useCollections();
@@ -59,14 +59,18 @@ export function PriorityCell({ info }: PriorityCellProps) {
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
 				<button
-					className="p-0 cursor-pointer border-0 hover:brightness-110 transition-all"
+					className="group p-0 cursor-pointer border-0 transition-all"
 					title={PRIORITY_LABELS[currentPriority]}
 				>
-					<PriorityIcon priority={currentPriority} statusType={statusType} />
+					<PriorityIcon
+						priority={currentPriority}
+						statusType={statusType}
+						showHover={true}
+					/>
 				</button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent align="start" className="w-52 p-1">
-				{taskPriorityValues.map((priority: TaskPriority) => (
+				{PRIORITY_DISPLAY_ORDER.map((priority: TaskPriority) => (
 					<DropdownMenuItem
 						key={priority}
 						onSelect={() => handleSelectPriority(priority)}
@@ -74,12 +78,7 @@ export function PriorityCell({ info }: PriorityCellProps) {
 					>
 						<PriorityIcon priority={priority} statusType={statusType} />
 						<span className="text-sm flex-1">{PRIORITY_LABELS[priority]}</span>
-						{priority === currentPriority && (
-							<span className="text-sm">✓</span>
-						)}
-						<span className="text-xs text-muted-foreground tabular-nums">
-							{PRIORITY_NUMBERS[priority]}
-						</span>
+						{priority === currentPriority && <span className="text-sm">✓</span>}
 					</DropdownMenuItem>
 				))}
 			</DropdownMenuContent>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index c389ebc4c5c..16af5f6df5f 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -251,7 +251,7 @@ export function useTasksTable(): {
 					const date = info.getValue();
 					if (!date) return null;
 					return (
-						<span className="text-xs text-muted-foreground flex-shrink-0">
+						<span className="text-xs text-muted-foreground flex-shrink-0 w-11">
 							{format(new Date(date), "MMM d")}
 						</span>
 					);
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 5aa98a1fa26..568f0af4210 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -12,6 +12,7 @@
 		"./mesh-gradient": "./src/components/mesh-gradient.tsx",
 		"./icons/preset-icons": "./src/assets/icons/preset-icons/index.ts",
 		"./icons/preset-icons/*": "./src/assets/icons/preset-icons/*.svg",
+		"./atoms/*": "./src/atoms/*/index.ts",
 		"./*": "./src/components/ui/*.tsx"
 	},
 	"scripts": {
diff --git a/packages/ui/src/atoms/Avatar/Avatar.tsx b/packages/ui/src/atoms/Avatar/Avatar.tsx
new file mode 100644
index 00000000000..f7c5f944daa
--- /dev/null
+++ b/packages/ui/src/atoms/Avatar/Avatar.tsx
@@ -0,0 +1,75 @@
+import type React from "react";
+import { cva, type VariantProps } from "class-variance-authority";
+import {
+	Avatar as AvatarBase,
+	AvatarFallback as AvatarFallbackBase,
+	AvatarImage as AvatarImageBase,
+} from "../../components/ui/avatar";
+import { cn } from "../../lib/utils";
+
+const avatarVariants = cva("", {
+	variants: {
+		size: {
+			xs: "size-5",
+			sm: "size-6",
+			md: "size-8",
+			lg: "size-10",
+			xl: "size-12",
+		},
+	},
+	defaultVariants: {
+		size: "md",
+	},
+});
+
+const avatarFallbackVariants = cva("", {
+	variants: {
+		size: {
+			xs: "text-[0.625rem]",
+			sm: "text-xs",
+			md: "text-sm",
+			lg: "text-base",
+			xl: "text-lg",
+		},
+	},
+	defaultVariants: {
+		size: "md",
+	},
+});
+
+interface AvatarProps
+	extends React.ComponentProps<typeof AvatarBase>,
+		VariantProps<typeof avatarVariants> {}
+
+interface AvatarFallbackProps
+	extends React.ComponentProps<typeof AvatarFallbackBase>,
+		VariantProps<typeof avatarFallbackVariants> {}
+
+function Avatar({ className, size, ...props }: AvatarProps) {
+	return (
+		<AvatarBase
+			className={cn(avatarVariants({ size }), className)}
+			{...props}
+		/>
+	);
+}
+
+function AvatarImage(props: React.ComponentProps<typeof AvatarImageBase>) {
+	return <AvatarImageBase {...props} />;
+}
+
+function AvatarFallback({
+	className,
+	size,
+	...props
+}: AvatarFallbackProps) {
+	return (
+		<AvatarFallbackBase
+			className={cn(avatarFallbackVariants({ size }), className)}
+			{...props}
+		/>
+	);
+}
+
+export { Avatar, AvatarImage, AvatarFallback };
+export type { AvatarProps, AvatarFallbackProps };
diff --git a/packages/ui/src/atoms/Avatar/index.ts b/packages/ui/src/atoms/Avatar/index.ts
new file mode 100644
index 00000000000..bc98b83e574
--- /dev/null
+++ b/packages/ui/src/atoms/Avatar/index.ts
@@ -0,0 +1,2 @@
+export { Avatar, AvatarImage, AvatarFallback } from "./Avatar";
+export type { AvatarProps, AvatarFallbackProps } from "./Avatar";

From b4392d2bb0d61cbd213c5f7e202e982cf4a2a9b9 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sat, 10 Jan 2026 22:23:10 -0800
Subject: [PATCH 06/18] HOLY FUCK THIS SUCKS

---
 apps/api/package.json                         |  2 +-
 apps/desktop/package.json                     |  2 +-
 .../CollectionsProvider/collections.ts        |  5 --
 .../TeamSettings/TeamSettings.tsx             | 66 +++++++------------
 .../MemberActions/MemberActions.tsx           |  2 +-
 .../cells/AssigneeCell/AssigneeCell.tsx       | 21 ++++--
 bun.lock                                      |  8 ++-
 7 files changed, 47 insertions(+), 59 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index b4ad65cf7a0..4ec4477dbff 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -11,7 +11,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@electric-sql/client": "^1.3.1",
+		"@electric-sql/client": "1.4.0",
 		"@linear/sdk": "^68.1.0",
 		"@sentry/nextjs": "^10.32.1",
 		"@superset/auth": "workspace:*",
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 0bd431f8968..2a85bc1efc3 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -34,7 +34,7 @@
 		"@dnd-kit/core": "^6.3.1",
 		"@dnd-kit/sortable": "^10.0.0",
 		"@dnd-kit/utilities": "^3.2.2",
-		"@electric-sql/client": "^1.3.1",
+		"@electric-sql/client": "1.4.0",
 		"@monaco-editor/react": "^4.7.0",
 		"@radix-ui/react-dialog": "^1.1.15",
 		"@radix-ui/react-label": "^2.1.8",
diff --git a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
index d9a288fae32..7bf4bfebabc 100644
--- a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
+++ b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
@@ -58,7 +58,6 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "tasks",
-					organization: organizationId,
 				},
 				headers,
 				columnMapper,
@@ -92,7 +91,6 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "task_statuses",
-					organization: organizationId,
 				},
 				headers,
 				columnMapper,
@@ -108,7 +106,6 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "repositories",
-					organization: organizationId,
 				},
 				headers,
 				columnMapper,
@@ -134,7 +131,6 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "auth.members",
-					organization: organizationId,
 				},
 				headers,
 				columnMapper,
@@ -150,7 +146,6 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "auth.users",
-					organization: organizationId,
 				},
 				headers,
 				columnMapper,
diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
index 51be9767c93..ec61ae6ab15 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
@@ -10,6 +10,7 @@ import {
 	TableHeader,
 	TableRow,
 } from "@superset/ui/table";
+import { eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useAuth } from "renderer/contexts/AuthProvider";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
@@ -20,55 +21,38 @@ export function TeamSettings() {
 	const { session } = useAuth();
 	const collections = useCollections();
 
-	const { data: membersData, isLoading: isLoadingMembers } = useLiveQuery(
-		(q) => q.from({ members: collections.members }),
+	const { data: membersData, isLoading } = useLiveQuery(
+		(q) =>
+			q
+				.from({ members: collections.members })
+				.leftJoin(
+					{ users: collections.users },
+					({ members, users }) => eq(members.userId, users.id),
+				)
+				.select(({ members, users }) => ({
+					memberId: members.id,
+					userId: members.userId,
+					name: users?.name ?? null,
+					email: users?.email ?? "",
+					image: users?.image ?? null,
+					role: members.role,
+					joinedAt: members.createdAt,
+					organizationId: members.organizationId,
+				}))
+				.orderBy(({ members }) => members.role, "asc")
+				.orderBy(({ members }) => members.createdAt, "asc"),
 		[collections],
 	);
 
-	const { data: usersData, isLoading: isLoadingUsers } = useLiveQuery(
-		(q) => q.from({ users: collections.users }),
-		[collections],
-	);
-
-	const isLoading = isLoadingMembers || isLoadingUsers;
-
-	// Join members with users and create member details
-	const memberDetails =
-		membersData && usersData
-			? membersData.map((member) => {
-					const user = usersData.find((u) => u.id === member.userId);
-					return {
-						memberId: member.id,
-						userId: member.userId,
-						name: user?.name ?? null,
-						email: user?.email ?? "",
-						image: user?.image ?? null,
-						role: member.role,
-						joinedAt:
-							member.createdAt instanceof Date
-								? member.createdAt.toISOString()
-								: member.createdAt,
-						organizationId: member.organizationId,
-					};
-				})
-			: [];
-
-	// Sort by role (owner first) then by joinedAt
-	const members = memberDetails.slice().sort((a, b) => {
-		// Owners first
-		if (a.role === "owner" && b.role !== "owner") return -1;
-		if (a.role !== "owner" && b.role === "owner") return 1;
-		// Then by join date
-		return new Date(a.joinedAt).getTime() - new Date(b.joinedAt).getTime();
-	});
+	const members = membersData ?? [];
 
 	const currentUserId = session?.user?.id;
 	const currentMember = members.find((m) => m.userId === currentUserId);
 	const isOwner = currentMember?.role === "owner";
 
-	const formatDate = (dateString: string) => {
-		const date = new Date(dateString);
-		return date.toLocaleDateString("en-US", {
+	const formatDate = (date: Date | string) => {
+		const d = date instanceof Date ? date : new Date(date);
+		return d.toLocaleDateString("en-US", {
 			month: "short",
 			day: "numeric",
 		});
diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberActions/MemberActions.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberActions/MemberActions.tsx
index 0d4bbf960c9..526c67a0a7a 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberActions/MemberActions.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberActions/MemberActions.tsx
@@ -25,7 +25,7 @@ export interface MemberDetails {
 	email: string;
 	image: string | null;
 	role: string;
-	joinedAt: string;
+	joinedAt: Date;
 	organizationId: string;
 }
 
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index 8ff01878614..76ad9cea3fe 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -1,6 +1,7 @@
 import { useState, useMemo } from "react";
 import type { CellContext } from "@tanstack/react-table";
 import type { SelectTask } from "@superset/db/schema";
+import { eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import {
 	DropdownMenu,
@@ -23,19 +24,25 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 	const task = info.row.original;
 	const assigneeId = info.getValue();
 
-	// Load all users
+	// All users for dropdown
 	const { data: allUsers } = useLiveQuery(
 		(q) => q.from({ users: collections.users }),
 		[collections],
 	);
 
-	const users = useMemo(() => allUsers || [], [allUsers]);
+	// Current assignee (filtered query)
+	const { data: assigneeData } = useLiveQuery(
+		(q) =>
+			assigneeId
+				? q
+						.from({ users: collections.users })
+						.where(({ users }) => eq(users.id, assigneeId))
+				: null,
+		[collections, assigneeId],
+	);
 
-	// Find current assignee
-	const currentAssignee = useMemo(() => {
-		if (!assigneeId) return null;
-		return users.find((u) => u.id === assigneeId);
-	}, [assigneeId, users]);
+	const users = useMemo(() => allUsers || [], [allUsers]);
+	const currentAssignee = assigneeData?.[0] ?? null;
 
 	const handleSelectUser = (userId: string | null) => {
 		if (userId === assigneeId) {
diff --git a/bun.lock b/bun.lock
index 19bccb4f16c..b64cabd9c4e 100644
--- a/bun.lock
+++ b/bun.lock
@@ -58,7 +58,7 @@
       "name": "@superset/api",
       "version": "0.1.0",
       "dependencies": {
-        "@electric-sql/client": "^1.3.1",
+        "@electric-sql/client": "1.4.0",
         "@linear/sdk": "^68.1.0",
         "@sentry/nextjs": "^10.32.1",
         "@superset/auth": "workspace:*",
@@ -127,7 +127,7 @@
         "@dnd-kit/core": "^6.3.1",
         "@dnd-kit/sortable": "^10.0.0",
         "@dnd-kit/utilities": "^3.2.2",
-        "@electric-sql/client": "^1.3.1",
+        "@electric-sql/client": "1.4.0",
         "@monaco-editor/react": "^4.7.0",
         "@radix-ui/react-dialog": "^1.1.15",
         "@radix-ui/react-label": "^2.1.8",
@@ -659,7 +659,7 @@
 
     "@drizzle-team/brocli": ["@drizzle-team/brocli@0.10.2", "", {}, "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w=="],
 
-    "@electric-sql/client": ["@electric-sql/client@1.3.1", "", { "dependencies": { "@microsoft/fetch-event-source": "^2.0.1" }, "optionalDependencies": { "@rollup/rollup-darwin-arm64": "^4.18.1" } }, "sha512-Tr7jY60acKfxuODOzGcJYzEXtTJyiE8l237hMpCPHjflr+qSGYVZ0NkOnFgAE2xIPFgP1zn05nQb3+mkUu8qUQ=="],
+    "@electric-sql/client": ["@electric-sql/client@1.4.0", "", { "dependencies": { "@microsoft/fetch-event-source": "^2.0.1" }, "optionalDependencies": { "@rollup/rollup-darwin-arm64": "^4.18.1" } }, "sha512-JTJxm3r5KXhpSEJ+C89gWbGzIH+UnPlzD92iNdtkXYx2gkoJcgd2h0YfaBF2Tu1k3yVG/pje/6CeFlHI9JrsCQ=="],
 
     "@electric-sql/pglite": ["@electric-sql/pglite@0.3.14", "", {}, "sha512-3DB258dhqdsArOI1fIt7cb9RpUOgcDg5hXWVgVHAeqVQ/qxtFy605QKs4gx6mFq3jWsSPqDN8TgSEsqC3OfV9Q=="],
 
@@ -3835,6 +3835,8 @@
 
     "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
+    "@tanstack/electric-db-collection/@electric-sql/client": ["@electric-sql/client@1.3.1", "", { "dependencies": { "@microsoft/fetch-event-source": "^2.0.1" }, "optionalDependencies": { "@rollup/rollup-darwin-arm64": "^4.18.1" } }, "sha512-Tr7jY60acKfxuODOzGcJYzEXtTJyiE8l237hMpCPHjflr+qSGYVZ0NkOnFgAE2xIPFgP1zn05nQb3+mkUu8qUQ=="],
+
     "@ts-morph/common/minimatch": ["minimatch@10.1.1", "", { "dependencies": { "@isaacs/brace-expansion": "^5.0.0" } }, "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ=="],
 
     "@types/three/fflate": ["fflate@0.8.2", "", {}, "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="],

From c65f4175f36823af69d552da9708d058015f7e63 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sun, 11 Jan 2026 13:57:49 -0800
Subject: [PATCH 07/18] better

---
 .../src/app/api/electric/[...path]/route.ts   |  30 +--
 .../main/components/TasksView/TasksView.tsx   |   4 +-
 .../TaskContextMenu/TaskContextMenu.tsx       | 184 ++++++++++++++++++
 .../components/TaskContextMenu/index.ts       |   1 +
 .../TasksTableView/TasksTableView.tsx         |  37 ++--
 .../cells/AssigneeCell/AssigneeCell.tsx       |  19 +-
 .../cells/PriorityCell/PriorityCell.tsx       |  15 +-
 .../cells/StatusCell/StatusCell.tsx           |  23 +--
 .../components/shared/AssigneeMenuItems.tsx   |  73 +++++++
 .../components/shared/PriorityMenuItems.tsx   |  51 +++++
 .../components/shared/StatusMenuItems.tsx     |  46 +++++
 .../TasksView/hooks/useTasksTable/index.ts    |   2 +-
 .../hooks/useTasksTable/useTasksTable.tsx     |  95 ++++-----
 .../components/TasksView/utils/taskSorting.ts | 120 ++++++++++++
 14 files changed, 563 insertions(+), 137 deletions(-)
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts

diff --git a/apps/api/src/app/api/electric/[...path]/route.ts b/apps/api/src/app/api/electric/[...path]/route.ts
index 2cb3967e447..b49f9c7bd3c 100644
--- a/apps/api/src/app/api/electric/[...path]/route.ts
+++ b/apps/api/src/app/api/electric/[...path]/route.ts
@@ -42,19 +42,21 @@ export async function GET(request: Request): Promise<Response> {
 		originUrl.searchParams.set(`params[${index + 1}]`, String(value));
 	});
 
-	const response = await fetch(originUrl.toString());
-
-	const headers = new Headers();
-	response.headers.forEach((value, key) => {
-		const lower = key.toLowerCase();
-		if (lower !== "content-encoding" && lower !== "content-length") {
-			headers.set(key, value);
-		}
-	});
+	let response = await fetch(originUrl.toString());
+
+	// When proxying long-polling requests, content-encoding & content-length are added
+	// erroneously (saying the body is gzipped when it's not) so we'll just remove
+	// them to avoid content decoding errors in the browser.
+	if (response.headers.get("content-encoding")) {
+		const headers = new Headers(response.headers);
+		headers.delete("content-encoding");
+		headers.delete("content-length");
+		response = new Response(response.body, {
+			status: response.status,
+			statusText: response.statusText,
+			headers,
+		});
+	}
 
-	return new Response(response.body, {
-		status: response.status,
-		statusText: response.statusText,
-		headers,
-	});
+	return response;
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
index 353d3cc3194..f0c6b65ab60 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
@@ -8,7 +8,7 @@ export function TasksView() {
 
 	if (isLoading) {
 		return (
-			<div className="flex items-center justify-center h-64">
+			<div className="flex-1 flex items-center justify-center">
 				<div className="h-5 w-5 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
 			</div>
 		);
@@ -16,7 +16,7 @@ export function TasksView() {
 
 	if (table.getRowModel().rows.length === 0) {
 		return (
-			<div className="flex items-center justify-center h-64">
+			<div className="flex-1 flex items-center justify-center">
 				<div className="flex flex-col items-center gap-2 text-muted-foreground">
 					<HiCheckCircle className="h-8 w-8" />
 					<span className="text-sm">No tasks found</span>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
new file mode 100644
index 00000000000..c8de7c5ee2d
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
@@ -0,0 +1,184 @@
+import { type ReactNode, useMemo } from "react";
+import {
+	ContextMenu,
+	ContextMenuContent,
+	ContextMenuItem,
+	ContextMenuSeparator,
+	ContextMenuSub,
+	ContextMenuSubContent,
+	ContextMenuSubTrigger,
+	ContextMenuTrigger,
+} from "@superset/ui/context-menu";
+import { useLiveQuery } from "@tanstack/react-db";
+import { useCollections } from "renderer/contexts/CollectionsProvider";
+import type { TaskWithStatus } from "../../hooks/useTasksTable";
+import { StatusMenuItems } from "../shared/StatusMenuItems";
+import { AssigneeMenuItems } from "../shared/AssigneeMenuItems";
+import { PriorityMenuItems } from "../shared/PriorityMenuItems";
+import { compareStatusesForDropdown } from "../../utils/taskSorting";
+import {
+	HiCheckCircle,
+	HiOutlineDocumentDuplicate,
+	HiOutlineTrash,
+	HiOutlineUserCircle,
+} from "react-icons/hi2";
+import { TbFlag3 } from "react-icons/tb";
+
+interface TaskContextMenuProps {
+	children: ReactNode;
+	task: TaskWithStatus;
+	onDelete?: () => void;
+}
+
+export function TaskContextMenu({
+	children,
+	task,
+	onDelete,
+}: TaskContextMenuProps) {
+	const collections = useCollections();
+
+	// Load statuses for the status submenu
+	const { data: allStatuses } = useLiveQuery(
+		(q) => q.from({ taskStatuses: collections.taskStatuses }),
+		[collections],
+	);
+
+	// Load users for the assignee submenu
+	const { data: allUsers } = useLiveQuery(
+		(q) => q.from({ users: collections.users }),
+		[collections],
+	);
+
+	const sortedStatuses = useMemo(() => {
+		if (!allStatuses) return [];
+		return [...allStatuses].sort(compareStatusesForDropdown);
+	}, [allStatuses]);
+
+	const users = useMemo(() => allUsers || [], [allUsers]);
+
+	const handleStatusChange = (status: typeof allStatuses[0]) => {
+		try {
+			collections.tasks.update(task.id, (draft) => {
+				draft.statusId = status.id;
+			});
+		} catch (error) {
+			console.error("[TaskContextMenu] Failed to update status:", error);
+		}
+	};
+
+	const handleAssigneeChange = (userId: string | null) => {
+		try {
+			collections.tasks.update(task.id, (draft) => {
+				draft.assigneeId = userId;
+			});
+		} catch (error) {
+			console.error("[TaskContextMenu] Failed to update assignee:", error);
+		}
+	};
+
+	const handlePriorityChange = (priority: typeof task.priority) => {
+		try {
+			collections.tasks.update(task.id, (draft) => {
+				draft.priority = priority;
+			});
+		} catch (error) {
+			console.error("[TaskContextMenu] Failed to update priority:", error);
+		}
+	};
+
+	const handleCopyId = () => {
+		navigator.clipboard.writeText(task.slug);
+	};
+
+	const handleCopyTitle = () => {
+		navigator.clipboard.writeText(task.title);
+	};
+
+	return (
+		<ContextMenu>
+			<ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
+			<ContextMenuContent className="w-64">
+				{/* Status submenu */}
+				<ContextMenuSub>
+					<ContextMenuSubTrigger>
+						<HiCheckCircle className="mr-2 h-4 w-4" />
+						<span>Status</span>
+					</ContextMenuSubTrigger>
+					<ContextMenuSubContent className="w-48">
+						<div className="max-h-64 overflow-y-auto">
+							<StatusMenuItems
+								statuses={sortedStatuses}
+								currentStatusId={task.statusId}
+								onSelect={handleStatusChange}
+								MenuItem={ContextMenuItem}
+							/>
+						</div>
+					</ContextMenuSubContent>
+				</ContextMenuSub>
+
+				{/* Assignee submenu */}
+				<ContextMenuSub>
+					<ContextMenuSubTrigger>
+						<HiOutlineUserCircle className="mr-2 h-4 w-4" />
+						<span>Assignee</span>
+					</ContextMenuSubTrigger>
+					<ContextMenuSubContent className="w-56">
+						<div className="max-h-64 overflow-y-auto">
+							<AssigneeMenuItems
+								users={users}
+								currentAssigneeId={task.assigneeId}
+								onSelect={handleAssigneeChange}
+								MenuItem={ContextMenuItem}
+							/>
+						</div>
+					</ContextMenuSubContent>
+				</ContextMenuSub>
+
+				{/* Priority submenu */}
+				<ContextMenuSub>
+					<ContextMenuSubTrigger>
+						<TbFlag3 className="mr-2 h-4 w-4" />
+						<span>Priority</span>
+					</ContextMenuSubTrigger>
+					<ContextMenuSubContent className="w-52">
+						<PriorityMenuItems
+							currentPriority={task.priority}
+							statusType={task.status.type}
+							onSelect={handlePriorityChange}
+							MenuItem={ContextMenuItem}
+						/>
+					</ContextMenuSubContent>
+				</ContextMenuSub>
+
+				<ContextMenuSeparator />
+
+				{/* Copy submenu */}
+				<ContextMenuSub>
+					<ContextMenuSubTrigger>
+						<HiOutlineDocumentDuplicate className="mr-2 h-4 w-4" />
+						<span>Copy</span>
+					</ContextMenuSubTrigger>
+					<ContextMenuSubContent className="w-48">
+						<ContextMenuItem onClick={handleCopyId}>
+							<span>Copy ID</span>
+						</ContextMenuItem>
+						<ContextMenuItem onClick={handleCopyTitle}>
+							<span>Copy Title</span>
+						</ContextMenuItem>
+					</ContextMenuSubContent>
+				</ContextMenuSub>
+
+				<ContextMenuSeparator />
+
+				{/* Delete */}
+				<ContextMenuItem
+					onClick={onDelete}
+					className="text-destructive focus:text-destructive"
+				>
+					<HiOutlineTrash className="mr-2 h-4 w-4" />
+					<span>Delete</span>
+				</ContextMenuItem>
+			</ContextMenuContent>
+		</ContextMenu>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/index.ts
new file mode 100644
index 00000000000..86be1e53002
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/index.ts
@@ -0,0 +1 @@
+export { TaskContextMenu } from "./TaskContextMenu";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
index 404be56d3d6..d0f2fe7edf2 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
@@ -1,8 +1,9 @@
 import { flexRender, type Table } from "@tanstack/react-table";
-import type { SelectTask } from "@superset/db/schema";
+import { TaskContextMenu } from "../TaskContextMenu";
+import type { TaskWithStatus } from "../../hooks/useTasksTable";
 
 interface TasksTableViewProps {
-	table: Table<SelectTask>;
+	table: Table<TaskWithStatus>;
 	slugColumnWidth: string;
 }
 
@@ -33,21 +34,31 @@ export function TasksTableView({ table, slugColumnWidth }: TasksTableViewProps)
 				// Layout: [Checkbox] [Priority] [ID] [Title] ... [Labels] [Assignee] [Due] [gap]
 				// Note: Status column (index 0) returns null for leaf rows, so we skip it
 				const cells = row.getVisibleCells();
+				const task = row.original;
+
 				return (
-					<div
+					<TaskContextMenu
 						key={row.id}
-						className="grid items-center gap-3 px-4 h-9 hover:bg-accent/50 cursor-pointer border-b border-border/50"
-						style={{
-							gridTemplateColumns: `auto auto ${slugColumnWidth} 1fr auto auto`,
+						task={task}
+						onDelete={() => {
+							// TODO: Implement delete
+							console.log("Delete task:", task.id);
 						}}
 					>
-						{/* Skip status column (index 0), render checkbox, priority, id, title+labels, assignee, created */}
-						{cells.slice(1).map((cell) => (
-							<div key={cell.id} className="flex items-center">
-								{flexRender(cell.column.columnDef.cell, cell.getContext())}
-							</div>
-						))}
-					</div>
+						<div
+							className="grid items-center gap-3 px-4 h-9 hover:bg-accent/50 cursor-pointer border-b border-border/50"
+							style={{
+								gridTemplateColumns: `auto auto ${slugColumnWidth} 1fr auto auto`,
+							}}
+						>
+							{/* Skip status column (index 0), render checkbox, priority, id, title+labels, assignee, created */}
+							{cells.slice(1).map((cell) => (
+								<div key={cell.id} className="flex items-center">
+									{flexRender(cell.column.columnDef.cell, cell.getContext())}
+								</div>
+							))}
+						</div>
+					</TaskContextMenu>
 				);
 			})}
 		</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index 76ad9cea3fe..0513945270a 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -1,7 +1,5 @@
 import { useState, useMemo } from "react";
 import type { CellContext } from "@tanstack/react-table";
-import type { SelectTask } from "@superset/db/schema";
-import { eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import {
 	DropdownMenu,
@@ -12,9 +10,10 @@ import {
 import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
+import type { TaskWithStatus } from "../../hooks/useTasksTable";
 
 interface AssigneeCellProps {
-	info: CellContext<SelectTask, string | null>;
+	info: CellContext<TaskWithStatus, string | null>;
 }
 
 export function AssigneeCell({ info }: AssigneeCellProps) {
@@ -30,19 +29,9 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 		[collections],
 	);
 
-	// Current assignee (filtered query)
-	const { data: assigneeData } = useLiveQuery(
-		(q) =>
-			assigneeId
-				? q
-						.from({ users: collections.users })
-						.where(({ users }) => eq(users.id, assigneeId))
-				: null,
-		[collections, assigneeId],
-	);
-
 	const users = useMemo(() => allUsers || [], [allUsers]);
-	const currentAssignee = assigneeData?.[0] ?? null;
+	// Use pre-loaded assignee from joined query (eliminates delay)
+	const currentAssignee = task.assignee;
 
 	const handleSelectUser = (userId: string | null) => {
 		if (userId === assigneeId) {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
index f99d2a3a7e0..e72393f64bb 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -10,6 +10,7 @@ import {
 } from "@superset/ui/dropdown-menu";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { PriorityIcon } from "../../PriorityIcon";
+import { ALL_PRIORITIES } from "../../../utils/taskSorting";
 
 interface PriorityCellProps {
 	info: CellContext<SelectTask, TaskPriority>;
@@ -23,14 +24,6 @@ const PRIORITY_LABELS: Record<TaskPriority, string> = {
 	low: "Low",
 };
 
-const PRIORITY_DISPLAY_ORDER: TaskPriority[] = [
-	"none",
-	"urgent",
-	"high",
-	"medium",
-	"low",
-];
-
 export function PriorityCell({ info }: PriorityCellProps) {
 	const collections = useCollections();
 	const [open, setOpen] = useState(false);
@@ -39,14 +32,14 @@ export function PriorityCell({ info }: PriorityCellProps) {
 	const currentPriority = info.getValue();
 	const statusType = (task as any).status?.type;
 
-	const handleSelectPriority = async (newPriority: TaskPriority) => {
+	const handleSelectPriority = (newPriority: TaskPriority) => {
 		if (newPriority === currentPriority) {
 			setOpen(false);
 			return;
 		}
 
 		try {
-			await collections.tasks.update(task.id, (draft) => {
+			collections.tasks.update(task.id, (draft) => {
 				draft.priority = newPriority;
 			});
 			setOpen(false);
@@ -70,7 +63,7 @@ export function PriorityCell({ info }: PriorityCellProps) {
 				</button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent align="start" className="w-52 p-1">
-				{PRIORITY_DISPLAY_ORDER.map((priority: TaskPriority) => (
+				{ALL_PRIORITIES.map((priority) => (
 					<DropdownMenuItem
 						key={priority}
 						onSelect={() => handleSelectPriority(priority)}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
index c054e9f5dfc..ea9caffc447 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -9,21 +9,13 @@ import {
 } from "@superset/ui/dropdown-menu";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { StatusIcon } from "../../StatusIcon";
+import { compareStatusesForDropdown } from "../../../utils/taskSorting";
 
 // Task with joined status data
 type TaskWithStatus = SelectTask & {
 	status: SelectTaskStatus;
 };
 
-// Status type ordering (Linear style: in progress → todo → backlog → done → cancelled)
-const STATUS_TYPE_ORDER: Record<string, number> = {
-	started: 0,
-	unstarted: 1,
-	backlog: 2,
-	completed: 3,
-	cancelled: 4,
-};
-
 interface StatusCellProps {
 	taskWithStatus: TaskWithStatus;
 }
@@ -41,18 +33,9 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const statuses = useMemo(() => allStatuses || [], [allStatuses]);
 	const currentStatus = taskWithStatus.status;
 
-	// Sort statuses by type order and position
+	// Sort statuses by workflow order (backlog → unstarted → started → completed → cancelled)
 	const sortedStatuses = useMemo(() => {
-		return statuses.sort((a, b) => {
-			// Sort by status type first (started → unstarted → backlog → completed → cancelled)
-			const typeOrderA = STATUS_TYPE_ORDER[a.type] ?? 999;
-			const typeOrderB = STATUS_TYPE_ORDER[b.type] ?? 999;
-			if (typeOrderA !== typeOrderB) {
-				return typeOrderA - typeOrderB;
-			}
-			// Within same type, sort by position
-			return a.position - b.position;
-		});
+		return statuses.sort(compareStatusesForDropdown);
 	}, [statuses]);
 
 	const handleSelectStatus = (newStatus: SelectTaskStatus) => {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
new file mode 100644
index 00000000000..95764a7ac95
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
@@ -0,0 +1,73 @@
+import type { ReactNode } from "react";
+import type { SelectUser } from "@superset/db/schema";
+import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
+import { HiOutlineUserCircle } from "react-icons/hi2";
+
+interface MenuItemProps {
+	children: ReactNode;
+	onSelect: () => void;
+	className?: string;
+}
+
+interface AssigneeMenuItemsProps {
+	users: SelectUser[];
+	currentAssigneeId: string | null;
+	onSelect: (userId: string | null) => void;
+	MenuItem: React.ComponentType<MenuItemProps>;
+}
+
+function getInitials(name: string) {
+	return name
+		.split(" ")
+		.map((n) => n[0])
+		.join("")
+		.toUpperCase()
+		.slice(0, 2);
+}
+
+export function AssigneeMenuItems({
+	users,
+	currentAssigneeId,
+	onSelect,
+	MenuItem,
+}: AssigneeMenuItemsProps) {
+	return (
+		<>
+			{/* No assignee option */}
+			<MenuItem
+				onSelect={() => onSelect(null)}
+				className="flex items-center gap-2"
+			>
+				<HiOutlineUserCircle className="size-5 text-muted-foreground flex-shrink-0" />
+				<span className="text-sm">No assignee</span>
+				{!currentAssigneeId && (
+					<span className="ml-auto text-xs text-muted-foreground">✓</span>
+				)}
+			</MenuItem>
+
+			{/* Users */}
+			{users.map((user) => {
+				const isSelected = user.id === currentAssigneeId;
+				return (
+					<MenuItem
+						key={user.id}
+						onSelect={() => onSelect(user.id)}
+						className="flex items-center gap-2"
+					>
+						<Avatar size="xs">
+							{user.image && <AvatarImage src={user.image} />}
+							<AvatarFallback size="xs">{getInitials(user.name)}</AvatarFallback>
+						</Avatar>
+						<div className="flex flex-col">
+							<span className="text-sm">{user.name}</span>
+							<span className="text-xs text-muted-foreground">{user.email}</span>
+						</div>
+						{isSelected && (
+							<span className="ml-auto text-xs text-muted-foreground">✓</span>
+						)}
+					</MenuItem>
+				);
+			})}
+		</>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
new file mode 100644
index 00000000000..6a3aa75eddf
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
@@ -0,0 +1,51 @@
+import type { ReactNode } from "react";
+import type { TaskPriority } from "@superset/db/enums";
+import { PriorityIcon } from "../PriorityIcon";
+import { ALL_PRIORITIES } from "../../utils/taskSorting";
+
+interface MenuItemProps {
+	children: ReactNode;
+	onSelect: () => void;
+	className?: string;
+}
+
+interface PriorityMenuItemsProps {
+	currentPriority: TaskPriority;
+	statusType?: string;
+	onSelect: (priority: TaskPriority) => void;
+	MenuItem: React.ComponentType<MenuItemProps>;
+}
+
+const PRIORITY_LABELS: Record<TaskPriority, string> = {
+	none: "No priority",
+	urgent: "Urgent",
+	high: "High",
+	medium: "Medium",
+	low: "Low",
+};
+
+export function PriorityMenuItems({
+	currentPriority,
+	statusType,
+	onSelect,
+	MenuItem,
+}: PriorityMenuItemsProps) {
+	return (
+		<>
+			{ALL_PRIORITIES.map((priority) => {
+				const isSelected = priority === currentPriority;
+				return (
+					<MenuItem
+						key={priority}
+						onSelect={() => onSelect(priority)}
+						className="flex items-center gap-3 px-3 py-2"
+					>
+						<PriorityIcon priority={priority} statusType={statusType} />
+						<span className="text-sm flex-1">{PRIORITY_LABELS[priority]}</span>
+						{isSelected && <span className="text-sm">✓</span>}
+					</MenuItem>
+				);
+			})}
+		</>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
new file mode 100644
index 00000000000..6d1227ac173
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
@@ -0,0 +1,46 @@
+import type { ReactNode } from "react";
+import type { SelectTaskStatus } from "@superset/db/schema";
+import { StatusIcon } from "../StatusIcon";
+
+interface MenuItemProps {
+	children: ReactNode;
+	onSelect: () => void;
+	className?: string;
+}
+
+interface StatusMenuItemsProps {
+	statuses: SelectTaskStatus[];
+	currentStatusId: string;
+	onSelect: (status: SelectTaskStatus) => void;
+	MenuItem: React.ComponentType<MenuItemProps>;
+}
+
+export function StatusMenuItems({
+	statuses,
+	currentStatusId,
+	onSelect,
+	MenuItem,
+}: StatusMenuItemsProps) {
+	return (
+		<>
+			{statuses.map((status) => {
+				const isSelected = status.id === currentStatusId;
+				return (
+					<MenuItem
+						key={status.id}
+						onSelect={() => onSelect(status)}
+						className="flex items-center gap-3 px-3 py-2"
+					>
+						<StatusIcon
+							type={status.type as any}
+							color={status.color}
+							progress={status.progressPercent ?? undefined}
+						/>
+						<span className="text-sm flex-1">{status.name}</span>
+						{isSelected && <span className="text-sm">✓</span>}
+					</MenuItem>
+				);
+			})}
+		</>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
index 60a6208b821..78731039efb 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
@@ -1 +1 @@
-export { useTasksTable } from "./useTasksTable";
+export { useTasksTable, type TaskWithStatus } from "./useTasksTable";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 16af5f6df5f..de29d68d2f5 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -1,6 +1,5 @@
 import { useMemo, useState } from "react";
 import {
-	type ColumnDef,
 	type ExpandedState,
 	type Table,
 	createColumnHelper,
@@ -9,8 +8,13 @@ import {
 	getGroupedRowModel,
 	useReactTable,
 } from "@tanstack/react-table";
-import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
+import type {
+	SelectTask,
+	SelectTaskStatus,
+	SelectUser,
+} from "@superset/db/schema";
 import { useLiveQuery } from "@tanstack/react-db";
+import { eq, isNull } from "@tanstack/db";
 import { format } from "date-fns";
 import { HiChevronRight } from "react-icons/hi2";
 import { Badge } from "@superset/ui/badge";
@@ -19,19 +23,12 @@ import { StatusIcon } from "../../components/StatusIcon";
 import { StatusCell } from "../../components/cells/StatusCell";
 import { PriorityCell } from "../../components/cells/PriorityCell";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
+import { compareTasks } from "../../utils/taskSorting";
 
-// Task with joined status data
-type TaskWithStatus = SelectTask & {
+// Task with joined status and assignee data
+export type TaskWithStatus = SelectTask & {
 	status: SelectTaskStatus;
-};
-
-// Status type ordering (Linear style: in progress → todo → backlog → done → cancelled)
-const STATUS_TYPE_ORDER: Record<string, number> = {
-	started: 0,
-	unstarted: 1,
-	backlog: 2,
-	completed: 3,
-	cancelled: 4,
+	assignee: SelectUser | null;
 };
 
 const columnHelper = createColumnHelper<TaskWithStatus>();
@@ -45,55 +42,33 @@ export function useTasksTable(): {
 	const [grouping, setGrouping] = useState<string[]>(["status"]);
 	const [expanded, setExpanded] = useState<ExpandedState>(true);
 
-	// Load tasks and statuses separately
-	const { data: allTasks, isLoading: tasksLoading } = useLiveQuery(
-		(q) => q.from({ tasks: collections.tasks }),
-		[collections],
-	);
-
-	const { data: allStatuses, isLoading: statusesLoading } = useLiveQuery(
-		(q) => q.from({ taskStatuses: collections.taskStatuses }),
+	// Join tasks with statuses and assignees
+	const { data: allData, isLoading } = useLiveQuery(
+		(q) =>
+			q
+				.from({ tasks: collections.tasks })
+				.innerJoin(
+					{ status: collections.taskStatuses },
+					({ tasks, status }) => eq(tasks.statusId, status.id),
+				)
+				.leftJoin(
+					{ assignee: collections.users },
+					({ tasks, assignee }) => eq(tasks.assigneeId, assignee.id),
+				)
+				.select(({ tasks, status, assignee }) => ({
+					...tasks,
+					status,
+					assignee: assignee ?? null,
+				}))
+				.where(({ tasks }) => isNull(tasks.deletedAt)),
 		[collections],
 	);
 
-	// Client-side join: merge tasks with their status and sort
+	// Sort tasks by status type, priority, and position
 	const data = useMemo(() => {
-		if (!allTasks || !allStatuses) return [];
-
-		const statusMap = new Map(allStatuses.map((s) => [s.id, s]));
-
-		return allTasks
-			.filter((task) => task.deletedAt === null)
-			.map((task) => {
-				const status = statusMap.get(task.statusId);
-				if (!status) {
-					console.warn(`[useTasksTable] Status not found for task ${task.id}`);
-					// Provide a fallback status to prevent crashes
-					return {
-						...task,
-						status: {
-							id: task.statusId,
-							name: "Unknown",
-							color: "#8B5CF6",
-							type: "unstarted",
-							position: 0,
-							progressPercent: null,
-						} as SelectTaskStatus,
-					};
-				}
-				return { ...task, status };
-			})
-			.sort((a, b) => {
-				// Sort by status type first (started → unstarted → backlog → completed → cancelled)
-				const typeOrderA = STATUS_TYPE_ORDER[a.status.type] ?? 999;
-				const typeOrderB = STATUS_TYPE_ORDER[b.status.type] ?? 999;
-				if (typeOrderA !== typeOrderB) {
-					return typeOrderA - typeOrderB;
-				}
-				// Within same type, sort by position
-				return a.status.position - b.status.position;
-			});
-	}, [allTasks, allStatuses]);
+		if (!allData) return [];
+		return [...allData].sort(compareTasks);
+	}, [allData]);
 
 	// Calculate optimal slug column width based on longest slug
 	const slugColumnWidth = useMemo(() => {
@@ -112,12 +87,10 @@ export function useTasksTable(): {
 		return `${Math.ceil(width * 10) / 10}rem`; // Round to 1 decimal
 	}, [data]);
 
-	const isLoading = tasksLoading || statusesLoading;
-
 	// TODO: Add localStorage persistence for collapsed groups
 
 	// Define columns with useMemo (following official docs pattern)
-	const columns = useMemo<ColumnDef<TaskWithStatus>[]>(
+	const columns = useMemo(
 		() => [
 			// Status column (grouped) - only shows for group headers
 			columnHelper.accessor((row) => row.status, {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts
new file mode 100644
index 00000000000..9d97fa44b77
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts
@@ -0,0 +1,120 @@
+import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
+
+// Status type ordering for table groups (Linear style: in progress → todo → backlog → done → cancelled)
+const STATUS_TYPE_ORDER: Record<string, number> = {
+	started: 0,
+	unstarted: 1,
+	backlog: 2,
+	completed: 3,
+	cancelled: 4,
+};
+
+// Status type ordering for dropdowns (workflow order: backlog → todo → in progress → done → cancelled)
+const STATUS_TYPE_DROPDOWN_ORDER: Record<string, number> = {
+	backlog: 0,
+	unstarted: 1,
+	started: 2,
+	completed: 3,
+	cancelled: 4,
+};
+
+// Priority ordering for task sorting (urgent at top, none at bottom)
+const PRIORITY_ORDER: Record<string, number> = {
+	urgent: 0,
+	high: 1,
+	medium: 2,
+	low: 3,
+	none: 4,
+};
+
+// All priorities in dropdown order (none → urgent → high → medium → low)
+export const ALL_PRIORITIES = [
+	"none",
+	"urgent",
+	"high",
+	"medium",
+	"low",
+] as const;
+
+/**
+ * Get sort order for a status type (table groups).
+ * Unknown types are sorted to the end.
+ */
+function getStatusTypeOrder(type: string): number {
+	return STATUS_TYPE_ORDER[type] ?? Number.MAX_SAFE_INTEGER;
+}
+
+/**
+ * Get sort order for a status type (dropdowns).
+ * Unknown types are sorted to the end.
+ */
+function getStatusTypeDropdownOrder(type: string): number {
+	return STATUS_TYPE_DROPDOWN_ORDER[type] ?? Number.MAX_SAFE_INTEGER;
+}
+
+/**
+ * Get sort order for a priority.
+ * Unknown priorities are sorted to the end.
+ */
+function getPriorityOrder(
+	priority: "urgent" | "high" | "medium" | "low" | "none",
+): number {
+	return PRIORITY_ORDER[priority] ?? Number.MAX_SAFE_INTEGER;
+}
+
+/**
+ * Compare two tasks for sorting in table.
+ * Sort order: status type → status position → priority
+ */
+export function compareTasks(
+	a: SelectTask & { status: SelectTaskStatus },
+	b: SelectTask & { status: SelectTaskStatus },
+): number {
+	// 1. Sort by status type (determines group order)
+	const typeOrderA = getStatusTypeOrder(a.status.type);
+	const typeOrderB = getStatusTypeOrder(b.status.type);
+	if (typeOrderA !== typeOrderB) {
+		return typeOrderA - typeOrderB;
+	}
+
+	// 2. Within same status type, sort by status position (workflow order)
+	if (a.status.position !== b.status.position) {
+		return a.status.position - b.status.position;
+	}
+
+	// 3. Within same status, sort by priority
+	const priorityOrderA = getPriorityOrder(a.priority);
+	const priorityOrderB = getPriorityOrder(b.priority);
+	return priorityOrderA - priorityOrderB;
+}
+
+/**
+ * Compare two statuses for dropdown sorting.
+ * Sort order: status type (workflow order) → status position
+ */
+export function compareStatusesForDropdown(
+	a: SelectTaskStatus,
+	b: SelectTaskStatus,
+): number {
+	// 1. Sort by status type in workflow order (backlog → unstarted → started → completed → cancelled)
+	const typeOrderA = getStatusTypeDropdownOrder(a.type);
+	const typeOrderB = getStatusTypeDropdownOrder(b.type);
+	if (typeOrderA !== typeOrderB) {
+		return typeOrderA - typeOrderB;
+	}
+
+	// 2. Within same type, sort by position
+	return a.position - b.position;
+}
+
+/**
+ * Compare two priorities for dropdown sorting.
+ * Sort order: urgent → high → medium → low → none
+ * (Same order as task sorting)
+ */
+export function comparePrioritiesForDropdown(
+	a: "urgent" | "high" | "medium" | "low" | "none",
+	b: "urgent" | "high" | "medium" | "low" | "none",
+): number {
+	return getPriorityOrder(a) - getPriorityOrder(b);
+}

From d01e460356cba99461d5d8a5e4ae4b9ac6cca173 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Sun, 11 Jan 2026 15:22:02 -0800
Subject: [PATCH 08/18] WIP

---
 .../main/components/TasksView/TasksView.tsx   | 53 +++++++------
 .../components/PriorityIcon/PriorityIcon.tsx  |  8 +-
 .../TaskContextMenu/TaskContextMenu.tsx       | 23 +++---
 .../components/TasksTopBar/TasksTopBar.tsx    | 78 +++++++++++++++++++
 .../TasksView/components/TasksTopBar/index.ts |  1 +
 .../icons/ActiveIcon/ActiveIcon.tsx           | 10 +++
 .../components/icons/ActiveIcon/index.ts      |  1 +
 .../icons/AllIssuesIcon/AllIssuesIcon.tsx     | 15 ++++
 .../components/icons/AllIssuesIcon/index.ts   |  1 +
 .../AssigneeMenuIcon/AssigneeMenuIcon.tsx     | 10 +++
 .../icons/AssigneeMenuIcon/index.ts           |  1 +
 .../icons/BacklogIcon/BacklogIcon.tsx         | 10 +++
 .../components/icons/BacklogIcon/index.ts     |  1 +
 .../PriorityMenuIcon/PriorityMenuIcon.tsx     | 13 ++++
 .../icons/PriorityMenuIcon/index.ts           |  1 +
 .../hooks/useTasksTable/useTasksTable.tsx     | 61 ++++++++++++++-
 16 files changed, 246 insertions(+), 41 deletions(-)
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/index.ts
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/PriorityMenuIcon.tsx
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/index.ts

diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
index f0c6b65ab60..82857656395 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
@@ -1,35 +1,44 @@
+import { useState } from "react";
 import { ScrollArea } from "@superset/ui/scroll-area";
 import { HiCheckCircle } from "react-icons/hi2";
 import { TasksTableView } from "./components/TasksTableView";
+import { TasksTopBar, type TabValue } from "./components/TasksTopBar";
 import { useTasksTable } from "./hooks/useTasksTable";
 
 export function TasksView() {
-	const { table, isLoading, slugColumnWidth } = useTasksTable();
+	const [currentTab, setCurrentTab] = useState<TabValue>("all");
+	const [searchQuery, setSearchQuery] = useState("");
 
-	if (isLoading) {
-		return (
-			<div className="flex-1 flex items-center justify-center">
-				<div className="h-5 w-5 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
-			</div>
-		);
-	}
-
-	if (table.getRowModel().rows.length === 0) {
-		return (
-			<div className="flex-1 flex items-center justify-center">
-				<div className="flex flex-col items-center gap-2 text-muted-foreground">
-					<HiCheckCircle className="h-8 w-8" />
-					<span className="text-sm">No tasks found</span>
-				</div>
-			</div>
-		);
-	}
+	const { table, isLoading, slugColumnWidth } = useTasksTable({
+		filterTab: currentTab,
+		searchQuery,
+	});
 
 	return (
 		<div className="flex-1 flex flex-col min-h-0">
-			<ScrollArea className="flex-1 min-h-0">
-				<TasksTableView table={table} slugColumnWidth={slugColumnWidth} />
-			</ScrollArea>
+			<TasksTopBar
+				currentTab={currentTab}
+				onTabChange={setCurrentTab}
+				searchQuery={searchQuery}
+				onSearchChange={setSearchQuery}
+			/>
+
+			{isLoading ? (
+				<div className="flex-1 flex items-center justify-center">
+					<div className="h-5 w-5 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
+				</div>
+			) : table.getRowModel().rows.length === 0 ? (
+				<div className="flex-1 flex items-center justify-center">
+					<div className="flex flex-col items-center gap-2 text-muted-foreground">
+						<HiCheckCircle className="h-8 w-8" />
+						<span className="text-sm">No tasks found</span>
+					</div>
+				</div>
+			) : (
+				<ScrollArea className="flex-1 min-h-0">
+					<TasksTableView table={table} slugColumnWidth={slugColumnWidth} />
+				</ScrollArea>
+			)}
 		</div>
 	);
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index d7c9a1f2052..1ef276d251d 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -6,6 +6,7 @@ interface PriorityIconProps {
 	statusType?: string;
 	className?: string;
 	showHover?: boolean;
+	color?: string;
 }
 
 export function PriorityIcon({
@@ -13,10 +14,11 @@ export function PriorityIcon({
 	statusType,
 	className = "",
 	showHover = false,
+	color,
 }: PriorityIconProps) {
 	const sizeClass = className || "h-4 w-4";
 	const hoverClass = showHover ? "group-hover:brightness-150" : "";
-	const defaultColor = colors.neutral[500];
+	const defaultColor = color || colors.neutral[500];
 
 	// None: Three horizontal dashes with opacity
 	if (priority === "none") {
@@ -51,11 +53,13 @@ export function PriorityIcon({
 			statusType === "unstarted" ||
 			statusType === "backlog";
 
+		const fillColor = color || (isActive ? "#F97316" : colors.neutral[500]);
+
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
 					viewBox="0 0 16 16"
-					fill={isActive ? "#F97316" : defaultColor}
+					fill={fillColor}
 					xmlns="http://www.w3.org/2000/svg"
 					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
index c8de7c5ee2d..9cfe7759968 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
@@ -15,14 +15,10 @@ import type { TaskWithStatus } from "../../hooks/useTasksTable";
 import { StatusMenuItems } from "../shared/StatusMenuItems";
 import { AssigneeMenuItems } from "../shared/AssigneeMenuItems";
 import { PriorityMenuItems } from "../shared/PriorityMenuItems";
+import { ActiveIcon } from "../icons/ActiveIcon";
 import { compareStatusesForDropdown } from "../../utils/taskSorting";
-import {
-	HiCheckCircle,
-	HiOutlineDocumentDuplicate,
-	HiOutlineTrash,
-	HiOutlineUserCircle,
-} from "react-icons/hi2";
-import { TbFlag3 } from "react-icons/tb";
+import { HiOutlineDocumentDuplicate, HiOutlineTrash, HiOutlineUserCircle } from "react-icons/hi2";
+import { PriorityMenuIcon } from "../icons/PriorityMenuIcon";
 
 interface TaskContextMenuProps {
 	children: ReactNode;
@@ -56,7 +52,7 @@ export function TaskContextMenu({
 
 	const users = useMemo(() => allUsers || [], [allUsers]);
 
-	const handleStatusChange = (status: typeof allStatuses[0]) => {
+	const handleStatusChange = (status: (typeof allStatuses)[0]) => {
 		try {
 			collections.tasks.update(task.id, (draft) => {
 				draft.statusId = status.id;
@@ -101,7 +97,7 @@ export function TaskContextMenu({
 				{/* Status submenu */}
 				<ContextMenuSub>
 					<ContextMenuSubTrigger>
-						<HiCheckCircle className="mr-2 h-4 w-4" />
+						<ActiveIcon className="mr-2" />
 						<span>Status</span>
 					</ContextMenuSubTrigger>
 					<ContextMenuSubContent className="w-48">
@@ -119,7 +115,7 @@ export function TaskContextMenu({
 				{/* Assignee submenu */}
 				<ContextMenuSub>
 					<ContextMenuSubTrigger>
-						<HiOutlineUserCircle className="mr-2 h-4 w-4" />
+						<HiOutlineUserCircle className="mr-2 size-4" />
 						<span>Assignee</span>
 					</ContextMenuSubTrigger>
 					<ContextMenuSubContent className="w-56">
@@ -137,7 +133,7 @@ export function TaskContextMenu({
 				{/* Priority submenu */}
 				<ContextMenuSub>
 					<ContextMenuSubTrigger>
-						<TbFlag3 className="mr-2 h-4 w-4" />
+						<PriorityMenuIcon className="mr-1" />
 						<span>Priority</span>
 					</ContextMenuSubTrigger>
 					<ContextMenuSubContent className="w-52">
@@ -155,7 +151,7 @@ export function TaskContextMenu({
 				{/* Copy submenu */}
 				<ContextMenuSub>
 					<ContextMenuSubTrigger>
-						<HiOutlineDocumentDuplicate className="mr-2 h-4 w-4" />
+						<HiOutlineDocumentDuplicate className="mr-2 size-4" />
 						<span>Copy</span>
 					</ContextMenuSubTrigger>
 					<ContextMenuSubContent className="w-48">
@@ -170,12 +166,11 @@ export function TaskContextMenu({
 
 				<ContextMenuSeparator />
 
-				{/* Delete */}
 				<ContextMenuItem
 					onClick={onDelete}
 					className="text-destructive focus:text-destructive"
 				>
-					<HiOutlineTrash className="mr-2 h-4 w-4" />
+					<HiOutlineTrash className="text-destructive size-4" />
 					<span>Delete</span>
 				</ContextMenuItem>
 			</ContextMenuContent>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
new file mode 100644
index 00000000000..6aad9233b23
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
@@ -0,0 +1,78 @@
+import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
+import { Input } from "@superset/ui/input";
+import { HiOutlineMagnifyingGlass } from "react-icons/hi2";
+import { AllIssuesIcon } from "../icons/AllIssuesIcon";
+import { ActiveIcon } from "../icons/ActiveIcon";
+import { BacklogIcon } from "../icons/BacklogIcon";
+
+export type TabValue = "all" | "active" | "backlog";
+
+interface TasksTopBarProps {
+	currentTab: TabValue;
+	onTabChange: (tab: TabValue) => void;
+	searchQuery: string;
+	onSearchChange: (query: string) => void;
+}
+
+const TABS = [
+	{
+		value: "all" as const,
+		label: "All issues",
+		Icon: AllIssuesIcon,
+	},
+	{
+		value: "active" as const,
+		label: "Active",
+		Icon: ActiveIcon,
+	},
+	{
+		value: "backlog" as const,
+		label: "Backlog",
+		Icon: BacklogIcon,
+	},
+] as const;
+
+export function TasksTopBar({
+	currentTab,
+	onTabChange,
+	searchQuery,
+	onSearchChange,
+}: TasksTopBarProps) {
+	return (
+		<div className="flex items-center justify-between border-b border-border px-4 h-11">
+			{/* Tabs on the left */}
+			<Tabs
+				value={currentTab}
+				onValueChange={(value) => onTabChange(value as TabValue)}
+			>
+				<TabsList className="h-8 bg-transparent p-0 gap-1">
+					{TABS.map((tab) => {
+						const Icon = tab.Icon;
+						return (
+							<TabsTrigger
+								key={tab.value}
+								value={tab.value}
+								className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
+							>
+								<Icon className="h-3.5 w-3.5" />
+								<span className="text-sm">{tab.label}</span>
+							</TabsTrigger>
+						);
+					})}
+				</TabsList>
+			</Tabs>
+
+			{/* Search on the right */}
+			<div className="relative w-64">
+				<HiOutlineMagnifyingGlass className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground pointer-events-none" />
+				<Input
+					type="text"
+					placeholder="Search tasks..."
+					value={searchQuery}
+					onChange={(e) => onSearchChange(e.target.value)}
+					className="h-8 pl-9 pr-3 text-sm bg-muted/50 border-0 focus-visible:ring-1"
+				/>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts
new file mode 100644
index 00000000000..229d9f7e92b
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts
@@ -0,0 +1 @@
+export { TasksTopBar, type TabValue } from "./TasksTopBar";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
new file mode 100644
index 00000000000..60457eb8128
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
@@ -0,0 +1,10 @@
+import { StatusIcon } from "../../StatusIcon";
+
+interface ActiveIconProps {
+	color?: string;
+	className?: string;
+}
+
+export function ActiveIcon({ color = "currentColor", className }: ActiveIconProps) {
+	return <StatusIcon type="started" color={color} progress={50} className={className} />;
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/index.ts
new file mode 100644
index 00000000000..0624cec7df7
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/index.ts
@@ -0,0 +1 @@
+export { ActiveIcon } from "./ActiveIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
new file mode 100644
index 00000000000..9afaaf8a5eb
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
@@ -0,0 +1,15 @@
+import { HiOutlineRectangleStack } from "react-icons/hi2";
+
+interface AllIssuesIconProps {
+	color?: string;
+	className?: string;
+}
+
+export function AllIssuesIcon({ color = "currentColor", className }: AllIssuesIconProps) {
+	return (
+		<HiOutlineRectangleStack
+			className={className}
+			style={{ color }}
+		/>
+	);
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/index.ts
new file mode 100644
index 00000000000..278cf8ab08a
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/index.ts
@@ -0,0 +1 @@
+export { AllIssuesIcon } from "./AllIssuesIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
new file mode 100644
index 00000000000..55e47c7f260
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
@@ -0,0 +1,10 @@
+import { HiOutlineUserCircle } from "react-icons/hi2";
+
+interface AssigneeMenuIconProps {
+	color?: string;
+	className?: string;
+}
+
+export function AssigneeMenuIcon({ color = "currentColor", className }: AssigneeMenuIconProps) {
+	return <HiOutlineUserCircle className={className} style={{ color }} />;
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/index.ts
new file mode 100644
index 00000000000..ba0df554fd1
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/index.ts
@@ -0,0 +1 @@
+export { AssigneeMenuIcon } from "./AssigneeMenuIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
new file mode 100644
index 00000000000..aa40564b4d6
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
@@ -0,0 +1,10 @@
+import { StatusIcon } from "../../StatusIcon";
+
+interface BacklogIconProps {
+	color?: string;
+	className?: string;
+}
+
+export function BacklogIcon({ color = "currentColor", className }: BacklogIconProps) {
+	return <StatusIcon type="backlog" color={color} className={className} />;
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/index.ts
new file mode 100644
index 00000000000..af616402643
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/index.ts
@@ -0,0 +1 @@
+export { BacklogIcon } from "./BacklogIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/PriorityMenuIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/PriorityMenuIcon.tsx
new file mode 100644
index 00000000000..42ff493a746
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/PriorityMenuIcon.tsx
@@ -0,0 +1,13 @@
+import { PriorityIcon } from "../../PriorityIcon";
+
+interface PriorityMenuIconProps {
+	className?: string;
+	color?: string;
+}
+
+export function PriorityMenuIcon({
+	className,
+	color = "currentColor",
+}: PriorityMenuIconProps) {
+	return <PriorityIcon priority="urgent" className={className} color={color} />;
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/index.ts
new file mode 100644
index 00000000000..3189b457c66
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/index.ts
@@ -0,0 +1 @@
+export { PriorityMenuIcon } from "./PriorityMenuIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index de29d68d2f5..724c1158343 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -1,11 +1,13 @@
-import { useMemo, useState } from "react";
+import { useMemo, useState, useEffect } from "react";
 import {
 	type ExpandedState,
 	type Table,
+	type ColumnFiltersState,
 	createColumnHelper,
 	getCoreRowModel,
 	getExpandedRowModel,
 	getGroupedRowModel,
+	getFilteredRowModel,
 	useReactTable,
 } from "@tanstack/react-table";
 import type {
@@ -24,6 +26,7 @@ import { StatusCell } from "../../components/cells/StatusCell";
 import { PriorityCell } from "../../components/cells/PriorityCell";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
 import { compareTasks } from "../../utils/taskSorting";
+import type { TabValue } from "../../components/TasksTopBar";
 
 // Task with joined status and assignee data
 export type TaskWithStatus = SelectTask & {
@@ -33,7 +36,15 @@ export type TaskWithStatus = SelectTask & {
 
 const columnHelper = createColumnHelper<TaskWithStatus>();
 
-export function useTasksTable(): {
+interface UseTasksTableParams {
+	filterTab: TabValue;
+	searchQuery: string;
+}
+
+export function useTasksTable({
+	filterTab,
+	searchQuery,
+}: UseTasksTableParams): {
 	table: Table<TaskWithStatus>;
 	isLoading: boolean;
 	slugColumnWidth: string;
@@ -41,6 +52,8 @@ export function useTasksTable(): {
 	const collections = useCollections();
 	const [grouping, setGrouping] = useState<string[]>(["status"]);
 	const [expanded, setExpanded] = useState<ExpandedState>(true);
+	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
+	const [globalFilter, setGlobalFilter] = useState("");
 
 	// Join tasks with statuses and assignees
 	const { data: allData, isLoading } = useLiveQuery(
@@ -70,6 +83,22 @@ export function useTasksTable(): {
 		return [...allData].sort(compareTasks);
 	}, [allData]);
 
+	// Update filters based on tab and search
+	useEffect(() => {
+		// Update column filter for tab
+		const newColumnFilters: ColumnFiltersState = [];
+		if (filterTab !== "all") {
+			newColumnFilters.push({
+				id: "status",
+				value: filterTab,
+			});
+		}
+		setColumnFilters(newColumnFilters);
+
+		// Update global filter for search
+		setGlobalFilter(searchQuery);
+	}, [filterTab, searchQuery]);
+
 	// Calculate optimal slug column width based on longest slug
 	const slugColumnWidth = useMemo(() => {
 		if (!data || data.length === 0) return "5rem"; // Default fallback
@@ -96,6 +125,17 @@ export function useTasksTable(): {
 			columnHelper.accessor((row) => row.status, {
 				id: "status",
 				header: "Status",
+				filterFn: (row, _columnId, filterValue: TabValue) => {
+					// Filter by tab value: "active" | "backlog" | "all"
+					const statusType = row.original.status.type;
+					if (filterValue === "active") {
+						return statusType === "started" || statusType === "unstarted";
+					}
+					if (filterValue === "backlog") {
+						return statusType === "backlog";
+					}
+					return true; // "all" shows everything
+				},
 				cell: (info) => {
 					const { row, cell } = info;
 					const status = info.getValue();
@@ -238,10 +278,25 @@ export function useTasksTable(): {
 	const table = useReactTable({
 		data,
 		columns,
-		state: { grouping, expanded },
+		state: {
+			grouping,
+			expanded,
+			columnFilters,
+			globalFilter,
+		},
 		onGroupingChange: setGrouping,
 		onExpandedChange: setExpanded,
+		onColumnFiltersChange: setColumnFilters,
+		onGlobalFilterChange: setGlobalFilter,
+		globalFilterFn: (row, _columnId, filterValue: string) => {
+			// Search across title and slug
+			const query = filterValue.toLowerCase();
+			const title = row.original.title.toLowerCase();
+			const slug = row.original.slug.toLowerCase();
+			return title.includes(query) || slug.includes(query);
+		},
 		getCoreRowModel: getCoreRowModel(),
+		getFilteredRowModel: getFilteredRowModel(),
 		getGroupedRowModel: getGroupedRowModel(),
 		getExpandedRowModel: getExpandedRowModel(),
 		autoResetExpanded: false,

From a145da330c8b1fa727e349f2bb1140244bd50158 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 12:07:47 -0800
Subject: [PATCH 09/18] WIP

---
 apps/desktop/docs/SEMANTIC_SEARCH_PLAN.md     | 932 ++++++++++++++++++
 apps/desktop/package.json                     |   1 +
 .../src/renderer/hooks/useHybridSearch.ts     |  83 ++
 .../cells/AssigneeCell/AssigneeCell.tsx       |   2 +-
 .../cells/PriorityCell/PriorityCell.tsx       |   6 +-
 .../hooks/useTasksTable/useTasksTable.tsx     |  32 +-
 bun.lock                                      |   3 +
 7 files changed, 1036 insertions(+), 23 deletions(-)
 create mode 100644 apps/desktop/docs/SEMANTIC_SEARCH_PLAN.md
 create mode 100644 apps/desktop/src/renderer/hooks/useHybridSearch.ts

diff --git a/apps/desktop/docs/SEMANTIC_SEARCH_PLAN.md b/apps/desktop/docs/SEMANTIC_SEARCH_PLAN.md
new file mode 100644
index 00000000000..93c880e50a1
--- /dev/null
+++ b/apps/desktop/docs/SEMANTIC_SEARCH_PLAN.md
@@ -0,0 +1,932 @@
+# Semantic Search with Embeddings - Local-First Architecture
+
+## Overview
+
+Implement semantic search for tasks using text embeddings, with a **local-first architecture** that keeps the embedding model in the desktop app's main process. This enables offline search while maintaining snappy UI updates through fire-and-forget embedding computation.
+
+## Architecture
+
+### High-Level Flow
+
+```
+Server (Linear Sync):
+  Linear task → generate embedding → store in DB
+    ↓
+  ElectricSQL syncs task + embedding to desktop
+    ↓
+Desktop has embedding ready for search
+
+Desktop (User-Created Tasks):
+  User creates task → insert to TanStack DB (no embedding yet)
+    ↓
+  Fire-and-forget tRPC call → main process computes embedding
+    ↓
+  Main returns embedding → update TanStack DB
+    ↓
+  ElectricSQL syncs back to server
+
+Desktop (Search):
+  User types "auth bug" → tRPC call to main process
+    ↓
+  Main generates query embedding → returns to renderer
+    ↓
+  Renderer: cosine similarity against task embeddings
+    ↓
+  Sorted results displayed
+```
+
+### Key Design Decisions
+
+1. **Model Location**: Main process (shared across all renderer operations, doesn't block UI)
+2. **Task Embeddings**: Generated server-side during Linear sync, locally for user-created tasks
+3. **Query Embeddings**: Generated on-demand in main process via tRPC
+4. **Search Execution**: In-memory cosine similarity in renderer (fast, no IPC overhead)
+5. **Optimistic Updates**: Tasks created without embeddings, embedding added async (fire-and-forget)
+
+---
+
+## Current State
+
+### Database Schema
+- ❌ No `embedding` column on tasks table
+- ✅ Tasks table has: id, title, description, slug, statusId, priority, etc.
+- ✅ Uses jsonb for labels (can use same for embeddings)
+
+### API Sync
+- ✅ Linear sync working (`performInitialSync()`)
+- ✅ Batch inserts 100 tasks at a time
+- ❌ No embedding generation during sync
+
+### Desktop App
+- ✅ tRPC setup with `ipcLink` for renderer-main communication
+- ✅ Collections using ElectricSQL for real-time sync
+- ✅ Update pattern: `collections.tasks.update(id, draft => { ... })`
+- ❌ No embedding model loaded
+- ❌ No tRPC endpoint for embedding computation
+
+### Current Search
+- ✅ TanStack Table globalFilter
+- ✅ Simple substring matching on title + slug
+- ❌ No semantic search
+- ❌ No relevance ranking
+
+---
+
+## Implementation Plan
+
+### Phase 1: Database Schema Update
+
+**Goal**: Add embedding storage to tasks table
+
+#### Step 1.1: Update Schema
+**File**: `packages/db/src/schema/schema.ts`
+
+Add embedding column to tasks table:
+```typescript
+export const tasks = pgTable(
+  "tasks",
+  {
+    // ... existing fields
+
+    // NEW: Text embedding for semantic search
+    embedding: jsonb("embedding").$type<number[]>(),
+
+    // ... rest of fields
+  },
+  // ... indexes
+);
+```
+
+#### Step 1.2: Generate and Push Migration
+
+**Note**: You will handle generating and pushing the migration yourself.
+
+After updating the schema in Step 1.1, you should:
+1. Spin up a new Neon branch
+2. Update `.env` files to point at the Neon branch locally
+3. Generate migration: `pnpm drizzle-kit generate --name="add_task_embeddings"`
+4. Review and push the migration
+
+**Verification**:
+```sql
+SELECT column_name, data_type
+FROM information_schema.columns
+WHERE table_name = 'tasks' AND column_name = 'embedding';
+```
+
+---
+
+### Phase 2: API - Embedding Generation During Sync
+
+**Goal**: Generate embeddings server-side during Linear sync
+
+#### Step 2.1: Install Dependencies
+```bash
+cd apps/api
+bun add @xenova/transformers
+```
+
+#### Step 2.2: Create Embedding Utility
+**File**: `apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils/embeddings.ts` (NEW)
+
+```typescript
+import { pipeline } from '@xenova/transformers';
+
+let embedder: Awaited<ReturnType<typeof pipeline>> | null = null;
+
+/**
+ * Lazily loads the embedding model (downloads ~90MB once, then caches)
+ */
+export async function getEmbedder() {
+  if (!embedder) {
+    console.log("[embeddings] Loading model: Xenova/all-MiniLM-L6-v2");
+    embedder = await pipeline(
+      'feature-extraction',
+      'Xenova/all-MiniLM-L6-v2'
+    );
+    console.log("[embeddings] Model loaded successfully");
+  }
+  return embedder;
+}
+
+/**
+ * Generates embedding for a task (combines title + description + labels)
+ */
+export async function generateTaskEmbedding(
+  title: string,
+  description: string | null,
+  labels: string[] = []
+): Promise<number[]> {
+  const model = await getEmbedder();
+
+  // Combine title, description, and labels for richer embeddings
+  const parts = [title, description, ...labels].filter(Boolean);
+  const text = parts.join(' ');
+
+  const result = await model(text, {
+    pooling: 'mean',
+    normalize: true,
+  });
+
+  return Array.from(result.data);
+}
+```
+
+#### Step 2.3: Update mapIssueToTask
+**File**: `apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts`
+
+Update signature to accept embeddings:
+```typescript
+export function mapIssueToTask(
+  issue: LinearIssue,
+  organizationId: string,
+  creatorId: string,
+  userByEmail: Map<string, string>,
+  statusByExternalId: Map<string, string>,
+  embedding: number[], // NEW parameter
+) {
+  return {
+    // ... existing fields
+    embedding, // NEW field
+    // ... rest of fields
+  };
+}
+```
+
+#### Step 2.4: Update performInitialSync
+**File**: `apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts`
+
+Generate embeddings using **batch processing** (more efficient than Promise.all):
+```typescript
+async function performInitialSync(
+  client: LinearClient,
+  organizationId: string,
+  creatorUserId: string,
+) {
+  // ... existing workflow state sync
+
+  // Fetch issues
+  const issues = await fetchAllIssues(client);
+
+  // Generate embeddings in BATCH (more efficient than individual calls)
+  console.log(`[initial-sync] Generating embeddings for ${issues.length} issues`);
+
+  const embedder = await getEmbedder();
+
+  // Prepare all texts at once
+  const texts = issues.map(issue => {
+    const parts = [
+      issue.title,
+      issue.description,
+      ...issue.labels.nodes.map(l => l.name)
+    ].filter(Boolean);
+    return parts.join(' ');
+  });
+
+  // Single batched call (faster than individual promises)
+  const result = await embedder(texts, {
+    pooling: 'mean',
+    normalize: true,
+  });
+
+  // Convert to array of embeddings
+  const embeddings: number[][] = [];
+  const embeddingDim = 384; // all-MiniLM-L6-v2 dimension
+  for (let i = 0; i < issues.length; i++) {
+    const start = i * embeddingDim;
+    const end = start + embeddingDim;
+    embeddings.push(Array.from(result.data.slice(start, end)));
+  }
+
+  console.log("[initial-sync] Embeddings generated");
+
+  // Map issues to tasks WITH embeddings
+  const mappedTasks = issues.map((issue, index) =>
+    mapIssueToTask(
+      issue,
+      organizationId,
+      creatorUserId,
+      userByEmail,
+      statusByExternalId,
+      embeddings[index] // Pass pre-computed embedding
+    )
+  );
+
+  // ... rest of batch insert logic
+}
+```
+
+**Why batch?** Transformers.js processes batches much faster than individual calls - ~2-3x speedup for 100+ tasks.
+
+---
+
+### Phase 3: Desktop Main Process - Embedding Model & tRPC Endpoint
+
+**Goal**: Load embedding model in main process, expose tRPC endpoint for renderer
+
+#### Step 3.1: Install Dependencies
+```bash
+cd apps/desktop
+bun add @xenova/transformers
+```
+
+#### Step 3.2: Create Embedding Service
+**File**: `apps/desktop/src/main/lib/embeddings.ts` (NEW)
+
+```typescript
+import { pipeline } from '@xenova/transformers';
+
+let embedder: Awaited<ReturnType<typeof pipeline>> | null = null;
+
+/**
+ * Initialize the embedding model (call on app startup)
+ * Downloads ~90MB model on first run, then caches locally
+ */
+export async function initEmbeddings() {
+  if (!embedder) {
+    console.log("[embeddings] Loading model: Xenova/all-MiniLM-L6-v2");
+    embedder = await pipeline(
+      'feature-extraction',
+      'Xenova/all-MiniLM-L6-v2'
+    );
+    console.log("[embeddings] Model loaded and cached");
+  }
+  return embedder;
+}
+
+/**
+ * Generate embedding for text (task or query)
+ */
+export async function generateEmbedding(text: string): Promise<number[]> {
+  const model = await initEmbeddings();
+
+  const result = await model(text, {
+    pooling: 'mean',
+    normalize: true,
+  });
+
+  return Array.from(result.data);
+}
+```
+
+#### Step 3.3: Load Model on Startup
+**File**: `apps/desktop/src/main/index.ts`
+
+Add to app initialization:
+```typescript
+import { initEmbeddings } from './lib/embeddings';
+
+app.whenReady().then(async () => {
+  // ... existing initialization
+
+  // Pre-load embedding model (async, doesn't block window creation)
+  console.log("[main] Pre-loading embedding model...");
+  initEmbeddings().catch(error => {
+    console.error("[main] Failed to load embedding model:", error);
+  });
+
+  // ... create window
+});
+```
+
+#### Step 3.4: Create tRPC Router for Embeddings
+**File**: `apps/desktop/src/lib/trpc/routers/embeddings/index.ts` (NEW)
+
+```typescript
+import { z } from 'zod';
+import { router, publicProcedure } from '../../index';
+import { generateEmbedding } from '../../../../main/lib/embeddings';
+
+export const createEmbeddingsRouter = () => {
+  return router({
+    /**
+     * Generate embedding for a text string (task or search query)
+     */
+    compute: publicProcedure
+      .input(z.object({
+        text: z.string().min(1),
+      }))
+      .mutation(async ({ input }) => {
+        const embedding = await generateEmbedding(input.text);
+        return { embedding };
+      }),
+  });
+};
+```
+
+#### Step 3.5: Register Router
+**File**: `apps/desktop/src/lib/trpc/index.ts`
+
+Add embeddings router:
+```typescript
+import { createEmbeddingsRouter } from './routers/embeddings';
+
+export const appRouter = router({
+  // ... existing routers
+  embeddings: createEmbeddingsRouter(),
+});
+
+export type AppRouter = typeof appRouter;
+```
+
+---
+
+### Phase 4: Desktop Renderer - Fire-and-Forget Embedding Updates
+
+**Goal**: Compute embeddings for user-created/updated tasks asynchronously
+
+#### Step 4.1: Create Embedding Helper
+**File**: `apps/desktop/src/renderer/hooks/useTaskEmbedding.ts` (NEW)
+
+```typescript
+import { useCallback } from 'react';
+import { trpc } from '../../lib/trpc';
+import { useCollections } from '../contexts/CollectionsProvider';
+
+/**
+ * Hook to compute and update task embeddings asynchronously
+ */
+export function useTaskEmbedding() {
+  const collections = useCollections();
+  const computeEmbedding = trpc.embeddings.compute.useMutation();
+
+  /**
+   * Fire-and-forget: Compute embedding and update task
+   * Returns immediately, embedding updates in background
+   */
+  const updateTaskEmbedding = useCallback((
+    taskId: string,
+    title: string,
+    description: string | null,
+    labels: string[] = []
+  ) => {
+    // Combine title, description, and labels
+    const parts = [title, description, ...labels].filter(Boolean);
+    const text = parts.join(' ');
+
+    // Fire and forget - don't await
+    computeEmbedding.mutateAsync({ text })
+      .then(({ embedding }) => {
+        collections.tasks.update(taskId, (draft) => {
+          draft.embedding = embedding;
+        });
+      })
+      .catch(error => {
+        console.error('[useTaskEmbedding] Failed to compute embedding:', error);
+      });
+  }, [collections, computeEmbedding]);
+
+  return { updateTaskEmbedding };
+}
+```
+
+#### Step 4.2: Update Task Creation Pattern
+**File**: `apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useCreateTask.ts` (NEW or UPDATE if exists)
+
+```typescript
+import { useCollections } from '../../../contexts/CollectionsProvider';
+import { useTaskEmbedding } from '../../../../hooks/useTaskEmbedding';
+
+export function useCreateTask() {
+  const collections = useCollections();
+  const { updateTaskEmbedding } = useTaskEmbedding();
+
+  const createTask = (taskData: { title: string; description: string | null; /* ... */ }) => {
+    // 1. Optimistic insert - immediate UI feedback
+    const taskId = crypto.randomUUID();
+    collections.tasks.insert({
+      id: taskId,
+      ...taskData,
+      embedding: null, // No embedding yet
+    });
+
+    // 2. Fire-and-forget embedding computation
+    updateTaskEmbedding(taskId, taskData.title, taskData.description);
+
+    // 3. Return immediately
+    return taskId;
+  };
+
+  return { createTask };
+}
+```
+
+**Pattern for updates**: Similar approach - update fields immediately, recompute embedding async.
+
+---
+
+### Phase 5: Desktop Renderer - Semantic Search
+
+**Goal**: Replace substring search with semantic search using embeddings
+
+#### Step 5.1: Create Cosine Similarity Utility
+**File**: `apps/desktop/src/renderer/utils/embeddings.ts` (NEW)
+
+```typescript
+/**
+ * Compute cosine similarity between two embedding vectors
+ * Returns value between -1 and 1 (higher = more similar)
+ */
+export function cosineSimilarity(a: number[], b: number[]): number {
+  if (a.length !== b.length) {
+    throw new Error('Vectors must have same length');
+  }
+
+  let dotProduct = 0;
+  let magnitudeA = 0;
+  let magnitudeB = 0;
+
+  for (let i = 0; i < a.length; i++) {
+    dotProduct += a[i] * b[i];
+    magnitudeA += a[i] * a[i];
+    magnitudeB += b[i] * b[i];
+  }
+
+  magnitudeA = Math.sqrt(magnitudeA);
+  magnitudeB = Math.sqrt(magnitudeB);
+
+  if (magnitudeA === 0 || magnitudeB === 0) {
+    return 0;
+  }
+
+  return dotProduct / (magnitudeA * magnitudeB);
+}
+```
+
+#### Step 5.2: Create Semantic Search Hook with Caching & Hybrid Search
+**File**: `apps/desktop/src/renderer/hooks/useSemanticSearch.ts` (NEW)
+
+```typescript
+import { useState, useCallback, useRef } from 'react';
+import { trpc } from '../lib/trpc';
+import { cosineSimilarity } from '../utils/embeddings';
+
+interface Task {
+  id: string;
+  title: string;
+  slug: string;
+  embedding?: number[] | null;
+}
+
+interface SearchResult<T extends Task> {
+  task: T;
+  score: number;
+}
+
+/**
+ * Simple keyword matching score (0-1)
+ * Used for hybrid search to catch exact matches
+ */
+function keywordScore(query: string, task: Task): number {
+  const lowerQuery = query.toLowerCase();
+  const titleMatch = task.title.toLowerCase().includes(lowerQuery);
+  const slugMatch = task.slug.toLowerCase().includes(lowerQuery);
+
+  // Exact slug match = highest score
+  if (task.slug.toLowerCase() === lowerQuery) return 1.0;
+  // Slug contains = high score
+  if (slugMatch) return 0.8;
+  // Title contains = medium score
+  if (titleMatch) return 0.6;
+  // No match
+  return 0;
+}
+
+/**
+ * Hook for hybrid semantic + keyword search with query caching
+ */
+export function useSemanticSearch<T extends Task>() {
+  const [isSearching, setIsSearching] = useState(false);
+  const computeEmbedding = trpc.embeddings.compute.useMutation();
+
+  // Cache query embeddings to avoid recomputing
+  const queryCache = useRef(new Map<string, number[]>());
+
+  /**
+   * Perform hybrid search (semantic + keyword)
+   * Returns tasks sorted by relevance (highest score first)
+   */
+  const search = useCallback(async (
+    query: string,
+    tasks: T[]
+  ): Promise<SearchResult<T>[]> => {
+    if (!query.trim()) {
+      return tasks.map(task => ({ task, score: 1 }));
+    }
+
+    setIsSearching(true);
+
+    try {
+      // 1. Get query embedding (from cache or generate)
+      let queryEmbedding = queryCache.current.get(query);
+
+      if (!queryEmbedding) {
+        const result = await computeEmbedding.mutateAsync({ text: query });
+        queryEmbedding = result.embedding;
+        queryCache.current.set(query, queryEmbedding);
+
+        // Limit cache size to 50 queries
+        if (queryCache.current.size > 50) {
+          const firstKey = queryCache.current.keys().next().value;
+          queryCache.current.delete(firstKey);
+        }
+      }
+
+      // 2. Compute hybrid scores (70% semantic + 30% keyword)
+      const results = tasks
+        .filter(task => task.embedding && task.embedding.length > 0)
+        .map(task => {
+          const semanticScore = cosineSimilarity(queryEmbedding!, task.embedding!);
+          const kwScore = keywordScore(query, task);
+
+          // Hybrid: 70% semantic, 30% keyword
+          const hybridScore = (0.7 * semanticScore) + (0.3 * kwScore);
+
+          return { task, score: hybridScore };
+        })
+        .sort((a, b) => b.score - a.score);
+
+      return results;
+    } catch (error) {
+      console.error('[useSemanticSearch] Search failed:', error);
+
+      // Fallback to keyword-only search
+      return tasks
+        .map(task => ({ task, score: keywordScore(query, task) }))
+        .filter(r => r.score > 0)
+        .sort((a, b) => b.score - a.score);
+    } finally {
+      setIsSearching(false);
+    }
+  }, [computeEmbedding]);
+
+  return { search, isSearching };
+}
+```
+
+#### Step 5.3: Update useTasksTable to Use Semantic Search
+**File**: `apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx`
+
+Replace globalFilter with semantic search:
+
+```typescript
+import { useSemanticSearch } from '../../../../../hooks/useSemanticSearch';
+
+export function useTasksTable({ filterTab, searchQuery }: UseTasksTableParams) {
+  // ... existing code
+
+  const { search, isSearching } = useSemanticSearch();
+  const [searchResults, setSearchResults] = useState<Map<string, number>>(new Map());
+
+  // Debounced semantic search
+  useEffect(() => {
+    if (!searchQuery.trim()) {
+      setSearchResults(new Map());
+      return;
+    }
+
+    const timer = setTimeout(async () => {
+      const results = await search(searchQuery, data);
+      const scoreMap = new Map(
+        results.map(r => [r.task.id, r.score])
+      );
+      setSearchResults(scoreMap);
+    }, 300); // 300ms debounce
+
+    return () => clearTimeout(timer);
+  }, [searchQuery, data, search]);
+
+  // Sort by semantic relevance when searching
+  const sortedData = useMemo(() => {
+    if (searchResults.size === 0) {
+      return data;
+    }
+
+    // Filter by minimum similarity threshold + sort by score
+    return [...data]
+      .filter(task => {
+        const score = searchResults.get(task.id);
+        return score !== undefined && score > 0.3; // 30% similarity threshold
+      })
+      .sort((a, b) => {
+        const scoreA = searchResults.get(a.id) || 0;
+        const scoreB = searchResults.get(b.id) || 0;
+        return scoreB - scoreA;
+      });
+  }, [data, searchResults]);
+
+  // Use sortedData for table instead of data
+  const table = useReactTable({
+    data: sortedData, // Changed from 'data'
+    columns,
+    // ... rest of config
+    // REMOVE: globalFilter, globalFilterFn (no longer needed)
+  });
+
+  return { table, isLoading: isLoading || isSearching, slugColumnWidth };
+}
+```
+
+#### Step 5.4: Add Search Feedback UI
+**File**: `apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx`
+
+Add loading indicator:
+```typescript
+interface TasksTopBarProps {
+  // ... existing
+  isSearching?: boolean; // NEW
+}
+
+export function TasksTopBar({
+  currentTab,
+  onTabChange,
+  searchQuery,
+  onSearchChange,
+  isSearching = false // NEW
+}: TasksTopBarProps) {
+  return (
+    <div className="flex items-center justify-between border-b border-border px-4 h-11">
+      {/* ... tabs */}
+
+      <div className="relative w-64">
+        <HiOutlineMagnifyingGlass className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground pointer-events-none" />
+        <Input
+          type="text"
+          placeholder="Search tasks..."
+          value={searchQuery}
+          onChange={(e) => onSearchChange(e.target.value)}
+          className="h-8 pl-9 pr-3 text-sm bg-muted/50 border-0 focus-visible:ring-1"
+        />
+        {isSearching && (
+          <div className="absolute right-3 top-1/2 -translate-y-1/2">
+            <div className="h-3 w-3 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+```
+
+---
+
+## Critical Files Summary
+
+### New Files to Create:
+
+**API:**
+1. `apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils/embeddings.ts` - Server-side embedding generation
+
+**Desktop Main:**
+2. `apps/desktop/src/main/lib/embeddings.ts` - Main process embedding model
+3. `apps/desktop/src/lib/trpc/routers/embeddings/index.ts` - tRPC router for embeddings
+
+**Desktop Renderer:**
+4. `apps/desktop/src/renderer/hooks/useTaskEmbedding.ts` - Fire-and-forget embedding updates
+5. `apps/desktop/src/renderer/hooks/useSemanticSearch.ts` - Semantic search hook
+6. `apps/desktop/src/renderer/hooks/useCreateTask.ts` - Task creation with embeddings
+7. `apps/desktop/src/renderer/utils/embeddings.ts` - Cosine similarity utility
+
+### Files to Modify:
+
+**Database:**
+1. `packages/db/src/schema/schema.ts` - Add embedding column
+
+**API:**
+2. `apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts` - Update mapIssueToTask signature
+3. `apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts` - Generate embeddings during sync
+
+**Desktop Main:**
+4. `apps/desktop/src/main/index.ts` - Load embedding model on startup
+5. `apps/desktop/src/lib/trpc/index.ts` - Register embeddings router
+
+**Desktop Renderer:**
+6. `apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx` - Replace globalFilter with semantic search
+7. `apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx` - Add search loading indicator
+8. `apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx` - Pass isSearching prop
+
+---
+
+## Testing & Verification Plan
+
+### 1. Schema Verification
+```sql
+-- Verify embedding column exists
+SELECT column_name, data_type
+FROM information_schema.columns
+WHERE table_name = 'tasks' AND column_name = 'embedding';
+
+-- Should return: embedding | jsonb
+```
+
+### 2. API Embedding Generation
+```bash
+# Trigger Linear sync
+# Check database for embeddings
+
+SELECT
+  slug,
+  title,
+  jsonb_array_length(embedding) as embedding_dimensions
+FROM tasks
+WHERE external_provider = 'linear'
+LIMIT 5;
+
+# Should return ~384 dimensions for all tasks
+```
+
+### 3. Desktop Model Loading
+```bash
+# Start desktop app, check logs
+# Should see: "[embeddings] Loading model: Xenova/all-MiniLM-L6-v2"
+# Should see: "[embeddings] Model loaded and cached"
+
+# First load: ~5-10 seconds (downloads model)
+# Subsequent loads: <1 second (uses cache)
+```
+
+### 4. Task Creation with Embeddings
+```javascript
+// Create a test task in desktop app
+// Check TanStack DB:
+// 1. Task appears immediately (embedding: null)
+// 2. After ~200-500ms, embedding populates
+// 3. Verify embedding has 384 dimensions
+```
+
+### 5. Semantic Search Testing
+
+**Test queries:**
+- "authentication bug" → should match tasks with "login", "auth", "user access"
+- "performance issue" → should match "slow", "latency", "optimization"
+- "database migration" → should match "schema", "SQL", "data"
+
+**Expected behavior:**
+- Search triggers in 300ms (debounce)
+- Spinner shows while generating query embedding
+- Results sorted by relevance
+- Tasks with similarity < 0.3 filtered out
+
+### 6. Edge Cases
+
+**No embeddings:**
+- Create task → immediately search before embedding computed
+- Should gracefully exclude from results
+
+**Empty search:**
+- Clear search box → should show all tasks
+- No API calls made
+
+**Offline:**
+- Disconnect network → create task
+- Embedding computation should fail gracefully
+- Task still usable, just not semantically searchable
+
+**Model load failure:**
+- Simulate model download failure
+- Should log error, app should still function
+- Search falls back to showing all tasks
+
+---
+
+## Performance Considerations
+
+### Model Size
+- **all-MiniLM-L6-v2**: ~90MB download (one-time)
+- Cached in: `~/.cache/huggingface/` (or OS equivalent)
+- Memory footprint: ~200-300MB when loaded
+
+### Embedding Generation
+- **Single task**: ~50-200ms
+- **Batch (100 tasks)**: ~2-5 seconds (parallel processing)
+- **Search query**: ~50-200ms
+
+### Cosine Similarity
+- **100 tasks**: <5ms (pure JavaScript math)
+- **1000 tasks**: <50ms
+- Scales linearly, no DB queries
+
+### Network Impact
+- **Initial model download**: ~90MB (one-time)
+- **After cache**: 0 bytes (fully local)
+- **Search**: 0 bytes (no API calls)
+
+---
+
+## Dependencies
+
+### New Dependencies
+
+**API:**
+```json
+{
+  "@xenova/transformers": "^2.17.1"
+}
+```
+
+**Desktop:**
+```json
+{
+  "@xenova/transformers": "^2.17.1"
+}
+```
+
+**No other dependencies needed** - uses existing:
+- tRPC (already set up)
+- Electric SQL (already syncing)
+- TanStack Table (already used for display)
+
+---
+
+## Rollout Strategy
+
+### Phase 1: Server-Side Only (Low Risk)
+1. Deploy schema change (add embedding column)
+2. Deploy API with embedding generation
+3. Re-sync Linear tasks
+4. Verify embeddings in database
+
+### Phase 2: Desktop Read-Only (Testing)
+1. Deploy desktop with model loading + tRPC endpoint
+2. Test embedding generation for queries
+3. Don't wire up to UI yet
+4. Monitor performance, model load times
+
+### Phase 3: Full Rollout
+1. Wire up semantic search in UI
+2. Monitor search quality
+3. Collect feedback
+4. Tune similarity threshold if needed
+
+### Rollback Plan
+- Embedding column nullable → can remove feature without breaking
+- Old globalFilter code still exists → revert UI changes
+- Model doesn't auto-load → disable via feature flag
+
+---
+
+## Future Enhancements
+
+### Short Term
+- [ ] Hybrid search: Combine semantic + keyword matching
+- [ ] Search result highlighting
+- [ ] Show similarity scores in UI (debugging)
+- [ ] Tune similarity threshold (currently 0.3)
+
+### Medium Term
+- [ ] Multi-field search weights (title > description)
+- [ ] Batch re-embedding on model version changes
+- [ ] Background job: Fill missing embeddings
+- [ ] Search analytics (track query quality)
+
+### Long Term
+- [ ] Upgrade to larger model (better quality, slower)
+- [ ] Custom fine-tuned model for task domain
+- [ ] Search across comments, attachments
+- [ ] Semantic suggestions ("Similar tasks")
+
+---
+
+## Open Questions
+
+None - architecture is fully specified and ready for implementation.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 2a85bc1efc3..e278afac64b 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -83,6 +83,7 @@
 		"fast-glob": "^3.3.3",
 		"file-uri-to-path": "^1.0.0",
 		"framer-motion": "^12.23.26",
+		"fuse.js": "^7.1.0",
 		"http-proxy": "^1.18.1",
 		"idb": "^8.0.3",
 		"idb-keyval": "^6.2.2",
diff --git a/apps/desktop/src/renderer/hooks/useHybridSearch.ts b/apps/desktop/src/renderer/hooks/useHybridSearch.ts
new file mode 100644
index 00000000000..46776aa5568
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/useHybridSearch.ts
@@ -0,0 +1,83 @@
+import { useMemo, useCallback } from "react";
+import Fuse from "fuse.js";
+
+interface SearchableTask {
+	id: string;
+	title: string;
+	slug: string;
+	description: string | null;
+	labels: string[] | null;
+}
+
+interface SearchResult<T extends SearchableTask> {
+	item: T;
+	score: number;
+	matchType: "exact" | "fuzzy";
+}
+
+export function useHybridSearch<T extends SearchableTask>(tasks: T[]) {
+	const exactFuse = useMemo(
+		() =>
+			new Fuse(tasks, {
+				keys: [
+					{ name: "slug", weight: 2 },
+					{ name: "labels", weight: 1 },
+				],
+				threshold: 0,
+				includeScore: true,
+				ignoreLocation: true,
+				useExtendedSearch: false,
+			}),
+		[tasks],
+	);
+	// TODO(satya): Replace this with embeddings search
+	const fuzzyFuse = useMemo(
+		() =>
+			new Fuse(tasks, {
+				keys: [
+					{ name: "title", weight: 2 },
+					{ name: "description", weight: 1 },
+				],
+				threshold: 0.3,
+				includeScore: true,
+				ignoreLocation: true,
+				useExtendedSearch: false,
+			}),
+		[tasks],
+	);
+
+	const search = useCallback(
+		(query: string): SearchResult<T>[] => {
+			if (!query.trim()) {
+				return tasks.map((item) => ({
+					item,
+					score: 1,
+					matchType: "exact" as const,
+				}));
+			}
+
+			const exactMatches = exactFuse.search(query);
+			const exactIds = new Set(exactMatches.map((m) => m.item.id));
+
+			const fuzzyMatches = fuzzyFuse
+				.search(query)
+				.filter((m) => !exactIds.has(m.item.id));
+
+			return [
+				...exactMatches.map((m) => ({
+					item: m.item,
+					score: 1 - (m.score ?? 0),
+					matchType: "exact" as const,
+				})),
+				...fuzzyMatches.map((m) => ({
+					item: m.item,
+					score: 1 - (m.score ?? 0),
+					matchType: "fuzzy" as const,
+				})),
+			];
+		},
+		[exactFuse, fuzzyFuse, tasks],
+	);
+
+	return { search };
+}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index 0513945270a..7f56498822c 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -10,7 +10,7 @@ import {
 import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import type { TaskWithStatus } from "../../hooks/useTasksTable";
+import type { TaskWithStatus } from "../../../hooks/useTasksTable";
 
 interface AssigneeCellProps {
 	info: CellContext<TaskWithStatus, string | null>;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
index e72393f64bb..15fc6754b6b 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -1,6 +1,5 @@
 import { useState } from "react";
 import type { CellContext } from "@tanstack/react-table";
-import type { SelectTask } from "@superset/db/schema";
 import { type TaskPriority } from "@superset/db/enums";
 import {
 	DropdownMenu,
@@ -11,9 +10,10 @@ import {
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { PriorityIcon } from "../../PriorityIcon";
 import { ALL_PRIORITIES } from "../../../utils/taskSorting";
+import type { TaskWithStatus } from "../../../hooks/useTasksTable";
 
 interface PriorityCellProps {
-	info: CellContext<SelectTask, TaskPriority>;
+	info: CellContext<TaskWithStatus, TaskPriority>;
 }
 
 const PRIORITY_LABELS: Record<TaskPriority, string> = {
@@ -30,7 +30,7 @@ export function PriorityCell({ info }: PriorityCellProps) {
 
 	const task = info.row.original;
 	const currentPriority = info.getValue();
-	const statusType = (task as any).status?.type;
+	const statusType = task.status.type;
 
 	const handleSelectPriority = (newPriority: TaskPriority) => {
 		if (newPriority === currentPriority) {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 724c1158343..106f75b9d68 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -27,6 +27,7 @@ import { PriorityCell } from "../../components/cells/PriorityCell";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
 import { compareTasks } from "../../utils/taskSorting";
 import type { TabValue } from "../../components/TasksTopBar";
+import { useHybridSearch } from "renderer/hooks/useHybridSearch";
 
 // Task with joined status and assignee data
 export type TaskWithStatus = SelectTask & {
@@ -53,9 +54,7 @@ export function useTasksTable({
 	const [grouping, setGrouping] = useState<string[]>(["status"]);
 	const [expanded, setExpanded] = useState<ExpandedState>(true);
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
-	const [globalFilter, setGlobalFilter] = useState("");
 
-	// Join tasks with statuses and assignees
 	const { data: allData, isLoading } = useLiveQuery(
 		(q) =>
 			q
@@ -77,15 +76,22 @@ export function useTasksTable({
 		[collections],
 	);
 
-	// Sort tasks by status type, priority, and position
-	const data = useMemo(() => {
+	const sortedData = useMemo(() => {
 		if (!allData) return [];
 		return [...allData].sort(compareTasks);
 	}, [allData]);
 
-	// Update filters based on tab and search
+	const { search } = useHybridSearch<TaskWithStatus>(sortedData);
+
+	const data = useMemo(() => {
+		if (!searchQuery.trim()) {
+			return sortedData;
+		}
+		const results = search(searchQuery);
+		return results.map((r) => r.item);
+	}, [sortedData, searchQuery, search]);
+
 	useEffect(() => {
-		// Update column filter for tab
 		const newColumnFilters: ColumnFiltersState = [];
 		if (filterTab !== "all") {
 			newColumnFilters.push({
@@ -94,10 +100,7 @@ export function useTasksTable({
 			});
 		}
 		setColumnFilters(newColumnFilters);
-
-		// Update global filter for search
-		setGlobalFilter(searchQuery);
-	}, [filterTab, searchQuery]);
+	}, [filterTab]);
 
 	// Calculate optimal slug column width based on longest slug
 	const slugColumnWidth = useMemo(() => {
@@ -282,19 +285,10 @@ export function useTasksTable({
 			grouping,
 			expanded,
 			columnFilters,
-			globalFilter,
 		},
 		onGroupingChange: setGrouping,
 		onExpandedChange: setExpanded,
 		onColumnFiltersChange: setColumnFilters,
-		onGlobalFilterChange: setGlobalFilter,
-		globalFilterFn: (row, _columnId, filterValue: string) => {
-			// Search across title and slug
-			const query = filterValue.toLowerCase();
-			const title = row.original.title.toLowerCase();
-			const slug = row.original.slug.toLowerCase();
-			return title.includes(query) || slug.includes(query);
-		},
 		getCoreRowModel: getCoreRowModel(),
 		getFilteredRowModel: getFilteredRowModel(),
 		getGroupedRowModel: getGroupedRowModel(),
diff --git a/bun.lock b/bun.lock
index b64cabd9c4e..acad8efefda 100644
--- a/bun.lock
+++ b/bun.lock
@@ -176,6 +176,7 @@
         "fast-glob": "^3.3.3",
         "file-uri-to-path": "^1.0.0",
         "framer-motion": "^12.23.26",
+        "fuse.js": "^7.1.0",
         "http-proxy": "^1.18.1",
         "idb": "^8.0.3",
         "idb-keyval": "^6.2.2",
@@ -2263,6 +2264,8 @@
 
     "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="],
 
+    "fuse.js": ["fuse.js@7.1.0", "", {}, "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ=="],
+
     "geist": ["geist@1.5.1", "", { "peerDependencies": { "next": ">=13.2.0" } }, "sha512-mAHZxIsL2o3ZITFaBVFBnwyDOw+zNLYum6A6nIjpzCGIO8QtC3V76XF2RnZTyLx1wlDTmMDy8jg3Ib52MIjGvQ=="],
 
     "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="],

From 40a73f618b99d359f2145b4c5a02c95bb6a16314 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 12:13:29 -0800
Subject: [PATCH 10/18] WIP

---
 .../src/app/api/electric/[...path]/utils.ts   |  2 +-
 .../api/integrations/linear/callback/route.ts |  3 +-
 .../linear/jobs/initial-sync/route.ts         |  6 ++-
 .../jobs/initial-sync/syncWorkflowStates.ts   |  7 ++-
 .../linear/jobs/initial-sync/utils.ts         | 19 +++++---
 .../linear/jobs/sync-task/route.ts            |  6 ++-
 .../api/integrations/linear/webhook/route.ts  |  2 +-
 .../src/renderer/hooks/useHybridSearch.ts     |  2 +-
 .../components/ComponentsShowcase/index.tsx   | 42 +++++++-----------
 .../TeamSettings/TeamSettings.tsx             |  5 +--
 .../main/components/TasksView/TasksView.tsx   |  4 +-
 .../components/PriorityIcon/PriorityIcon.tsx  | 18 +++++++-
 .../TasksView/components/StatusIcon/index.ts  |  2 +-
 .../TaskContextMenu/TaskContextMenu.tsx       | 16 ++++---
 .../TasksTableView/TasksTableView.tsx         | 12 +++--
 .../components/TasksTopBar/TasksTopBar.tsx    |  4 +-
 .../TasksView/components/TasksTopBar/index.ts |  2 +-
 .../cells/AssigneeCell/AssigneeCell.tsx       |  8 ++--
 .../cells/LabelsCell/LabelsCell.tsx           |  2 +-
 .../cells/PriorityCell/PriorityCell.tsx       | 10 ++---
 .../cells/StatusCell/StatusCell.tsx           |  6 +--
 .../icons/ActiveIcon/ActiveIcon.tsx           | 14 +++++-
 .../icons/AllIssuesIcon/AllIssuesIcon.tsx     | 12 +++--
 .../AssigneeMenuIcon/AssigneeMenuIcon.tsx     |  5 ++-
 .../icons/BacklogIcon/BacklogIcon.tsx         |  5 ++-
 .../components/shared/AssigneeMenuItems.tsx   | 10 +++--
 .../components/shared/PriorityMenuItems.tsx   |  4 +-
 .../components/shared/StatusMenuItems.tsx     |  2 +-
 .../TasksView/hooks/useTasksTable/index.ts    |  2 +-
 .../hooks/useTasksTable/useTasksTable.tsx     | 44 +++++++++----------
 .../src/renderer/screens/main/index.tsx       |  2 +-
 apps/desktop/src/renderer/stores/app-state.ts |  7 ++-
 packages/db/src/schema/relations.ts           |  2 +-
 packages/ui/src/atoms/Avatar/Avatar.tsx       |  8 +---
 packages/ui/src/atoms/Avatar/index.ts         |  4 +-
 35 files changed, 169 insertions(+), 130 deletions(-)

diff --git a/apps/api/src/app/api/electric/[...path]/utils.ts b/apps/api/src/app/api/electric/[...path]/utils.ts
index 4a89029accf..6f14103be59 100644
--- a/apps/api/src/app/api/electric/[...path]/utils.ts
+++ b/apps/api/src/app/api/electric/[...path]/utils.ts
@@ -3,8 +3,8 @@ import {
 	members,
 	organizations,
 	repositories,
-	tasks,
 	taskStatuses,
+	tasks,
 	users,
 } from "@superset/db/schema";
 import { eq, inArray, sql } from "drizzle-orm";
diff --git a/apps/api/src/app/api/integrations/linear/callback/route.ts b/apps/api/src/app/api/integrations/linear/callback/route.ts
index 8bae5376c85..566f3c5ae75 100644
--- a/apps/api/src/app/api/integrations/linear/callback/route.ts
+++ b/apps/api/src/app/api/integrations/linear/callback/route.ts
@@ -50,7 +50,8 @@ export async function GET(request: Request) {
 			client_id: env.LINEAR_CLIENT_ID,
 			client_secret: env.LINEAR_CLIENT_SECRET,
 			// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
-			redirect_uri: "https://b02ef5887783.ngrok-free.app/api/integrations/linear/callback",
+			redirect_uri:
+				"https://b02ef5887783.ngrok-free.app/api/integrations/linear/callback",
 			code,
 		}),
 	});
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
index 67d239a218c..f72f35c9381 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
@@ -2,8 +2,8 @@ import { LinearClient } from "@linear/sdk";
 import { buildConflictUpdateColumns, db } from "@superset/db";
 import {
 	integrationConnections,
-	tasks,
 	taskStatuses,
+	tasks,
 	users,
 } from "@superset/db/schema";
 import { Receiver } from "@upstash/qstash";
@@ -89,7 +89,9 @@ async function performInitialSync(
 		),
 	});
 	for (const status of statuses) {
-		statusByExternalId.set(status.externalId!, status.id);
+		if (status.externalId) {
+			statusByExternalId.set(status.externalId, status.id);
+		}
 	}
 
 	// STEP 3: Sync issues
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
index 6c76cb71096..46dd41427f4 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
@@ -1,8 +1,7 @@
 import type { LinearClient } from "@linear/sdk";
-import { and, eq } from "drizzle-orm";
+import { buildConflictUpdateColumns } from "@superset/db";
 import { db } from "@superset/db/client";
 import { taskStatuses } from "@superset/db/schema";
-import { buildConflictUpdateColumns } from "@superset/db";
 import { calculateProgressForStates } from "./utils";
 
 /**
@@ -37,7 +36,7 @@ export async function syncWorkflowStates({
 			if (!statesByType.has(state.type)) {
 				statesByType.set(state.type, []);
 			}
-			statesByType.get(state.type)!.push(state);
+			statesByType.get(state.type)?.push(state);
 		}
 
 		// Calculate progress for "started" type
@@ -54,7 +53,7 @@ export async function syncWorkflowStates({
 			type: normalizeStateType(state.type),
 			position: state.position,
 			progressPercent:
-				state.type === "started" ? progressMap.get(state.name) ?? null : null,
+				state.type === "started" ? (progressMap.get(state.name) ?? null) : null,
 			externalProvider: "linear" as const,
 			externalId: state.id,
 		}));
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
index e6cb223592b..5e32465d51e 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
@@ -1,6 +1,6 @@
 import type { LinearClient } from "@linear/sdk";
-import { subMonths } from "date-fns";
 import { mapPriorityFromLinear } from "@superset/trpc/integrations/linear";
+import { subMonths } from "date-fns";
 
 export interface LinearIssue {
 	id: string;
@@ -15,7 +15,13 @@ export interface LinearIssue {
 	startedAt: string | null;
 	completedAt: string | null;
 	assignee: { id: string; email: string } | null;
-	state: { id: string; name: string; color: string; type: string; position: number };
+	state: {
+		id: string;
+		name: string;
+		color: string;
+		type: string;
+		position: number;
+	};
 	labels: { nodes: Array<{ id: string; name: string }> };
 }
 
@@ -47,21 +53,21 @@ export function calculateProgressForStates(
 		return progressMap;
 	}
 
-	// Sort by position to get Linear's intended order
 	const sorted = [...states].sort((a, b) => a.position - b.position);
 
 	const total = sorted.length;
 
 	for (let i = 0; i < total; i++) {
 		const state = sorted[i];
+		if (!state) continue;
+
 		let progress: number;
 
 		if (total === 1) {
-			progress = 50; // 50%
+			progress = 50;
 		} else if (total === 2) {
-			progress = i === 0 ? 50 : 75; // [50%, 75%]
+			progress = i === 0 ? 50 : 75;
 		} else {
-			// 3+ states: evenly spaced (index + 1) / (total + 1)
 			progress = ((i + 1) / (total + 1)) * 100;
 		}
 
@@ -149,7 +155,6 @@ export function mapIssueToTask(
 		? (userByEmail.get(issue.assignee.email) ?? null)
 		: null;
 
-	// Look up statusId from pre-loaded map (no DB query)
 	const statusId = statusByExternalId.get(issue.state.id);
 	if (!statusId) {
 		throw new Error(`Status not found for state ${issue.state.id}`);
diff --git a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
index 593d7a2c6be..f01259bb34c 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
@@ -1,7 +1,11 @@
 import type { LinearClient, WorkflowState } from "@linear/sdk";
 import { db } from "@superset/db/client";
 import type { LinearConfig, SelectTask } from "@superset/db/schema";
-import { integrationConnections, tasks, taskStatuses } from "@superset/db/schema";
+import {
+	integrationConnections,
+	taskStatuses,
+	tasks,
+} from "@superset/db/schema";
 import {
 	getLinearClient,
 	mapPriorityToLinear,
diff --git a/apps/api/src/app/api/integrations/linear/webhook/route.ts b/apps/api/src/app/api/integrations/linear/webhook/route.ts
index f961d0c5299..f3a25da001a 100644
--- a/apps/api/src/app/api/integrations/linear/webhook/route.ts
+++ b/apps/api/src/app/api/integrations/linear/webhook/route.ts
@@ -7,8 +7,8 @@ import { db } from "@superset/db/client";
 import type { SelectIntegrationConnection } from "@superset/db/schema";
 import {
 	integrationConnections,
-	tasks,
 	taskStatuses,
+	tasks,
 	users,
 	webhookEvents,
 } from "@superset/db/schema";
diff --git a/apps/desktop/src/renderer/hooks/useHybridSearch.ts b/apps/desktop/src/renderer/hooks/useHybridSearch.ts
index 46776aa5568..a03224bf544 100644
--- a/apps/desktop/src/renderer/hooks/useHybridSearch.ts
+++ b/apps/desktop/src/renderer/hooks/useHybridSearch.ts
@@ -1,5 +1,5 @@
-import { useMemo, useCallback } from "react";
 import Fuse from "fuse.js";
+import { useCallback, useMemo } from "react";
 
 interface SearchableTask {
 	id: string;
diff --git a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
index 5c2b2a19083..cf8decfad25 100644
--- a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
@@ -1,5 +1,8 @@
 import { ScrollArea } from "@superset/ui/scroll-area";
-import { StatusIcon, type StatusType } from "../TasksView/components/StatusIcon";
+import {
+	StatusIcon,
+	type StatusType,
+} from "../TasksView/components/StatusIcon";
 
 const STATUS_VARIANTS: Array<{
 	type: StatusType;
@@ -50,10 +53,7 @@ export function ComponentsShowcase() {
 											key={index}
 											className="flex items-center gap-3 p-4 rounded-lg border border-border bg-card"
 										>
-											<StatusIcon
-												type={variant.type}
-												color={variant.color}
-											/>
+											<StatusIcon type={variant.type} color={variant.color} />
 											<div className="flex-1 min-w-0">
 												<p className="text-sm font-medium">{variant.label}</p>
 												<p className="text-xs text-muted-foreground">
@@ -72,10 +72,7 @@ export function ComponentsShowcase() {
 									{/* Backlog */}
 									<div className="p-4 rounded-lg border border-border bg-card">
 										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon
-												type="backlog"
-												color="#6B7280"
-											/>
+											<StatusIcon type="backlog" color="#6B7280" />
 											<span className="font-medium">Backlog Type</span>
 										</div>
 										<p className="text-sm text-muted-foreground ml-9">
@@ -86,10 +83,7 @@ export function ComponentsShowcase() {
 									{/* Unstarted */}
 									<div className="p-4 rounded-lg border border-border bg-card">
 										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon
-												type="unstarted"
-												color="#3B82F6"
-											/>
+											<StatusIcon type="unstarted" color="#3B82F6" />
 											<span className="font-medium">Unstarted Type</span>
 										</div>
 										<p className="text-sm text-muted-foreground ml-9">
@@ -100,10 +94,7 @@ export function ComponentsShowcase() {
 									{/* Started */}
 									<div className="p-4 rounded-lg border border-border bg-card">
 										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon
-												type="started"
-												color="#F59E0B"
-											/>
+											<StatusIcon type="started" color="#F59E0B" />
 											<span className="font-medium">Started Type</span>
 										</div>
 										<p className="text-sm text-muted-foreground ml-9">
@@ -114,10 +105,7 @@ export function ComponentsShowcase() {
 									{/* Completed */}
 									<div className="p-4 rounded-lg border border-border bg-card">
 										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon
-												type="completed"
-												color="#8B5CF6"
-											/>
+											<StatusIcon type="completed" color="#8B5CF6" />
 											<span className="font-medium">Completed Type</span>
 										</div>
 										<p className="text-sm text-muted-foreground ml-9">
@@ -128,10 +116,7 @@ export function ComponentsShowcase() {
 									{/* Cancelled */}
 									<div className="p-4 rounded-lg border border-border bg-card">
 										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon
-												type="cancelled"
-												color="#6B7280"
-											/>
+											<StatusIcon type="cancelled" color="#6B7280" />
 											<span className="font-medium">Cancelled Type</span>
 										</div>
 										<p className="text-sm text-muted-foreground ml-9">
@@ -203,7 +188,9 @@ export function ComponentsShowcase() {
 
 							{/* Progress Variants for Started Type */}
 							<div>
-								<h3 className="text-sm font-medium mb-3">Started Progress Variants</h3>
+								<h3 className="text-sm font-medium mb-3">
+									Started Progress Variants
+								</h3>
 								<p className="text-xs text-muted-foreground mb-3">
 									Visual progress indication for "started" type statuses
 								</p>
@@ -230,7 +217,8 @@ export function ComponentsShowcase() {
 									</div>
 								</div>
 								<p className="text-xs text-muted-foreground mt-2 ml-2">
-									Progress is calculated from Linear workflow state positions during sync
+									Progress is calculated from Linear workflow state positions
+									during sync
 								</p>
 							</div>
 						</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
index ec61ae6ab15..4d12273e242 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
@@ -25,9 +25,8 @@ export function TeamSettings() {
 		(q) =>
 			q
 				.from({ members: collections.members })
-				.leftJoin(
-					{ users: collections.users },
-					({ members, users }) => eq(members.userId, users.id),
+				.leftJoin({ users: collections.users }, ({ members, users }) =>
+					eq(members.userId, users.id),
 				)
 				.select(({ members, users }) => ({
 					memberId: members.id,
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
index 82857656395..dc84102977a 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/TasksView.tsx
@@ -1,8 +1,8 @@
-import { useState } from "react";
 import { ScrollArea } from "@superset/ui/scroll-area";
+import { useState } from "react";
 import { HiCheckCircle } from "react-icons/hi2";
 import { TasksTableView } from "./components/TasksTableView";
-import { TasksTopBar, type TabValue } from "./components/TasksTopBar";
+import { type TabValue, TasksTopBar } from "./components/TasksTopBar";
 import { useTasksTable } from "./hooks/useTasksTable";
 
 export function TasksView() {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index 1ef276d251d..ea90bdcdb6a 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -30,8 +30,22 @@ export function PriorityIcon({
 					xmlns="http://www.w3.org/2000/svg"
 					className={`${sizeClass} ${hoverClass} transition-all`}
 				>
-					<rect x="1.5" y="7.25" width="3" height="1.5" rx="0.5" opacity="0.9" />
-					<rect x="6.5" y="7.25" width="3" height="1.5" rx="0.5" opacity="0.9" />
+					<rect
+						x="1.5"
+						y="7.25"
+						width="3"
+						height="1.5"
+						rx="0.5"
+						opacity="0.9"
+					/>
+					<rect
+						x="6.5"
+						y="7.25"
+						width="3"
+						height="1.5"
+						rx="0.5"
+						opacity="0.9"
+					/>
 					<rect
 						x="11.5"
 						y="7.25"
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
index 328c2e4860a..7ea09b00327 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
@@ -1,2 +1,2 @@
-export { StatusIcon, type StatusType } from "./StatusIcon";
 export { STATUS_COLORS } from "./constants";
+export { StatusIcon, type StatusType } from "./StatusIcon";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
index 9cfe7759968..9dd979fd4f0 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
@@ -1,4 +1,3 @@
-import { type ReactNode, useMemo } from "react";
 import {
 	ContextMenu,
 	ContextMenuContent,
@@ -10,15 +9,20 @@ import {
 	ContextMenuTrigger,
 } from "@superset/ui/context-menu";
 import { useLiveQuery } from "@tanstack/react-db";
+import { type ReactNode, useMemo } from "react";
+import {
+	HiOutlineDocumentDuplicate,
+	HiOutlineTrash,
+	HiOutlineUserCircle,
+} from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import type { TaskWithStatus } from "../../hooks/useTasksTable";
-import { StatusMenuItems } from "../shared/StatusMenuItems";
-import { AssigneeMenuItems } from "../shared/AssigneeMenuItems";
-import { PriorityMenuItems } from "../shared/PriorityMenuItems";
-import { ActiveIcon } from "../icons/ActiveIcon";
 import { compareStatusesForDropdown } from "../../utils/taskSorting";
-import { HiOutlineDocumentDuplicate, HiOutlineTrash, HiOutlineUserCircle } from "react-icons/hi2";
+import { ActiveIcon } from "../icons/ActiveIcon";
 import { PriorityMenuIcon } from "../icons/PriorityMenuIcon";
+import { AssigneeMenuItems } from "../shared/AssigneeMenuItems";
+import { PriorityMenuItems } from "../shared/PriorityMenuItems";
+import { StatusMenuItems } from "../shared/StatusMenuItems";
 
 interface TaskContextMenuProps {
 	children: ReactNode;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
index d0f2fe7edf2..ced7fe69bd9 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
@@ -1,13 +1,16 @@
 import { flexRender, type Table } from "@tanstack/react-table";
-import { TaskContextMenu } from "../TaskContextMenu";
 import type { TaskWithStatus } from "../../hooks/useTasksTable";
+import { TaskContextMenu } from "../TaskContextMenu";
 
 interface TasksTableViewProps {
 	table: Table<TaskWithStatus>;
 	slugColumnWidth: string;
 }
 
-export function TasksTableView({ table, slugColumnWidth }: TasksTableViewProps) {
+export function TasksTableView({
+	table,
+	slugColumnWidth,
+}: TasksTableViewProps) {
 	return (
 		<div className="flex flex-col">
 			{table.getRowModel().rows.map((row) => {
@@ -25,7 +28,10 @@ export function TasksTableView({ table, slugColumnWidth }: TasksTableViewProps)
 							key={row.id}
 							className="sticky top-0 bg-background z-10 border-b border-border/50"
 						>
-							{flexRender(firstCell.column.columnDef.cell, firstCell.getContext())}
+							{flexRender(
+								firstCell.column.columnDef.cell,
+								firstCell.getContext(),
+							)}
 						</div>
 					);
 				}
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
index 6aad9233b23..653bbda9f50 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
@@ -1,8 +1,8 @@
-import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { Input } from "@superset/ui/input";
+import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { HiOutlineMagnifyingGlass } from "react-icons/hi2";
-import { AllIssuesIcon } from "../icons/AllIssuesIcon";
 import { ActiveIcon } from "../icons/ActiveIcon";
+import { AllIssuesIcon } from "../icons/AllIssuesIcon";
 import { BacklogIcon } from "../icons/BacklogIcon";
 
 export type TabValue = "all" | "active" | "backlog";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts
index 229d9f7e92b..0e91843fc6c 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/index.ts
@@ -1 +1 @@
-export { TasksTopBar, type TabValue } from "./TasksTopBar";
+export { type TabValue, TasksTopBar } from "./TasksTopBar";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index 7f56498822c..705163310c8 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -1,13 +1,13 @@
-import { useState, useMemo } from "react";
-import type { CellContext } from "@tanstack/react-table";
-import { useLiveQuery } from "@tanstack/react-db";
+import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
+import { useLiveQuery } from "@tanstack/react-db";
+import type { CellContext } from "@tanstack/react-table";
+import { useMemo, useState } from "react";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import type { TaskWithStatus } from "../../../hooks/useTasksTable";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
index 85c8238d794..835e7dced8a 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
@@ -1,6 +1,6 @@
-import type { CellContext } from "@tanstack/react-table";
 import type { SelectTask } from "@superset/db/schema";
 import { Badge } from "@superset/ui/badge";
+import type { CellContext } from "@tanstack/react-table";
 
 interface LabelsCellProps {
 	info: CellContext<SelectTask, string[] | null>;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
index 15fc6754b6b..50d21ef75fb 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -1,16 +1,16 @@
-import { useState } from "react";
-import type { CellContext } from "@tanstack/react-table";
-import { type TaskPriority } from "@superset/db/enums";
+import type { TaskPriority } from "@superset/db/enums";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
+import type { CellContext } from "@tanstack/react-table";
+import { useState } from "react";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { PriorityIcon } from "../../PriorityIcon";
-import { ALL_PRIORITIES } from "../../../utils/taskSorting";
 import type { TaskWithStatus } from "../../../hooks/useTasksTable";
+import { ALL_PRIORITIES } from "../../../utils/taskSorting";
+import { PriorityIcon } from "../../PriorityIcon";
 
 interface PriorityCellProps {
 	info: CellContext<TaskWithStatus, TaskPriority>;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
index ea9caffc447..86d7f80ca32 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -1,15 +1,15 @@
-import { useState, useMemo } from "react";
 import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
-import { useLiveQuery } from "@tanstack/react-db";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
+import { useLiveQuery } from "@tanstack/react-db";
+import { useMemo, useState } from "react";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { StatusIcon } from "../../StatusIcon";
 import { compareStatusesForDropdown } from "../../../utils/taskSorting";
+import { StatusIcon } from "../../StatusIcon";
 
 // Task with joined status data
 type TaskWithStatus = SelectTask & {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
index 60457eb8128..38757da9b80 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
@@ -5,6 +5,16 @@ interface ActiveIconProps {
 	className?: string;
 }
 
-export function ActiveIcon({ color = "currentColor", className }: ActiveIconProps) {
-	return <StatusIcon type="started" color={color} progress={50} className={className} />;
+export function ActiveIcon({
+	color = "currentColor",
+	className,
+}: ActiveIconProps) {
+	return (
+		<StatusIcon
+			type="started"
+			color={color}
+			progress={50}
+			className={className}
+		/>
+	);
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
index 9afaaf8a5eb..8df10be7463 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
@@ -5,11 +5,9 @@ interface AllIssuesIconProps {
 	className?: string;
 }
 
-export function AllIssuesIcon({ color = "currentColor", className }: AllIssuesIconProps) {
-	return (
-		<HiOutlineRectangleStack
-			className={className}
-			style={{ color }}
-		/>
-	);
+export function AllIssuesIcon({
+	color = "currentColor",
+	className,
+}: AllIssuesIconProps) {
+	return <HiOutlineRectangleStack className={className} style={{ color }} />;
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
index 55e47c7f260..702d7e85aef 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
@@ -5,6 +5,9 @@ interface AssigneeMenuIconProps {
 	className?: string;
 }
 
-export function AssigneeMenuIcon({ color = "currentColor", className }: AssigneeMenuIconProps) {
+export function AssigneeMenuIcon({
+	color = "currentColor",
+	className,
+}: AssigneeMenuIconProps) {
 	return <HiOutlineUserCircle className={className} style={{ color }} />;
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
index aa40564b4d6..3c3569ff3f5 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
@@ -5,6 +5,9 @@ interface BacklogIconProps {
 	className?: string;
 }
 
-export function BacklogIcon({ color = "currentColor", className }: BacklogIconProps) {
+export function BacklogIcon({
+	color = "currentColor",
+	className,
+}: BacklogIconProps) {
 	return <StatusIcon type="backlog" color={color} className={className} />;
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
index 95764a7ac95..cc31f3c46eb 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
@@ -1,6 +1,6 @@
-import type { ReactNode } from "react";
 import type { SelectUser } from "@superset/db/schema";
 import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
+import type { ReactNode } from "react";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 
 interface MenuItemProps {
@@ -56,11 +56,15 @@ export function AssigneeMenuItems({
 					>
 						<Avatar size="xs">
 							{user.image && <AvatarImage src={user.image} />}
-							<AvatarFallback size="xs">{getInitials(user.name)}</AvatarFallback>
+							<AvatarFallback size="xs">
+								{getInitials(user.name)}
+							</AvatarFallback>
 						</Avatar>
 						<div className="flex flex-col">
 							<span className="text-sm">{user.name}</span>
-							<span className="text-xs text-muted-foreground">{user.email}</span>
+							<span className="text-xs text-muted-foreground">
+								{user.email}
+							</span>
 						</div>
 						{isSelected && (
 							<span className="ml-auto text-xs text-muted-foreground">✓</span>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
index 6a3aa75eddf..99be2c1b64a 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
@@ -1,7 +1,7 @@
-import type { ReactNode } from "react";
 import type { TaskPriority } from "@superset/db/enums";
-import { PriorityIcon } from "../PriorityIcon";
+import type { ReactNode } from "react";
 import { ALL_PRIORITIES } from "../../utils/taskSorting";
+import { PriorityIcon } from "../PriorityIcon";
 
 interface MenuItemProps {
 	children: ReactNode;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
index 6d1227ac173..a1286e3c683 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
@@ -1,5 +1,5 @@
-import type { ReactNode } from "react";
 import type { SelectTaskStatus } from "@superset/db/schema";
+import type { ReactNode } from "react";
 import { StatusIcon } from "../StatusIcon";
 
 interface MenuItemProps {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
index 78731039efb..771abc08151 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/index.ts
@@ -1 +1 @@
-export { useTasksTable, type TaskWithStatus } from "./useTasksTable";
+export { type TaskWithStatus, useTasksTable } from "./useTasksTable";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 106f75b9d68..3c65b9c661f 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -1,33 +1,33 @@
-import { useMemo, useState, useEffect } from "react";
+import type {
+	SelectTask,
+	SelectTaskStatus,
+	SelectUser,
+} from "@superset/db/schema";
+import { Badge } from "@superset/ui/badge";
+import { eq, isNull } from "@tanstack/db";
+import { useLiveQuery } from "@tanstack/react-db";
 import {
-	type ExpandedState,
-	type Table,
 	type ColumnFiltersState,
 	createColumnHelper,
+	type ExpandedState,
 	getCoreRowModel,
 	getExpandedRowModel,
-	getGroupedRowModel,
 	getFilteredRowModel,
+	getGroupedRowModel,
+	type Table,
 	useReactTable,
 } from "@tanstack/react-table";
-import type {
-	SelectTask,
-	SelectTaskStatus,
-	SelectUser,
-} from "@superset/db/schema";
-import { useLiveQuery } from "@tanstack/react-db";
-import { eq, isNull } from "@tanstack/db";
 import { format } from "date-fns";
+import { useEffect, useMemo, useState } from "react";
 import { HiChevronRight } from "react-icons/hi2";
-import { Badge } from "@superset/ui/badge";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { StatusIcon } from "../../components/StatusIcon";
-import { StatusCell } from "../../components/cells/StatusCell";
-import { PriorityCell } from "../../components/cells/PriorityCell";
+import { useHybridSearch } from "renderer/hooks/useHybridSearch";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
-import { compareTasks } from "../../utils/taskSorting";
+import { PriorityCell } from "../../components/cells/PriorityCell";
+import { StatusCell } from "../../components/cells/StatusCell";
+import { StatusIcon } from "../../components/StatusIcon";
 import type { TabValue } from "../../components/TasksTopBar";
-import { useHybridSearch } from "renderer/hooks/useHybridSearch";
+import { compareTasks } from "../../utils/taskSorting";
 
 // Task with joined status and assignee data
 export type TaskWithStatus = SelectTask & {
@@ -59,13 +59,11 @@ export function useTasksTable({
 		(q) =>
 			q
 				.from({ tasks: collections.tasks })
-				.innerJoin(
-					{ status: collections.taskStatuses },
-					({ tasks, status }) => eq(tasks.statusId, status.id),
+				.innerJoin({ status: collections.taskStatuses }, ({ tasks, status }) =>
+					eq(tasks.statusId, status.id),
 				)
-				.leftJoin(
-					{ assignee: collections.users },
-					({ tasks, assignee }) => eq(tasks.assigneeId, assignee.id),
+				.leftJoin({ assignee: collections.users }, ({ tasks, assignee }) =>
+					eq(tasks.assigneeId, assignee.id),
 				)
 				.select(({ tasks, status, assignee }) => ({
 					...tasks,
diff --git a/apps/desktop/src/renderer/screens/main/index.tsx b/apps/desktop/src/renderer/screens/main/index.tsx
index 57118b4a7a7..3211f86e4f2 100644
--- a/apps/desktop/src/renderer/screens/main/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/index.tsx
@@ -31,8 +31,8 @@ import {
 import { dragDropManager } from "../../lib/dnd";
 import { AppFrame } from "./components/AppFrame";
 import { Background } from "./components/Background";
-import { ResizablePanel } from "./components/ResizablePanel";
 import { ComponentsShowcase } from "./components/ComponentsShowcase";
+import { ResizablePanel } from "./components/ResizablePanel";
 import { SettingsView } from "./components/SettingsView";
 import { StartView } from "./components/StartView";
 import { TasksView } from "./components/TasksView";
diff --git a/apps/desktop/src/renderer/stores/app-state.ts b/apps/desktop/src/renderer/stores/app-state.ts
index 7d3ab1a813a..d6d4ee1dfbb 100644
--- a/apps/desktop/src/renderer/stores/app-state.ts
+++ b/apps/desktop/src/renderer/stores/app-state.ts
@@ -1,7 +1,12 @@
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 
-export type AppView = "workspace" | "settings" | "tasks" | "workspaces-list" | "components";
+export type AppView =
+	| "workspace"
+	| "settings"
+	| "tasks"
+	| "workspaces-list"
+	| "components";
 export type SettingsSection =
 	| "account"
 	| "project"
diff --git a/packages/db/src/schema/relations.ts b/packages/db/src/schema/relations.ts
index acff0f3fb0f..2e9afd3210f 100644
--- a/packages/db/src/schema/relations.ts
+++ b/packages/db/src/schema/relations.ts
@@ -11,8 +11,8 @@ import {
 import {
 	integrationConnections,
 	repositories,
-	tasks,
 	taskStatuses,
+	tasks,
 } from "./schema";
 
 export const usersRelations = relations(users, ({ many }) => ({
diff --git a/packages/ui/src/atoms/Avatar/Avatar.tsx b/packages/ui/src/atoms/Avatar/Avatar.tsx
index f7c5f944daa..1ccc658d6f9 100644
--- a/packages/ui/src/atoms/Avatar/Avatar.tsx
+++ b/packages/ui/src/atoms/Avatar/Avatar.tsx
@@ -1,5 +1,5 @@
-import type React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
+import type React from "react";
 import {
 	Avatar as AvatarBase,
 	AvatarFallback as AvatarFallbackBase,
@@ -58,11 +58,7 @@ function AvatarImage(props: React.ComponentProps<typeof AvatarImageBase>) {
 	return <AvatarImageBase {...props} />;
 }
 
-function AvatarFallback({
-	className,
-	size,
-	...props
-}: AvatarFallbackProps) {
+function AvatarFallback({ className, size, ...props }: AvatarFallbackProps) {
 	return (
 		<AvatarFallbackBase
 			className={cn(avatarFallbackVariants({ size }), className)}
diff --git a/packages/ui/src/atoms/Avatar/index.ts b/packages/ui/src/atoms/Avatar/index.ts
index bc98b83e574..6362f5de585 100644
--- a/packages/ui/src/atoms/Avatar/index.ts
+++ b/packages/ui/src/atoms/Avatar/index.ts
@@ -1,2 +1,2 @@
-export { Avatar, AvatarImage, AvatarFallback } from "./Avatar";
-export type { AvatarProps, AvatarFallbackProps } from "./Avatar";
+export type { AvatarFallbackProps, AvatarProps } from "./Avatar";
+export { Avatar, AvatarFallback, AvatarImage } from "./Avatar";

From 6c5e4427184679dcc9c25015a10ac42a8a2c5347 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 12:41:11 -0800
Subject: [PATCH 11/18] WIP

---
 .../src/app/api/electric/[...path]/route.ts   |    3 -
 .../api/integrations/linear/callback/route.ts |    8 +-
 .../api/integrations/linear/connect/route.ts  |    3 +-
 .../linear/jobs/initial-sync/route.ts         |   14 +-
 .../jobs/initial-sync/syncWorkflowStates.ts   |   24 +-
 .../linear/jobs/sync-task/route.ts            |    4 +-
 .../api/integrations/linear/webhook/route.ts  |    6 +-
 .../components/ComponentsShowcase/index.tsx   |   14 +-
 .../components/PriorityIcon/PriorityIcon.tsx  |    2 +-
 .../components/StatusIcon/StatusIcon.tsx      |   24 +-
 .../cells/StatusCell/StatusCell.tsx           |    2 +-
 .../components/TasksView/utils/taskSorting.ts |   10 +-
 ...ganization_id_to_tasks_external_unique.sql |    2 +
 packages/db/drizzle/meta/0009_snapshot.json   | 1660 +++++++++++++++++
 packages/db/drizzle/meta/_journal.json        |    7 +
 packages/db/src/schema/schema.ts              |    1 +
 16 files changed, 1699 insertions(+), 85 deletions(-)
 create mode 100644 packages/db/drizzle/0009_add_organization_id_to_tasks_external_unique.sql
 create mode 100644 packages/db/drizzle/meta/0009_snapshot.json

diff --git a/apps/api/src/app/api/electric/[...path]/route.ts b/apps/api/src/app/api/electric/[...path]/route.ts
index b49f9c7bd3c..847e3ca019a 100644
--- a/apps/api/src/app/api/electric/[...path]/route.ts
+++ b/apps/api/src/app/api/electric/[...path]/route.ts
@@ -44,9 +44,6 @@ export async function GET(request: Request): Promise<Response> {
 
 	let response = await fetch(originUrl.toString());
 
-	// When proxying long-polling requests, content-encoding & content-length are added
-	// erroneously (saying the body is gzipped when it's not) so we'll just remove
-	// them to avoid content decoding errors in the browser.
 	if (response.headers.get("content-encoding")) {
 		const headers = new Headers(response.headers);
 		headers.delete("content-encoding");
diff --git a/apps/api/src/app/api/integrations/linear/callback/route.ts b/apps/api/src/app/api/integrations/linear/callback/route.ts
index 566f3c5ae75..7eebb8f2de6 100644
--- a/apps/api/src/app/api/integrations/linear/callback/route.ts
+++ b/apps/api/src/app/api/integrations/linear/callback/route.ts
@@ -49,9 +49,7 @@ export async function GET(request: Request) {
 			grant_type: "authorization_code",
 			client_id: env.LINEAR_CLIENT_ID,
 			client_secret: env.LINEAR_CLIENT_SECRET,
-			// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
-			redirect_uri:
-				"https://b02ef5887783.ngrok-free.app/api/integrations/linear/callback",
+			redirect_uri: `${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/callback`,
 			code,
 		}),
 	});
@@ -101,11 +99,9 @@ export async function GET(request: Request) {
 			},
 		});
 
-	// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
-	const qstashBaseUrl = "https://b02ef5887783.ngrok-free.app";
 	try {
 		await qstash.publishJSON({
-			url: `${qstashBaseUrl}/api/integrations/linear/jobs/initial-sync`,
+			url: `${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/jobs/initial-sync`,
 			body: { organizationId, creatorUserId: userId },
 			retries: 3,
 		});
diff --git a/apps/api/src/app/api/integrations/linear/connect/route.ts b/apps/api/src/app/api/integrations/linear/connect/route.ts
index 59f3e60431d..6a8d123bbf8 100644
--- a/apps/api/src/app/api/integrations/linear/connect/route.ts
+++ b/apps/api/src/app/api/integrations/linear/connect/route.ts
@@ -45,8 +45,7 @@ export async function GET(request: Request) {
 	linearAuthUrl.searchParams.set("client_id", env.LINEAR_CLIENT_ID);
 	linearAuthUrl.searchParams.set(
 		"redirect_uri",
-		// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
-		"https://b02ef5887783.ngrok-free.app/api/integrations/linear/callback",
+		`${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/callback`,
 	);
 	linearAuthUrl.searchParams.set("response_type", "code");
 	linearAuthUrl.searchParams.set("scope", "read,write,issues:create");
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
index f72f35c9381..af9857ea741 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
@@ -34,12 +34,10 @@ export async function POST(request: Request) {
 		return Response.json({ error: "Missing signature" }, { status: 401 });
 	}
 
-	// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
-	const qstashBaseUrl = "https://b02ef5887783.ngrok-free.app";
 	const isValid = await receiver.verify({
 		body,
 		signature,
-		url: `${qstashBaseUrl}/api/integrations/linear/jobs/initial-sync`,
+		url: `${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/jobs/initial-sync`,
 	});
 
 	if (!isValid) {
@@ -75,13 +73,9 @@ async function performInitialSync(
 	organizationId: string,
 	creatorUserId: string,
 ) {
-	// STEP 1: Sync workflow states FIRST
-	console.log("[initial-sync] Syncing workflow states");
 	await syncWorkflowStates({ client, organizationId });
 
-	// STEP 2: Load all statuses into a lookup map (avoid N+1)
-	console.log("[initial-sync] Loading status lookup map");
-	const statusByExternalId = new Map<string, string>(); // externalId -> statusId
+	const statusByExternalId = new Map<string, string>();
 	const statuses = await db.query.taskStatuses.findMany({
 		where: and(
 			eq(taskStatuses.organizationId, organizationId),
@@ -94,8 +88,6 @@ async function performInitialSync(
 		}
 	}
 
-	// STEP 3: Sync issues
-	console.log("[initial-sync] Syncing issues");
 	const issues = await fetchAllIssues(client);
 
 	if (issues.length === 0) {
@@ -134,7 +126,7 @@ async function performInitialSync(
 			.insert(tasks)
 			.values(batch)
 			.onConflictDoUpdate({
-				target: [tasks.externalProvider, tasks.externalId],
+				target: [tasks.organizationId, tasks.externalProvider, tasks.externalId],
 				set: {
 					...buildConflictUpdateColumns(tasks, [
 						"slug",
diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
index 46dd41427f4..f82b46bb35f 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/syncWorkflowStates.ts
@@ -4,16 +4,6 @@ import { db } from "@superset/db/client";
 import { taskStatuses } from "@superset/db/schema";
 import { calculateProgressForStates } from "./utils";
 
-/**
- * Normalizes Linear's state type to our preferred US spelling
- */
-function normalizeStateType(linearType: string): string {
-	if (linearType === "canceled") {
-		return "cancelled";
-	}
-	return linearType;
-}
-
 export async function syncWorkflowStates({
 	client,
 	organizationId,
@@ -21,16 +11,11 @@ export async function syncWorkflowStates({
 	client: LinearClient;
 	organizationId: string;
 }): Promise<void> {
-	console.log("[syncWorkflowStates] Fetching teams");
-
 	const teams = await client.teams();
 
 	for (const team of teams.nodes) {
-		console.log(`[syncWorkflowStates] Processing team: ${team.name}`);
-
 		const states = await team.states();
 
-		// Group by type for progress calculation
 		const statesByType = new Map<string, typeof states.nodes>();
 		for (const state of states.nodes) {
 			if (!statesByType.has(state.type)) {
@@ -39,18 +24,16 @@ export async function syncWorkflowStates({
 			statesByType.get(state.type)?.push(state);
 		}
 
-		// Calculate progress for "started" type
 		const startedStates = statesByType.get("started") || [];
 		const progressMap = calculateProgressForStates(
 			startedStates.map((s) => ({ name: s.name, position: s.position })),
 		);
 
-		// Prepare insert values
 		const values = states.nodes.map((state) => ({
 			organizationId,
 			name: state.name,
 			color: state.color,
-			type: normalizeStateType(state.type),
+			type: state.type,
 			position: state.position,
 			progressPercent:
 				state.type === "started" ? (progressMap.get(state.name) ?? null) : null,
@@ -58,7 +41,6 @@ export async function syncWorkflowStates({
 			externalId: state.id,
 		}));
 
-		// Upsert workflow states
 		if (values.length > 0) {
 			await db
 				.insert(taskStatuses)
@@ -81,9 +63,5 @@ export async function syncWorkflowStates({
 					},
 				});
 		}
-
-		console.log(
-			`[syncWorkflowStates] Synced ${values.length} states for team ${team.name}`,
-		);
 	}
 }
diff --git a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
index f01259bb34c..8750b411624 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
@@ -177,12 +177,10 @@ export async function POST(request: Request) {
 		return Response.json({ error: "Missing signature" }, { status: 401 });
 	}
 
-	// TODO: Revert to env.NEXT_PUBLIC_API_URL after testing
-	const qstashBaseUrl = "https://b02ef5887783.ngrok-free.app";
 	const isValid = await receiver.verify({
 		body,
 		signature,
-		url: `${qstashBaseUrl}/api/integrations/linear/jobs/sync-task`,
+		url: `${env.NEXT_PUBLIC_API_URL}/api/integrations/linear/jobs/sync-task`,
 	});
 
 	if (!isValid) {
diff --git a/apps/api/src/app/api/integrations/linear/webhook/route.ts b/apps/api/src/app/api/integrations/linear/webhook/route.ts
index f3a25da001a..30fed9f54c2 100644
--- a/apps/api/src/app/api/integrations/linear/webhook/route.ts
+++ b/apps/api/src/app/api/integrations/linear/webhook/route.ts
@@ -103,7 +103,9 @@ async function processIssueEvent(
 		});
 
 		if (!taskStatus) {
-			// Status doesn't exist yet - need to sync workflow states
+			// TODO(SUPER-237): Handle new workflow states in webhooks by triggering syncWorkflowStates
+			// Currently webhooks silently fail when Linear has new statuses that aren't synced yet.
+			// Should either: (1) trigger workflow state sync and retry, (2) queue for retry, or (3) keep periodic sync only
 			console.warn(
 				`[webhook] Status not found for state ${issue.state.id}, skipping update`,
 			);
@@ -146,7 +148,7 @@ async function processIssueEvent(
 				createdAt: new Date(issue.createdAt),
 			})
 			.onConflictDoUpdate({
-				target: [tasks.externalProvider, tasks.externalId],
+				target: [tasks.organizationId, tasks.externalProvider, tasks.externalId],
 				set: { ...taskData, syncError: null },
 			});
 	} else if (payload.action === "remove") {
diff --git a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
index cf8decfad25..2578eeee5c1 100644
--- a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
@@ -15,8 +15,8 @@ const STATUS_VARIANTS: Array<{
 	{ type: "started", color: "#F59E0B", label: "In Progress (Orange)" },
 	{ type: "started", color: "#10B981", label: "In Review (Green)" },
 	{ type: "completed", color: "#8B5CF6", label: "Done (Purple)" },
-	{ type: "cancelled", color: "#6B7280", label: "Canceled (Gray)" },
-	{ type: "cancelled", color: "#EF4444", label: "Duplicate (Red)" },
+	{ type: "canceled", color: "#6B7280", label: "Canceled (Gray)" },
+	{ type: "canceled", color: "#EF4444", label: "Duplicate (Red)" },
 ];
 
 export function ComponentsShowcase() {
@@ -113,11 +113,11 @@ export function ComponentsShowcase() {
 										</p>
 									</div>
 
-									{/* Cancelled */}
+									{/* Canceled */}
 									<div className="p-4 rounded-lg border border-border bg-card">
 										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon type="cancelled" color="#6B7280" />
-											<span className="font-medium">Cancelled Type</span>
+											<StatusIcon type="canceled" color="#6B7280" />
+											<span className="font-medium">Canceled Type</span>
 										</div>
 										<p className="text-sm text-muted-foreground ml-9">
 											Filled circle with hollow X icon
@@ -172,12 +172,12 @@ export function ComponentsShowcase() {
 									</div>
 									<div className="flex flex-col items-center gap-2">
 										<StatusIcon
-											type="cancelled"
+											type="canceled"
 											color="#6B7280"
 											showHover={true}
 										/>
 										<span className="text-xs text-muted-foreground">
-											Cancelled
+											Canceled
 										</span>
 									</div>
 								</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index ea90bdcdb6a..acb1ce4acfc 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -60,7 +60,7 @@ export function PriorityIcon({
 	}
 
 	// Urgent: Filled square with exclamation mark
-	// Orange for backlog/todo/in-progress, gray for completed/cancelled
+	// Orange for backlog/todo/in-progress, gray for completed/canceled
 	if (priority === "urgent") {
 		const isActive =
 			statusType === "started" ||
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
index acddc3bc070..0ceb43fb4f0 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
@@ -5,7 +5,7 @@ export type StatusType =
 	| "unstarted"
 	| "started"
 	| "completed"
-	| "cancelled";
+	| "canceled";
 
 interface StatusIconProps {
 	type: StatusType;
@@ -87,7 +87,6 @@ export function StatusIcon({
 					fill="none"
 					xmlns="http://www.w3.org/2000/svg"
 				>
-					{/* Outer circle - full */}
 					<circle
 						cx="7"
 						cy="7"
@@ -97,7 +96,6 @@ export function StatusIcon({
 						strokeDasharray="3.14 0"
 						strokeDashoffset="-0.7"
 					/>
-					{/* Center circle - radial progress, clockwise from top */}
 					<circle
 						cx="7"
 						cy="7"
@@ -141,11 +139,7 @@ export function StatusIcon({
 		);
 	}
 
-	if (type === "cancelled") {
-		// Middle ring is 50% filled (matches Linear)
-		const middleRadius = 3;
-		const middleCircumference = 2 * Math.PI * middleRadius;
-
+	if (type === "canceled") {
 		return (
 			<div className={containerClasses}>
 				<svg
@@ -154,7 +148,6 @@ export function StatusIcon({
 					fill="none"
 					xmlns="http://www.w3.org/2000/svg"
 				>
-					{/* Outer circle - full */}
 					<circle
 						cx="7"
 						cy="7"
@@ -164,18 +157,7 @@ export function StatusIcon({
 						strokeDasharray="3.14 0"
 						strokeDashoffset="-0.7"
 					/>
-					{/* Middle ring - 50% filled */}
-					<circle
-						cx="7"
-						cy="7"
-						r={middleRadius}
-						stroke={color}
-						strokeWidth="6"
-						strokeDasharray={`${middleCircumference} ${middleCircumference * 2}`}
-						strokeDashoffset="0"
-						transform="rotate(-90 7 7)"
-					/>
-					{/* X icon */}
+
 					<path
 						className="fill-background"
 						stroke="none"
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
index 86d7f80ca32..f8270e7f808 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -33,7 +33,7 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const statuses = useMemo(() => allStatuses || [], [allStatuses]);
 	const currentStatus = taskWithStatus.status;
 
-	// Sort statuses by workflow order (backlog → unstarted → started → completed → cancelled)
+	// Sort statuses by workflow order (backlog → unstarted → started → completed → canceled)
 	const sortedStatuses = useMemo(() => {
 		return statuses.sort(compareStatusesForDropdown);
 	}, [statuses]);
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts
index 9d97fa44b77..10ccd99de0e 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts
@@ -1,21 +1,21 @@
 import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
 
-// Status type ordering for table groups (Linear style: in progress → todo → backlog → done → cancelled)
+// Status type ordering for table groups (Linear style: in progress → todo → backlog → done → canceled)
 const STATUS_TYPE_ORDER: Record<string, number> = {
 	started: 0,
 	unstarted: 1,
 	backlog: 2,
 	completed: 3,
-	cancelled: 4,
+	canceled: 4,
 };
 
-// Status type ordering for dropdowns (workflow order: backlog → todo → in progress → done → cancelled)
+// Status type ordering for dropdowns (workflow order: backlog → todo → in progress → done → canceled)
 const STATUS_TYPE_DROPDOWN_ORDER: Record<string, number> = {
 	backlog: 0,
 	unstarted: 1,
 	started: 2,
 	completed: 3,
-	cancelled: 4,
+	canceled: 4,
 };
 
 // Priority ordering for task sorting (urgent at top, none at bottom)
@@ -96,7 +96,7 @@ export function compareStatusesForDropdown(
 	a: SelectTaskStatus,
 	b: SelectTaskStatus,
 ): number {
-	// 1. Sort by status type in workflow order (backlog → unstarted → started → completed → cancelled)
+	// 1. Sort by status type in workflow order (backlog → unstarted → started → completed → canceled)
 	const typeOrderA = getStatusTypeDropdownOrder(a.type);
 	const typeOrderB = getStatusTypeDropdownOrder(b.type);
 	if (typeOrderA !== typeOrderB) {
diff --git a/packages/db/drizzle/0009_add_organization_id_to_tasks_external_unique.sql b/packages/db/drizzle/0009_add_organization_id_to_tasks_external_unique.sql
new file mode 100644
index 00000000000..59183c82a0f
--- /dev/null
+++ b/packages/db/drizzle/0009_add_organization_id_to_tasks_external_unique.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "tasks" DROP CONSTRAINT "tasks_external_unique";--> statement-breakpoint
+ALTER TABLE "tasks" ADD CONSTRAINT "tasks_external_unique" UNIQUE("organization_id","external_provider","external_id");
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/0009_snapshot.json b/packages/db/drizzle/meta/0009_snapshot.json
new file mode 100644
index 00000000000..7ec8bc346a4
--- /dev/null
+++ b/packages/db/drizzle/meta/0009_snapshot.json
@@ -0,0 +1,1660 @@
+{
+  "id": "23a2e181-a5e1-4c5b-a36a-09ec4e0b7a28",
+  "prevId": "a303ef94-785d-41b4-ae28-defe0ec99e61",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "auth.accounts": {
+      "name": "accounts",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "accounts_user_id_idx": {
+          "name": "accounts_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "accounts_user_id_users_id_fk": {
+          "name": "accounts_user_id_users_id_fk",
+          "tableFrom": "accounts",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.invitations": {
+      "name": "invitations",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "invitations_organization_id_idx": {
+          "name": "invitations_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitations_email_idx": {
+          "name": "invitations_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitations_organization_id_organizations_id_fk": {
+          "name": "invitations_organization_id_organizations_id_fk",
+          "tableFrom": "invitations",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitations_inviter_id_users_id_fk": {
+          "name": "invitations_inviter_id_users_id_fk",
+          "tableFrom": "invitations",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "inviter_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.members": {
+      "name": "members",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "members_organization_id_idx": {
+          "name": "members_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "members_user_id_idx": {
+          "name": "members_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "members_organization_id_organizations_id_fk": {
+          "name": "members_organization_id_organizations_id_fk",
+          "tableFrom": "members",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "members_user_id_users_id_fk": {
+          "name": "members_user_id_users_id_fk",
+          "tableFrom": "members",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.organizations": {
+      "name": "organizations",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "organizations_slug_idx": {
+          "name": "organizations_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "organizations_slug_unique": {
+          "name": "organizations_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.sessions": {
+      "name": "sessions",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sessions_user_id_idx": {
+          "name": "sessions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sessions_user_id_users_id_fk": {
+          "name": "sessions_user_id_users_id_fk",
+          "tableFrom": "sessions",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "sessions_token_unique": {
+          "name": "sessions_token_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "token"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.users": {
+      "name": "users",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.verifications": {
+      "name": "verifications",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "verifications_identifier_idx": {
+          "name": "verifications_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "ingest.webhook_events": {
+      "name": "webhook_events",
+      "schema": "ingest",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_id": {
+          "name": "event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "retry_count": {
+          "name": "retry_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "webhook_events_provider_status_idx": {
+          "name": "webhook_events_provider_status_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_events_provider_event_id_idx": {
+          "name": "webhook_events_provider_event_id_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "event_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_events_received_at_idx": {
+          "name": "webhook_events_received_at_idx",
+          "columns": [
+            {
+              "expression": "received_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.integration_connections": {
+      "name": "integration_connections",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connected_by_user_id": {
+          "name": "connected_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_expires_at": {
+          "name": "token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_org_id": {
+          "name": "external_org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_org_name": {
+          "name": "external_org_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "integration_connections_org_idx": {
+          "name": "integration_connections_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "integration_connections_organization_id_organizations_id_fk": {
+          "name": "integration_connections_organization_id_organizations_id_fk",
+          "tableFrom": "integration_connections",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "integration_connections_connected_by_user_id_users_id_fk": {
+          "name": "integration_connections_connected_by_user_id_users_id_fk",
+          "tableFrom": "integration_connections",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "connected_by_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "integration_connections_unique": {
+          "name": "integration_connections_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "provider"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.repositories": {
+      "name": "repositories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_url": {
+          "name": "repo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_owner": {
+          "name": "repo_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_name": {
+          "name": "repo_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'main'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "repositories_organization_id_idx": {
+          "name": "repositories_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "repositories_slug_idx": {
+          "name": "repositories_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "repositories_organization_id_organizations_id_fk": {
+          "name": "repositories_organization_id_organizations_id_fk",
+          "tableFrom": "repositories",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "repositories_org_slug_unique": {
+          "name": "repositories_org_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.task_statuses": {
+      "name": "task_statuses",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "progress_percent": {
+          "name": "progress_percent",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "task_statuses_organization_id_idx": {
+          "name": "task_statuses_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "task_statuses_type_idx": {
+          "name": "task_statuses_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "task_statuses_organization_id_organizations_id_fk": {
+          "name": "task_statuses_organization_id_organizations_id_fk",
+          "tableFrom": "task_statuses",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "task_statuses_org_external_unique": {
+          "name": "task_statuses_org_external_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "external_provider",
+            "external_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.tasks": {
+      "name": "tasks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_id": {
+          "name": "status_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "priority": {
+          "name": "priority",
+          "type": "task_priority",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assignee_id": {
+          "name": "assignee_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimate": {
+          "name": "estimate",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "due_date": {
+          "name": "due_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pr_url": {
+          "name": "pr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_key": {
+          "name": "external_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_url": {
+          "name": "external_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sync_error": {
+          "name": "sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "tasks_slug_idx": {
+          "name": "tasks_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_organization_id_idx": {
+          "name": "tasks_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_repository_id_idx": {
+          "name": "tasks_repository_id_idx",
+          "columns": [
+            {
+              "expression": "repository_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_assignee_id_idx": {
+          "name": "tasks_assignee_id_idx",
+          "columns": [
+            {
+              "expression": "assignee_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_creator_id_idx": {
+          "name": "tasks_creator_id_idx",
+          "columns": [
+            {
+              "expression": "creator_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_status_id_idx": {
+          "name": "tasks_status_id_idx",
+          "columns": [
+            {
+              "expression": "status_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_created_at_idx": {
+          "name": "tasks_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_external_provider_idx": {
+          "name": "tasks_external_provider_idx",
+          "columns": [
+            {
+              "expression": "external_provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "tasks_status_id_task_statuses_id_fk": {
+          "name": "tasks_status_id_task_statuses_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "task_statuses",
+          "columnsFrom": [
+            "status_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "tasks_organization_id_organizations_id_fk": {
+          "name": "tasks_organization_id_organizations_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_repository_id_repositories_id_fk": {
+          "name": "tasks_repository_id_repositories_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "repositories",
+          "columnsFrom": [
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_assignee_id_users_id_fk": {
+          "name": "tasks_assignee_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "assignee_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "tasks_creator_id_users_id_fk": {
+          "name": "tasks_creator_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "creator_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "tasks_slug_unique": {
+          "name": "tasks_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        },
+        "tasks_external_unique": {
+          "name": "tasks_external_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "external_provider",
+            "external_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.integration_provider": {
+      "name": "integration_provider",
+      "schema": "public",
+      "values": [
+        "linear"
+      ]
+    },
+    "public.task_priority": {
+      "name": "task_priority",
+      "schema": "public",
+      "values": [
+        "urgent",
+        "high",
+        "medium",
+        "low",
+        "none"
+      ]
+    },
+    "public.task_status": {
+      "name": "task_status",
+      "schema": "public",
+      "values": [
+        "backlog",
+        "todo",
+        "planning",
+        "working",
+        "needs-feedback",
+        "ready-to-merge",
+        "completed",
+        "canceled"
+      ]
+    }
+  },
+  "schemas": {
+    "auth": "auth",
+    "ingest": "ingest"
+  },
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index 17fb696a222..f2cad0413a9 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -64,6 +64,13 @@
       "when": 1768087327155,
       "tag": "0008_add_full_task_status_table",
       "breakpoints": true
+    },
+    {
+      "idx": 9,
+      "version": "7",
+      "when": 1768250000970,
+      "tag": "0009_add_organization_id_to_tasks_external_unique",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/schema/schema.ts b/packages/db/src/schema/schema.ts
index b4248566d1e..475a63c4104 100644
--- a/packages/db/src/schema/schema.ts
+++ b/packages/db/src/schema/schema.ts
@@ -163,6 +163,7 @@ export const tasks = pgTable(
 		index("tasks_created_at_idx").on(table.createdAt),
 		index("tasks_external_provider_idx").on(table.externalProvider),
 		unique("tasks_external_unique").on(
+			table.organizationId,
 			table.externalProvider,
 			table.externalId,
 		),

From dcaa7b7d9979c3f6cf10241567fcf6d3b367da59 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 12:50:03 -0800
Subject: [PATCH 12/18] WIP

---
 .../api/integrations/linear/jobs/initial-sync/route.ts    | 6 +++++-
 apps/api/src/app/api/integrations/linear/webhook/route.ts | 6 +++++-
 .../screens/main/components/ComponentsShowcase/index.tsx  | 4 ++--
 .../TasksView/components/PriorityIcon/PriorityIcon.tsx    | 6 ++++++
 .../TasksView/components/StatusIcon/StatusIcon.tsx        | 7 +++++++
 .../components/cells/AssigneeCell/AssigneeCell.tsx        | 2 +-
 .../components/cells/PriorityCell/PriorityCell.tsx        | 1 +
 .../TasksView/components/cells/StatusCell/StatusCell.tsx  | 8 ++++----
 .../TasksView/components/shared/StatusMenuItems.tsx       | 4 ++--
 .../TasksView/hooks/useTasksTable/useTasksTable.tsx       | 5 +++--
 10 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
index af9857ea741..f99ed95025c 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/route.ts
@@ -126,7 +126,11 @@ async function performInitialSync(
 			.insert(tasks)
 			.values(batch)
 			.onConflictDoUpdate({
-				target: [tasks.organizationId, tasks.externalProvider, tasks.externalId],
+				target: [
+					tasks.organizationId,
+					tasks.externalProvider,
+					tasks.externalId,
+				],
 				set: {
 					...buildConflictUpdateColumns(tasks, [
 						"slug",
diff --git a/apps/api/src/app/api/integrations/linear/webhook/route.ts b/apps/api/src/app/api/integrations/linear/webhook/route.ts
index 30fed9f54c2..e6f85272247 100644
--- a/apps/api/src/app/api/integrations/linear/webhook/route.ts
+++ b/apps/api/src/app/api/integrations/linear/webhook/route.ts
@@ -148,7 +148,11 @@ async function processIssueEvent(
 				createdAt: new Date(issue.createdAt),
 			})
 			.onConflictDoUpdate({
-				target: [tasks.organizationId, tasks.externalProvider, tasks.externalId],
+				target: [
+					tasks.organizationId,
+					tasks.externalProvider,
+					tasks.externalId,
+				],
 				set: { ...taskData, syncError: null },
 			});
 	} else if (payload.action === "remove") {
diff --git a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
index 2578eeee5c1..76c391923cb 100644
--- a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
@@ -48,9 +48,9 @@ export function ComponentsShowcase() {
 							<div>
 								<h3 className="text-sm font-medium mb-3">All Variants</h3>
 								<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
-									{STATUS_VARIANTS.map((variant, index) => (
+									{STATUS_VARIANTS.map((variant) => (
 										<div
-											key={index}
+											key={`${variant.type}-${variant.color}`}
 											className="flex items-center gap-3 p-4 rounded-lg border border-border bg-card"
 										>
 											<StatusIcon type={variant.type} color={variant.color} />
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index acb1ce4acfc..868bffd5302 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -1,3 +1,4 @@
+// biome-ignore lint/a11y/noSvgWithoutTitle: These are decorative icons within labeled interactive elements
 import type { TaskPriority } from "@superset/db/enums";
 import colors from "tailwindcss/colors";
 
@@ -25,6 +26,7 @@ export function PriorityIcon({
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 16 16"
 					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
@@ -72,6 +74,7 @@ export function PriorityIcon({
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 16 16"
 					fill={fillColor}
 					xmlns="http://www.w3.org/2000/svg"
@@ -88,6 +91,7 @@ export function PriorityIcon({
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 16 16"
 					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
@@ -106,6 +110,7 @@ export function PriorityIcon({
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 16 16"
 					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
@@ -124,6 +129,7 @@ export function PriorityIcon({
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 16 16"
 					fill={defaultColor}
 					xmlns="http://www.w3.org/2000/svg"
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
index 0ceb43fb4f0..b9c30cecf18 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
@@ -1,3 +1,4 @@
+// biome-ignore lint/a11y/noSvgWithoutTitle: These are decorative icons within labeled interactive elements
 import { cn } from "@superset/ui/utils";
 
 export type StatusType =
@@ -35,6 +36,7 @@ export function StatusIcon({
 		return (
 			<div className={containerClasses}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 14 14"
 					className={sizeClass}
 					fill="none"
@@ -58,6 +60,7 @@ export function StatusIcon({
 		return (
 			<div className={containerClasses}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 14 14"
 					className={sizeClass}
 					fill="none"
@@ -82,6 +85,7 @@ export function StatusIcon({
 		return (
 			<div className={containerClasses}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 14 14"
 					className={sizeClass}
 					fill="none"
@@ -114,6 +118,7 @@ export function StatusIcon({
 		return (
 			<div className={containerClasses}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 14 14"
 					className={sizeClass}
 					fill="none"
@@ -143,6 +148,7 @@ export function StatusIcon({
 		return (
 			<div className={containerClasses}>
 				<svg
+					aria-hidden="true"
 					viewBox="0 0 14 14"
 					className={sizeClass}
 					fill="none"
@@ -171,6 +177,7 @@ export function StatusIcon({
 	return (
 		<div className={containerClasses}>
 			<svg
+				aria-hidden="true"
 				viewBox="0 0 14 14"
 				className={sizeClass}
 				fill="none"
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index 705163310c8..44c5c0adbbc 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -58,7 +58,7 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 	return (
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
-				<button className="cursor-pointer">
+				<button type="button" className="cursor-pointer">
 					{currentAssignee ? (
 						<Avatar size="xs">
 							{currentAssignee.image && (
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
index 50d21ef75fb..4b23c9f98d8 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
@@ -52,6 +52,7 @@ export function PriorityCell({ info }: PriorityCellProps) {
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
 				<button
+					type="button"
 					className="group p-0 cursor-pointer border-0 transition-all"
 					title={PRIORITY_LABELS[currentPriority]}
 				>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
index f8270e7f808..5adf6f8aeec 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
@@ -9,7 +9,7 @@ import { useLiveQuery } from "@tanstack/react-db";
 import { useMemo, useState } from "react";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { compareStatusesForDropdown } from "../../../utils/taskSorting";
-import { StatusIcon } from "../../StatusIcon";
+import { StatusIcon, type StatusType } from "../../StatusIcon";
 
 // Task with joined status data
 type TaskWithStatus = SelectTask & {
@@ -57,9 +57,9 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	return (
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
-				<button className="p-0 cursor-pointer border-0">
+				<button type="button" className="p-0 cursor-pointer border-0">
 					<StatusIcon
-						type={currentStatus.type as any}
+						type={currentStatus.type as StatusType}
 						color={currentStatus.color}
 						progress={currentStatus.progressPercent ?? undefined}
 						showHover={true}
@@ -75,7 +75,7 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 							className="flex items-center gap-3 px-3 py-2"
 						>
 							<StatusIcon
-								type={status.type as any}
+								type={status.type as StatusType}
 								color={status.color}
 								progress={status.progressPercent ?? undefined}
 							/>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
index a1286e3c683..0dc280388c1 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
@@ -1,6 +1,6 @@
 import type { SelectTaskStatus } from "@superset/db/schema";
 import type { ReactNode } from "react";
-import { StatusIcon } from "../StatusIcon";
+import { StatusIcon, type StatusType } from "../StatusIcon";
 
 interface MenuItemProps {
 	children: ReactNode;
@@ -32,7 +32,7 @@ export function StatusMenuItems({
 						className="flex items-center gap-3 px-3 py-2"
 					>
 						<StatusIcon
-							type={status.type as any}
+							type={status.type as StatusType}
 							color={status.color}
 							progress={status.progressPercent ?? undefined}
 						/>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 3c65b9c661f..d733dd5c325 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -25,7 +25,7 @@ import { useHybridSearch } from "renderer/hooks/useHybridSearch";
 import { AssigneeCell } from "../../components/cells/AssigneeCell";
 import { PriorityCell } from "../../components/cells/PriorityCell";
 import { StatusCell } from "../../components/cells/StatusCell";
-import { StatusIcon } from "../../components/StatusIcon";
+import { StatusIcon, type StatusType } from "../../components/StatusIcon";
 import type { TabValue } from "../../components/TasksTopBar";
 import { compareTasks } from "../../utils/taskSorting";
 
@@ -151,6 +151,7 @@ export function useTasksTable({
 								}}
 							>
 								<button
+									type="button"
 									className="group w-full justify-start px-4 py-2 h-auto relative rounded-none bg-transparent flex items-center cursor-pointer border-0"
 									onClick={row.getToggleExpandedHandler()}
 								>
@@ -161,7 +162,7 @@ export function useTasksTable({
 									/>
 									<div className="flex items-center gap-2 pl-4">
 										<StatusIcon
-											type={status.type as any}
+											type={status.type as StatusType}
 											color={status.color}
 											progress={status.progressPercent ?? undefined}
 										/>

From 3574dd619e812a0f4719822b47508810e1c00f1b Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 12:59:03 -0800
Subject: [PATCH 13/18] WIP

---
 .../linear/jobs/initial-sync/utils.ts         |   2 +-
 .../linear/jobs/sync-task/route.ts            |   1 -
 .../api/integrations/linear/webhook/route.ts  |  18 +-
 .../components/ComponentsShowcase/index.tsx   | 230 ------------------
 .../WorkspaceSidebarHeader.tsx                |  38 ---
 .../src/renderer/screens/main/index.tsx       |   4 -
 apps/desktop/src/renderer/stores/app-state.ts |  23 +-
 7 files changed, 14 insertions(+), 302 deletions(-)
 delete mode 100644 apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx

diff --git a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
index 5e32465d51e..f14271d85bc 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/initial-sync/utils.ts
@@ -166,7 +166,7 @@ export function mapIssueToTask(
 		slug: issue.identifier,
 		title: issue.title,
 		description: issue.description,
-		statusId, // FK to task_statuses
+		statusId,
 		priority: mapPriorityFromLinear(issue.priority),
 		assigneeId,
 		estimate: issue.estimate,
diff --git a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
index 8750b411624..a06e0e90d69 100644
--- a/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
+++ b/apps/api/src/app/api/integrations/linear/jobs/sync-task/route.ts
@@ -73,7 +73,6 @@ async function syncTaskToLinear(
 	}
 
 	try {
-		// Look up the status from task_statuses table
 		const taskStatus = await db.query.taskStatuses.findFirst({
 			where: eq(taskStatuses.id, task.statusId),
 		});
diff --git a/apps/api/src/app/api/integrations/linear/webhook/route.ts b/apps/api/src/app/api/integrations/linear/webhook/route.ts
index e6f85272247..cae9af0a514 100644
--- a/apps/api/src/app/api/integrations/linear/webhook/route.ts
+++ b/apps/api/src/app/api/integrations/linear/webhook/route.ts
@@ -59,8 +59,10 @@ export async function POST(request: Request) {
 	}
 
 	try {
+		let status: "processed" | "skipped" = "processed";
+
 		if (payload.type === "Issue") {
-			await processIssueEvent(
+			status = await processIssueEvent(
 				payload as EntityWebhookPayloadWithIssueData,
 				connection,
 			);
@@ -68,7 +70,10 @@ export async function POST(request: Request) {
 
 		await db
 			.update(webhookEvents)
-			.set({ status: "processed", processedAt: new Date() })
+			.set({
+				status,
+				processedAt: new Date(),
+			})
 			.where(eq(webhookEvents.id, webhookEvent.id));
 
 		return Response.json({ success: true });
@@ -89,11 +94,10 @@ export async function POST(request: Request) {
 async function processIssueEvent(
 	payload: EntityWebhookPayloadWithIssueData,
 	connection: SelectIntegrationConnection,
-) {
+): Promise<"processed" | "skipped"> {
 	const issue = payload.data;
 
 	if (payload.action === "create" || payload.action === "update") {
-		// Look up statusId from task_statuses
 		const taskStatus = await db.query.taskStatuses.findFirst({
 			where: and(
 				eq(taskStatuses.organizationId, connection.organizationId),
@@ -109,7 +113,7 @@ async function processIssueEvent(
 			console.warn(
 				`[webhook] Status not found for state ${issue.state.id}, skipping update`,
 			);
-			return;
+			return "skipped";
 		}
 
 		let assigneeId: string | null = null;
@@ -124,7 +128,7 @@ async function processIssueEvent(
 			slug: issue.identifier,
 			title: issue.title,
 			description: issue.description ?? null,
-			statusId: taskStatus.id, // FK reference
+			statusId: taskStatus.id,
 			priority: mapPriorityFromLinear(issue.priority),
 			assigneeId,
 			estimate: issue.estimate ?? null,
@@ -166,4 +170,6 @@ async function processIssueEvent(
 				),
 			);
 	}
+
+	return "processed";
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx b/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
deleted file mode 100644
index 76c391923cb..00000000000
--- a/apps/desktop/src/renderer/screens/main/components/ComponentsShowcase/index.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { ScrollArea } from "@superset/ui/scroll-area";
-import {
-	StatusIcon,
-	type StatusType,
-} from "../TasksView/components/StatusIcon";
-
-const STATUS_VARIANTS: Array<{
-	type: StatusType;
-	color: string;
-	label: string;
-}> = [
-	{ type: "backlog", color: "#6B7280", label: "Backlog (Gray)" },
-	{ type: "unstarted", color: "#3B82F6", label: "Todo (Blue)" },
-	{ type: "unstarted", color: "#EF4444", label: "Blocked (Red)" },
-	{ type: "started", color: "#F59E0B", label: "In Progress (Orange)" },
-	{ type: "started", color: "#10B981", label: "In Review (Green)" },
-	{ type: "completed", color: "#8B5CF6", label: "Done (Purple)" },
-	{ type: "canceled", color: "#6B7280", label: "Canceled (Gray)" },
-	{ type: "canceled", color: "#EF4444", label: "Duplicate (Red)" },
-];
-
-export function ComponentsShowcase() {
-	return (
-		<div className="flex-1 flex flex-col min-h-0 bg-background">
-			{/* Header */}
-			<div className="flex items-center justify-between border-b border-border px-6 py-4">
-				<div>
-					<h1 className="text-xl font-semibold">Components Showcase</h1>
-					<p className="text-sm text-muted-foreground mt-1">
-						View all component variants and states
-					</p>
-				</div>
-			</div>
-
-			{/* Content */}
-			<ScrollArea className="flex-1 min-h-0">
-				<div className="p-6 space-y-8">
-					{/* Status Icon Display */}
-					<section>
-						<h2 className="text-lg font-semibold mb-4">Status Icon Display</h2>
-						<p className="text-sm text-muted-foreground mb-6">
-							Linear-style status icons with support for different types and
-							colors
-						</p>
-
-						<div className="space-y-8">
-							{/* All Variants Grid */}
-							<div>
-								<h3 className="text-sm font-medium mb-3">All Variants</h3>
-								<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4">
-									{STATUS_VARIANTS.map((variant) => (
-										<div
-											key={`${variant.type}-${variant.color}`}
-											className="flex items-center gap-3 p-4 rounded-lg border border-border bg-card"
-										>
-											<StatusIcon type={variant.type} color={variant.color} />
-											<div className="flex-1 min-w-0">
-												<p className="text-sm font-medium">{variant.label}</p>
-												<p className="text-xs text-muted-foreground">
-													{variant.type}
-												</p>
-											</div>
-										</div>
-									))}
-								</div>
-							</div>
-
-							{/* Type Breakdown */}
-							<div>
-								<h3 className="text-sm font-medium mb-3">Type Breakdown</h3>
-								<div className="space-y-4">
-									{/* Backlog */}
-									<div className="p-4 rounded-lg border border-border bg-card">
-										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon type="backlog" color="#6B7280" />
-											<span className="font-medium">Backlog Type</span>
-										</div>
-										<p className="text-sm text-muted-foreground ml-9">
-											Dashed circle outline
-										</p>
-									</div>
-
-									{/* Unstarted */}
-									<div className="p-4 rounded-lg border border-border bg-card">
-										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon type="unstarted" color="#3B82F6" />
-											<span className="font-medium">Unstarted Type</span>
-										</div>
-										<p className="text-sm text-muted-foreground ml-9">
-											Solid circle outline
-										</p>
-									</div>
-
-									{/* Started */}
-									<div className="p-4 rounded-lg border border-border bg-card">
-										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon type="started" color="#F59E0B" />
-											<span className="font-medium">Started Type</span>
-										</div>
-										<p className="text-sm text-muted-foreground ml-9">
-											Filled circle with thin gap between fill and border
-										</p>
-									</div>
-
-									{/* Completed */}
-									<div className="p-4 rounded-lg border border-border bg-card">
-										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon type="completed" color="#8B5CF6" />
-											<span className="font-medium">Completed Type</span>
-										</div>
-										<p className="text-sm text-muted-foreground ml-9">
-											Filled circle with hollow check icon
-										</p>
-									</div>
-
-									{/* Canceled */}
-									<div className="p-4 rounded-lg border border-border bg-card">
-										<div className="flex items-center gap-3 mb-2">
-											<StatusIcon type="canceled" color="#6B7280" />
-											<span className="font-medium">Canceled Type</span>
-										</div>
-										<p className="text-sm text-muted-foreground ml-9">
-											Filled circle with hollow X icon
-										</p>
-									</div>
-								</div>
-							</div>
-
-							{/* Hover States */}
-							<div>
-								<h3 className="text-sm font-medium mb-3">Hover States</h3>
-								<div className="grid grid-cols-5 gap-4 p-4 rounded-lg border border-border bg-card">
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon
-											type="backlog"
-											color="#6B7280"
-											showHover={true}
-										/>
-										<span className="text-xs text-muted-foreground">
-											Backlog
-										</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon
-											type="unstarted"
-											color="#3B82F6"
-											showHover={true}
-										/>
-										<span className="text-xs text-muted-foreground">
-											Unstarted
-										</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon
-											type="started"
-											color="#F59E0B"
-											showHover={true}
-										/>
-										<span className="text-xs text-muted-foreground">
-											Started
-										</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon
-											type="completed"
-											color="#8B5CF6"
-											showHover={true}
-										/>
-										<span className="text-xs text-muted-foreground">
-											Completed
-										</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon
-											type="canceled"
-											color="#6B7280"
-											showHover={true}
-										/>
-										<span className="text-xs text-muted-foreground">
-											Canceled
-										</span>
-									</div>
-								</div>
-								<p className="text-xs text-muted-foreground mt-2 ml-2">
-									Hover over any icon to see the brightness effect
-								</p>
-							</div>
-
-							{/* Progress Variants for Started Type */}
-							<div>
-								<h3 className="text-sm font-medium mb-3">
-									Started Progress Variants
-								</h3>
-								<p className="text-xs text-muted-foreground mb-3">
-									Visual progress indication for "started" type statuses
-								</p>
-								<div className="grid grid-cols-5 gap-4 p-4 rounded-lg border border-border bg-card">
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon type="started" color="#F59E0B" progress={25} />
-										<span className="text-xs text-muted-foreground">25%</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon type="started" color="#F59E0B" progress={50} />
-										<span className="text-xs text-muted-foreground">50%</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon type="started" color="#10B981" progress={75} />
-										<span className="text-xs text-muted-foreground">75%</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon type="started" color="#8B5CF6" progress={83} />
-										<span className="text-xs text-muted-foreground">83%</span>
-									</div>
-									<div className="flex flex-col items-center gap-2">
-										<StatusIcon type="started" color="#8B5CF6" progress={100} />
-										<span className="text-xs text-muted-foreground">100%</span>
-									</div>
-								</div>
-								<p className="text-xs text-muted-foreground mt-2 ml-2">
-									Progress is calculated from Linear workflow state positions
-									during sync
-								</p>
-							</div>
-						</div>
-					</section>
-				</div>
-			</ScrollArea>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
index b4ae0a476b8..ec8598c5c26 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
@@ -5,7 +5,6 @@ import { useFeatureFlagEnabled } from "posthog-js/react";
 import { useState } from "react";
 import { HiOutlineClipboardDocumentList } from "react-icons/hi2";
 import {
-	LuBoxes,
 	LuLayers,
 	LuPanelLeft,
 	LuPanelLeftClose,
@@ -15,7 +14,6 @@ import { useWorkspaceSidebarStore } from "renderer/stores";
 import {
 	useCloseWorkspacesList,
 	useCurrentView,
-	useOpenComponents,
 	useOpenTasks,
 	useOpenWorkspacesList,
 } from "renderer/stores/app-state";
@@ -34,7 +32,6 @@ export function WorkspaceSidebarHeader({
 	const openWorkspacesList = useOpenWorkspacesList();
 	const closeWorkspacesList = useCloseWorkspacesList();
 	const openTasks = useOpenTasks();
-	const openComponents = useOpenComponents();
 	const { toggleCollapsed } = useWorkspaceSidebarStore();
 	const [isHovering, setIsHovering] = useState(false);
 	const hasTasksAccess = useFeatureFlagEnabled(
@@ -43,7 +40,6 @@ export function WorkspaceSidebarHeader({
 
 	const isWorkspacesListOpen = currentView === "workspaces-list";
 	const isTasksOpen = currentView === "tasks";
-	const isComponentsOpen = currentView === "components";
 
 	const handleClick = () => {
 		if (isWorkspacesListOpen) {
@@ -133,24 +129,6 @@ export function WorkspaceSidebarHeader({
 					</Tooltip>
 				)}
 
-				<Tooltip delayDuration={300}>
-					<TooltipTrigger asChild>
-						<button
-							type="button"
-							onClick={() => openComponents()}
-							className={cn(
-								"flex items-center justify-center size-8 rounded-md transition-colors",
-								isComponentsOpen
-									? "text-foreground bg-accent"
-									: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
-							)}
-						>
-							<LuBoxes className="size-4" strokeWidth={STROKE_WIDTH} />
-						</button>
-					</TooltipTrigger>
-					<TooltipContent side="right">Components</TooltipContent>
-				</Tooltip>
-
 				<NewWorkspaceButton isCollapsed />
 			</div>
 		);
@@ -219,22 +197,6 @@ export function WorkspaceSidebarHeader({
 				</button>
 			)}
 
-			<button
-				type="button"
-				onClick={() => openComponents()}
-				className={cn(
-					"flex items-center gap-2 px-2 py-1.5 w-full rounded-md transition-colors",
-					isComponentsOpen
-						? "text-foreground bg-accent"
-						: "text-muted-foreground hover:text-foreground hover:bg-accent/50",
-				)}
-			>
-				<div className="flex items-center justify-center size-5">
-					<LuBoxes className="size-4" strokeWidth={STROKE_WIDTH} />
-				</div>
-				<span className="text-sm font-medium flex-1 text-left">Components</span>
-			</button>
-
 			<NewWorkspaceButton />
 		</div>
 	);
diff --git a/apps/desktop/src/renderer/screens/main/index.tsx b/apps/desktop/src/renderer/screens/main/index.tsx
index 3211f86e4f2..2a20077abb7 100644
--- a/apps/desktop/src/renderer/screens/main/index.tsx
+++ b/apps/desktop/src/renderer/screens/main/index.tsx
@@ -31,7 +31,6 @@ import {
 import { dragDropManager } from "../../lib/dnd";
 import { AppFrame } from "./components/AppFrame";
 import { Background } from "./components/Background";
-import { ComponentsShowcase } from "./components/ComponentsShowcase";
 import { ResizablePanel } from "./components/ResizablePanel";
 import { SettingsView } from "./components/SettingsView";
 import { StartView } from "./components/StartView";
@@ -301,9 +300,6 @@ export function MainScreen() {
 		if (currentView === "workspaces-list") {
 			return <WorkspacesListView />;
 		}
-		if (currentView === "components") {
-			return <ComponentsShowcase />;
-		}
 		return <WorkspaceView />;
 	};
 
diff --git a/apps/desktop/src/renderer/stores/app-state.ts b/apps/desktop/src/renderer/stores/app-state.ts
index d6d4ee1dfbb..47fe07d2763 100644
--- a/apps/desktop/src/renderer/stores/app-state.ts
+++ b/apps/desktop/src/renderer/stores/app-state.ts
@@ -1,12 +1,7 @@
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 
-export type AppView =
-	| "workspace"
-	| "settings"
-	| "tasks"
-	| "workspaces-list"
-	| "components";
+export type AppView = "workspace" | "settings" | "tasks" | "workspaces-list";
 export type SettingsSection =
 	| "account"
 	| "project"
@@ -23,7 +18,6 @@ interface AppState {
 	isSettingsTabOpen: boolean;
 	isTasksTabOpen: boolean;
 	isWorkspacesListOpen: boolean;
-	isComponentsOpen: boolean;
 	settingsSection: SettingsSection;
 	setView: (view: AppView) => void;
 	openSettings: (section?: SettingsSection) => void;
@@ -34,8 +28,6 @@ interface AppState {
 	closeTasks: () => void;
 	openWorkspacesList: () => void;
 	closeWorkspacesList: () => void;
-	openComponents: () => void;
-	closeComponents: () => void;
 }
 
 export const useAppStore = create<AppState>()(
@@ -45,7 +37,6 @@ export const useAppStore = create<AppState>()(
 			isSettingsTabOpen: false,
 			isTasksTabOpen: false,
 			isWorkspacesListOpen: false,
-			isComponentsOpen: false,
 			settingsSection: "project",
 
 			setView: (view) => {
@@ -87,14 +78,6 @@ export const useAppStore = create<AppState>()(
 			closeWorkspacesList: () => {
 				set({ currentView: "workspace", isWorkspacesListOpen: false });
 			},
-
-			openComponents: () => {
-				set({ currentView: "components", isComponentsOpen: true });
-			},
-
-			closeComponents: () => {
-				set({ currentView: "workspace", isComponentsOpen: false });
-			},
 		}),
 		{ name: "AppStore" },
 	),
@@ -116,7 +99,3 @@ export const useOpenWorkspacesList = () =>
 	useAppStore((state) => state.openWorkspacesList);
 export const useCloseWorkspacesList = () =>
 	useAppStore((state) => state.closeWorkspacesList);
-export const useOpenComponents = () =>
-	useAppStore((state) => state.openComponents);
-export const useCloseComponents = () =>
-	useAppStore((state) => state.closeComponents);

From 1d48e20fbea8526d038de1d81301bd67dfad2deb Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 13:15:37 -0800
Subject: [PATCH 14/18] WIP

---
 .../src/renderer/contexts/CollectionsProvider/collections.ts | 5 +++++
 .../TasksView/components/PriorityIcon/PriorityIcon.tsx       | 1 -
 .../TasksView/components/StatusIcon/StatusIcon.tsx           | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
index 7bf4bfebabc..eb51e333165 100644
--- a/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
+++ b/apps/desktop/src/renderer/contexts/CollectionsProvider/collections.ts
@@ -58,6 +58,7 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "tasks",
+					organizationId,
 				},
 				headers,
 				columnMapper,
@@ -91,6 +92,7 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "task_statuses",
+					organizationId,
 				},
 				headers,
 				columnMapper,
@@ -106,6 +108,7 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "repositories",
+					organizationId,
 				},
 				headers,
 				columnMapper,
@@ -131,6 +134,7 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "auth.members",
+					organizationId,
 				},
 				headers,
 				columnMapper,
@@ -146,6 +150,7 @@ function createOrgCollections(
 				url: electricUrl,
 				params: {
 					table: "auth.users",
+					organizationId,
 				},
 				headers,
 				columnMapper,
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index 868bffd5302..d8520461999 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -1,4 +1,3 @@
-// biome-ignore lint/a11y/noSvgWithoutTitle: These are decorative icons within labeled interactive elements
 import type { TaskPriority } from "@superset/db/enums";
 import colors from "tailwindcss/colors";
 
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
index b9c30cecf18..09ab35f7365 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
@@ -1,4 +1,3 @@
-// biome-ignore lint/a11y/noSvgWithoutTitle: These are decorative icons within labeled interactive elements
 import { cn } from "@superset/ui/utils";
 
 export type StatusType =

From 4dde9c6725c392dd00ea9302a03aa57fa68a7e57 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 13:58:45 -0800
Subject: [PATCH 15/18] WIP

---
 .../components/PriorityIcon/PriorityIcon.tsx  |  7 +-----
 .../cells/AssigneeCell/AssigneeCell.tsx       | 23 ++++---------------
 .../components/shared/AssigneeMenuItems.tsx   | 14 ++---------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
index d8520461999..0a0c3387f38 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
@@ -20,7 +20,6 @@ export function PriorityIcon({
 	const hoverClass = showHover ? "group-hover:brightness-150" : "";
 	const defaultColor = color || colors.neutral[500];
 
-	// None: Three horizontal dashes with opacity
 	if (priority === "none") {
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
@@ -60,14 +59,13 @@ export function PriorityIcon({
 		);
 	}
 
-	// Urgent: Filled square with exclamation mark
-	// Orange for backlog/todo/in-progress, gray for completed/canceled
 	if (priority === "urgent") {
 		const isActive =
 			statusType === "started" ||
 			statusType === "unstarted" ||
 			statusType === "backlog";
 
+		// For urgent statuses that are also active, we use orange as a small stylistic touch
 		const fillColor = color || (isActive ? "#F97316" : colors.neutral[500]);
 
 		return (
@@ -85,7 +83,6 @@ export function PriorityIcon({
 		);
 	}
 
-	// High: 3 bars staircase pattern (all solid)
 	if (priority === "high") {
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
@@ -104,7 +101,6 @@ export function PriorityIcon({
 		);
 	}
 
-	// Medium: 3 bars staircase (last bar 40% opacity)
 	if (priority === "medium") {
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
@@ -123,7 +119,6 @@ export function PriorityIcon({
 		);
 	}
 
-	// Low: 3 bars staircase (middle and last bars 40% opacity)
 	if (priority === "low") {
 		return (
 			<div className={`flex items-center justify-center ${sizeClass}`}>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
index 44c5c0adbbc..c5099e3aa3b 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
@@ -1,3 +1,4 @@
+import { getInitials } from "@superset/shared/names";
 import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
 import {
 	DropdownMenu,
@@ -23,15 +24,12 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 	const task = info.row.original;
 	const assigneeId = info.getValue();
 
-	// All users for dropdown
 	const { data: allUsers } = useLiveQuery(
 		(q) => q.from({ users: collections.users }),
 		[collections],
 	);
 
 	const users = useMemo(() => allUsers || [], [allUsers]);
-	// Use pre-loaded assignee from joined query (eliminates delay)
-	const currentAssignee = task.assignee;
 
 	const handleSelectUser = (userId: string | null) => {
 		if (userId === assigneeId) {
@@ -46,26 +44,15 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 		});
 	};
 
-	const getInitials = (name: string) => {
-		return name
-			.split(" ")
-			.map((n) => n[0])
-			.join("")
-			.toUpperCase()
-			.slice(0, 2);
-	};
-
 	return (
 		<DropdownMenu open={open} onOpenChange={setOpen}>
 			<DropdownMenuTrigger asChild>
 				<button type="button" className="cursor-pointer">
-					{currentAssignee ? (
+					{task.assignee ? (
 						<Avatar size="xs">
-							{currentAssignee.image && (
-								<AvatarImage src={currentAssignee.image} />
-							)}
+							{task.assignee.image && <AvatarImage src={task.assignee.image} />}
 							<AvatarFallback size="xs">
-								{getInitials(currentAssignee.name)}
+								{getInitials(task.assignee.name)}
 							</AvatarFallback>
 						</Avatar>
 					) : (
@@ -79,7 +66,7 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 						onSelect={() => handleSelectUser(null)}
 						className="flex items-center gap-2"
 					>
-						<HiOutlineUserCircle className="size-5 text-muted-foreground flex-shrink-0" />
+						<HiOutlineUserCircle className="size-5 text-muted-foreground shrink-0" />
 						<span className="text-sm">No assignee</span>
 						{!assigneeId && (
 							<span className="ml-auto text-xs text-muted-foreground">✓</span>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
index cc31f3c46eb..1d5c41c6c5f 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
@@ -1,4 +1,5 @@
 import type { SelectUser } from "@superset/db/schema";
+import { getInitials } from "@superset/shared/names";
 import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
 import type { ReactNode } from "react";
 import { HiOutlineUserCircle } from "react-icons/hi2";
@@ -16,15 +17,6 @@ interface AssigneeMenuItemsProps {
 	MenuItem: React.ComponentType<MenuItemProps>;
 }
 
-function getInitials(name: string) {
-	return name
-		.split(" ")
-		.map((n) => n[0])
-		.join("")
-		.toUpperCase()
-		.slice(0, 2);
-}
-
 export function AssigneeMenuItems({
 	users,
 	currentAssigneeId,
@@ -33,19 +25,17 @@ export function AssigneeMenuItems({
 }: AssigneeMenuItemsProps) {
 	return (
 		<>
-			{/* No assignee option */}
 			<MenuItem
 				onSelect={() => onSelect(null)}
 				className="flex items-center gap-2"
 			>
-				<HiOutlineUserCircle className="size-5 text-muted-foreground flex-shrink-0" />
+				<HiOutlineUserCircle className="size-5 text-muted-foreground shrink-0" />
 				<span className="text-sm">No assignee</span>
 				{!currentAssigneeId && (
 					<span className="ml-auto text-xs text-muted-foreground">✓</span>
 				)}
 			</MenuItem>
 
-			{/* Users */}
 			{users.map((user) => {
 				const isSelected = user.id === currentAssigneeId;
 				return (

From 6d8e747f878d531a696560bff74edb65d292b49d Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 14:23:45 -0800
Subject: [PATCH 16/18] WIP

---
 .../TasksTableView/TasksTableView.tsx         |  2 +-
 .../TaskContextMenu/TaskContextMenu.tsx       | 14 ++++----
 .../components}/TaskContextMenu/index.ts      |  0
 .../components/TasksTopBar/TasksTopBar.tsx    |  6 ++--
 .../cells/PriorityCell/constants.ts           |  7 ----
 .../PriorityIcon/PriorityIcon.tsx             |  0
 .../{ => shared}/PriorityIcon/index.ts        |  0
 .../components/shared/PriorityMenuItems.tsx   |  4 +--
 .../{ => shared}/StatusIcon/StatusIcon.tsx    |  0
 .../{ => shared}/StatusIcon/constants.ts      |  0
 .../{ => shared}/StatusIcon/index.ts          |  0
 .../components/shared/StatusMenuItems.tsx     |  2 +-
 .../icons/ActiveIcon/ActiveIcon.tsx           |  0
 .../{ => shared}/icons/ActiveIcon/index.ts    |  0
 .../icons/AllIssuesIcon/AllIssuesIcon.tsx     |  0
 .../{ => shared}/icons/AllIssuesIcon/index.ts |  0
 .../AssigneeMenuIcon/AssigneeMenuIcon.tsx     |  0
 .../icons/AssigneeMenuIcon/index.ts           |  0
 .../icons/BacklogIcon/BacklogIcon.tsx         |  0
 .../{ => shared}/icons/BacklogIcon/index.ts   |  0
 .../PriorityMenuIcon/PriorityMenuIcon.tsx     |  0
 .../icons/PriorityMenuIcon/index.ts           |  0
 .../components}/AssigneeCell/AssigneeCell.tsx |  2 +-
 .../components}/AssigneeCell/index.ts         |  0
 .../components}/LabelsCell/LabelsCell.tsx     |  0
 .../components}/LabelsCell/index.ts           |  0
 .../components}/PriorityCell/PriorityCell.tsx |  6 ++--
 .../components}/PriorityCell/index.ts         |  0
 .../components}/StatusCell/StatusCell.tsx     |  7 ++--
 .../components}/StatusCell/index.ts           |  0
 .../hooks/useTasksTable/useTasksTable.tsx     | 36 ++++++++-----------
 .../TasksView/utils/sorting/index.ts          |  1 +
 .../{taskSorting.ts => sorting/sorting.ts}    |  0
 packages/db/src/schema/schema.ts              |  6 +---
 34 files changed, 39 insertions(+), 54 deletions(-)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => TasksTableView/components}/TaskContextMenu/TaskContextMenu.tsx (90%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => TasksTableView/components}/TaskContextMenu/index.ts (100%)
 delete mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/PriorityIcon/PriorityIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/PriorityIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/StatusIcon/StatusIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/StatusIcon/constants.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/StatusIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/ActiveIcon/ActiveIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/ActiveIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/AllIssuesIcon/AllIssuesIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/AllIssuesIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/AssigneeMenuIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/BacklogIcon/BacklogIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/BacklogIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/PriorityMenuIcon/PriorityMenuIcon.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/components/{ => shared}/icons/PriorityMenuIcon/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/AssigneeCell/AssigneeCell.tsx (97%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/AssigneeCell/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/LabelsCell/LabelsCell.tsx (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/LabelsCell/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/PriorityCell/PriorityCell.tsx (91%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/PriorityCell/index.ts (100%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/StatusCell/StatusCell.tsx (94%)
 rename apps/desktop/src/renderer/screens/main/components/TasksView/{components/cells => hooks/useTasksTable/components}/StatusCell/index.ts (100%)
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/utils/sorting/index.ts
 rename apps/desktop/src/renderer/screens/main/components/TasksView/utils/{taskSorting.ts => sorting/sorting.ts} (100%)

diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
index ced7fe69bd9..1185e2f2c62 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx
@@ -1,6 +1,6 @@
 import { flexRender, type Table } from "@tanstack/react-table";
 import type { TaskWithStatus } from "../../hooks/useTasksTable";
-import { TaskContextMenu } from "../TaskContextMenu";
+import { TaskContextMenu } from "./components/TaskContextMenu";
 
 interface TasksTableViewProps {
 	table: Table<TaskWithStatus>;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx
similarity index 90%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx
index 9dd979fd4f0..59fce527865 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/TaskContextMenu.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/components/TaskContextMenu/TaskContextMenu.tsx
@@ -16,13 +16,13 @@ import {
 	HiOutlineUserCircle,
 } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import type { TaskWithStatus } from "../../hooks/useTasksTable";
-import { compareStatusesForDropdown } from "../../utils/taskSorting";
-import { ActiveIcon } from "../icons/ActiveIcon";
-import { PriorityMenuIcon } from "../icons/PriorityMenuIcon";
-import { AssigneeMenuItems } from "../shared/AssigneeMenuItems";
-import { PriorityMenuItems } from "../shared/PriorityMenuItems";
-import { StatusMenuItems } from "../shared/StatusMenuItems";
+import type { TaskWithStatus } from "../../../../hooks/useTasksTable";
+import { compareStatusesForDropdown } from "../../../../utils/sorting";
+import { AssigneeMenuItems } from "../../../shared/AssigneeMenuItems";
+import { ActiveIcon } from "../../../shared/icons/ActiveIcon";
+import { PriorityMenuIcon } from "../../../shared/icons/PriorityMenuIcon";
+import { PriorityMenuItems } from "../../../shared/PriorityMenuItems";
+import { StatusMenuItems } from "../../../shared/StatusMenuItems";
 
 interface TaskContextMenuProps {
 	children: ReactNode;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/components/TaskContextMenu/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/TaskContextMenu/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/components/TaskContextMenu/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
index 653bbda9f50..7e63f664866 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTopBar/TasksTopBar.tsx
@@ -1,9 +1,9 @@
 import { Input } from "@superset/ui/input";
 import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { HiOutlineMagnifyingGlass } from "react-icons/hi2";
-import { ActiveIcon } from "../icons/ActiveIcon";
-import { AllIssuesIcon } from "../icons/AllIssuesIcon";
-import { BacklogIcon } from "../icons/BacklogIcon";
+import { ActiveIcon } from "../shared/icons/ActiveIcon";
+import { AllIssuesIcon } from "../shared/icons/AllIssuesIcon";
+import { BacklogIcon } from "../shared/icons/BacklogIcon";
 
 export type TabValue = "all" | "active" | "backlog";
 
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts
deleted file mode 100644
index 7feb29ff5a3..00000000000
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/constants.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const PRIORITY_COLORS: Record<string, string> = {
-	urgent: "bg-red-500",
-	high: "bg-orange-500",
-	medium: "bg-yellow-500",
-	low: "bg-blue-500",
-	none: "bg-gray-400",
-};
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityIcon/PriorityIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/PriorityIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityIcon/PriorityIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/PriorityIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
index 99be2c1b64a..ec18abd88e3 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/PriorityMenuItems.tsx
@@ -1,7 +1,7 @@
 import type { TaskPriority } from "@superset/db/enums";
 import type { ReactNode } from "react";
-import { ALL_PRIORITIES } from "../../utils/taskSorting";
-import { PriorityIcon } from "../PriorityIcon";
+import { ALL_PRIORITIES } from "../../utils/sorting";
+import { PriorityIcon } from "./PriorityIcon";
 
 interface MenuItemProps {
 	children: ReactNode;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusIcon/StatusIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/StatusIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusIcon/StatusIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/constants.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusIcon/constants.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/constants.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusIcon/constants.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/StatusIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
index 0dc280388c1..3edbe8d17ec 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/StatusMenuItems.tsx
@@ -1,6 +1,6 @@
 import type { SelectTaskStatus } from "@superset/db/schema";
 import type { ReactNode } from "react";
-import { StatusIcon, type StatusType } from "../StatusIcon";
+import { StatusIcon, type StatusType } from "./StatusIcon";
 
 interface MenuItemProps {
 	children: ReactNode;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/ActiveIcon/ActiveIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/ActiveIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/ActiveIcon/ActiveIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/ActiveIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/ActiveIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/ActiveIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AllIssuesIcon/AllIssuesIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/AllIssuesIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AllIssuesIcon/AllIssuesIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AllIssuesIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AllIssuesIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AllIssuesIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AssigneeMenuIcon/AssigneeMenuIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AssigneeMenuIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/AssigneeMenuIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/AssigneeMenuIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/BacklogIcon/BacklogIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/BacklogIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/BacklogIcon/BacklogIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/BacklogIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/BacklogIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/BacklogIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/PriorityMenuIcon.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/PriorityMenuIcon/PriorityMenuIcon.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/PriorityMenuIcon.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/PriorityMenuIcon/PriorityMenuIcon.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/PriorityMenuIcon/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/icons/PriorityMenuIcon/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/icons/PriorityMenuIcon/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx
similarity index 97%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx
index c5099e3aa3b..9ebdb510f71 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx
@@ -11,7 +11,7 @@ import type { CellContext } from "@tanstack/react-table";
 import { useMemo, useState } from "react";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import type { TaskWithStatus } from "../../../hooks/useTasksTable";
+import type { TaskWithStatus } from "../../useTasksTable";
 
 interface AssigneeCellProps {
 	info: CellContext<TaskWithStatus, string | null>;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/AssigneeCell/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/LabelsCell/LabelsCell.tsx
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/LabelsCell.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/LabelsCell/LabelsCell.tsx
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/LabelsCell/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/LabelsCell/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/LabelsCell/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/PriorityCell/PriorityCell.tsx
similarity index 91%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/PriorityCell/PriorityCell.tsx
index 4b23c9f98d8..f15dc5e7c78 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/PriorityCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/PriorityCell/PriorityCell.tsx
@@ -8,9 +8,9 @@ import {
 import type { CellContext } from "@tanstack/react-table";
 import { useState } from "react";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import type { TaskWithStatus } from "../../../hooks/useTasksTable";
-import { ALL_PRIORITIES } from "../../../utils/taskSorting";
-import { PriorityIcon } from "../../PriorityIcon";
+import { PriorityIcon } from "../../../../components/shared/PriorityIcon";
+import { ALL_PRIORITIES } from "../../../../utils/sorting";
+import type { TaskWithStatus } from "../../useTasksTable";
 
 interface PriorityCellProps {
 	info: CellContext<TaskWithStatus, TaskPriority>;
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/PriorityCell/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/PriorityCell/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/PriorityCell/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx
similarity index 94%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx
index 5adf6f8aeec..3ef121a10fc 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx
@@ -8,8 +8,11 @@ import {
 import { useLiveQuery } from "@tanstack/react-db";
 import { useMemo, useState } from "react";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { compareStatusesForDropdown } from "../../../utils/taskSorting";
-import { StatusIcon, type StatusType } from "../../StatusIcon";
+import {
+	StatusIcon,
+	type StatusType,
+} from "../../../../components/shared/StatusIcon";
+import { compareStatusesForDropdown } from "../../../../utils/sorting";
 
 // Task with joined status data
 type TaskWithStatus = SelectTask & {
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/components/cells/StatusCell/index.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/index.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index d733dd5c325..8ac3fa770ba 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -22,14 +22,16 @@ import { useEffect, useMemo, useState } from "react";
 import { HiChevronRight } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { useHybridSearch } from "renderer/hooks/useHybridSearch";
-import { AssigneeCell } from "../../components/cells/AssigneeCell";
-import { PriorityCell } from "../../components/cells/PriorityCell";
-import { StatusCell } from "../../components/cells/StatusCell";
-import { StatusIcon, type StatusType } from "../../components/StatusIcon";
+import {
+	StatusIcon,
+	type StatusType,
+} from "../../components/shared/StatusIcon";
 import type { TabValue } from "../../components/TasksTopBar";
-import { compareTasks } from "../../utils/taskSorting";
+import { compareTasks } from "../../utils/sorting";
+import { AssigneeCell } from "./components/AssigneeCell";
+import { PriorityCell } from "./components/PriorityCell";
+import { StatusCell } from "./components/StatusCell";
 
-// Task with joined status and assignee data
 export type TaskWithStatus = SelectTask & {
 	status: SelectTaskStatus;
 	assignee: SelectUser | null;
@@ -102,7 +104,7 @@ export function useTasksTable({
 
 	// Calculate optimal slug column width based on longest slug
 	const slugColumnWidth = useMemo(() => {
-		if (!data || data.length === 0) return "5rem"; // Default fallback
+		if (!data || data.length === 0) return "5rem";
 
 		const longestSlug = data.reduce((longest, task) => {
 			return task.slug.length > longest.length ? task.slug : longest;
@@ -122,12 +124,10 @@ export function useTasksTable({
 	// Define columns with useMemo (following official docs pattern)
 	const columns = useMemo(
 		() => [
-			// Status column (grouped) - only shows for group headers
 			columnHelper.accessor((row) => row.status, {
 				id: "status",
 				header: "Status",
 				filterFn: (row, _columnId, filterValue: TabValue) => {
-					// Filter by tab value: "active" | "backlog" | "all"
 					const statusType = row.original.status.type;
 					if (filterValue === "active") {
 						return statusType === "started" || statusType === "unstarted";
@@ -135,14 +135,13 @@ export function useTasksTable({
 					if (filterValue === "backlog") {
 						return statusType === "backlog";
 					}
-					return true; // "all" shows everything
+					return true;
 				},
 				cell: (info) => {
 					const { row, cell } = info;
 					const status = info.getValue();
 
 					if (cell.getIsGrouped()) {
-						// Group header row with subtle gradient (Linear style, 8% opacity)
 						return (
 							<div
 								className="w-full"
@@ -178,7 +177,6 @@ export function useTasksTable({
 						);
 					}
 
-					// For leaf rows, return null - status icon is shown in title column
 					return null;
 				},
 				getGroupingValue: (row) => row.status.name,
@@ -193,7 +191,6 @@ export function useTasksTable({
 				},
 			}),
 
-			// Priority - clickable dropdown
 			columnHelper.accessor("priority", {
 				header: "Priority",
 				cell: (info) => {
@@ -202,20 +199,18 @@ export function useTasksTable({
 				},
 			}),
 
-			// Task ID - simple inline rendering
 			columnHelper.accessor("slug", {
 				header: "ID",
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
 					return (
-						<span className="text-xs text-muted-foreground flex-shrink-0">
+						<span className="text-xs text-muted-foreground shrink-0">
 							{info.getValue()}
 						</span>
 					);
 				},
 			}),
 
-			// Title + Labels - combined to handle overflow better
 			columnHelper.accessor("title", {
 				header: "Title",
 				cell: (info) => {
@@ -226,11 +221,11 @@ export function useTasksTable({
 						<div className="flex items-center gap-1.5 flex-1 min-w-0">
 							<StatusCell taskWithStatus={taskWithStatus} />
 							<div className="flex items-center justify-between gap-2 flex-1 min-w-0">
-								<span className="text-sm font-medium line-clamp-1 flex-shrink">
+								<span className="text-sm font-medium line-clamp-1 shrink">
 									{info.getValue()}
 								</span>
 								{labels.length > 0 && (
-									<div className="flex gap-1 flex-shrink-0">
+									<div className="flex gap-1 shrink-0">
 										{labels.slice(0, 2).map((label) => (
 											<Badge key={label} variant="outline" className="text-xs">
 												{label}
@@ -249,7 +244,6 @@ export function useTasksTable({
 				},
 			}),
 
-			// Assignee - clickable dropdown
 			columnHelper.accessor("assigneeId", {
 				header: "Assignee",
 				cell: (info) => {
@@ -258,7 +252,6 @@ export function useTasksTable({
 				},
 			}),
 
-			// Created date - simple inline rendering
 			columnHelper.accessor("createdAt", {
 				header: "Created",
 				cell: (info) => {
@@ -266,7 +259,7 @@ export function useTasksTable({
 					const date = info.getValue();
 					if (!date) return null;
 					return (
-						<span className="text-xs text-muted-foreground flex-shrink-0 w-11">
+						<span className="text-xs text-muted-foreground shrink-0 w-11">
 							{format(new Date(date), "MMM d")}
 						</span>
 					);
@@ -276,7 +269,6 @@ export function useTasksTable({
 		[],
 	);
 
-	// Create table instance
 	const table = useReactTable({
 		data,
 		columns,
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/utils/sorting/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/sorting/index.ts
new file mode 100644
index 00000000000..3e6e2c36c0a
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/sorting/index.ts
@@ -0,0 +1 @@
+export * from "./sorting";
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/utils/sorting/sorting.ts
similarity index 100%
rename from apps/desktop/src/renderer/screens/main/components/TasksView/utils/taskSorting.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/utils/sorting/sorting.ts
diff --git a/packages/db/src/schema/schema.ts b/packages/db/src/schema/schema.ts
index 475a63c4104..06e3763eba3 100644
--- a/packages/db/src/schema/schema.ts
+++ b/packages/db/src/schema/schema.ts
@@ -63,20 +63,16 @@ export const taskStatuses = pgTable(
 			.notNull()
 			.references(() => organizations.id, { onDelete: "cascade" }),
 
-		// Core fields from Linear WorkflowState
 		name: text().notNull(),
 		color: text().notNull(),
 		type: text().notNull(), // "backlog" | "unstarted" | "started" | "completed" | "canceled"
 		position: real().notNull(),
-
-		// Calculated progress for "started" type
-		progressPercent: real("progress_percent"), // 0-100, only for "started" type
+		progressPercent: real("progress_percent"),
 
 		// External sync
 		externalProvider: integrationProvider("external_provider"),
 		externalId: text("external_id"),
 
-		// Timestamps
 		createdAt: timestamp("created_at").notNull().defaultNow(),
 		updatedAt: timestamp("updated_at")
 			.notNull()

From ccfc522545ff582b02f913fb3c93ec8409f761a2 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 14:32:45 -0800
Subject: [PATCH 17/18] WIP

---
 .../TasksView/hooks/useHybridSearch/index.ts  |  1 +
 .../hooks/useHybridSearch}/useHybridSearch.ts |  0
 .../components/StatusCell/StatusCell.tsx      | 34 +++++--------------
 .../hooks/useTasksTable/useTasksTable.tsx     |  2 +-
 4 files changed, 11 insertions(+), 26 deletions(-)
 create mode 100644 apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useHybridSearch/index.ts
 rename apps/desktop/src/renderer/{hooks => screens/main/components/TasksView/hooks/useHybridSearch}/useHybridSearch.ts (100%)

diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useHybridSearch/index.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useHybridSearch/index.ts
new file mode 100644
index 00000000000..285fa9732a1
--- /dev/null
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useHybridSearch/index.ts
@@ -0,0 +1 @@
+export * from "./useHybridSearch";
diff --git a/apps/desktop/src/renderer/hooks/useHybridSearch.ts b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useHybridSearch/useHybridSearch.ts
similarity index 100%
rename from apps/desktop/src/renderer/hooks/useHybridSearch.ts
rename to apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useHybridSearch/useHybridSearch.ts
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx
index 3ef121a10fc..5d356aef716 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/StatusCell/StatusCell.tsx
@@ -1,4 +1,4 @@
-import type { SelectTask, SelectTaskStatus } from "@superset/db/schema";
+import type { SelectTaskStatus } from "@superset/db/schema";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -12,12 +12,9 @@ import {
 	StatusIcon,
 	type StatusType,
 } from "../../../../components/shared/StatusIcon";
+import { StatusMenuItems } from "../../../../components/shared/StatusMenuItems";
 import { compareStatusesForDropdown } from "../../../../utils/sorting";
-
-// Task with joined status data
-type TaskWithStatus = SelectTask & {
-	status: SelectTaskStatus;
-};
+import type { TaskWithStatus } from "../../useTasksTable";
 
 interface StatusCellProps {
 	taskWithStatus: TaskWithStatus;
@@ -27,7 +24,6 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const collections = useCollections();
 	const [open, setOpen] = useState(false);
 
-	// Lazy load statuses only when dropdown opens
 	const { data: allStatuses } = useLiveQuery(
 		(q) => (open ? q.from({ taskStatuses: collections.taskStatuses }) : null),
 		[collections, open],
@@ -36,7 +32,6 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 	const statuses = useMemo(() => allStatuses || [], [allStatuses]);
 	const currentStatus = taskWithStatus.status;
 
-	// Sort statuses by workflow order (backlog → unstarted → started → completed → canceled)
 	const sortedStatuses = useMemo(() => {
 		return statuses.sort(compareStatusesForDropdown);
 	}, [statuses]);
@@ -71,23 +66,12 @@ export function StatusCell({ taskWithStatus }: StatusCellProps) {
 			</DropdownMenuTrigger>
 			<DropdownMenuContent align="start" className="w-48 p-1">
 				<div className="max-h-64 overflow-y-auto">
-					{sortedStatuses.map((status) => (
-						<DropdownMenuItem
-							key={status.id}
-							onSelect={() => handleSelectStatus(status)}
-							className="flex items-center gap-3 px-3 py-2"
-						>
-							<StatusIcon
-								type={status.type as StatusType}
-								color={status.color}
-								progress={status.progressPercent ?? undefined}
-							/>
-							<span className="text-sm flex-1">{status.name}</span>
-							{status.id === currentStatus.id && (
-								<span className="text-sm">✓</span>
-							)}
-						</DropdownMenuItem>
-					))}
+					<StatusMenuItems
+						statuses={sortedStatuses}
+						currentStatusId={currentStatus.id}
+						onSelect={handleSelectStatus}
+						MenuItem={DropdownMenuItem}
+					/>
 				</div>
 			</DropdownMenuContent>
 		</DropdownMenu>
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 8ac3fa770ba..c4b8c4d6e10 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -21,13 +21,13 @@ import { format } from "date-fns";
 import { useEffect, useMemo, useState } from "react";
 import { HiChevronRight } from "react-icons/hi2";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
-import { useHybridSearch } from "renderer/hooks/useHybridSearch";
 import {
 	StatusIcon,
 	type StatusType,
 } from "../../components/shared/StatusIcon";
 import type { TabValue } from "../../components/TasksTopBar";
 import { compareTasks } from "../../utils/sorting";
+import { useHybridSearch } from "../useHybridSearch";
 import { AssigneeCell } from "./components/AssigneeCell";
 import { PriorityCell } from "./components/PriorityCell";
 import { StatusCell } from "./components/StatusCell";

From 2fb1f80423f816edc775957d72385cc979ead9b8 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Mon, 12 Jan 2026 14:41:11 -0800
Subject: [PATCH 18/18] done

---
 .../AccountSettings/AccountSettings.tsx       | 12 +-----
 .../TeamSettings/TeamSettings.tsx             | 15 +++----
 .../components/MemberRow/MemberRow.tsx        | 10 +----
 .../components/shared/AssigneeMenuItems.tsx   | 10 +----
 .../components/AssigneeCell/AssigneeCell.tsx  | 21 ++++------
 .../OrganizationDropdown.tsx                  | 40 +++++++++---------
 bun.lock                                      |  1 +
 packages/ui/package.json                      |  1 +
 packages/ui/src/atoms/Avatar/Avatar.tsx       | 41 +++++++------------
 packages/ui/src/atoms/Avatar/index.ts         |  4 +-
 10 files changed, 57 insertions(+), 98 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsView/AccountSettings/AccountSettings.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsView/AccountSettings/AccountSettings.tsx
index 443095f80b1..d97507614a3 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsView/AccountSettings/AccountSettings.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsView/AccountSettings/AccountSettings.tsx
@@ -1,5 +1,4 @@
-import { getInitials } from "@superset/shared/names";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { Avatar } from "@superset/ui/atoms/Avatar";
 import { Button } from "@superset/ui/button";
 import { Skeleton } from "@superset/ui/skeleton";
 import { toast } from "@superset/ui/sonner";
@@ -13,8 +12,6 @@ export function AccountSettings() {
 
 	const signOut = () => signOutMutation.mutate();
 
-	const initials = getInitials(user?.name, user?.email);
-
 	return (
 		<div className="p-6 max-w-4xl">
 			<div className="mb-8">
@@ -39,12 +36,7 @@ export function AccountSettings() {
 							</>
 						) : user ? (
 							<>
-								<Avatar className="h-16 w-16">
-									<AvatarImage src={user.image ?? undefined} />
-									<AvatarFallback className="text-lg">
-										{initials || "?"}
-									</AvatarFallback>
-								</Avatar>
+								<Avatar size="xl" fullName={user.name} image={user.image} />
 								<div>
 									<p className="font-medium text-lg">{user.name}</p>
 									<p className="text-sm text-muted-foreground">{user.email}</p>
diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
index 4d12273e242..245c85e4e69 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/TeamSettings.tsx
@@ -1,5 +1,4 @@
-import { getInitials } from "@superset/shared/names";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { Avatar } from "@superset/ui/atoms/Avatar";
 import { Badge } from "@superset/ui/badge";
 import { Skeleton } from "@superset/ui/skeleton";
 import {
@@ -107,19 +106,17 @@ export function TeamSettings() {
 									</TableHeader>
 									<TableBody>
 										{members.map((member) => {
-											const initials = getInitials(member.name, member.email);
 											const isCurrentUserRow = member.userId === currentUserId;
 
 											return (
 												<TableRow key={member.memberId}>
 													<TableCell>
 														<div className="flex items-center gap-3">
-															<Avatar className="h-8 w-8">
-																<AvatarImage src={member.image ?? undefined} />
-																<AvatarFallback className="text-xs">
-																	{initials || "?"}
-																</AvatarFallback>
-															</Avatar>
+															<Avatar
+																size="md"
+																fullName={member.name}
+																image={member.image}
+															/>
 															<div className="flex items-center gap-2">
 																<span className="font-medium">
 																	{member.name || "Unknown"}
diff --git a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberRow/MemberRow.tsx b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberRow/MemberRow.tsx
index 71cb99dc865..a6477eb6082 100644
--- a/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberRow/MemberRow.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SettingsView/TeamSettings/components/MemberRow/MemberRow.tsx
@@ -1,6 +1,5 @@
 import { authClient } from "@superset/auth/client";
-import { getInitials } from "@superset/shared/names";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { Avatar } from "@superset/ui/atoms/Avatar";
 import { Badge } from "@superset/ui/badge";
 import { Button } from "@superset/ui/button";
 import {
@@ -48,17 +47,12 @@ export function MemberRow({
 		}
 	};
 
-	const initials = getInitials(member.name, member.email);
-
 	const isOwner = member.role === "owner";
 
 	return (
 		<>
 			<div className="flex items-center gap-4 p-4 rounded-lg border bg-card">
-				<Avatar className="h-10 w-10">
-					<AvatarImage src={member.image ?? undefined} />
-					<AvatarFallback>{initials || "?"}</AvatarFallback>
-				</Avatar>
+				<Avatar size="lg" fullName={member.name} image={member.image} />
 
 				<div className="flex-1 min-w-0">
 					<div className="flex items-center gap-2">
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
index 1d5c41c6c5f..a3bd2988a21 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/shared/AssigneeMenuItems.tsx
@@ -1,6 +1,5 @@
 import type { SelectUser } from "@superset/db/schema";
-import { getInitials } from "@superset/shared/names";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
+import { Avatar } from "@superset/ui/atoms/Avatar";
 import type { ReactNode } from "react";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 
@@ -44,12 +43,7 @@ export function AssigneeMenuItems({
 						onSelect={() => onSelect(user.id)}
 						className="flex items-center gap-2"
 					>
-						<Avatar size="xs">
-							{user.image && <AvatarImage src={user.image} />}
-							<AvatarFallback size="xs">
-								{getInitials(user.name)}
-							</AvatarFallback>
-						</Avatar>
+						<Avatar size="xs" fullName={user.name} image={user.image} />
 						<div className="flex flex-col">
 							<span className="text-sm">{user.name}</span>
 							<span className="text-xs text-muted-foreground">
diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx
index 9ebdb510f71..593143c7d50 100644
--- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/components/AssigneeCell/AssigneeCell.tsx
@@ -1,5 +1,4 @@
-import { getInitials } from "@superset/shared/names";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/atoms/Avatar";
+import { Avatar } from "@superset/ui/atoms/Avatar";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -49,12 +48,11 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 			<DropdownMenuTrigger asChild>
 				<button type="button" className="cursor-pointer">
 					{task.assignee ? (
-						<Avatar size="xs">
-							{task.assignee.image && <AvatarImage src={task.assignee.image} />}
-							<AvatarFallback size="xs">
-								{getInitials(task.assignee.name)}
-							</AvatarFallback>
-						</Avatar>
+						<Avatar
+							size="xs"
+							fullName={task.assignee.name}
+							image={task.assignee.image}
+						/>
 					) : (
 						<HiOutlineUserCircle className="size-5 text-muted-foreground" />
 					)}
@@ -78,12 +76,7 @@ export function AssigneeCell({ info }: AssigneeCellProps) {
 							onSelect={() => handleSelectUser(user.id)}
 							className="flex items-center gap-2"
 						>
-							<Avatar size="xs">
-								{user.image && <AvatarImage src={user.image} />}
-								<AvatarFallback size="xs">
-									{getInitials(user.name)}
-								</AvatarFallback>
-							</Avatar>
+							<Avatar size="xs" fullName={user.name} image={user.image} />
 							<div className="flex flex-col">
 								<span className="text-sm">{user.name}</span>
 								<span className="text-xs text-muted-foreground">
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
index 370f689a6f7..5a1753b0f26 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
@@ -1,5 +1,4 @@
-import { getInitials } from "@superset/shared/names";
-import { Avatar, AvatarFallback, AvatarImage } from "@superset/ui/avatar";
+import { Avatar } from "@superset/ui/atoms/Avatar";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -49,7 +48,6 @@ export function OrganizationDropdown({
 
 	// Always render dropdown to prevent trapping users without orgs
 	const orgName = activeOrganization?.name ?? "No Organization";
-	const initials = getInitials(activeOrganization?.name);
 
 	const switchOrganization = async (newOrgId: string) => {
 		await setActiveOrg.mutateAsync({ organizationId: newOrgId });
@@ -66,12 +64,12 @@ export function OrganizationDropdown({
 					type="button"
 					className="flex items-center justify-center size-8 rounded-md hover:bg-accent/50 transition-colors"
 				>
-					<Avatar className="h-6 w-6 rounded-md">
-						<AvatarImage src={activeOrganization?.logo ?? undefined} />
-						<AvatarFallback className="text-xs rounded-md">
-							{initials || "?"}
-						</AvatarFallback>
-					</Avatar>
+					<Avatar
+						size="sm"
+						fullName={activeOrganization?.name}
+						image={activeOrganization?.logo}
+						className="rounded-md"
+					/>
 				</button>
 			</TooltipTrigger>
 			<TooltipContent side="right">{orgName}</TooltipContent>
@@ -81,12 +79,12 @@ export function OrganizationDropdown({
 			type="button"
 			className="flex items-center gap-2 w-full px-2 py-1.5 rounded-md hover:bg-accent/50 transition-colors text-left"
 		>
-			<Avatar className="h-6 w-6 rounded-md">
-				<AvatarImage src={activeOrganization?.logo ?? undefined} />
-				<AvatarFallback className="text-xs rounded-md">
-					{initials || "?"}
-				</AvatarFallback>
-			</Avatar>
+			<Avatar
+				size="sm"
+				fullName={activeOrganization?.name}
+				image={activeOrganization?.logo}
+				className="rounded-md"
+			/>
 			<span className="flex-1 text-sm font-medium truncate">{orgName}</span>
 			<HiChevronUpDown className="h-4 w-4 text-muted-foreground shrink-0" />
 		</button>
@@ -135,12 +133,12 @@ export function OrganizationDropdown({
 										onSelect={() => switchOrganization(organization.id)}
 										className="gap-2"
 									>
-										<Avatar className="h-5 w-5 rounded-md">
-											<AvatarImage src={organization.logo ?? undefined} />
-											<AvatarFallback className="text-xs rounded-md">
-												{organization.name?.[0]?.toUpperCase() || "?"}
-											</AvatarFallback>
-										</Avatar>
+										<Avatar
+											size="xs"
+											fullName={organization.name}
+											image={organization.logo}
+											className="rounded-md"
+										/>
 										<span className="flex-1 truncate">{organization.name}</span>
 										{organization.id === activeOrganization?.id && (
 											<HiCheck className="h-4 w-4 text-primary" />
diff --git a/bun.lock b/bun.lock
index acad8efefda..2d2b69cf805 100644
--- a/bun.lock
+++ b/bun.lock
@@ -488,6 +488,7 @@
         "@radix-ui/react-toggle-group": "^1.1.11",
         "@radix-ui/react-tooltip": "^1.2.8",
         "@radix-ui/react-use-controllable-state": "^1.2.2",
+        "@superset/shared": "workspace:*",
         "@xyflow/react": "^12.10.0",
         "ai": "^5.0.112",
         "class-variance-authority": "^0.7.1",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 568f0af4210..a02897d90b6 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -49,6 +49,7 @@
 		"@radix-ui/react-toggle-group": "^1.1.11",
 		"@radix-ui/react-tooltip": "^1.2.8",
 		"@radix-ui/react-use-controllable-state": "^1.2.2",
+		"@superset/shared": "workspace:*",
 		"@xyflow/react": "^12.10.0",
 		"ai": "^5.0.112",
 		"class-variance-authority": "^0.7.1",
diff --git a/packages/ui/src/atoms/Avatar/Avatar.tsx b/packages/ui/src/atoms/Avatar/Avatar.tsx
index 1ccc658d6f9..22b4932c9f7 100644
--- a/packages/ui/src/atoms/Avatar/Avatar.tsx
+++ b/packages/ui/src/atoms/Avatar/Avatar.tsx
@@ -1,5 +1,5 @@
+import { getInitials } from "@superset/shared/names";
 import { cva, type VariantProps } from "class-variance-authority";
-import type React from "react";
 import {
 	Avatar as AvatarBase,
 	AvatarFallback as AvatarFallbackBase,
@@ -37,35 +37,24 @@ const avatarFallbackVariants = cva("", {
 	},
 });
 
-interface AvatarProps
-	extends React.ComponentProps<typeof AvatarBase>,
-		VariantProps<typeof avatarVariants> {}
-
-interface AvatarFallbackProps
-	extends React.ComponentProps<typeof AvatarFallbackBase>,
-		VariantProps<typeof avatarFallbackVariants> {}
-
-function Avatar({ className, size, ...props }: AvatarProps) {
-	return (
-		<AvatarBase
-			className={cn(avatarVariants({ size }), className)}
-			{...props}
-		/>
-	);
+interface AvatarProps extends VariantProps<typeof avatarVariants> {
+	fullName?: string | null;
+	image?: string | null;
+	className?: string;
 }
 
-function AvatarImage(props: React.ComponentProps<typeof AvatarImageBase>) {
-	return <AvatarImageBase {...props} />;
-}
+function Avatar({ className, size = "md", fullName, image }: AvatarProps) {
+	const fallbackText = fullName ? getInitials(fullName) : "A";
 
-function AvatarFallback({ className, size, ...props }: AvatarFallbackProps) {
 	return (
-		<AvatarFallbackBase
-			className={cn(avatarFallbackVariants({ size }), className)}
-			{...props}
-		/>
+		<AvatarBase className={cn(avatarVariants({ size }), className)}>
+			{image && <AvatarImageBase src={image} />}
+			<AvatarFallbackBase className={cn(avatarFallbackVariants({ size }))}>
+				{fallbackText}
+			</AvatarFallbackBase>
+		</AvatarBase>
 	);
 }
 
-export { Avatar, AvatarImage, AvatarFallback };
-export type { AvatarProps, AvatarFallbackProps };
+export { Avatar };
+export type { AvatarProps };
diff --git a/packages/ui/src/atoms/Avatar/index.ts b/packages/ui/src/atoms/Avatar/index.ts
index 6362f5de585..1cca53e30a8 100644
--- a/packages/ui/src/atoms/Avatar/index.ts
+++ b/packages/ui/src/atoms/Avatar/index.ts
@@ -1,2 +1,2 @@
-export type { AvatarFallbackProps, AvatarProps } from "./Avatar";
-export { Avatar, AvatarFallback, AvatarImage } from "./Avatar";
+export type { AvatarProps } from "./Avatar";
+export { Avatar } from "./Avatar";