diff --git a/README.md b/README.md
index 9d91c9e..b965f1d 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 | **Collections** | Nested folders with drag-style reordering and public sharing |
 | **Tags** | Colour-coded labels with bulk assignment |
 | **Custom Domains** | Bring your own domain with DNS verification + SSL tracking |
-| **QR Codes** | PNG/SVG generation with optional logo embedding |
+| **QR Codes** | PNG/SVG generation with caching, optional logo embedding, and time-limited expiry |
 | **Bulk Operations** | Tag, move, extend expiry, or delete multiple links at once |
 | **CSV Import/Export** | Import up to 500 URLs; export visit logs as CSV |
 | **Link Chaining** | Point short links to other short links (max 5 hops, cycle detection) |
@@ -164,7 +164,8 @@ curl -L http://localhost:3000/aB3xK9m
 | `GET /api/urls/:code/visits` | Visit log |
 | `GET /api/urls/:code/stats` | Analytics (hourly/daily aggregation) |
 | `GET /api/urls/:code/visits/export` | CSV export of visits |
-| `GET /api/urls/:code/qr` | QR code generation |
+| `GET /api/urls/:code/qr` | QR code generation (cached, time-limited) |
+| `POST /api/urls/:code/qr/regenerate` | Regenerate expired QR code |
 | `POST /api/urls/:code/verify-password` | Password verification |
 | `PATCH /api/urls/:code/settings` | Update link settings |
 | `POST /api/collections` | Create collection |
