diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 2e37062..cf21a0d 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -1,24 +1,41 @@
+import { lazy, Suspense } from 'react';
 import { Routes, Route, Navigate } from 'react-router-dom';
 import { ToastProvider, ToastViewport } from '@yetanother/ui';
-import { NotesPage } from './notes/NotesPage';
-import { TasksPage } from './tasks/TasksPage';
-import { CalendarPage } from './calendar/CalendarPage';
 import { Sidebar } from './components/Sidebar';
-import './index.css';
+import { SearchBar } from './ai/SearchBar';
+
+const NotesPage = lazy(() => import('./notes/NotesPage').then((m) => ({ default: m.NotesPage })));
+const TasksPage = lazy(() => import('./tasks/TasksPage').then((m) => ({ default: m.TasksPage })));
+const CalendarPage = lazy(() => import('./calendar/CalendarPage').then((m) => ({ default: m.CalendarPage })));
+
+function Loading() {
+  return (
+    <div className="flex items-center justify-center h-full text-muted-foreground">
+      Loading...
+    </div>
+  );
+}
 
 export function App() {
   return (
     <ToastProvider>
       <div className="h-screen flex">
         <Sidebar />
-        <main className="flex-1 overflow-hidden">
-          <Routes>
-            <Route path="/" element={<Navigate to="/notes" replace />} />
-            <Route path="/notes/*" element={<NotesPage />} />
-            <Route path="/tasks/*" element={<TasksPage />} />
-            <Route path="/calendar/*" element={<CalendarPage />} />
-          </Routes>
-        </main>
+        <div className="flex-1 flex flex-col overflow-hidden">
+          <div className="flex items-center justify-end px-4 py-2 border-b gap-3">
+            <SearchBar />
+          </div>
+          <main className="flex-1 overflow-hidden">
+            <Suspense fallback={<Loading />}>
+              <Routes>
+                <Route path="/" element={<Navigate to="/notes" replace />} />
+                <Route path="/notes/*" element={<NotesPage />} />
+                <Route path="/tasks/*" element={<TasksPage />} />
+                <Route path="/calendar/*" element={<CalendarPage />} />
+              </Routes>
+            </Suspense>
+          </main>
+        </div>
       </div>
       <ToastViewport />
     </ToastProvider>
diff --git a/apps/web/src/calendar/CalendarPage.tsx b/apps/web/src/calendar/CalendarPage.tsx
index 60e006c..d5a3fa8 100644
--- a/apps/web/src/calendar/CalendarPage.tsx
+++ b/apps/web/src/calendar/CalendarPage.tsx
@@ -1,6 +1,9 @@
 import { CalendarHeader } from './CalendarHeader';
 import { MonthView } from './MonthView';
+import { WeekView } from './WeekView';
+import { DayView } from './DayView';
 import { useCalendarStore } from '../stores/calendar';
+import { EventDialog } from './EventDialog';
 
 export function CalendarPage() {
   const view = useCalendarStore((s) => s.view);
@@ -8,12 +11,12 @@ export function CalendarPage() {
   return (
     <div className="flex flex-col h-full">
       <CalendarHeader />
+      {view === 'day' && <DayView />}
+      {view === 'week' && <WeekView />}
       {view === 'month' && <MonthView />}
-      {(view === 'day' || view === 'week') && (
-        <div className="flex-1 flex items-center justify-center text-muted-foreground">
-          Day/Week view coming soon
-        </div>
-      )}
+      {view === 'year' && <MonthView />}
+      {view === 'schedule' && <MonthView />}
+      <EventDialog />
     </div>
   );
 }
diff --git a/apps/web/src/calendar/DayView.tsx b/apps/web/src/calendar/DayView.tsx
new file mode 100644
index 0000000..4b9af11
--- /dev/null
+++ b/apps/web/src/calendar/DayView.tsx
@@ -0,0 +1,54 @@
+import { useCalendarStore } from '../stores/calendar';
+import { format, isSameDay, parseISO } from 'date-fns';
+
+const HOURS = Array.from({ length: 16 }, (_, i) => i + 6);
+
+export function DayView() {
+  const currentDate = useCalendarStore((s) => s.currentDate);
+  const events = useCalendarStore((s) => s.events);
+
+  const date = new Date(currentDate);
+  const dayEvents = events.filter((e) => isSameDay(parseISO(e.startTime), date));
+
+  return (
+    <div className="flex-1 flex flex-col overflow-auto">
+      <div className="sticky top-0 bg-background z-10 border-b px-4 py-3">
+        <h2 className="text-lg font-semibold">{format(date, 'EEEE, MMMM d')}</h2>
+      </div>
+
+      <div className="flex-1 relative">
+        {HOURS.map((hour) => (
+          <div key={hour} className="flex h-14 border-b">
+            <div className="w-16 px-3 text-xs text-muted-foreground pt-1 flex-shrink-0 text-right">
+              {format(new Date().setHours(hour, 0, 0, 0), 'ha')}
+            </div>
+            <div className="flex-1 border-l" />
+          </div>
+        ))}
+
+        {dayEvents.map((event) => {
+          const startHour = parseISO(event.startTime).getHours();
+          const endHour = parseISO(event.endTime ?? event.startTime).getHours();
+          const duration = Math.max(endHour - startHour, 1);
+
+          return (
+            <div
+              key={event.id}
+              className="absolute left-20 right-4 rounded px-2 py-1.5 text-sm overflow-hidden cursor-pointer"
+              style={{
+                top: `${(startHour - 6) * 56}px`,
+                height: `${duration * 56 - 4}px`,
+                backgroundColor: event.color + '20',
+                color: event.color,
+                borderLeft: `3px solid ${event.color}`,
+              }}
+            >
+              <div className="font-medium truncate">{event.title}</div>
+              <div className="text-xs opacity-75">{format(parseISO(event.startTime), 'h:mm a')}</div>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/calendar/EventDialog.tsx b/apps/web/src/calendar/EventDialog.tsx
new file mode 100644
index 0000000..430122b
--- /dev/null
+++ b/apps/web/src/calendar/EventDialog.tsx
@@ -0,0 +1,119 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@yetanother/ui';
+import { useCalendarStore, type CalendarEvent } from '../stores/calendar';
+
+interface EventDialogProps {
+  open?: boolean;
+  onClose?: () => void;
+}
+
+export function EventDialog({ open: controlledOpen, onClose }: EventDialogProps) {
+  const [internalOpen, setInternalOpen] = useState(false);
+  const addEvent = useCalendarStore((s) => s.addEvent);
+  const open = controlledOpen ?? internalOpen;
+  const close = onClose ?? (() => setInternalOpen(false));
+
+  const [title, setTitle] = useState('');
+  const [date, setDate] = useState(new Date().toISOString().slice(0, 10));
+  const [startTime, setStartTime] = useState('09:00');
+  const [endTime, setEndTime] = useState('10:00');
+  const [color, setColor] = useState('#3b82f6');
+
+  const handleSubmit = () => {
+    if (!title.trim()) return;
+    const event: CalendarEvent = {
+      id: crypto.randomUUID(),
+      title: title.trim(),
+      description: '',
+      startTime: new Date(`${date}T${startTime}`).toISOString(),
+      endTime: new Date(`${date}T${endTime}`).toISOString(),
+      allDay: false,
+      recurrenceRule: null,
+      color,
+      workspaceId: 'default',
+      taskId: null,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    };
+    addEvent(event);
+    setTitle('');
+    close();
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={(v) => !v && close()}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>New Event</DialogTitle>
+        </DialogHeader>
+        <div className="space-y-3">
+          <input
+            type="text"
+            value={title}
+            onChange={(e) => setTitle(e.target.value)}
+            placeholder="Event title"
+            className="w-full px-3 py-2 text-sm rounded-md border bg-background focus:outline-none focus:ring-2 focus:ring-ring"
+            autoFocus
+            onKeyDown={(e) => e.key === 'Enter' && handleSubmit()}
+          />
+          <div className="grid grid-cols-2 gap-3">
+            <div>
+              <label className="text-xs text-muted-foreground mb-1 block">Date</label>
+              <input
+                type="date"
+                value={date}
+                onChange={(e) => setDate(e.target.value)}
+                className="w-full px-3 py-2 text-sm rounded-md border bg-background focus:outline-none focus:ring-2 focus:ring-ring"
+              />
+            </div>
+            <div>
+              <label className="text-xs text-muted-foreground mb-1 block">Color</label>
+              <input
+                type="color"
+                value={color}
+                onChange={(e) => setColor(e.target.value)}
+                className="w-full h-9 rounded-md border cursor-pointer"
+              />
+            </div>
+          </div>
+          <div className="grid grid-cols-2 gap-3">
+            <div>
+              <label className="text-xs text-muted-foreground mb-1 block">Start</label>
+              <input
+                type="time"
+                value={startTime}
+                onChange={(e) => setStartTime(e.target.value)}
+                className="w-full px-3 py-2 text-sm rounded-md border bg-background focus:outline-none focus:ring-2 focus:ring-ring"
+              />
+            </div>
+            <div>
+              <label className="text-xs text-muted-foreground mb-1 block">End</label>
+              <input
+                type="time"
+                value={endTime}
+                onChange={(e) => setEndTime(e.target.value)}
+                className="w-full px-3 py-2 text-sm rounded-md border bg-background focus:outline-none focus:ring-2 focus:ring-ring"
+              />
+            </div>
+          </div>
+          <div className="flex justify-end gap-2 pt-2">
+            <button
+              type="button"
+              onClick={() => close()}
+              className="px-4 py-2 text-sm rounded-md hover:bg-accent transition-colors"
+            >
+              Cancel
+            </button>
+            <button
+              type="button"
+              onClick={handleSubmit}
+              className="px-4 py-2 text-sm rounded-md bg-primary text-primary-foreground hover:bg-primary/90 transition-colors"
+            >
+              Create Event
+            </button>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/web/src/calendar/WeekView.tsx b/apps/web/src/calendar/WeekView.tsx
new file mode 100644
index 0000000..d81a6b8
--- /dev/null
+++ b/apps/web/src/calendar/WeekView.tsx
@@ -0,0 +1,72 @@
+import { useCalendarStore, type CalendarEvent } from '../stores/calendar';
+import { startOfWeek, endOfWeek, eachDayOfInterval, format, isSameDay, isToday, parseISO } from 'date-fns';
+import { cn } from '@yetanother/utils';
+
+const HOURS = Array.from({ length: 14 }, (_, i) => i + 7);
+
+function getEventsForDay(events: CalendarEvent[], day: Date) {
+  return events.filter((e) => isSameDay(parseISO(e.startTime), day));
+}
+
+export function WeekView() {
+  const currentDate = useCalendarStore((s) => s.currentDate);
+  const events = useCalendarStore((s) => s.events);
+
+  const date = new Date(currentDate);
+  const weekStart = startOfWeek(date, { weekStartsOn: 0 });
+  const weekEnd = endOfWeek(date, { weekStartsOn: 0 });
+  const days = eachDayOfInterval({ start: weekStart, end: weekEnd });
+
+  return (
+    <div className="flex-1 flex flex-col overflow-auto">
+      <div className="grid grid-cols-8 border-b sticky top-0 bg-background z-10">
+        <div className="p-2 text-xs text-muted-foreground border-r" />
+        {days.map((day) => (
+          <div key={day.toISOString()} className={cn('p-2 text-center border-r', isToday(day) && 'bg-accent/30')}>
+            <div className="text-xs text-muted-foreground">{format(day, 'EEE')}</div>
+            <div className={cn('text-sm font-medium', isToday(day) && 'text-primary')}>{format(day, 'd')}</div>
+          </div>
+        ))}
+      </div>
+
+      <div className="flex-1 grid grid-cols-8">
+        <div className="border-r">
+          {HOURS.map((hour) => (
+            <div key={hour} className="h-12 border-b px-2 text-xs text-muted-foreground pt-1">
+              {format(new Date().setHours(hour, 0, 0, 0), 'ha')}
+            </div>
+          ))}
+        </div>
+
+        {days.map((day) => {
+          const dayEvents = getEventsForDay(events, day);
+          return (
+            <div key={day.toISOString()} className={cn('border-r relative', isToday(day) && 'bg-accent/10')}>
+              {HOURS.map((hour) => (
+                <div key={hour} className="h-12 border-b" />
+              ))}
+              {dayEvents.map((event) => {
+                const startHour = parseISO(event.startTime).getHours();
+                return (
+                  <div
+                    key={event.id}
+                    className="absolute left-1 right-1 rounded px-1.5 py-1 text-xs overflow-hidden cursor-pointer"
+                    style={{
+                      top: `${(startHour - 7) * 48}px`,
+                      height: '48px',
+                      backgroundColor: event.color + '20',
+                      color: event.color,
+                      borderLeft: `2px solid ${event.color}`,
+                    }}
+                  >
+                    <div className="font-medium truncate">{event.title}</div>
+                  </div>
+                );
+              })}
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/editor/Editor.tsx b/apps/web/src/editor/Editor.tsx
index 55db05e..4042365 100644
--- a/apps/web/src/editor/Editor.tsx
+++ b/apps/web/src/editor/Editor.tsx
@@ -1,15 +1,19 @@
+import { useEffect, useCallback } from 'react';
 import { useEditor, EditorContent, type Editor } from '@tiptap/react';
 import { extensions } from './extensions';
 import { EditorToolbar } from './EditorToolbar';
 import { SlashMenu } from './SlashMenu';
+import { AIAssistant } from '../ai/AIAssistant';
+import { collaboration } from '../lib/collaboration';
 
 interface EditorProps {
   content?: Record<string, unknown>;
   onChange?: (json: Record<string, unknown>) => void;
   editable?: boolean;
+  nodeId?: string;
 }
 
-export function BlockEditor({ content, onChange, editable = true }: EditorProps) {
+export function BlockEditor({ content, onChange, editable = true, nodeId }: EditorProps) {
   const editor = useEditor({
     extensions,
     content: content ?? { type: 'doc', content: [{ type: 'paragraph' }] },
@@ -25,11 +29,44 @@ export function BlockEditor({ content, onChange, editable = true }: EditorProps)
     },
   });
 
+  useEffect(() => {
+    if (!nodeId || !editor) return;
+
+    collaboration.connect(nodeId);
+
+    const unsubscribe = collaboration.onMessage((msg) => {
+      if (msg.type === 'update' && msg.sender !== 'self') {
+        // Apply remote updates (simplified — real CRDT sync uses y-prosemirror)
+      }
+    });
+
+    return () => {
+      unsubscribe();
+      collaboration.disconnect();
+    };
+  }, [nodeId, editor]);
+
+  const handleAIApply = useCallback((text: string) => {
+    if (!editor) return;
+    editor.commands.insertContent(`\n\n${text}\n\n`);
+  }, [editor]);
+
+  const getText = useCallback(() => {
+    return editor?.getText() ?? '';
+  }, [editor]);
+
   if (!editor) return null;
 
   return (
     <div className="border rounded-lg overflow-hidden bg-background">
-      {editable && <EditorToolbar editor={editor} />}
+      <div className="flex items-center justify-between">
+        {editable && <EditorToolbar editor={editor} />}
+        {editable && (
+          <div className="px-3">
+            <AIAssistant content={getText()} onApply={handleAIApply} />
+          </div>
+        )}
+      </div>
       <SlashMenu editor={editor} />
       <EditorContent editor={editor} />
     </div>