diff --git a/apps/db/supabase/migrations/20250620145741_add_calendar_tasks_table.sql b/apps/db/supabase/migrations/20250620145741_add_calendar_tasks_table.sql
new file mode 100644
index 000000000..5e5a853a5
--- /dev/null
+++ b/apps/db/supabase/migrations/20250620145741_add_calendar_tasks_table.sql
@@ -0,0 +1,98 @@
+create type "public"."calendar_task_time" as enum ('working_time', 'personal_time');
+
+create type "public"."priority_status" as enum ('low', 'medium', 'high', 'critical');
+
+create table "public"."workspace_calendar_tasks" (
+    "id" uuid not null default gen_random_uuid(),
+    "created_at" timestamp with time zone not null default now(),
+    "ws_id" uuid,
+    "creator_id" uuid,
+    "updated_at" timestamp with time zone,
+    "is_splittable" boolean,
+    "name" text,
+    "min_split_duration_minutes" smallint,
+    "max_split_duration_minutes" smallint,
+    "schedule_after" timestamp with time zone,
+    "due_date" timestamp with time zone,
+    "time_reference" calendar_task_time default 'working_time'::calendar_task_time,
+    "user_defined_priority" priority_status default 'medium'::priority_status,
+    "evaluated_priority" priority_status default 'medium'::priority_status
+);
+
+
+alter table "public"."workspace_calendar_tasks" enable row level security;
+
+CREATE UNIQUE INDEX workspace_calendar_tasks_pkey ON public.workspace_calendar_tasks USING btree (id);
+
+alter table "public"."workspace_calendar_tasks" add constraint "workspace_calendar_tasks_pkey" PRIMARY KEY using index "workspace_calendar_tasks_pkey";
+
+alter table "public"."workspace_calendar_tasks" add constraint "workspace_calendar_tasks_creator_id_fkey" FOREIGN KEY (creator_id) REFERENCES users(id) ON DELETE CASCADE not valid;
+
+alter table "public"."workspace_calendar_tasks" validate constraint "workspace_calendar_tasks_creator_id_fkey";
+
+alter table "public"."workspace_calendar_tasks" add constraint "workspace_calendar_tasks_ws_id_fkey" FOREIGN KEY (ws_id) REFERENCES workspaces(id) ON DELETE CASCADE not valid;
+
+alter table "public"."workspace_calendar_tasks" validate constraint "workspace_calendar_tasks_ws_id_fkey";
+
+grant delete on table "public"."workspace_calendar_tasks" to "anon";
+
+grant insert on table "public"."workspace_calendar_tasks" to "anon";
+
+grant references on table "public"."workspace_calendar_tasks" to "anon";
+
+grant select on table "public"."workspace_calendar_tasks" to "anon";
+
+grant trigger on table "public"."workspace_calendar_tasks" to "anon";
+
+grant truncate on table "public"."workspace_calendar_tasks" to "anon";
+
+grant update on table "public"."workspace_calendar_tasks" to "anon";
+
+grant delete on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant insert on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant references on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant select on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant trigger on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant truncate on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant update on table "public"."workspace_calendar_tasks" to "authenticated";
+
+grant delete on table "public"."workspace_calendar_tasks" to "service_role";
+
+grant insert on table "public"."workspace_calendar_tasks" to "service_role";
+
+grant references on table "public"."workspace_calendar_tasks" to "service_role";
+
+grant select on table "public"."workspace_calendar_tasks" to "service_role";
+
+grant trigger on table "public"."workspace_calendar_tasks" to "service_role";
+
+grant truncate on table "public"."workspace_calendar_tasks" to "service_role";
+
+grant update on table "public"."workspace_calendar_tasks" to "service_role";
+
+alter table "public"."workspace_calendar_tasks" add column "description" text;
+
+alter table "public"."workspace_calendar_tasks" add column "total_duration" text not null;
+
+alter table "public"."workspace_calendar_tasks" alter column "max_split_duration_minutes" set data type real using "max_split_duration_minutes"::real;
+
+alter table "public"."workspace_calendar_tasks" alter column "min_split_duration_minutes" set data type real using "min_split_duration_minutes"::real;
+
+alter table "public"."workspace_calendar_tasks" enable row level security;
+
+create policy "allow only user in the workspace to insert"
+on "public"."workspace_calendar_tasks"
+as permissive
+for insert
+to authenticated
+with check (true);
+
+alter table "public"."workspace_calendar_tasks" alter column "total_duration" set data type real using "total_duration"::real;
+
+alter table "public"."workspace_calendar_tasks" alter column "updated_at" set default now();
\ No newline at end of file
diff --git a/apps/db/supabase/migrations/20250621070438_alter_tasks_table.sql b/apps/db/supabase/migrations/20250621070438_alter_tasks_table.sql
new file mode 100644
index 000000000..ddb453391
--- /dev/null
+++ b/apps/db/supabase/migrations/20250621070438_alter_tasks_table.sql
@@ -0,0 +1,209 @@
+drop policy "Users can view sync logs for their workspaces" on "public"."workspace_calendar_sync_log";
+
+drop policy "Workspace members can read and write whiteboards" on "public"."workspace_whiteboards";
+
+revoke delete on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke insert on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke references on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke select on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke trigger on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke truncate on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke update on table "public"."workspace_calendar_sync_log" from "anon";
+
+revoke delete on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke insert on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke references on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke select on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke trigger on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke truncate on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke update on table "public"."workspace_calendar_sync_log" from "authenticated";
+
+revoke delete on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke insert on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke references on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke select on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke trigger on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke truncate on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke update on table "public"."workspace_calendar_sync_log" from "service_role";
+
+revoke delete on table "public"."workspace_whiteboards" from "anon";
+
+revoke insert on table "public"."workspace_whiteboards" from "anon";
+
+revoke references on table "public"."workspace_whiteboards" from "anon";
+
+revoke select on table "public"."workspace_whiteboards" from "anon";
+
+revoke trigger on table "public"."workspace_whiteboards" from "anon";
+
+revoke truncate on table "public"."workspace_whiteboards" from "anon";
+
+revoke update on table "public"."workspace_whiteboards" from "anon";
+
+revoke delete on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke insert on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke references on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke select on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke trigger on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke truncate on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke update on table "public"."workspace_whiteboards" from "authenticated";
+
+revoke delete on table "public"."workspace_whiteboards" from "service_role";
+
+revoke insert on table "public"."workspace_whiteboards" from "service_role";
+
+revoke references on table "public"."workspace_whiteboards" from "service_role";
+
+revoke select on table "public"."workspace_whiteboards" from "service_role";
+
+revoke trigger on table "public"."workspace_whiteboards" from "service_role";
+
+revoke truncate on table "public"."workspace_whiteboards" from "service_role";
+
+revoke update on table "public"."workspace_whiteboards" from "service_role";
+
+alter table "public"."workspace_calendar_sync_log" drop constraint "workspace_calendar_sync_log_status_check";
+
+alter table "public"."workspace_calendar_sync_log" drop constraint "workspace_calendar_sync_log_timestamps_check";
+
+alter table "public"."workspace_calendar_sync_log" drop constraint "workspace_calendar_sync_log_triggered_by_check";
+
+alter table "public"."workspace_calendar_sync_log" drop constraint "workspace_calendar_sync_log_ws_id_fkey";
+
+alter table "public"."workspace_calendar_tasks" drop constraint "workspace_calendar_tasks_creator_id_fkey";
+
+alter table "public"."workspace_calendar_tasks" drop constraint "workspace_calendar_tasks_ws_id_fkey";
+
+alter table "public"."workspace_whiteboards" drop constraint "workspace_whiteboards_creator_id_fkey";
+
+alter table "public"."workspace_whiteboards" drop constraint "workspace_whiteboards_ws_id_fkey";
+
+drop view if exists "public"."time_tracking_session_analytics";
+
+alter table "public"."workspace_calendar_sync_log" drop constraint "workspace_calendar_sync_log_pkey";
+
+alter table "public"."workspace_calendar_tasks" drop constraint "workspace_calendar_tasks_pkey";
+
+alter table "public"."workspace_whiteboards" drop constraint "workspace_whiteboards_pkey";
+
+drop index if exists "public"."idx_whiteboards_creator_id";
+
+drop index if exists "public"."idx_whiteboards_snapshot_gin";
+
+drop index if exists "public"."idx_whiteboards_ws_id";
+
+drop index if exists "public"."workspace_calendar_sync_log_pkey";
+
+drop index if exists "public"."workspace_calendar_sync_log_status_idx";
+
+drop index if exists "public"."workspace_calendar_sync_log_sync_started_at_idx";
+
+drop index if exists "public"."workspace_calendar_sync_log_workspace_id_idx";
+
+drop index if exists "public"."workspace_calendar_tasks_pkey";
+
+drop index if exists "public"."workspace_whiteboards_pkey";
+
+drop table "public"."workspace_calendar_sync_log";
+
+drop table "public"."workspace_whiteboards";
+
+alter table "public"."tasks" add column "is_splittable" boolean not null default true;
+
+alter table "public"."tasks" add column "max_split_duration_minutes" real default '240'::real;
+
+alter table "public"."tasks" add column "min_split_duration_minutes" real default '30'::real;
+
+alter table "public"."tasks" add column "time_reference" calendar_task_time not null default 'working_time'::calendar_task_time;
+
+alter table "public"."tasks" add column "total_duration" real;
+
+alter table "public"."tasks" add column "user_defined_priority" priority_status default 'medium'::priority_status;
+
+
+
+
+CREATE UNIQUE INDEX workspace_calendar_taskss_pkey ON public.workspace_calendar_tasks USING btree (id);
+
+alter table "public"."workspace_calendar_tasks" add constraint "workspace_calendar_taskss_pkey" PRIMARY KEY using index "workspace_calendar_taskss_pkey";
+
+alter table "public"."workspace_calendar_tasks" add constraint "workspace_calendar_taskss_creator_id_fkey" FOREIGN KEY (creator_id) REFERENCES users(id) ON DELETE CASCADE not valid;
+
+alter table "public"."workspace_calendar_tasks" validate constraint "workspace_calendar_taskss_creator_id_fkey";
+
+alter table "public"."workspace_calendar_tasks" add constraint "workspace_calendar_taskss_ws_id_fkey" FOREIGN KEY (ws_id) REFERENCES workspaces(id) ON DELETE CASCADE not valid;
+
+alter table "public"."workspace_calendar_tasks" validate constraint "workspace_calendar_taskss_ws_id_fkey";
+
+create or replace view "public"."time_tracking_session_analytics" as  SELECT tts.id,
+    tts.ws_id,
+    tts.user_id,
+    tts.task_id,
+    tts.category_id,
+    tts.title,
+    tts.description,
+    tts.start_time,
+    tts.end_time,
+    tts.duration_seconds,
+    tts.is_running,
+    tts.tags,
+    tts.created_at,
+    tts.updated_at,
+    tts.productivity_score,
+    tts.was_resumed,
+    ttc.name AS category_name,
+    ttc.color AS category_color,
+    t.name AS task_name,
+    EXTRACT(hour FROM tts.start_time) AS start_hour,
+    EXTRACT(dow FROM tts.start_time) AS day_of_week,
+    date_trunc('day'::text, tts.start_time) AS session_date,
+    date_trunc('week'::text, tts.start_time) AS session_week,
+    date_trunc('month'::text, tts.start_time) AS session_month,
+        CASE
+            WHEN (tts.duration_seconds >= 7200) THEN 'long'::text
+            WHEN (tts.duration_seconds >= 1800) THEN 'medium'::text
+            WHEN (tts.duration_seconds >= 300) THEN 'short'::text
+            ELSE 'micro'::text
+        END AS session_length_category
+   FROM ((time_tracking_sessions tts
+     LEFT JOIN time_tracking_categories ttc ON ((tts.category_id = ttc.id)))
+     LEFT JOIN tasks t ON ((tts.task_id = t.id)));
+
+
+
+alter table "public"."tasks" alter column "is_splittable" drop default;
+
+alter table "public"."tasks" alter column "is_splittable" drop not null;
+
+alter table "public"."tasks" alter column "max_split_duration_minutes" drop default;
+
+alter table "public"."tasks" alter column "min_split_duration_minutes" drop default;
+
+alter table "public"."tasks" alter column "time_reference" drop default;
+
+alter table "public"."tasks" alter column "time_reference" drop not null;
+
diff --git a/apps/db/supabase/migrations/20250621074218_new_migration.sql b/apps/db/supabase/migrations/20250621074218_new_migration.sql
new file mode 100644
index 000000000..20ab0a00d
--- /dev/null
+++ b/apps/db/supabase/migrations/20250621074218_new_migration.sql
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+alter table "public"."tasks" alter column "list_id" drop not null;
+
+
+
+
+
+create or replace view "public"."time_tracking_session_analytics" as  SELECT tts.id,
+    tts.ws_id,
+    tts.user_id,
+    tts.task_id,
+    tts.category_id,
+    tts.title,
+    tts.description,
+    tts.start_time,
+    tts.end_time,
+    tts.duration_seconds,
+    tts.is_running,
+    tts.tags,
+    tts.created_at,
+    tts.updated_at,
+    tts.productivity_score,
+    tts.was_resumed,
+    ttc.name AS category_name,
+    ttc.color AS category_color,
+    t.name AS task_name,
+    EXTRACT(hour FROM tts.start_time) AS start_hour,
+    EXTRACT(dow FROM tts.start_time) AS day_of_week,
+    date_trunc('day'::text, tts.start_time) AS session_date,
+    date_trunc('week'::text, tts.start_time) AS session_week,
+    date_trunc('month'::text, tts.start_time) AS session_month,
+        CASE
+            WHEN (tts.duration_seconds >= 7200) THEN 'long'::text
+            WHEN (tts.duration_seconds >= 1800) THEN 'medium'::text
+            WHEN (tts.duration_seconds >= 300) THEN 'short'::text
+            ELSE 'micro'::text
+        END AS session_length_category
+   FROM ((time_tracking_sessions tts
+     LEFT JOIN time_tracking_categories ttc ON ((tts.category_id = ttc.id)))
+     LEFT JOIN tasks t ON ((tts.task_id = t.id)));
+
+
+
diff --git a/apps/db/supabase/migrations/20250621082137_new_migration.sql b/apps/db/supabase/migrations/20250621082137_new_migration.sql
new file mode 100644
index 000000000..3f0765d66
--- /dev/null
+++ b/apps/db/supabase/migrations/20250621082137_new_migration.sql
@@ -0,0 +1,41 @@
+drop view if exists "public"."time_tracking_session_analytics";
+
+
+
+
+create or replace view "public"."time_tracking_session_analytics" as  SELECT tts.id,
+    tts.ws_id,
+    tts.user_id,
+    tts.task_id,
+    tts.category_id,
+    tts.title,
+    tts.description,
+    tts.start_time,
+    tts.end_time,
+    tts.duration_seconds,
+    tts.is_running,
+    tts.tags,
+    tts.created_at,
+    tts.updated_at,
+    tts.productivity_score,
+    tts.was_resumed,
+    ttc.name AS category_name,
+    ttc.color AS category_color,
+    t.name AS task_name,
+    EXTRACT(hour FROM tts.start_time) AS start_hour,
+    EXTRACT(dow FROM tts.start_time) AS day_of_week,
+    date_trunc('day'::text, tts.start_time) AS session_date,
+    date_trunc('week'::text, tts.start_time) AS session_week,
+    date_trunc('month'::text, tts.start_time) AS session_month,
+        CASE
+            WHEN (tts.duration_seconds >= 7200) THEN 'long'::text
+            WHEN (tts.duration_seconds >= 1800) THEN 'medium'::text
+            WHEN (tts.duration_seconds >= 300) THEN 'short'::text
+            ELSE 'micro'::text
+        END AS session_length_category
+   FROM ((time_tracking_sessions tts
+     LEFT JOIN time_tracking_categories ttc ON ((tts.category_id = ttc.id)))
+     LEFT JOIN tasks t ON ((tts.task_id = t.id)));
+
+
+
diff --git a/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/client.tsx b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/client.tsx
index 079c9afd0..4031eb845 100644
--- a/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/client.tsx
+++ b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/client.tsx
@@ -1,5 +1,7 @@
 'use client';
 