diff --git a/apps/api/src/__tests__/index.test.ts b/apps/api/src/__tests__/index.test.ts
index fa505a7..d221c4a 100644
--- a/apps/api/src/__tests__/index.test.ts
+++ b/apps/api/src/__tests__/index.test.ts
@@ -40,25 +40,33 @@ vi.mock('../jobs/seedPlans', () => ({
 }))
 
 describe('Server entry point (index.ts)', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    vi.clearAllMocks()
+  })
+
   it('starts the server on the configured port', async () => {
     await import('../index')
-
-    expect(mockListen).toHaveBeenCalledWith(4000, expect.any(Function))
+    await vi.waitFor(() => {
+      expect(mockListen).toHaveBeenCalledWith(4000, expect.any(Function))
+    })
   })
 
   it('logs server start message', async () => {
     await import('../index')
-
-    expect(mockLogger.info).toHaveBeenCalledWith(
-      { port: 4000 },
-      'Server started',
-    )
+    await vi.waitFor(() => {
+      expect(mockLogger.info).toHaveBeenCalledWith(
+        { port: 4000 },
+        'Server started',
+      )
+    })
   })
 
   it('starts health check job when interval is configured', async () => {
     await import('../index')
-
-    expect(mockStartHealthCheckJob).toHaveBeenCalledWith(3600000)
+    await vi.waitFor(() => {
+      expect(mockStartHealthCheckJob).toHaveBeenCalledWith(3600000)
+    })
     expect(mockLogger.info).toHaveBeenCalledWith(
       { interval: 3600000 },
       'Health check job started',
@@ -67,7 +75,8 @@ describe('Server entry point (index.ts)', () => {
 
   it('seeds plans on startup (fire-and-forget)', async () => {
     await import('../index')
-
-    expect(mockSeedPlans).toHaveBeenCalled()
+    await vi.waitFor(() => {
+      expect(mockSeedPlans).toHaveBeenCalled()
+    })
   })
 })
diff --git a/apps/dashboard/src/components/copy-button.tsx b/apps/dashboard/src/components/copy-button.tsx
new file mode 100644
index 0000000..783a6f7
--- /dev/null
+++ b/apps/dashboard/src/components/copy-button.tsx
@@ -0,0 +1,51 @@
+import { useState, useCallback } from "react"
+import { Button } from "@/components/ui/button"
+import { Check, Copy } from "lucide-react"
+import { cn } from "@/lib/utils"
+
+interface CopyButtonProps {
+  text: string
+  className?: string
+  variant?: "primary" | "outline" | "ghost"
+  size?: "default" | "sm" | "lg" | "icon"
+}
+
+export default function CopyButton({ text, className, variant = "outline", size = "icon" }: CopyButtonProps) {
+  const [copied, setCopied] = useState(false)
+
+  const handleCopy = useCallback(async () => {
+    try {
+      await navigator.clipboard.writeText(text)
+      setCopied(true)
+      setTimeout(() => setCopied(false), 1500)
+    } catch {
+      const input = document.createElement("input")
+      input.value = text
+      input.style.position = "fixed"
+      input.style.opacity = "0"
+      document.body.appendChild(input)
+      try {
+        input.select()
+        if (document.execCommand("copy")) {
+          setCopied(true)
+          setTimeout(() => setCopied(false), 1500)
+        }
+      } finally {
+        document.body.removeChild(input)
+      }
+    }
+  }, [text])
+
+  return (
+    <Button
+      variant={variant}
+      size={size}
+      onClick={handleCopy}
+      className={cn("gap-1.5", className)}
+      title="Copy to clipboard"
+    >
+      {copied ? <Check className="h-3.5 w-3.5 text-emerald-500" /> : <Copy className="h-3.5 w-3.5" />}
+      {copied ? "Copied" : "Copy"}
+    </Button>
+  )
+}
diff --git a/apps/dashboard/src/components/status-badge.tsx b/apps/dashboard/src/components/status-badge.tsx
new file mode 100644
index 0000000..f33bdb8
--- /dev/null
+++ b/apps/dashboard/src/components/status-badge.tsx
@@ -0,0 +1,44 @@
+import { Badge } from "@/components/ui/badge"
+import { cn } from "@/lib/utils"
+
+interface StatusBadgeProps {
+  status: string
+  className?: string
+}
+
+const statusConfig: Record<string, { label: string; variant: "default" | "secondary" | "success" | "destructive" | "outline" }> = {
+  active: { label: "Active", variant: "success" },
+  expired: { label: "Expired", variant: "destructive" },
+  scheduled: { label: "Scheduled", variant: "outline" },
+  "password-protected": { label: "Password", variant: "default" },
+  "blocked-bots": { label: "Bots Blocked", variant: "secondary" },
+  inactive: { label: "Inactive", variant: "secondary" },
+}
+
+export default function StatusBadge({ status, className }: StatusBadgeProps) {
+  const config = statusConfig[status] ?? { label: status, variant: "outline" as const }
+
+  return (
+    <Badge variant={config.variant} className={cn("capitalize", className)}>
+      {config.label}
+    </Badge>
+  )
+}
+
+export function getLinkStatus(link: { expiresAt: string | null; activeAt: string | null; hasPassword: boolean; blockBots: boolean }): string {
+  const now = new Date()
+
+  if (link.activeAt && new Date(link.activeAt) > now) {
+    return "scheduled"
+  }
+  if (link.expiresAt && new Date(link.expiresAt) < now) {
+    return "expired"
+  }
+  if (link.hasPassword) {
+    return "password-protected"
+  }
+  if (link.blockBots) {
+    return "blocked-bots"
+  }
+  return "active"
+}
diff --git a/apps/dashboard/src/components/ui/command.tsx b/apps/dashboard/src/components/ui/command.tsx
new file mode 100644
index 0000000..964ba59
--- /dev/null
+++ b/apps/dashboard/src/components/ui/command.tsx
@@ -0,0 +1,136 @@
+import { cn } from "@/lib/utils"
+import { createContext, useContext, useState, useRef, useEffect, type ReactNode } from "react"
+
+interface CommandContextValue {
+  search: string
+  setSearch: (search: string) => void
+  filter?: (value: string, search: string) => boolean
+  inputRef: React.RefObject<HTMLInputElement | null>
+}
+
+const CommandContext = createContext<CommandContextValue | undefined>(undefined)
+
+function useCommand() {
+  const ctx = useContext(CommandContext)
+  if (!ctx) throw new Error("Command components must be used within Command")
+  return ctx
+}
+
+interface CommandProps {
+  children: ReactNode
+  className?: string
+  filter?: (value: string, search: string) => boolean
+}
+
+export function Command({ children, className, filter }: CommandProps) {
+  const [search, setSearch] = useState("")
+  const inputRef = useRef<HTMLInputElement>(null)
+
+  useEffect(() => {
+    setTimeout(() => inputRef.current?.focus(), 50)
+  }, [])
+
+  return (
+    <CommandContext.Provider value={{ search, setSearch, filter, inputRef }}>
+      <div className={cn("", className)}>
+        {children}
+      </div>
+    </CommandContext.Provider>
+  )
+}
+
+interface CommandInputProps {
+  placeholder?: string
+  className?: string
+}
+
+export function CommandInput({ placeholder = "Search...", className }: CommandInputProps) {
+  const { search, setSearch, inputRef } = useCommand()
+  return (
+    <div className="flex items-center border-b border-border px-3">
+      <input
+        ref={inputRef}
+        value={search}
+        onChange={(e) => setSearch(e.target.value)}
+        placeholder={placeholder}
+        className={cn(
+          "flex h-9 w-full rounded-md bg-transparent py-2 text-sm text-foreground outline-none placeholder:text-muted-foreground",
+          className
+        )}
+      />
+    </div>
+  )
+}
+
+interface CommandListProps {
+  children: ReactNode
+  className?: string
+}
+
+export function CommandList({ children, className }: CommandListProps) {
+  return (
+    <div className={cn("max-h-60 overflow-y-auto py-1", className)}>
+      {children}
+    </div>
+  )
+}
+
+interface CommandEmptyProps {
+  children: ReactNode
+  className?: string
+}
+
+export function CommandEmpty({ children, className }: CommandEmptyProps) {
+  return (
+    <div className={cn("py-6 text-center text-sm text-muted-foreground", className)}>
+      {children}
+    </div>
+  )
+}
+
+interface CommandItemProps {
+  children: ReactNode
+  value?: string
+  onSelect?: () => void
+  disabled?: boolean
+  className?: string
+}
+
+export function CommandItem({ children, value, onSelect, disabled, className }: CommandItemProps) {
+  const { search, filter } = useCommand()
+  if (search) {
+    const match = filter ? filter(value ?? "", search) : value?.toLowerCase().includes(search.toLowerCase())
+    if (!match) return null
+  }
+
+  return (
+    <button
+      type="button"
+      disabled={disabled}
+      onClick={onSelect}
+      className={cn(
+        "relative flex w-full cursor-default select-none items-center rounded-md px-2 py-1.5 text-sm text-foreground outline-none transition-colors hover:bg-muted aria-selected:bg-muted data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+        className
+      )}
+    >
+      {children}
+    </button>
+  )
+}
+
+interface CommandGroupProps {
+  children: ReactNode
+  heading?: string
+  className?: string
+}
+
+export function CommandGroup({ children, heading, className }: CommandGroupProps) {
+  return (
+    <div className={cn("", className)}>
+      {heading && (
+        <div className="px-2 py-1.5 text-xs font-medium text-muted-foreground">{heading}</div>
+      )}
+      {children}
+    </div>
+  )
+}
diff --git a/apps/dashboard/src/components/ui/dialog.tsx b/apps/dashboard/src/components/ui/dialog.tsx
new file mode 100644
index 0000000..c00e9e0
--- /dev/null
+++ b/apps/dashboard/src/components/ui/dialog.tsx
@@ -0,0 +1,131 @@
+import { cn } from "@/lib/utils"
+import { createContext, useContext, useEffect, useRef, useId, useCallback, type ReactNode } from "react"
+
+interface DialogContextValue {
+  titleId: string
+  descriptionId: string
+}
+
+const DialogContext = createContext<DialogContextValue | undefined>(undefined)
+
+export function useDialog() {
+  const ctx = useContext(DialogContext)
+  if (!ctx) throw new Error("Dialog components must be used within Dialog")
+  return ctx
+}
+
+interface DialogProps {
+  open: boolean
+  onClose: () => void
+  children: ReactNode
+}
+
+export function Dialog({ open, onClose, children }: DialogProps) {
+  const overlayRef = useRef<HTMLDivElement>(null)
+  const contentRef = useRef<HTMLDivElement>(null)
+  const previousFocusRef = useRef<HTMLElement | null>(null)
+  const titleId = useId()
+  const descriptionId = useId()
+
+  const getFocusableElements = useCallback(() => {
+    if (!contentRef.current) return []
+    return Array.from(
+      contentRef.current.querySelectorAll<HTMLElement>(
+        'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])'
+      )
+    )
+  }, [])
+
+  useEffect(() => {
+    if (!open) return
+    previousFocusRef.current = document.activeElement as HTMLElement
+    const timer = setTimeout(() => {
+      const focusable = getFocusableElements()
+      if (focusable.length > 0) focusable[0].focus()
+    }, 50)
+    return () => clearTimeout(timer)
+  }, [open, getFocusableElements])
+
+  useEffect(() => {
+    if (!open) {
+      const timer = setTimeout(() => previousFocusRef.current?.focus(), 50)
+      return () => clearTimeout(timer)
+    }
+  }, [open])
+
+  useEffect(() => {
+    if (!open) return
+    const handler = (e: KeyboardEvent) => {
+      if (e.key === "Escape") {
+        onClose()
+        return
+      }
+      if (e.key === "Tab") {
+        const focusable = getFocusableElements()
+        if (focusable.length === 0) return
+        const first = focusable[0]
+        const last = focusable[focusable.length - 1]
+        if (e.shiftKey) {
+          if (document.activeElement === first) {
+            e.preventDefault()
+            last.focus()
+          }
+        } else {
+          if (document.activeElement === last) {
+            e.preventDefault()
+            first.focus()
+          }
+        }
+      }
+    }
+    document.addEventListener("keydown", handler)
+    document.body.style.overflow = "hidden"
+    return () => {
+      document.removeEventListener("keydown", handler)
+      document.body.style.overflow = ""
+    }
+  }, [open, onClose, getFocusableElements])
+
+  if (!open) return null
+
+  return (
+    <DialogContext.Provider value={{ titleId, descriptionId }}>
+      <div
+        ref={overlayRef}
+        className="fixed inset-0 z-50 flex items-center justify-center bg-black/12 backdrop-blur-sm"
+        onClick={(e) => {
+          if (e.target === overlayRef.current) onClose()
+        }}
+      >
+        <div
+          ref={contentRef}
+          className="relative w-full max-w-lg mx-4 rounded-xl border border-border bg-card p-6 shadow-lg animate-in fade-in zoom-in-95"
+          role="dialog"
+          aria-modal="true"
+          aria-labelledby={titleId}
+          aria-describedby={descriptionId}
+        >
+          {children}
+        </div>
+      </div>
+    </DialogContext.Provider>
+  )
+}
+
+export function DialogHeader({ children, className }: { children: ReactNode; className?: string }) {
+  return <div className={cn("mb-4 space-y-1.5", className)}>{children}</div>
+}
+
+export function DialogTitle({ children, className }: { children: ReactNode; className?: string }) {
+  const { titleId } = useDialog()
+  return <h2 id={titleId} className={cn("text-base font-semibold text-foreground", className)}>{children}</h2>
+}
+
+export function DialogDescription({ children, className }: { children: ReactNode; className?: string }) {
+  const { descriptionId } = useDialog()
+  return <p id={descriptionId} className={cn("text-sm text-muted-foreground", className)}>{children}</p>
+}
+
+export function DialogFooter({ children, className }: { children: ReactNode; className?: string }) {
+  return <div className={cn("mt-6 flex items-center justify-end gap-2", className)}>{children}</div>
+}
diff --git a/apps/dashboard/src/components/ui/dropdown-menu.tsx b/apps/dashboard/src/components/ui/dropdown-menu.tsx
index ae7c855..a9f10d5 100644
--- a/apps/dashboard/src/components/ui/dropdown-menu.tsx
+++ b/apps/dashboard/src/components/ui/dropdown-menu.tsx
@@ -5,6 +5,8 @@ import {
   useState,
   useRef,
   useEffect,
+  cloneElement,
+  isValidElement,
   type ReactNode,
 } from "react"
 
@@ -32,11 +34,14 @@ export function DropdownMenu({ children }: { children: ReactNode }) {
 
 export function DropdownMenuTrigger({ children, asChild }: { children: ReactNode; asChild?: boolean }) {
   const { open, setOpen } = useDropdown()
+  if (asChild && isValidElement(children)) {
+    return cloneElement(children, { onClick: () => setOpen(!open) } as Partial<unknown>)
+  }
   return (
     <button
       type="button"
       onClick={() => setOpen(!open)}
-      className={asChild ? "" : "inline-flex items-center"}
+      className="inline-flex items-center"
     >
       {children}
     </button>
diff --git a/apps/dashboard/src/components/ui/label.tsx b/apps/dashboard/src/components/ui/label.tsx
new file mode 100644
index 0000000..16292c3
--- /dev/null
+++ b/apps/dashboard/src/components/ui/label.tsx
@@ -0,0 +1,18 @@
+import { cn } from "@/lib/utils"
+import { forwardRef, type LabelHTMLAttributes } from "react"
+
+const Label = forwardRef<HTMLLabelElement, LabelHTMLAttributes<HTMLLabelElement>>(
+  ({ className, ...props }, ref) => (
+    <label
+      ref={ref}
+      className={cn(
+        "text-sm font-medium text-foreground leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-50",
+        className
+      )}
+      {...props}
+    />
+  )
+)
+Label.displayName = "Label"
+
+export { Label }
diff --git a/apps/dashboard/src/components/ui/pagination.tsx b/apps/dashboard/src/components/ui/pagination.tsx
new file mode 100644
index 0000000..9b4284b
--- /dev/null
+++ b/apps/dashboard/src/components/ui/pagination.tsx
@@ -0,0 +1,92 @@
+import { cn } from "@/lib/utils"
+import { Button } from "@/components/ui/button"
+import { ChevronLeft, ChevronRight } from "lucide-react"
+
+interface PaginationProps {
+  page: number
+  totalPages: number
+  onPageChange: (page: number) => void
+  className?: string
+}
+
+export default function Pagination({ page, totalPages, onPageChange, className }: PaginationProps) {
+  if (totalPages <= 1) return null
+
+  const candidates = [1, totalPages, page - 1, page, page + 1]
+  const unique = [...new Set(candidates)].filter((p) => p >= 1 && p <= totalPages)
+  unique.sort((a, b) => a - b)
+
+  const pages: (number | "...")[] = [unique[0]]
+  for (let i = 1; i < unique.length; i++) {
+    if (unique[i] - unique[i - 1] > 1) {
+      pages.push("...")
+    }
+    pages.push(unique[i])
+  }
+
+  return (
+    <div className={cn("flex items-center gap-1", className)}>
+      <Button
+        variant="outline"
+        size="sm"
+        disabled={page <= 1}
+        onClick={() => onPageChange(page - 1)}
+        aria-label="Previous page"
+      >
+        <ChevronLeft className="h-4 w-4" />
+      </Button>
+      {pages.map((p, i) =>
+        p === "..." ? (
+          <span key={`ellipsis-${i}`} className="px-1 text-xs text-muted-foreground">
+            ...
+          </span>
+        ) : (
+          <Button
+            key={p}
+            variant={p === page ? "primary" : "outline"}
+            size="sm"
+            className="min-w-[32px]"
+            onClick={() => onPageChange(p)}
+          >
+            {p}
+          </Button>
+        )
+      )}
+      <Button
+        variant="outline"
+        size="sm"
+        disabled={page >= totalPages}
+        onClick={() => onPageChange(page + 1)}
+        aria-label="Next page"
+      >
+        <ChevronRight className="h-4 w-4" />
+      </Button>
+    </div>
+  )
+}
+
+interface PageSizeSelectorProps {
+  pageSize: number
+  onPageSizeChange: (size: number) => void
+  className?: string
+}
+
+export function PageSizeSelector({ pageSize, onPageSizeChange, className }: PageSizeSelectorProps) {
+  return (
+    <div className={cn("flex items-center gap-2 text-sm text-muted-foreground", className)}>
+      <span>Show</span>
+      <select
+        aria-label="Page size"
+        value={pageSize}
+        onChange={(e) => onPageSizeChange(Number(e.target.value))}
+        className="h-8 rounded-lg border border-border bg-background px-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+      >
+        <option value={10}>10</option>
+        <option value={25}>25</option>
+        <option value={50}>50</option>
+        <option value={100}>100</option>
+      </select>
+      <span>per page</span>
+    </div>
+  )
+}
diff --git a/apps/dashboard/src/components/ui/popover.tsx b/apps/dashboard/src/components/ui/popover.tsx
new file mode 100644
index 0000000..1bde85a
--- /dev/null
+++ b/apps/dashboard/src/components/ui/popover.tsx
@@ -0,0 +1,79 @@
+import { cn } from "@/lib/utils"
+import { createContext, useContext, useState, useRef, useEffect, type ReactNode } from "react"
+
+interface PopoverContextValue {
+  open: boolean
+  setOpen: (open: boolean) => void
+}
+
+const PopoverContext = createContext<PopoverContextValue | undefined>(undefined)
+
+function usePopover() {
+  const ctx = useContext(PopoverContext)
+  if (!ctx) throw new Error("Popover components must be used within Popover")
+  return ctx
+}
+
+interface PopoverProps {
+  children: ReactNode
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}
+
+export function Popover({ children, open: controlledOpen, onOpenChange }: PopoverProps) {
+  const [internalOpen, setInternalOpen] = useState(false)
+  const ref = useRef<HTMLDivElement>(null)
+
+  const open = controlledOpen ?? internalOpen
+  const setOpen = onOpenChange ?? setInternalOpen
+
+  useEffect(() => {
+    function handleClickOutside(e: MouseEvent) {
+      if (ref.current && !ref.current.contains(e.target as Node)) {
+        setOpen(false)
+      }
+    }
+    if (open) {
+      document.addEventListener("mousedown", handleClickOutside)
+      return () => document.removeEventListener("mousedown", handleClickOutside)
+    }
+  }, [open, setOpen])
+
+  return (
+    <PopoverContext.Provider value={{ open, setOpen }}>
+      <div ref={ref} className="relative">{children}</div>
+    </PopoverContext.Provider>
+  )
+}
+
+interface PopoverTriggerProps {
+  children: ReactNode
+  asChild?: boolean
+}
+
+export function PopoverTrigger({ children }: PopoverTriggerProps) {
+  const { open, setOpen } = usePopover()
+  return <div onClick={() => setOpen(!open)}>{children}</div>
+}
+
+interface PopoverContentProps {
+  children: ReactNode
+  className?: string
+  align?: "start" | "end"
+}
+
+export function PopoverContent({ children, className, align = "start" }: PopoverContentProps) {
+  const { open } = usePopover()
+  if (!open) return null
+  return (
+    <div
+      className={cn(
+        "absolute z-50 mt-1 min-w-[14rem] rounded-xl border border-border bg-card p-1 shadow-lg animate-in fade-in zoom-in-95",
+        align === "end" ? "right-0" : "left-0",
+        className
+      )}
+    >
+      {children}
+    </div>
+  )
+}
diff --git a/apps/dashboard/src/components/ui/select.tsx b/apps/dashboard/src/components/ui/select.tsx
new file mode 100644
index 0000000..f53608d
--- /dev/null
+++ b/apps/dashboard/src/components/ui/select.tsx
@@ -0,0 +1,30 @@
+import { cn } from "@/lib/utils"
+import { forwardRef, type SelectHTMLAttributes } from "react"
+
+export interface SelectProps extends SelectHTMLAttributes<HTMLSelectElement> {}
+
+const Select = forwardRef<HTMLSelectElement, SelectProps>(
+  ({ className, children, style, ...props }, ref) => {
+    return (
+      <select
+        ref={ref}
+        className={cn(
+          "flex h-9 w-full rounded-lg border border-border bg-background px-3 py-1 text-sm text-foreground shadow-none transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary disabled:cursor-not-allowed disabled:opacity-50 appearance-none bg-no-repeat",
+          className
+        )}
+        style={{
+          backgroundImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%23808080' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'%3E%3C/polyline%3E%3C/svg%3E")`,
+          backgroundPosition: "right 10px center",
+          paddingRight: "32px",
+          ...style,
+        }}
+        {...props}
+      >
+        {children}
+      </select>
+    )
+  }
+)
+Select.displayName = "Select"
+
+export { Select }
diff --git a/apps/dashboard/src/components/ui/switch.tsx b/apps/dashboard/src/components/ui/switch.tsx
new file mode 100644
index 0000000..6d9606b
--- /dev/null
+++ b/apps/dashboard/src/components/ui/switch.tsx
@@ -0,0 +1,50 @@
+import { cn } from "@/lib/utils"
+import { forwardRef, useState, type InputHTMLAttributes } from "react"
+
+export interface SwitchProps extends Omit<InputHTMLAttributes<HTMLInputElement>, "type"> {
+  onCheckedChange?: (checked: boolean) => void
+}
+
+const Switch = forwardRef<HTMLInputElement, SwitchProps>(
+  ({ className, checked: controlledChecked, defaultChecked, onChange, onCheckedChange, disabled, ...props }, ref) => {
+    const [internalChecked, setInternalChecked] = useState(defaultChecked ?? controlledChecked ?? false)
+    const isControlled = controlledChecked !== undefined
+    const checked = isControlled ? controlledChecked : internalChecked
+
+    const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+      if (!isControlled) setInternalChecked(e.target.checked)
+      onChange?.(e)
+      onCheckedChange?.(e.target.checked)
+    }
+
+    return (
+      <label
+        className={cn(
+          "relative inline-flex h-5 w-9 cursor-pointer items-center rounded-full transition-colors",
+          checked ? "bg-primary" : "bg-muted",
+          disabled && "cursor-not-allowed opacity-50",
+          className
+        )}
+      >
+        <input
+          ref={ref}
+          type="checkbox"
+          checked={checked}
+          onChange={handleChange}
+          disabled={disabled}
+          className="sr-only"
+          {...props}
+        />
+        <span
+          className={cn(
+            "inline-block h-3.5 w-3.5 transform rounded-full bg-background transition-transform",
+            checked ? "translate-x-[18px]" : "translate-x-[3px]"
+          )}
+        />
+      </label>
+    )
+  }
+)
+Switch.displayName = "Switch"
+
+export { Switch }
diff --git a/apps/dashboard/src/components/ui/table.tsx b/apps/dashboard/src/components/ui/table.tsx
new file mode 100644
index 0000000..443ba82
--- /dev/null
+++ b/apps/dashboard/src/components/ui/table.tsx
@@ -0,0 +1,77 @@
+import { cn } from "@/lib/utils"
+import { forwardRef, type HTMLAttributes, type TdHTMLAttributes, type ThHTMLAttributes } from "react"
+
+const Table = forwardRef<HTMLTableElement, HTMLAttributes<HTMLTableElement>>(
+  ({ className, ...props }, ref) => (
+    <div className="relative w-full overflow-auto">
+      <table
+        ref={ref}
+        className={cn("w-full caption-bottom text-sm", className)}
+        {...props}
+      />
+    </div>
+  )
+)
+Table.displayName = "Table"
+
+const TableHeader = forwardRef<HTMLTableSectionElement, HTMLAttributes<HTMLTableSectionElement>>(
+  ({ className, ...props }, ref) => (
+    <thead ref={ref} className={cn("[&_tr]:border-b border-border", className)} {...props} />
+  )
+)
+TableHeader.displayName = "TableHeader"
+
+const TableBody = forwardRef<HTMLTableSectionElement, HTMLAttributes<HTMLTableSectionElement>>(
+  ({ className, ...props }, ref) => (
+    <tbody
+      ref={ref}
+      className={cn("[&_tr:last-child]:border-0", className)}
+      {...props}
+    />
+  )
+)
+TableBody.displayName = "TableBody"
+
+const TableRow = forwardRef<HTMLTableRowElement, HTMLAttributes<HTMLTableRowElement>>(
+  ({ className, ...props }, ref) => (
+    <tr
+      ref={ref}
+      className={cn(
+        "border-b border-border transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
+        className
+      )}
+      {...props}
+    />
+  )
+)
+TableRow.displayName = "TableRow"
+
+const TableHead = forwardRef<HTMLTableHeaderCellElement, ThHTMLAttributes<HTMLTableHeaderCellElement>>(
+  ({ className, ...props }, ref) => (
+    <th
+      ref={ref}
+      className={cn(
+        "h-10 px-3 text-left align-middle text-xs font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0",
+        className
+      )}
+      {...props}
+    />
+  )
+)
+TableHead.displayName = "TableHead"
+
+const TableCell = forwardRef<HTMLTableDataCellElement, TdHTMLAttributes<HTMLTableDataCellElement>>(
+  ({ className, ...props }, ref) => (
+    <td
+      ref={ref}
+      className={cn(
+        "p-3 align-middle [&:has([role=checkbox])]:pr-0",
+        className
+      )}
+      {...props}
+    />
+  )
+)
+TableCell.displayName = "TableCell"
+
+export { Table, TableHeader, TableBody, TableRow, TableHead, TableCell }
diff --git a/apps/dashboard/src/components/ui/tabs.tsx b/apps/dashboard/src/components/ui/tabs.tsx
new file mode 100644
index 0000000..6d5e2d7
--- /dev/null
+++ b/apps/dashboard/src/components/ui/tabs.tsx
@@ -0,0 +1,135 @@
+import { cn } from "@/lib/utils"
+import { createContext, useContext, useState, useRef, useCallback, type ReactNode } from "react"
+
+interface TabsContextValue {
+  value: string
+  onValueChange: (value: string) => void
+}
+
+const TabsContext = createContext<TabsContextValue | undefined>(undefined)
+
+function useTabs() {
+  const ctx = useContext(TabsContext)
+  if (!ctx) throw new Error("Tabs components must be used within Tabs")
+  return ctx
+}
+
+interface TabsProps {
+  defaultValue: string
+  children: ReactNode
+  className?: string
+  value?: string
+  onValueChange?: (value: string) => void
+}
+
+export function Tabs({ defaultValue, children, className, value: controlledValue, onValueChange }: TabsProps) {
+  const [internalValue, setInternalValue] = useState(defaultValue)
+  const value = controlledValue ?? internalValue
+  const setValue = onValueChange ?? setInternalValue
+
+  return (
+    <TabsContext.Provider value={{ value, onValueChange: setValue }}>
+      <div className={cn("", className)}>
+        {children}
+      </div>
+    </TabsContext.Provider>
+  )
+}
+
+interface TabsListProps {
+  children: ReactNode
+  className?: string
+}
+
+export function TabsList({ children, className }: TabsListProps) {
+  const listRef = useRef<HTMLDivElement>(null)
+
+  const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
+    const buttons = listRef.current?.querySelectorAll<HTMLButtonElement>('[role="tab"]')
+    if (!buttons || buttons.length === 0) return
+    const currentIndex = Array.from(buttons).findIndex((btn) => btn === document.activeElement)
+    if (currentIndex === -1) return
+
+    let nextIndex: number | undefined
+    if (e.key === "ArrowRight") {
+      nextIndex = (currentIndex + 1) % buttons.length
+    } else if (e.key === "ArrowLeft") {
+      nextIndex = (currentIndex - 1 + buttons.length) % buttons.length
+    }
+    if (nextIndex !== undefined) {
+      e.preventDefault()
+      buttons[nextIndex].focus()
+      buttons[nextIndex].click()
+    }
+  }, [])
+
+  return (
+    <div
+      ref={listRef}
+      role="tablist"
+      onKeyDown={handleKeyDown}
+      className={cn("inline-flex items-center gap-1 rounded-lg bg-muted p-1", className)}
+    >
+      {children}
+    </div>
+  )
+}
+
+interface TabsTriggerProps {
+  value: string
+  children: ReactNode
+  className?: string
+}
+
+export function TabsTrigger({ value, children, className }: TabsTriggerProps) {
+  const { value: selectedValue, onValueChange } = useTabs()
+  const isActive = selectedValue === value
+  const panelId = `tabpanel-${value.replace(/\s+/g, "-")}`
+  const tabId = `tab-${value.replace(/\s+/g, "-")}`
+
+  return (
+    <button
+      type="button"
+      role="tab"
+      id={tabId}
+      aria-selected={isActive}
+      aria-controls={panelId}
+      tabIndex={isActive ? 0 : -1}
+      onClick={() => onValueChange(value)}
+      className={cn(
+        "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1.5 text-sm font-medium transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary",
+        isActive
+          ? "bg-background text-foreground shadow-sm"
+          : "text-muted-foreground hover:text-foreground",
+        className
+      )}
+    >
+      {children}
+    </button>
+  )
+}
+
+interface TabsContentProps {
+  value: string
+  children: ReactNode
+  className?: string
+}
+
+export function TabsContent({ value, children, className }: TabsContentProps) {
+  const { value: selectedValue } = useTabs()
+  const panelId = `tabpanel-${value.replace(/\s+/g, "-")}`
+  const tabId = `tab-${value.replace(/\s+/g, "-")}`
+
+  if (selectedValue !== value) return null
+
+  return (
+    <div
+      role="tabpanel"
+      id={panelId}
+      aria-labelledby={tabId}
+      className={cn("", className)}
+    >
+      {children}
+    </div>
+  )
+}
diff --git a/apps/dashboard/src/components/ui/textarea.tsx b/apps/dashboard/src/components/ui/textarea.tsx
new file mode 100644
index 0000000..0c27cb7
--- /dev/null
+++ b/apps/dashboard/src/components/ui/textarea.tsx
@@ -0,0 +1,22 @@
+import { cn } from "@/lib/utils"
+import { forwardRef, type TextareaHTMLAttributes } from "react"
+
+export interface TextareaProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {}
+
+const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(
+  ({ className, ...props }, ref) => {
+    return (
+      <textarea
+        ref={ref}
+        className={cn(
+          "flex min-h-[80px] w-full rounded-lg border border-border bg-background px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary disabled:cursor-not-allowed disabled:opacity-50",
+          className
+        )}
+        {...props}
+      />
+    )
+  }
+)
+Textarea.displayName = "Textarea"
+
+export { Textarea }
diff --git a/apps/dashboard/src/components/ui/tooltip.tsx b/apps/dashboard/src/components/ui/tooltip.tsx
new file mode 100644
index 0000000..540ae0d
--- /dev/null
+++ b/apps/dashboard/src/components/ui/tooltip.tsx
@@ -0,0 +1,51 @@
+import { cn } from "@/lib/utils"
+import { useState, useRef, useId, type ReactNode } from "react"
+
+interface TooltipProps {
+  content: string
+  children: ReactNode
+  className?: string
+}
+
+export function Tooltip({ content, children, className }: TooltipProps) {
+  const [show, setShow] = useState(false)
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)
+  const id = useId()
+  const triggerRef = useRef<HTMLDivElement>(null)
+
+  const showTooltip = () => {
+    clearTimeout(timeoutRef.current)
+    timeoutRef.current = setTimeout(() => { setShow(true) }, 300)
+  }
+
+  const hideTooltip = () => {
+    clearTimeout(timeoutRef.current)
+    setShow(false)
+  }
+
+  return (
+    <div
+      ref={triggerRef}
+      className="relative inline-flex"
+      onMouseEnter={showTooltip}
+      onMouseLeave={hideTooltip}
+      onFocus={showTooltip}
+      onBlur={hideTooltip}
+      aria-describedby={show ? id : undefined}
+    >
+      {children}
+      {show && (
+        <div
+          id={id}
+          role="tooltip"
+          className={cn(
+            "absolute bottom-full left-1/2 z-50 mb-1.5 -translate-x-1/2 rounded-md border border-border bg-card px-2.5 py-1 text-xs text-foreground shadow-lg whitespace-nowrap max-w-[300px] overflow-hidden text-ellipsis",
+            className
+          )}
+        >
+          {content}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/apps/dashboard/src/lib/api.ts b/apps/dashboard/src/lib/api.ts
index e12c23d..c98ae12 100644
--- a/apps/dashboard/src/lib/api.ts
+++ b/apps/dashboard/src/lib/api.ts
@@ -171,45 +171,46 @@ export function bulkCreateUrls(token: string, urls: { url: string; customCode?:
   )
 }
 
-export function listUrls(token: string, params?: Record<string, string>) {
+export function listUrls(token: string, params?: Record<string, string>, signal?: AbortSignal) {
   const searchParams = new URLSearchParams(params)
   const qs = searchParams.toString()
   return request<{ urls: ShortUrl[]; pagination: Pagination }>(
     `/api/urls${qs ? `?${qs}` : ""}`,
-    { headers: setAuthHeader(token) }
+    { headers: setAuthHeader(token), signal }
   )
 }
 
-export function getUrlInfo(token: string | null, code: string) {
+export function getUrlInfo(token: string | null, code: string, signal?: AbortSignal) {
   const headers = token ? setAuthHeader(token) : undefined
   return request<ShortUrl>(
     `/api/urls/${code}/info`,
-    headers ? { headers } : undefined
+    headers ? { headers, signal } : { signal }
   )
 }
 
-export function getUrlVisits(code: string, params?: { page?: number; limit?: number }) {
+export function getUrlVisits(token: string, code: string, params?: { page?: number; limit?: number }, signal?: AbortSignal) {
   const searchParams = new URLSearchParams()
   if (params?.page) searchParams.set("page", String(params.page))
   if (params?.limit) searchParams.set("limit", String(params.limit))
   const qs = searchParams.toString()
   return request<{ visits: Visit[]; pagination: Pagination }>(
-    `/api/urls/${code}/visits${qs ? `?${qs}` : ""}`
+    `/api/urls/${code}/visits${qs ? `?${qs}` : ""}`,
+    { headers: setAuthHeader(token), signal }
   )
 }
 
-export function getUrlStats(code: string) {
-  return request<VisitStats>(`/api/urls/${code}/stats`)
+export function getUrlStats(token: string, code: string, signal?: AbortSignal) {
+  return request<VisitStats>(`/api/urls/${code}/stats`, { headers: setAuthHeader(token), signal })
 }
 
-export function exportVisitsCsv(code: string) {
-  return requestBlob(`/api/urls/${code}/visits/export`)
+export function exportVisitsCsv(token: string, code: string) {
+  return requestBlob(`/api/urls/${code}/visits/export`, { headers: setAuthHeader(token) })
 }
 
-export function generateQrCode(code: string, format: "png" | "svg" = "png", logo?: string) {
+export function generateQrCode(code: string, format: "png" | "svg" = "png", logo?: string, signal?: AbortSignal) {
   const searchParams = new URLSearchParams({ format })
   if (logo) searchParams.set("logo", logo)
-  return requestBlob(`/api/urls/${code}/qr?${searchParams.toString()}`)
+  return requestBlob(`/api/urls/${code}/qr?${searchParams.toString()}`, { signal })
 }
 
 export function updateUrlSettings(token: string, code: string, payload: UpdateUrlSettingsPayload) {
diff --git a/apps/dashboard/src/pages/BulkCreatePage.tsx b/apps/dashboard/src/pages/BulkCreatePage.tsx
index 22d95cf..cdf069f 100644
--- a/apps/dashboard/src/pages/BulkCreatePage.tsx
+++ b/apps/dashboard/src/pages/BulkCreatePage.tsx
@@ -1,12 +1,222 @@
+import { useState } from "react"
+import { useAuth } from "@/hooks/use-auth"
+import { bulkCreateUrls } from "@/lib/api"
+import type { BulkResult } from "@linkify/shared"
+import { toast } from "sonner"
+import { useNavigate } from "react-router-dom"
 import PageHeader from "@/components/page-header"
+import { Button } from "@/components/ui/button"
+import { Textarea } from "@/components/ui/textarea"
+import { Label } from "@/components/ui/label"
+import { Card, CardContent } from "@/components/ui/card"
+import { Badge } from "@/components/ui/badge"
+import { Loader2, Upload, CheckCircle, XCircle } from "lucide-react"
+import CopyButton from "@/components/copy-button"
+
+function BulkResultSuccess({ result }: { result: BulkResult }) {
+  const data = result.data as Record<string, string> | undefined
+  const shortUrl = data?.shortUrl
+  return (
+    <div className="flex items-center gap-2">
+      <span className="font-mono text-sm font-medium text-primary">
+        {shortUrl ?? result.code ?? "—"}
+      </span>
+      {shortUrl && (
+        <CopyButton text={shortUrl} variant="ghost" size="icon" />
+      )}
+    </div>
+  )
+}
 
 export default function BulkCreatePage() {
+  const { session } = useAuth()
+  const token = session?.access_token ?? ""
+  const navigate = useNavigate()
+
+  const [input, setInput] = useState("")
+  const [loading, setLoading] = useState(false)
+  const [results, setResults] = useState<BulkResult[] | null>(null)
+
+  const urls = input
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean)
+
+  const validUrls = urls.map((url) => {
+    try {
+      const fullUrl = url.startsWith("http") ? url : `https://${url}`
+      new URL(fullUrl)
+      return { original: url, url: fullUrl, valid: true }
+    } catch {
+      return { original: url, url: "", valid: false }
+    }
+  })
+
+  const validCount = validUrls.filter((u) => u.valid).length
+  const invalidCount = validUrls.filter((u) => !u.valid).length
+
+  const handleSubmit = async () => {
+    if (validCount === 0) {
+      toast.error("No valid URLs to create")
+      return
+    }
+
+    if (validCount > 50) {
+      toast.error("Maximum 50 URLs per batch")
+      return
+    }
+
+    setLoading(true)
+    try {
+      const payload = validUrls.filter((u) => u.valid).map((u) => ({ url: u.url }))
+      const data = await bulkCreateUrls(token, payload)
+      setResults(data)
+      const successCount = data.filter((r) => r.success).length
+      toast.success(`${successCount} of ${data.length} URLs created successfully`)
+    } catch (err: unknown) {
+      const msg = err instanceof Error ? err.message : "Failed to create URLs"
+      toast.error(msg)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const handleReset = () => {
+    setInput("")
+    setResults(null)
+  }
+
   return (
-    <div>
+    <div className="space-y-6">
       <PageHeader
         title="Bulk Create"
         description="Create multiple short links at once"
+        actions={
+          results && (
+            <Button variant="outline" size="sm" onClick={handleReset}>
+              Create another batch
+            </Button>
+          )
+        }
       />
+
+      {!results ? (
+        <Card>
+          <CardContent className="p-6 space-y-4">
+            <div className="space-y-1.5">
+              <Label htmlFor="urls">Enter URLs (one per line)</Label>
+              <Textarea
+                id="urls"
+                placeholder={`https://example.com/page1\nhttps://example.com/page2\nhttps://example.com/page3`}
+                value={input}
+                onChange={(e) => setInput(e.target.value)}
+                className="min-h-[200px] font-mono text-sm"
+              />
+            </div>
+
+            {urls.length > 0 && (
+              <div className="flex items-center gap-2 text-sm">
+                <span className="text-muted-foreground">
+                  {urls.length} URL{urls.length !== 1 ? "s" : ""} detected
+                </span>
+                {validCount > 0 && (
+                  <Badge variant="success" className="gap-1">
+                    <CheckCircle className="h-3 w-3" />
+                    {validCount} valid
+                  </Badge>
+                )}
+                {invalidCount > 0 && (
+                  <Badge variant="destructive" className="gap-1">
+                    <XCircle className="h-3 w-3" />
+                    {invalidCount} invalid
+                  </Badge>
+                )}
+              </div>
+            )}
+
+            <div className="flex items-center gap-3">
+              <Button onClick={handleSubmit} disabled={loading || validCount === 0} size="lg">
+                {loading ? (
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                ) : (
+                  <Upload className="mr-2 h-4 w-4" />
+                )}
+                {loading ? "Creating..." : `Create ${validCount} URL${validCount !== 1 ? "s" : ""}`}
+              </Button>
+              <Button variant="outline" onClick={() => navigate("/urls")}>
+                Cancel
+              </Button>
+            </div>
+
+            {invalidCount > 0 && (
+              <div className="rounded-lg border border-destructive/20 bg-destructive/5 p-3">
+                <p className="text-xs font-medium text-destructive">Invalid URLs:</p>
+                <ul className="mt-1 list-inside list-disc text-xs text-destructive/80">
+                  {validUrls.filter((u) => !u.valid).map((u, i) => (
+                    <li key={i}>{u.original}</li>
+                  ))}
+                </ul>
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      ) : (
+        <Card>
+          <CardContent className="p-6">
+            <div className="mb-4 flex items-center gap-2">
+              <span className="text-sm font-medium text-foreground">
+                Results
+              </span>
+              <Badge variant="success">
+                {results.filter((r) => r.success).length} succeeded
+              </Badge>
+              {results.some((r) => !r.success) && (
+                <Badge variant="destructive">
+                  {results.filter((r) => !r.success).length} failed
+                </Badge>
+              )}
+            </div>
+
+            <div className="space-y-2">
+              {results.map((result, i) => {
+                const originalUrl = result.index !== undefined ? validUrls[result.index]?.original : validUrls[i]?.original
+                return (
+                  <div
+                    key={i}
+                    className="flex items-center justify-between rounded-lg border border-border p-3"
+                  >
+                    <div className="flex items-center gap-3 min-w-0">
+                      {result.success ? (
+                        <CheckCircle className="h-4 w-4 shrink-0 text-emerald-500" />
+                      ) : (
+                        <XCircle className="h-4 w-4 shrink-0 text-destructive" />
+                      )}
+                      <div className="min-w-0">
+                        {result.success ? (
+                          <BulkResultSuccess result={result} />
+                        ) : (
+                          <span className="text-sm text-muted-foreground">
+                            {result.error ?? "Unknown error"}
+                          </span>
+                        )}
+                        {originalUrl && (
+                          <p className="text-xs text-muted-foreground truncate max-w-[300px] mt-0.5">
+                            {originalUrl}
+                          </p>
+                        )}
+                      </div>
+                    </div>
+                  </div>
+                )
+              })}
+            </div>
+
+            <Button className="mt-4" onClick={() => navigate("/urls")}>
+              View all URLs
+            </Button>
+          </CardContent>
+        </Card>
+      )}
     </div>
   )
 }
diff --git a/apps/dashboard/src/pages/CreateUrlPage.tsx b/apps/dashboard/src/pages/CreateUrlPage.tsx
index 7154b35..9bdd8e5 100644
--- a/apps/dashboard/src/pages/CreateUrlPage.tsx
+++ b/apps/dashboard/src/pages/CreateUrlPage.tsx
@@ -1,12 +1,413 @@
+import { useState, useEffect } from "react"
+import { useAuth } from "@/hooks/use-auth"
+import { createUrl, listTags, listCollections } from "@/lib/api"
+import type { Tag, Collection, ShortUrl } from "@linkify/shared"
+import { toast } from "sonner"
+import { useNavigate } from "react-router-dom"
 import PageHeader from "@/components/page-header"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Switch } from "@/components/ui/switch"
+import { Card, CardContent } from "@/components/ui/card"
+import CopyButton from "@/components/copy-button"
+import { Link2, CheckCircle, Loader2, Plus, X } from "lucide-react"
+
+function normalizeUrl(url: string): string {
+  if (!url.trim()) return ""
+  const normalized = url.startsWith("http") ? url : `https://${url}`
+  try {
+    const parsed = new URL(normalized)
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return ""
+    return normalized
+  } catch {
+    return ""
+  }
+}
+
+const TTL_PRESETS = [
+  { label: "7 days", value: 7 },
+  { label: "30 days", value: 30 },
+  { label: "90 days", value: 90 },
+  { label: "365 days", value: 365 },
+  { label: "Never", value: 0 },
+] as const
+
+interface FormState {
+  url: string
+  customCode: string
+  ttlDays: string
+  password: string
+  activeAt: string
+  activeTime: string
+  blockBots: boolean
+  tags: string[]
+  collectionId: string
+}
+
+const initialForm: FormState = {
+  url: "",
+  customCode: "",
+  ttlDays: "",
+  password: "",
+  activeAt: "",
+  activeTime: "",
+  blockBots: false,
+  tags: [],
+  collectionId: "",
+}
 
 export default function CreateUrlPage() {
+  const { session } = useAuth()
+  const token = session?.access_token ?? ""
+  const navigate = useNavigate()
+
+  const [form, setForm] = useState<FormState>(initialForm)
+  const [tags, setTags] = useState<Tag[]>([])
+  const [collections, setCollections] = useState<Collection[]>([])
+  const [loading, setLoading] = useState(false)
+  const [created, setCreated] = useState<ShortUrl | null>(null)
+  const [errors, setErrors] = useState<Record<string, string>>({})
+  const [tagInput, setTagInput] = useState("")
+
+  useEffect(() => {
+    if (!token) return
+    Promise.all([
+      listTags(token).catch(() => ({ tags: [] as Tag[], pagination: { total: 0, page: 1, limit: 10, totalPages: 0 } })),
+      listCollections(token).catch(() => ({ collections: [] as Collection[], pagination: { total: 0, page: 1, limit: 10, totalPages: 0 } })),
+    ]).then(([tagsData, collectionsData]) => {
+      setTags(tagsData.tags)
+      setCollections(collectionsData.collections)
+    })
+  }, [token])
+
+  const updateField = (key: keyof FormState, value: string | boolean) => {
+    setForm((prev) => ({ ...prev, [key]: value }))
+    setErrors((prev) => ({ ...prev, [key]: "" }))
+  }
+
+  const addTag = (tagName: string) => {
+    const trimmed = tagName.trim().toLowerCase()
+    if (!trimmed || form.tags.includes(trimmed)) return
+    if (form.tags.length >= 10) {
+      toast.error("Maximum 10 tags allowed")
+      return
+    }
+    setForm((prev) => ({ ...prev, tags: [...prev.tags, trimmed] }))
+    setTagInput("")
+  }
+
+  const removeTag = (tag: string) => {
+    setForm((prev) => ({ ...prev, tags: prev.tags.filter((t) => t !== tag) }))
+  }
+
+  const validate = (): boolean => {
+    const errs: Record<string, string> = {}
+
+    if (!form.url.trim()) {
+      errs.url = "URL is required"
+    } else if (!normalizeUrl(form.url)) {
+      errs.url = "Invalid URL"
+    }
+
+    if (form.customCode) {
+      if (form.customCode.length < 3 || form.customCode.length > 16) {
+        errs.customCode = "Custom code must be 3-16 characters"
+      } else if (!/^[a-zA-Z0-9_-]+$/.test(form.customCode)) {
+        errs.customCode = "Custom code can only contain letters, numbers, hyphens, and underscores"
+      }
+    }
+
+    if (form.password && (form.password.length < 4 || form.password.length > 128)) {
+      errs.password = "Password must be 4-128 characters"
+    }
+
+    const ttl = Number(form.ttlDays)
+    if (form.ttlDays && ttl !== 0 && (ttl < 1 || ttl > 365)) {
+      errs.ttlDays = "TTL must be between 1 and 365 days"
+    }
+
+    setErrors(errs)
+    return Object.keys(errs).length === 0
+  }
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault()
+    if (!validate()) return
+
+    setLoading(true)
+    try {
+      let activeAt: string | undefined
+      if (form.activeAt) {
+        const dateStr = form.activeTime ? `${form.activeAt}T${form.activeTime}:00` : `${form.activeAt}T00:00:00`
+        activeAt = new Date(dateStr).toISOString()
+      }
+
+      const result = await createUrl(token, {
+        url: normalizeUrl(form.url),
+        customCode: form.customCode || undefined,
+        ttlDays: form.ttlDays ? Number(form.ttlDays) : undefined,
+        password: form.password || undefined,
+        activeAt,
+        blockBots: form.blockBots,
+        tags: form.tags.length > 0 ? form.tags : undefined,
+        collectionId: form.collectionId ? Number(form.collectionId) : undefined,
+      })
+
+      setCreated(result)
+      toast.success("URL created successfully!")
+    } catch (err: unknown) {
+      const apiErr = err as { code?: string; message?: string }
+      if (apiErr.code === "CODE_TAKEN" || apiErr.code === "RESERVED_CODE") {
+        setErrors((prev) => ({ ...prev, customCode: apiErr.message || "Code not available" }))
+      } else if (apiErr.code === "INVALID_URL" || apiErr.code === "INVALID_PROTOCOL") {
+        setErrors((prev) => ({ ...prev, url: apiErr.message || "Invalid URL" }))
+      } else if (apiErr.code === "PLAN_LIMIT_REACHED") {
+        toast.error(apiErr.message || "Plan limit reached")
+      } else if (apiErr.code === "FEATURE_NOT_AVAILABLE") {
+        toast.error(apiErr.message || "Feature not available on your plan")
+      } else {
+        toast.error(apiErr.message || "Failed to create URL")
+      }
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const handleCreateAnother = () => {
+    setForm(initialForm)
+    setCreated(null)
+    setErrors({})
+  }
+
+  if (created) {
+    return (
+      <div className="space-y-6">
+        <PageHeader
+          title="URL Created"
+          description="Your short link is ready"
+        />
+        <Card>
+          <CardContent className="flex flex-col items-center py-10 text-center">
+            <CheckCircle className="h-12 w-12 text-emerald-500" />
+            <h2 className="mt-4 text-lg font-semibold text-foreground">Link created successfully</h2>
+            <div className="mt-6 flex items-center gap-3 rounded-xl border border-border bg-muted/50 px-6 py-4">
+              <span className="text-lg font-mono font-medium text-primary">{created.shortUrl}</span>
+              <CopyButton text={created.shortUrl} variant="primary" size="sm" />
+            </div>
+            <p className="mt-2 text-sm text-muted-foreground">
+              Destination: {created.url}
+            </p>
+            <div className="mt-6 flex gap-3">
+              <Button variant="outline" onClick={handleCreateAnother}>
+                <Plus className="mr-1.5 h-4 w-4" />
+                Create another
+              </Button>
+              <Button onClick={() => navigate(`/urls/${created.code}`)}>
+                View details
+              </Button>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+    )
+  }
+
   return (
-    <div>
+    <div className="space-y-6">
       <PageHeader
         title="Create URL"
         description="Shorten a new link"
       />
+
+      <Card>
+        <CardContent className="p-6">
+          <form onSubmit={handleSubmit} className="space-y-5">
+            {/* URL */}
+            <div className="space-y-1.5">
+              <Label htmlFor="url">
+                URL <span className="text-destructive">*</span>
+              </Label>
+              <Input
+                id="url"
+                placeholder="https://example.com/very-long-url"
+                value={form.url}
+                onChange={(e) => updateField("url", e.target.value)}
+              />
+              {errors.url && <p className="text-xs text-destructive">{errors.url}</p>}
+            </div>
+
+            {/* Custom code */}
+            <div className="space-y-1.5">
+              <Label htmlFor="customCode">Custom code (optional)</Label>
+              <Input
+                id="customCode"
+                placeholder="my-custom-link"
+                value={form.customCode}
+                onChange={(e) => updateField("customCode", e.target.value)}
+              />
+              {errors.customCode && <p className="text-xs text-destructive">{errors.customCode}</p>}
+              <p className="text-xs text-muted-foreground">
+                3-16 characters: letters, numbers, hyphens, underscores
+              </p>
+            </div>
+
+            {/* TTL */}
+            <div className="space-y-1.5">
+              <Label>Expiry (optional)</Label>
+              <div className="flex flex-wrap gap-2">
+                {TTL_PRESETS.map((preset) => (
+                  <Button
+                    key={preset.value}
+                    type="button"
+                    variant={form.ttlDays === String(preset.value) ? "primary" : "outline"}
+                    size="sm"
+                    onClick={() => updateField("ttlDays", String(preset.value))}
+                  >
+                    {preset.label}
+                  </Button>
+                ))}
+                <Input
+                  type="number"
+                  min={1}
+                  max={365}
+                  placeholder="Custom"
+                  value={form.ttlDays && !TTL_PRESETS.some((p) => p.value === Number(form.ttlDays)) ? form.ttlDays : ""}
+                  onChange={(e) => updateField("ttlDays", e.target.value)}
+                  className="w-24 h-8 text-sm"
+                />
+              </div>
+              {errors.ttlDays && <p className="text-xs text-destructive">{errors.ttlDays}</p>}
+            </div>
+
+            {/* Password */}
+            <div className="space-y-1.5">
+              <Label htmlFor="password">Password protection (optional)</Label>
+              <Input
+                id="password"
+                type="password"
+                placeholder="Set a password to protect this link"
+                value={form.password}
+                onChange={(e) => updateField("password", e.target.value)}
+              />
+              {errors.password && <p className="text-xs text-destructive">{errors.password}</p>}
+              <p className="text-xs text-muted-foreground">
+                4-128 characters. Requires a plan with password protection.
+              </p>
+            </div>
+
+            {/* Active at */}
+            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+              <div className="space-y-1.5">
+                <Label htmlFor="activeAt">Schedule activation (optional)</Label>
+                <Input
+                  id="activeAt"
+                  type="date"
+                  value={form.activeAt}
+                  onChange={(e) => updateField("activeAt", e.target.value)}
+                />
+              </div>
+              <div className="space-y-1.5">
+                <Label htmlFor="activeTime">Time (optional)</Label>
+                <Input
+                  id="activeTime"
+                  type="time"
+                  value={form.activeTime}
+                  onChange={(e) => updateField("activeTime", e.target.value)}
+                />
+              </div>
+            </div>
+
+            {/* Block bots */}
+            <div className="flex items-center justify-between rounded-lg border border-border p-3">
+              <div>
+                <Label htmlFor="block-bots" className="text-sm font-medium">Block bots</Label>
+                <p className="text-xs text-muted-foreground">Prevent automated crawlers from accessing this link</p>
+              </div>
+              <Switch
+                id="block-bots"
+                checked={form.blockBots}
+                onCheckedChange={(checked) => updateField("blockBots", checked)}
+              />
+            </div>
+
+            {/* Tags */}
+            <div className="space-y-1.5">
+              <Label>Tags (optional)</Label>
+              <div className="flex flex-wrap gap-1.5 mb-2">
+                {form.tags.map((tag) => (
+                  <span
+                    key={tag}
+                    className="inline-flex items-center gap-1 rounded-md bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary"
+                  >
+                    {tag}
+                    <button type="button" onClick={() => removeTag(tag)} className="hover:text-destructive">
+                      <X className="h-3 w-3" />
+                    </button>
+                  </span>
+                ))}
+              </div>
+              <div className="flex gap-2">
+                <Input
+                  placeholder="Type tag name and press Enter"
+                  value={tagInput}
+                  onChange={(e) => setTagInput(e.target.value)}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter") {
+                      e.preventDefault()
+                      addTag(tagInput)
+                    }
+                  }}
+                  className="flex-1"
+                />
+                <Button type="button" variant="outline" size="sm" onClick={() => addTag(tagInput)}>
+                  <Plus className="h-4 w-4" />
+                </Button>
+              </div>
+              <div className="flex flex-wrap gap-1.5 mt-1.5">
+                {tags.filter((t) => !form.tags.includes(t.name)).slice(0, 10).map((tag) => (
+                  <button
+                    key={tag.id}
+                    type="button"
+                    onClick={() => addTag(tag.name)}
+                    className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-0.5 text-xs text-muted-foreground hover:bg-muted hover:text-foreground transition-colors"
+                  >
+                    <Plus className="h-3 w-3" />
+                    {tag.name}
+                  </button>
+                ))}
+              </div>
+            </div>
+
+            {/* Collection */}
+            <div className="space-y-1.5">
+              <Label htmlFor="collection">Collection (optional)</Label>
+              <select
+                id="collection"
+                value={form.collectionId}
+                onChange={(e) => updateField("collectionId", e.target.value)}
+                className="flex h-9 w-full rounded-lg border border-border bg-background px-3 py-1 text-sm text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary appearance-none"
+              >
+                <option value="">No collection</option>
+                {collections.map((c) => (
+                  <option key={c.id} value={c.id}>{c.name}</option>
+                ))}
+              </select>
+            </div>
+
+            {/* Submit */}
+            <div className="flex items-center gap-3 pt-2">
+              <Button type="submit" disabled={loading} size="lg">
+                {loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+                {loading ? "Creating..." : "Create URL"}
+              </Button>
+              <Button type="button" variant="outline" onClick={() => navigate("/urls")}>
+                Cancel
+              </Button>
+            </div>
+          </form>
+        </CardContent>
+      </Card>
     </div>
   )
 }
diff --git a/apps/dashboard/src/pages/UrlDetailPage.tsx b/apps/dashboard/src/pages/UrlDetailPage.tsx
index 2b8bf68..b5a7115 100644
--- a/apps/dashboard/src/pages/UrlDetailPage.tsx
+++ b/apps/dashboard/src/pages/UrlDetailPage.tsx
@@ -1,12 +1,674 @@
+import { useState, useEffect, useCallback } from "react"
+import { useAuth } from "@/hooks/use-auth"
+import { getUrlInfo, getUrlVisits, getUrlStats, exportVisitsCsv, generateQrCode, softDeleteUrl } from "@/lib/api"
+import type { ShortUrl, Visit, VisitStats, Pagination as PaginatedInfo } from "@linkify/shared"
+import { toast } from "sonner"
+import { useParams, useNavigate, Link } from "react-router-dom"
 import PageHeader from "@/components/page-header"
+import { Button } from "@/components/ui/button"
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { Badge } from "@/components/ui/badge"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs"
+import StatusBadge, { getLinkStatus } from "@/components/status-badge"
+import CopyButton from "@/components/copy-button"
+import TablePagination from "@/components/ui/pagination"
+import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "@/components/ui/table"
+import { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from "@/components/ui/dialog"
+import {
+  BarChart, Bar, XAxis, YAxis, Tooltip as RechartsTooltip, ResponsiveContainer, LineChart, Line, CartesianGrid, Legend,
+} from "recharts"
+import {
+  ExternalLink,
+  Trash2,
+  Settings,
+  Download,
+  QrCode,
+  Eye,
+  Clock,
+  Globe,
+  Monitor,
+  Smartphone,
+  Tablet,
+  Bot,
+  Loader2,
+  Calendar,
+  BarChart3,
+  Activity,
+} from "lucide-react"
+import { format } from "date-fns"
+
+const COUNTRY_FLAGS: Record<string, string> = {
+  US: "🇺🇸", GB: "🇬🇧", CA: "🇨🇦", AU: "🇦🇺", DE: "🇩🇪",
+  FR: "🇫🇷", JP: "🇯🇵", BR: "🇧🇷", IN: "🇮🇳", CN: "🇨🇳",
+  RU: "🇷🇺", KR: "🇰🇷", NL: "🇳🇱", SE: "🇸🇪", NO: "🇳🇴",
+  DK: "🇩🇰", FI: "🇫🇮", IT: "🇮🇹", ES: "🇪🇸", PT: "🇵🇹",
+  CH: "🇨🇭", AT: "🇦🇹", BE: "🇧🇪", IE: "🇮🇪", NZ: "🇳🇿",
+  SG: "🇸🇬", HK: "🇭🇰", TW: "🇹🇼", AE: "🇦🇪", SA: "🇸🇦",
+  MX: "🇲🇽", AR: "🇦🇷", CO: "🇨🇴", CL: "🇨🇱", ZA: "🇿🇦",
+  NG: "🇳🇬", EG: "🇪🇬", IL: "🇮🇱", TR: "🇹🇷", TH: "🇹🇭",
+  VN: "🇻🇳", PH: "🇵🇭", ID: "🇮🇩", MY: "🇲🇾", PK: "🇵🇰",
+  BD: "🇧🇩", PL: "🇵🇱", UA: "🇺🇦", RO: "🇷🇴", CZ: "🇨🇿",
+  GR: "🇬🇷", HU: "🇭🇺", SK: "🇸🇰", BG: "🇧🇬", HR: "🇭🇷",
+  RS: "🇷🇸", LT: "🇱🇹", SI: "🇸🇮", EE: "🇪🇪", LV: "🇱🇻",
+  IS: "🇮🇸", LU: "🇱🇺", MT: "🇲🇹", CY: "🇨🇾", AM: "🇦🇲",
+  GE: "🇬🇪", AZ: "🇦🇿", KZ: "🇰🇿", UZ: "🇺🇿", PE: "🇵🇪",
+}
+
+function getFlag(country: string | null): string {
+  if (!country) return "🌍"
+  return COUNTRY_FLAGS[country.toUpperCase()] ?? "🌍"
+}
+
+function getDeviceIcon(deviceType: string | null) {
+  switch (deviceType?.toLowerCase()) {
+    case "mobile": return <Smartphone className="h-3.5 w-3.5" />
+    case "tablet": return <Tablet className="h-3.5 w-3.5" />
+    default: return <Monitor className="h-3.5 w-3.5" />
+  }
+}
+
+function referrerCategoryColor(category: string | null): "default" | "secondary" | "outline" {
+  switch (category) {
+    case "direct": return "default"
+    case "search": return "secondary"
+    case "social": return "outline"
+    default: return "secondary"
+  }
+}
 
 export default function UrlDetailPage() {
+  const { session } = useAuth()
+  const token = session?.access_token ?? ""
+  const { code } = useParams<{ code: string }>()
+  const navigate = useNavigate()
+
+  const [urlInfo, setUrlInfo] = useState<ShortUrl | null>(null)
+  const [visits, setVisits] = useState<Visit[]>([])
+  const [visitsPagination, setVisitsPagination] = useState<PaginatedInfo | null>(null)
+  const [stats, setStats] = useState<VisitStats | null>(null)
+  const [activeTab, setActiveTab] = useState("info")
+  const [loading, setLoading] = useState(true)
+  const [visitsLoading, setVisitsLoading] = useState(false)
+  const [statsLoading, setStatsLoading] = useState(false)
+  const [csvLoading, setCsvLoading] = useState(false)
+  const [qrLoading, setQrLoading] = useState(false)
+  const [qrDialog, setQrDialog] = useState(false)
+  const [qrFormat, setQrFormat] = useState<"png" | "svg">("png")
+  const [qrLogo, setQrLogo] = useState("")
+  const [qrDataUrl, setQrDataUrl] = useState<string | null>(null)
+  const [qrResultFormat, setQrResultFormat] = useState<"png" | "svg">("png")
+  const [deleteDialog, setDeleteDialog] = useState(false)
+  const [deleting, setDeleting] = useState(false)
+  const [showTotal, setShowTotal] = useState(true)
+
+  const fetchUrlInfo = useCallback(async (signal?: AbortSignal) => {
+    if (!code) return
+    try {
+      const data = await getUrlInfo(token, code, signal)
+      if (!signal?.aborted) setUrlInfo(data)
+    } catch (err: unknown) {
+      if (err instanceof DOMException && err.name === "AbortError") return
+      const msg = err instanceof Error ? err.message : "URL not found"
+      if (!signal?.aborted) toast.error(msg)
+      if (!signal?.aborted) navigate("/urls")
+    }
+  }, [code, token, navigate])
+
+  const fetchVisits = useCallback(async (page = 1, signal?: AbortSignal) => {
+    if (!code) return
+    setVisitsLoading(true)
+    try {
+      const data = await getUrlVisits(token, code, { page, limit: 15 }, signal)
+      if (!signal?.aborted) {
+        setVisits(data.visits)
+        setVisitsPagination(data.pagination)
+      }
+    } catch (err: unknown) {
+      if (err instanceof DOMException && err.name === "AbortError") return
+      if (!signal?.aborted) toast.error("Failed to load visits")
+    } finally {
+      if (!signal?.aborted) setVisitsLoading(false)
+    }
+  }, [code, token])
+
+  const fetchStats = useCallback(async (signal?: AbortSignal) => {
+    if (!code) return
+    setStatsLoading(true)
+    try {
+      const data = await getUrlStats(token, code, signal)
+      if (!signal?.aborted) setStats(data)
+    } catch (err: unknown) {
+      if (err instanceof DOMException && err.name === "AbortError") return
+      if (!signal?.aborted) toast.error("Failed to load stats")
+    } finally {
+      if (!signal?.aborted) setStatsLoading(false)
+    }
+  }, [code, token])
+
+  useEffect(() => {
+    if (!code) return
+    const abortController = new AbortController()
+    setLoading(true)
+    Promise.all([
+      fetchUrlInfo(abortController.signal),
+      fetchVisits(1, abortController.signal),
+      fetchStats(abortController.signal),
+    ]).finally(() => {
+      if (!abortController.signal.aborted) setLoading(false)
+    })
+    return () => abortController.abort()
+  }, [code, fetchUrlInfo, fetchVisits, fetchStats])
+
+  const handleExportCsv = async () => {
+    if (!code) return
+    setCsvLoading(true)
+    try {
+      const blob = await exportVisitsCsv(token, code)
+      const url = window.URL.createObjectURL(blob)
+      const a = document.createElement("a")
+      a.href = url
+      a.download = `${code}-visits.csv`
+      a.click()
+      window.URL.revokeObjectURL(url)
+      toast.success("CSV downloaded")
+    } catch {
+      toast.error("Failed to export CSV")
+    } finally {
+      setCsvLoading(false)
+    }
+  }
+
+  useEffect(() => {
+    return () => {
+      if (qrDataUrl) URL.revokeObjectURL(qrDataUrl)
+    }
+  }, [])
+
+  const handleGenerateQr = async () => {
+    if (!code) return
+    setQrLoading(true)
+    if (qrDataUrl) URL.revokeObjectURL(qrDataUrl)
+    setQrDataUrl(null)
+    try {
+      const blob = await generateQrCode(code, qrFormat, qrLogo || undefined)
+      const url = URL.createObjectURL(blob)
+      setQrDataUrl(url)
+      setQrResultFormat(qrFormat)
+    } catch {
+      toast.error("Failed to generate QR code")
+    } finally {
+      setQrLoading(false)
+    }
+  }
+
+  const handleDelete = async () => {
+    if (!code) return
+    setDeleting(true)
+    try {
+      await softDeleteUrl(token, code)
+      toast.success("URL deleted")
+      navigate("/urls")
+    } catch (err: unknown) {
+      const msg = err instanceof Error ? err.message : "Failed to delete"
+      toast.error(msg)
+    } finally {
+      setDeleting(false)
+    }
+  }
+
+  const dailyChartData = (stats?.daily ?? []).map((d) => ({
+    date: d.date ? format(new Date(d.date), "MMM d") : "",
+    visits: d.visits,
+    uniqueVisits: d.uniqueVisits,
+  }))
+
+  const hourlyChartData = (stats?.hourly ?? []).map((h) => ({
+    hour: h.hour ? format(new Date(h.hour), "HH:mm") : "",
+    visits: h.visits,
+    uniqueVisits: h.uniqueVisits,
+  }))
+
+  if (loading) {
+    return (
+      <div className="space-y-6">
+        <Skeleton className="h-8 w-48" />
+        <Skeleton className="h-48 w-full rounded-xl" />
+      </div>
+    )
+  }
+
+  if (!urlInfo) return null
+
+  const status = getLinkStatus(urlInfo)
+
   return (
-    <div>
+    <div className="space-y-6">
       <PageHeader
-        title="URL Details"
+        title={urlInfo.code}
         description="View link analytics and activity"
+        actions={
+          <div className="flex gap-2">
+            <Link
+              to={`/urls/${code}/settings`}
+              className="inline-flex items-center justify-center whitespace-nowrap rounded-lg text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary disabled:pointer-events-none disabled:opacity-50 select-none h-8 px-3 text-xs border border-border bg-background text-foreground hover:bg-muted active:translate-y-[1px]"
+            >
+              <Settings className="mr-1.5 h-4 w-4" />
+              Settings
+            </Link>
+            <Button variant="outline" size="sm" onClick={() => setDeleteDialog(true)}>
+              <Trash2 className="mr-1.5 h-4 w-4 text-destructive" />
+              <span className="text-destructive">Delete</span>
+            </Button>
+          </div>
+        }
       />
+
+      {/* Info Header Card */}
+      <Card>
+        <CardContent className="p-5 space-y-5">
+          <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+            <div className="flex-1 min-w-0">
+              <div className="flex items-center gap-2 mb-2">
+                <span className="font-mono text-xl font-semibold text-primary">{urlInfo.shortUrl}</span>
+                <CopyButton text={urlInfo.shortUrl} variant="primary" size="sm" />
+              </div>
+              <a
+                href={urlInfo.url}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground truncate"
+              >
+                <ExternalLink className="h-3.5 w-3.5 shrink-0" />
+                <span className="truncate">{urlInfo.url}</span>
+              </a>
+            </div>
+            <StatusBadge status={status} />
+          </div>
+
+          {/* Stats row */}
+          <div className="grid grid-cols-2 gap-4 sm:grid-cols-4">
+            <div className="space-y-0.5">
+              <p className="text-xs text-muted-foreground">Total visits</p>
+              <p className="text-lg font-semibold tabular-nums">{urlInfo.visits.toLocaleString()}</p>
+            </div>
+            <div className="space-y-0.5">
+              <p className="text-xs text-muted-foreground">Unique visits</p>
+              <p className="text-lg font-semibold tabular-nums">{urlInfo.uniqueVisits.toLocaleString()}</p>
+            </div>
+            <div className="space-y-0.5">
+              <p className="text-xs text-muted-foreground">Created</p>
+              <p className="text-sm font-medium tabular-nums">{format(new Date(urlInfo.createdAt), "MMM d, yyyy")}</p>
+            </div>
+            <div className="space-y-0.5">
+              <p className="text-xs text-muted-foreground">Expires</p>
+              <p className="text-sm font-medium tabular-nums">
+                {urlInfo.expiresAt ? format(new Date(urlInfo.expiresAt), "MMM d, yyyy") : "Never"}
+              </p>
+            </div>
+          </div>
+
+          {/* OG Preview */}
+          {(urlInfo.title || urlInfo.description || urlInfo.image) && (
+            <div className="flex gap-4 rounded-lg border border-border bg-muted/30 p-4">
+              {urlInfo.image && (
+                <img
+                  src={urlInfo.image}
+                  alt=""
+                  className="h-16 w-16 shrink-0 rounded-lg object-cover"
+                  onError={(e) => { (e.target as HTMLImageElement).style.display = "none" }}
+                />
+              )}
+              <div className="min-w-0">
+                {urlInfo.title && (
+                  <p className="text-sm font-medium text-foreground truncate">{urlInfo.title}</p>
+                )}
+                {urlInfo.description && (
+                  <p className="mt-0.5 text-xs text-muted-foreground line-clamp-2">{urlInfo.description}</p>
+                )}
+              </div>
+            </div>
+          )}
+        </CardContent>
+      </Card>
+
+      {/* Tabs */}
+      <Tabs defaultValue="info" value={activeTab} onValueChange={setActiveTab}>
+        <TabsList>
+          <TabsTrigger value="info">
+            <Eye className="mr-1.5 h-4 w-4" />
+            Info
+          </TabsTrigger>
+          <TabsTrigger value="visits">
+            <Activity className="mr-1.5 h-4 w-4" />
+            Visits
+          </TabsTrigger>
+          <TabsTrigger value="stats">
+            <BarChart3 className="mr-1.5 h-4 w-4" />
+            Stats
+          </TabsTrigger>
+          <TabsTrigger value="qr">
+            <QrCode className="mr-1.5 h-4 w-4" />
+            QR Code
+          </TabsTrigger>
+        </TabsList>
+
+        {/* Info Tab */}
+        <TabsContent value="info">
+          <Card>
+            <CardContent className="p-5 space-y-4">
+              <div className="grid gap-3 sm:grid-cols-2">
+                <div className="space-y-0.5">
+                  <p className="text-xs text-muted-foreground">Code</p>
+                  <p className="font-mono text-sm text-foreground">{urlInfo.code}</p>
+                </div>
+                <div className="space-y-0.5">
+                  <p className="text-xs text-muted-foreground">Block bots</p>
+                  <p className="text-sm text-foreground">{urlInfo.blockBots ? "Yes" : "No"}</p>
+                </div>
+                <div className="space-y-0.5">
+                  <p className="text-xs text-muted-foreground">Password protected</p>
+                  <p className="text-sm text-foreground">{urlInfo.hasPassword ? "Yes" : "No"}</p>
+                </div>
+                <div className="space-y-0.5">
+                  <p className="text-xs text-muted-foreground">Active at</p>
+                  <p className="text-sm text-foreground">
+                    {urlInfo.activeAt ? format(new Date(urlInfo.activeAt), "MMM d, yyyy HH:mm") : "Immediately"}
+                  </p>
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </TabsContent>
+
+        {/* Visits Tab */}
+        <TabsContent value="visits">
+          <Card>
+            <CardHeader className="flex flex-row items-center justify-between">
+              <CardTitle>Visit Log</CardTitle>
+              <Button variant="outline" size="sm" onClick={handleExportCsv} disabled={csvLoading}>
+                {csvLoading ? (
+                  <Loader2 className="mr-1.5 h-4 w-4 animate-spin" />
+                ) : (
+                  <Download className="mr-1.5 h-4 w-4" />
+                )}
+                Export CSV
+              </Button>
+            </CardHeader>
+            <CardContent>
+              {visitsLoading ? (
+                <div className="space-y-3">
+                  {Array.from({ length: 5 }).map((_, i) => (
+                    <Skeleton key={i} className="h-10 w-full rounded-lg" />
+                  ))}
+                </div>
+              ) : visits.length === 0 ? (
+                <div className="flex flex-col items-center py-10 text-center">
+                  <Eye className="h-8 w-8 text-muted-foreground/50" />
+                  <p className="mt-2 text-sm text-muted-foreground">No visits yet</p>
+                </div>
+              ) : (
+                <div className="rounded-lg border border-border">
+                  <Table>
+                    <TableHeader>
+                      <TableRow>
+                        <TableHead>Time</TableHead>
+                        <TableHead>Location</TableHead>
+                        <TableHead>Device</TableHead>
+                        <TableHead>OS</TableHead>
+                        <TableHead>Browser</TableHead>
+                        <TableHead>Referrer</TableHead>
+                      </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                      {visits.map((v) => (
+                        <TableRow key={v.id}>
+                          <TableCell className="whitespace-nowrap text-xs tabular-nums text-muted-foreground">
+                            {format(new Date(v.visitedAt), "MMM d, HH:mm")}
+                          </TableCell>
+                          <TableCell>
+                            <span className="text-sm">
+                              {getFlag(v.country)} {v.country ?? "—"}
+                              {v.city && <span className="text-muted-foreground">, {v.city}</span>}
+                            </span>
+                          </TableCell>
+                          <TableCell>
+                            <div className="flex items-center gap-1.5 text-sm text-muted-foreground">
+                              {getDeviceIcon(v.deviceType)}
+                              <span className="capitalize">{v.deviceType ?? "—"}</span>
+                            </div>
+                          </TableCell>
+                          <TableCell className="text-sm text-muted-foreground">{v.os ?? "—"}</TableCell>
+                          <TableCell className="text-sm text-muted-foreground">
+                            {v.browser ?? "—"}
+                            {v.browserVersion && (
+                              <span className="text-xs text-muted-foreground/60"> v{v.browserVersion}</span>
+                            )}
+                          </TableCell>
+                          <TableCell className="max-w-[160px]">
+                            <div className="flex items-center gap-1.5">
+                              {v.referrerCategory && (
+                                <Badge variant={referrerCategoryColor(v.referrerCategory)} className="text-[10px] px-1.5 py-0">
+                                  {v.referrerCategory}
+                                </Badge>
+                              )}
+                              {v.isBot && (
+                                <Badge variant="destructive" className="text-[10px] px-1.5 py-0 gap-1">
+                                  <Bot className="h-2.5 w-2.5" />
+                                  Bot
+                                </Badge>
+                              )}
+                              {v.referer && (
+                                <span className="text-xs text-muted-foreground truncate">{v.referer}</span>
+                              )}
+                            </div>
+                          </TableCell>
+                        </TableRow>
+                      ))}
+                    </TableBody>
+                  </Table>
+                </div>
+              )}
+              {visitsPagination && visitsPagination.totalPages > 1 && (
+                <div className="mt-4 flex justify-center">
+                  <TablePagination
+                    page={visitsPagination.page}
+                    totalPages={visitsPagination.totalPages}
+                    onPageChange={fetchVisits}
+                  />
+                </div>
+              )}
+            </CardContent>
+          </Card>
+        </TabsContent>
+
+        {/* Stats Tab */}
+        <TabsContent value="stats">
+          <div className="space-y-4">
+            {/* Summary stats */}
+            {stats && (
+              <div className="grid grid-cols-3 gap-4">
+                <Card>
+                  <CardContent className="p-4 text-center">
+                    <p className="text-xs text-muted-foreground">Total</p>
+                    <p className="mt-1 text-xl font-semibold tabular-nums">{stats.totalVisits.toLocaleString()}</p>
+                  </CardContent>
+                </Card>
+                <Card>
+                  <CardContent className="p-4 text-center">
+                    <p className="text-xs text-muted-foreground">Unique</p>
+                    <p className="mt-1 text-xl font-semibold tabular-nums">{stats.uniqueVisits.toLocaleString()}</p>
+                  </CardContent>
+                </Card>
+                <Card>
+                  <CardContent className="p-4 text-center">
+                    <p className="text-xs text-muted-foreground">Daily avg</p>
+                    <p className="mt-1 text-xl font-semibold tabular-nums">
+                      {stats.daily.length > 0
+                        ? Math.round(stats.totalVisits / stats.daily.length).toLocaleString()
+                        : "0"}
+                    </p>
+                  </CardContent>
+                </Card>
+              </div>
+            )}
+
+            {/* Daily chart */}
+            <Card>
+              <CardHeader>
+                <div className="flex items-center justify-between">
+                  <CardTitle>Daily Visits (7 days)</CardTitle>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    onClick={() => setShowTotal(!showTotal)}
+                  >
+                    {showTotal ? "Show Unique" : "Show Total"}
+                  </Button>
+                </div>
+              </CardHeader>
+              <CardContent>
+                {statsLoading ? (
+                  <Skeleton className="h-64 w-full rounded-lg" />
+                ) : dailyChartData.length === 0 ? (
+                  <div className="flex flex-col items-center py-10 text-center">
+                    <BarChart3 className="h-8 w-8 text-muted-foreground/50" />
+                    <p className="mt-2 text-sm text-muted-foreground">
+                      Not enough data yet. Share your link to get started.
+                    </p>
+                  </div>
+                ) : (
+                  <div className="h-64">
+                    <ResponsiveContainer width="100%" height="100%">
+                      <BarChart data={dailyChartData}>
+                        <CartesianGrid strokeDasharray="3 3" stroke="var(--color-border)" />
+                        <XAxis dataKey="date" tick={{ fontSize: 12, fill: "var(--color-muted-foreground)" }} />
+                        <YAxis tick={{ fontSize: 12, fill: "var(--color-muted-foreground)" }} />
+                        <RechartsTooltip />
+                        <Bar
+                          dataKey={showTotal ? "visits" : "uniqueVisits"}
+                          fill="oklch(0.35 0.12 260)"
+                          radius={[4, 4, 0, 0]}
+                        />
+                      </BarChart>
+                    </ResponsiveContainer>
+                  </div>
+                )}
+              </CardContent>
+            </Card>
+
+            {/* Hourly chart */}
+            <Card>
+              <CardHeader>
+                <CardTitle>Hourly Visits (24h)</CardTitle>
+              </CardHeader>
+              <CardContent>
+                {statsLoading ? (
+                  <Skeleton className="h-48 w-full rounded-lg" />
+                ) : hourlyChartData.length === 0 ? (
+                  <div className="flex flex-col items-center py-8 text-center">
+                    <Clock className="h-8 w-8 text-muted-foreground/50" />
+                    <p className="mt-2 text-sm text-muted-foreground">No hourly data available yet.</p>
+                  </div>
+                ) : (
+                  <div className="h-48">
+                    <ResponsiveContainer width="100%" height="100%">
+                      <BarChart data={hourlyChartData}>
+                        <CartesianGrid strokeDasharray="3 3" stroke="var(--color-border)" />
+                        <XAxis dataKey="hour" tick={{ fontSize: 11, fill: "var(--color-muted-foreground)" }} />
+                        <YAxis tick={{ fontSize: 11, fill: "var(--color-muted-foreground)" }} />
+                        <RechartsTooltip />
+                        <Bar
+                          dataKey={showTotal ? "visits" : "uniqueVisits"}
+                          fill="oklch(0.55 0.01 260)"
+                          radius={[4, 4, 0, 0]}
+                        />
+                      </BarChart>
+                    </ResponsiveContainer>
+                  </div>
+                )}
+              </CardContent>
+            </Card>
+          </div>
+        </TabsContent>
+
+        {/* QR Code Tab */}
+        <TabsContent value="qr">
+          <Card>
+            <CardHeader>
+              <CardTitle>QR Code</CardTitle>
+            </CardHeader>
+            <CardContent className="space-y-4">
+              <div className="grid gap-3 sm:grid-cols-2">
+                <div className="space-y-1.5">
+                  <label htmlFor="qr-format" className="text-xs font-medium text-muted-foreground">Format</label>
+                  <select
+                    id="qr-format"
+                    value={qrFormat}
+                    onChange={(e) => setQrFormat(e.target.value as "png" | "svg")}
+                    className="flex h-9 w-full rounded-lg border border-border bg-background px-3 text-sm text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+                  >
+                    <option value="png">PNG</option>
+                    <option value="svg">SVG</option>
+                  </select>
+                </div>
+                <div className="space-y-1.5">
+                  <label htmlFor="qr-logo" className="text-xs font-medium text-muted-foreground">Logo URL (optional)</label>
+                  <input
+                    id="qr-logo"
+                    value={qrLogo}
+                    onChange={(e) => setQrLogo(e.target.value)}
+                    placeholder="https://example.com/logo.png"
+                    className="flex h-9 w-full rounded-lg border border-border bg-background px-3 text-sm text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+                  />
+                </div>
+              </div>
+
+              <Button onClick={handleGenerateQr} disabled={qrLoading}>
+                {qrLoading ? (
+                  <Loader2 className="mr-1.5 h-4 w-4 animate-spin" />
+                ) : (
+                  <QrCode className="mr-1.5 h-4 w-4" />
+                )}
+                {qrLoading ? "Generating..." : "Generate QR Code"}
+              </Button>
+
+              {qrDataUrl && (
+                <div className="flex flex-col items-center gap-4 rounded-lg border border-border p-6">
+                  <img src={qrDataUrl} alt="QR Code" className="h-48 w-48" />
+                  <a
+                    href={qrDataUrl}
+                    download={`${code}-qr.${qrResultFormat}`}
+                    className="inline-flex items-center gap-1.5 text-sm font-medium text-primary hover:underline"
+                  >
+                    <Download className="h-4 w-4" />
+                    Download {qrFormat.toUpperCase()}
+                  </a>
+                </div>
+              )}
+            </CardContent>
+          </Card>
+        </TabsContent>
+      </Tabs>
+
+      {/* Delete Dialog */}
+      <Dialog open={deleteDialog} onClose={() => setDeleteDialog(false)}>
+        <DialogHeader>
+          <DialogTitle>Delete URL</DialogTitle>
+          <DialogDescription>
+            Are you sure you want to delete <span className="font-mono font-medium text-foreground">{code}</span>?
+            This link will no longer be accessible.
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <Button variant="outline" onClick={() => setDeleteDialog(false)} disabled={deleting}>
+            Cancel
+          </Button>
+          <Button variant="destructive" onClick={handleDelete} disabled={deleting}>
+            {deleting ? "Deleting..." : "Delete"}
+          </Button>
+        </DialogFooter>
+      </Dialog>
     </div>
   )
 }
diff --git a/apps/dashboard/src/pages/UrlsListPage.tsx b/apps/dashboard/src/pages/UrlsListPage.tsx
index 9016cf4..3c9bd98 100644
--- a/apps/dashboard/src/pages/UrlsListPage.tsx
+++ b/apps/dashboard/src/pages/UrlsListPage.tsx
@@ -1,30 +1,535 @@
+import { useState, useEffect, useCallback, useRef } from "react"
+import { useAuth } from "@/hooks/use-auth"
+import { listUrls, listTags, listCollections, softDeleteUrl } from "@/lib/api"
+import type { ShortUrl, Tag, Collection, Pagination as PaginatedInfo } from "@linkify/shared"
+import { toast } from "sonner"
+import { useSearchParams, Link, useNavigate } from "react-router-dom"
 import PageHeader from "@/components/page-header"
 import { Button } from "@/components/ui/button"
-import { Link } from "react-router-dom"
-import { Plus } from "lucide-react"
+import { Input } from "@/components/ui/input"
+import { Badge } from "@/components/ui/badge"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Tooltip } from "@/components/ui/tooltip"
+import StatusBadge, { getLinkStatus } from "@/components/status-badge"
+import TablePagination, { PageSizeSelector } from "@/components/ui/pagination"
+import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "@/components/ui/table"
+import { Switch } from "@/components/ui/switch"
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
+import { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from "@/components/ui/dialog"
+import {
+  Search,
+  SlidersHorizontal,
+  X,
+  ChevronUp,
+  ChevronDown,
+  ChevronsUpDown,
+  Link as LinkIcon,
+  ExternalLink,
+  Trash2,
+  Settings,
+  MoreHorizontal,
+} from "lucide-react"
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { format } from "date-fns"
+
+interface FiltersState {
+  q: string
+  tagIds: string
+  collectionId: string
+  createdAfter: string
+  createdBefore: string
+  hasPassword: string
+  isActive: string
+  sortBy: string
+  sortOrder: string
+  page: string
+  limit: string
+}
+
+const defaultFilters: FiltersState = {
+  q: "",
+  tagIds: "",
+  collectionId: "",
+  createdAfter: "",
+  createdBefore: "",
+  hasPassword: "",
+  isActive: "",
+  sortBy: "createdAt",
+  sortOrder: "desc",
+  page: "1",
+  limit: "10",
+}
 
 export default function UrlsListPage() {
+  const { session } = useAuth()
+  const token = session?.access_token ?? ""
+  const navigate = useNavigate()
+  const [searchParams, setSearchParams] = useSearchParams()
+
+  const getFilters = useCallback((): FiltersState => {
+    const f = { ...defaultFilters }
+    for (const key of Object.keys(defaultFilters) as (keyof FiltersState)[]) {
+      const val = searchParams.get(key)
+      if (val) f[key] = val
+    }
+    return f
+  }, [searchParams])
+
+  const [filters, setFilters] = useState<FiltersState>(getFilters)
+  const [urls, setUrls] = useState<ShortUrl[]>([])
+  const [pagination, setPagination] = useState<PaginatedInfo | null>(null)
+  const [tags, setTags] = useState<Tag[]>([])
+  const [collections, setCollections] = useState<Collection[]>([])
+  const [loading, setLoading] = useState(true)
+  const [selected, setSelected] = useState<Set<string>>(new Set())
+  const [deleteDialog, setDeleteDialog] = useState<string | null>(null)
+  const [deleting, setDeleting] = useState(false)
+
+  const totalActiveFilters = [filters.tagIds, filters.collectionId, filters.createdAfter, filters.createdBefore, filters.hasPassword, filters.isActive].filter(Boolean).length
+
+  async function fetchAllPages<T>(
+    fetcher: (page: number) => Promise<{ items: T[]; pagination: PaginatedInfo }>,
+  ): Promise<T[]> {
+    const first = await fetcher(1)
+    const all = [...first.items]
+    const totalPages = first.pagination.totalPages ?? 1
+    for (let p = 2; p <= totalPages; p++) {
+      const page = await fetcher(p)
+      all.push(...page.items)
+    }
+    return all
+  }
+
+  const abortRef = useRef<AbortController | null>(null)
+
+  const fetchData = useCallback(async () => {
+    if (!token) return
+    abortRef.current?.abort()
+    const controller = new AbortController()
+    abortRef.current = controller
+    setLoading(true)
+    try {
+      const params = new URLSearchParams()
+      for (const [key, val] of Object.entries(filters)) {
+        if (val) params.set(key, val)
+      }
+      const [urlsData, tagsData, collectionsData] = await Promise.all([
+        listUrls(token, Object.fromEntries(params)),
+        fetchAllPages((page) => listTags(token, { page }).then((d) => ({ items: d.tags, pagination: d.pagination }))).catch(() => [] as Tag[]),
+        fetchAllPages((page) => listCollections(token, { page }).then((d) => ({ items: d.collections, pagination: d.pagination }))).catch(() => [] as Collection[]),
+      ])
+      if (!controller.signal.aborted) {
+        setUrls(urlsData.urls)
+        setPagination(urlsData.pagination)
+        setTags(tagsData)
+        setCollections(collectionsData)
+      }
+    } catch (err: unknown) {
+      if (err instanceof DOMException && err.name === "AbortError") return
+      const msg = err instanceof Error ? err.message : "Failed to load URLs"
+      if (!controller.signal.aborted) toast.error(msg)
+    } finally {
+      if (!controller.signal.aborted) setLoading(false)
+    }
+  }, [token, filters])
+
+  useEffect(() => {
+    fetchData()
+    return () => abortRef.current?.abort()
+  }, [fetchData])
+
+  useEffect(() => {
+    const newParams = new URLSearchParams()
+    for (const [key, val] of Object.entries(filters)) {
+      if (val) newParams.set(key, val)
+    }
+    setSearchParams(newParams, { replace: true })
+  }, [filters, setSearchParams])
+
+  const updateFilter = (key: keyof FiltersState, value: string) => {
+    setFilters((prev) => ({ ...prev, [key]: value, page: key === "page" ? value : "1" }))
+    setSelected(new Set())
+  }
+
+  const clearFilters = () => {
+    setFilters(defaultFilters)
+    setSelected(new Set())
+  }
+
+  const handleSort = (column: string) => {
+    setFilters((prev) => ({
+      ...prev,
+      sortBy: column,
+      sortOrder: prev.sortBy === column && prev.sortOrder === "asc" ? "desc" : "asc",
+      page: "1",
+    }))
+  }
+
+  const toggleSelect = (code: string) => {
+    setSelected((prev) => {
+      const next = new Set(prev)
+      if (next.has(code)) next.delete(code)
+      else next.add(code)
+      return next
+    })
+  }
+
+  const toggleSelectAll = () => {
+    if (selected.size === urls.length) {
+      setSelected(new Set())
+    } else {
+      setSelected(new Set(urls.map((u) => u.code)))
+    }
+  }
+
+  const handleDelete = async (code: string) => {
+    setDeleting(true)
+    try {
+      await softDeleteUrl(token, code)
+      toast.success("URL deleted")
+      setDeleteDialog(null)
+      fetchData()
+    } catch (err: unknown) {
+      const msg = err instanceof Error ? err.message : "Failed to delete"
+      toast.error(msg)
+    } finally {
+      setDeleting(false)
+    }
+  }
+
+  const SortIcon = ({ column }: { column: string }) => {
+    if (filters.sortBy !== column) return <ChevronsUpDown className="ml-1 h-3 w-3 text-muted-foreground" />
+    return filters.sortOrder === "asc" ? (
+      <ChevronUp className="ml-1 h-3 w-3" />
+    ) : (
+      <ChevronDown className="ml-1 h-3 w-3" />
+    )
+  }
+
   return (
-    <div>
+    <div className="space-y-4">
       <PageHeader
         title="URLs"
         description="Manage your short links"
         actions={
           <div className="flex gap-2">
             <Link to="/urls/new">
-              <Button size="sm">
-                <Plus className="mr-1.5 h-4 w-4" />
-                Create URL
-              </Button>
+              <Button size="sm">Create URL</Button>
             </Link>
             <Link to="/urls/bulk">
-              <Button variant="outline" size="sm">
-                Bulk Create
-              </Button>
+              <Button variant="outline" size="sm">Bulk Create</Button>
             </Link>
           </div>
         }
       />
+
+      {/* Search & Filters */}
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center">
+        <div className="relative flex-1">
+          <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+          <Input
+            placeholder="Search URLs and codes..."
+            value={filters.q}
+            onChange={(e) => updateFilter("q", e.target.value)}
+            className="pl-9 pr-8"
+          />
+          {filters.q && (
+            <button
+              onClick={() => updateFilter("q", "")}
+              className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
+            >
+              <X className="h-4 w-4" />
+            </button>
+          )}
+        </div>
+        <Popover>
+          <PopoverTrigger>
+            <Button variant="outline" size="sm" className="gap-2">
+              <SlidersHorizontal className="h-4 w-4" />
+              Filters
+              {totalActiveFilters > 0 && (
+                <Badge variant="default" className="ml-1 h-5 w-5 rounded-full p-0 text-xs">{totalActiveFilters}</Badge>
+              )}
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent className="w-72 p-4 space-y-4" align="end">
+            <div className="space-y-1.5">
+              <label className="text-xs font-medium text-muted-foreground">Tag</label>
+              <select
+                value={filters.tagIds}
+                onChange={(e) => updateFilter("tagIds", e.target.value)}
+                className="w-full h-8 rounded-lg border border-border bg-background px-2 text-sm"
+              >
+                <option value="">All tags</option>
+                {tags.map((t) => (
+                  <option key={t.id} value={t.id}>{t.name}</option>
+                ))}
+              </select>
+            </div>
+
+            <div className="space-y-1.5">
+              <label className="text-xs font-medium text-muted-foreground">Collection</label>
+              <select
+                value={filters.collectionId}
+                onChange={(e) => updateFilter("collectionId", e.target.value)}
+                className="w-full h-8 rounded-lg border border-border bg-background px-2 text-sm"
+              >
+                <option value="">All collections</option>
+                {collections.map((c) => (
+                  <option key={c.id} value={c.id}>{c.name}</option>
+                ))}
+              </select>
+            </div>
+
+            <div className="grid grid-cols-2 gap-2">
+              <div className="space-y-1.5">
+                <label className="text-xs font-medium text-muted-foreground">From</label>
+                <Input
+                  type="date"
+                  value={filters.createdAfter}
+                  onChange={(e) => updateFilter("createdAfter", e.target.value)}
+                  className="h-8 text-xs"
+                />
+              </div>
+              <div className="space-y-1.5">
+                <label className="text-xs font-medium text-muted-foreground">To</label>
+                <Input
+                  type="date"
+                  value={filters.createdBefore}
+                  onChange={(e) => updateFilter("createdBefore", e.target.value)}
+                  className="h-8 text-xs"
+                />
+              </div>
+            </div>
+
+            <div className="space-y-2">
+              <label className="flex items-center justify-between">
+                <span className="text-xs font-medium text-muted-foreground">Password protected</span>
+                <Switch
+                  checked={filters.hasPassword === "true"}
+                  onCheckedChange={(checked) => updateFilter("hasPassword", checked ? "true" : "")}
+                />
+              </label>
+              <label className="flex items-center justify-between">
+                <span className="text-xs font-medium text-muted-foreground">Active only</span>
+                <Switch
+                  checked={filters.isActive === "true"}
+                  onCheckedChange={(checked) => updateFilter("isActive", checked ? "true" : "")}
+                />
+              </label>
+            </div>
+
+            {(filters.q || totalActiveFilters > 0) && (
+              <Button variant="ghost" size="sm" className="w-full" onClick={clearFilters}>
+                Clear filters
+              </Button>
+            )}
+          </PopoverContent>
+        </Popover>
+      </div>
+
+      {/* Data Table */}
+      {loading ? (
+        <div className="space-y-3">
+          <Skeleton className="h-10 w-full rounded-lg" />
+          {Array.from({ length: 5 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full rounded-lg" />
+          ))}
+        </div>
+      ) : urls.length === 0 && !filters.q && totalActiveFilters === 0 ? (
+        <div className="flex flex-col items-center justify-center py-16 text-center">
+          <LinkIcon className="h-10 w-10 text-muted-foreground/50" />
+          <h3 className="mt-4 text-base font-medium text-foreground">No links yet</h3>
+          <p className="mt-1 text-sm text-muted-foreground">Create your first short link to get started.</p>
+          <Link to="/urls/new">
+            <Button size="sm" className="mt-4">Create your first link</Button>
+          </Link>
+        </div>
+      ) : urls.length === 0 ? (
+        <div className="flex flex-col items-center justify-center py-16 text-center">
+          <Search className="h-10 w-10 text-muted-foreground/50" />
+          <h3 className="mt-4 text-base font-medium text-foreground">No matching links</h3>
+          <p className="mt-1 text-sm text-muted-foreground">Try adjusting your filters.</p>
+          <Button variant="outline" size="sm" className="mt-4" onClick={clearFilters}>
+            Clear filters
+          </Button>
+        </div>
+      ) : (
+        <div className="rounded-xl border border-border">
+          <Table>
+            <TableHeader>
+              <TableRow>
+                <TableHead className="w-10">
+                  <input
+                    type="checkbox"
+                    aria-label="Select all URLs"
+                    checked={selected.size === urls.length && urls.length > 0}
+                    onChange={toggleSelectAll}
+                    className="h-4 w-4 rounded border-border"
+                  />
+                </TableHead>
+                <TableHead className="cursor-pointer select-none" onClick={() => handleSort("code")}>
+                  <div className="flex items-center">
+                    Code
+                    <SortIcon column="code" />
+                  </div>
+                </TableHead>
+                <TableHead>Destination</TableHead>
+                <TableHead>Title</TableHead>
+                <TableHead className="cursor-pointer select-none" onClick={() => handleSort("visits")}>
+                  <div className="flex items-center">
+                    Visits
+                    <SortIcon column="visits" />
+                  </div>
+                </TableHead>
+                <TableHead>Status</TableHead>
+                <TableHead className="cursor-pointer select-none" onClick={() => handleSort("createdAt")}>
+                  <div className="flex items-center">
+                    Created
+                    <SortIcon column="createdAt" />
+                  </div>
+                </TableHead>
+                <TableHead className="w-12" />
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {urls.map((url) => {
+                const status = getLinkStatus(url)
+                return (
+                  <TableRow key={url.code}>
+                    <TableCell>
+                      <input
+                        type="checkbox"
+                        aria-label={`Select ${url.code}`}
+                        checked={selected.has(url.code)}
+                        onChange={() => toggleSelect(url.code)}
+                        className="h-4 w-4 rounded border-border"
+                      />
+                    </TableCell>
+                    <TableCell>
+                      <Link
+                        to={`/urls/${url.code}`}
+                        className="font-mono text-sm font-medium text-primary hover:underline"
+                      >
+                        {url.code}
+                      </Link>
+                    </TableCell>
+                    <TableCell className="max-w-[220px]">
+                      <Tooltip content={url.url}>
+                        <a
+                          href={url.url}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground truncate"
+                        >
+                          <ExternalLink className="h-3 w-3 shrink-0" />
+                          <span className="truncate">{url.url}</span>
+                        </a>
+                      </Tooltip>
+                    </TableCell>
+                    <TableCell>
+                      <span className="text-sm text-foreground truncate block max-w-[180px]">
+                        {url.title ?? "—"}
+                      </span>
+                    </TableCell>
+                    <TableCell>
+                      <div className="text-sm tabular-nums">
+                        <span className="font-medium">{url.visits}</span>
+                        <span className="text-muted-foreground ml-1">/ {url.uniqueVisits}</span>
+                      </div>
+                    </TableCell>
+                    <TableCell>
+                      <StatusBadge status={status} />
+                    </TableCell>
+                    <TableCell>
+                      <span className="text-sm text-muted-foreground tabular-nums">
+                        {format(new Date(url.createdAt), "MMM d, yyyy")}
+                      </span>
+                    </TableCell>
+                    <TableCell>
+                      <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                          <Button variant="ghost" size="icon" className="h-8 w-8">
+                            <MoreHorizontal className="h-4 w-4" />
+                          </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent>
+                          <DropdownMenuItem onClick={() => navigator.clipboard.writeText(url.shortUrl)}>
+                            <ExternalLink className="mr-2 h-4 w-4" />
+                            Copy short URL
+                          </DropdownMenuItem>
+                          <DropdownMenuItem onClick={() => navigator.clipboard.writeText(url.url)}>
+                            <ExternalLink className="mr-2 h-4 w-4" />
+                            Copy destination URL
+                          </DropdownMenuItem>
+                          <DropdownMenuSeparator />
+                          <DropdownMenuItem onClick={() => navigate(`/urls/${url.code}/settings`)}>
+                            <Settings className="mr-2 h-4 w-4" />
+                            Settings
+                          </DropdownMenuItem>
+                          <DropdownMenuSeparator />
+                          <DropdownMenuItem onClick={() => setDeleteDialog(url.code)}>
+                            <Trash2 className="mr-2 h-4 w-4 text-destructive" />
+                            <span className="text-destructive">Delete</span>
+                          </DropdownMenuItem>
+                        </DropdownMenuContent>
+                      </DropdownMenu>
+                    </TableCell>
+                  </TableRow>
+                )
+              })}
+            </TableBody>
+          </Table>
+
+          {pagination && (
+            <div className="flex items-center justify-between border-t border-border px-4 py-3">
+              <PageSizeSelector
+                pageSize={Number(filters.limit)}
+                onPageSizeChange={(size) => updateFilter("limit", String(size))}
+              />
+              <div className="flex items-center gap-4">
+                <span className="text-sm text-muted-foreground">
+                  Page {pagination.page} of {pagination.totalPages} ({pagination.total} total)
+                </span>
+                <TablePagination
+                  page={pagination.page}
+                  totalPages={pagination.totalPages}
+                  onPageChange={(page) => updateFilter("page", String(page))}
+                />
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+
+      {/* Delete Dialog */}
+      <Dialog open={!!deleteDialog} onClose={() => setDeleteDialog(null)}>
+        <DialogHeader>
+          <DialogTitle>Delete URL</DialogTitle>
+          <DialogDescription>
+            Are you sure you want to delete <span className="font-mono font-medium text-foreground">{deleteDialog}</span>?
+            This link will no longer be accessible.
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <Button variant="outline" onClick={() => setDeleteDialog(null)} disabled={deleting}>
+            Cancel
+          </Button>
+          <Button
+            variant="destructive"
+            onClick={() => deleteDialog && handleDelete(deleteDialog)}
+            disabled={deleting}
+          >
+            {deleting ? "Deleting..." : "Delete"}
+          </Button>
+        </DialogFooter>
+      </Dialog>
     </div>
   )
 }
diff --git a/docs/API.md b/docs/API.md
index 78f5a07..3adca77 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -117,6 +117,8 @@ x-aal: aal2
 | `URL_NOT_FOUND` | 404 | Short URL code not found |
 | `LINK_EXPIRED` | 410 | Short URL has passed its expiry date |
 | `LINK_NOT_ACTIVE` | 410 | Short URL is scheduled but not yet active |
+| `QR_CODE_EXPIRED` | 410 | QR code has passed its `qrExpiresAt` date |
+| `QR_NOT_YET_EXPIRED` | 400 | Attempted to regenerate a QR that has not yet expired |
 | `LINK_PASSWORD_REQUIRED` | 401 | Link is password-protected; token needed |
 | `INCORRECT_PASSWORD` | 403 | Submitted password does not match |
 | `PASSWORD_EXPIRED` | 403 | Link password has expired per policy |
@@ -440,6 +442,7 @@ Create a new short URL.
 | `ttlDays` | number | no | Link expiry in days (1-365). `null` = never expires. |
 | `password` | string | no | Password protect the link (4-128 chars). Requires plan feature. |
 | `activeAt` | string (ISO 8601) | no | Schedule activation date/time. |
+| `qrExpiresAt` | string (ISO 8601) | no | QR code expiry date (independent of link TTL). |
 | `blockBots` | boolean | no | Block known bots from accessing. Default `false`. |
 | `tags` | string[] | no | Tag names to attach (max 10, max 50 chars each). Tags must exist. |
 | `collectionId` | number | no | Collection ID to add link to. Requires plan feature. |
@@ -459,6 +462,7 @@ Create a new short URL.
     "uniqueVisits": 0,
     "expiresAt": "2024-08-15T12:00:00.000Z",
     "activeAt": null,
+    "qrExpiresAt": null,
     "hasPassword": false,
     "blockBots": false,
     "createdAt": "2024-07-15T12:00:00.000Z"
@@ -597,6 +601,7 @@ Get metadata about a short URL without redirecting.
     "uniqueVisits": 35,
     "expiresAt": null,
     "activeAt": null,
+    "qrExpiresAt": null,
     "hasPassword": false,
     "blockBots": false,
     "createdAt": "2024-01-01T00:00:00.000Z"
@@ -690,9 +695,17 @@ CSV columns: `id`, `code`, `ip_address`, `user_agent`, `referer`, `country`, `ci
 
 ### `GET /api/urls/:code/qr`
 
-Generate a QR code for the short URL's destination.
+Get a QR code for the short URL. The QR encodes the **short URL** (not the destination), so scans are recorded as visits and respect link expiry, password protection, and scheduled activation.
 
-**Auth**: None
+**Auth**: Required (owner only)
+
+**Rate Limit**: Standard (120 req/min)
+
+**Path Parameters**:
+
+| Param | Type | Description |
+|---|---|---|
+| `code` | string | Short URL code (3-16 alphanumeric) |
 
 **Query Parameters**:
 
@@ -701,9 +714,64 @@ Generate a QR code for the short URL's destination.
 | `format` | enum | `png` | `png` or `svg` |
 | `logo` | string | — | URL of an optional logo image to embed in the centre |
 
-**Response**:
-- PNG: `image/png`
-- SVG: `image/svg+xml`
+**Response** `200`:
+- `Content-Type: image/png` or `image/svg+xml`
+- `Content-Disposition: attachment; filename="<code>-qr.<format>"`
+
+The QR is cached in the `qr_codes` table on first generation. Subsequent requests with the same `(code, format, logo)` combination return the cached version.
+
+**Error Responses**:
+- `404 URL_NOT_FOUND` — code does not exist or is not owned by the requesting user
+- `410 QR_CODE_EXPIRED` — QR has a `qrExpiresAt` date that has passed
+
+**cURL Example**:
+```bash
+curl -H "Authorization: Bearer $TOKEN" \
+  "http://localhost:3000/api/urls/aB3xK9m/qr?format=svg&logo=https://example.com/logo.png" \
+  --output qr-code.svg
+```
+
+---
+
+### `POST /api/urls/:code/qr/regenerate`
+
+Regenerate an expired QR code with a new expiry date.
+
+**Auth**: Required (owner only)
+
+**Rate Limit**: Standard (120 req/min)
+
+**Path Parameters**:
+
+| Param | Type | Description |
+|---|---|---|
+| `code` | string | Short URL code (3-16 alphanumeric) |
+
+**Query Parameters**:
+
+| Param | Type | Default | Description |
+|---|---|---|---|
+| `format` | enum | `png` | `png` or `svg` |
+| `logo` | string | — | URL of an optional logo image to embed in the centre |
+
+**Request Body**:
+```json
+{
+  "expiresAt": "2025-12-31T23:59:59.000Z"
+}
+```
+
+| Field | Type | Required | Description |
+|---|---|---|---|
+| `expiresAt` | string (ISO 8601) | **yes** | New expiry datetime for the QR code |
+
+The `expiresAt` datetime must be in ISO 8601 format.
+
+**Response** `200`: Same as `GET /api/urls/:code/qr` — the new QR code image.
+
+**Error Responses**:
+- `404 URL_NOT_FOUND` — code does not exist or is not owned by the requesting user
+- `400 QR_NOT_YET_EXPIRED` — QR has not expired yet; cannot regenerate until after `qrExpiresAt`
 
 ---
 
@@ -779,6 +847,7 @@ Update a short URL's settings.
 {
   "activeAt": "2024-08-01T00:00:00.000Z",
   "expiresAt": "2025-01-01T00:00:00.000Z",
+  "qrExpiresAt": "2025-06-01T00:00:00.000Z",
   "password": "new-password",
   "blockBots": true
 }
@@ -788,6 +857,7 @@ Update a short URL's settings.
 |---|---|---|
 | `activeAt` | string \| null | ISO 8601 date or `null` to clear |
 | `expiresAt` | string \| null | ISO 8601 date or `null` to clear |
+| `qrExpiresAt` | string \| null | ISO 8601 date or `null` to clear (independent of link expiry) |
 | `password` | string \| null | New password or `null` to remove |
 | `blockBots` | boolean | Toggle bot blocking |
 
@@ -2128,6 +2198,7 @@ Stripe webhook receiver. Expects raw JSON body with Stripe signature verificatio
 | `blockBots` | BOOLEAN | DEFAULT false, NOT NULL | Block known bots |
 | `activeAt` | TIMESTAMP | — | Scheduled activation time |
 | `expiresAt` | TIMESTAMP | — | Link expiry time |
+| `qrExpiresAt` | TIMESTAMP | — | QR code expiry time (independent of link expiry) |
 | `deletedAt` | TIMESTAMP | — | Soft-delete timestamp |
 | `lastCheckedAt` | TIMESTAMP | — | Last health check timestamp |
 | `lastStatusCode` | INTEGER | — | Last health check HTTP status |
@@ -2298,3 +2369,18 @@ Hourly aggregated visit statistics (last 7 days available).
 | `updatedAt` | TIMESTAMP | DEFAULT NOW(), NOT NULL | Last update time |
 
 **Unique**: `(userId, domain)`, `(domain)`
+
+### `qr_codes`
+
+Cached QR code images, keyed by URL code + format + optional logo.
+
+| Column | Type | Constraints | Description |
+|---|---|---|---|
+| `id` | SERIAL | PK | Auto-increment ID |
+| `code` | TEXT | FK → urls.code, NOT NULL, ON DELETE CASCADE | Short URL code |
+| `format` | TEXT | NOT NULL | `png` or `svg` |
+| `data` | TEXT | NOT NULL | Base64-encoded PNG binary or SVG text |
+| `logoUrl` | TEXT | — | Optional centre logo URL |
+| `createdAt` | TIMESTAMP | DEFAULT NOW(), NOT NULL | Creation time |
+
+**Unique**: `(code, format, COALESCE(logoUrl, ''))`
diff --git a/docs/PROJECT.md b/docs/PROJECT.md
index 7ba5f4e..3da84ca 100644
--- a/docs/PROJECT.md
+++ b/docs/PROJECT.md
@@ -58,6 +58,10 @@ Linkify handles the complete lifecycle of a short link — from creation with cu
 - **PNG & SVG Formats** — Download QR codes in either format
 - **Logo Embedding** — Optionally embed a logo image in the centre of the QR code
 - **Auto-Fetch** — Fetches logo from URL, resizes, and composites
+- **Short URL Encoding** — QR encodes the short URL (not destination), so scans are tracked and respect expiry/password protection
+- **Database Caching** — QR images are cached in the `qr_codes` table; subsequent requests skip re-generation
+- **Time-Limited QR** — Independent `qrExpiresAt` field allows QR expiry separate from link expiry
+- **QR Regeneration** — Expired QR codes can be regenerated with a new expiry date; old cache is purged
 
 ### Bulk Operations
 - **Bulk Tag** — Assign tags to multiple URLs at once
diff --git a/opencode.json b/opencode.json
index 986631c..11bd67c 100644
--- a/opencode.json
+++ b/opencode.json
@@ -1,7 +1,5 @@
 {
   "$schema": "https://opencode.ai/config.json",
-  "model": "anthropic/claude-sonnet-4-5",
-  "small_model": "anthropic/claude-haiku-4-5",
   "default_agent": "build",
   "instructions": [
     "AGENTS.md",
@@ -31,7 +29,6 @@
     "build": {
       "description": "Primary coding agent for development work",
       "mode": "primary",
-      "model": "anthropic/claude-sonnet-4-5",
       "tools": {
         "write": true,
         "edit": true,
@@ -43,7 +40,6 @@
     "planner": {
       "description": "Expert planning specialist for complex features and refactoring. Use for implementation planning, architectural changes, or complex refactoring.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/planner.txt}",
       "tools": {
         "read": true,
@@ -55,7 +51,6 @@
     "architect": {
       "description": "Software architecture specialist for system design, scalability, and technical decision-making.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/architect.txt}",
       "tools": {
         "read": true,
@@ -67,7 +62,6 @@
     "code-reviewer": {
       "description": "Expert code review specialist. Reviews code for quality, security, and maintainability. Use immediately after writing or modifying code.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/code-reviewer.txt}",
       "tools": {
         "read": true,
@@ -79,19 +73,17 @@
     "security-reviewer": {
       "description": "Security vulnerability detection and remediation specialist. Use after writing code that handles user input, authentication, API endpoints, or sensitive data.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/security-reviewer.txt}",
       "tools": {
         "read": true,
-        "bash": true,
         "write": true,
-        "edit": true
+        "edit": true,
+        "bash": true
       }
     },
     "tdd-guide": {
       "description": "Test-Driven Development specialist enforcing write-tests-first methodology. Use when writing new features, fixing bugs, or refactoring code. Ensures 80%+ test coverage.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/tdd-guide.txt}",
       "tools": {
         "read": true,
@@ -103,7 +95,6 @@
     "build-error-resolver": {
       "description": "Build and TypeScript error resolution specialist. Use when build fails or type errors occur. Fixes build/type errors only with minimal diffs.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/build-error-resolver.txt}",
       "tools": {
         "read": true,
@@ -115,7 +106,6 @@
     "e2e-runner": {
       "description": "End-to-end testing specialist using Playwright. Generates, maintains, and runs E2E tests for critical user flows.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/e2e-runner.txt}",
       "tools": {
         "read": true,
@@ -127,7 +117,6 @@
     "doc-updater": {
       "description": "Documentation and codemap specialist. Use for updating codemaps and documentation.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/doc-updater.txt}",
       "tools": {
         "read": true,
@@ -139,7 +128,6 @@
     "refactor-cleaner": {
       "description": "Dead code cleanup and consolidation specialist. Use for removing unused code, duplicates, and refactoring.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/refactor-cleaner.txt}",
       "tools": {
         "read": true,
@@ -151,7 +139,6 @@
     "go-reviewer": {
       "description": "Expert Go code reviewer specializing in idiomatic Go, concurrency patterns, error handling, and performance.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/go-reviewer.txt}",
       "tools": {
         "read": true,
@@ -163,7 +150,6 @@
     "go-build-resolver": {
       "description": "Go build, vet, and compilation error resolution specialist. Fixes Go build errors with minimal changes.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/go-build-resolver.txt}",
       "tools": {
         "read": true,
@@ -175,7 +161,6 @@
     "database-reviewer": {
       "description": "PostgreSQL database specialist for query optimization, schema design, security, and performance. Incorporates Supabase best practices.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/database-reviewer.txt}",
       "tools": {
         "read": true,
@@ -187,7 +172,6 @@
     "cpp-reviewer": {
       "description": "Expert C++ code reviewer specializing in memory safety, modern C++ idioms, concurrency, and performance. Use for all C++ code changes.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/cpp-reviewer.txt}",
       "tools": {
         "read": true,
@@ -199,7 +183,6 @@
     "cpp-build-resolver": {
       "description": "C++ build, CMake, and compilation error resolution specialist. Fixes build errors, linker issues, and template errors with minimal changes.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/cpp-build-resolver.txt}",
       "tools": {
         "read": true,
@@ -211,7 +194,6 @@
     "docs-lookup": {
       "description": "Documentation specialist using Context7 MCP to fetch current library and API documentation with code examples.",
       "mode": "subagent",
-      "model": "anthropic/claude-sonnet-4-5",
       "prompt": "{file:.opencode/prompts/agents/docs-lookup.txt}",
       "tools": {
         "read": true,
@@ -223,7 +205,6 @@
     "harness-optimizer": {
       "description": "Analyze and improve the local agent harness configuration for reliability, cost, and throughput.",
       "mode": "subagent",
-      "model": "anthropic/claude-sonnet-4-5",
       "prompt": "{file:.opencode/prompts/agents/harness-optimizer.txt}",
       "tools": {
         "read": true,
@@ -234,7 +215,6 @@
     "java-reviewer": {
       "description": "Expert Java and Spring Boot code reviewer specializing in layered architecture, JPA patterns, security, and concurrency.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/java-reviewer.txt}",
       "tools": {
         "read": true,
@@ -246,7 +226,6 @@
     "java-build-resolver": {
       "description": "Java/Maven/Gradle build, compilation, and dependency error resolution specialist. Fixes build errors with minimal changes.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/java-build-resolver.txt}",
       "tools": {
         "read": true,
@@ -258,7 +237,6 @@
     "kotlin-reviewer": {
       "description": "Kotlin and Android/KMP code reviewer. Reviews Kotlin code for idiomatic patterns, coroutine safety, Compose best practices.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/kotlin-reviewer.txt}",
       "tools": {
         "read": true,
@@ -270,7 +248,6 @@
     "kotlin-build-resolver": {
       "description": "Kotlin/Gradle build, compilation, and dependency error resolution specialist. Fixes Kotlin build errors with minimal changes.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/kotlin-build-resolver.txt}",
       "tools": {
         "read": true,
@@ -282,7 +259,6 @@
     "loop-operator": {
       "description": "Operate autonomous agent loops, monitor progress, and intervene safely when loops stall.",
       "mode": "subagent",
-      "model": "anthropic/claude-sonnet-4-5",
       "prompt": "{file:.opencode/prompts/agents/loop-operator.txt}",
       "tools": {
         "read": true,
@@ -293,7 +269,6 @@
     "php-reviewer": {
       "description": "Expert PHP code reviewer specializing in PSR-12 compliance, PHP type system, Eloquent ORM patterns, security, and performance.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/php-reviewer.txt}",
       "tools": {
         "read": true,
@@ -305,7 +280,6 @@
     "python-reviewer": {
       "description": "Expert Python code reviewer specializing in PEP 8 compliance, Pythonic idioms, type hints, security, and performance.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/python-reviewer.txt}",
       "tools": {
         "read": true,
@@ -317,7 +291,6 @@
     "rust-reviewer": {
       "description": "Expert Rust code reviewer specializing in idiomatic Rust, ownership, lifetimes, concurrency, and performance.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/rust-reviewer.txt}",
       "tools": {
         "read": true,
@@ -329,7 +302,6 @@
     "rust-build-resolver": {
       "description": "Rust build, Cargo, and compilation error resolution specialist. Fixes Rust build errors with minimal changes.",
       "mode": "subagent",
-      "model": "anthropic/claude-opus-4-5",
       "prompt": "{file:.opencode/prompts/agents/rust-build-resolver.txt}",
       "tools": {
         "read": true,
@@ -475,15 +447,15 @@
   },
   "mcp": {
     "21st": {
-      "type":"remote",
+      "type": "remote",
       "url": "https://21st.dev/api/mcp",
-      "enabled":true,
+      "enabled": true,
       "headers": {
-        "x-api-key": "21st_sk_e97f6ad7dba85817321fea2aeb876ba733738c50511181f8610ba07026a4c697"
+        "x-api-key": "${21ST_API_KEY}"
       }
     }
   },
   "permission": {
     "mcp_*": "ask"
   }
-}
\ No newline at end of file
+}
diff --git a/phases.md b/phases.md
index 3977bd0..44e70fe 100644
--- a/phases.md
+++ b/phases.md
@@ -54,7 +54,7 @@ After auth in `apps/web`, the user is redirected to `apps/dashboard` (port 5174)
 #### Shared types (`packages/shared/src/index.ts`)
 Add TypeScript interfaces/types for all API response shapes:
 
-- `ShortUrl` — `{ code, url, shortUrl, title, description, image, visits, uniqueVisits, expiresAt, activeAt, hasPassword, blockBots, createdAt }`
+- `ShortUrl` — `{ code, url, shortUrl, title, description, image, visits, uniqueVisits, expiresAt, activeAt, hasPassword, blockBots, qrExpiresAt, createdAt }`
 - `Visit` — `{ id, code, ipAddress, userAgent, referer, country, city, deviceType, os, browser, browserVersion, referrerCategory, isBot, visitedAt }`
 - `VisitStats` — `{ totalVisits, uniqueVisits, hourly: VisitStat[], daily: VisitStat[] }`
 - `VisitStat` — `{ hour/date, visits, uniqueVisits }`
@@ -76,7 +76,7 @@ Add TypeScript interfaces/types for all API response shapes:
 - Export typed helper functions for every endpoint (one per API call):
   - Auth: `fetchMe`, `refreshToken`, `resetPassword`
   - API Keys: `createApiKey`, `listApiKeys`, `updateApiKey`, `revokeApiKey`
-  - URLs: `createUrl`, `bulkCreateUrls`, `listUrls`, `getUrlInfo`, `getUrlVisits`, `getUrlStats`, `exportVisitsCsv`, `generateQrCode`, `updateUrlSettings`, `setUrlPassword`, `removeUrlPassword`, `verifyUrlPassword`, `softDeleteUrl`, `purgeUrl`, `bulkOperations`, `importCsv`
+  - URLs: `createUrl`, `bulkCreateUrls`, `listUrls`, `getUrlInfo`, `getUrlVisits`, `getUrlStats`, `exportVisitsCsv`, `generateQrCode`, `regenerateQrCode`, `updateUrlSettings`, `setUrlPassword`, `removeUrlPassword`, `verifyUrlPassword`, `softDeleteUrl`, `purgeUrl`, `bulkOperations`, `importCsv`
   - Collections: `listCollections`, `createCollection`, `getCollection`, `updateCollection`, `deleteCollection`, `reorderCollections`, `shareCollection`, `revokeCollectionShare`, `getCollectionUrls`, `addUrlToCollection`, `removeUrlFromCollection`
   - Tags: `listTags`, `createTag`, `updateTag`, `deleteTag`, `bulkTagUrls`, `getTagUrls`
   - Billing: `listPlans`, `createCheckoutSession`, `getPortalUrl`, `getSubscription`, `cancelSubscription`, `getUsage`
@@ -240,6 +240,7 @@ Each page component is a placeholder `<PageHeader title="..." />` — actual con
   - **TTL Days** (optional) — number input or preset buttons (7d, 30d, 90d, 365d, never)
   - **Password** (optional) — password input, only shown if plan allows
   - **Active at** (optional) — date-time picker (scheduled activation)
+  - **QR expires at** (optional) — date-time picker (QR code expiry, independent of link TTL)
   - **Block bots** — toggle switch
   - **Tags** — multi-select of existing tags, with create-new-tag inline option
   - **Collection** — dropdown to select a collection
@@ -303,11 +304,17 @@ Each page component is a placeholder `<PageHeader title="..." />` — actual con
 - Loading state while file generates
 
 #### QR code
+- QR encodes the **short URL** (not destination) → scans go through the redirect: tracked, time-limited, password-checked
 - Button/modal "Generate QR Code"
 - Format selector: PNG / SVG
 - Optional logo URL input
 - Preview of the QR code in the modal
 - Download button for PNG or SVG
+- Expiry badge: shows `qrExpiresAt` if set; "Expired" state when past
+- **"Regenerate QR"** — visible when QR is expired
+  - Confirmation dialog → calls `POST /:code/qr/regenerate` with new `expiresAt`
+  - Replaces the stored QR (old cache is purged, new QR generated)
+- QR is cached in DB on first generation; subsequent loads return cached version
 - Loading state while QR generates
 
 #### Page sections navigation
@@ -326,6 +333,7 @@ Each page component is a placeholder `<PageHeader title="..." />` — actual con
 - Edit form using `PATCH /api/urls/:code/settings`:
   - **Active at** — date-time picker (null = no schedule)
   - **Expires at** — date-time picker (null = never expires)
+  - **QR expires at** — date-time picker (null = never expires; independent of link expiry)
   - **Block bots** — toggle switch
   - "Clear" buttons next to date fields to set null
 - Save button with loading state and success toast
diff --git a/specs/03-third-fourth-phase.md b/specs/03-third-fourth-phase.md
new file mode 100644
index 0000000..fedc747
--- /dev/null
+++ b/specs/03-third-fourth-phase.md
@@ -0,0 +1,26 @@
+# Building the Phase 3 and Phase 4
+
+You have to build the Phase 3 and Phase 4 of the phases.md file.
+
+## Instruction
+
+You are a professional and experienced software developer with years of experience. Write professional and production-ready code and professional code logics and best-practices. think like a 100x engineer. do same as what he would do. follow proper typescript. Do not break anything.  Build everything written in the phase.
+
+## What to DO.
+
+write production-ready code and professional code and best-practices. Follow professional code guidelines.Create a minimal aesthetic professional and popping out UI and UX that follows modern design principles and professional design hirarchy and strictly follow the DESIGN.md file for the design theme and layout and everything.
+
+## What not to do.
+
+Dont use hardcoded talwind colors. 
+
+## Context
+
+- AGENTS.md
+- docs/API.md
+- docs/PROJECT.md
+- README.md
+- phases.md
+- DESIGN.md
+
+these all files have all the context related to project backend and full guides.
\ No newline at end of file
diff --git a/specs/04-fifth-sixth-phase.md b/specs/04-fifth-sixth-phase.md
new file mode 100644
index 0000000..b2901cc
--- /dev/null
+++ b/specs/04-fifth-sixth-phase.md
@@ -0,0 +1,26 @@
+# Building the Phase 5 and Phase 6
+
+You have to build the Phase 5 and Phase 6 of the phases.md file.
+
+## Instruction
+
+You are a professional and experienced software developer with years of experience. Write professional and production-ready code and professional code logics and best-practices. think like a 100x engineer. do same as what he would do. follow proper typescript. Do not break anything.  Build everything written in the phase.
+
+## What to DO.
+
+write production-ready code and professional code and best-practices. Follow professional code guidelines.Create a minimal aesthetic professional and popping out UI and UX that follows modern design principles and professional design hirarchy and strictly follow the DESIGN.md file for the design theme and layout and everything.
+
+## What not to do.
+
+Dont use hardcoded talwind colors. 
+
+## Context
+
+- AGENTS.md
+- docs/API.md
+- docs/PROJECT.md
+- README.md
+- phases.md
+- DESIGN.md
+
+these all files have all the context related to project backend and full guides.
\ No newline at end of file
diff --git a/specs/qr-caching-time-limited.md b/specs/qr-caching-time-limited.md
new file mode 100644
index 0000000..e8c9d87
--- /dev/null
+++ b/specs/qr-caching-time-limited.md
@@ -0,0 +1,109 @@
+# QR Code Caching & Time-Limited QR — Implementation Spec
+
+## Problem
+
+The current QR code endpoint (`GET /api/urls/:code/qr`) generates the QR on-the-fly every request. Two issues:
+
+1. **No caching** — every download re-renders the same QR, wasting CPU. The QR encodes the **destination URL** (not the short URL), so if the destination hasn't changed, the image is identical each time.
+2. **QR encodes destination URL directly** — scans bypass linkify's redirect entirely. This means:
+   - Visit analytics are **not recorded** from QR scans
+   - Password-protected links are **bypassed**
+   - Expired/deleted links still resolve (the QR points to the destination, not the short URL)
+   - Scheduled activation is ignored
+
+## Approach
+
+### 1. Change what the QR encodes
+
+Switch from encoding the **destination URL** to encoding the **short URL** (`http://localhost:3000/aB3xK9m`).
+
+**Why:** Scanning the short URL means every request goes through the redirect handler, which:
+- Records visit analytics
+- Checks password protection
+- Checks expiry (`expiresAt`) — the QR is naturally time-limited by the link's own TTL
+- Checks scheduled activation (`activeAt`)
+- Allows bot blocking, soft-delete enforcement, etc.
+
+**In the controller** (`qr.controller.ts`), instead of:
+```ts
+const urlRow = await resolveUrl(code)
+const targetUrl = urlRow.url
+```
+Use:
+```ts
+const targetUrl = `${BASE_URL}/${code}`  // the short URL
+```
+(BASE_URL being the configured `BASE_URL` from env or `http://localhost:3000`)
+
+### 2. Cache the QR in the database
+
+Add a `qrCode` column to the `short_urls` table (or a separate `qr_codes` table keyed by `code + format + logo_hash`).
+
+**Schema option A — column on short_urls:**
+```sql
+ALTER TABLE short_urls ADD COLUMN qr_code_png bytea;
+ALTER TABLE short_urls ADD COLUMN qr_code_svg text;
+ALTER TABLE short_urls ADD COLUMN qr_logo_url text;
+ALTER TABLE short_urls ADD COLUMN qr_updated_at timestamptz;
+```
+
+**Schema option B — separate table (more flexible):**
+```sql
+CREATE TABLE qr_codes (
+  id serial PRIMARY KEY,
+  code text NOT NULL REFERENCES short_urls(code) ON DELETE CASCADE,
+  format text NOT NULL,        -- 'png' or 'svg'
+  logo_url text,
+  data bytea NOT NULL,         -- PNG binary or SVG text stored as bytes
+  created_at timestamptz DEFAULT now(),
+  UNIQUE(code, format, COALESCE(logo_url, ''))
+);
+```
+
+Option B is cleaner — supports multiple formats without sparse columns, and the composite unique key prevents duplicates.
+
+**Controller flow becomes:**
+1. Parse `format` and `logo` from query params
+2. Compute lookup key: `(code, format, logo_url ?? '')`
+3. Check DB cache — if row exists, return `data` with appropriate Content-Type
+4. If not cached, generate QR, store in DB, return it
+
+### 3. Invalidation triggers
+
+The cached QR must be invalidated when the **short URL encoding** changes. The QR encodes `BASE_URL/code`, and `code` never changes (it's the identity). So for the basic approach (encoding the short URL), **no invalidation is ever needed** — the QR is immutable for a given `(code, format, logo)` combination.
+
+If you later decide to encode the destination URL or add metadata like title, then invalidation triggers would be:
+- `PATCH /api/urls/:code/settings` — if destination URL or expiry changed
+- `DELETE /api/urls/:code` — cascade delete the QR rows
+- `DELETE /api/urls/:code/purge` — cascade delete
+
+### 4. Time-limited QR via dedicated field (optional enhancement)
+
+If you want QR expiry **independent** of link expiry, add a field:
+
+```sql
+ALTER TABLE short_urls ADD COLUMN qr_expires_at timestamptz;
+```
+
+This allows scenarios like:
+- Link is permanent but QR for a printed flyer should expire after the campaign
+- QR for a conference talk expires after the event, but the underlying link stays active for registered attendees via a password
+
+Add `qrExpiresAt` to the URL settings form (Phase 5) and check it in the QR controller before serving.
+
+## Summary of Changes
+
+| File | Change |
+|---|---|
+| `controllers/qr.controller.ts` | Encode short URL not destination; add cache check + store |
+| `services/qr.service.ts` | No change (still generates buffer/string) |
+| `db/schema.ts` | Add `qr_codes` table (or columns on `short_urls`) |
+| `controllers/link.controller.ts` | Add invalidation on settings update (if needed) |
+| `services/url.services.ts` | Add `getQrCache` / `setQrCache` helpers |
+| `pages/UrlDetailPage.tsx` | No change needed (already fetches from API) |
+
+## Migration
+
+- Existing saved QRs (none, since nothing is saved) — no migration needed
+- After deploy, first request for each QR generates + caches it; subsequent requests return cached version
+- If switching to short-URL encoding, any previously distributed QRs (encoding destination URL) will continue to work — they just won't be tracked. Newly generated QRs will encode the short URL.