+import AddEventButton from './components/add-event-button';
+import AddEventModal from './components/add-event-dialog';
 import AutoScheduleComprehensiveDialog from './components/auto-schedule-comprehensive-dialog';
 import TestEventGeneratorButton from './components/test-event-generator-button';
 import { DEV_MODE } from '@/constants/common';
@@ -10,6 +12,7 @@ import { Sparkles } from '@tuturuuu/ui/icons';
 import { SmartCalendar } from '@tuturuuu/ui/legacy/calendar/smart-calendar';
 import { ROOT_WORKSPACE_ID } from '@tuturuuu/utils/constants';
 import { useLocale, useTranslations } from 'next-intl';
+import { useState } from 'react';
 
 export default function CalendarClientPage({
   experimentalGoogleToken,
@@ -20,11 +23,16 @@ export default function CalendarClientPage({
 }) {
   const t = useTranslations('calendar');
   const locale = useLocale();
+  const [isAddEventModalOpen, setIsAddEventModalOpen] = useState(false);
+
+  const openAddEventDialog = () => setIsAddEventModalOpen(true);
+  const closeAddEventDialog = () => setIsAddEventModalOpen(false);
 
   const extras =
     workspace.id === ROOT_WORKSPACE_ID ? (
       <div className="grid w-full items-center gap-2 md:flex md:w-auto">
         {DEV_MODE && <TestEventGeneratorButton wsId={workspace.id} />}
+        <AddEventButton onOpenDialog={openAddEventDialog} />
         <AutoScheduleComprehensiveDialog wsId={workspace.id}>
           <Button
             variant="default"
@@ -39,18 +47,25 @@ export default function CalendarClientPage({
     ) : undefined;
 
   return (
-    <SmartCalendar
-      t={t}
-      locale={locale}
-      workspace={workspace}
-      useQuery={useQuery}
-      useQueryClient={useQueryClient}
-      experimentalGoogleToken={
-        experimentalGoogleToken?.ws_id === workspace.id
-          ? experimentalGoogleToken
-          : null
-      }
-      extras={extras}
-    />
+    <>
+      <SmartCalendar
+        t={t}
+        locale={locale}
+        workspace={workspace}
+        useQuery={useQuery}
+        useQueryClient={useQueryClient}
+        experimentalGoogleToken={
+          experimentalGoogleToken?.ws_id === workspace.id
+            ? experimentalGoogleToken
+            : null
+        }
+        extras={extras}
+      />
+      <AddEventModal
+        wsId={workspace.id}
+        isOpen={isAddEventModalOpen}
+        onClose={closeAddEventDialog}
+      />
+    </>
   );
 }
diff --git a/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/add-event-button.tsx b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/add-event-button.tsx
new file mode 100644
index 000000000..b85468062
--- /dev/null
+++ b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/add-event-button.tsx
@@ -0,0 +1,21 @@
+import { Button } from '@tuturuuu/ui/button';
+import { PlusIcon } from '@tuturuuu/ui/icons';
+import React from 'react';
+
+interface AddEventButtonProps {
+  onOpenDialog?: () => void;
+}
+
+export default function AddEventButton({ onOpenDialog }: AddEventButtonProps) {
+  return (
+    <Button
+      onClick={onOpenDialog}
+      variant="default"
+      size="sm"
+      className="w-full bg-blue-500 text-white hover:bg-blue-600 md:w-fit"
+    >
+      <PlusIcon className="mr-2 h-4 w-4" />
+      Add Event
+    </Button>
+  );
+}
diff --git a/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/add-event-dialog.tsx b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/add-event-dialog.tsx
new file mode 100644
index 000000000..b2204b89d
--- /dev/null
+++ b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/add-event-dialog.tsx
@@ -0,0 +1,512 @@
+import { createClient } from '@tuturuuu/supabase/next/client';
+import { Button } from '@tuturuuu/ui/button';
+import { Checkbox } from '@tuturuuu/ui/checkbox';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@tuturuuu/ui/dialog';
+import { CalendarIcon, ClockIcon, PlusIcon } from '@tuturuuu/ui/icons';
+import { Input } from '@tuturuuu/ui/input';
+import { Label } from '@tuturuuu/ui/label';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@tuturuuu/ui/select';
+import { Separator } from '@tuturuuu/ui/separator';
+import { Textarea } from '@tuturuuu/ui/textarea';
+import dayjs from 'dayjs';
+import React from 'react';
+
+interface AddEventModalProps {
+  isOpen?: boolean;
+  onClose?: () => void;
+  wsId?: string;
+}
+
+export default function AddEventModal({
+  isOpen,
+  onClose,
+  wsId,
+}: AddEventModalProps) {
+  const [formData, setFormData] = React.useState({
+    name: '',
+    description: '',
+    total_duration: 1,
+    is_splittable: true,
+    min_split_duration_hours: 0.5,
+    max_split_duration_hours: 2,
+    time_reference: 'working_time',
+    start_date: '',
+    end_date: '',
+  });
+
+  const [errors, setErrors] = React.useState<Record<string, string>>({});
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [user, setUser] = React.useState<any>(null);
+  const supabase = createClient();
+
+  React.useEffect(() => {
+    const getUser = async () => {
+      const {
+        data: { user },
+        error,
+      } = await supabase.auth.getUser();
+      if (!error && user) {
+        setUser(user);
+      }
+    };
+
+    getUser();
+  }, [supabase]);
+
+  const validateForm = () => {
+    const newErrors: Record<string, string> = {};
+
+    if (!formData.name.trim()) {
+      newErrors.name = 'Task name is required';
+    }
+
+    if (formData.total_duration <= 0) {
+      newErrors.total_duration = 'Duration must be greater than 0';
+    }
+
+    if (formData.is_splittable) {
+      if (formData.min_split_duration_hours <= 0) {
+        newErrors.min_split_duration_hours =
+          'Minimum duration must be greater than 0';
+      }
+
+      if (formData.max_split_duration_hours <= 0) {
+        newErrors.max_split_duration_hours =
+          'Maximum duration must be greater than 0';
+      }
+
+      if (
+        formData.min_split_duration_hours > formData.max_split_duration_hours
+      ) {
+        newErrors.min_split_duration_hours =
+          'Minimum duration cannot be greater than maximum';
+      }
+    }
+
+    if (formData.end_date && dayjs(formData.end_date).isBefore(dayjs())) {
+      newErrors.end_date = 'End date cannot be in the past';
+    }
+
+    setErrors(newErrors);
+    return Object.keys(newErrors).length === 0;
+  };
+
+  const updateFormData = (field: string, value: string | number | boolean) => {
+    setFormData((prev) => ({ ...prev, [field]: value }));
+    if (errors[field]) {
+      setErrors((prev) => ({ ...prev, [field]: '' }));
+    }
+  };
+
+  const submitToDatabase = async () => {
+    if (!wsId) {
+      setErrors({ submit: 'Workspace ID is required' });
+      return false;
+    }
+
+    if (!user) {
+      setErrors({ submit: 'Authentication required. Please log in.' });
+      return false;
+    }
+
+    try {
+      setIsLoading(true);
+
+      const taskData = {
+        name: formData.name.trim(),
+        description: formData.description.trim() || null,
+        total_duration: formData.total_duration,
+        is_splittable: formData.is_splittable,
+        min_split_duration_hours: formData.is_splittable
+          ? formData.min_split_duration_hours
+          : null,
+        max_split_duration_hours: formData.is_splittable
+          ? formData.max_split_duration_hours
+          : null,
+        time_reference: formData.time_reference as
+          | 'working_time'
+          | 'personal_time',
+        start_date: formData.start_date || null,
+        end_date: formData.end_date || null,
+        ws_id: wsId,
+        creator_id: user.id,
+        archived: false,
+        completed: false,
+        created_at: new Date().toISOString(),
+      };
+
+      const { data, error } = await supabase
+        .from('tasks')
+        .insert([taskData])
+        .select();
+
+      if (error) {
+        console.error('Database error:', error);
+        setErrors({ submit: `Failed to create task: ${error.message}` });
+        return false;
+      }
+
+      console.log('Task created successfully:', data);
+      return true;
+    } catch (error) {
+      console.error('Unexpected error:', error);
+      setErrors({ submit: 'An unexpected error occurred. Please try again.' });
+      return false;
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+
+    if (!validateForm()) {
+      return;
+    }
+
+    const success = await submitToDatabase();
+    if (success) {
+      handleClose();
+    }
+  };
+
+  const handleClose = () => {
+    setFormData({
+      name: '',
+      description: '',
+      total_duration: 1,
+      is_splittable: true,
+      min_split_duration_hours: 0.5,
+      max_split_duration_hours: 2,
+      time_reference: 'working_time',
+      start_date: '',
+      end_date: '',
+    });
+    setErrors({});
+    onClose?.();
+  };
+
+  const workingHoursOptions = [
+    {
+      value: 'working_time',
+      label: 'Working Hours',
+      icon: '💼',
+      description: 'Schedule during standard work hours',
+    },
+    {
+      value: 'personal_time',
+      label: 'Personal Time',
+      icon: '⚙️',
+      description: 'Schedule at any time of day',
+    },
+  ];
+
+  return (
+    <Dialog open={isOpen} onOpenChange={handleClose}>
+      <DialogContent className="max-h-[90vh] overflow-y-auto sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <PlusIcon className="h-5 w-5" />
+            Create New Task
+          </DialogTitle>
+          <DialogDescription>
+            Schedule a new task with your preferred settings and constraints.
+          </DialogDescription>
+        </DialogHeader>
+
+        <form onSubmit={handleSubmit} className="space-y-6">
+          {/* Basic Information */}
+          <div className="space-y-4">
+            <div className="space-y-2">
+              <Label htmlFor="task-title">
+                Task Name <span className="text-destructive">*</span>
+              </Label>
+              <Input
+                id="task-title"
+                placeholder="e.g., Complete project documentation"
+                value={formData.name}
+                onChange={(e) => updateFormData('name', e.target.value)}
+                className={errors.name ? 'border-destructive' : ''}
+              />
+              {errors.name && (
+                <p className="text-sm text-destructive">{errors.name}</p>
+              )}
+            </div>
+
+            <div className="space-y-2">
+              <Label htmlFor="task-description">Description (Optional)</Label>
+              <Textarea
+                id="task-description"
+                placeholder="Add any additional details about this task..."
+                value={formData.description}
+                onChange={(e) => updateFormData('description', e.target.value)}
+                rows={2}
+              />
+            </div>
+          </div>
+
+          <Separator />
+
+          {/* Duration Settings */}
+          <div className="space-y-4">
+            <div className="mb-3 flex items-center gap-2">
+              <ClockIcon className="h-4 w-4 text-muted-foreground" />
+              <Label className="text-sm font-medium">Duration Settings</Label>
+            </div>
+
+            <div className="space-y-4">
+              <div className="space-y-2">
+                <Label htmlFor="duration" className="text-sm">
+                  Total Duration (h) <span className="text-destructive">*</span>
+                </Label>
+                <Input
+                  id="duration"
+                  type="number"
+                  step="0.25"
+                  min="0.25"
+                  value={formData.total_duration}
+                  onChange={(e) =>
+                    updateFormData('total_duration', parseFloat(e.target.value))
+                  }
+                  className={errors.total_duration ? 'border-destructive' : ''}
+                />
+                {errors.total_duration && (
+                  <p className="text-xs text-destructive">
+                    {errors.total_duration}
+                  </p>
+                )}
+              </div>
+
+              <div className="flex items-center space-x-2">
+                <Checkbox
+                  id="split-up"
+                  checked={formData.is_splittable}
+                  onCheckedChange={(checked) =>
+                    updateFormData('is_splittable', checked)
+                  }
+                />
+                <Label htmlFor="split-up" className="text-sm font-normal">
+                  Allow splitting into smaller sessions
+                </Label>
+              </div>
+
+              {formData.is_splittable && (
+                <div className="grid grid-cols-2 gap-3">
+                  <div className="space-y-2">
+                    <Label htmlFor="min-duration" className="text-sm">
+                      Min Duration (h){' '}
+                      <span className="text-destructive">*</span>
+                    </Label>
+                    <Input
+                      id="min-duration"
+                      type="number"
+                      step="0.25"
+                      min="0.25"
+                      value={formData.min_split_duration_hours}
+                      onChange={(e) =>
+                        updateFormData(
+                          'min_split_duration_hours',
+                          parseFloat(e.target.value)
+                        )
+                      }
+                      className={
+                        errors.min_split_duration_hours
+                          ? 'border-destructive'
+                          : ''
+                      }
+                    />
+                    {errors.min_split_duration_hours && (
+                      <p className="text-xs text-destructive">
+                        {errors.min_split_duration_hours}
+                      </p>
+                    )}
+                  </div>
+
+                  <div className="space-y-2">
+                    <Label htmlFor="max-duration" className="text-sm">
+                      Max Duration (h){' '}
+                      <span className="text-destructive">*</span>
+                    </Label>
+                    <Input
+                      id="max-duration"
+                      type="number"
+                      step="0.25"
+                      min="0.25"
+                      value={formData.max_split_duration_hours}
+                      onChange={(e) =>
+                        updateFormData(
+                          'max_split_duration_hours',
+                          parseFloat(e.target.value)
+                        )
+                      }
+                      className={
+                        errors.max_split_duration_hours
+                          ? 'border-destructive'
+                          : ''
+                      }
+                    />
+                    {errors.max_split_duration_hours && (
+                      <p className="text-xs text-destructive">
+                        {errors.max_split_duration_hours}
+                      </p>
+                    )}
+                  </div>
+                </div>
+              )}
+
+              <div className="rounded-lg bg-accent/50 p-3 text-xs text-muted-foreground">
+                <strong>Duration Guidelines:</strong>
+                <ul className="mt-1 space-y-1">
+                  <li>
+                    • <strong>Total:</strong> How long this task should take
+                    overall
+                  </li>
+                  {formData.is_splittable && (
+                    <>
+                      <li>
+                        • <strong>Min:</strong> Minimum time block needed for
+                        meaningful progress
+                      </li>
+                      <li>
+                        • <strong>Max:</strong> Maximum time to work on this
+                        task at once
+                      </li>
+                    </>
+                  )}
+                </ul>
+              </div>
+            </div>
+          </div>
+
+          <Separator />
+
+          {/* Scheduling Preferences */}
+          <div className="space-y-4">
+            <div className="space-y-2">
+              <div className="mb-2 flex items-center gap-2">
+                <ClockIcon className="h-4 w-4 text-muted-foreground" />
+                <Label className="text-sm font-medium">Working Hours</Label>
+              </div>
+              <Select
+                value={formData.time_reference}
+                onValueChange={(value) =>
+                  updateFormData('time_reference', value)
+                }
+              >
+                <SelectTrigger>
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {workingHoursOptions.map((option) => (
+                    <SelectItem key={option.value} value={option.value}>
+                      <div className="flex items-center gap-2">
+                        <span>{option.icon}</span>
+                        <div>
+                          <div className="font-medium">{option.label}</div>
+                          <div className="text-xs text-muted-foreground">
+                            {option.description}
+                          </div>
+                        </div>
+                      </div>
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+
+            <div className="grid grid-cols-2 gap-4">
+              <div className="space-y-2">
+                <Label htmlFor="start-date" className="text-sm">
+                  Start Date (Optional)
+                </Label>
+                <Input
+                  id="start-date"
+                  type="datetime-local"
+                  value={formData.start_date}
+                  onChange={(e) => updateFormData('start_date', e.target.value)}
+                  min={dayjs().format('YYYY-MM-DDTHH:mm')}
+                />
+              </div>
+
+              <div className="space-y-2">
+                <div className="flex items-center gap-2">
+                  <CalendarIcon className="h-4 w-4 text-muted-foreground" />
+                  <Label htmlFor="end-date" className="text-sm">
+                    End Date (Optional)
+                  </Label>
+                </div>
+                <Input
+                  id="end-date"
+                  type="datetime-local"
+                  value={formData.end_date}
+                  onChange={(e) => updateFormData('end_date', e.target.value)}
+                  min={dayjs().format('YYYY-MM-DDTHH:mm')}
+                  className={errors.end_date ? 'border-destructive' : ''}
+                />
+                {errors.end_date && (
+                  <p className="text-xs text-destructive">{errors.end_date}</p>
+                )}
+              </div>
+            </div>
+
+            <div className="rounded-lg bg-blue-50 p-3 text-sm text-blue-800">
+              <div className="flex items-center gap-2">
+                <span>📧</span>
+                <span>
+                  Tasks will be scheduled for {user?.email || 'your account'}
+                </span>
+              </div>
+            </div>
+          </div>
+
+          {errors.submit && (
+            <div className="rounded-lg bg-destructive/10 p-3 text-sm text-destructive">
+              {errors.submit}
+            </div>
+          )}
+
+          <DialogFooter className="gap-2">
+            <Button
+              type="button"
+              variant="outline"
+              onClick={handleClose}
+              disabled={isLoading}
+            >
+              Cancel
+            </Button>
+            <Button
+              type="submit"
+              className="bg-blue-500 hover:bg-blue-600"
+              disabled={isLoading}
+            >
+              {isLoading ? (
+                <>
+                  <div className="mr-2 h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent" />
+                  Creating...
+                </>
+              ) : (
+                <>
+                  <PlusIcon className="mr-2 h-4 w-4" />
+                  Create Task
+                </>
+              )}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/tasks-sidebar-content.tsx b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/tasks-sidebar-content.tsx
index 5e6b78c04..8df61dc89 100644
--- a/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/tasks-sidebar-content.tsx
+++ b/apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/tasks-sidebar-content.tsx
@@ -234,6 +234,12 @@ export default function TasksSidebarContent({
                 is_assigned_to_current_user:
                   taskMeta.is_assigned_to_current_user || undefined,
                 assignees: taskMeta.assignees || undefined,
+                is_splittable: null,
+                max_split_duration_hours: null,
+                min_split_duration_hours: null,
+                time_reference: null,
+                total_duration: null,
+                user_defined_priority: null,
               };
 
               return extendedTask;
diff --git a/packages/types/src/supabase.ts b/packages/types/src/supabase.ts
index d30084af8..b0d79ead4 100644
--- a/packages/types/src/supabase.ts
+++ b/packages/types/src/supabase.ts
@@ -3639,10 +3639,20 @@ export type Database = {
           description: string | null;
           end_date: string | null;
           id: string;
-          list_id: string;
+          is_splittable: boolean | null;
+          list_id: string | null;
+          max_split_duration_hours: number | null;
+          min_split_duration_hours: number | null;
           name: string;
           priority: number | null;
           start_date: string | null;
+          time_reference:
+            | Database['public']['Enums']['calendar_task_time']
+            | null;
+          total_duration: number | null;
+          user_defined_priority:
+            | Database['public']['Enums']['priority_status']
+            | null;
         };
         Insert: {
           archived?: boolean | null;
@@ -3653,10 +3663,20 @@ export type Database = {
           description?: string | null;
           end_date?: string | null;
           id?: string;
-          list_id: string;
+          is_splittable?: boolean | null;
+          list_id?: string | null;
+          max_split_duration_hours?: number | null;
+          min_split_duration_hours?: number | null;
           name: string;
           priority?: number | null;
           start_date?: string | null;
+          time_reference?:
+            | Database['public']['Enums']['calendar_task_time']
+            | null;
+          total_duration?: number | null;
+          user_defined_priority?:
+            | Database['public']['Enums']['priority_status']
+            | null;
         };
         Update: {
           archived?: boolean | null;
@@ -3667,10 +3687,20 @@ export type Database = {
           description?: string | null;
           end_date?: string | null;
           id?: string;
-          list_id?: string;
+          is_splittable?: boolean | null;
+          list_id?: string | null;
+          max_split_duration_hours?: number | null;
+          min_split_duration_hours?: number | null;
           name?: string;
           priority?: number | null;
           start_date?: string | null;
+          time_reference?:
+            | Database['public']['Enums']['calendar_task_time']
+            | null;
+          total_duration?: number | null;
+          user_defined_priority?:
+            | Database['public']['Enums']['priority_status']
+            | null;
         };
         Relationships: [
           {
@@ -5062,52 +5092,103 @@ export type Database = {
           },
         ];
       };
-      workspace_calendar_sync_log: {
+      workspace_calendar_tasks: {
         Row: {
           created_at: string;
-          deleted_events: Json | null;
-          error_message: string | null;
-          event_snapshot_before: Json;
-          google_account_email: string | null;
+          creator_id: string | null;
+          description: string | null;
+          due_date: string | null;
+          evaluated_priority:
+            | Database['public']['Enums']['priority_status']
+            | null;
           id: string;
-          status: string;
-          sync_ended_at: string | null;
-          sync_started_at: string;
-          triggered_by: string;
-          upserted_events: Json | null;
-          ws_id: string;
+          is_splittable: boolean | null;
+          max_split_duration_minutes: number | null;
+          min_split_duration_minutes: number | null;
+          name: string | null;
+          schedule_after: string | null;
+          time_reference:
+            | Database['public']['Enums']['calendar_task_time']
+            | null;
+          total_duration: number;
+          updated_at: string | null;
+          user_defined_priority:
+            | Database['public']['Enums']['priority_status']
+            | null;
+          ws_id: string | null;
         };
         Insert: {
           created_at?: string;
-          deleted_events?: Json | null;
-          error_message?: string | null;
-          event_snapshot_before: Json;
-          google_account_email?: string | null;
-          id?: string;
-          status: string;
-          sync_ended_at?: string | null;
-          sync_started_at: string;
-          triggered_by: string;
-          upserted_events?: Json | null;
-          ws_id: string;
+          creator_id?: string | null;
+          description?: string | null;
+          due_date?: string | null;
+          evaluated_priority?:
+            | Database['public']['Enums']['priority_status']
+            | null;
+          id?: string;
+          is_splittable?: boolean | null;
+          max_split_duration_minutes?: number | null;
+          min_split_duration_minutes?: number | null;
+          name?: string | null;
+          schedule_after?: string | null;
+          time_reference?:
+            | Database['public']['Enums']['calendar_task_time']
+            | null;
+          total_duration: number;
+          updated_at?: string | null;
+          user_defined_priority?:
+            | Database['public']['Enums']['priority_status']
+            | null;
+          ws_id?: string | null;
         };
         Update: {
           created_at?: string;
-          deleted_events?: Json | null;
-          error_message?: string | null;
-          event_snapshot_before?: Json;
-          google_account_email?: string | null;
-          id?: string;
-          status?: string;
-          sync_ended_at?: string | null;
-          sync_started_at?: string;
-          triggered_by?: string;
-          upserted_events?: Json | null;
-          ws_id?: string;
+          creator_id?: string | null;
+          description?: string | null;
+          due_date?: string | null;
+          evaluated_priority?:
+            | Database['public']['Enums']['priority_status']
+            | null;
+          id?: string;
+          is_splittable?: boolean | null;
+          max_split_duration_minutes?: number | null;
+          min_split_duration_minutes?: number | null;
+          name?: string | null;
+          schedule_after?: string | null;
+          time_reference?:
+            | Database['public']['Enums']['calendar_task_time']
+            | null;
+          total_duration?: number;
+          updated_at?: string | null;
+          user_defined_priority?:
+            | Database['public']['Enums']['priority_status']
+            | null;
+          ws_id?: string | null;
         };
         Relationships: [
           {
-            foreignKeyName: 'workspace_calendar_sync_log_ws_id_fkey';
+            foreignKeyName: 'workspace_calendar_taskss_creator_id_fkey';
+            columns: ['creator_id'];
+            isOneToOne: false;
+            referencedRelation: 'nova_user_challenge_leaderboard';
+            referencedColumns: ['user_id'];
+          },
+          {
+            foreignKeyName: 'workspace_calendar_taskss_creator_id_fkey';
+            columns: ['creator_id'];
+            isOneToOne: false;
+            referencedRelation: 'nova_user_leaderboard';
+            referencedColumns: ['user_id'];
+          },
+          {
+            foreignKeyName: 'workspace_calendar_taskss_creator_id_fkey';
+            columns: ['creator_id'];
+            isOneToOne: false;
+            referencedRelation: 'users';
+            referencedColumns: ['id'];
+          },
+          {
+            foreignKeyName: 'workspace_calendar_taskss_ws_id_fkey';
             columns: ['ws_id'];
             isOneToOne: false;
             referencedRelation: 'workspaces';
@@ -7110,71 +7191,6 @@ export type Database = {
           },
         ];
       };
-      workspace_whiteboards: {
-        Row: {
-          created_at: string;
-          creator_id: string;
-          description: string | null;
-          id: string;
-          snapshot: Json | null;
-          thumbnail_url: string | null;
-          title: string;
-          updated_at: string;
-          ws_id: string;
-        };
-        Insert: {
-          created_at?: string;
-          creator_id: string;
-          description?: string | null;
-          id?: string;
-          snapshot?: Json | null;
-          thumbnail_url?: string | null;
-          title: string;
-          updated_at?: string;
-          ws_id: string;
-        };
-        Update: {
-          created_at?: string;
-          creator_id?: string;
-          description?: string | null;
-          id?: string;
-          snapshot?: Json | null;
-          thumbnail_url?: string | null;
-          title?: string;
-          updated_at?: string;
-          ws_id?: string;
-        };
-        Relationships: [
-          {
-            foreignKeyName: 'workspace_whiteboards_creator_id_fkey';
-            columns: ['creator_id'];
-            isOneToOne: false;
-            referencedRelation: 'nova_user_challenge_leaderboard';
-            referencedColumns: ['user_id'];
-          },
-          {
-            foreignKeyName: 'workspace_whiteboards_creator_id_fkey';
-            columns: ['creator_id'];
-            isOneToOne: false;
-            referencedRelation: 'nova_user_leaderboard';
-            referencedColumns: ['user_id'];
-          },
-          {
-            foreignKeyName: 'workspace_whiteboards_creator_id_fkey';
-            columns: ['creator_id'];
-            isOneToOne: false;
-            referencedRelation: 'users';
-            referencedColumns: ['id'];
-          },
-          {
-            foreignKeyName: 'workspace_whiteboards_ws_id_fkey';
-            columns: ['ws_id'];
-            isOneToOne: false;
-            referencedRelation: 'workspaces';
-            referencedColumns: ['id'];
-          },
-        ];
-      };
       workspaces: {
         Row: {
           avatar_url: string | null;
@@ -8261,10 +8277,12 @@ export type Database = {
         | 'paragraph_quiz'
         | 'flashcards';
       calendar_hour_type: 'WORK' | 'PERSONAL' | 'MEETING';
+      calendar_task_time: 'working_time' | 'personal_time';
       certificate_templates: 'original' | 'modern' | 'elegant';
       chat_role: 'FUNCTION' | 'USER' | 'SYSTEM' | 'ASSISTANT';
       dataset_type: 'excel' | 'csv' | 'html';
       platform_service: 'TUTURUUU' | 'REWISE' | 'NOVA' | 'UPSKII';
+      priority_status: 'low' | 'medium' | 'high' | 'critical';
       subscription_status: 'trialing' | 'active' | 'canceled' | 'past_due';
       task_board_status: 'not_started' | 'active' | 'done' | 'closed';
       workspace_role_permission:
@@ -8416,10 +8434,12 @@ export const Constants = {
         'flashcards',
       ],
       calendar_hour_type: ['WORK', 'PERSONAL', 'MEETING'],
+      calendar_task_time: ['working_time', 'personal_time'],
       certificate_templates: ['original', 'modern', 'elegant'],
       chat_role: ['FUNCTION', 'USER', 'SYSTEM', 'ASSISTANT'],
       dataset_type: ['excel', 'csv', 'html'],
       platform_service: ['TUTURUUU', 'REWISE', 'NOVA', 'UPSKII'],
+      priority_status: ['low', 'medium', 'high', 'critical'],
       subscription_status: ['trialing', 'active', 'canceled', 'past_due'],
       task_board_status: ['not_started', 'active', 'done', 'closed'],
       workspace_role_permission: [